From 70a60111e00fe834e1303d87265c1aa65cb1f086 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Wed, 14 Feb 2018 04:03:57 +0100 Subject: [PATCH] avoid deprecated GtkStock --- baobab/src/baobab-chart.c | 4 +- baobab/src/baobab-remote-connect-dialog.c | 2 +- baobab/src/baobab-utils.c | 4 +- gsearchtool/src/gsearchtool-callbacks.c | 37 ++++++++++----- gsearchtool/src/gsearchtool-support.c | 6 +-- gsearchtool/src/gsearchtool-support.h | 4 +- gsearchtool/src/gsearchtool.c | 45 ++++++++++++++++--- logview/src/logview-filter-manager.c | 22 +++++++-- logview/src/logview-findbar.c | 2 +- logview/src/logview-window.c | 26 +++++------ .../libgdict/gdict-database-chooser.c | 6 ++- .../libgdict/gdict-source-chooser.c | 6 ++- .../libgdict/gdict-strategy-chooser.c | 6 ++- mate-dictionary/src/gdict-applet.c | 39 +++++++++++----- mate-dictionary/src/gdict-pref-dialog.c | 4 +- mate-dictionary/src/gdict-source-dialog.c | 12 ++--- mate-dictionary/src/gdict-window.c | 32 ++++++------- mate-screenshot/src/mate-screenshot.c | 4 +- mate-screenshot/src/screenshot-xfer.c | 2 +- 19 files changed, 175 insertions(+), 88 deletions(-) diff --git a/baobab/src/baobab-chart.c b/baobab/src/baobab-chart.c index 7848bdef6..64eedbcd6 100644 --- a/baobab/src/baobab-chart.c +++ b/baobab/src/baobab-chart.c @@ -1728,9 +1728,9 @@ baobab_chart_save_snapshot (GtkWidget *chart) fs_dlg = gtk_file_chooser_dialog_new (_("Save Snapshot"), NULL, GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, + "gtk-save", GTK_RESPONSE_ACCEPT, NULL); item = (BaobabChartItem *) priv->first_item->data; diff --git a/baobab/src/baobab-remote-connect-dialog.c b/baobab/src/baobab-remote-connect-dialog.c index 603adb9bf..c78725caf 100644 --- a/baobab/src/baobab-remote-connect-dialog.c +++ b/baobab/src/baobab-remote-connect-dialog.c @@ -723,7 +723,7 @@ baobab_remote_connect_dialog_init (BaobabRemoteConnectDialog *dialog) setup_for_type (dialog); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Scan"), diff --git a/baobab/src/baobab-utils.c b/baobab/src/baobab-utils.c index a102bc30f..1da18c126 100644 --- a/baobab/src/baobab-utils.c +++ b/baobab/src/baobab-utils.c @@ -106,9 +106,9 @@ dir_select (gboolean SEARCH, GtkWidget *parent) file_chooser = gtk_file_chooser_dialog_new (_("Select Folder"), GTK_WINDOW (parent), GTK_FILE_CHOOSER_ACTION_SELECT_FOLDER, - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, + "gtk-open", GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_show_hidden (GTK_FILE_CHOOSER (file_chooser), FALSE); diff --git a/gsearchtool/src/gsearchtool-callbacks.c b/gsearchtool/src/gsearchtool-callbacks.c index 55b1e086d..67dca06e6 100644 --- a/gsearchtool/src/gsearchtool-callbacks.c +++ b/gsearchtool/src/gsearchtool-callbacks.c @@ -369,7 +369,12 @@ display_dialog_file_open_limit (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - button = gtk_button_new_from_stock ("gtk-open"); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-open", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (button, TRUE); gtk_widget_show (button); @@ -566,7 +571,12 @@ display_dialog_folder_open_limit (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - button = gtk_button_new_from_stock ("gtk-open"); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-open", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (button, TRUE); gtk_widget_show (button); @@ -746,7 +756,12 @@ display_dialog_delete_permanently (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - button = gtk_button_new_from_stock ("gtk-delete"); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-delete", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (button, TRUE); gtk_widget_show (button); @@ -1094,7 +1109,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL); if (file_icon == NULL) { - file_icon = g_themed_icon_new (GTK_STOCK_OPEN); + file_icon = g_themed_icon_new ("gtk-open"); } image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU); @@ -1132,7 +1147,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL); if (file_icon == NULL) { - file_icon = g_themed_icon_new (GTK_STOCK_OPEN); + file_icon = g_themed_icon_new ("gtk-open"); } image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU); @@ -1167,7 +1182,7 @@ build_popup_menu_for_file (GSearchWindow * gsearch, gtk_image_menu_item_set_always_show_image (GTK_IMAGE_MENU_ITEM (new1), file_icon != NULL); if (file_icon == NULL) { - file_icon = g_themed_icon_new (GTK_STOCK_OPEN); + file_icon = g_themed_icon_new ("gtk-open"); } image1 = gtk_image_new_from_gicon (file_icon, GTK_ICON_SIZE_MENU); @@ -1514,7 +1529,7 @@ drag_begin_file_cb (GtkWidget * widget, number_of_selected_rows = gtk_tree_selection_count_selected_rows (GTK_TREE_SELECTION (gsearch->search_results_selection)); if (number_of_selected_rows > 1) { - gtk_drag_set_icon_stock (context, GTK_STOCK_DND_MULTIPLE, 0, 0); + gtk_drag_set_icon_stock (context, "gtk-dnd-multiple", 0, 0); } else if (number_of_selected_rows == 1) { GdkPixbuf * pixbuf; @@ -1538,7 +1553,7 @@ drag_begin_file_cb (GtkWidget * widget, gtk_drag_set_icon_pixbuf (context, pixbuf, 0, 0); } else { - gtk_drag_set_icon_stock (context, GTK_STOCK_DND, 0, 0); + gtk_drag_set_icon_stock (context, "gtk-dnd", 0, 0); } } } @@ -1618,8 +1633,8 @@ show_file_selector_cb (GtkAction * action, file_chooser = gtk_file_chooser_dialog_new (_("Save Search Results As..."), GTK_WINDOW (gsearch->window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + "gtk-save", GTK_RESPONSE_OK, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (file_chooser), TRUE); @@ -1727,7 +1742,7 @@ display_dialog_could_not_save_exists (GtkWidget * window, gtk_container_set_border_width (GTK_CONTAINER (dialog), 5); gtk_box_set_spacing (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), 14); - button = gsearchtool_button_new_with_stock_icon (_("_Replace"), GTK_STOCK_OK); + button = gsearchtool_button_new_with_icon (_("_Replace"), "gtk-ok"); gtk_widget_set_can_default (button, TRUE); gtk_widget_show (button); diff --git a/gsearchtool/src/gsearchtool-support.c b/gsearchtool/src/gsearchtool-support.c index 5804e378d..61f456ae3 100644 --- a/gsearchtool/src/gsearchtool-support.c +++ b/gsearchtool/src/gsearchtool-support.c @@ -1117,8 +1117,8 @@ gsearchtool_get_unique_filename (const gchar * path, } GtkWidget * -gsearchtool_button_new_with_stock_icon (const gchar * string, - const gchar * stock_id) +gsearchtool_button_new_with_icon (const gchar * string, + const gchar * icon_name) { GtkWidget * button; GtkWidget * hbox; @@ -1128,7 +1128,7 @@ gsearchtool_button_new_with_stock_icon (const gchar * string, button = gtk_button_new (); label = gtk_label_new_with_mnemonic (string); gtk_label_set_mnemonic_widget (GTK_LABEL (label), GTK_WIDGET (button)); - image = gtk_image_new_from_stock (stock_id, GTK_ICON_SIZE_BUTTON); + image = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON); hbox = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 2); gtk_box_pack_start (GTK_BOX (hbox), image, FALSE, FALSE, 0); gtk_box_pack_end (GTK_BOX (hbox), label, FALSE, FALSE, 0); diff --git a/gsearchtool/src/gsearchtool-support.h b/gsearchtool/src/gsearchtool-support.h index 15585d5da..7d9842b7f 100644 --- a/gsearchtool/src/gsearchtool-support.h +++ b/gsearchtool/src/gsearchtool-support.h @@ -93,8 +93,8 @@ gchar * gsearchtool_get_unique_filename (const gchar * path, const gchar * suffix); GtkWidget * -gsearchtool_button_new_with_stock_icon (const gchar * string, - const gchar * stock_id); +gsearchtool_button_new_with_icon (const gchar * string, + const gchar * icon_name); GSList * gsearchtool_get_columns_order (GtkTreeView * treeview); diff --git a/gsearchtool/src/gsearchtool.c b/gsearchtool/src/gsearchtool.c index eeae2ecd9..368bbe69d 100644 --- a/gsearchtool/src/gsearchtool.c +++ b/gsearchtool/src/gsearchtool.c @@ -1798,7 +1798,7 @@ handle_search_command_stderr_io (GIOChannel * ioc, gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))), hbox, FALSE, FALSE, 0); gtk_widget_show_all (hbox); - button = gsearchtool_button_new_with_stock_icon (_("Disable _Quick Search"), GTK_STOCK_OK); + button = gsearchtool_button_new_with_icon (_("Disable _Quick Search"), "gtk-ok"); gtk_widget_set_can_default (button, TRUE); gtk_widget_show (button); @@ -2051,7 +2051,12 @@ create_constraint_box (GSearchWindow * gsearch, break; } - button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-remove", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (button, FALSE); { @@ -2197,7 +2202,12 @@ create_additional_constraint_section (GSearchWindow * gsearch) _("Select a search option from the drop-down list.")); } - gsearch->available_options_add_button = gtk_button_new_from_stock (GTK_STOCK_ADD); + gsearch->available_options_add_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-add", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (gsearch->available_options_add_button, FALSE); gsearch->available_options_button_size_group = gtk_size_group_new (GTK_SIZE_GROUP_BOTH); gtk_size_group_add_widget (gsearch->available_options_button_size_group, gsearch->available_options_add_button); @@ -2877,7 +2887,14 @@ gsearch_app_create (GSearchWindow * gsearch) gtk_box_pack_start (GTK_BOX (vbox), hbox, FALSE, FALSE, 0); gtk_box_set_spacing (GTK_BOX (hbox), 6); - button = gtk_button_new_from_stock (GTK_STOCK_HELP); + + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-help", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + + gtk_widget_set_can_default (button, TRUE); gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); gtk_button_box_set_child_secondary (GTK_BUTTON_BOX (hbox), button, TRUE); @@ -2887,7 +2904,12 @@ gsearch_app_create (GSearchWindow * gsearch) add_atk_namedesc (GTK_WIDGET (button), NULL, _("Click to display the help manual.")); } - button = gtk_button_new_from_stock (GTK_STOCK_CLOSE); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-close", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_can_default (button, TRUE); g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (click_close_cb), (gpointer) gsearch); @@ -2898,8 +2920,17 @@ gsearch_app_create (GSearchWindow * gsearch) gtk_box_pack_start (GTK_BOX (hbox), button, FALSE, FALSE, 0); /* Find and Stop buttons... */ - gsearch->find_button = gtk_button_new_from_stock (GTK_STOCK_FIND); - gsearch->stop_button = gtk_button_new_from_stock (GTK_STOCK_STOP); + gsearch->find_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-find", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + + gsearch->stop_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-stop", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); gtk_widget_set_can_default (gsearch->find_button, TRUE); gtk_widget_set_can_default (gsearch->stop_button, TRUE); diff --git a/logview/src/logview-filter-manager.c b/logview/src/logview-filter-manager.c index bcfef5a9d..44a215507 100644 --- a/logview/src/logview-filter-manager.c +++ b/logview/src/logview-filter-manager.c @@ -468,7 +468,7 @@ logview_filter_manager_init (LogviewFilterManager *manager) priv->prefs = logview_prefs_get (); gtk_dialog_add_button (GTK_DIALOG(manager), - GTK_STOCK_CLOSE, + "gtk-close", GTK_RESPONSE_CLOSE); gtk_window_set_modal (GTK_WINDOW (manager), TRUE); @@ -502,9 +502,23 @@ logview_filter_manager_init (LogviewFilterManager *manager) gtk_tree_view_append_column (GTK_TREE_VIEW (priv->tree), column); - priv->add_button = gtk_button_new_from_stock (GTK_STOCK_ADD); - priv->edit_button = gtk_button_new_from_stock (GTK_STOCK_PROPERTIES); - priv->remove_button = gtk_button_new_from_stock (GTK_STOCK_REMOVE); + priv->add_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-add", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + + priv->edit_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-properties", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + + priv->remove_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-remove", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); gtk_window_set_title (GTK_WINDOW (manager), _("Filters")); diff --git a/logview/src/logview-findbar.c b/logview/src/logview-findbar.c index 0246d8d6c..846f7de5a 100644 --- a/logview/src/logview-findbar.c +++ b/logview/src/logview-findbar.c @@ -200,7 +200,7 @@ logview_findbar_init (LogviewFindbar *findbar) gtk_widget_show_all (GTK_WIDGET (priv->forward_button)); /* clear button */ - priv->clear_button = gtk_tool_button_new_from_stock (GTK_STOCK_CLEAR); + priv->clear_button = gtk_tool_button_new_from_stock ("gtk-clear"); gtk_tool_item_set_tooltip_text (priv->clear_button, _("Clear the search string")); gtk_toolbar_insert (gtoolbar, priv->clear_button, -1); diff --git a/logview/src/logview-window.c b/logview/src/logview-window.c index e20208b23..739910e05 100644 --- a/logview/src/logview-window.c +++ b/logview/src/logview-window.c @@ -325,8 +325,8 @@ logview_open_log (GtkAction *action, LogviewWindow *logview) chooser = gtk_file_chooser_dialog_new (_("Open Log"), GTK_WINDOW (logview), GTK_FILE_CHOOSER_ACTION_OPEN, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_OPEN, GTK_RESPONSE_OK, + "gtk-cancel", GTK_RESPONSE_CANCEL, + "gtk-open", GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (chooser), GTK_RESPONSE_OK); gtk_window_set_modal (GTK_WINDOW (chooser), TRUE); @@ -819,33 +819,33 @@ static GtkActionEntry entries[] = { { "FilterMenu", NULL, N_("_Filters"), NULL, NULL, NULL }, { "HelpMenu", NULL, N_("_Help"), NULL, NULL, NULL }, - { "OpenLog", GTK_STOCK_OPEN, N_("_Open..."), "O", N_("Open a log from file"), + { "OpenLog", "document-open", N_("_Open..."), "O", N_("Open a log from file"), G_CALLBACK (logview_open_log) }, - { "CloseLog", GTK_STOCK_CLOSE, N_("_Close"), "W", N_("Close this log"), + { "CloseLog", "window-close", N_("_Close"), "W", N_("Close this log"), G_CALLBACK (logview_close_log) }, - { "Quit", GTK_STOCK_QUIT, N_("_Quit"), "Q", N_("Quit the log viewer"), + { "Quit", "application-exit", N_("_Quit"), "Q", N_("Quit the log viewer"), G_CALLBACK (gtk_main_quit) }, - { "Copy", GTK_STOCK_COPY, N_("_Copy"), "C", N_("Copy the selection"), + { "Copy", "edit-copy", N_("_Copy"), "C", N_("Copy the selection"), G_CALLBACK (logview_copy) }, { "SelectAll", NULL, N_("Select _All"), "A", N_("Select the entire log"), G_CALLBACK (logview_select_all) }, - { "Search", GTK_STOCK_FIND, N_("_Find..."), "F", N_("Find a word or phrase in the log"), + { "Search", "edit-find", N_("_Find..."), "F", N_("Find a word or phrase in the log"), G_CALLBACK (logview_search) }, - { "ViewZoomIn", GTK_STOCK_ZOOM_IN, NULL, "plus", N_("Bigger text size"), + { "ViewZoomIn", "zoom-in", N_("Zoom _In"), "plus", N_("Bigger text size"), G_CALLBACK (logview_bigger_text)}, - { "ViewZoomOut", GTK_STOCK_ZOOM_OUT, NULL, "minus", N_("Smaller text size"), + { "ViewZoomOut", "zoom-out", N_("Zoom _Out"), "minus", N_("Smaller text size"), G_CALLBACK (logview_smaller_text)}, - { "ViewZoom100", GTK_STOCK_ZOOM_100, NULL, "0", N_("Normal text size"), + { "ViewZoom100", "zoom-original", N_("_Normal Size"), "0", N_("Normal text size"), G_CALLBACK (logview_normal_text)}, { "FilterManage", NULL, N_("Manage Filters"), NULL, N_("Manage filters"), G_CALLBACK (logview_manage_filters)}, - { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", N_("Open the help contents for the log viewer"), + { "HelpContents", "help-browser", N_("_Contents"), "F1", N_("Open the help contents for the log viewer"), G_CALLBACK (logview_help) }, - { "AboutAction", GTK_STOCK_ABOUT, N_("_About"), NULL, N_("Show the about dialog for the log viewer"), + { "AboutAction", "help-about", N_("_About"), NULL, N_("Show the about dialog for the log viewer"), G_CALLBACK (logview_about) }, }; @@ -1364,7 +1364,7 @@ logview_window_init (LogviewWindow *logview) priv->message_area = gtk_info_bar_new (); message_area_create_error_box (logview, priv->message_area); gtk_info_bar_add_button (GTK_INFO_BAR (priv->message_area), - GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE); + "gtk-close", GTK_RESPONSE_CLOSE); gtk_box_pack_start (GTK_BOX (main_view), priv->message_area, FALSE, FALSE, 0); /* second pane: text view */ diff --git a/mate-dictionary/libgdict/gdict-database-chooser.c b/mate-dictionary/libgdict/gdict-database-chooser.c index 37572abe1..8ccc8201d 100644 --- a/mate-dictionary/libgdict/gdict-database-chooser.c +++ b/mate-dictionary/libgdict/gdict-database-chooser.c @@ -1130,7 +1130,11 @@ gdict_database_chooser_add_button (GdictDatabaseChooser *chooser, priv = chooser->priv; - button = gtk_button_new_from_stock (button_text); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", button_text, + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); gtk_widget_set_can_default (button, TRUE); diff --git a/mate-dictionary/libgdict/gdict-source-chooser.c b/mate-dictionary/libgdict/gdict-source-chooser.c index 54b77f4ef..1579cc192 100644 --- a/mate-dictionary/libgdict/gdict-source-chooser.c +++ b/mate-dictionary/libgdict/gdict-source-chooser.c @@ -884,7 +884,11 @@ gdict_source_chooser_add_button (GdictSourceChooser *chooser, priv = chooser->priv; - button = gtk_button_new_from_stock (button_text); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", button_text, + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); gtk_widget_set_can_default (button, TRUE); diff --git a/mate-dictionary/libgdict/gdict-strategy-chooser.c b/mate-dictionary/libgdict/gdict-strategy-chooser.c index 4b6f1ecd9..a3a28112f 100644 --- a/mate-dictionary/libgdict/gdict-strategy-chooser.c +++ b/mate-dictionary/libgdict/gdict-strategy-chooser.c @@ -1074,7 +1074,11 @@ gdict_strategy_chooser_add_button (GdictStrategyChooser *chooser, priv = chooser->priv; - button = gtk_button_new_from_stock (button_text); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", button_text, + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); gtk_widget_set_can_default (button, TRUE); diff --git a/mate-dictionary/src/gdict-applet.c b/mate-dictionary/src/gdict-applet.c index 817880dd3..e8b7e62be 100644 --- a/mate-dictionary/src/gdict-applet.c +++ b/mate-dictionary/src/gdict-applet.c @@ -206,8 +206,8 @@ save_cb (GtkWidget *widget, dialog = gtk_file_chooser_dialog_new (_("Save a Copy"), GTK_WINDOW (priv->window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + "gtk-cancel", GTK_RESPONSE_CANCEL, + "gtk-save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); @@ -353,7 +353,12 @@ gdict_applet_build_window (GdictApplet *applet) gtk_box_pack_end (GTK_BOX (vbox), bbox, FALSE, FALSE, 0); gtk_widget_show (bbox); - button = gtk_button_new_from_stock (GTK_STOCK_CLEAR); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-clear", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_tooltip_text (button, _("Clear the definitions found")); set_atk_name_description (button, _("Clear definition"), @@ -363,7 +368,12 @@ gdict_applet_build_window (GdictApplet *applet) gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); gtk_widget_show (button); - button = gtk_button_new_from_stock (GTK_STOCK_PRINT); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-print", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_tooltip_text (button, _("Print the definitions found")); set_atk_name_description (button, _("Print definition"), @@ -373,7 +383,12 @@ gdict_applet_build_window (GdictApplet *applet) gtk_box_pack_start (GTK_BOX (bbox), button, FALSE, FALSE, 0); gtk_widget_show (button); - button = gtk_button_new_from_stock (GTK_STOCK_SAVE); + button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON, + "label", "gtk-save", + "use-stock", TRUE, + "use-underline", TRUE, + NULL)); + gtk_widget_set_tooltip_text (button, _("Save the definitions found")); set_atk_name_description (button, _("Save definition"), @@ -1154,25 +1169,25 @@ gdict_applet_init (GdictApplet *applet) } static const GtkActionEntry gdict_applet_menu_actions[] = { - {"DictionaryLookup", GTK_STOCK_FIND, N_("_Look Up Selected Text"), + {"DictionaryLookup", "edit-find", N_("_Look Up Selected Text"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_lookup) }, - {"DictionaryClear", GTK_STOCK_CLEAR, N_("Cl_ear"), + {"DictionaryClear", "edit-clear", N_("Cl_ear"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_clear) }, - {"DictionaryPrint", GTK_STOCK_PRINT, N_("_Print"), + {"DictionaryPrint", "document-print", N_("_Print"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_print) }, - {"DictionarySave", GTK_STOCK_SAVE, N_("_Save"), + {"DictionarySave", "document-save", N_("_Save"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_save) }, - {"DictionaryPreferences", GTK_STOCK_PREFERENCES, N_("Preferences"), + {"DictionaryPreferences", "preferences-desktop", N_("Preferences"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_preferences) }, - {"DictionaryHelp", GTK_STOCK_HELP, N_("_Help"), + {"DictionaryHelp", "help-browser", N_("_Help"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_help) }, - {"DictionaryAbout", GTK_STOCK_ABOUT, N_("_About"), + {"DictionaryAbout", "help-about", N_("_About"), NULL, NULL, G_CALLBACK (gdict_applet_cmd_about) }, }; diff --git a/mate-dictionary/src/gdict-pref-dialog.c b/mate-dictionary/src/gdict-pref-dialog.c index e35634799..ddf80f0e9 100644 --- a/mate-dictionary/src/gdict-pref-dialog.c +++ b/mate-dictionary/src/gdict-pref-dialog.c @@ -352,10 +352,10 @@ source_remove_clicked_cb (GtkWidget *widget, "dictionary source from the list.")); gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (confirm_dialog), - GTK_STOCK_REMOVE, + "gtk-remove", GTK_RESPONSE_OK); gtk_window_set_title (GTK_WINDOW (confirm_dialog), ""); diff --git a/mate-dictionary/src/gdict-source-dialog.c b/mate-dictionary/src/gdict-source-dialog.c index f79b5a4a4..3fc17de5b 100644 --- a/mate-dictionary/src/gdict-source-dialog.c +++ b/mate-dictionary/src/gdict-source-dialog.c @@ -607,7 +607,7 @@ gdict_source_dialog_constructor (GType type, /* the help button is always visible */ dialog->help_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_HELP, + "gtk-help", GTK_RESPONSE_HELP); vbox = GTK_WIDGET (gtk_builder_get_object (dialog->builder, "db-vbox")); @@ -636,15 +636,15 @@ gdict_source_dialog_constructor (GType type, /* we just allow closing the dialog */ dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, + "gtk-close", GTK_RESPONSE_CLOSE); break; case GDICT_SOURCE_DIALOG_CREATE: dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_ADD, + "gtk-add", GTK_RESPONSE_ACCEPT); /* the "add" button sensitivity is controlled by the transport_combo * since it's the only setting that makes a source usable. @@ -653,10 +653,10 @@ gdict_source_dialog_constructor (GType type, break; case GDICT_SOURCE_DIALOG_EDIT: dialog->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); dialog->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CLOSE, + "gtk-close", GTK_RESPONSE_CLOSE); break; default: diff --git a/mate-dictionary/src/gdict-window.c b/mate-dictionary/src/gdict-window.c index 07d05922f..b5e371fd6 100644 --- a/mate-dictionary/src/gdict-window.c +++ b/mate-dictionary/src/gdict-window.c @@ -964,8 +964,8 @@ gdict_window_cmd_save_as (GtkAction *action, dialog = gtk_file_chooser_dialog_new (_("Save a Copy"), GTK_WINDOW (window), GTK_FILE_CHOOSER_ACTION_SAVE, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, - GTK_STOCK_SAVE, GTK_RESPONSE_ACCEPT, + "gtk-cancel", GTK_RESPONSE_CANCEL, + "gtk-save", GTK_RESPONSE_ACCEPT, NULL); gtk_file_chooser_set_do_overwrite_confirmation (GTK_FILE_CHOOSER (dialog), TRUE); @@ -1291,40 +1291,40 @@ static const GtkActionEntry entries[] = { "Help", NULL, N_("_Help") }, /* File menu */ - { "FileNew", GTK_STOCK_NEW, N_("_New"), "N", + { "FileNew", "document-new", N_("_New"), "N", N_("New look up"), G_CALLBACK (gdict_window_cmd_file_new) }, - { "FileSaveAs", GTK_STOCK_SAVE_AS, N_("_Save a Copy..."), NULL, NULL, + { "FileSaveAs", "document-save-as", N_("_Save a Copy..."), NULL, NULL, G_CALLBACK (gdict_window_cmd_save_as) }, { "FilePreview", NULL, N_("P_review..."), "P", N_("Preview this document"), G_CALLBACK (gdict_window_cmd_file_preview) }, - { "FilePrint", GTK_STOCK_PRINT, N_("_Print..."), "P", + { "FilePrint", "document-print", N_("_Print..."), "P", N_("Print this document"), G_CALLBACK (gdict_window_cmd_file_print) }, - { "FileCloseWindow", GTK_STOCK_CLOSE, NULL, "W", NULL, + { "FileCloseWindow", "window-close", N_("_Close"), "W", NULL, G_CALLBACK (gdict_window_cmd_file_close_window) }, /* Edit menu */ - { "EditCopy", GTK_STOCK_COPY, NULL, "C", NULL, + { "EditCopy", "edit-copy", N_("_Copy"), "C", NULL, G_CALLBACK (gdict_window_cmd_edit_copy) }, { "EditSelectAll", NULL, N_("Select _All"), "A", NULL, G_CALLBACK (gdict_window_cmd_edit_select_all) }, - { "EditFind", GTK_STOCK_FIND, NULL, "F", + { "EditFind", "edit-find", N_("_Find"), "F", N_("Find a word or phrase in the document"), G_CALLBACK (gdict_window_cmd_edit_find) }, { "EditFindNext", NULL, N_("Find Ne_xt"), "G", NULL, G_CALLBACK (gdict_window_cmd_edit_find_next) }, { "EditFindPrevious", NULL, N_("Find Pre_vious"), "G", NULL, G_CALLBACK (gdict_window_cmd_edit_find_previous) }, - { "EditPreferences", GTK_STOCK_PREFERENCES, N_("_Preferences"), NULL, NULL, + { "EditPreferences", "preferences-desktop", N_("_Preferences"), NULL, NULL, G_CALLBACK (gdict_window_cmd_edit_preferences) }, /* Go menu */ - { "GoPreviousDef", GTK_STOCK_GO_BACK, N_("_Previous Definition"), "Page_Up", + { "GoPreviousDef", "go-previous", N_("_Previous Definition"), "Page_Up", N_("Go to the previous definition"), G_CALLBACK (gdict_window_cmd_go_previous_def) }, - { "GoNextDef", GTK_STOCK_GO_FORWARD, N_("_Next Definition"), "Page_Down", + { "GoNextDef", "go-next", N_("_Next Definition"), "Page_Down", N_("Go to the next definition"), G_CALLBACK (gdict_window_cmd_go_next_def) }, - { "GoFirstDef", GTK_STOCK_GOTO_FIRST, N_("_First Definition"), "Home", + { "GoFirstDef", "go-first", N_("_First Definition"), "Home", N_("Go to the first definition"), G_CALLBACK (gdict_window_cmd_go_first_def) }, - { "GoLastDef", GTK_STOCK_GOTO_LAST, N_("_Last Definition"), "End", + { "GoLastDef", "go-last", N_("_Last Definition"), "End", N_("Go to the last definition"), G_CALLBACK (gdict_window_cmd_go_last_def) }, /* View menu */ @@ -1338,15 +1338,15 @@ static const GtkActionEntry entries[] = G_CALLBACK (gdict_window_cmd_view_strategies), }, /* Help menu */ - { "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1", NULL, + { "HelpContents", "help-browser", N_("_Contents"), "F1", NULL, G_CALLBACK (gdict_window_cmd_help_contents) }, - { "HelpAbout", GTK_STOCK_ABOUT, N_("_About"), NULL, NULL, + { "HelpAbout", "help-about", N_("_About"), NULL, NULL, G_CALLBACK (gdict_window_cmd_help_about) }, /* Accelerators */ { "Lookup", NULL, "", "L", NULL, G_CALLBACK (gdict_window_cmd_lookup) }, { "Escape", NULL, "", "Escape", "", G_CALLBACK (gdict_window_cmd_escape) }, - { "Slash", GTK_STOCK_FIND, NULL, "slash", NULL, G_CALLBACK (gdict_window_cmd_edit_find) }, + { "Slash", "edit-find", NULL, "slash", NULL, G_CALLBACK (gdict_window_cmd_edit_find) }, }; static const GtkToggleActionEntry toggle_entries[] = { diff --git a/mate-screenshot/src/mate-screenshot.c b/mate-screenshot/src/mate-screenshot.c index e4251fed6..145296246 100644 --- a/mate-screenshot/src/mate-screenshot.c +++ b/mate-screenshot/src/mate-screenshot.c @@ -526,8 +526,8 @@ create_interactive_dialog (void) create_screenshot_frame (main_vbox, _("Take Screenshot")); create_effects_frame (main_vbox, _("Effects")); gtk_dialog_add_buttons (GTK_DIALOG (retval), - GTK_STOCK_HELP, GTK_RESPONSE_HELP, - GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL, + "gtk-help", GTK_RESPONSE_HELP, + "gtk-cancel", GTK_RESPONSE_CANCEL, _("Take _Screenshot"), GTK_RESPONSE_OK, NULL); gtk_dialog_set_default_response (GTK_DIALOG (retval), GTK_RESPONSE_OK); diff --git a/mate-screenshot/src/screenshot-xfer.c b/mate-screenshot/src/screenshot-xfer.c index a4cfeac18..eaf09121a 100644 --- a/mate-screenshot/src/screenshot-xfer.c +++ b/mate-screenshot/src/screenshot-xfer.c @@ -76,7 +76,7 @@ do_run_overwrite_confirm_dialog (gpointer _data) "Would you like to replace it?"), data->basename); gtk_dialog_add_button (GTK_DIALOG (dialog), - GTK_STOCK_CANCEL, + "gtk-cancel", GTK_RESPONSE_CANCEL); gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Replace"),