From 2a4a1a0917d503ca414ad265a98b87d3e90cb00a Mon Sep 17 00:00:00 2001
From: Jabier Arraiza <jabier.arraiza@marker.es>
Date: Thu, 26 Jul 2018 00:58:28 +0200
Subject: Fixes pointed by maren in original MR

---
 src/ui/dialog/inkscape-preferences.cpp | 28 +++++++++++++++-------------
 src/ui/interface.cpp                   |  9 ++++++++-
 2 files changed, 23 insertions(+), 14 deletions(-)

(limited to 'src')

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 38e217397..ba0e95921 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -636,14 +636,16 @@ void InkscapePreferences::symbolicThemeCheck()
             }
         }
     }
-    if (!symbolic) {
-        _symbolic_icons.set_active(false);
-        _symbolic_icons.hide();
-        _symbolic_color.hide();
-    }
-    else {
-        _symbolic_icons.show();
-        _symbolic_color.show();
+    if (_symbolic_icons.get_parent()) {
+        if (!symbolic) {
+            _symbolic_icons.set_active(false);
+            _symbolic_icons.get_parent()->hide();
+            _symbolic_color.get_parent()->hide();
+        }
+        else {
+            _symbolic_icons.get_parent()->show();
+            _symbolic_color.get_parent()->show();
+        }
     }
 }
 void InkscapePreferences::initPageUI()
@@ -868,7 +870,7 @@ void InkscapePreferences::initPageUI()
     _symbolic_icons.init(_("Use symbolic icons"), "/theme/symbolicIcons", true);
     _page_theme.add_line(true, "", _symbolic_icons, "", "", true),
     _symbolic_color.init(_("Color for symbolic icons:"), "/theme/symbolicColor", 0x000000ff);
-    _page_theme.add_line(false, _("Color for symbolic icons:"), _symbolic_color, "", "", true);
+    _page_theme.add_line(false, "", _symbolic_color, _("Color for symbolic icons"), "", true);
     {
         Glib::ustring sizeLabels[] = { C_("Icon size", "Larger"), C_("Icon size", "Large"), C_("Icon size", "Small"),
                                        C_("Icon size", "Smaller") };
@@ -2190,7 +2192,7 @@ void InkscapePreferences::initPageSystem()
     _sys_user_prefs.set_editable(false);
     _page_system.add_line(true, _("User preferences: "), _sys_user_prefs, "", _("Location of the users preferences file"), true);
 
-    _sys_user_config.init((char const *)Inkscape::IO::Resource::profile_path(""), _("Open inkscape folder"));
+    _sys_user_config.init((char const *)Inkscape::IO::Resource::profile_path(""), _("Open preferences folder"));
     _page_system.add_line(true, _("User config: "), _sys_user_config, "", _("Location of users configuration"), true);
 
     _sys_user_extension_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::EXTENSIONS, ""),
@@ -2215,16 +2217,16 @@ void InkscapePreferences::initPageSystem()
                           true);
 
     _sys_user_palettes_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::PALETTES, ""),
-                                _("Open palletes folder"));
+                                _("Open palettes folder"));
     _page_system.add_line(true, _("User palettes: "), _sys_user_palettes_dir, "", _("Location of the users palettes"),
                           true);
 
     _sys_user_keys_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::KEYS, ""),
-                            _("Open keys shorcuts folder"));
+                            _("Open keyboard shorcuts folder"));
     _page_system.add_line(true, _("User keys: "), _sys_user_keys_dir, "", _("Location of the users keys"), true);
 
     _sys_user_ui_dir.init((char const *)IO::Resource::get_path(IO::Resource::USER, IO::Resource::UIS, ""),
-                          _("Open UI folder"));
+                          _("Open user interface folder"));
     _page_system.add_line(true, _("User UI: "), _sys_user_ui_dir, "", _("Location of the users UI"), true);
 
     _sys_user_cache.set_text(g_get_user_cache_dir());
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 99fbbc23c..f8d48a2d0 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -73,6 +73,7 @@
 #include "ui/clipboard.h"
 #include "ui/dialog-events.h"
 #include "ui/dialog/dialog-manager.h"
+#include "ui/dialog/inkscape-preferences.h"
 #include "ui/dialog/layer-properties.h"
 #include "ui/interface.h"
 #include "ui/monitor.h"
@@ -267,6 +268,12 @@ void sp_ui_reload()
 {
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
+    prefs->setInt("/dialogs/preferences/page", PREFS_PAGE_UI_THEME);
+    Inkscape::UI::Dialog::Dialog *prefs_dialog = SP_ACTIVE_DESKTOP->_dlg_mgr->getDialog("InkscapePreferences");
+    if (prefs_dialog) {
+        prefs_dialog->hide();
+    }
+    SP_ACTIVE_DESKTOP->disableInteraction();
     int window_geometry = prefs->getInt("/options/savewindowgeometry/value", PREFS_WINDOW_GEOMETRY_NONE);
     g_object_set(gtk_settings_get_default(), "gtk-theme-name", prefs->getString("/theme/gtkTheme").c_str(), NULL);
     g_object_set(gtk_settings_get_default(), "gtk-application-prefer-dark-theme",
@@ -283,7 +290,6 @@ void sp_ui_reload()
             continue;
         }
         dt->storeDesktopPosition();
-
         SPDocument *document;
         SPViewWidget *dtw;
 
@@ -304,6 +310,7 @@ void sp_ui_reload()
         dt->destroyWidget();
         i++;
     }
+    SP_ACTIVE_DESKTOP->_dlg_mgr->showDialog("InkscapePreferences");
     INKSCAPE.add_style_sheet();
     prefs->setInt("/options/savewindowgeometry/value", window_geometry);
 }
-- 
cgit v1.2.3