From 0c63ba89a507f817dcd7b54cf60af8951e14e2c9 Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Sat, 22 Sep 2018 13:17:10 +0200
Subject: Allow ask for SVG dragged import method. Also split ask question from
 one to 2 (Bitmap and SVG)

---
 src/extension/internal/svg.cpp | 10 +++++-----
 src/extension/system.cpp       |  3 ++-
 2 files changed, 7 insertions(+), 6 deletions(-)

(limited to 'src/extension')

diff --git a/src/extension/internal/svg.cpp b/src/extension/internal/svg.cpp
index 3f6a342de..d392d6bf0 100644
--- a/src/extension/internal/svg.cpp
+++ b/src/extension/internal/svg.cpp
@@ -149,7 +149,7 @@ Svg::init()
                     "<_option value='optimizeSpeed' >" N_("Blocky (optimizeSpeed)") "</_option>\n"
                   "</param>\n"
 
-            "<param name=\"do_not_ask\" _gui-description='" N_("Hide the dialog next time and always apply the same actions.") "' _gui-text=\"" N_("Don't ask again") "\" type=\"boolean\" >false</param>\n"
+            "<param name=\"do_not_ask\" _gui-description='" N_("Hide the dialog next time and always apply the same actions.") "' _gui-text=\"" N_("Don't ask again") "\" type=\"boolean\" >%s</param>\n"
             "<input>\n"
                 "<extension>.svg</extension>\n"
                 "<mimetype>image/svg+xml</mimetype>\n"
@@ -158,7 +158,7 @@ Svg::init()
                 "<output_extension>" SP_MODULE_KEY_OUTPUT_SVG_INKSCAPE "</output_extension>\n"
             "</input>\n"
         "</inkscape-extension>", new Svg());
-
+    
     /* SVG out Inkscape */
     Inkscape::Extension::build_from_mem(
         "<inkscape-extension xmlns=\"" INKSCAPE_EXTENSION_URI "\">\n"
@@ -205,10 +205,10 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
     auto file = Gio::File::create_for_uri(uri);
     const auto path = file->get_path();
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
-    bool ask = prefs->getBool("/dialogs/import/ask");
+    bool ask_svg = prefs->getBool("/dialogs/import/ask_svg");
     Glib::ustring import_mode_svg  = prefs->getString("/dialogs/import/import_mode_svg");
     Glib::ustring scale = prefs->getString("/dialogs/import/scale");
-    if(mod->get_gui() && ask) {
+    if(mod->get_gui() && ask_svg) {
         Glib::ustring mod_import_mode_svg = mod->get_param_optiongroup("import_mode_svg");
         Glib::ustring mod_scale = mod->get_param_optiongroup("scale");
         if( import_mode_svg.compare( mod_import_mode_svg) != 0 ) {
@@ -219,7 +219,7 @@ Svg::open (Inkscape::Extension::Input *mod, const gchar *uri)
             scale = mod_scale;
         }
         prefs->setString("/dialogs/import/scale", scale );
-        prefs->setBool("/dialogs/import/ask", !mod->get_param_bool("do_not_ask") );
+        prefs->setBool("/dialogs/import/ask_svg", !mod->get_param_bool("do_not_ask") );
     }
     SPDocument * doc = SPDocument::createNewDoc (nullptr, TRUE, TRUE);
     if (prefs->getBool("/options/onimport", false) && import_mode_svg.compare("include") != 0) {
diff --git a/src/extension/system.cpp b/src/extension/system.cpp
index daad169aa..f000e88f0 100644
--- a/src/extension/system.cpp
+++ b/src/extension/system.cpp
@@ -98,9 +98,10 @@ SPDocument *open(Extension *key, gchar const *filename)
     if (strlen(imod->get_id()) > 21) {
         Inkscape::Preferences *prefs = Inkscape::Preferences::get();
         bool ask = prefs->getBool("/dialogs/import/ask");
+        bool ask_svg = prefs->getBool("/dialogs/import/ask_svg");
         Glib::ustring id = Glib::ustring(imod->get_id(), 22);
         if (id.compare("org.inkscape.input.svg") == 0) {
-            if (ask && prefs->getBool("/options/onimport", false)) {
+            if (ask_svg && prefs->getBool("/options/onimport", false)) {
                 show = true;
                 imod->set_gui(true);
             } else {
-- 
cgit v1.2.3