Skip to content

Commit 36bcd30

Browse files
sc0wraveit65
authored andcommitted
avoid deprecated GtkStock
1 parent 77f8101 commit 36bcd30

File tree

6 files changed

+35
-17
lines changed

6 files changed

+35
-17
lines changed

src/interface.cpp

+6-6
Original file line numberDiff line numberDiff line change
@@ -53,9 +53,9 @@ static const GtkActionEntry menu_entries[] =
5353
{ "View", NULL, N_("_View") },
5454
{ "Help", NULL, N_("_Help") },
5555

56-
{ "Lsof", GTK_STOCK_FIND, N_("Search for _Open Files"), "<control>O",
56+
{ "Lsof", "edit-find", N_("Search for _Open Files"), "<control>O",
5757
N_("Search for open files"), G_CALLBACK(cb_show_lsof) },
58-
{ "Quit", GTK_STOCK_QUIT, NULL, NULL,
58+
{ "Quit", "application-exit", N_("_Quit"), "<control>Q",
5959
N_("Quit the program"), G_CALLBACK (cb_app_exit) },
6060

6161

@@ -70,10 +70,10 @@ static const GtkActionEntry menu_entries[] =
7070
N_("Force process to finish immediately"), G_CALLBACK (cb_kill_process) },
7171
{ "ChangePriority", NULL, N_("_Change Priority"), NULL,
7272
N_("Change the order of priority of process"), NULL },
73-
{ "Preferences", GTK_STOCK_PREFERENCES, NULL, NULL,
73+
{ "Preferences", "preferences-desktop", N_("_Preferences"), NULL,
7474
N_("Configure the application"), G_CALLBACK (cb_edit_preferences) },
7575

76-
{ "Refresh", GTK_STOCK_REFRESH, N_("_Refresh"), "<control>R",
76+
{ "Refresh", "view-refresh", N_("_Refresh"), "<control>R",
7777
N_("Refresh the process list"), G_CALLBACK(cb_user_refresh) },
7878

7979
{ "MemoryMaps", NULL, N_("_Memory Maps"), "<control>M",
@@ -85,9 +85,9 @@ static const GtkActionEntry menu_entries[] =
8585
N_("View additional information about a process"), G_CALLBACK (cb_show_process_properties) },
8686

8787

88-
{ "HelpContents", GTK_STOCK_HELP, N_("_Contents"), "F1",
88+
{ "HelpContents", "help-browser", N_("_Contents"), "F1",
8989
N_("Open the manual"), G_CALLBACK (cb_help_contents) },
90-
{ "About", GTK_STOCK_ABOUT, NULL, NULL,
90+
{ "About", "help-about", N_("_About"), NULL,
9191
N_("About this application"), G_CALLBACK (cb_about) }
9292
};
9393

src/lsof.cpp

+21-3
Original file line numberDiff line numberDiff line change
@@ -338,9 +338,21 @@ void procman_lsof(ProcData *procdata)
338338
GtkWidget *entry = gtk_entry_new();
339339

340340
gtk_box_pack_start(GTK_BOX(hbox), entry, TRUE, TRUE, 0);
341-
GtkWidget *search_button = gtk_button_new_from_stock(GTK_STOCK_FIND);
341+
342+
GtkWidget *search_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
343+
"label", "gtk-find",
344+
"use-stock", TRUE,
345+
"use-underline", TRUE,
346+
NULL));
347+
342348
gtk_box_pack_start(GTK_BOX(hbox), search_button, FALSE, FALSE, 0);
343-
GtkWidget *clear_button = gtk_button_new_from_stock(GTK_STOCK_CLEAR);
349+
350+
GtkWidget *clear_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
351+
"label", "gtk-clear",
352+
"use-stock", TRUE,
353+
"use-underline", TRUE,
354+
NULL));
355+
344356
/* The default accelerator collides with the default close accelerator. */
345357
gtk_button_set_label(GTK_BUTTON(clear_button), _("C_lear"));
346358
gtk_box_pack_start(GTK_BOX(hbox), clear_button, FALSE, FALSE, 0);
@@ -370,7 +382,13 @@ void procman_lsof(ProcData *procdata)
370382
gtk_box_pack_start(GTK_BOX(mainbox), scrolled, TRUE, TRUE, 0);
371383

372384
GtkWidget *bottom_box = gtk_box_new(GTK_ORIENTATION_HORIZONTAL, 12);
373-
GtkWidget *close_button = gtk_button_new_from_stock(GTK_STOCK_CLOSE);
385+
386+
GtkWidget *close_button = GTK_WIDGET (g_object_new (GTK_TYPE_BUTTON,
387+
"label", "gtk-close",
388+
"use-stock", TRUE,
389+
"use-underline", TRUE,
390+
NULL));
391+
374392
gtk_box_pack_start(GTK_BOX(mainbox), bottom_box, FALSE, FALSE, 0);
375393
gtk_box_pack_end(GTK_BOX(bottom_box), close_button, FALSE, FALSE, 0);
376394

