From 3c32888946e6309ae4a8472996c414f47b8d87ed Mon Sep 17 00:00:00 2001 From: Tomasz Golinski Date: Sat, 29 Jul 2023 09:45:07 +0100 Subject: [PATCH] PR #1139: Remove some of deprecated GTK stuff https://github.com/BestImageViewer/geeqie/pull/1139 MIME-Version: 1.0 Content-Type: text/plain; charset=utf8 Content-Transfer-Encoding: 8bit Remove deprecated gtk_adjustment_changed Remove gtk_tree_view_set_rules_hint Get rid of half of deprecated stock icons: menu items Replace deprecated gdk_cursor_new with gdk_cursor_new_for_display Add fullscreen icon Replace deprecated gtk_tree_view_get_vadjustment with gtk_scrollable_… Get rid of another big chunk of stock icons: buttons Replace literal icon names with #defines in main.h, replace some icon… Leftover cleanup after previous series of commits Replace a few left literal icon names with #defines Fix icons in sort bar and toolbar customization Remove leftover line --- src/advanced-exif.cc | 1 - src/bar-comment.cc | 4 +- src/bar-exif.cc | 10 +- src/bar-gps.cc | 6 +- src/bar-keywords.cc | 20 ++-- src/bar-sort.cc | 12 +-- src/bar.cc | 19 ++-- src/cache-maint.cc | 56 +++++------ src/collect-dlg.cc | 12 +-- src/collect-table.cc | 42 ++++---- src/collect.cc | 4 +- src/desktop-file.cc | 17 ++-- src/dupe.cc | 63 ++++++------ src/editors.cc | 5 +- src/fullscreen.cc | 8 +- src/img-view.cc | 36 +++---- src/layout-image.cc | 26 ++--- src/layout-util.cc | 168 ++++++++++++++++---------------- src/layout.cc | 16 +-- src/logwindow.cc | 6 +- src/main.cc | 2 +- src/main.h | 83 ++++++++++++++++ src/menu.cc | 2 +- src/pan-view/pan-view-filter.cc | 6 +- src/pan-view/pan-view-search.cc | 6 +- src/pan-view/pan-view.cc | 34 +++---- src/pixbuf-renderer.cc | 5 +- src/preferences.cc | 152 ++++++++++++++--------------- src/print.cc | 4 +- src/search.cc | 30 +++--- src/shortcuts.cc | 4 +- src/toolbar.cc | 112 ++++++++++----------- src/trash.cc | 2 +- src/ui-bookmark.cc | 19 ++-- src/ui-fileops.cc | 2 +- src/ui-help.cc | 2 +- src/ui-menu.cc | 53 ++++++++++ src/ui-menu.h | 4 + src/ui-misc.cc | 92 ++++------------- src/ui-misc.h | 9 +- src/ui-pathsel.cc | 12 +-- src/ui-spinner.cc | 2 +- src/ui-tabcomp.cc | 2 +- src/ui-utildlg.cc | 8 +- src/ui-utildlg.h | 2 +- src/utilops.cc | 55 ++++++----- src/view-dir-tree.cc | 5 +- src/view-dir.cc | 28 +++--- src/view-file/view-file-icon.cc | 2 +- src/view-file/view-file.cc | 28 +++--- src/window.cc | 4 +- 51 files changed, 696 insertions(+), 606 deletions(-) diff --git a/src/advanced-exif.cc b/src/advanced-exif.cc index b8fc8d04..92542ebc 100644 --- a/src/advanced-exif.cc +++ b/src/advanced-exif.cc @@ -476,7 +476,6 @@ GtkWidget *advanced_exif_new(LayoutWindow *lw) ew->listview = gtk_tree_view_new_with_model(GTK_TREE_MODEL(store)); g_object_unref(store); - gtk_tree_view_set_rules_hint(GTK_TREE_VIEW(ew->listview), TRUE); gtk_tree_view_set_headers_visible(GTK_TREE_VIEW(ew->listview), TRUE); advanced_exif_add_column(ew->listview, _("Description"), EXIF_ADVCOL_DESCRIPTION, FALSE); diff --git a/src/bar-comment.cc b/src/bar-comment.cc index a84f2d77..219f5a90 100644 --- a/src/bar-comment.cc +++ b/src/bar-comment.cc @@ -235,8 +235,8 @@ static void bar_pane_comment_populate_popup(GtkTextView *, GtkMenu *menu, gpoint auto pcd = static_cast(data); menu_item_add_divider(GTK_WIDGET(menu)); - menu_item_add_stock(GTK_WIDGET(menu), _("Add text to selected files"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_comment_sel_add_cb), pcd); - menu_item_add_stock(GTK_WIDGET(menu), _("Replace existing text in selected files"), GTK_STOCK_CONVERT, G_CALLBACK(bar_pane_comment_sel_replace_cb), data); + menu_item_add_icon(GTK_WIDGET(menu), _("Add text to selected files"), GQ_ICON_ADD, G_CALLBACK(bar_pane_comment_sel_add_cb), pcd); + menu_item_add_icon(GTK_WIDGET(menu), _("Replace existing text in selected files"), GQ_ICON_REPLACE, G_CALLBACK(bar_pane_comment_sel_replace_cb), data); } static void bar_pane_comment_destroy(GtkWidget *, gpointer data) diff --git a/src/bar-exif.cc b/src/bar-exif.cc index 2eb93d16..03c601e4 100644 --- a/src/bar-exif.cc +++ b/src/bar-exif.cc @@ -562,7 +562,7 @@ static void bar_pane_exif_conf_dialog(GtkWidget *widget) generic_dialog_add_message(gd, nullptr, ee ? _("Configure entry") : _("Add entry"), nullptr, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", bar_pane_exif_edit_ok_cb, TRUE); table = pref_table_new(gd->vbox, 3, 2, FALSE, TRUE); @@ -638,9 +638,9 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped) gchar *del = g_strdup_printf(_("Remove \"%s\""), ee->title); gchar *copy = g_strdup_printf(_("Copy \"%s\""), ee->title); - menu_item_add_stock(menu, conf, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_exif_conf_dialog_cb), widget); - menu_item_add_stock(menu, del, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_exif_delete_entry_cb), widget); - menu_item_add_stock(menu, copy, GTK_STOCK_COPY, G_CALLBACK(bar_pane_exif_copy_entry_cb), widget); + menu_item_add_icon(menu, conf, GQ_ICON_EDIT, G_CALLBACK(bar_pane_exif_conf_dialog_cb), widget); + menu_item_add_icon(menu, del, GQ_ICON_DELETE, G_CALLBACK(bar_pane_exif_delete_entry_cb), widget); + menu_item_add_icon(menu, copy, GQ_ICON_COPY, G_CALLBACK(bar_pane_exif_copy_entry_cb), widget); menu_item_add_divider(menu); g_free(conf); @@ -648,7 +648,7 @@ static void bar_pane_exif_menu_popup(GtkWidget *widget, PaneExifData *ped) } /* for the pane */ - menu_item_add_stock(menu, _("Add entry"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_exif_conf_dialog_cb), ped->widget); + menu_item_add_icon(menu, _("Add entry"), GQ_ICON_ADD, G_CALLBACK(bar_pane_exif_conf_dialog_cb), ped->widget); menu_item_add_check(menu, _("Show hidden entries"), ped->show_all, G_CALLBACK(bar_pane_exif_toggle_show_all_cb), ped); gtk_menu_popup_at_pointer(GTK_MENU(menu), nullptr); diff --git a/src/bar-gps.cc b/src/bar-gps.cc index 44707bf1..5a86a756 100644 --- a/src/bar-gps.cc +++ b/src/bar-gps.cc @@ -216,7 +216,7 @@ static void bar_pane_gps_close_save_cb(GenericDialog *, gpointer data) _("Write lat/long to meta-data?"), message->str, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_SAVE, nullptr, + generic_dialog_add_button(gd, GQ_ICON_SAVE, _("Save"), bar_pane_gps_close_save_cb, TRUE); gtk_widget_show(gd->dialog); @@ -848,7 +848,7 @@ void bar_pane_gps_map_centreing(PaneGPSData *pgd) "map_centering", nullptr, TRUE, nullptr, pgd); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO, "Map Centering", message->str, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", NULL, TRUE); gtk_widget_show(gd->dialog); @@ -922,7 +922,7 @@ GtkWidget *bar_pane_gps_new(const gchar *id, const gchar *title, const gchar *ma GtkWidget *status, *state, *progress, *slider; ChamplainMarkerLayer *layer; ChamplainView *view; - const gchar *slider_list[] = {"zoom-in", "zoom-out", nullptr}; + const gchar *slider_list[] = {GQ_ICON_ZOOM_IN, GQ_ICON_ZOOM_OUT, nullptr}; const gchar **slider_icons = slider_list; pgd = g_new0(PaneGPSData, 1); diff --git a/src/bar-keywords.cc b/src/bar-keywords.cc index ea31534c..5068dbdc 100644 --- a/src/bar-keywords.cc +++ b/src/bar-keywords.cc @@ -475,8 +475,8 @@ static void bar_pane_keywords_populate_popup_cb(GtkTextView *, GtkMenu *menu, gp auto pkd = static_cast(data); menu_item_add_divider(GTK_WIDGET(menu)); - menu_item_add_stock(GTK_WIDGET(menu), _("Add selected keywords to selected files"), GTK_STOCK_ADD, G_CALLBACK(bar_pane_keywords_sel_add_cb), pkd); - menu_item_add_stock(GTK_WIDGET(menu), _("Replace existing keywords in selected files with selected keywords"), GTK_STOCK_CONVERT, G_CALLBACK(bar_pane_keywords_sel_replace_cb), pkd); + menu_item_add_icon(GTK_WIDGET(menu), _("Add selected keywords to selected files"), GQ_ICON_ADD, G_CALLBACK(bar_pane_keywords_sel_add_cb), pkd); + menu_item_add_icon(GTK_WIDGET(menu), _("Replace existing keywords in selected files with selected keywords"), GQ_ICON_REPLACE, G_CALLBACK(bar_pane_keywords_sel_replace_cb), pkd); } @@ -956,7 +956,7 @@ static void bar_pane_keywords_edit_dialog(PaneKeywordsData *pkd, gboolean edit_e generic_dialog_add_message(gd, nullptr, name ? _("Configure keyword") : _("New keyword"), nullptr, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", bar_pane_keywords_edit_ok_cb, TRUE); table = pref_table_new(gd->vbox, 3, 1, FALSE, TRUE); @@ -1054,7 +1054,7 @@ static void bar_pane_keywords_disconnect_marks_cb(GtkWidget *menu_widget, gpoint "marks_keywords", menu_widget, TRUE, dummy_cancel_cb, pkd); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, "Disconnect all Marks Keywords connections?", message->str, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, bar_pane_keywords_disconnect_marks_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", bar_pane_keywords_disconnect_marks_ok_cb, TRUE); gtk_widget_show(gd->dialog); @@ -1299,7 +1299,7 @@ static void bar_pane_keywords_menu_popup(GtkWidget *, PaneKeywordsData *pkd, gin menu = popup_menu_short_lived(); - menu_item_add_stock(menu, _("New keyword"), GTK_STOCK_NEW, G_CALLBACK(bar_pane_keywords_add_dialog_cb), pkd); + menu_item_add_icon(menu, _("New keyword"), GQ_ICON_NEW, G_CALLBACK(bar_pane_keywords_add_dialog_cb), pkd); menu_item_add_divider(menu); @@ -1324,7 +1324,7 @@ static void bar_pane_keywords_menu_popup(GtkWidget *, PaneKeywordsData *pkd, gin if (keyword) { text = g_strdup_printf(_("Add \"%s\" to all selected images"), name); - menu_item_add_stock(menu, text, GTK_STOCK_ADD, G_CALLBACK(bar_pane_keywords_add_to_selected_cb), pkd); + menu_item_add_icon(menu, text, GQ_ICON_ADD, G_CALLBACK(bar_pane_keywords_add_to_selected_cb), pkd); g_free(text); } menu_item_add_divider(menu); @@ -1352,24 +1352,24 @@ static void bar_pane_keywords_menu_popup(GtkWidget *, PaneKeywordsData *pkd, gin menu_item_add_divider(menu); text = g_strdup_printf(_("Edit \"%s\""), name); - menu_item_add_stock(menu, text, GTK_STOCK_EDIT, G_CALLBACK(bar_pane_keywords_edit_dialog_cb), pkd); + menu_item_add_icon(menu, text, GQ_ICON_EDIT, G_CALLBACK(bar_pane_keywords_edit_dialog_cb), pkd); g_free(text); text = g_strdup_printf(_("Remove \"%s\""), name); - menu_item_add_stock(menu, text, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_keywords_delete_cb), pkd); + menu_item_add_icon(menu, text, GQ_ICON_DELETE, G_CALLBACK(bar_pane_keywords_delete_cb), pkd); g_free(text); if (mark && mark[0]) { text = g_strdup_printf(_("Disconnect \"%s\" from mark %s"), name, mark); - menu_item_add_stock(menu, text, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_keywords_connect_mark_cb), pkd); + menu_item_add_icon(menu, text, GQ_ICON_DELETE, G_CALLBACK(bar_pane_keywords_connect_mark_cb), pkd); g_free(text); } if (keyword) { text = g_strdup_printf(_("Disconnect all Mark Keyword connections")); - menu_item_add_stock(menu, text, GTK_STOCK_DELETE, G_CALLBACK(bar_pane_keywords_disconnect_marks_cb), pkd); + menu_item_add_icon(menu, text, GQ_ICON_DELETE, G_CALLBACK(bar_pane_keywords_disconnect_marks_cb), pkd); g_free(text); } menu_item_add_divider(menu); diff --git a/src/bar-sort.cc b/src/bar-sort.cc index 1fd2d699..b5ae8ece 100644 --- a/src/bar-sort.cc +++ b/src/bar-sort.cc @@ -433,8 +433,8 @@ static void bar_filter_help_dialog() "sort_manager_operations", nullptr, TRUE, nullptr, nullptr); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO, "Sort Manager Operations", _("Additional operations utilising plugins\nmay be included by setting:\n\nX-Geeqie-Filter=true\n\nin the plugin file."), TRUE); - generic_dialog_add_button(gd, GTK_STOCK_HELP, nullptr, bar_filter_help_cb, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), bar_filter_help_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", NULL, TRUE); gtk_widget_show(gd->dialog); } @@ -573,7 +573,7 @@ static void bar_sort_add_cb(GtkWidget *button, gpointer data) sd->dialog = file_util_file_dlg(title, "add_bookmark", button, bar_sort_add_cancel_cb, sd); - file_dialog_add_button(sd->dialog, GTK_STOCK_OK, nullptr, bar_sort_add_ok_cb, TRUE); + file_dialog_add_button(sd->dialog, GQ_ICON_OK, "OK", bar_sort_add_ok_cb, TRUE); generic_dialog_add_message(GENERIC_DIALOG(sd->dialog), nullptr, title, nullptr, FALSE); @@ -743,13 +743,13 @@ static GtkWidget *bar_sort_new(LayoutWindow *lw, SortActionType action, tbar = pref_toolbar_new(sd->vbox, GTK_TOOLBAR_ICONS); DEBUG_NAME(tbar); - sd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, nullptr, FALSE, + sd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE, _("Add Bookmark"), G_CALLBACK(bar_sort_add_cb), sd); - sd->undo_button = pref_toolbar_button(tbar, GTK_STOCK_UNDO, nullptr, FALSE, + sd->undo_button = pref_toolbar_button(tbar, GQ_ICON_UNDO, _("Undo"), FALSE, _("Undo last image"), G_CALLBACK(bar_sort_undo_cb), sd); - sd->help_button = pref_toolbar_button(tbar, GTK_STOCK_HELP, nullptr, FALSE, + sd->help_button = pref_toolbar_button(tbar, GQ_ICON_HELP, _("Help"), FALSE, _("Functions additional to Copy and Move"), G_CALLBACK(bar_sort_help_cb), sd); diff --git a/src/bar.cc b/src/bar.cc index b00a7e02..ce15b5f5 100644 --- a/src/bar.cc +++ b/src/bar.cc @@ -385,19 +385,19 @@ static void bar_menu_popup(GtkWidget *widget) if (expander) { - menu_item_add_stock(menu, _("Move to _top"), GTK_STOCK_GOTO_TOP, G_CALLBACK(bar_expander_move_top_cb), expander); - menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP, G_CALLBACK(bar_expander_move_up_cb), expander); - menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(bar_expander_move_down_cb), expander); - menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander); + menu_item_add_icon(menu, _("Move to _top"), GQ_ICON_GO_TOP, G_CALLBACK(bar_expander_move_top_cb), expander); + menu_item_add_icon(menu, _("Move _up"), GQ_ICON_GO_UP, G_CALLBACK(bar_expander_move_up_cb), expander); + menu_item_add_icon(menu, _("Move _down"), GQ_ICON_GO_DOWN, G_CALLBACK(bar_expander_move_down_cb), expander); + menu_item_add_icon(menu, _("Move to _bottom"), GQ_ICON_GO_BOTTOM, G_CALLBACK(bar_expander_move_bottom_cb), expander); menu_item_add_divider(menu); if (gtk_expander_get_expanded(GTK_EXPANDER(expander)) && display_height_option) { - menu_item_add_stock(menu, _("Height..."), GTK_STOCK_PREFERENCES, G_CALLBACK(bar_expander_height_cb), expander); + menu_item_add_icon(menu, _("Height..."), GQ_ICON_PREFERENCES, G_CALLBACK(bar_expander_height_cb), expander); menu_item_add_divider(menu); } - menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(bar_expander_delete_cb), expander); + menu_item_add_icon(menu, _("Remove"), GQ_ICON_DELETE, G_CALLBACK(bar_expander_delete_cb), expander); menu_item_add_divider(menu); } @@ -417,7 +417,7 @@ static void bar_menu_add_popup(GtkWidget *widget) while (pane->id) { GtkWidget *item; - item = menu_item_add_stock(menu, _(pane->title), GTK_STOCK_ADD, G_CALLBACK(bar_expander_add_cb), bar); + item = menu_item_add_icon(menu, _(pane->title), GQ_ICON_ADD, G_CALLBACK(bar_expander_add_cb), bar); g_object_set_data(G_OBJECT(item), "pane_add_id", const_cast(pane->id)); pane++; } @@ -781,9 +781,8 @@ GtkWidget *bar_new(LayoutWindow *lw) DEBUG_NAME(add_box); gtk_box_pack_end(GTK_BOX(bd->widget), add_box, FALSE, FALSE, 0); tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS); - bd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, nullptr, FALSE, - _("Add Pane"), - G_CALLBACK(bar_menu_add_cb), bd); + bd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE, + _("Add Pane"), G_CALLBACK(bar_menu_add_cb), bd); gtk_widget_show(add_box); #ifdef HAVE_LIBCHAMPLAIN_GTK diff --git a/src/cache-maint.cc b/src/cache-maint.cc index cf5d4a2c..93838c10 100644 --- a/src/cache-maint.cc +++ b/src/cache-maint.cc @@ -385,10 +385,10 @@ void cache_maintain_home(gboolean metadata, gboolean clear, GtkWidget *parent) parent, FALSE, nullptr, cm); cm->gd->cancel_cb = cache_maintain_home_close_cb; - cm->button_close = generic_dialog_add_button(cm->gd, GTK_STOCK_CLOSE, nullptr, + cm->button_close = generic_dialog_add_button(cm->gd, GQ_ICON_CLOSE, _("Close"), cache_maintain_home_close_cb, FALSE); gtk_widget_set_sensitive(cm->button_close, FALSE); - cm->button_stop = generic_dialog_add_button(cm->gd, GTK_STOCK_STOP, nullptr, + cm->button_stop = generic_dialog_add_button(cm->gd, GQ_ICON_STOP, _("Stop"), cache_maintain_home_stop_cb, FALSE); generic_dialog_add_message(cm->gd, nullptr, msg, nullptr, FALSE); @@ -885,11 +885,11 @@ static void cache_manager_render_dialog(GtkWidget *widget, const gchar *path) nullptr, cd); gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1); cd->gd->cancel_cb = cache_manager_render_close_cb; - cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, nullptr, + cd->button_close = generic_dialog_add_button(cd->gd, GQ_ICON_CLOSE, _("Close"), cache_manager_render_close_cb, FALSE); - cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"), + cd->button_start = generic_dialog_add_button(cd->gd, GQ_ICON_OK, _("S_tart"), cache_manager_render_start_cb, FALSE); - cd->button_stop = generic_dialog_add_button(cd->gd, GTK_STOCK_STOP, nullptr, + cd->button_stop = generic_dialog_add_button(cd->gd, GQ_ICON_STOP, _("Stop"), cache_manager_render_stop_cb, FALSE); gtk_widget_set_sensitive(cd->button_stop, FALSE); @@ -1135,7 +1135,7 @@ static void cache_manager_standard_clean_start_cb(GenericDialog *gd, gpointer da static void cache_manager_standard_process(GtkWidget *widget, gboolean clear) { CacheOpsData *cd; - const gchar *stock_id; + const gchar *icon_name; const gchar *msg; cd = g_new0(CacheOpsData, 1); @@ -1144,12 +1144,12 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear) if (clear) { - stock_id = GTK_STOCK_DELETE; + icon_name = GQ_ICON_DELETE; msg = _("Clearing thumbnails..."); } else { - stock_id = GTK_STOCK_CLEAR; + icon_name = GQ_ICON_CLEAR; msg = _("Removing old thumbnails..."); } @@ -1158,15 +1158,15 @@ static void cache_manager_standard_process(GtkWidget *widget, gboolean clear) widget, FALSE, nullptr, cd); cd->gd->cancel_cb = cache_manager_standard_clean_close_cb; - cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, nullptr, + cd->button_close = generic_dialog_add_button(cd->gd, GQ_ICON_CLOSE, _("Close"), cache_manager_standard_clean_close_cb, FALSE); - cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"), + cd->button_start = generic_dialog_add_button(cd->gd, GQ_ICON_OK, _("S_tart"), cache_manager_standard_clean_start_cb, FALSE); - cd->button_stop = generic_dialog_add_button(cd->gd, GTK_STOCK_STOP, nullptr, + cd->button_stop = generic_dialog_add_button(cd->gd, GQ_ICON_STOP, _("Stop"), cache_manager_standard_clean_stop_cb, FALSE); gtk_widget_set_sensitive(cd->button_stop, FALSE); - generic_dialog_add_message(cd->gd, stock_id, msg, nullptr, FALSE); + generic_dialog_add_message(cd->gd, icon_name, msg, NULL, FALSE); cd->progress = gtk_progress_bar_new(); gtk_progress_bar_set_text(GTK_PROGRESS_BAR(cd->progress), _("click start to begin")); @@ -1231,7 +1231,7 @@ void cache_manager_main_clear_confirm(GtkWidget *parent) dummy_cancel_cb, nullptr); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear cache"), _("This will remove all thumbnails and sim. files\nthat have been saved to disk, continue?"), TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, cache_manager_main_clear_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", cache_manager_main_clear_ok_cb, TRUE); gtk_widget_show(gd->dialog); } @@ -1527,11 +1527,11 @@ static void cache_manager_sim_load_dialog(GtkWidget *widget, const gchar *path) cd->gd = generic_dialog_new(_("Create sim. files"), "create_sim_files", widget, FALSE, nullptr, cd); gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1); cd->gd->cancel_cb = cache_manager_sim_close_cb; - cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, nullptr, + cd->button_close = generic_dialog_add_button(cd->gd, GQ_ICON_CLOSE, _("Close"), cache_manager_sim_close_cb, FALSE); - cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"), + cd->button_start = generic_dialog_add_button(cd->gd, GQ_ICON_OK, _("S_tart"), cache_manager_sim_start_cb, FALSE); - cd->button_stop = generic_dialog_add_button(cd->gd, GTK_STOCK_STOP, nullptr, + cd->button_stop = generic_dialog_add_button(cd->gd, GQ_ICON_STOP, _("Stop"), cache_manager_sim_stop_cb, FALSE); gtk_widget_set_sensitive(cd->button_stop, FALSE); @@ -1646,9 +1646,9 @@ static void cache_manager_cache_maintenance_load_dialog(GtkWidget *widget, const cd->gd = generic_dialog_new(_("Background cache maintenance"), "background_cache_maintenance", widget, FALSE, nullptr, cd); gtk_window_set_default_size(GTK_WINDOW(cd->gd->dialog), PURGE_DIALOG_WIDTH, -1); cd->gd->cancel_cb = cache_manager_cache_maintenance_close_cb; - cd->button_close = generic_dialog_add_button(cd->gd, GTK_STOCK_CLOSE, nullptr, + cd->button_close = generic_dialog_add_button(cd->gd, GQ_ICON_CLOSE, _("Close"), cache_manager_cache_maintenance_close_cb, FALSE); - cd->button_start = generic_dialog_add_button(cd->gd, GTK_STOCK_OK, _("S_tart"), + cd->button_start = generic_dialog_add_button(cd->gd, GQ_ICON_OK, _("S_tart"), cache_manager_cache_maintenance_start_cb, FALSE); generic_dialog_add_message(cd->gd, nullptr, _("Recursively delete orphaned thumbnails\nand .sim files, and create new\nthumbnails and .sim files"), nullptr, FALSE); @@ -1702,9 +1702,9 @@ void cache_manager_show() gd = cache_manager->dialog; gd->cancel_cb = cache_manager_close_cb; - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), cache_manager_close_cb, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_HELP, nullptr, + generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), cache_manager_help_cb, FALSE); generic_dialog_add_message(gd, nullptr, _("Cache and Data Maintenance"), nullptr, FALSE); @@ -1717,12 +1717,12 @@ void cache_manager_show() table = pref_table_new(group, 2, 2, FALSE, FALSE); - button = pref_table_button(table, 0, 0, GTK_STOCK_CLEAR, _("Clean up"), FALSE, + button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"), G_CALLBACK(cache_manager_main_clean_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails and sim. files."), 0.0); - button = pref_table_button(table, 0, 1, GTK_STOCK_DELETE, _("Clear cache"), FALSE, + button = pref_table_button(table, 0, 1, GQ_ICON_DELETE, _("Clear cache"), G_CALLBACK(cache_manager_main_clear_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 1, _("Delete all cached data."), 0.0); @@ -1736,12 +1736,12 @@ void cache_manager_show() table = pref_table_new(group, 2, 2, FALSE, FALSE); - button = pref_table_button(table, 0, 0, GTK_STOCK_CLEAR, _("Clean up"), FALSE, + button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"), G_CALLBACK(cache_manager_standard_clean_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 0, _("Remove orphaned or outdated thumbnails."), 0.0); - button = pref_table_button(table, 0, 1, GTK_STOCK_DELETE, _("Clear cache"), FALSE, + button = pref_table_button(table, 0, 1, GQ_ICON_DELETE, _("Clear cache"), G_CALLBACK(cache_manager_standard_clear_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 1, _("Delete all cached thumbnails."), 0.0); @@ -1750,7 +1750,7 @@ void cache_manager_show() table = pref_table_new(group, 2, 1, FALSE, FALSE); - button = pref_table_button(table, 0, 1, "system-run", _("Render"), FALSE, + button = pref_table_button(table, 0, 1, GQ_ICON_RUN, _("Render"), G_CALLBACK(cache_manager_render_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 1, _("Render thumbnails for a specific folder."), 0.0); @@ -1760,7 +1760,7 @@ void cache_manager_show() table = pref_table_new(group, 3, 2, FALSE, FALSE); - button = pref_table_button(table, 0, 0, GTK_STOCK_EXECUTE, _("Create"), FALSE, + button = pref_table_button(table, 0, 0, GQ_ICON_RUN, _("Create"), G_CALLBACK(cache_manager_sim_load_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 0, _("Create sim. files recursively."), 0.0); @@ -1772,7 +1772,7 @@ void cache_manager_show() table = pref_table_new(group, 2, 1, FALSE, FALSE); - button = pref_table_button(table, 0, 0, GTK_STOCK_CLEAR, _("Clean up"), FALSE, + button = pref_table_button(table, 0, 0, GQ_ICON_CLEAR, _("Clean up"), G_CALLBACK(cache_manager_metadata_clean_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 0, _("Remove orphaned keywords and comments."), 0.0); @@ -1781,7 +1781,7 @@ void cache_manager_show() table = pref_table_new(group, 3, 2, FALSE, FALSE); - button = pref_table_button(table, 0, 0, GTK_STOCK_EXECUTE, _("Select"), FALSE, + button = pref_table_button(table, 0, 0, GQ_ICON_RUN, _("Select"), G_CALLBACK(cache_manager_cache_maintenance_load_cb), cache_manager); gtk_size_group_add_widget(sizegroup, button); pref_table_label(table, 1, 0, _("Run cache maintenance as a background job."), 0.0); diff --git a/src/collect-dlg.cc b/src/collect-dlg.cc index c4a7c795..26336b0f 100644 --- a/src/collect-dlg.cc +++ b/src/collect-dlg.cc @@ -80,7 +80,7 @@ static gboolean collection_save_confirmed(FileDialog *fd, gboolean overwrite, Co generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Overwrite existing file?"), fd->dest_path, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, _("_Overwrite"), collection_confirm_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, _("_Overwrite"), collection_confirm_ok_cb, TRUE); gtk_widget_show(gd->dialog); @@ -194,7 +194,7 @@ static void collection_save_or_load_dialog(const gchar *path, const gchar *title; const gchar *btntext; gpointer btnfunc; - const gchar *stock_id; + const gchar *icon_name; if (type == DIALOG_SAVE || type == DIALOG_SAVE_CLOSE) { @@ -202,14 +202,14 @@ static void collection_save_or_load_dialog(const gchar *path, title = _("Save collection"); btntext = nullptr; btnfunc = reinterpret_cast(collection_save_cb); - stock_id = GTK_STOCK_SAVE; + icon_name = GQ_ICON_SAVE; } else if (type == DIALOG_LOAD) { title = _("Open collection"); btntext = nullptr; btnfunc = reinterpret_cast(collection_load_cb); - stock_id = GTK_STOCK_OPEN; + icon_name = GQ_ICON_OPEN; } else { @@ -217,7 +217,7 @@ static void collection_save_or_load_dialog(const gchar *path, title = _("Append collection"); btntext = _("_Append"); btnfunc = reinterpret_cast(collection_append_cb); - stock_id = GTK_STOCK_ADD; + icon_name = GQ_ICON_ADD; } if (cd) collection_ref(cd); @@ -229,7 +229,7 @@ static void collection_save_or_load_dialog(const gchar *path, collection_save_or_load_dialog_close_cb, cd); generic_dialog_add_message(GENERIC_DIALOG(fd), nullptr, title, nullptr, FALSE); - file_dialog_add_button(fd, stock_id, btntext, reinterpret_cast(btnfunc), TRUE); + file_dialog_add_button(fd, icon_name, btntext, reinterpret_cast(btnfunc), TRUE); file_dialog_add_path_widgets(fd, get_collections_dir(), path, "collection_load_save", GQ_COLLECTION_EXT, _("Collection Files")); diff --git a/src/collect-table.cc b/src/collect-table.cc index 809c31d6..3d93a574 100644 --- a/src/collect-table.cc +++ b/src/collect-table.cc @@ -978,17 +978,17 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic menu_item_add_sensitive(menu, _("_View"), over_icon, G_CALLBACK(collection_table_popup_view_cb), ct); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, over_icon, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, over_icon, G_CALLBACK(collection_table_popup_view_new_cb), ct); - menu_item_add_stock(menu, _("Go to original"), GTK_STOCK_FIND, + menu_item_add_icon(menu, _("Go to original"), GQ_ICON_FIND, G_CALLBACK(collection_table_popup_goto_original_cb), ct); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, over_icon, + menu_item_add_icon_sensitive(menu, _("Rem_ove"), GQ_ICON_REMOVE, over_icon, G_CALLBACK(collection_table_popup_remove_cb), ct); - menu_item_add_stock(menu, _("Append from file selection"), GTK_STOCK_ADD, + menu_item_add_icon(menu, _("Append from file selection"), GQ_ICON_ADD, G_CALLBACK(collection_table_popup_add_file_selection_cb), ct); - menu_item_add_stock(menu, _("Append from collection..."), GTK_STOCK_OPEN, + menu_item_add_icon(menu, _("Append from collection..."), GQ_ICON_OPEN, G_CALLBACK(collection_table_popup_add_collection_cb), ct); menu_item_add_divider(menu); @@ -1012,7 +1012,7 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic gtk_widget_set_sensitive(item, over_icon); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, over_icon, + menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, over_icon, G_CALLBACK(collection_table_popup_copy_cb), ct); menu_item_add_sensitive(menu, _("_Move..."), over_icon, G_CALLBACK(collection_table_popup_move_cb), ct); @@ -1024,13 +1024,13 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic G_CALLBACK(collection_table_popup_copy_path_unquoted_cb), ct); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, over_icon, + _("Move to Trash"), GQ_ICON_DELETE, over_icon, G_CALLBACK(collection_table_popup_move_to_trash_cb), ct); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, over_icon, + _("_Delete"), GQ_ICON_DELETE_SHRED, over_icon, G_CALLBACK(collection_table_popup_delete_cb), ct); menu_item_add_divider(menu); @@ -1046,14 +1046,14 @@ static GtkWidget *collection_table_popup_menu(CollectTable *ct, gboolean over_ic menu_item_add_check(menu, _("Show star rating"), ct->show_stars, G_CALLBACK(collection_table_popup_show_stars_cb), ct); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Save collection"), GTK_STOCK_SAVE, + menu_item_add_icon(menu, _("_Save collection"), GQ_ICON_SAVE, G_CALLBACK(collection_table_popup_save_cb), ct); - menu_item_add_stock(menu, _("Save collection _as..."), GTK_STOCK_SAVE_AS, + menu_item_add_icon(menu, _("Save collection _as..."), GQ_ICON_SAVE_AS, G_CALLBACK(collection_table_popup_save_as_cb), ct); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Find duplicates..."), GTK_STOCK_FIND, + menu_item_add_icon(menu, _("_Find duplicates..."), GQ_ICON_FIND, G_CALLBACK(collection_table_popup_find_dupes_cb), ct); - menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, over_icon, + menu_item_add_icon_sensitive(menu, _("Print..."), GQ_ICON_PRINT, over_icon, G_CALLBACK(collection_table_popup_print_cb), ct); return menu; @@ -1227,7 +1227,7 @@ static gint page_height(CollectTable *ct) gint row_height; gint ret; - adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); + adj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(ct->listview)); page_size = static_cast(gtk_adjustment_get_page_increment(adj)); row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2; @@ -1656,7 +1656,7 @@ static void collection_table_scroll(CollectTable *ct, gboolean scroll) } else { - GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(ct->listview)); + GtkAdjustment *adj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(ct->listview)); widget_auto_scroll_start(ct->listview, adj, -1, options->thumbnails.max_height / 2, collection_table_auto_scroll_notify_cb, ct); } @@ -2228,16 +2228,16 @@ static GtkWidget *collection_table_drop_menu(CollectTable *ct) g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(collection_table_popup_destroy_cb), ct); - menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, nullptr, nullptr); + menu_item_add_stock(menu, _("Dropped list includes folders."), GQ_ICON_DND, nullptr, nullptr); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, + menu_item_add_icon(menu, _("_Add contents"), GQ_ICON_OK, G_CALLBACK(confirm_dir_list_add), ct); - menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, + menu_item_add_icon(menu, _("Add contents _recursive"), GQ_ICON_ADD, G_CALLBACK(confirm_dir_list_recurse), ct); - menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, + menu_item_add_icon(menu, _("_Skip folders"), GQ_ICON_REMOVE, G_CALLBACK(confirm_dir_list_skip), ct); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, nullptr, ct); + menu_item_add_icon(menu, _("Cancel"), GQ_ICON_CANCEL, nullptr, ct); return menu; } diff --git a/src/collect.cc b/src/collect.cc index b14c0080..78cc7ce7 100644 --- a/src/collect.cc +++ b/src/collect.cc @@ -1233,8 +1233,8 @@ static void collection_close_dlg_show(CollectWindow *cw) _("Close collection"), _("Collection has been modified.\nSave first?"), TRUE); - generic_dialog_add_button(gd, GTK_STOCK_SAVE, nullptr, collection_close_save_cb, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_DELETE, _("_Discard"), collection_close_close_cb, FALSE); + generic_dialog_add_button(gd, GQ_ICON_SAVE, _("Save"), collection_close_save_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_DELETE, _("_Discard"), collection_close_close_cb, FALSE); cw->close_dialog = gd->dialog; diff --git a/src/desktop-file.cc b/src/desktop-file.cc index 95611697..725cf7c7 100644 --- a/src/desktop-file.cc +++ b/src/desktop-file.cc @@ -218,7 +218,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name) gtk_box_pack_end(GTK_BOX(hbox), button_hbox, FALSE, FALSE, 0); gtk_widget_show(button_hbox); - ew->save_button = pref_button_new(nullptr, GTK_STOCK_SAVE, nullptr, FALSE, + ew->save_button = pref_button_new(nullptr, GQ_ICON_SAVE, _("Save"), G_CALLBACK(editor_window_save_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), ew->save_button); gtk_widget_set_can_default(ew->save_button, TRUE); @@ -226,7 +226,7 @@ static void editor_window_new(const gchar *src_path, const gchar *desktop_name) gtk_widget_show(ew->save_button); ct_button = ew->save_button; - button = pref_button_new(nullptr, GTK_STOCK_CLOSE, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(editor_window_close_cb), ew); gtk_container_add(GTK_CONTAINER(button_hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -341,7 +341,7 @@ static void editor_list_window_delete_cb(GtkWidget *, gpointer data) nullptr, TRUE, editor_list_window_delete_dlg_cancel, ewdl); - generic_dialog_add_button(ewl->gd, GTK_STOCK_DELETE, nullptr, editor_list_window_delete_dlg_ok_cb, TRUE); + generic_dialog_add_button(ewl->gd, GQ_ICON_DELETE, "Delete", editor_list_window_delete_dlg_ok_cb, TRUE); text = g_strdup_printf(_("About to delete the file:\n %s"), path); generic_dialog_add_message(ewl->gd, GTK_STOCK_DIALOG_QUESTION, @@ -559,20 +559,19 @@ static void editor_list_window_create() gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - - button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(editor_list_window_help_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_NEW, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_NEW, _("New"), G_CALLBACK(editor_list_window_new_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_EDIT, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_EDIT, _("Edit"), G_CALLBACK(editor_list_window_edit_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -580,7 +579,7 @@ static void editor_list_window_create() gtk_widget_show(button); ewl->edit_button = button; - button = pref_button_new(nullptr, GTK_STOCK_DELETE, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_DELETE, "Delete", G_CALLBACK(editor_list_window_delete_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -588,7 +587,7 @@ static void editor_list_window_create() gtk_widget_show(button); ewl->delete_button = button; - button = pref_button_new(nullptr, GTK_STOCK_CLOSE, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(editor_list_window_close_cb), ewl); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); diff --git a/src/dupe.cc b/src/dupe.cc index f5633515..381c0a61 100644 --- a/src/dupe.cc +++ b/src/dupe.cc @@ -379,6 +379,7 @@ static void dupe_window_update_progress(DupeWindow *dw, const gchar *status, gdo static void widget_set_cursor(GtkWidget *widget, gint icon) { GdkCursor *cursor; + GdkDisplay *display; if (!gtk_widget_get_window(widget)) return; @@ -388,7 +389,8 @@ static void widget_set_cursor(GtkWidget *widget, gint icon) } else { - cursor = gdk_cursor_new(static_cast(icon)); + display = gdk_display_get_default(); + cursor = gdk_cursor_new_for_display(display, static_cast(icon)); } gdk_window_set_cursor(gtk_widget_get_window(widget), cursor); @@ -3119,7 +3121,7 @@ static void dupe_display_stats(DupeWindow *dw, DupeItem *di) gd = file_util_gen_dlg("Image thumbprint debug info", "thumbprint", dw->window, TRUE, nullptr, nullptr); - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, TRUE); dupe_display_label(gd->vbox, "name:", di->fd->name); buf = text_from_size(di->fd->size); @@ -3500,7 +3502,7 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di) menu_item_add_sensitive(menu, _("_View"), on_row, G_CALLBACK(dupe_menu_view_cb), dw); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row, G_CALLBACK(dupe_menu_viewnew_cb), dw); menu_item_add_divider(menu); menu_item_add_sensitive(menu, _("Select all"), (dw->dupes != nullptr), @@ -3527,10 +3529,10 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di) G_CALLBACK(dupe_pop_menu_collections_cb), dw); gtk_widget_set_sensitive(item, on_row); - menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row, + menu_item_add_icon_sensitive(menu, _("Print..."), GQ_ICON_PRINT, on_row, G_CALLBACK(dupe_menu_print_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, on_row, + menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, on_row, G_CALLBACK(dupe_menu_copy_cb), dw); menu_item_add_sensitive(menu, _("_Move..."), on_row, G_CALLBACK(dupe_menu_move_cb), dw); @@ -3542,22 +3544,22 @@ static GtkWidget *dupe_menu_popup_main(DupeWindow *dw, DupeItem *di) G_CALLBACK(dupe_menu_copy_path_unquoted_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, on_row, + _("Move to Trash"), GQ_ICON_DELETE, on_row, G_CALLBACK(dupe_menu_move_to_trash_cb), dw); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, on_row, + _("_Delete"), GQ_ICON_DELETE_SHRED, on_row, G_CALLBACK(dupe_menu_delete_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row, + menu_item_add_icon_sensitive(menu, _("Rem_ove"), GQ_ICON_REMOVE, on_row, G_CALLBACK(dupe_menu_remove_cb), dw); - menu_item_add_stock_sensitive(menu, _("C_lear"), GTK_STOCK_CLEAR, (dw->list != nullptr), + menu_item_add_icon_sensitive(menu, _("C_lear"), GQ_ICON_CLEAR, (dw->list != nullptr), G_CALLBACK(dupe_menu_clear_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Close _window"), GTK_STOCK_CLOSE, + menu_item_add_icon(menu, _("Close _window"), GQ_ICON_CLOSE, G_CALLBACK(dupe_menu_close_cb), dw); return menu; @@ -3838,7 +3840,7 @@ static GtkWidget *dupe_menu_popup_second(DupeWindow *dw, DupeItem *di) menu_item_add_sensitive(menu, _("_View"), on_row, G_CALLBACK(dupe_second_menu_view_cb), dw); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row, G_CALLBACK(dupe_second_menu_viewnew_cb), dw); menu_item_add_divider(menu); menu_item_add_sensitive(menu, _("Select all"), notempty, @@ -3846,12 +3848,12 @@ static GtkWidget *dupe_menu_popup_second(DupeWindow *dw, DupeItem *di) menu_item_add_sensitive(menu, _("Select none"), notempty, G_CALLBACK(dupe_second_menu_select_none_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("Rem_ove"), GTK_STOCK_REMOVE, on_row, + menu_item_add_icon_sensitive(menu, _("Rem_ove"), GQ_ICON_REMOVE, on_row, G_CALLBACK(dupe_second_menu_remove_cb), dw); - menu_item_add_stock_sensitive(menu, _("C_lear"), GTK_STOCK_CLEAR, notempty, + menu_item_add_icon_sensitive(menu, _("C_lear"), GQ_ICON_CLEAR, notempty, G_CALLBACK(dupe_second_menu_clear_cb), dw); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Close _window"), GTK_STOCK_CLOSE, + menu_item_add_icon(menu, _("Close _window"), GQ_ICON_CLOSE, G_CALLBACK(dupe_menu_close_cb), dw); return menu; @@ -4782,18 +4784,18 @@ DupeWindow *dupe_window_new() gtk_box_pack_end(GTK_BOX(button_box), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE, G_CALLBACK(dupe_help_cb), nullptr); + button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(dupe_help_cb), nullptr); gtk_widget_set_tooltip_text(GTK_WIDGET(button), "F1"); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_STOP, nullptr, FALSE, G_CALLBACK(dupe_check_stop_cb), dw); + button = pref_button_new(nullptr, GQ_ICON_STOP, _("Stop"), G_CALLBACK(dupe_check_stop_cb), dw); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_CLOSE, nullptr, FALSE, G_CALLBACK(dupe_window_close_cb), dw); + button = pref_button_new(nullptr, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(dupe_window_close_cb), dw); gtk_widget_set_tooltip_text(GTK_WIDGET(button), "Ctrl-W"); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -4907,13 +4909,13 @@ static GtkWidget *dupe_confirm_dir_list(DupeWindow *dw, GList *list) g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(confirm_dir_list_destroy), d); - menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, nullptr, nullptr); + menu_item_add_stock(menu, _("Dropped list includes folders."), GQ_ICON_DND, nullptr, nullptr); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(confirm_dir_list_add), d); - menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(confirm_dir_list_recurse), d); - menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(confirm_dir_list_skip), d); + menu_item_add_icon(menu, _("_Add contents"), GQ_ICON_OK, G_CALLBACK(confirm_dir_list_add), d); + menu_item_add_icon(menu, _("Add contents _recursive"), GQ_ICON_ADD, G_CALLBACK(confirm_dir_list_recurse), d); + menu_item_add_icon(menu, _("_Skip folders"), GQ_ICON_REMOVE, G_CALLBACK(confirm_dir_list_skip), d); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(confirm_dir_list_cancel), d); + menu_item_add_icon(menu, _("Cancel"), GQ_ICON_CANCEL, G_CALLBACK(confirm_dir_list_cancel), d); return menu; } @@ -5330,7 +5332,6 @@ static void pop_menu_export(GList *, gpointer dupe_window, gpointer data) const gchar *title = "Export duplicates data"; const gchar *default_path = "/tmp/"; gchar *file_extension; - const gchar *stock_id; ExportDupesData *edd; const gchar *previous_path; @@ -5351,10 +5352,8 @@ static void pop_menu_export(GList *, gpointer dupe_window, gpointer data) return; } - stock_id = GTK_STOCK_SAVE; - generic_dialog_add_message(GENERIC_DIALOG(edd->dialog), nullptr, title, nullptr, FALSE); - file_dialog_add_button(edd->dialog, stock_id, nullptr, export_duplicates_data_save_cb, TRUE); + file_dialog_add_button(edd->dialog, GQ_ICON_SAVE, _("Save"), export_duplicates_data_save_cb, TRUE); previous_path = history_list_find_last_path_by_key("export_duplicates"); @@ -5389,10 +5388,10 @@ static GtkWidget *submenu_add_export(GtkWidget *menu, GtkWidget **menu_item, GCa submenu = gtk_menu_new(); g_object_set_data(G_OBJECT(submenu), "submenu_data", data); - menu_item_add_stock_sensitive(submenu, _("Export to csv"), - GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(0)); - menu_item_add_stock_sensitive(submenu, _("Export to tab-delimited"), - GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(1)); + menu_item_add_icon_sensitive(submenu, _("Export to csv"), + GQ_ICON_EXPORT, TRUE, G_CALLBACK(func), GINT_TO_POINTER(0)); + menu_item_add_icon_sensitive(submenu, _("Export to tab-delimited"), + GQ_ICON_EXPORT, TRUE, G_CALLBACK(func), GINT_TO_POINTER(1)); gtk_menu_item_set_submenu(GTK_MENU_ITEM(item), submenu); if (menu_item) *menu_item = item; diff --git a/src/editors.cc b/src/editors.cc index 8a60674d..8b982efa 100644 --- a/src/editors.cc +++ b/src/editors.cc @@ -588,11 +588,10 @@ static EditorVerboseData *editor_verbose_window(EditorData *ed, const gchar *tex buf = g_strdup_printf(_("Output of %s"), text); generic_dialog_add_message(vd->gd, nullptr, buf, nullptr, FALSE); g_free(buf); - - vd->button_stop = generic_dialog_add_button(vd->gd, "process-stop", nullptr, + vd->button_stop = generic_dialog_add_button(vd->gd, GQ_ICON_STOP, nullptr, editor_verbose_window_stop, FALSE); gtk_widget_set_sensitive(vd->button_stop, FALSE); - vd->button_close = generic_dialog_add_button(vd->gd, GTK_STOCK_CLOSE, nullptr, + vd->button_close = generic_dialog_add_button(vd->gd, GQ_ICON_CLOSE, _("Close"), editor_verbose_window_close, TRUE); gtk_widget_set_sensitive(vd->button_close, FALSE); diff --git a/src/fullscreen.cc b/src/fullscreen.cc index 5db1a901..d8493de6 100644 --- a/src/fullscreen.cc +++ b/src/fullscreen.cc @@ -45,13 +45,17 @@ enum { static void clear_mouse_cursor(GtkWidget *widget, gint state) { GdkWindow *window = gtk_widget_get_window(widget); + GdkDisplay *display; + if (!window) return; + display = gdk_display_get_default(); + if (state & FULLSCREEN_CURSOR_BUSY) { GdkCursor *cursor; - cursor = gdk_cursor_new(GDK_WATCH); + cursor = gdk_cursor_new_for_display(display, GDK_WATCH); gdk_window_set_cursor(window, cursor); g_object_unref(G_OBJECT(cursor)); } @@ -63,7 +67,7 @@ static void clear_mouse_cursor(GtkWidget *widget, gint state) { GdkCursor *cursor; - cursor = gdk_cursor_new(GDK_BLANK_CURSOR); + cursor = gdk_cursor_new_for_display(display, GDK_BLANK_CURSOR); gdk_window_set_cursor(window, cursor); g_object_unref(G_OBJECT(cursor)); } diff --git a/src/img-view.cc b/src/img-view.cc index f9a32745..0862cb64 100644 --- a/src/img-view.cc +++ b/src/img-view.cc @@ -1403,10 +1403,10 @@ static GtkWidget *view_popup_menu(ViewWindow *vw) g_object_set_data(G_OBJECT(menu), "window_keys", image_window_keys); g_object_set_data(G_OBJECT(menu), "accel_group", accel_group); - menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw); - menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw); - menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw); - menu_item_add_stock(menu, _("Zoom to fit"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw); + menu_item_add_icon(menu, _("Zoom _in"), GQ_ICON_ZOOM_IN, G_CALLBACK(view_zoom_in_cb), vw); + menu_item_add_icon(menu, _("Zoom _out"), GQ_ICON_ZOOM_OUT, G_CALLBACK(view_zoom_out_cb), vw); + menu_item_add_icon(menu, _("Zoom _1:1"), GQ_ICON_ZOOM_100, G_CALLBACK(view_zoom_1_1_cb), vw); + menu_item_add_icon(menu, _("Zoom to fit"), GQ_ICON_ZOOM_FIT, G_CALLBACK(view_zoom_fit_cb), vw); menu_item_add_divider(menu); editmenu_fd_list = view_window_get_fd_list(vw); @@ -1417,24 +1417,24 @@ static GtkWidget *view_popup_menu(ViewWindow *vw) submenu_add_alter(menu, G_CALLBACK(view_alter_cb), vw); - menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(view_new_window_cb), vw); + menu_item_add_icon(menu, _("View in _new window"), GQ_ICON_NEW, G_CALLBACK(view_new_window_cb), vw); item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(view_set_layout_path_cb), vw); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(view_copy_cb), vw); + menu_item_add_icon(menu, _("_Copy..."), GQ_ICON_COPY, G_CALLBACK(view_copy_cb), vw); menu_item_add(menu, _("_Move..."), G_CALLBACK(view_move_cb), vw); menu_item_add(menu, _("_Rename..."), G_CALLBACK(view_rename_cb), vw); menu_item_add(menu, _("_Copy path"), G_CALLBACK(view_copy_path_cb), vw); menu_item_add(menu, _("_Copy path unquoted"), G_CALLBACK(view_copy_path_unquoted_cb), vw); menu_item_add_divider(menu); - menu_item_add_stock(menu, + menu_item_add_icon(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, + _("Move to Trash"), GQ_ICON_DELETE, G_CALLBACK(view_move_to_trash_cb), vw); - menu_item_add_stock(menu, + menu_item_add_icon(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, + _("_Delete"), GQ_ICON_DELETE_SHRED, G_CALLBACK(view_delete_cb), vw); menu_item_add_divider(menu); @@ -1468,15 +1468,15 @@ static GtkWidget *view_popup_menu(ViewWindow *vw) if (vw->fs) { - menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(view_fullscreen_cb), vw); + menu_item_add_icon(menu, _("Exit _full screen"), GQ_ICON_LEAVE_FULLSCREEN, G_CALLBACK(view_fullscreen_cb), vw); } else { - menu_item_add(menu, _("_Full screen"), G_CALLBACK(view_fullscreen_cb), vw); + menu_item_add_icon(menu, _("_Full screen"), GQ_ICON_FULLSCREEN, G_CALLBACK(view_fullscreen_cb), vw); } menu_item_add_divider(menu); - menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(view_close_cb), vw); + menu_item_add_icon(menu, _("C_lose window"), GQ_ICON_CLOSE, G_CALLBACK(view_close_cb), vw); return menu; } @@ -1594,13 +1594,13 @@ static GtkWidget *view_confirm_dir_list(ViewWindow *vw, GList *list) g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(view_dir_list_destroy), d); - menu_item_add_stock(menu, _("Dropped list includes folders."), GTK_STOCK_DND_MULTIPLE, nullptr, nullptr); + menu_item_add_stock(menu, _("Dropped list includes folders."), GQ_ICON_DND, nullptr, nullptr); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("_Add contents"), GTK_STOCK_OK, G_CALLBACK(view_dir_list_add), d); - menu_item_add_stock(menu, _("Add contents _recursive"), GTK_STOCK_ADD, G_CALLBACK(view_dir_list_recurse), d); - menu_item_add_stock(menu, _("_Skip folders"), GTK_STOCK_REMOVE, G_CALLBACK(view_dir_list_skip), d); + menu_item_add_icon(menu, _("_Add contents"), GQ_ICON_OK, G_CALLBACK(view_dir_list_add), d); + menu_item_add_icon(menu, _("Add contents _recursive"), GQ_ICON_ADD, G_CALLBACK(view_dir_list_recurse), d); + menu_item_add_icon(menu, _("_Skip folders"), GQ_ICON_REMOVE, G_CALLBACK(view_dir_list_skip), d); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, G_CALLBACK(view_dir_list_cancel), d); + menu_item_add_icon(menu, _("Cancel"), GQ_ICON_CANCEL, G_CALLBACK(view_dir_list_cancel), d); return menu; } diff --git a/src/layout-image.cc b/src/layout-image.cc index d3bc4e2d..84fe604f 100644 --- a/src/layout-image.cc +++ b/src/layout-image.cc @@ -776,10 +776,10 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) g_object_set_data(G_OBJECT(menu), "window_keys", nullptr); g_object_set_data(G_OBJECT(menu), "accel_group", accel_group); - menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, G_CALLBACK(li_pop_menu_zoom_in_cb), lw); - menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, G_CALLBACK(li_pop_menu_zoom_out_cb), lw); - menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, G_CALLBACK(li_pop_menu_zoom_1_1_cb), lw); - menu_item_add_stock(menu, _("Zoom to fit"), GTK_STOCK_ZOOM_FIT, G_CALLBACK(li_pop_menu_zoom_fit_cb), lw); + menu_item_add_icon(menu, _("Zoom _in"), GQ_ICON_ZOOM_IN, G_CALLBACK(li_pop_menu_zoom_in_cb), lw); + menu_item_add_icon(menu, _("Zoom _out"), GQ_ICON_ZOOM_OUT, G_CALLBACK(li_pop_menu_zoom_out_cb), lw); + menu_item_add_icon(menu, _("Zoom _1:1"), GQ_ICON_ZOOM_100, G_CALLBACK(li_pop_menu_zoom_1_1_cb), lw); + menu_item_add_icon(menu, _("Zoom to fit"), GQ_ICON_ZOOM_FIT, G_CALLBACK(li_pop_menu_zoom_fit_cb), lw); menu_item_add_divider(menu); editmenu_fd_list = layout_image_get_fd_list(lw); @@ -790,13 +790,13 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) menu_item_add_divider(submenu); item = submenu_add_alter(menu, G_CALLBACK(li_pop_menu_alter_cb), lw); - item = menu_item_add_stock(menu, _("View in _new window"), GTK_STOCK_NEW, G_CALLBACK(li_pop_menu_new_cb), lw); + item = menu_item_add_icon(menu, _("View in _new window"), GQ_ICON_NEW, G_CALLBACK(li_pop_menu_new_cb), lw); if (!path || fullscreen) gtk_widget_set_sensitive(item, FALSE); item = menu_item_add(menu, _("_Go to directory view"), G_CALLBACK(li_set_layout_path_cb), lw); if (!path || li_check_if_current_path(lw, path)) gtk_widget_set_sensitive(item, FALSE); - item = menu_item_add_stock(menu, _("Open archive"), GTK_STOCK_OPEN, G_CALLBACK(li_open_archive_cb), lw); + item = menu_item_add_icon(menu, _("Open archive"), GQ_ICON_OPEN, G_CALLBACK(li_open_archive_cb), lw); if (!path || lw->image->image_fd->format_class != FORMAT_CLASS_ARCHIVE) { gtk_widget_set_sensitive(item, FALSE); @@ -804,7 +804,7 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) menu_item_add_divider(menu); - item = menu_item_add_stock(menu, _("_Copy..."), GTK_STOCK_COPY, G_CALLBACK(li_pop_menu_copy_cb), lw); + item = menu_item_add_icon(menu, _("_Copy..."), GQ_ICON_COPY, G_CALLBACK(li_pop_menu_copy_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); item = menu_item_add(menu, _("_Move..."), G_CALLBACK(li_pop_menu_move_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); @@ -816,14 +816,14 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) if (!path) gtk_widget_set_sensitive(item, FALSE); menu_item_add_divider(menu); - item = menu_item_add_stock(menu, + item = menu_item_add_icon(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, + _("Move to Trash"), GQ_ICON_DELETE, G_CALLBACK(li_pop_menu_move_to_trash_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); - item = menu_item_add_stock(menu, + item = menu_item_add_icon(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), "edit-delete", + _("_Delete"), GQ_ICON_DELETE_SHRED, G_CALLBACK(li_pop_menu_delete_cb), lw); if (!path) gtk_widget_set_sensitive(item, FALSE); menu_item_add_divider(menu); @@ -856,11 +856,11 @@ static GtkWidget *layout_image_pop_menu(LayoutWindow *lw) if (!fullscreen) { - menu_item_add(menu, _("_Full screen"), G_CALLBACK(li_pop_menu_full_screen_cb), lw); + menu_item_add_icon(menu, _("_Full screen"), GQ_ICON_FULLSCREEN, G_CALLBACK(li_pop_menu_full_screen_cb), lw); } else { - menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(li_pop_menu_full_screen_cb), lw); + menu_item_add_icon(menu, _("Exit _full screen"), GQ_ICON_LEAVE_FULLSCREEN, G_CALLBACK(li_pop_menu_full_screen_cb), lw); } menu_item_add_check(menu, _("GIF _animation"), lw->options.animate, G_CALLBACK(li_pop_menu_animate_cb), lw); diff --git a/src/layout-util.cc b/src/layout-util.cc index 2dba0642..bc5b2944 100644 --- a/src/layout-util.cc +++ b/src/layout-util.cc @@ -242,8 +242,8 @@ static void layout_menu_clear_marks_cb(GtkAction *, gpointer) generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, "Clear all marks?", "This will clear all marks for all images,\nincluding those linked to keywords", TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, layout_menu_clear_marks_ok_cb, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_HELP, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", layout_menu_clear_marks_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), clear_marks_help_cb, FALSE); gtk_widget_show(gd->dialog); @@ -605,7 +605,7 @@ static void layout_menu_write_rotate(GtkToggleAction *, gpointer data, gboolean "Image orientation", nullptr, TRUE, nullptr, nullptr); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_ERROR, "Image orientation", message->str, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", nullptr, TRUE); gtk_widget_show(gd->dialog); @@ -2393,7 +2393,7 @@ static void layout_menu_window_rename_cb(GtkWidget *, gpointer data) rw->lw = lw; rw->gd = generic_dialog_new(_("Rename window"), "rename_window", nullptr, FALSE, window_rename_cancel_cb, rw); - rw->button_ok = generic_dialog_add_button(rw->gd, GTK_STOCK_OK, _("OK"), window_rename_ok_cb, TRUE); + rw->button_ok = generic_dialog_add_button(rw->gd, GQ_ICON_OK, _("OK"), window_rename_ok_cb, TRUE); generic_dialog_add_message(rw->gd, nullptr, _("rename window"), nullptr, FALSE); @@ -2424,7 +2424,7 @@ static void layout_menu_window_delete_cb(GtkWidget *, gpointer data) dw->lw = lw; dw->gd = generic_dialog_new(_("Delete window"), "delete_window", nullptr, TRUE, window_delete_cancel_cb, dw); - dw->button_ok = generic_dialog_add_button(dw->gd, GTK_STOCK_OK, _("OK"), window_delete_ok_cb, TRUE); + dw->button_ok = generic_dialog_add_button(dw->gd, GQ_ICON_OK, _("OK"), window_delete_ok_cb, TRUE); generic_dialog_add_message(dw->gd, nullptr, _("Delete window layout"), nullptr, FALSE); @@ -2471,53 +2471,53 @@ static GtkActionEntry menu_entries[] = { { "WindowsMenu", nullptr, N_("_Windows"), nullptr, nullptr, CB(layout_menu_windows_menu_cb) }, { "HelpMenu", nullptr, N_("_Help"), nullptr, nullptr, nullptr }, - { "Copy", GTK_STOCK_COPY, N_("_Copy..."), "C", N_("Copy..."), CB(layout_menu_copy_cb) }, + { "Copy", GQ_ICON_COPY, N_("_Copy..."), "C", N_("Copy..."), CB(layout_menu_copy_cb) }, { "Move", PIXBUF_INLINE_ICON_MOVE, N_("_Move..."), "M", N_("Move..."), CB(layout_menu_move_cb) }, { "Rename", PIXBUF_INLINE_ICON_RENAME, N_("_Rename..."), "R", N_("Rename..."), CB(layout_menu_rename_cb) }, { "Delete", PIXBUF_INLINE_ICON_TRASH, N_("Move to Trash..."), "D", N_("Move to Trash..."), CB(layout_menu_move_to_trash_cb) }, { "DeleteAlt1", PIXBUF_INLINE_ICON_TRASH,N_("Move to Trash..."), "Delete", N_("Move to Trash..."), CB(layout_menu_move_to_trash_key_cb) }, { "DeleteAlt2", PIXBUF_INLINE_ICON_TRASH,N_("Move to Trash..."), "KP_Delete", N_("Move to Trash..."), CB(layout_menu_move_to_trash_key_cb) }, - { "PermanentDelete", GTK_STOCK_DELETE, N_("Delete..."), "Delete",N_("Delete..."), CB(layout_menu_delete_cb) }, + { "PermanentDelete", GQ_ICON_DELETE, N_("Delete..."), "Delete",N_("Delete..."), CB(layout_menu_delete_cb) }, { "SelectAll", PIXBUF_INLINE_ICON_SELECT_ALL, N_("Select _all"), "A", N_("Select all"), CB(layout_menu_select_all_cb) }, { "SelectNone", PIXBUF_INLINE_ICON_SELECT_NONE, N_("Select _none"), "A", N_("Select none"), CB(layout_menu_unselect_all_cb) }, { "SelectInvert", PIXBUF_INLINE_ICON_SELECT_INVERT, N_("_Invert Selection"), "I", N_("Invert Selection"), CB(layout_menu_invert_selection_cb) }, - { "CloseWindow", GTK_STOCK_CLOSE, N_("C_lose window"), "W", N_("Close window"), CB(layout_menu_close_cb) }, - { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "Q", N_("Quit"), CB(layout_menu_exit_cb) }, - { "FirstImage", GTK_STOCK_GOTO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) }, - { "PrevImage", GTK_STOCK_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, - { "PrevImageAlt1", GTK_STOCK_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, - { "PrevImageAlt2", GTK_STOCK_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, - { "NextImage", GTK_STOCK_GO_DOWN, N_("_Next Image"), "space", N_("Next Image"), CB(layout_menu_image_next_cb) }, - { "NextImageAlt1", GTK_STOCK_GO_DOWN, N_("_Next Image"), "Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) }, - - { "ImageForward", GTK_STOCK_GOTO_LAST, N_("Image Forward"), nullptr, N_("Forward in image history"), CB(layout_menu_image_forward_cb) }, - { "ImageBack", GTK_STOCK_GOTO_FIRST, N_("Image Back"), nullptr, N_("Back in image history"), CB(layout_menu_image_back_cb) }, - - { "FirstPage",GTK_STOCK_MEDIA_PREVIOUS, N_("_First Page"), nullptr, N_( "First Page of multi-page image"), CB(layout_menu_page_first_cb) }, - { "LastPage", GTK_STOCK_MEDIA_NEXT, N_("_Last Page"), nullptr, N_("Last Page of multi-page image"), CB(layout_menu_page_last_cb) }, - { "NextPage", GTK_STOCK_MEDIA_FORWARD, N_("_Next Page"), nullptr, N_("Next Page of multi-page image"), CB(layout_menu_page_next_cb) }, - { "PrevPage", GTK_STOCK_MEDIA_REWIND, N_("_Previous Page"), nullptr, N_("Previous Page of multi-page image"), CB(layout_menu_page_previous_cb) }, - - - { "NextImageAlt2", GTK_STOCK_GO_DOWN, N_("_Next Image"), "KP_Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) }, - { "LastImage", GTK_STOCK_GOTO_BOTTOM, N_("_Last Image"), "End", N_("Last Image"), CB(layout_menu_image_last_cb) }, - { "Back", GTK_STOCK_GO_BACK, N_("_Back"), nullptr, N_("Back in folder history"), CB(layout_menu_back_cb) }, - { "Forward", GTK_STOCK_GO_FORWARD, N_("_Forward"), nullptr, N_("Forward in folder history"), CB(layout_menu_forward_cb) }, - { "Home", GTK_STOCK_HOME, N_("_Home"), nullptr, N_("Home"), CB(layout_menu_home_cb) }, - { "Up", GTK_STOCK_GO_UP, N_("_Up"), nullptr, N_("Up one folder"), CB(layout_menu_up_cb) }, + { "CloseWindow", GQ_ICON_CLOSE, N_("C_lose window"), "W", N_("Close window"), CB(layout_menu_close_cb) }, + { "Quit", GQ_ICON_QUIT, N_("_Quit"), "Q", N_("Quit"), CB(layout_menu_exit_cb) }, + { "FirstImage", GQ_ICON_GO_TOP, N_("_First Image"), "Home", N_("First Image"), CB(layout_menu_image_first_cb) }, + { "PrevImage", GQ_ICON_GO_UP, N_("_Previous Image"), "BackSpace", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, + { "PrevImageAlt1", GQ_ICON_GO_UP, N_("_Previous Image"), "Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, + { "PrevImageAlt2", GQ_ICON_GO_UP, N_("_Previous Image"), "KP_Page_Up", N_("Previous Image"), CB(layout_menu_image_prev_cb) }, + { "NextImage", GQ_ICON_GO_DOWN, N_("_Next Image"), "space", N_("Next Image"), CB(layout_menu_image_next_cb) }, + { "NextImageAlt1", GQ_ICON_GO_DOWN, N_("_Next Image"), "Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) }, + + { "ImageForward", GQ_ICON_GO_LAST, N_("Image Forward"), nullptr, N_("Forward in image history"), CB(layout_menu_image_forward_cb) }, + { "ImageBack", GQ_ICON_GO_FIRST, N_("Image Back"), nullptr, N_("Back in image history"), CB(layout_menu_image_back_cb) }, + + { "FirstPage",GQ_ICON_PREV_PAGE, N_("_First Page"), nullptr, N_( "First Page of multi-page image"), CB(layout_menu_page_first_cb) }, + { "LastPage", GQ_ICON_NEXT_PAGE, N_("_Last Page"), nullptr, N_("Last Page of multi-page image"), CB(layout_menu_page_last_cb) }, + { "NextPage", GQ_ICON_FORWARD_PAGE, N_("_Next Page"), nullptr, N_("Next Page of multi-page image"), CB(layout_menu_page_next_cb) }, + { "PrevPage", GQ_ICON_BACK_PAGE, N_("_Previous Page"), nullptr, N_("Previous Page of multi-page image"), CB(layout_menu_page_previous_cb) }, + + + { "NextImageAlt2", GQ_ICON_GO_DOWN, N_("_Next Image"), "KP_Page_Down", N_("Next Image"), CB(layout_menu_image_next_cb) }, + { "LastImage", GQ_ICON_GO_BOTTOM, N_("_Last Image"), "End", N_("Last Image"), CB(layout_menu_image_last_cb) }, + { "Back", GQ_ICON_GO_PREV, N_("_Back"), nullptr, N_("Back in folder history"), CB(layout_menu_back_cb) }, + { "Forward", GQ_ICON_GO_NEXT, N_("_Forward"), nullptr, N_("Forward in folder history"), CB(layout_menu_forward_cb) }, + { "Home", GQ_ICON_HOME, N_("_Home"), nullptr, N_("Home"), CB(layout_menu_home_cb) }, + { "Up", GQ_ICON_GO_UP, N_("_Up"), nullptr, N_("Up one folder"), CB(layout_menu_up_cb) }, { "NewWindow", nullptr, N_("New window"), nullptr, N_("New window"), CB(layout_menu_window_cb) }, { "NewWindowDefault", nullptr, N_("default"), "N", N_("New window (default)"), CB(layout_menu_window_default_cb) }, { "NewWindowFromCurrent", nullptr, N_("from current"), nullptr, N_("from current"), CB(layout_menu_window_from_current_cb) }, - { "RenameWindow", GTK_STOCK_EDIT, N_("Rename window"), nullptr, N_("Rename window"), CB(layout_menu_window_rename_cb) }, - { "DeleteWindow", GTK_STOCK_DELETE, N_("Delete window"), nullptr, N_("Delete window"), CB(layout_menu_window_delete_cb) }, - { "NewCollection", GTK_STOCK_INDEX, N_("_New collection"), "C", N_("New collection"), CB(layout_menu_new_cb) }, - { "OpenCollection", GTK_STOCK_OPEN, N_("_Open collection..."), "O", N_("Open collection..."), CB(layout_menu_open_cb) }, + { "RenameWindow", GQ_ICON_EDIT, N_("Rename window"), nullptr, N_("Rename window"), CB(layout_menu_window_rename_cb) }, + { "DeleteWindow", GQ_ICON_DELETE, N_("Delete window"), nullptr, N_("Delete window"), CB(layout_menu_window_delete_cb) }, + { "NewCollection", GQ_ICON_COLLECTION, N_("_New collection"), "C", N_("New collection"), CB(layout_menu_new_cb) }, + { "OpenCollection", GQ_ICON_OPEN, N_("_Open collection..."), "O", N_("Open collection..."), CB(layout_menu_open_cb) }, { "OpenRecent", nullptr, N_("Open recen_t"), nullptr, N_("Open recent collection"), nullptr }, - { "Search", GTK_STOCK_FIND, N_("_Search..."), "F3", N_("Search..."), CB(layout_menu_search_cb) }, - { "FindDupes", GTK_STOCK_FIND, N_("_Find duplicates..."), "D", N_("Find duplicates..."), CB(layout_menu_dupes_cb) }, + { "Search", GQ_ICON_FIND, N_("_Search..."), "F3", N_("Search..."), CB(layout_menu_search_cb) }, + { "FindDupes", GQ_ICON_FIND, N_("_Find duplicates..."), "D", N_("Find duplicates..."), CB(layout_menu_dupes_cb) }, { "PanView", PIXBUF_INLINE_ICON_PANORAMA, N_("Pa_n view"), "J", N_("Pan view"), CB(layout_menu_pan_cb) }, - { "Print", GTK_STOCK_PRINT, N_("_Print..."), "P", N_("Print..."), CB(layout_menu_print_cb) }, - { "NewFolder", GTK_STOCK_DIRECTORY, N_("N_ew folder..."), "F", N_("New folder..."), CB(layout_menu_dir_cb) }, + { "Print", GQ_ICON_PRINT, N_("_Print..."), "P", N_("Print..."), CB(layout_menu_print_cb) }, + { "NewFolder", GQ_ICON_DIRECTORY, N_("N_ew folder..."), "F", N_("New folder..."), CB(layout_menu_dir_cb) }, { "EnableGrouping", nullptr, N_("Enable file _grouping"), nullptr, N_("Enable file grouping"), CB(layout_menu_enable_grouping_cb) }, { "DisableGrouping", nullptr, N_("Disable file groupi_ng"), nullptr, N_("Disable file grouping"), CB(layout_menu_disable_grouping_cb) }, { "CopyPath", nullptr, N_("_Copy path to clipboard"), nullptr, N_("Copy path to clipboard"), CB(layout_menu_copy_path_cb) }, @@ -2535,37 +2535,37 @@ static GtkActionEntry menu_entries[] = { { "Mirror", PIXBUF_INLINE_ICON_MIRROR, N_("_Mirror"), "M", N_("Image Mirror"), CB(layout_menu_alter_mirror_cb) }, { "Flip", PIXBUF_INLINE_ICON_FLIP, N_("_Flip"), "F", N_("Image Flip"), CB(layout_menu_alter_flip_cb) }, { "AlterNone", PIXBUF_INLINE_ICON_ORIGINAL, N_("_Original state"), "O", N_("Image rotate Original state"), CB(layout_menu_alter_none_cb) }, - { "Preferences", GTK_STOCK_PREFERENCES, N_("P_references..."), "O", N_("Preferences..."), CB(layout_menu_config_cb) }, - { "Plugins", GTK_STOCK_PREFERENCES, N_("Configure _Plugins..."), nullptr, N_("Configure Plugins..."), CB(layout_menu_editors_cb) }, - { "LayoutConfig", GTK_STOCK_PREFERENCES, N_("_Configure this window..."), nullptr, N_("Configure this window..."), CB(layout_menu_layout_config_cb) }, + { "Preferences", GQ_ICON_PREFERENCES, N_("P_references..."), "O", N_("Preferences..."), CB(layout_menu_config_cb) }, + { "Plugins", GQ_ICON_PREFERENCES, N_("Configure _Plugins..."), nullptr, N_("Configure Plugins..."), CB(layout_menu_editors_cb) }, + { "LayoutConfig", GQ_ICON_PREFERENCES, N_("_Configure this window..."), nullptr, N_("Configure this window..."), CB(layout_menu_layout_config_cb) }, { "Maintenance", PIXBUF_INLINE_ICON_MAINTENANCE, N_("_Cache maintenance..."), nullptr, N_("Cache maintenance..."), CB(layout_menu_remove_thumb_cb) }, { "Wallpaper", nullptr, N_("Set as _wallpaper"), nullptr, N_("Set as wallpaper"), CB(layout_menu_wallpaper_cb) }, - { "SaveMetadata", GTK_STOCK_SAVE, N_("_Save metadata"), "S", N_("Save metadata"), CB(layout_menu_metadata_write_cb) }, + { "SaveMetadata", GQ_ICON_SAVE, N_("_Save metadata"), "S", N_("Save metadata"), CB(layout_menu_metadata_write_cb) }, { "KeywordAutocomplete", nullptr, N_("Keyword autocomplete"), "K", N_("Keyword Autocomplete"), CB(layout_menu_keyword_autocomplete_cb) }, - { "ZoomInAlt1", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "KP_Add", N_("Zoom in"), CB(layout_menu_zoom_in_cb) }, - { "ZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "equal", N_("Zoom in"), CB(layout_menu_zoom_in_cb) }, - { "ZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "minus", N_("Zoom out"), CB(layout_menu_zoom_out_cb) }, - { "ZoomOutAlt1", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "KP_Subtract", N_("Zoom out"), CB(layout_menu_zoom_out_cb) }, - { "Zoom100", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "Z", N_("Zoom 1:1"), CB(layout_menu_zoom_1_1_cb) }, - { "Zoom100Alt1", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "KP_Divide", N_("Zoom 1:1"), CB(layout_menu_zoom_1_1_cb) }, - { "ZoomFitAlt1", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "KP_Multiply", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, - { "ZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "X", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, + { "ZoomInAlt1", GQ_ICON_ZOOM_IN, N_("Zoom _in"), "KP_Add", N_("Zoom in"), CB(layout_menu_zoom_in_cb) }, + { "ZoomIn", GQ_ICON_ZOOM_IN, N_("Zoom _in"), "equal", N_("Zoom in"), CB(layout_menu_zoom_in_cb) }, + { "ZoomOut", GQ_ICON_ZOOM_OUT, N_("Zoom _out"), "minus", N_("Zoom out"), CB(layout_menu_zoom_out_cb) }, + { "ZoomOutAlt1", GQ_ICON_ZOOM_OUT, N_("Zoom _out"), "KP_Subtract", N_("Zoom out"), CB(layout_menu_zoom_out_cb) }, + { "Zoom100", GQ_ICON_ZOOM_100, N_("Zoom _1:1"), "Z", N_("Zoom 1:1"), CB(layout_menu_zoom_1_1_cb) }, + { "Zoom100Alt1", GQ_ICON_ZOOM_100, N_("Zoom _1:1"), "KP_Divide", N_("Zoom 1:1"), CB(layout_menu_zoom_1_1_cb) }, + { "ZoomFitAlt1", GQ_ICON_ZOOM_FIT, N_("_Zoom to fit"), "KP_Multiply", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, + { "ZoomFit", GQ_ICON_ZOOM_FIT, N_("_Zoom to fit"), "X", N_("Zoom to fit"), CB(layout_menu_zoom_fit_cb) }, { "ZoomFillHor", PIXBUF_INLINE_ICON_ZOOMFILLHOR, N_("Fit _Horizontally"), "H", N_("Fit Horizontally"), CB(layout_menu_zoom_fit_hor_cb) }, { "ZoomFillVert", PIXBUF_INLINE_ICON_ZOOMFILLVERT, N_("Fit _Vertically"), "W", N_("Fit Vertically"), CB(layout_menu_zoom_fit_vert_cb) }, - { "Zoom200", GTK_STOCK_FILE, N_("Zoom _2:1"), nullptr, N_("Zoom 2:1"), CB(layout_menu_zoom_2_1_cb) }, - { "Zoom300", GTK_STOCK_FILE, N_("Zoom _3:1"), nullptr, N_("Zoom 3:1"), CB(layout_menu_zoom_3_1_cb) }, - { "Zoom400", GTK_STOCK_FILE, N_("Zoom _4:1"), nullptr, N_("Zoom 4:1"), CB(layout_menu_zoom_4_1_cb) }, - { "Zoom50", GTK_STOCK_FILE, N_("Zoom 1:2"), nullptr, N_("Zoom 1:2"), CB(layout_menu_zoom_1_2_cb) }, - { "Zoom33", GTK_STOCK_FILE, N_("Zoom 1:3"), nullptr, N_("Zoom 1:3"), CB(layout_menu_zoom_1_3_cb) }, - { "Zoom25", GTK_STOCK_FILE, N_("Zoom 1:4"), nullptr, N_("Zoom 1:4"), CB(layout_menu_zoom_1_4_cb) }, - { "ConnectZoomIn", GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "plus", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, - { "ConnectZoomInAlt1",GTK_STOCK_ZOOM_IN, N_("Zoom _in"), "KP_Add", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, - { "ConnectZoomOut", GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "underscore", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, - { "ConnectZoomOutAlt1",GTK_STOCK_ZOOM_OUT, N_("Zoom _out"), "KP_Subtract", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, - { "ConnectZoom100", GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "Z", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, - { "ConnectZoom100Alt1",GTK_STOCK_ZOOM_100, N_("Zoom _1:1"), "KP_Divide", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, - { "ConnectZoomFit", GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "X", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, - { "ConnectZoomFitAlt1",GTK_STOCK_ZOOM_FIT, N_("_Zoom to fit"), "KP_Multiply", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, + { "Zoom200", GQ_ICON_GENERIC, N_("Zoom _2:1"), nullptr, N_("Zoom 2:1"), CB(layout_menu_zoom_2_1_cb) }, + { "Zoom300", GQ_ICON_GENERIC, N_("Zoom _3:1"), nullptr, N_("Zoom 3:1"), CB(layout_menu_zoom_3_1_cb) }, + { "Zoom400", GQ_ICON_GENERIC, N_("Zoom _4:1"), nullptr, N_("Zoom 4:1"), CB(layout_menu_zoom_4_1_cb) }, + { "Zoom50", GQ_ICON_GENERIC, N_("Zoom 1:2"), nullptr, N_("Zoom 1:2"), CB(layout_menu_zoom_1_2_cb) }, + { "Zoom33", GQ_ICON_GENERIC, N_("Zoom 1:3"), nullptr, N_("Zoom 1:3"), CB(layout_menu_zoom_1_3_cb) }, + { "Zoom25", GQ_ICON_GENERIC, N_("Zoom 1:4"), nullptr, N_("Zoom 1:4"), CB(layout_menu_zoom_1_4_cb) }, + { "ConnectZoomIn", GQ_ICON_ZOOM_IN, N_("Zoom _in"), "plus", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, + { "ConnectZoomInAlt1",GQ_ICON_ZOOM_IN, N_("Zoom _in"), "KP_Add", N_("Connected Zoom in"), CB(layout_menu_connect_zoom_in_cb) }, + { "ConnectZoomOut", GQ_ICON_ZOOM_OUT, N_("Zoom _out"), "underscore", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, + { "ConnectZoomOutAlt1",GQ_ICON_ZOOM_OUT, N_("Zoom _out"), "KP_Subtract", N_("Connected Zoom out"), CB(layout_menu_connect_zoom_out_cb) }, + { "ConnectZoom100", GQ_ICON_ZOOM_100, N_("Zoom _1:1"), "Z", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, + { "ConnectZoom100Alt1",GQ_ICON_ZOOM_100, N_("Zoom _1:1"), "KP_Divide", N_("Connected Zoom 1:1"), CB(layout_menu_connect_zoom_1_1_cb) }, + { "ConnectZoomFit", GQ_ICON_ZOOM_FIT, N_("_Zoom to fit"), "X", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, + { "ConnectZoomFitAlt1",GQ_ICON_ZOOM_FIT, N_("_Zoom to fit"), "KP_Multiply", N_("Connected Zoom to fit"), CB(layout_menu_connect_zoom_fit_cb) }, { "ConnectZoomFillHor",nullptr, N_("Fit _Horizontally"), "H", N_("Connected Fit Horizontally"), CB(layout_menu_connect_zoom_fit_hor_cb) }, { "ConnectZoomFillVert",nullptr, N_("Fit _Vertically"), "W", N_("Connected Fit Vertically"), CB(layout_menu_connect_zoom_fit_vert_cb) }, { "ConnectZoom200", nullptr, N_("Zoom _2:1"), nullptr, N_("Connected Zoom 2:1"), CB(layout_menu_connect_zoom_2_1_cb) }, @@ -2575,28 +2575,28 @@ static GtkActionEntry menu_entries[] = { { "ConnectZoom33", nullptr, N_("Zoom 1:3"), nullptr, N_("Connected Zoom 1:3"), CB(layout_menu_connect_zoom_1_3_cb) }, { "ConnectZoom25", nullptr, N_("Zoom 1:4"), nullptr, N_("Connected Zoom 1:4"), CB(layout_menu_connect_zoom_1_4_cb) }, { "ViewInNewWindow", nullptr, N_("_View in new window"), "V", N_("View in new window"), CB(layout_menu_view_in_new_window_cb) }, - { "OpenArchive", GTK_STOCK_OPEN, N_("Open archive"), nullptr, N_("Open archive"), CB(layout_menu_open_archive_cb) }, - { "FullScreen", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, - { "FullScreenAlt1", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "V", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, - { "FullScreenAlt2", GTK_STOCK_FULLSCREEN, N_("F_ull screen"), "F11", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, - { "Escape", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Escape", N_("Leave full screen"), CB(layout_menu_escape_cb) }, - { "EscapeAlt1", GTK_STOCK_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Q", N_("Leave full screen"), CB(layout_menu_escape_cb) }, + { "OpenArchive", GQ_ICON_OPEN, N_("Open archive"), nullptr, N_("Open archive"), CB(layout_menu_open_archive_cb) }, + { "FullScreen", GQ_ICON_FULLSCREEN, N_("F_ull screen"), "F", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, + { "FullScreenAlt1", GQ_ICON_FULLSCREEN, N_("F_ull screen"), "V", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, + { "FullScreenAlt2", GQ_ICON_FULLSCREEN, N_("F_ull screen"), "F11", N_("Full screen"), CB(layout_menu_fullscreen_cb) }, + { "Escape", GQ_ICON_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Escape", N_("Leave full screen"), CB(layout_menu_escape_cb) }, + { "EscapeAlt1", GQ_ICON_LEAVE_FULLSCREEN,N_("_Leave full screen"), "Q", N_("Leave full screen"), CB(layout_menu_escape_cb) }, { "ImageOverlayCycle",nullptr, N_("_Cycle through overlay modes"), "I", N_("Cycle through Overlay modes"), CB(layout_menu_overlay_toggle_cb) }, { "HistogramChanCycle",nullptr, N_("Cycle through histogram ch_annels"),"K", N_("Cycle through histogram channels"), CB(layout_menu_histogram_toggle_channel_cb) }, { "HistogramModeCycle",nullptr, N_("Cycle through histogram mo_des"), "J", N_("Cycle through histogram modes"), CB(layout_menu_histogram_toggle_mode_cb) }, { "HideTools", PIXBUF_INLINE_ICON_HIDETOOLS, N_("_Hide file list"), "H", N_("Hide file list"), CB(layout_menu_hide_cb) }, - { "SlideShowPause", GTK_STOCK_MEDIA_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) }, - { "SlideShowFaster", GTK_STOCK_FILE, N_("Faster"), "equal", N_("Slideshow Faster"), CB(layout_menu_slideshow_faster_cb) }, - { "SlideShowSlower", GTK_STOCK_FILE, N_("Slower"), "minus", N_("Slideshow Slower"), CB(layout_menu_slideshow_slower_cb) }, - { "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "R", N_("Refresh"), CB(layout_menu_refresh_cb) }, - { "HelpContents", GTK_STOCK_HELP, N_("_Help manual"), "F1", N_("Help manual"), CB(layout_menu_help_cb) }, + { "SlideShowPause", GQ_ICON_PAUSE, N_("_Pause slideshow"), "P", N_("Pause slideshow"), CB(layout_menu_slideshow_pause_cb) }, + { "SlideShowFaster", GQ_ICON_GENERIC, N_("Faster"), "equal", N_("Slideshow Faster"), CB(layout_menu_slideshow_faster_cb) }, + { "SlideShowSlower", GQ_ICON_GENERIC, N_("Slower"), "minus", N_("Slideshow Slower"), CB(layout_menu_slideshow_slower_cb) }, + { "Refresh", GQ_ICON_REFRESH, N_("_Refresh"), "R", N_("Refresh"), CB(layout_menu_refresh_cb) }, + { "HelpContents", GQ_ICON_HELP, N_("_Help manual"), "F1", N_("Help manual"), CB(layout_menu_help_cb) }, { "HelpSearch", nullptr, N_("On-line help search"), nullptr, N_("On-line help search"), CB(layout_menu_help_search_cb) }, { "HelpShortcuts", nullptr, N_("_Keyboard shortcuts"), nullptr, N_("Keyboard shortcuts"), CB(layout_menu_help_keys_cb) }, { "HelpKbd", nullptr, N_("_Keyboard map"), nullptr, N_("Keyboard map"), CB(layout_menu_kbd_map_cb) }, { "HelpNotes", nullptr, N_("_Readme"), nullptr, N_("Readme"), CB(layout_menu_notes_cb) }, { "HelpChangeLog", nullptr, N_("_ChangeLog"), nullptr, N_("ChangeLog notes"), CB(layout_menu_changelog_cb) }, - { "SearchAndRunCommand", GTK_STOCK_FIND, N_("Search and Run command"), "slash", N_("Search commands by keyword and run them"), CB(layout_menu_search_and_run_cb) }, - { "About", GTK_STOCK_ABOUT, N_("_About"), nullptr, N_("About"), CB(layout_menu_about_cb) }, + { "SearchAndRunCommand", GQ_ICON_FIND, N_("Search and Run command"), "slash", N_("Search commands by keyword and run them"), CB(layout_menu_search_and_run_cb) }, + { "About", GQ_ICON_ABOUT, N_("_About"), nullptr, N_("About"), CB(layout_menu_about_cb) }, { "LogWindow", nullptr, N_("_Log Window"), nullptr, N_("Log Window"), CB(layout_menu_log_window_cb) }, { "ExifWin", PIXBUF_INLINE_ICON_EXIF, N_("_Exif window"), "E", N_("Exif window"), CB(layout_menu_bar_exif_cb) }, { "StereoCycle", nullptr, N_("_Cycle through stereo modes"), nullptr, N_("Cycle through stereo modes"), CB(layout_menu_stereo_mode_next_cb) }, @@ -2613,22 +2613,22 @@ static GtkToggleActionEntry menu_toggle_entries[] = { { "Thumbnails", PIXBUF_INLINE_ICON_THUMB,N_("Show _Thumbnails"), "T", N_("Show Thumbnails"), CB(layout_menu_thumb_cb), FALSE }, { "ShowMarks", PIXBUF_INLINE_ICON_MARKS, N_("Show _Marks"), "M", N_("Show Marks"), CB(layout_menu_marks_cb), FALSE }, { "ShowFileFilter", PIXBUF_INLINE_ICON_FILE_FILTER, N_("Show File Filter"), nullptr, N_("Show File Filter"), CB(layout_menu_file_filter_cb), FALSE }, - { "ShowInfoPixel", GTK_STOCK_COLOR_PICKER, N_("Pi_xel Info"), nullptr, N_("Show Pixel Info"), CB(layout_menu_info_pixel_cb), FALSE }, - { "IgnoreAlpha", GTK_STOCK_STRIKETHROUGH, N_("Hide _alpha"), "A", N_("Hide alpha channel"), CB(layout_menu_alter_ignore_alpha_cb), FALSE}, + { "ShowInfoPixel", GQ_ICON_SELECT_COLOR, N_("Pi_xel Info"), nullptr, N_("Show Pixel Info"), CB(layout_menu_info_pixel_cb), FALSE }, + { "IgnoreAlpha", GQ_ICON_STRIKETHROUGH, N_("Hide _alpha"), "A", N_("Hide alpha channel"), CB(layout_menu_alter_ignore_alpha_cb), FALSE}, { "FloatTools", PIXBUF_INLINE_ICON_FLOAT,N_("_Float file list"), "L", N_("Float file list"), CB(layout_menu_float_cb), FALSE }, { "HideToolbar", nullptr, N_("Hide tool_bar"), nullptr, N_("Hide toolbar"), CB(layout_menu_toolbar_cb), FALSE }, { "SBar", PIXBUF_INLINE_ICON_INFO, N_("_Info sidebar"), "K", N_("Info sidebar"), CB(layout_menu_bar_cb), FALSE }, { "SBarSort", PIXBUF_INLINE_ICON_SORT, N_("Sort _manager"), "S", N_("Sort manager"), CB(layout_menu_bar_sort_cb), FALSE }, { "HideBars", nullptr, N_("Hide Bars"), "grave", N_("Hide Bars"), CB(layout_menu_hide_bars_cb), FALSE }, - { "SlideShow", GTK_STOCK_MEDIA_PLAY, N_("Toggle _slideshow"), "S", N_("Toggle slideshow"), CB(layout_menu_slideshow_cb), FALSE }, - { "UseColorProfiles", GTK_STOCK_SELECT_COLOR, N_("Use _color profiles"), nullptr, N_("Use color profiles"), CB(layout_color_menu_enable_cb), FALSE}, + { "SlideShow", GQ_ICON_PLAY, N_("Toggle _slideshow"), "S", N_("Toggle slideshow"), CB(layout_menu_slideshow_cb), FALSE }, + { "UseColorProfiles", GQ_ICON_COLOR_MANAGEMENT, N_("Use _color profiles"), nullptr, N_("Use color profiles"), CB(layout_color_menu_enable_cb), FALSE}, { "UseImageProfile", nullptr, N_("Use profile from _image"), nullptr, N_("Use profile from image"), CB(layout_color_menu_use_image_cb), FALSE}, { "Grayscale", PIXBUF_INLINE_ICON_GRAYSCALE, N_("Toggle _grayscale"), "G", N_("Toggle grayscale"), CB(layout_menu_alter_desaturate_cb), FALSE}, { "ImageOverlay", nullptr, N_("Image _Overlay"), nullptr, N_("Image Overlay"), CB(layout_menu_overlay_cb), FALSE }, { "ImageHistogram", nullptr, N_("_Show Histogram"), nullptr, N_("Show Histogram"), CB(layout_menu_histogram_cb), FALSE }, { "RectangularSelection", PIXBUF_INLINE_ICON_SELECT_RECTANGLE, N_("Rectangular Selection"), "R", N_("Rectangular Selection"), CB(layout_menu_rectangular_selection_cb), FALSE }, { "Animate", nullptr, N_("_Animation"), "A", N_("Toggle animation"), CB(layout_menu_animate_cb), FALSE }, - { "ExifRotate", GTK_STOCK_ORIENTATION_PORTRAIT, N_("_Exif rotate"), "X", N_("Toggle Exif rotate"), CB(layout_menu_exif_rotate_cb), FALSE }, + { "ExifRotate", GQ_ICON_ROTATE, N_("_Exif rotate"), "X", N_("Toggle Exif rotate"), CB(layout_menu_exif_rotate_cb), FALSE }, { "DrawRectangle", PIXBUF_INLINE_ICON_DRAW_RECTANGLE, N_("Draw Rectangle"), nullptr, N_("Draw Rectangle"), CB(layout_menu_select_rectangle_cb), FALSE }, { "OverUnderExposed", PIXBUF_INLINE_ICON_EXPOSURE, N_("Over/Under Exposed"), "E", N_("Highlight over/under exposed"), CB(layout_menu_select_overunderexposed_cb), FALSE }, { "SplitPaneSync", PIXBUF_INLINE_SPLIT_PANE_SYNC, N_("Split Pane Sync"), nullptr, N_("Split Pane Sync"), CB(layout_menu_split_pane_sync_cb), FALSE }, @@ -3468,7 +3468,7 @@ void layout_toolbar_add(LayoutWindow *lw, ToolbarType type, const gchar *action) if (!gtk_action_group_get_action(lw->action_group_editors, action)) { GtkActionEntry entry = { action, - GTK_STOCK_MISSING_IMAGE, + GQ_ICON_MISSING_IMAGE, action, nullptr, nullptr, diff --git a/src/layout.cc b/src/layout.cc index d1c38870..9c6389a2 100644 --- a/src/layout.cc +++ b/src/layout.cc @@ -472,7 +472,7 @@ static GtkWidget *layout_sort_button(LayoutWindow *lw, GtkWidget *box) gtk_box_pack_start(GTK_BOX(box), frame, FALSE, FALSE, 0); gtk_widget_show(frame); - image = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON); button = gtk_button_new_with_label(sort_type_get_text(lw->sort_method)); gtk_button_set_image(GTK_BUTTON(button), image); g_signal_connect(G_OBJECT(button), "clicked", @@ -570,7 +570,7 @@ static GtkWidget *layout_zoom_button(LayoutWindow *lw, GtkWidget *box, gint size gtk_widget_show(frame); - image = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON); button = gtk_button_new_with_label("1:1"); gtk_button_set_image(GTK_BUTTON(button), image); g_signal_connect(G_OBJECT(button), "clicked", @@ -2279,7 +2279,7 @@ void layout_show_config_window(LayoutWindow *lw) gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - button = pref_button_new(nullptr, GTK_STOCK_OK, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_OK, "OK", G_CALLBACK(layout_config_ok_cb), lc); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -2288,25 +2288,25 @@ void layout_show_config_window(LayoutWindow *lw) ct_button = button; /* - button = pref_button_new(NULL, GTK_STOCK_SAVE, NULL, FALSE, + button = pref_button_new(NULL, GQ_ICON_SAVE, _("Save"), FALSE, G_CALLBACK(layout_config_save_cb), NULL); gtk_container_add(GTK_CONTAINER(hbox), button); GTK_WIDGET_SET_FLAGS(button, GTK_CAN_DEFAULT); gtk_widget_show(button); */ - button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(layout_config_help_cb), lc); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_APPLY, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_APPLY, _("Apply"), G_CALLBACK(layout_config_apply_cb), lc); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_CANCEL, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"), G_CALLBACK(layout_config_close_cb), lc); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -2336,7 +2336,7 @@ void layout_show_config_window(LayoutWindow *lw) gtk_box_pack_start(GTK_BOX(hbox), tabcomp, TRUE, TRUE, 0); gtk_widget_show(tabcomp); - button = pref_button_new(hbox, nullptr, _("Use current"), FALSE, + button = pref_button_new(hbox, nullptr, _("Use current"), G_CALLBACK(home_path_set_current_cb), lc); pref_checkbox_new_int(group, _("Show date in directories list view"), diff --git a/src/logwindow.cc b/src/logwindow.cc index dabe764e..3af30b82 100644 --- a/src/logwindow.cc +++ b/src/logwindow.cc @@ -489,8 +489,8 @@ static LogWindow *log_window_create(LayoutWindow *lw) logwin->search_entry_box = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(search_box), logwin->search_entry_box, FALSE, FALSE, 0); gtk_widget_show(logwin->search_entry_box); - gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_PRIMARY, "edit-find"); - gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_PRIMARY, GQ_ICON_FIND); + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(logwin->search_entry_box), GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_widget_show(search_box); gtk_widget_set_tooltip_text(logwin->search_entry_box, _("Search for text in log window")); g_signal_connect(logwin->search_entry_box, "icon-press", G_CALLBACK(search_entry_icon_cb), logwin); @@ -531,7 +531,7 @@ static LogWindow *log_window_create(LayoutWindow *lw) textbox = gtk_entry_new(); gtk_box_pack_start(GTK_BOX(hbox), textbox, FALSE, FALSE, 0); - gtk_entry_set_icon_from_icon_name(GTK_ENTRY(textbox), GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(textbox), GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_widget_show(textbox); g_signal_connect(G_OBJECT(textbox), "activate", G_CALLBACK(log_window_regexp_cb), logwin); diff --git a/src/main.cc b/src/main.cc index 375f4bbd..b5305eeb 100644 --- a/src/main.cc +++ b/src/main.cc @@ -1111,7 +1111,7 @@ static gint exit_confirm_dlg() generic_dialog_add_message(exit_dialog, GTK_STOCK_DIALOG_QUESTION, msg, _("Collections have been modified. Quit anyway?"), TRUE); g_free(msg); - generic_dialog_add_button(exit_dialog, GTK_STOCK_QUIT, nullptr, exit_confirm_exit_cb, TRUE); + generic_dialog_add_button(exit_dialog, GQ_ICON_QUIT, _("Quit"), exit_confirm_exit_cb, TRUE); gtk_widget_show(exit_dialog->dialog); diff --git a/src/main.h b/src/main.h index bb1ef3f9..4ba7354f 100644 --- a/src/main.h +++ b/src/main.h @@ -133,6 +133,89 @@ #define STAR_RATING_REJECTED 0x274C //Unicode Character 'Cross Mark' #define STAR_RATING_STAR 0x2738 //Unicode Character 'Heavy Eight Pointed Rectilinear Black Star' +#define GQ_ICON_ADD "list-add" +#define GQ_ICON_REMOVE "list-remove" +#define GQ_ICON_UNDO "edit-undo" +#define GQ_ICON_OPEN "document-open" +#define GQ_ICON_SAVE "document-save" +#define GQ_ICON_SAVE_AS "document-save-as" +#define GQ_ICON_NEW "document-new" +#define GQ_ICON_EDIT "document-edit" +#define GQ_ICON_REVERT "document-revert" +#define GQ_ICON_CLOSE "window-close" +#define GQ_ICON_RUN "system-run" +#define GQ_ICON_STOP "process-stop" +#define GQ_ICON_FULLSCREEN "view-fullscreen" +#define GQ_ICON_LEAVE_FULLSCREEN "view-restore" +#define GQ_ICON_REFRESH "view-refresh" +#define GQ_ICON_ABOUT "help-about" +#define GQ_ICON_QUIT "application-exit" +#define GQ_ICON_DELETE "edit-delete" +#define GQ_ICON_DELETE_SHRED "edit-delete-shred" +#define GQ_ICON_CLEAR "edit-clear" +#define GQ_ICON_COPY "edit-copy" +#define GQ_ICON_FIND "edit-find" +#define GQ_ICON_REPLACE "edit-find-replace" +#define GQ_ICON_PRINT "document-print" + +#define GQ_ICON_GO_TOP "go-top" +#define GQ_ICON_GO_BOTTOM "go-bottom" +#define GQ_ICON_GO_UP "go-up" +#define GQ_ICON_GO_DOWN "go-down" +#define GQ_ICON_GO_FIRST "go-first" +#define GQ_ICON_GO_LAST "go-last" +#define GQ_ICON_GO_PREV "go-previous" +#define GQ_ICON_GO_NEXT "go-next" +#define GQ_ICON_GO_JUMP "go-jump" +#define GQ_ICON_HOME "go-home" +#define GQ_ICON_PAN_DOWN "pan-down" +#define GQ_ICON_PAN_UP "pan-up" + +#define GQ_ICON_PREV_PAGE "media-skip-backward" +#define GQ_ICON_NEXT_PAGE "media-skip-forward" +#define GQ_ICON_BACK_PAGE "media-seek-backward" +#define GQ_ICON_FORWARD_PAGE "media-seek-forward" + +#define GQ_ICON_PLAY "media-playback-start" +#define GQ_ICON_PAUSE "media-playback-pause" + +#define GQ_ICON_ZOOM_IN "zoom-in" +#define GQ_ICON_ZOOM_OUT "zoom-out" +#define GQ_ICON_ZOOM_100 "zoom-original" +#define GQ_ICON_ZOOM_FIT "zoom-fit-best" + +// might need replacing +#define GQ_ICON_PREFERENCES "preferences-system" +#define GQ_ICON_HELP "help-contents" // "help-browser"? +#define GQ_ICON_EXPORT "document-export" // use collection icon? + +// not available in some themes? +#define GQ_ICON_OK "emblem-ok" +#define GQ_ICON_APPLY "emblem-ok" // need something else? +#define GQ_ICON_CANCEL "dialog-cancel" // missing in adwaita and others, seen in breeze +#define GQ_ICON_INFO "dialog-information" +#define GQ_ICON_QUESTION "dialog-question" +#define GQ_ICON_UNREADABLE "emblem-unreadable" +#define GQ_ICON_LINK "emblem-symbolic-link" +#define GQ_ICON_READONLY "emblem-readonly" + +#define GQ_ICON_ROTATE "object-rotate-left" +#define GQ_ICON_DIRECTORY "folder" +#define GQ_ICON_MISSING_IMAGE "image-missing" +#define GQ_ICON_STRIKETHROUGH "format-text-strikethrough" +#define GQ_ICON_FILE "text-x-generic" +#define GQ_ICON_GENERIC "text-x-generic" +#define GQ_ICON_SELECT_FONT "font-select" +#define GQ_ICON_SELECT_COLOR "color-select" +#define GQ_ICON_COLOR_MANAGEMENT "preferences-color" // breeze has nicer "color-management" icon, missing in others + +#define GQ_ICON_PROPERTIES "document-properties" +// not done... plus many more +#define GQ_ICON_COLLECTION GTK_STOCK_INDEX +#define GQ_ICON_DND GTK_STOCK_DND_MULTIPLE +// PIXBUF_INLINE_ICON_ZOOMFILLHOR +// PIXBUF_INLINE_ICON_ZOOMFILLVERT + /* *---------------------------------------------------------------------------- * main.cc diff --git a/src/menu.cc b/src/menu.cc index 20acc518..428f955c 100644 --- a/src/menu.cc +++ b/src/menu.cc @@ -452,7 +452,7 @@ GtkWidget *submenu_add_collections(GtkWidget *menu, GtkWidget **menu_item, g_object_set_data(G_OBJECT(submenu), "submenu_data", data); menu_item_add_stock_sensitive(submenu, _("New collection"), - GTK_STOCK_INDEX, TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1)); + GQ_ICON_COLLECTION, TRUE, G_CALLBACK(func), GINT_TO_POINTER(-1)); menu_item_add_divider(submenu); collect_manager_list(&collection_list,nullptr,nullptr); diff --git a/src/pan-view/pan-view-filter.cc b/src/pan-view/pan-view-filter.cc index e1f0594e..80b47854 100644 --- a/src/pan-view/pan-view-filter.cc +++ b/src/pan-view/pan-view-filter.cc @@ -93,7 +93,7 @@ PanViewFilterUi *pan_filter_ui_new(PanWindow *pw) hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); gtk_container_add(GTK_CONTAINER(ui->filter_button), hbox); gtk_widget_show(hbox); - ui->filter_button_arrow = gtk_image_new_from_icon_name("pan-up", GTK_ICON_SIZE_BUTTON); + ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(hbox), ui->filter_button_arrow, FALSE, FALSE, 0); gtk_widget_show(ui->filter_button_arrow); pref_label_new(hbox, _("Filter")); @@ -226,7 +226,7 @@ void pan_filter_toggle_cb(GtkWidget *button, gpointer data) parent = gtk_widget_get_parent(ui->filter_button_arrow); gtk_widget_destroy(ui->filter_button_arrow); - ui->filter_button_arrow = gtk_image_new_from_icon_name("pan-up", GTK_ICON_SIZE_BUTTON); + ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(parent), ui->filter_button_arrow, 0); @@ -240,7 +240,7 @@ void pan_filter_toggle_cb(GtkWidget *button, gpointer data) parent = gtk_widget_get_parent(ui->filter_button_arrow); gtk_widget_destroy(ui->filter_button_arrow); - ui->filter_button_arrow = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON); + ui->filter_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(parent), ui->filter_button_arrow, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(parent), ui->filter_button_arrow, 0); diff --git a/src/pan-view/pan-view-search.cc b/src/pan-view/pan-view-search.cc index 4d21789f..7a656153 100644 --- a/src/pan-view/pan-view-search.cc +++ b/src/pan-view/pan-view-search.cc @@ -59,7 +59,7 @@ PanViewSearchUi *pan_search_ui_new(PanWindow *pw) hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); gtk_container_add(GTK_CONTAINER(ui->search_button), hbox); gtk_widget_show(hbox); - ui->search_button_arrow = gtk_image_new_from_icon_name("pan-up", GTK_ICON_SIZE_BUTTON); + ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(hbox), ui->search_button_arrow, FALSE, FALSE, 0); gtk_widget_show(ui->search_button_arrow); pref_label_new(hbox, _("Find")); @@ -432,7 +432,7 @@ void pan_search_toggle_cb(GtkWidget *button, gpointer data) parent = gtk_widget_get_parent(ui->search_button_arrow); gtk_widget_destroy(ui->search_button_arrow); - ui->search_button_arrow = gtk_image_new_from_icon_name("pan-up", GTK_ICON_SIZE_BUTTON); + ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_UP, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(parent), ui->search_button_arrow, 0); @@ -446,7 +446,7 @@ void pan_search_toggle_cb(GtkWidget *button, gpointer data) parent = gtk_widget_get_parent(ui->search_button_arrow); gtk_widget_destroy(ui->search_button_arrow); - ui->search_button_arrow = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_BUTTON); + ui->search_button_arrow = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_BUTTON); gtk_box_pack_start(GTK_BOX(parent), ui->search_button_arrow, FALSE, FALSE, 0); gtk_box_reorder_child(GTK_BOX(parent), ui->search_button_arrow, 0); diff --git a/src/pan-view/pan-view.cc b/src/pan-view/pan-view.cc index 57424a0f..32b2462d 100644 --- a/src/pan-view/pan-view.cc +++ b/src/pan-view/pan-view.cc @@ -1674,8 +1674,6 @@ static void pan_window_image_scroll_notify_cb(PixbufRenderer *pr, gpointer data) gtk_adjustment_set_value(adj, static_cast(rect.x)); pref_signal_block_data(pw->scrollbar_h, pw); - gtk_adjustment_changed(adj); - gtk_adjustment_value_changed(adj); pref_signal_unblock_data(pw->scrollbar_h, pw); adj = gtk_range_get_adjustment(GTK_RANGE(pw->scrollbar_v)); @@ -1687,8 +1685,6 @@ static void pan_window_image_scroll_notify_cb(PixbufRenderer *pr, gpointer data) gtk_adjustment_set_value(adj, static_cast(rect.y)); pref_signal_block_data(pw->scrollbar_v, pw); - gtk_adjustment_changed(adj); - gtk_adjustment_value_changed(adj); pref_signal_unblock_data(pw->scrollbar_v, pw); } @@ -2031,7 +2027,7 @@ static gboolean pan_warning(FileData *dir_fd) gd = generic_dialog_new(_("Pan View Performance"), "pan_view_warning", nullptr, FALSE, nullptr, nullptr); gd->data = file_data_ref(dir_fd); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", pan_warning_ok_cb, TRUE); box = generic_dialog_add_message(gd, GTK_STOCK_DIALOG_INFO, @@ -2322,15 +2318,15 @@ static GtkWidget *pan_popup_menu(PanWindow *pw) g_object_set_data(G_OBJECT(menu), "window_keys", pan_view_window_keys); g_object_set_data(G_OBJECT(menu), "accel_group", accel_group); - menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video, + menu_item_add_icon_sensitive(menu, _("_Play"), GQ_ICON_PLAY, video, G_CALLBACK(pan_play_cb), pw); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Zoom _in"), GTK_STOCK_ZOOM_IN, + menu_item_add_icon(menu, _("Zoom _in"), GQ_ICON_ZOOM_IN, G_CALLBACK(pan_zoom_in_cb), pw); - menu_item_add_stock(menu, _("Zoom _out"), GTK_STOCK_ZOOM_OUT, + menu_item_add_icon(menu, _("Zoom _out"), GQ_ICON_ZOOM_OUT, G_CALLBACK(pan_zoom_out_cb), pw); - menu_item_add_stock(menu, _("Zoom _1:1"), GTK_STOCK_ZOOM_100, + menu_item_add_icon(menu, _("Zoom _1:1"), GQ_ICON_ZOOM_100, G_CALLBACK(pan_zoom_1_1_cb), pw); menu_item_add_divider(menu); @@ -2341,13 +2337,13 @@ static GtkWidget *pan_popup_menu(PanWindow *pw) submenu_add_edit(menu, &item, G_CALLBACK(pan_edit_cb), pw, editmenu_fd_list); gtk_widget_set_sensitive(item, active); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, active, G_CALLBACK(pan_new_window_cb), pw); - menu_item_add_stock(menu, _("Go to original"), GTK_STOCK_FIND, + menu_item_add_icon(menu, _("Go to original"), GQ_ICON_FIND, G_CALLBACK(pan_go_to_original_cb), pw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active, + menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, active, G_CALLBACK(pan_copy_cb), pw); menu_item_add_sensitive(menu, _("_Move..."), active, G_CALLBACK(pan_move_cb), pw); @@ -2359,13 +2355,13 @@ static GtkWidget *pan_popup_menu(PanWindow *pw) G_CALLBACK(pan_copy_path_unquoted_cb), pw); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, active, + _("Move to Trash"), GQ_ICON_DELETE, active, G_CALLBACK(pan_move_to_trash_cb), pw); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, active, + _("_Delete"), GQ_ICON_DELETE_SHRED, active, G_CALLBACK(pan_delete_cb), pw); menu_item_add_divider(menu); @@ -2418,15 +2414,15 @@ static GtkWidget *pan_popup_menu(PanWindow *pw) if (pw->fs) { - menu_item_add(menu, _("Exit _full screen"), G_CALLBACK(pan_fullscreen_cb), pw); + menu_item_add_icon(menu, _("Exit _full screen"), GQ_ICON_LEAVE_FULLSCREEN, G_CALLBACK(pan_fullscreen_cb), pw); } else { - menu_item_add(menu, _("_Full screen"), G_CALLBACK(pan_fullscreen_cb), pw); + menu_item_add_icon(menu, _("_Full screen"), GQ_ICON_FULLSCREEN, G_CALLBACK(pan_fullscreen_cb), pw); } menu_item_add_divider(menu); - menu_item_add_stock(menu, _("C_lose window"), GTK_STOCK_CLOSE, G_CALLBACK(pan_close_cb), pw); + menu_item_add_icon(menu, _("C_lose window"), GQ_ICON_CLOSE, G_CALLBACK(pan_close_cb), pw); return menu; } diff --git a/src/pixbuf-renderer.cc b/src/pixbuf-renderer.cc index 702156c0..0b4f44b7 100644 --- a/src/pixbuf-renderer.cc +++ b/src/pixbuf-renderer.cc @@ -620,16 +620,19 @@ static void pixbuf_renderer_get_property(GObject *object, guint prop_id, static void widget_set_cursor(GtkWidget *widget, gint icon) { GdkCursor *cursor; + GdkDisplay *display; if (!gtk_widget_get_window(widget)) return; + display = gdk_display_get_default(); + if (icon == -1) { cursor = nullptr; } else { - cursor = gdk_cursor_new(static_cast(icon)); + cursor = gdk_cursor_new_for_display(display, static_cast(icon)); } gdk_window_set_cursor(gtk_widget_get_window(widget), cursor); diff --git a/src/preferences.cc b/src/preferences.cc index 78793a69..a67939a3 100644 --- a/src/preferences.cc +++ b/src/preferences.cc @@ -770,43 +770,43 @@ struct UseableMouseItems { const gchar *name; /* GtkActionEntry terminology */ const gchar *label; - const gchar *stock_id; + const gchar *icon_name; }; static const UseableMouseItems useable_mouse_items[] = { {"", "", nullptr}, - {"FirstImage", N_("First Image"), GTK_STOCK_GOTO_TOP}, - {"PrevImage", N_("Previous Image"), GTK_STOCK_GO_UP}, - {"NextImage", N_("Next Image"), GTK_STOCK_GO_DOWN}, - {"LastImage", N_("Last Image"), GTK_STOCK_GOTO_BOTTOM}, - {"Back", N_("Back"), GTK_STOCK_GO_BACK}, - {"Forward", N_("Forward"), GTK_STOCK_GO_FORWARD}, - {"Home", N_("Home"), GTK_STOCK_HOME}, - {"Up", N_("Up"), GTK_STOCK_GO_UP}, - {"FirstPage", N_("First page"), GTK_STOCK_MEDIA_PREVIOUS}, - {"LastPage", N_("Last Page"), GTK_STOCK_MEDIA_NEXT}, - {"NextPage", N_("Next page"), GTK_STOCK_MEDIA_FORWARD}, - {"PrevPage", N_("Previous Page"), GTK_STOCK_MEDIA_REWIND}, - {"NewWindow", N_("New _window"), GTK_STOCK_NEW}, - {"NewCollection", N_("New collection"), GTK_STOCK_INDEX}, - {"OpenCollection", N_("Open collection"), GTK_STOCK_OPEN}, - {"Search", N_("Search"), GTK_STOCK_FIND}, - {"FindDupes", N_("Find duplicates"), GTK_STOCK_FIND}, - {"NewFolder", N_("New folder"),GTK_STOCK_DIRECTORY}, - {"Copy", N_("Copy"), GTK_STOCK_COPY}, + {"FirstImage", N_("First Image"), GQ_ICON_GO_TOP}, + {"PrevImage", N_("Previous Image"), GQ_ICON_GO_UP}, + {"NextImage", N_("Next Image"), GQ_ICON_GO_DOWN}, + {"LastImage", N_("Last Image"), GQ_ICON_GO_BOTTOM}, + {"Back", N_("Back"), GQ_ICON_GO_PREV}, + {"Forward", N_("Forward"), GQ_ICON_GO_NEXT}, + {"Home", N_("Home"), GQ_ICON_HOME}, + {"Up", N_("Up"), GQ_ICON_GO_UP}, + {"FirstPage", N_("First page"), GQ_ICON_PREV_PAGE}, + {"LastPage", N_("Last Page"), GQ_ICON_NEXT_PAGE}, + {"NextPage", N_("Next page"), GQ_ICON_FORWARD_PAGE}, + {"PrevPage", N_("Previous Page"), GQ_ICON_BACK_PAGE}, + {"NewWindow", N_("New _window"), GQ_ICON_NEW}, + {"NewCollection", N_("New collection"), GQ_ICON_COLLECTION}, + {"OpenCollection", N_("Open collection"), GQ_ICON_OPEN}, + {"Search", N_("Search"), GQ_ICON_FIND}, + {"FindDupes", N_("Find duplicates"), GQ_ICON_FIND}, + {"NewFolder", N_("New folder"),GQ_ICON_DIRECTORY}, + {"Copy", N_("Copy"), GQ_ICON_COPY}, {"Move", N_("Move"), PIXBUF_INLINE_ICON_MOVE}, {"Rename", N_("Rename"), PIXBUF_INLINE_ICON_RENAME}, - {"Delete", N_("Delete"), GTK_STOCK_DELETE}, - {"CloseWindow", N_("Close Window"), GTK_STOCK_CLOSE}, + {"Delete", N_("Delete"), GQ_ICON_DELETE}, + {"CloseWindow", N_("Close Window"), GQ_ICON_CLOSE}, {"PanView", N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA}, {"SelectAll", N_("Select all"), PIXBUF_INLINE_ICON_SELECT_ALL}, {"SelectNone", N_("Select none"), PIXBUF_INLINE_ICON_SELECT_NONE}, {"SelectInvert", N_("Select invert"), PIXBUF_INLINE_ICON_SELECT_INVERT}, {"ShowFileFilter", N_("Show file filter"), PIXBUF_INLINE_ICON_FILE_FILTER}, {"RectangularSelection", N_("Select rectangle"), PIXBUF_INLINE_ICON_SELECT_RECTANGLE}, - {"Print", N_("Print"), GTK_STOCK_PRINT}, - {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES}, - {"LayoutConfig", N_("Configure this window"), GTK_STOCK_PREFERENCES}, + {"Print", N_("Print"), GQ_ICON_PRINT}, + {"Preferences", N_("Preferences"), GQ_ICON_PREFERENCES}, + {"LayoutConfig", N_("Configure this window"), GQ_ICON_PREFERENCES}, {"Maintenance", N_("Cache maintenance"), PIXBUF_INLINE_ICON_MAINTENANCE}, {"RotateCW", N_("Rotate clockwise 90°"), PIXBUF_INLINE_ICON_CW}, {"RotateCCW", N_("Rotate counterclockwise 90°"), PIXBUF_INLINE_ICON_CCW}, @@ -814,28 +814,28 @@ static const UseableMouseItems useable_mouse_items[] = { {"Mirror", N_("Mirror"), PIXBUF_INLINE_ICON_MIRROR}, {"Flip", N_("Flip"), PIXBUF_INLINE_ICON_FLIP}, {"AlterNone", N_("Original state"), PIXBUF_INLINE_ICON_ORIGINAL}, - {"ZoomIn", N_("Zoom in"), GTK_STOCK_ZOOM_IN}, - {"ZoomOut", N_("Zoom out"), GTK_STOCK_ZOOM_OUT}, - {"Zoom100", N_("Zoom 1:1"), GTK_STOCK_ZOOM_100}, - {"ZoomFit", N_("Zoom to fit"), GTK_STOCK_ZOOM_FIT}, + {"ZoomIn", N_("Zoom in"), GQ_ICON_ZOOM_IN}, + {"ZoomOut", N_("Zoom out"), GQ_ICON_ZOOM_OUT}, + {"Zoom100", N_("Zoom 1:1"), GQ_ICON_ZOOM_100}, + {"ZoomFit", N_("Zoom to fit"), GQ_ICON_ZOOM_FIT}, {"ZoomFillHor", N_("Fit Horizontaly"), PIXBUF_INLINE_ICON_ZOOMFILLHOR}, {"ZoomFillVert", N_("Fit vertically"), PIXBUF_INLINE_ICON_ZOOMFILLVERT}, - {"Zoom200", N_("Zoom 2:1"), GTK_STOCK_FILE}, - {"Zoom300", N_("Zoom 3:1"), GTK_STOCK_FILE}, - {"Zoom400", N_("Zoom 4:1"), GTK_STOCK_FILE}, - {"Zoom50", N_("Zoom 1:2"), GTK_STOCK_FILE}, - {"Zoom33", N_("Zoom1:3"), GTK_STOCK_FILE}, - {"Zoom25", N_("Zoom 1:4"), GTK_STOCK_FILE}, - {"ConnectZoomIn", N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN}, + {"Zoom200", N_("Zoom 2:1"), GQ_ICON_GENERIC}, + {"Zoom300", N_("Zoom 3:1"), GQ_ICON_GENERIC}, + {"Zoom400", N_("Zoom 4:1"), GQ_ICON_GENERIC}, + {"Zoom50", N_("Zoom 1:2"), GQ_ICON_GENERIC}, + {"Zoom33", N_("Zoom 1:3"), GQ_ICON_GENERIC}, + {"Zoom25", N_("Zoom 1:4"), GQ_ICON_GENERIC}, + {"ConnectZoomIn", N_("Connected Zoom in"), GQ_ICON_ZOOM_IN}, {"SplitPaneSync", N_("Split Pane Sync"), PIXBUF_INLINE_SPLIT_PANE_SYNC}, {"Grayscale", N_("Grayscale"), PIXBUF_INLINE_ICON_GRAYSCALE}, {"OverUnderExposed", N_("Over Under Exposed"), PIXBUF_INLINE_ICON_EXPOSURE}, {"HideTools", N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS}, - {"SlideShowPause", N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE}, - {"SlideShowFaster", N_("Slideshow Faster"), GTK_STOCK_FILE}, - {"SlideShowSlower", N_("Slideshow Slower"), GTK_STOCK_FILE}, - {"Refresh", N_("Refresh"), GTK_STOCK_REFRESH}, - {"HelpContents", N_("Help"), GTK_STOCK_HELP}, + {"SlideShowPause", N_("Pause slideshow"), GQ_ICON_PAUSE}, + {"SlideShowFaster", N_("Slideshow Faster"), GQ_ICON_GENERIC}, + {"SlideShowSlower", N_("Slideshow Slower"), GQ_ICON_GENERIC}, + {"Refresh", N_("Refresh"), GQ_ICON_REFRESH}, + {"HelpContents", N_("Help"), GQ_ICON_HELP}, {"ExifWin", N_("Exif window"), PIXBUF_INLINE_ICON_EXIF}, {"Thumbnails", N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB}, {"ShowMarks", N_("Show marks"), PIXBUF_INLINE_ICON_MARKS}, @@ -843,7 +843,7 @@ static const UseableMouseItems useable_mouse_items[] = { {"FloatTools", N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT}, {"SBar", N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO}, {"SBarSort", N_("Sort manager"), PIXBUF_INLINE_ICON_SORT}, - {"Quit", N_("Quit"), GTK_STOCK_QUIT}, + {"Quit", N_("Quit"), GQ_ICON_QUIT}, {nullptr, nullptr, nullptr} }; @@ -1425,7 +1425,7 @@ static void filter_default_cb(GtkWidget *widget, gpointer data) dummy_cancel_cb, data); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset filters"), _("This will reset the file filters to the defaults.\nContinue?"), TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, filter_default_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", filter_default_ok_cb, TRUE); gtk_widget_show(gd->dialog); } @@ -1456,7 +1456,7 @@ static void safe_delete_clear_cb(GtkWidget *widget, gpointer) dummy_cancel_cb, nullptr); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Clear trash"), _("This will remove the trash contents."), FALSE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, safe_delete_clear_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", safe_delete_clear_ok_cb, TRUE); entry = gtk_entry_new(); gtk_widget_set_can_focus(entry, FALSE); gtk_editable_set_editable(GTK_EDITABLE(entry), FALSE); @@ -1504,7 +1504,7 @@ static void image_overlay_default_template_cb(GtkWidget *widget, gpointer data) dummy_cancel_cb, data); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_QUESTION, _("Reset image overlay template string"), _("This will reset the image overlay template string to the default.\nContinue?"), TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, image_overlay_default_template_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", image_overlay_default_template_ok_cb, TRUE); gtk_widget_show(gd->dialog); } @@ -2034,18 +2034,18 @@ static void config_tab_general(GtkWidget *notebook) gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0); gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15); gtk_widget_show(star_rating_entry); - button = pref_button_new(nullptr, nullptr, _("Set"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Set"), G_CALLBACK(star_rating_star_test_cb), hbox); gtk_widget_set_tooltip_text(button, _("Display selected character")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet.")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry), - GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry), - GTK_ENTRY_ICON_PRIMARY, "document-revert"); + GTK_ENTRY_ICON_PRIMARY, GQ_ICON_REVERT); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry), GTK_ENTRY_ICON_PRIMARY, _("Default")); g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press", @@ -2066,18 +2066,18 @@ static void config_tab_general(GtkWidget *notebook) gtk_box_pack_start(GTK_BOX(hbox), star_rating_entry, FALSE, FALSE, 0); gtk_entry_set_width_chars(GTK_ENTRY(star_rating_entry), 15); gtk_widget_show(star_rating_entry); - button = pref_button_new(nullptr, nullptr, _("Set"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Set"), G_CALLBACK(star_rating_rejected_test_cb), hbox); gtk_widget_set_tooltip_text(button, _("Display selected character")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); gtk_widget_set_tooltip_text(star_rating_entry, _("Hexadecimal representation of a Unicode character. A list of all Unicode characters may be found on the Internet.")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry), - GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(star_rating_entry), - GTK_ENTRY_ICON_PRIMARY, "document-revert"); + GTK_ENTRY_ICON_PRIMARY, GQ_ICON_REVERT); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(star_rating_entry), GTK_ENTRY_ICON_PRIMARY, _("Default")); g_signal_connect(GTK_ENTRY(star_rating_entry), "icon-press", @@ -2179,11 +2179,11 @@ static void config_tab_general(GtkWidget *notebook) if (isfile(tz->timezone_database_user)) { - button = pref_button_new(GTK_WIDGET(hbox), nullptr, _("Update"), FALSE, G_CALLBACK(timezone_database_install_cb), tz); + button = pref_button_new(GTK_WIDGET(hbox), nullptr, _("Update"), G_CALLBACK(timezone_database_install_cb), tz); } else { - button = pref_button_new(GTK_WIDGET(hbox), nullptr, _("Install"), FALSE, G_CALLBACK(timezone_database_install_cb), tz); + button = pref_button_new(GTK_WIDGET(hbox), nullptr, _("Install"), G_CALLBACK(timezone_database_install_cb), tz); } download_locn = g_strconcat(_("Download database from: "), TIMEZONE_DATABASE_WEB, NULL); @@ -2212,11 +2212,11 @@ static void config_tab_general(GtkWidget *notebook) gtk_widget_set_tooltip_text(help_search_engine_entry, _("The format varies between search engines, e.g the format may be:\nhttps://www.search_engine.com/search?q=site:geeqie.org/help\nhttps://www.search_engine.com/?q=site:geeqie.org/help")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(help_search_engine_entry), - GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear")); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(help_search_engine_entry), - GTK_ENTRY_ICON_PRIMARY, "document-revert"); + GTK_ENTRY_ICON_PRIMARY, GQ_ICON_REVERT); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(help_search_engine_entry), GTK_ENTRY_ICON_PRIMARY, _("Default")); g_signal_connect(GTK_ENTRY(help_search_engine_entry), "icon-press", @@ -2392,7 +2392,7 @@ static void config_tab_windows(GtkWidget *notebook) subgroup = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_SPACE); pref_label_new(subgroup, _("Use current layout for default: ")); - button = pref_button_new(subgroup, nullptr, _("Set"), FALSE, G_CALLBACK(save_default_window_layout_cb), nullptr); + button = pref_button_new(subgroup, nullptr, _("Set"), G_CALLBACK(save_default_window_layout_cb), nullptr); GtkWidget *popover; @@ -2475,29 +2475,29 @@ static void config_tab_osd(GtkWidget *notebook) hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(nullptr, GTK_STOCK_SELECT_FONT, _("Font"), FALSE, + button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"), G_CALLBACK(image_overlay_set_font_cb), notebook); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_COLOR_PICKER, _("Text"), FALSE, + button = pref_button_new(nullptr, GQ_ICON_SELECT_COLOR, _("Text"), G_CALLBACK(image_overlay_set_text_colour_cb), nullptr); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_COLOR_PICKER, _("Background"), FALSE, + button = pref_button_new(nullptr, GQ_ICON_SELECT_COLOR, _("Background"), G_CALLBACK(image_overlay_set_background_colour_cb), nullptr); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); image_overlay_set_text_colours(); - button = pref_button_new(nullptr, nullptr, _("Defaults"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Defaults"), G_CALLBACK(image_overlay_default_template_cb), image_overlay_template_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(image_overlay_help_cb), nullptr); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -2798,17 +2798,17 @@ static void config_tab_files(GtkWidget *notebook) hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(nullptr, nullptr, _("Defaults"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Defaults"), G_CALLBACK(filter_default_cb), filter_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_REMOVE, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_REMOVE, _("Remove"), G_CALLBACK(filter_remove_cb), filter_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_ADD, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_ADD, _("Add"), G_CALLBACK(filter_add_cb), filter_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -3136,11 +3136,11 @@ static void keywords_find_dialog(GtkWidget *widget, const gchar *path) nullptr, kfd); gtk_window_set_default_size(GTK_WINDOW(kfd->gd->dialog), KEYWORD_DIALOG_WIDTH, -1); kfd->gd->cancel_cb = keywords_find_close_cb; - kfd->button_close = generic_dialog_add_button(kfd->gd, GTK_STOCK_CLOSE, nullptr, + kfd->button_close = generic_dialog_add_button(kfd->gd, GQ_ICON_CLOSE, _("Close"), keywords_find_close_cb, FALSE); - kfd->button_start = generic_dialog_add_button(kfd->gd, GTK_STOCK_OK, _("S_tart"), + kfd->button_start = generic_dialog_add_button(kfd->gd, GQ_ICON_OK, _("S_tart"), keywords_find_start_cb, FALSE); - kfd->button_stop = generic_dialog_add_button(kfd->gd, GTK_STOCK_STOP, nullptr, + kfd->button_stop = generic_dialog_add_button(kfd->gd, GQ_ICON_STOP, _("Stop"), keywords_find_stop_cb, FALSE); gtk_widget_set_sensitive(kfd->button_stop, FALSE); @@ -3249,7 +3249,7 @@ static void config_tab_keywords(GtkWidget *notebook) hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(hbox, GTK_STOCK_EXECUTE, _("Search"), FALSE, + button = pref_button_new(hbox, GQ_ICON_RUN, _("Search"), G_CALLBACK(keywords_find_cb), keyword_text); gtk_widget_set_tooltip_text(button, "Search for existing keywords"); @@ -3514,12 +3514,12 @@ static void config_tab_behavior(GtkWidget *notebook) spin = pref_spin_new_int(hbox, _("Maximum size:"), _("MiB"), 0, 2048, 1, options->file_ops.safe_delete_folder_maxsize, &c_options->file_ops.safe_delete_folder_maxsize); gtk_widget_set_tooltip_markup(spin, _("Set to 0 for unlimited size")); - button = pref_button_new(nullptr, nullptr, _("View"), FALSE, + button = pref_button_new(nullptr, nullptr, _("View"), G_CALLBACK(safe_delete_view_cb), nullptr); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_CLEAR, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_CLEAR, nullptr, G_CALLBACK(safe_delete_clear_cb), nullptr); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); @@ -3769,18 +3769,18 @@ static void config_tab_accelerators(GtkWidget *notebook) hbox = pref_box_new(group, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(nullptr, nullptr, _("Defaults"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Defaults"), G_CALLBACK(accel_default_cb), accel_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, nullptr, _("Reset selected"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Reset selected"), G_CALLBACK(accel_reset_cb), accel_view); gtk_widget_set_tooltip_text(button, _("Will only reset changes made before the settings are saved")); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); - button = pref_button_new(nullptr, nullptr, _("Clear selected"), FALSE, + button = pref_button_new(nullptr, nullptr, _("Clear selected"), G_CALLBACK(accel_clear_cb), accel_view); gtk_box_pack_end(GTK_BOX(hbox), button, FALSE, FALSE, 0); gtk_widget_show(button); @@ -4056,13 +4056,13 @@ static void config_window_create(LayoutWindow *lw) gtk_box_pack_end(GTK_BOX(win_vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - button = pref_button_new(nullptr, GTK_STOCK_HELP, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_HELP, _("Help"), G_CALLBACK(config_window_help_cb), notebook); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); gtk_widget_show(button); - button = pref_button_new(nullptr, GTK_STOCK_OK, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_OK, "OK", G_CALLBACK(config_window_ok_cb), notebook); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); @@ -4071,7 +4071,7 @@ static void config_window_create(LayoutWindow *lw) ct_button = button; - button = pref_button_new(nullptr, GTK_STOCK_CANCEL, nullptr, FALSE, + button = pref_button_new(nullptr, GQ_ICON_CANCEL, _("Cancel"), G_CALLBACK(config_window_close_cb), nullptr); gtk_container_add(GTK_CONTAINER(hbox), button); gtk_widget_set_can_default(button, TRUE); diff --git a/src/print.cc b/src/print.cc index 7491b3dd..2bae222f 100644 --- a/src/print.cc +++ b/src/print.cc @@ -398,7 +398,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw) hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(nullptr, GTK_STOCK_SELECT_FONT, _("Font"), FALSE, + button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"), G_CALLBACK(print_set_font_cb), const_cast("Image text font")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); @@ -452,7 +452,7 @@ static void print_text_menu(GtkWidget *box, PrintWindow *pw) hbox = pref_box_new(subgroup, FALSE, GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_GAP); - button = pref_button_new(nullptr, GTK_STOCK_SELECT_FONT, _("Font"), FALSE, + button = pref_button_new(nullptr, GQ_ICON_SELECT_FONT, _("Font"), G_CALLBACK(print_set_font_cb), const_cast("Page text font")); gtk_box_pack_start(GTK_BOX(hbox), button, FALSE, FALSE, 0); diff --git a/src/search.cc b/src/search.cc index 16347928..d4fefd7d 100644 --- a/src/search.cc +++ b/src/search.cc @@ -1133,13 +1133,13 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e g_object_set_data(G_OBJECT(menu), "accel_group", accel_group); video = (on_row && sd->click_fd && sd->click_fd->format_class == FORMAT_CLASS_VIDEO); - menu_item_add_stock_sensitive(menu, _("_Play"), GTK_STOCK_MEDIA_PLAY, video, + menu_item_add_icon_sensitive(menu, _("_Play"), GQ_ICON_PREV_PAGE , video, G_CALLBACK(sr_menu_play_cb), sd); menu_item_add_divider(menu); menu_item_add_sensitive(menu, _("_View"), on_row, G_CALLBACK(sr_menu_view_cb), sd); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, on_row, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, on_row, G_CALLBACK(sr_menu_viewnew_cb), sd); menu_item_add_divider(menu); menu_item_add_sensitive(menu, _("Select all"), !empty, @@ -1158,10 +1158,10 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e G_CALLBACK(search_pop_menu_collections_cb), sd); gtk_widget_set_sensitive(item, on_row); - menu_item_add_stock_sensitive(menu, _("Print..."), GTK_STOCK_PRINT, on_row, + menu_item_add_icon_sensitive(menu, _("Print..."), GQ_ICON_PRINT, on_row, G_CALLBACK(sr_menu_print_cb), sd); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, on_row, + menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, on_row, G_CALLBACK(sr_menu_copy_cb), sd); menu_item_add_sensitive(menu, _("_Move..."), on_row, G_CALLBACK(sr_menu_move_cb), sd); @@ -1173,13 +1173,13 @@ static GtkWidget *search_result_menu(SearchData *sd, gboolean on_row, gboolean e G_CALLBACK(sr_menu_copy_path_unquoted_cb), sd); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, on_row, + _("Move to Trash"), GQ_ICON_DELETE, on_row, G_CALLBACK(sr_menu_move_to_trash_cb), sd); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, on_row, + _("_Delete"), GQ_ICON_DELETE_SHRED, on_row, G_CALLBACK(sr_menu_delete_cb), sd); return menu; @@ -3255,17 +3255,17 @@ static void select_collection_clicked_cb(GtkWidget *, gpointer data) const gchar *title; const gchar *btntext; gpointer btnfunc; - const gchar *stock_id; + const gchar *icon_name; title = _("Select collection"); btntext = nullptr; btnfunc = reinterpret_cast(select_collection_dialog_ok_cb); - stock_id = GTK_STOCK_OK; + icon_name = GQ_ICON_OK; fdlg = file_util_file_dlg(title, "dlg_collection", sd->window, select_collection_dialog_close_cb, sd); generic_dialog_add_message(GENERIC_DIALOG(fdlg), nullptr, title, nullptr, FALSE); - file_dialog_add_button(fdlg, stock_id, btntext, reinterpret_cast(btnfunc), TRUE); + file_dialog_add_button(fdlg, icon_name, btntext, reinterpret_cast(btnfunc), TRUE); file_dialog_add_path_widgets(fdlg, get_collections_dir(), nullptr, "search_collection", GQ_COLLECTION_EXT, _("Collection Files")); @@ -3701,20 +3701,20 @@ void search_new(FileData *dir_fd, FileData *example_file) gtk_box_pack_start(GTK_BOX(hbox), sd->spinner, FALSE, FALSE, 0); gtk_widget_show(sd->spinner); - sd->button_help = pref_button_new(hbox, GTK_STOCK_HELP, nullptr, FALSE, G_CALLBACK(search_window_help_cb), sd); + sd->button_help = pref_button_new(hbox, GQ_ICON_HELP, _("Help"), G_CALLBACK(search_window_help_cb), sd); gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_help), "F1"); gtk_widget_set_sensitive(sd->button_help, TRUE); pref_spacer(hbox, PREF_PAD_BUTTON_GAP); - sd->button_start = pref_button_new(hbox, GTK_STOCK_FIND, nullptr, FALSE, + sd->button_start = pref_button_new(hbox, GQ_ICON_FIND, nullptr, G_CALLBACK(search_start_cb), sd); gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_start), "Ctrl-Return"); pref_spacer(hbox, PREF_PAD_BUTTON_GAP); - sd->button_stop = pref_button_new(hbox, GTK_STOCK_STOP, nullptr, FALSE, + sd->button_stop = pref_button_new(hbox, GQ_ICON_STOP, _("Stop"), G_CALLBACK(search_start_cb), sd); gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_stop), "Ctrl-Return"); gtk_widget_set_sensitive(sd->button_stop, FALSE); pref_spacer(hbox, PREF_PAD_BUTTON_GAP); - sd->button_close = pref_button_new(hbox, GTK_STOCK_CLOSE, nullptr, FALSE, G_CALLBACK(search_window_close_cb), sd); + sd->button_close = pref_button_new(hbox, GQ_ICON_CLOSE, _("Close"), G_CALLBACK(search_window_close_cb), sd); gtk_widget_set_tooltip_text(GTK_WIDGET(sd->button_close), "Ctrl-W"); gtk_widget_set_sensitive(sd->button_close, TRUE); diff --git a/src/shortcuts.cc b/src/shortcuts.cc index 82b30031..e9310cd1 100644 --- a/src/shortcuts.cc +++ b/src/shortcuts.cc @@ -106,7 +106,7 @@ static void shortcuts_add_cb(GtkWidget *button, gpointer data) scd->dialog = file_util_file_dlg(title, "add_shortcuts", button, shortcuts_add_cancel_cb, scd); - file_dialog_add_button(scd->dialog, GTK_STOCK_OK, nullptr, shortcuts_add_ok_cb, TRUE); + file_dialog_add_button(scd->dialog, GQ_ICON_OK, "OK", shortcuts_add_ok_cb, TRUE); generic_dialog_add_message(GENERIC_DIALOG(scd->dialog), nullptr, title, nullptr, FALSE); @@ -155,7 +155,7 @@ static GtkWidget *shortcuts_new(LayoutWindow *lw) tbar = pref_toolbar_new(scd->vbox, GTK_TOOLBAR_ICONS); - scd->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, nullptr, FALSE, + scd->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE, _("Add Shortcut"), G_CALLBACK(shortcuts_add_cb), scd); diff --git a/src/toolbar.cc b/src/toolbar.cc index 37b89697..86c8bac3 100644 --- a/src/toolbar.cc +++ b/src/toolbar.cc @@ -67,31 +67,31 @@ struct UseableToolbarItems * plus any desktop files **/ static constexpr UseableToolbarItems useable_toolbar_items[] = { - {"FirstImage", N_("First Image"), GTK_STOCK_GOTO_TOP}, - {"PrevImage", N_("Previous Image"), GTK_STOCK_GO_UP}, - {"NextImage", N_("Next Image"), GTK_STOCK_GO_DOWN}, - {"LastImage", N_("Last Image"), GTK_STOCK_GOTO_BOTTOM}, - {"Back", N_("Back"), GTK_STOCK_GO_BACK}, - {"Forward", N_("Forward"), GTK_STOCK_GO_FORWARD}, - {"Home", N_("Home"), GTK_STOCK_HOME}, - {"Up", N_("Up"), GTK_STOCK_GO_UP}, - {"FirstPage", N_("First page"), GTK_STOCK_MEDIA_PREVIOUS}, - {"LastPage", N_("Last Page"), GTK_STOCK_MEDIA_NEXT}, - {"NextPage", N_("Next page"), GTK_STOCK_MEDIA_FORWARD}, - {"PrevPage", N_("Previous Page"), GTK_STOCK_MEDIA_REWIND}, - {"ImageForward", N_("Image Forward"), GTK_STOCK_GOTO_LAST}, - {"ImageBack", N_("Image Back"), GTK_STOCK_GOTO_FIRST}, - {"NewWindow", N_("New window"), GTK_STOCK_NEW}, - {"NewCollection", N_("New collection"), GTK_STOCK_INDEX}, - {"OpenCollection", N_("Open collection"), GTK_STOCK_OPEN}, - {"Search", N_("Search"), GTK_STOCK_FIND}, - {"FindDupes", N_("Find duplicates"), GTK_STOCK_FIND}, - {"NewFolder", N_("New folder"),GTK_STOCK_DIRECTORY}, - {"Copy", N_("Copy"), GTK_STOCK_COPY}, + {"FirstImage", N_("First Image"), GQ_ICON_GO_TOP}, + {"PrevImage", N_("Previous Image"), GQ_ICON_GO_UP}, + {"NextImage", N_("Next Image"), GQ_ICON_GO_DOWN}, + {"LastImage", N_("Last Image"), GQ_ICON_GO_BOTTOM}, + {"Back", N_("Back"), GQ_ICON_GO_PREV}, + {"Forward", N_("Forward"), GQ_ICON_GO_NEXT}, + {"Home", N_("Home"), GQ_ICON_HOME}, + {"Up", N_("Up"), GQ_ICON_GO_UP}, + {"FirstPage", N_("First page"), GQ_ICON_PREV_PAGE}, + {"LastPage", N_("Last Page"), GQ_ICON_NEXT_PAGE}, + {"NextPage", N_("Next page"), GQ_ICON_FORWARD_PAGE}, + {"PrevPage", N_("Previous Page"), GQ_ICON_BACK_PAGE}, + {"ImageForward", N_("Image Forward"), GQ_ICON_GO_LAST}, + {"ImageBack", N_("Image Back"), GQ_ICON_GO_FIRST}, + {"NewWindow", N_("New window"), GQ_ICON_NEW}, + {"NewCollection", N_("New collection"), GQ_ICON_COLLECTION}, + {"OpenCollection", N_("Open collection"), GQ_ICON_OPEN}, + {"Search", N_("Search"), GQ_ICON_FIND}, + {"FindDupes", N_("Find duplicates"), GQ_ICON_FIND}, + {"NewFolder", N_("New folder"),GQ_ICON_DIRECTORY}, + {"Copy", N_("Copy"), GQ_ICON_COPY}, {"Move", N_("Move"), PIXBUF_INLINE_ICON_MOVE}, {"Rename", N_("Rename"), PIXBUF_INLINE_ICON_RENAME}, - {"Delete", N_("Delete"), GTK_STOCK_DELETE}, - {"CloseWindow", N_("Close Window"), GTK_STOCK_CLOSE}, + {"Delete", N_("Delete"), GQ_ICON_DELETE}, + {"CloseWindow", N_("Close Window"), GQ_ICON_CLOSE}, {"PanView", N_("Pan view"), PIXBUF_INLINE_ICON_PANORAMA}, {"OpenArchive", N_("Open Archive"), PIXBUF_INLINE_ARCHIVE}, {"SelectAll", N_("Select all"), PIXBUF_INLINE_ICON_SELECT_ALL}, @@ -99,9 +99,9 @@ static constexpr UseableToolbarItems useable_toolbar_items[] = { {"SelectInvert", N_("Select invert"), PIXBUF_INLINE_ICON_SELECT_INVERT}, {"ShowFileFilter", N_("Show file filter"), PIXBUF_INLINE_ICON_FILE_FILTER}, {"RectangularSelection", N_("Select rectangle"), PIXBUF_INLINE_ICON_SELECT_RECTANGLE}, - {"Print", N_("Print"), GTK_STOCK_PRINT}, - {"Preferences", N_("Preferences"), GTK_STOCK_PREFERENCES}, - {"LayoutConfig", N_("Configure this window"), GTK_STOCK_PREFERENCES}, + {"Print", N_("Print"), GQ_ICON_PRINT}, + {"Preferences", N_("Preferences"), GQ_ICON_PREFERENCES}, + {"LayoutConfig", N_("Configure this window"), GQ_ICON_PREFERENCES}, {"Maintenance", N_("Cache maintenance"), PIXBUF_INLINE_ICON_MAINTENANCE}, {"RotateCW", N_("Rotate clockwise 90°"), PIXBUF_INLINE_ICON_CW}, {"RotateCCW", N_("Rotate counterclockwise 90°"), PIXBUF_INLINE_ICON_CCW}, @@ -109,33 +109,33 @@ static constexpr UseableToolbarItems useable_toolbar_items[] = { {"Mirror", N_("Mirror"), PIXBUF_INLINE_ICON_MIRROR}, {"Flip", N_("Flip"), PIXBUF_INLINE_ICON_FLIP}, {"AlterNone", N_("Original state"), PIXBUF_INLINE_ICON_ORIGINAL}, - {"ZoomIn", N_("Zoom in"), GTK_STOCK_ZOOM_IN}, - {"ZoomOut", N_("Zoom out"), GTK_STOCK_ZOOM_OUT}, - {"Zoom100", N_("Zoom 1:1"), GTK_STOCK_ZOOM_100}, - {"ZoomFit", N_("Zoom to fit"), GTK_STOCK_ZOOM_FIT}, + {"ZoomIn", N_("Zoom in"), GQ_ICON_ZOOM_IN}, + {"ZoomOut", N_("Zoom out"), GQ_ICON_ZOOM_OUT}, + {"Zoom100", N_("Zoom 1:1"), GQ_ICON_ZOOM_100}, + {"ZoomFit", N_("Zoom to fit"), GQ_ICON_ZOOM_FIT}, {"ZoomFillHor", N_("Fit Horizontaly"), PIXBUF_INLINE_ICON_ZOOMFILLHOR}, {"ZoomFillVert", N_("Fit vertically"), PIXBUF_INLINE_ICON_ZOOMFILLVERT}, - {"Zoom200", N_("Zoom 2:1"), GTK_STOCK_FILE}, - {"Zoom300", N_("Zoom 3:1"), GTK_STOCK_FILE}, - {"Zoom400", N_("Zoom 4:1"), GTK_STOCK_FILE}, - {"Zoom50", N_("Zoom 1:2"), GTK_STOCK_FILE}, - {"Zoom33", N_("Zoom1:3"), GTK_STOCK_FILE}, - {"Zoom25", N_("Zoom 1:4"), GTK_STOCK_FILE}, - {"ConnectZoomIn", N_("Connected Zoom in"), GTK_STOCK_ZOOM_IN}, + {"Zoom200", N_("Zoom 2:1"), GQ_ICON_GENERIC}, + {"Zoom300", N_("Zoom 3:1"), GQ_ICON_GENERIC}, + {"Zoom400", N_("Zoom 4:1"), GQ_ICON_GENERIC}, + {"Zoom50", N_("Zoom 1:2"), GQ_ICON_GENERIC}, + {"Zoom33", N_("Zoom 1:3"), GQ_ICON_GENERIC}, + {"Zoom25", N_("Zoom 1:4"), GQ_ICON_GENERIC}, + {"ConnectZoomIn", N_("Connected Zoom in"), GQ_ICON_ZOOM_IN}, {"SplitPaneSync", N_("Split Pane Sync"), PIXBUF_INLINE_SPLIT_PANE_SYNC}, {"Grayscale", N_("Grayscale"), PIXBUF_INLINE_ICON_GRAYSCALE}, {"OverUnderExposed", N_("Over Under Exposed"), PIXBUF_INLINE_ICON_EXPOSURE}, - {"ShowInfoPixel", N_("Pixel Info"), GTK_STOCK_COLOR_PICKER}, - {"IgnoreAlpha", N_("Ignore Alpha"), GTK_STOCK_STRIKETHROUGH}, - {"ExifRotate", N_("Exif rotate"), GTK_STOCK_ORIENTATION_PORTRAIT}, - {"UseColorProfiles", N_("Use color profiles"), GTK_STOCK_SELECT_COLOR}, - {"SaveMetadata", N_("Save metadata"), GTK_STOCK_SAVE}, + {"ShowInfoPixel", N_("Pixel Info"), GQ_ICON_SELECT_COLOR}, + {"IgnoreAlpha", N_("Ignore Alpha"), GQ_ICON_STRIKETHROUGH}, + {"ExifRotate", N_("Exif rotate"), GQ_ICON_ROTATE}, + {"UseColorProfiles", N_("Use color profiles"), GQ_ICON_COLOR_MANAGEMENT}, + {"SaveMetadata", N_("Save metadata"), GQ_ICON_SAVE}, {"HideTools", N_("Hide file list"), PIXBUF_INLINE_ICON_HIDETOOLS}, - {"SlideShowPause", N_("Pause slideshow"), GTK_STOCK_MEDIA_PAUSE}, - {"SlideShowFaster", N_("Slideshow Faster"), GTK_STOCK_FILE}, - {"SlideShowSlower", N_("Slideshow Slower"), GTK_STOCK_FILE}, - {"Refresh", N_("Refresh"), GTK_STOCK_REFRESH}, - {"HelpContents", N_("Help"), GTK_STOCK_HELP}, + {"SlideShowPause", N_("Pause slideshow"), GQ_ICON_PAUSE}, + {"SlideShowFaster", N_("Slideshow Faster"), GQ_ICON_GENERIC}, + {"SlideShowSlower", N_("Slideshow Slower"), GQ_ICON_GENERIC}, + {"Refresh", N_("Refresh"), GQ_ICON_REFRESH}, + {"HelpContents", N_("Help"), GQ_ICON_HELP}, {"ExifWin", N_("Exif window"), PIXBUF_INLINE_ICON_EXIF}, {"Thumbnails", N_("Show thumbnails"), PIXBUF_INLINE_ICON_THUMB}, {"ShowMarks", N_("Show marks"), PIXBUF_INLINE_ICON_MARKS}, @@ -143,7 +143,7 @@ static constexpr UseableToolbarItems useable_toolbar_items[] = { {"FloatTools", N_("Float file list"), PIXBUF_INLINE_ICON_FLOAT}, {"SBar", N_("Info sidebar"), PIXBUF_INLINE_ICON_INFO}, {"SBarSort", N_("Sort manager"), PIXBUF_INLINE_ICON_SORT}, - {"Quit", N_("Quit"), GTK_STOCK_QUIT}, + {"Quit", N_("Quit"), GQ_ICON_QUIT}, }; /** @@ -212,12 +212,12 @@ static void toolbar_menu_popup(GtkWidget *widget) if (widget) { - menu_item_add_stock(menu, _("Move to _top"), GTK_STOCK_GOTO_TOP, G_CALLBACK(toolbar_item_move_top_cb), widget); - menu_item_add_stock(menu, _("Move _up"), GTK_STOCK_GO_UP, G_CALLBACK(toolbar_item_move_up_cb), widget); - menu_item_add_stock(menu, _("Move _down"), GTK_STOCK_GO_DOWN, G_CALLBACK(toolbar_item_move_down_cb), widget); - menu_item_add_stock(menu, _("Move to _bottom"), GTK_STOCK_GOTO_BOTTOM, G_CALLBACK(toolbar_item_move_bottom_cb), widget); + menu_item_add_icon(menu, _("Move to _top"), GQ_ICON_GO_TOP, G_CALLBACK(toolbar_item_move_top_cb), widget); + menu_item_add_icon(menu, _("Move _up"), GQ_ICON_GO_UP, G_CALLBACK(toolbar_item_move_up_cb), widget); + menu_item_add_icon(menu, _("Move _down"), GQ_ICON_GO_DOWN, G_CALLBACK(toolbar_item_move_down_cb), widget); + menu_item_add_icon(menu, _("Move to _bottom"), GQ_ICON_GO_BOTTOM, G_CALLBACK(toolbar_item_move_bottom_cb), widget); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Remove"), GTK_STOCK_DELETE, G_CALLBACK(toolbar_item_delete_cb), widget); + menu_item_add_icon(menu, _("Remove"), GQ_ICON_DELETE, G_CALLBACK(toolbar_item_delete_cb), widget); menu_item_add_divider(menu); } @@ -329,7 +329,7 @@ static void toolbarlist_add_button(const gchar *name, const gchar *label, } else { - toolbar_entry->image = gtk_image_new_from_icon_name("go-jump", + toolbar_entry->image = gtk_image_new_from_icon_name(GQ_ICON_GO_JUMP, GTK_ICON_SIZE_BUTTON); } gtk_box_pack_start(GTK_BOX(hbox), toolbar_entry->image, FALSE, FALSE, 0); @@ -403,7 +403,7 @@ static void toolbar_menu_add_popup(GtkWidget *, gpointer data) GtkWidget *item; gchar *icon = g_strconcat(editor->icon, ".desktop", NULL); - item = menu_item_add_stock(menu, editor->name, icon, + item = menu_item_add_icon(menu, editor->name, icon, G_CALLBACK(toolbarlist_add_cb), toolbarlist); g_object_set_data(G_OBJECT(item), "toolbar_add_name", g_strdup(editor->key)); g_object_set_data(G_OBJECT(item), "toolbar_add_label", g_strdup(editor->name)); @@ -526,7 +526,7 @@ GtkWidget *toolbar_select_new(LayoutWindow *lw, ToolbarType bar) gtk_widget_show(add_box); gtk_box_pack_end(GTK_BOX(toolbarlist[bar]->widget), add_box, FALSE, FALSE, 0); tbar = pref_toolbar_new(add_box, GTK_TOOLBAR_ICONS); - toolbarlist[bar]->add_button = pref_toolbar_button(tbar, GTK_STOCK_ADD, "NULL", FALSE, + toolbarlist[bar]->add_button = pref_toolbar_button(tbar, GQ_ICON_ADD, _("Add"), FALSE, _("Add Toolbar Item"), G_CALLBACK(toolbar_menu_add_cb), toolbarlist[bar]); gtk_widget_show(toolbarlist[bar]->add_button); diff --git a/src/trash.cc b/src/trash.cc index f7d83ca6..4957264a 100644 --- a/src/trash.cc +++ b/src/trash.cc @@ -193,7 +193,7 @@ gboolean file_util_safe_unlink(const gchar *path) { message = g_strconcat("See the Help file for a possible workaround.\n\n", error->message, NULL); gd = warning_dialog(_("Move to trash failed\n\n"), message, GTK_STOCK_DIALOG_ERROR, nullptr); - generic_dialog_add_button(gd, GTK_STOCK_HELP, "Help", move_to_trash_failed_cb, FALSE); + generic_dialog_add_button(gd, GQ_ICON_HELP, _("Help"), move_to_trash_failed_cb, FALSE); g_free(message); g_error_free(error); diff --git a/src/ui-bookmark.cc b/src/ui-bookmark.cc index ffe83096..1af9a4fa 100644 --- a/src/ui-bookmark.cc +++ b/src/ui-bookmark.cc @@ -275,7 +275,7 @@ static void bookmark_edit(const gchar *key, const gchar *text, GtkWidget *parent generic_dialog_add_message(gd, nullptr, _("Edit Bookmark"), nullptr, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", bookmark_edit_ok_cb, TRUE); table = pref_table_new(gd->vbox, 3, 2, FALSE, TRUE); @@ -385,13 +385,13 @@ static void bookmark_menu_popup(BookMarkData *bm, GtkWidget *button, gint, guint bm->active_button = b; menu = popup_menu_short_lived(); - menu_item_add_stock_sensitive(menu, _("_Properties..."), GTK_STOCK_PROPERTIES, bm->editable, + menu_item_add_icon_sensitive(menu, _("_Properties..."), GQ_ICON_PROPERTIES, bm->editable, G_CALLBACK(bookmark_menu_prop_cb), bm); - menu_item_add_stock_sensitive(menu, _("Move _up"), GTK_STOCK_GO_UP, bm->editable, + menu_item_add_icon_sensitive(menu, _("Move _up"), GQ_ICON_GO_UP, bm->editable, G_CALLBACK(bookmark_menu_up_cb), bm); - menu_item_add_stock_sensitive(menu, _("Move _down"), GTK_STOCK_GO_DOWN, bm->editable, + menu_item_add_icon_sensitive(menu, _("Move _down"), GQ_ICON_GO_DOWN, bm->editable, G_CALLBACK(bookmark_menu_down_cb), bm); - menu_item_add_stock_sensitive(menu, _("_Remove"), GTK_STOCK_REMOVE, bm->editable, + menu_item_add_icon_sensitive(menu, _("_Remove"), GQ_ICON_REMOVE, bm->editable, G_CALLBACK(bookmark_menu_remove_cb), bm); if (local) @@ -655,13 +655,12 @@ static void bookmark_populate(BookMarkData *bm) } else { - b->image = gtk_image_new_from_icon_name("folder", - GTK_ICON_SIZE_BUTTON); + b->image = gtk_image_new_from_icon_name(GQ_ICON_DIRECTORY, GTK_ICON_SIZE_BUTTON); } } else { - b->image = gtk_image_new_from_icon_name("folder", GTK_ICON_SIZE_BUTTON); + b->image = gtk_image_new_from_icon_name(GQ_ICON_DIRECTORY, GTK_ICON_SIZE_BUTTON); } gtk_box_pack_start(GTK_BOX(box), b->image, FALSE, FALSE, 0); gtk_widget_show(b->image); @@ -757,7 +756,7 @@ static void bookmark_dnd_get_data(GtkWidget *, GdkDragContext *, } else if (isfile(path)) { - buf = bookmark_string(filename_from_path(path), path, GTK_STOCK_FILE); + buf = bookmark_string(filename_from_path(path), path, GQ_ICON_FILE); } else { @@ -904,7 +903,7 @@ void bookmark_list_add(GtkWidget *list, const gchar *name, const gchar *path) { if (isfile(path)) { - buf.reset(bookmark_string(name, path, "gtk-file")); + buf.reset(bookmark_string(name, path, GQ_ICON_FILE)); } else { diff --git a/src/ui-fileops.cc b/src/ui-fileops.cc index ce1663c8..b366f867 100644 --- a/src/ui-fileops.cc +++ b/src/ui-fileops.cc @@ -102,7 +102,7 @@ static void encoding_dialog(const gchar *path) gd = generic_dialog_new(_("Filename encoding locale mismatch"), "locale warning", nullptr, TRUE, nullptr, nullptr); - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, TRUE); generic_dialog_add_message(gd, GTK_STOCK_DIALOG_WARNING, _("Filename encoding locale mismatch"), string->str, TRUE); diff --git a/src/ui-help.cc b/src/ui-help.cc index aaf6e881..367353fc 100644 --- a/src/ui-help.cc +++ b/src/ui-help.cc @@ -243,7 +243,7 @@ GtkWidget *help_window_new(const gchar *title, gtk_box_pack_end(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); gtk_widget_show(hbox); - button = gtk_button_new_from_stock(GTK_STOCK_CLOSE); + button = gtk_button_new_from_icon_name(GQ_ICON_CLOSE, GTK_ICON_SIZE_BUTTON); g_signal_connect(G_OBJECT(button), "clicked", G_CALLBACK(help_window_close), window); gtk_container_add(GTK_CONTAINER(hbox), button); diff --git a/src/ui-menu.cc b/src/ui-menu.cc index 98faefb6..18983e8c 100644 --- a/src/ui-menu.cc +++ b/src/ui-menu.cc @@ -227,6 +227,36 @@ GtkWidget *menu_item_add_stock(GtkWidget *menu, const gchar *label, const gchar return item; } +GtkWidget *menu_item_add_icon(GtkWidget *menu, const gchar *label, const gchar *icon_name, + GCallback func, gpointer data) +{ + GtkWidget *item; + GtkWidget *image; + GtkAccelGroup *accel_group; + hard_coded_window_keys *window_keys; + + item = gtk_image_menu_item_new_with_mnemonic(label); + window_keys = static_cast(g_object_get_data(G_OBJECT(menu), "window_keys")); + accel_group = static_cast(g_object_get_data(G_OBJECT(menu), "accel_group")); + + image = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_MENU); + gtk_image_menu_item_set_image(GTK_IMAGE_MENU_ITEM(item), image); + + if (accel_group && window_keys) + { + menu_item_add_accelerator(item, accel_group, window_keys); + } + else if (accel_group) + { + menu_item_add_main_window_accelerator(item, accel_group); + } + + gtk_widget_show(image); + menu_item_finish(menu, item, func, data); + + return item; +} + GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gboolean sensitive, GCallback func, gpointer data) { @@ -273,6 +303,29 @@ GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, co return item; } +GtkWidget *menu_item_add_icon_sensitive(GtkWidget *menu, const gchar *label, const gchar *icon_name, gboolean sensitive, + GCallback func, gpointer data) +{ + GtkWidget *item; + GtkAccelGroup *accel_group; + hard_coded_window_keys *window_keys; + + item = menu_item_add_icon(menu, label, icon_name, func, data); + gtk_widget_set_sensitive(item, sensitive); + window_keys = static_cast(g_object_get_data(G_OBJECT(menu), "window_keys")); + accel_group = static_cast(g_object_get_data(G_OBJECT(menu), "accel_group")); + if (accel_group && window_keys) + { + menu_item_add_accelerator(item, accel_group, window_keys); + } + else if (accel_group) + { + menu_item_add_main_window_accelerator(item, accel_group); + } + + return item; +} + GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gboolean active, GCallback func, gpointer data) { diff --git a/src/ui-menu.h b/src/ui-menu.h index 6f1c38a1..4783d330 100644 --- a/src/ui-menu.h +++ b/src/ui-menu.h @@ -27,8 +27,12 @@ GtkWidget *menu_item_add(GtkWidget *menu, const gchar *label, GCallback func, gpointer data); GtkWidget *menu_item_add_stock(GtkWidget *menu, const gchar *label, const gchar *stock_id, GCallback func, gpointer data); +GtkWidget *menu_item_add_icon(GtkWidget *menu, const gchar *label, const gchar *icon_name, + GCallback func, gpointer data); GtkWidget *menu_item_add_sensitive(GtkWidget *menu, const gchar *label, gboolean sensitive, GCallback func, gpointer data); +GtkWidget *menu_item_add_icon_sensitive(GtkWidget *menu, const gchar *label, const gchar *icon_name, gboolean sensitive, + GCallback func, gpointer data); GtkWidget *menu_item_add_stock_sensitive(GtkWidget *menu, const gchar *label, const gchar *stock_id, gboolean sensitive, GCallback func, gpointer data); GtkWidget *menu_item_add_check(GtkWidget *menu, const gchar *label, gboolean active, diff --git a/src/ui-misc.cc b/src/ui-misc.cc index 83a9616c..47d6a12a 100644 --- a/src/ui-misc.cc +++ b/src/ui-misc.cc @@ -236,67 +236,23 @@ void pref_label_bold(GtkWidget *label, gboolean bold, gboolean increase_size) pango_attr_list_unref(pal); } -GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id, - const gchar *text, gboolean hide_stock_text, - GCallback func, gpointer data) +GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *icon_name, + const gchar *text, GCallback func, gpointer data) { GtkWidget *button; - if (stock_id && !text && !hide_stock_text) + if (icon_name) { - button = gtk_button_new_from_stock(stock_id); + button = gtk_button_new_from_icon_name(icon_name, GTK_ICON_SIZE_BUTTON); } else { - GtkWidget *image = nullptr; - GtkWidget *label = nullptr; - button = gtk_button_new(); + } - if (stock_id) - { - image = gtk_image_new_from_stock(stock_id, GTK_ICON_SIZE_BUTTON); - } - - if (text) - { - label = gtk_label_new_with_mnemonic(text); - gtk_label_set_xalign(GTK_LABEL(label), 0.5); - gtk_label_set_yalign(GTK_LABEL(label), 0.5); - gtk_label_set_mnemonic_widget(GTK_LABEL(label), button); - } - - if (image && label) - { - GtkWidget *align; - GtkWidget *hbox; - - hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_BUTTON_ICON_GAP); - - align = gtk_alignment_new(0.5, 0.5, 0.0, 0.0); - gtk_container_add(GTK_CONTAINER(button), align); - gtk_widget_show(align); - - gtk_container_add(GTK_CONTAINER(align), hbox); - gtk_widget_show(hbox); - - gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); - gtk_box_pack_end(GTK_BOX(hbox), label, FALSE, FALSE, 0); - } - else - { - if (image) - { - gtk_container_add(GTK_CONTAINER(button), image); - } - else if (label) - { - gtk_container_add(GTK_CONTAINER(button), label); - } - } - - if (image) gtk_widget_show(image); - if (label) gtk_widget_show(label); + if (text) + { + gtk_button_set_label(GTK_BUTTON(button), text); } if (func) g_signal_connect(G_OBJECT(button), "clicked", func, data); @@ -655,12 +611,12 @@ GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row, } GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row, - const gchar *stock_id, const gchar *text, gboolean hide_stock_text, + const gchar *stock_id, const gchar *text, GCallback func, gpointer data) { GtkWidget *button; - button = pref_button_new(nullptr, stock_id, text, hide_stock_text, func, data); + button = pref_button_new(nullptr, stock_id, text, func, data); gtk_table_attach(GTK_TABLE(table), button, column, column + 1, row, row + 1, GTK_FILL, static_cast(0), 0, 0); gtk_widget_show(button); @@ -744,38 +700,30 @@ GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style) } GtkWidget *pref_toolbar_button(GtkWidget *toolbar, - const gchar *stock_id, const gchar *label, gboolean toggle, + const gchar *icon_name, const gchar *label, gboolean toggle, const gchar *description, GCallback func, gpointer data) { GtkWidget *item; - if (toggle) + if (toggle) // TODO: TG seems no function uses toggle now { - if (stock_id) - { - item = GTK_WIDGET(gtk_toggle_tool_button_new_from_stock(stock_id)); - } - else - { - item = GTK_WIDGET(gtk_toggle_tool_button_new()); - } + item = GTK_WIDGET(gtk_toggle_tool_button_new()); + if (icon_name) gtk_tool_button_set_icon_name(GTK_TOOL_BUTTON(item), icon_name); + if (label) gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), label); } else { - if (stock_id) + GtkWidget *icon = nullptr; + if (icon_name) { - item = GTK_WIDGET(gtk_tool_button_new_from_stock(stock_id)); - } - else - { - item = GTK_WIDGET(gtk_tool_button_new(nullptr, nullptr)); + icon = gtk_image_new_from_icon_name(icon_name, GTK_ICON_SIZE_LARGE_TOOLBAR); // TODO: TG which size? + gtk_widget_show(icon); } + item = GTK_WIDGET(gtk_tool_button_new(icon, label)); } gtk_tool_button_set_use_underline(GTK_TOOL_BUTTON(item), TRUE); - if (label) gtk_tool_button_set_label(GTK_TOOL_BUTTON(item), label); - if (func) g_signal_connect(item, "clicked", func, data); gtk_container_add(GTK_CONTAINER(toolbar), item); gtk_widget_show(item); diff --git a/src/ui-misc.h b/src/ui-misc.h index 50a5fb63..aaed09da 100644 --- a/src/ui-misc.h +++ b/src/ui-misc.h @@ -110,9 +110,8 @@ GtkWidget *pref_label_new(GtkWidget *parent_box, const gchar *text); GtkWidget *pref_label_new_mnemonic(GtkWidget *parent_box, const gchar *text, GtkWidget *widget); void pref_label_bold(GtkWidget *label, gboolean bold, gboolean increase_size); -GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *stock_id, - const gchar *text, gboolean hide_stock_text, - GCallback func, gpointer data); +GtkWidget *pref_button_new(GtkWidget *parent_box, const gchar *icon_name, + const gchar *text, GCallback func, gpointer data); GtkWidget *pref_checkbox_new(GtkWidget *parent_box, const gchar *text, gboolean active, GCallback func, gpointer data); @@ -166,7 +165,7 @@ GtkWidget *pref_table_label(GtkWidget *table, gint column, gint row, const gchar *text, gfloat alignment); GtkWidget *pref_table_button(GtkWidget *table, gint column, gint row, - const gchar *stock_id, const gchar *text, gboolean hide_stock_text, + const gchar *stock_id, const gchar *text, GCallback func, gpointer data); GtkWidget *pref_table_spin(GtkWidget *table, gint column, gint row, @@ -183,7 +182,7 @@ GtkWidget *pref_table_spin_new_int(GtkWidget *table, gint column, gint row, GtkWidget *pref_toolbar_new(GtkWidget *parent_box, GtkToolbarStyle style); GtkWidget *pref_toolbar_button(GtkWidget *toolbar, - const gchar *stock_id, const gchar *label, gboolean toggle, + const gchar *icon_name, const gchar *label, gboolean toggle, const gchar *description, GCallback func, gpointer data); void pref_toolbar_button_set_icon(GtkWidget *button, GtkWidget *widget, const gchar *stock_id); diff --git a/src/ui-pathsel.cc b/src/ui-pathsel.cc index 7106d6f6..d1445737 100644 --- a/src/ui-pathsel.cc +++ b/src/ui-pathsel.cc @@ -524,7 +524,7 @@ static void dest_view_delete(Dest_Data *dd, GtkTreeView *view) dd->entry, TRUE, dest_view_delete_dlg_cancel, dl); - generic_dialog_add_button(dd->gd, GTK_STOCK_DELETE, nullptr, dest_view_delete_dlg_ok_cb, TRUE); + generic_dialog_add_button(dd->gd, GQ_ICON_DELETE, "Delete", dest_view_delete_dlg_ok_cb, TRUE); text = g_strdup_printf(_("About to delete the file:\n %s"), path); generic_dialog_add_message(dd->gd, GTK_STOCK_DIALOG_QUESTION, @@ -604,7 +604,7 @@ static gboolean dest_popup_menu(Dest_Data *dd, GtkTreeView *view, guint, guint32 menu = popup_menu_short_lived(); menu_item_add_sensitive(menu, _("_Rename"), !normal_dir, G_CALLBACK(dest_popup_dir_rename_cb), dd); - menu_item_add_stock(menu, _("Add _Bookmark"), GTK_STOCK_JUMP_TO, + menu_item_add_icon(menu, _("Add _Bookmark"), GQ_ICON_GO_JUMP, G_CALLBACK(dest_popup_dir_bookmark_cb), dd); } else @@ -612,9 +612,9 @@ static gboolean dest_popup_menu(Dest_Data *dd, GtkTreeView *view, guint, guint32 menu = popup_menu_short_lived(); menu_item_add(menu, _("_Rename"), G_CALLBACK(dest_popup_file_rename_cb), dd); - menu_item_add_stock(menu, _("_Delete"), GTK_STOCK_DELETE, + menu_item_add_icon(menu, _("_Delete"), GQ_ICON_DELETE, G_CALLBACK(dest_popup_file_delete_cb), dd); - menu_item_add_stock(menu, _("Add _Bookmark"), GTK_STOCK_JUMP_TO, + menu_item_add_icon(menu, _("Add _Bookmark"), GQ_ICON_GO_JUMP, G_CALLBACK(dest_popup_file_bookmark_cb), dd); } @@ -1015,9 +1015,9 @@ GtkWidget *path_selection_new_with_files(GtkWidget *entry, const gchar *path, hbox2 = pref_table_box(table, 0, 0, GTK_ORIENTATION_HORIZONTAL, nullptr); gtk_box_set_spacing(GTK_BOX(hbox2), PREF_PAD_BUTTON_GAP); - pref_button_new(hbox2, nullptr, _("Home"), FALSE, + pref_button_new(hbox2, nullptr, _("Home"), G_CALLBACK(dest_home_cb), dd); - pref_button_new(hbox2, nullptr, _("New folder"), FALSE, + pref_button_new(hbox2, nullptr, _("New folder"), G_CALLBACK(dest_new_dir_cb), dd); dd->hidden_button = gtk_check_button_new_with_label(_("Show hidden")); diff --git a/src/ui-spinner.cc b/src/ui-spinner.cc index 85ef18c7..9307529c 100644 --- a/src/ui-spinner.cc +++ b/src/ui-spinner.cc @@ -157,7 +157,7 @@ GtkWidget *spinner_new(const gchar *path, gint interval) } else { - sp->image = gtk_image_new_from_icon_name("image-missing", GTK_ICON_SIZE_DIALOG); + sp->image = gtk_image_new_from_icon_name(GQ_ICON_MISSING_IMAGE, GTK_ICON_SIZE_DIALOG); } g_object_set_data(G_OBJECT(sp->image), "spinner", sp); diff --git a/src/ui-tabcomp.cc b/src/ui-tabcomp.cc index de132376..7a275885 100644 --- a/src/ui-tabcomp.cc +++ b/src/ui-tabcomp.cc @@ -846,7 +846,7 @@ static void tab_completion_select_show(TabCompData *td) title = (td->fd_title) ? td->fd_title : _("Select path"); td->fd = file_dialog_new(title, "select_path", td->entry, tab_completion_select_cancel_cb, td); - file_dialog_add_button(td->fd, GTK_STOCK_OK, nullptr, + file_dialog_add_button(td->fd, GQ_ICON_OK, "OK", tab_completion_select_ok_cb, TRUE); generic_dialog_add_message(GENERIC_DIALOG(td->fd), nullptr, title, nullptr, FALSE); diff --git a/src/ui-utildlg.cc b/src/ui-utildlg.cc index fe0d3e96..783096e7 100644 --- a/src/ui-utildlg.cc +++ b/src/ui-utildlg.cc @@ -229,13 +229,13 @@ gboolean generic_dialog_get_alternative_button_order(GtkWidget *widget) return alternative_order; } -GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text, +GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name, const gchar *text, void (*func_cb)(GenericDialog *, gpointer), gboolean is_default) { GtkWidget *button; gboolean alternative_order; - button = pref_button_new(nullptr, stock_id, text, FALSE, + button = pref_button_new(nullptr, icon_name, text, G_CALLBACK(generic_dialog_click_cb), gd); gtk_widget_set_can_default(button, TRUE); @@ -453,7 +453,7 @@ static void generic_dialog_setup(GenericDialog *gd, if (gd->cancel_cb) { - gd->cancel_button = generic_dialog_add_button(gd, GTK_STOCK_CANCEL, nullptr, gd->cancel_cb, TRUE); + gd->cancel_button = generic_dialog_add_button(gd, GQ_ICON_CANCEL, _("Cancel"), gd->cancel_cb, TRUE); } else { @@ -498,7 +498,7 @@ GenericDialog *warning_dialog(const gchar *heading, const gchar *text, GenericDialog *gd; gd = generic_dialog_new(heading, "warning", parent, TRUE, nullptr, nullptr); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, warning_dialog_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", warning_dialog_ok_cb, TRUE); generic_dialog_add_message(gd, icon_stock_id, heading, text, TRUE); diff --git a/src/ui-utildlg.h b/src/ui-utildlg.h index eef4c4e6..4cbbd904 100644 --- a/src/ui-utildlg.h +++ b/src/ui-utildlg.h @@ -67,7 +67,7 @@ GenericDialog *generic_dialog_new(const gchar *title, void (*cancel_cb)(GenericDialog *, gpointer), gpointer data); void generic_dialog_close(GenericDialog *gd); -GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *stock_id, const gchar *text, +GtkWidget *generic_dialog_add_button(GenericDialog *gd, const gchar *icon_name, const gchar *text, void (*func_cb)(GenericDialog *, gpointer), gboolean is_default); void generic_dialog_attach_default(GenericDialog *gd, GtkWidget *widget); diff --git a/src/utilops.cc b/src/utilops.cc index 6ac21ba2..529f0021 100644 --- a/src/utilops.cc +++ b/src/utilops.cc @@ -213,7 +213,7 @@ GenericDialog *file_util_warning_dialog(const gchar *heading, const gchar *messa gd = file_util_gen_dlg(heading, "warning", parent, TRUE, nullptr, nullptr); generic_dialog_add_message(gd, icon_stock_id, heading, message, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, file_util_warning_dialog_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", file_util_warning_dialog_ok_cb, TRUE); if (options->place_dialogs_under_mouse) { gtk_window_set_position(GTK_WINDOW(gd->dialog), GTK_WIN_POS_MOUSE); @@ -599,7 +599,7 @@ static gint file_util_perform_ci_cb(gpointer resume_data, EditorFlags flags, GLi generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, nullptr, msg->str, TRUE); - generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"), + generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"), file_util_resume_cb, TRUE); gtk_widget_show(d->dialog); ret = EDITOR_CB_SUSPEND; @@ -1047,7 +1047,7 @@ void file_util_check_ci(UtilityData *ud) generic_dialog_add_message(d, GTK_STOCK_DIALOG_WARNING, _("Really continue?"), desc, TRUE); - generic_dialog_add_button(d, GTK_STOCK_GO_FORWARD, _("Co_ntinue"), + generic_dialog_add_button(d, GQ_ICON_GO_NEXT, _("Co_ntinue"), file_util_check_resume_cb, TRUE); gtk_widget_show(d->dialog); } @@ -1513,26 +1513,29 @@ static void file_util_dialog_init_simple_list(UtilityData *ud) GtkTreeSelection *selection; gchar *dir_msg; - const gchar *stock_id; + const gchar *icon_name; + const gchar *msg; /** @FIXME use ud->stock_id */ if (ud->type == UTILITY_TYPE_DELETE || ud->type == UTILITY_TYPE_DELETE_LINK || ud->type == UTILITY_TYPE_DELETE_FOLDER) { - stock_id = GTK_STOCK_DELETE; + icon_name = GQ_ICON_DELETE; + msg = _("Delete"); } else { - stock_id = GTK_STOCK_OK; + icon_name = GQ_ICON_OK; + msg = "OK"; } ud->gd = file_util_gen_dlg(ud->messages.title, "dlg_confirm", ud->parent, FALSE, file_util_cancel_cb, ud); - if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE); - if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE); + if (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE); + if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_INFO, _("File details"), file_util_details_cb, FALSE); - generic_dialog_add_button(ud->gd, stock_id, nullptr, file_util_ok_cb, TRUE); + generic_dialog_add_button(ud->gd, icon_name, msg, file_util_ok_cb, TRUE); if (ud->dir_fd) { @@ -1576,15 +1579,15 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud) { FileDialog *fdlg; GtkWidget *label; - const gchar *stock_id; + const gchar *icon_name; if (ud->type == UTILITY_TYPE_COPY) { - stock_id = GTK_STOCK_COPY; + icon_name = GQ_ICON_COPY; } else { - stock_id = GTK_STOCK_OK; + icon_name = GQ_ICON_OK; } fdlg = file_util_file_dlg(ud->messages.title, "dlg_dest_folder", ud->parent, @@ -1602,13 +1605,13 @@ static void file_util_dialog_init_dest_folder(UtilityData *ud) if (options->with_rename) { - file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE); - file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE); + file_dialog_add_button(fdlg, icon_name, ud->messages.title, file_util_fdlg_ok_cb, TRUE); + file_dialog_add_button(fdlg, GQ_ICON_EDIT, _("With Rename"), file_util_fdlg_rename_cb, TRUE); } else { - file_dialog_add_button(fdlg, GTK_STOCK_EDIT, "With Rename", file_util_fdlg_rename_cb, TRUE); - file_dialog_add_button(fdlg, stock_id, ud->messages.title, file_util_fdlg_ok_cb, TRUE); + file_dialog_add_button(fdlg, GQ_ICON_EDIT, _("With Rename"), file_util_fdlg_rename_cb, TRUE); + file_dialog_add_button(fdlg, icon_name, ud->messages.title, file_util_fdlg_ok_cb, TRUE); } file_dialog_add_path_widgets(fdlg, nullptr, ud->dest_path, "move_copy", nullptr, nullptr); @@ -1654,10 +1657,10 @@ static void file_util_dialog_init_source_dest(UtilityData *ud, gboolean second_i box = generic_dialog_add_message(ud->gd, nullptr, ud->messages.question, nullptr, TRUE); - if (ud->discard_func) generic_dialog_add_button(ud->gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_discard_cb, FALSE); - if (ud->details_func) generic_dialog_add_button(ud->gd, GTK_STOCK_INFO, _("File details"), file_util_details_cb, FALSE); + if (ud->discard_func) generic_dialog_add_button(ud->gd, GQ_ICON_REVERT, _("Discard changes"), file_util_discard_cb, FALSE); + if (ud->details_func) generic_dialog_add_button(ud->gd, GQ_ICON_INFO, _("File details"), file_util_details_cb, FALSE); - generic_dialog_add_button(ud->gd, GTK_STOCK_OK, ud->messages.title, file_util_ok_cb, TRUE); + generic_dialog_add_button(ud->gd, GQ_ICON_OK, ud->messages.title, file_util_ok_cb, TRUE); if (ud->type == UTILITY_TYPE_COPY || ud->type == UTILITY_TYPE_MOVE) { @@ -2013,8 +2016,8 @@ static void file_util_details_dialog(UtilityData *ud, FileData *fd) const gchar *stock_id; gd = file_util_gen_dlg(_("File details"), "details", ud->gd->dialog, TRUE, nullptr, ud); - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, file_util_details_dialog_ok_cb, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE); + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), file_util_details_dialog_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE); g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd); @@ -2060,9 +2063,9 @@ static void file_util_write_metadata_details_dialog(UtilityData *ud, FileData *f gd = file_util_gen_dlg(_("Overview of changed metadata"), "details", ud->gd->dialog, TRUE, nullptr, ud); - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, file_util_details_dialog_ok_cb, TRUE); - generic_dialog_add_button(gd, GTK_STOCK_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_REVERT_TO_SAVED, _("Discard changes"), file_util_details_dialog_discard_cb, FALSE); + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), file_util_details_dialog_ok_cb, TRUE); + generic_dialog_add_button(gd, GQ_ICON_REMOVE, _("Exclude file"), file_util_details_dialog_exclude_cb, FALSE); + generic_dialog_add_button(gd, GQ_ICON_REVERT, _("Discard changes"), file_util_details_dialog_discard_cb, FALSE); g_object_set_data(G_OBJECT(gd->dialog), "file_data", fd); @@ -2690,7 +2693,7 @@ static void file_util_delete_dir_full(FileData *fd, GtkWidget *parent, UtilityPh gd = file_util_gen_dlg(_("Folder contains subfolders"), "dlg_warning", parent, TRUE, nullptr, nullptr); - generic_dialog_add_button(gd, GTK_STOCK_CLOSE, nullptr, nullptr, TRUE); + generic_dialog_add_button(gd, GQ_ICON_CLOSE, _("Close"), nullptr, TRUE); text = g_strdup_printf(_("Unable to delete the folder:\n\n%s\n\n" "This folder contains subfolders which must be moved before it can be deleted."), @@ -3308,7 +3311,7 @@ gchar *new_folder(GtkWindow *window , gchar *path) hbox = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); gtk_container_set_border_width(GTK_CONTAINER(hbox), PREF_PAD_GAP); gtk_box_pack_start(GTK_BOX(vbox), hbox, FALSE, FALSE, 0); - image = gtk_image_new_from_icon_name("dialog-question", GTK_ICON_SIZE_DIALOG); + image = gtk_image_new_from_icon_name(GQ_ICON_QUESTION, GTK_ICON_SIZE_DIALOG); gtk_box_pack_start(GTK_BOX(hbox), image, FALSE, FALSE, 0); label = gtk_label_new(_("Create new folder")); gtk_box_pack_start(GTK_BOX(hbox), label, FALSE, FALSE, 0); diff --git a/src/view-dir-tree.cc b/src/view-dir-tree.cc index 5c817315..d7e161a4 100644 --- a/src/view-dir-tree.cc +++ b/src/view-dir-tree.cc @@ -49,10 +49,13 @@ static void vdtree_row_expanded(GtkTreeView *treeview, GtkTreeIter *iter, GtkTre static void set_cursor(GtkWidget *widget, GdkCursorType cursor_type) { GdkCursor *cursor = nullptr; + GdkDisplay *display; if (!widget || !gtk_widget_get_window(widget)) return; - if (cursor_type > -1) cursor = gdk_cursor_new(cursor_type); + display = gdk_display_get_default(); + + if (cursor_type > -1) cursor = gdk_cursor_new_for_display(display, cursor_type); gdk_window_set_cursor(gtk_widget_get_window(widget), cursor); if (cursor) g_object_unref(G_OBJECT(cursor)); gdk_flush(); diff --git a/src/view-dir.cc b/src/view-dir.cc index fd9ca1ee..b3205468 100644 --- a/src/view-dir.cc +++ b/src/view-dir.cc @@ -62,9 +62,9 @@ static PixmapFolders *folder_icons_new(GtkWidget *widget) pf->open = gtk_widget_render_icon(widget, GTK_STOCK_OPEN, size, nullptr); pf->parent = gtk_widget_render_icon(widget, GTK_STOCK_GO_UP, size, nullptr); - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "emblem-unreadable")) + if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), GQ_ICON_UNREADABLE)) { - icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "emblem-unreadable", size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); + icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), GQ_ICON_UNREADABLE, size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); if (error) { log_printf("Error: %s\n", error->message); @@ -86,9 +86,9 @@ static PixmapFolders *folder_icons_new(GtkWidget *widget) pf->deny = gdk_pixbuf_copy(gtk_widget_render_icon(widget, GTK_STOCK_STOP, size, nullptr)); } - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "emblem-symbolic-link")) + if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), GQ_ICON_LINK)) { - icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "emblem-symbolic-link", size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); + icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), GQ_ICON_LINK, size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); if (error) { log_printf("Error: %s\n", error->message); @@ -111,9 +111,9 @@ static PixmapFolders *folder_icons_new(GtkWidget *widget) pf->read_only = gdk_pixbuf_copy(gtk_widget_render_icon(widget, GTK_STOCK_DIRECTORY, size, nullptr)); - if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), "emblem-readonly")) + if (gtk_icon_theme_has_icon(gtk_icon_theme_get_default(), GQ_ICON_READONLY)) { - icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), "emblem-readonly", size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); + icon = gtk_icon_theme_load_icon(gtk_icon_theme_get_default(), GQ_ICON_READONLY, size, GTK_ICON_LOOKUP_USE_BUILTIN, &error); if (error) { log_printf("Error: %s\n", error->message); @@ -486,7 +486,7 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active) g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(vd_popup_destroy_cb), vd); - menu_item_add_stock_sensitive(menu, _("_Copy"), GTK_STOCK_COPY, active, + menu_item_add_icon_sensitive(menu, _("_Copy"), GQ_ICON_COPY, active, G_CALLBACK(vd_drop_menu_copy_cb), vd); menu_item_add_sensitive(menu, _("_Move"), active, G_CALLBACK(vd_drop_menu_move_cb), vd); @@ -506,7 +506,7 @@ GtkWidget *vd_drop_menu(ViewDir *vd, gint active) g_list_free(editors_list); menu_item_add_divider(menu); - menu_item_add_stock(menu, _("Cancel"), GTK_STOCK_CANCEL, nullptr, vd); + menu_item_add_icon(menu, _("Cancel"), GQ_ICON_CANCEL, nullptr, vd); return menu; } @@ -789,7 +789,7 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd) g_signal_connect(G_OBJECT(menu), "destroy", G_CALLBACK(vd_popup_destroy_cb), vd); - menu_item_add_stock_sensitive(menu, _("_Up to parent"), GTK_STOCK_GO_UP, + menu_item_add_icon_sensitive(menu, _("_Up to parent"), GQ_ICON_GO_UP, (vd->dir_fd && strcmp(vd->dir_fd->path, G_DIR_SEPARATOR_S) != 0), G_CALLBACK(vd_pop_menu_up_cb), vd); @@ -800,9 +800,9 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd) G_CALLBACK(vd_pop_menu_slide_rec_cb), vd); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("Find _duplicates..."), GTK_STOCK_FIND, active, + menu_item_add_icon_sensitive(menu, _("Find _duplicates..."), GQ_ICON_FIND, active, G_CALLBACK(vd_pop_menu_dupe_cb), vd); - menu_item_add_stock_sensitive(menu, _("Find duplicates recursive..."), GTK_STOCK_FIND, active, + menu_item_add_icon_sensitive(menu, _("Find duplicates recursive..."), GQ_ICON_FIND, active, G_CALLBACK(vd_pop_menu_dupe_rec_cb), vd); menu_item_add_divider(menu); @@ -819,7 +819,7 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd) menu_item_add(menu, _("_Copy path unquoted"), G_CALLBACK(vd_pop_menu_copy_path_unquoted_cb), vd); - menu_item_add_stock_sensitive(menu, _("_Delete..."), GTK_STOCK_DELETE, rename_delete_active, + menu_item_add_icon_sensitive(menu, _("_Delete..."), GQ_ICON_DELETE, rename_delete_active, G_CALLBACK(vd_pop_menu_delete_cb), vd); menu_item_add_divider(menu); @@ -843,7 +843,7 @@ GtkWidget *vd_pop_menu(ViewDir *vd, FileData *fd) menu_item_add_check(menu, _("Show _hidden files"), options->file_filter.show_hidden_files, G_CALLBACK(vd_toggle_show_hidden_files_cb), vd); - menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, + menu_item_add_icon(menu, _("Re_fresh"), GQ_ICON_REFRESH, G_CALLBACK(vd_pop_menu_refresh_cb), vd); return menu; @@ -1102,7 +1102,7 @@ static gboolean vd_dnd_drop_motion(GtkWidget *, GdkDragContext *context, gint x, if (vd->drop_fd) { - GtkAdjustment *adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vd->view)); + GtkAdjustment *adj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vd->view)); widget_auto_scroll_start(vd->view, adj, -1, -1, vd_auto_scroll_notify_cb, vd); } diff --git a/src/view-file/view-file-icon.cc b/src/view-file/view-file-icon.cc index 00b06742..a9a5c8ba 100644 --- a/src/view-file/view-file-icon.cc +++ b/src/view-file/view-file-icon.cc @@ -1162,7 +1162,7 @@ static gint page_height(ViewFile *vf) gint row_height; gint ret; - adj = gtk_tree_view_get_vadjustment(GTK_TREE_VIEW(vf->listview)); + adj = gtk_scrollable_get_vadjustment(GTK_SCROLLABLE(vf->listview)); page_size = static_cast(gtk_adjustment_get_page_increment(adj)); row_height = options->thumbnails.max_height + THUMB_BORDER_PADDING * 2; diff --git a/src/view-file/view-file.cc b/src/view-file/view-file.cc index b69063f2..cad419a0 100644 --- a/src/view-file/view-file.cc +++ b/src/view-file/view-file.cc @@ -692,13 +692,13 @@ GtkWidget *vf_pop_menu(ViewFile *vf) submenu_add_edit(menu, &item, G_CALLBACK(vf_pop_menu_edit_cb), vf, vf->editmenu_fd_list); gtk_widget_set_sensitive(item, active); - menu_item_add_stock_sensitive(menu, _("View in _new window"), GTK_STOCK_NEW, active, + menu_item_add_icon_sensitive(menu, _("View in _new window"), GQ_ICON_NEW, active, G_CALLBACK(vf_pop_menu_view_cb), vf); - menu_item_add_stock_sensitive(menu, _("Open archive"), GTK_STOCK_OPEN, active & class_archive, G_CALLBACK(vf_pop_menu_open_archive_cb), vf); + menu_item_add_icon_sensitive(menu, _("Open archive"), GQ_ICON_OPEN, active & class_archive, G_CALLBACK(vf_pop_menu_open_archive_cb), vf); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Copy..."), GTK_STOCK_COPY, active, + menu_item_add_icon_sensitive(menu, _("_Copy..."), GQ_ICON_COPY, active, G_CALLBACK(vf_pop_menu_copy_cb), vf); menu_item_add_sensitive(menu, _("_Move..."), active, G_CALLBACK(vf_pop_menu_move_cb), vf); @@ -709,13 +709,13 @@ GtkWidget *vf_pop_menu(ViewFile *vf) menu_item_add_sensitive(menu, _("_Copy path unquoted to clipboard"), active, G_CALLBACK(vf_pop_menu_copy_path_unquoted_cb), vf); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_move_to_trash ? _("Move to Trash...") : - _("Move to Trash"), PIXBUF_INLINE_ICON_TRASH, active, + _("Move to Trash"), GQ_ICON_DELETE, active, G_CALLBACK(vf_pop_menu_move_to_trash_cb), vf); - menu_item_add_stock_sensitive(menu, + menu_item_add_icon_sensitive(menu, options->file_ops.confirm_delete ? _("_Delete...") : - _("_Delete"), GTK_STOCK_DELETE, active, + _("_Delete"), GQ_ICON_DELETE_SHRED, active, G_CALLBACK(vf_pop_menu_delete_cb), vf); menu_item_add_divider(menu); @@ -725,7 +725,7 @@ GtkWidget *vf_pop_menu(ViewFile *vf) G_CALLBACK(vf_pop_menu_disable_grouping_cb), vf); menu_item_add_divider(menu); - menu_item_add_stock_sensitive(menu, _("_Find duplicates..."), GTK_STOCK_FIND, active, + menu_item_add_icon_sensitive(menu, _("_Find duplicates..."), GQ_ICON_FIND, active, G_CALLBACK(vf_pop_menu_duplicates_cb), vf); menu_item_add_divider(menu); @@ -773,7 +773,7 @@ GtkWidget *vf_pop_menu(ViewFile *vf) break; } - menu_item_add_stock(menu, _("Re_fresh"), GTK_STOCK_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf); + menu_item_add_icon(menu, _("Re_fresh"), GQ_ICON_REFRESH, G_CALLBACK(vf_pop_menu_refresh_cb), vf); return menu; } @@ -901,9 +901,9 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget, vf_marks_tooltip_cancel_cb, mte); generic_dialog_add_message(mte->gd, GTK_STOCK_DIALOG_QUESTION, _("Set mark text"), _("This will set or clear the mark text."), FALSE); - generic_dialog_add_button(mte->gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(mte->gd, GQ_ICON_OK, "OK", vf_marks_tooltip_ok_cb, TRUE); - generic_dialog_add_button(mte->gd, GTK_STOCK_HELP, nullptr, + generic_dialog_add_button(mte->gd, GQ_ICON_HELP, _("Help"), vf_marks_tooltip_help_cb, FALSE); table = pref_table_new(mte->gd->vbox, 3, 1, FALSE, TRUE); @@ -918,7 +918,7 @@ static gboolean vf_marks_tooltip_cb(GtkWidget *widget, generic_dialog_attach_default(mte->gd, mte->edit_widget); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(mte->edit_widget), - GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text(GTK_ENTRY(mte->edit_widget), GTK_ENTRY_ICON_SECONDARY, "Clear"); g_signal_connect(GTK_ENTRY(mte->edit_widget), "icon-press", @@ -1176,7 +1176,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf) gtk_widget_show((GTK_WIDGET(vf->file_filter.combo))); gtk_widget_set_tooltip_text(GTK_WIDGET(vf->file_filter.combo), _("Use regular expressions")); - gtk_entry_set_icon_from_icon_name(GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + gtk_entry_set_icon_from_icon_name(GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(combo_entry), GTK_ENTRY_ICON_SECONDARY, _("Clear")); g_signal_connect(GTK_ENTRY(combo_entry), "icon-press", G_CALLBACK(file_filter_clear_cb), combo_entry); @@ -1215,7 +1215,7 @@ static GtkWidget *vf_file_filter_init(ViewFile *vf) gtk_widget_show(menubar); box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, PREF_PAD_GAP); - icon = gtk_image_new_from_icon_name("pan-down", GTK_ICON_SIZE_MENU); + icon = gtk_image_new_from_icon_name(GQ_ICON_PAN_DOWN, GTK_ICON_SIZE_MENU); label = gtk_label_new(_("Class")); gtk_box_pack_start(GTK_BOX(box), label, FALSE, FALSE, 0); diff --git a/src/window.cc b/src/window.cc index f3f64a07..fc80801b 100644 --- a/src/window.cc +++ b/src/window.cc @@ -370,7 +370,7 @@ void help_search_window_show() help_search_window_cancel_cb, hsd); generic_dialog_add_message(gd, nullptr, _("Search the on-line help files.\n"), nullptr, FALSE); - generic_dialog_add_button(gd, GTK_STOCK_OK, nullptr, + generic_dialog_add_button(gd, GQ_ICON_OK, "OK", help_search_window_ok_cb, TRUE); label1 = pref_label_new(GENERIC_DIALOG(gd)->vbox, _("Search engine:")); @@ -392,7 +392,7 @@ void help_search_window_show() gtk_widget_show(hsd->edit_widget); gtk_entry_set_icon_from_icon_name(GTK_ENTRY(hsd->edit_widget), - GTK_ENTRY_ICON_SECONDARY, "edit-clear"); + GTK_ENTRY_ICON_SECONDARY, GQ_ICON_CLEAR); gtk_entry_set_icon_tooltip_text (GTK_ENTRY(hsd->edit_widget), GTK_ENTRY_ICON_SECONDARY, _("Clear")); g_signal_connect(GTK_ENTRY(hsd->edit_widget), "icon-press", -- 2.20.1