diff options
Diffstat (limited to 'src/ui')
| -rw-r--r-- | src/ui/dialog/inkscape-preferences.cpp | 6 | ||||
| -rw-r--r-- | src/ui/interface.cpp | 1 | ||||
| -rw-r--r-- | src/ui/widget/color-notebook.cpp | 2 |
3 files changed, 6 insertions, 3 deletions
diff --git a/src/ui/dialog/inkscape-preferences.cpp b/src/ui/dialog/inkscape-preferences.cpp index b2020fa5f..2be489c23 100644 --- a/src/ui/dialog/inkscape-preferences.cpp +++ b/src/ui/dialog/inkscape-preferences.cpp @@ -610,11 +610,13 @@ static void _inkscape_fill_icons(const gchar *path, GHashTable *t) if (!dir) { return; } - std::cout << path << "AAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAAA" << std::endl; while ((dir_entry = g_dir_read_name(dir))) { gchar *filename = g_build_filename(path, dir_entry, "index.theme", NULL); gchar *scalable = g_build_filename(path, dir_entry, "scalable", NULL); - if (g_file_test(filename, G_FILE_TEST_IS_REGULAR) && g_file_test(scalable, G_FILE_TEST_IS_DIR) && + gchar *symbolic = g_build_filename(path, dir_entry, "symbolic", NULL); + if (g_file_test(filename, G_FILE_TEST_IS_REGULAR) && + (g_file_test(scalable, G_FILE_TEST_IS_DIR) || + g_file_test(symbolic, G_FILE_TEST_IS_DIR)) && g_strcmp0(dir_entry, "default") != 0 && !g_hash_table_contains(t, dir_entry)) { g_hash_table_add(t, g_strdup(dir_entry)); } diff --git a/src/ui/interface.cpp b/src/ui/interface.cpp index f8d48a2d0..18ac19ecd 100644 --- a/src/ui/interface.cpp +++ b/src/ui/interface.cpp @@ -276,6 +276,7 @@ void sp_ui_reload() 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-icon-theme-name", prefs->getString("/theme/iconTheme").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); diff --git a/src/ui/widget/color-notebook.cpp b/src/ui/widget/color-notebook.cpp index 2d8dcc310..1b3c8ff2e 100644 --- a/src/ui/widget/color-notebook.cpp +++ b/src/ui/widget/color-notebook.cpp @@ -161,7 +161,7 @@ void ColorNotebook::_initUI() /* Create color management icons */ _box_colormanaged = gtk_event_box_new(); GtkWidget *colormanaged = - GTK_WIDGET(sp_get_icon_image("color-management-icon", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); + GTK_WIDGET(sp_get_icon_image("color-management", GTK_ICON_SIZE_SMALL_TOOLBAR)->gobj()); gtk_container_add(GTK_CONTAINER(_box_colormanaged), colormanaged); gtk_widget_set_tooltip_text(_box_colormanaged, _("Color Managed")); gtk_widget_set_sensitive(_box_colormanaged, false); |