src/memmaps.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -431,7 +431,7 @@ create_single_memmaps_dialog (GtkTreeModel *model, GtkTreePath *path,
431431

432432
memmapsdialog = gtk_dialog_new_with_buttons (_("Memory Maps"), GTK_WINDOW (procdata->app),
433433
GTK_DIALOG_DESTROY_WITH_PARENT,
434-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
434+
"gtk-close", GTK_RESPONSE_CLOSE,
435435
NULL);
436436
gtk_window_set_resizable(GTK_WINDOW(memmapsdialog), TRUE);
437437
gtk_window_set_default_size(GTK_WINDOW(memmapsdialog), 620, 400);

src/openfiles.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -323,7 +323,7 @@ create_single_openfiles_dialog (GtkTreeModel *model, GtkTreePath *path,
323323

324324
openfilesdialog = gtk_dialog_new_with_buttons (_("Open Files"), NULL,
325325
GTK_DIALOG_DESTROY_WITH_PARENT,
326-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
326+
"gtk-close", GTK_RESPONSE_CLOSE,
327327
NULL);
328328
gtk_window_set_resizable (GTK_WINDOW (openfilesdialog), TRUE);
329329
gtk_window_set_default_size (GTK_WINDOW (openfilesdialog), 575, 400);

src/procdialogs.cpp

+5-5
Original file line numberDiff line numberDiff line change
@@ -104,7 +104,7 @@ procdialog_create_kill_dialog (ProcData *procdata, int signal)
104104
secondary);
105105

106106
gtk_dialog_add_buttons (GTK_DIALOG (kill_alert_dialog),
107-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
107+
"gtk-cancel", GTK_RESPONSE_CANCEL,
108108
button_text, GTK_RESPONSE_OK,
109109
NULL);
110110

@@ -171,7 +171,7 @@ procdialog_create_renice_dialog (ProcData *procdata)
171171
info->name, info->pid);
172172
dialog = gtk_dialog_new_with_buttons (dialog_title, NULL,
173173
GTK_DIALOG_DESTROY_WITH_PARENT,
174-
GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL,
174+
"gtk-cancel", GTK_RESPONSE_CANCEL,
175175
NULL);
176176
g_free (dialog_title);
177177

@@ -182,7 +182,7 @@ procdialog_create_renice_dialog (ProcData *procdata)
182182
button = gtk_button_new_with_mnemonic (_("Change _Priority"));
183183
gtk_widget_set_can_default (button, TRUE);
184184

185-
icon = gtk_image_new_from_stock (GTK_STOCK_OK, GTK_ICON_SIZE_BUTTON);
185+
icon = gtk_image_new_from_stock ("gtk-ok", GTK_ICON_SIZE_BUTTON);
186186
gtk_button_set_image (GTK_BUTTON (button), icon);
187187

188188
gtk_dialog_add_action_widget (GTK_DIALOG (renice_dialog), button, 100);
@@ -531,8 +531,8 @@ procdialog_create_preferences_dialog (ProcData *procdata)
531531
dialog = gtk_dialog_new_with_buttons (_("System Monitor Preferences"),
532532
GTK_WINDOW (procdata->app),
533533
GTK_DIALOG_DESTROY_WITH_PARENT,
534-
GTK_STOCK_HELP, GTK_RESPONSE_HELP,
535-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
534+
"gtk-help", GTK_RESPONSE_HELP,
535+
"gtk-close", GTK_RESPONSE_CLOSE,
536536
NULL);
537537
/* FIXME: we should not declare the window size, but let it's */
538538
/* driven by window childs. The problem is that the fields list */

src/procproperties.cpp

+1-1
Original file line numberDiff line numberDiff line change
@@ -241,7 +241,7 @@ create_single_procproperties_dialog (GtkTreeModel *model, GtkTreePath *path,
241241

242242
procpropdialog = gtk_dialog_new_with_buttons (_("Process Properties"), NULL,
243243
GTK_DIALOG_DESTROY_WITH_PARENT,
244-
GTK_STOCK_CLOSE, GTK_RESPONSE_CLOSE,
244+
"gtk-close", GTK_RESPONSE_CLOSE,
245245
NULL);
246246
gtk_window_set_resizable (GTK_WINDOW (procpropdialog), TRUE);
247247
gtk_window_set_default_size (GTK_WINDOW (procpropdialog), 575, 400);

0 commit comments

Comments
 (0)