diff options
| author | Jabier Arraiza Cenoz <jabier.arraiza@marker.es> | 2016-03-15 21:57:03 +0000 |
|---|---|---|
| committer | Jabiertxof <jtx@jtx.marker.es> | 2016-03-15 21:57:03 +0000 |
| commit | 6bd1c2a30b66e15fe055b22bd47dadb771f7fae2 (patch) | |
| tree | 1b991cc2736f84fb069666802d485bd29cff6394 /src/main.cpp | |
| parent | Update to limit options to radius = 0, radious > 0 or both (diff) | |
| parent | fix-bug-1557192. paint-order crash with multiple items (diff) | |
| download | inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.tar.gz inkscape-6bd1c2a30b66e15fe055b22bd47dadb771f7fae2.zip | |
Update to trunk
(bzr r13645.1.119)
Diffstat (limited to 'src/main.cpp')
| -rw-r--r-- | src/main.cpp | 10 |
1 files changed, 7 insertions, 3 deletions
diff --git a/src/main.cpp b/src/main.cpp index 26c25af02..840643a90 100644 --- a/src/main.cpp +++ b/src/main.cpp @@ -212,7 +212,7 @@ static gboolean sp_export_id_only = FALSE; static gchar *sp_export_svg = NULL; static gchar *sp_export_ps = NULL; static gchar *sp_export_eps = NULL; -static gint sp_export_ps_level = 2; +static gint sp_export_ps_level = 3; static gchar *sp_export_pdf = NULL; static gchar *sp_export_pdf_version = NULL; static gchar *sp_export_emf = NULL; @@ -260,7 +260,7 @@ static void resetCommandlineGlobals() { sp_export_svg = NULL; sp_export_ps = NULL; sp_export_eps = NULL; - sp_export_ps_level = 2; + sp_export_ps_level = 3; sp_export_pdf = NULL; sp_export_pdf_version = NULL; sp_export_emf = NULL; @@ -405,7 +405,7 @@ struct poptOption options[] = { {"export-ps-level", 0, POPT_ARG_INT, &sp_export_ps_level, SP_ARG_EXPORT_PS_LEVEL, N_("Choose the PostScript Level used to export. Possible choices are" - " 2 (the default) and 3"), + " 2 and 3 (the default)"), N_("PS Level")}, {"export-pdf", 'A', @@ -1045,6 +1045,10 @@ sp_main_gui(int argc, char const **argv) gchar *usericondir = Inkscape::Application::profile_path("icons"); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), usericondir); gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_PIXMAPDIR); +#ifdef INKSCAPE_THEMEDIR + gtk_icon_theme_append_search_path(gtk_icon_theme_get_default(), INKSCAPE_THEMEDIR); + gtk_icon_theme_rescan_if_needed (gtk_icon_theme_get_default()); +#endif g_free(usericondir); gdk_event_handler_set((GdkEventFunc)snooper, NULL, NULL); |