From 70a60111e00fe834e1303d87265c1aa65cb1f086 Mon Sep 17 00:00:00 2001 From: Pablo Barciela Date: Wed, 14 Feb 2018 04:03:57 +0100 Subject: avoid deprecated GtkStock --- logview/src/logview-filter-manager.c | 22 ++++++++++++++++++---- logview/src/logview-findbar.c | 2 +- logview/src/logview-window.c | 26 +++++++++++++------------- 3 files changed, 32 insertions(+), 18 deletions(-) (limited to 'logview/src') diff --git a/logview/src/logview-filter-manager.c b/logview/src/logview-filter-manager.c index bcfef5a9..44a21550 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 0246d8d6..846f7de5 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 e20208b2..739910e0 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 */ -- cgit v1.2.1