diff options
| author | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-09-22 11:17:10 +0000 |
|---|---|---|
| committer | Jabier Arraiza <jabier.arraiza@marker.es> | 2018-09-22 11:17:10 +0000 |
| commit | 0c63ba89a507f817dcd7b54cf60af8951e14e2c9 (patch) | |
| tree | d97f5ff77162216ee8948ef3893f6af1eabb1e12 /src/ui | |
| parent | Fix problems on dialogs with extensions. TODO: Add dialog on drag&drop a SVG (diff) | |
| download | inkscape-0c63ba89a507f817dcd7b54cf60af8951e14e2c9.tar.gz inkscape-0c63ba89a507f817dcd7b54cf60af8951e14e2c9.zip | |
Allow ask for SVG dragged import method. Also split ask question from one to 2 (Bitmap and SVG)
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 5 | ||||
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.h | 1 | ||||
| -rw-r--r-- | src/ui/interface.cpp | 6 |
3 files changed, 11 insertions, 1 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index a1aae3cde..02dcb4187 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -1731,9 +1731,12 @@ void InkscapePreferences::initPageBitmaps() _("Resolution used by the Create Bitmap Copy command"), false); _page_bitmaps.add_group_header( _("Import")); - _bitmap_ask.init(_("Ask about linking and scaling when importing"), "/dialogs/import/ask", true); + _bitmap_ask.init(_("Ask about linking and scaling when importing bitmap images"), "/dialogs/import/ask", true); _page_bitmaps.add_line( true, "", _bitmap_ask, "", _("Pop-up linking and scaling dialog when importing bitmap image.")); + _svg_ask.init(_("Ask about linking and scaling when importing SVG images"), "/dialogs/import/ask_svg", true); + _page_bitmaps.add_line( true, "", _svg_ask, "", + _("Pop-up linking and scaling dialog when importing SVG image.")); { Glib::ustring labels[] = {_("Embed"), _("Link")}; diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h index d0b51fa83..adcfca358 100644 --- a/src/ui/dialog/inkscape-preferences.h +++ b/src/ui/dialog/inkscape-preferences.h @@ -401,6 +401,7 @@ protected: UI::Widget::PrefCheckButton _misc_bitmap_autoreload; UI::Widget::PrefSpinButton _bitmap_copy_res; UI::Widget::PrefCheckButton _bitmap_ask; + UI::Widget::PrefCheckButton _svg_ask; UI::Widget::PrefCombo _bitmap_link; UI::Widget::PrefCombo _svg_link; UI::Widget::PrefCombo _bitmap_scale; diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index 35723af04..5edaab193 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -1246,6 +1246,8 @@ sp_ui_drag_data_received(GtkWidget *widget, case SVG_DATA: case SVG_XML_DATA: { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setBool("/options/onimport", true); gchar *svgdata = (gchar *)gtk_selection_data_get_data (data); Inkscape::XML::Document *rnewdoc = sp_repr_read_mem(svgdata, gtk_selection_data_get_length (data), SP_SVG_NS_URI); @@ -1291,12 +1293,16 @@ sp_ui_drag_data_received(GtkWidget *widget, Inkscape::GC::release(newgroup); DocumentUndo::done( doc, SP_VERB_NONE, _("Drop SVG") ); + prefs->setBool("/options/onimport", false); break; } case URI_LIST: { + Inkscape::Preferences *prefs = Inkscape::Preferences::get(); + prefs->setBool("/options/onimport", true); gchar *uri = (gchar *)gtk_selection_data_get_data (data); sp_ui_import_files(uri); + prefs->setBool("/options/onimport", false); break; } |