Working on themes

3 files changed, 7 insertions, 9 deletions

diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp
index 5bf594c38..f31b443fb 100644
--- a/src/ui/dialog/inkscape-preferences.cpp
+++ b/src/ui/dialog/inkscape-preferences.cpp
@@ -803,17 +803,13 @@ void InkscapePreferences::initPageUI()
         g_list_free (list);
         g_hash_table_destroy (t);
 
-//        g_object_bind_property (gtk_settings_get_default (), "gtk-theme-name",
-//                      (gpointer *)&_theme, "active-id",
-//                      (GBindingFlags)(G_BINDING_BIDIRECTIONAL | G_BINDING_SYNC_CREATE));
-
-        _theme.init("/theme/theme", labels, values, "Adwaita");
-        _page_theme.add_line(false, _("Change theme:"), _theme, "", "", false);
+        _gtk_theme.init("/theme/gtkTheme", labels, values, "Adwaita");
+        _page_theme.add_line(false, _("Change Gtk theme:"), _gtk_theme, "", "", false);
     }
 
     {
         using namespace Inkscape::IO::Resource;
-        auto files = get_filenames(UIS, {".css"}, {"style.css","dark.css","symbolic.css"});
+        auto files = get_foldernames(ICONS, {"application"});
         std::vector<Glib::ustring> labels;
         std::vector<Glib::ustring> values;
         for(auto &filename: files) {
@@ -836,6 +832,8 @@ void InkscapePreferences::initPageUI()
             labels.push_back(filename);
             values.push_back(filename);
         }
+        labels.erase(unique(labels.begin(), labels.end()), labels.end());
+        values.erase(unique(values.begin(), values.end()), values.end());
         _icon_theme.init("/theme/iconTheme", labels, values, "hicolor");
         _page_theme.add_line(false, _("Change icon theme:"), _icon_theme, "", "", false);
     }
diff --git a/src/ui/dialog/inkscape-preferences.h b/src/ui/dialog/inkscape-preferences.h
index f705d8e29..d172687fa 100644
--- a/src/ui/dialog/inkscape-preferences.h
+++ b/src/ui/dialog/inkscape-preferences.h
@@ -240,7 +240,7 @@ protected:
     UI::Widget::PrefCheckButton _t_node_delete_preserves_shape;
     UI::Widget::PrefColorPicker _t_node_pathoutline_color;
 
-    UI::Widget::PrefCombo       _theme;
+    UI::Widget::PrefCombo       _gtk_theme;
     UI::Widget::PrefCombo       _icon_theme;
     UI::Widget::PrefCheckButton _dark_theme;
     UI::Widget::PrefCheckButton _symbolic_icons;
diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp
index 9f5d2d38c..89f2c3d8a 100644
--- a/src/ui/interface.cpp
+++ b/src/ui/interface.cpp
@@ -269,7 +269,7 @@ sp_ui_reload()
 
     Inkscape::Preferences *prefs = Inkscape::Preferences::get();
     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/theme").c_str(), NULL);
+    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", prefs->getBool("/theme/darkTheme", false), NULL);
     prefs->setInt("/options/savewindowgeometry/value", PREFS_WINDOW_GEOMETRY_LAST);
     prefs->save();