Skip to content

Commit a518a93

Browse files
sc0wsc0w
committed
avoid gtk_dialog_add_buttons with stock ids
1 parent 3975311 commit a518a93

File tree

8 files changed

+99
-47
lines changed

8 files changed

+99
-47
lines changed

‎mate-panel/libpanel-util/panel-gtk.c‎

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -81,3 +81,23 @@ panel_gtk_file_chooser_add_image_preview (GtkFileChooser *chooser)
8181
/*
8282
* End of code coming from panel-properties-dialog.c
8383
*/
84+
85+
GtkWidget*
86+
panel_dialog_add_button (GtkDialog *dialog,
87+
const gchar *button_text,
88+
const gchar *icon_name,
89+
gint response_id)
90+
{
91+
GtkWidget *button;
92+
93+
button = gtk_button_new_with_mnemonic (button_text);
94+
gtk_button_set_image (GTK_BUTTON (button), gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON));
95+
96+
gtk_button_set_use_underline (GTK_BUTTON (button), TRUE);
97+
gtk_style_context_add_class (gtk_widget_get_style_context (button), "text-button");
98+
gtk_widget_set_can_default (button, TRUE);
99+
gtk_widget_show (button);
100+
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
101+
102+
return button;
103+
}

‎mate-panel/libpanel-util/panel-gtk.h‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -35,6 +35,11 @@ extern "C" {
3535

3636
void panel_gtk_file_chooser_add_image_preview (GtkFileChooser *chooser);
3737

38+
GtkWidget* panel_dialog_add_button (GtkDialog *dialog,
39+
const gchar *button_text,
40+
const gchar *icon_name,
41+
gint response_id);
42+
3843
#ifdef __cplusplus
3944
}
4045
#endif

‎mate-panel/panel-addto.c‎

Lines changed: 17 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,7 @@
3333

3434
#include <libpanel-util/panel-glib.h>
3535
#include <libpanel-util/panel-show.h>
36+
#include <libpanel-util/panel-gtk.h>
3637

3738
#include "launcher.h"
3839
#include "panel.h"
@@ -1220,17 +1221,22 @@ panel_addto_dialog_new (PanelWidget *panel_widget)
12201221
dialog);
12211222

12221223
dialog->addto_dialog = gtk_dialog_new ();
1223-
gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1224-
"gtk-help", GTK_RESPONSE_HELP);
1225-
dialog->back_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1226-
"gtk-go-back",
1227-
PANEL_ADDTO_RESPONSE_BACK);
1228-
dialog->add_button = gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1229-
"gtk-add",
1230-
PANEL_ADDTO_RESPONSE_ADD);
1231-
gtk_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1232-
"gtk-close",
1233-
GTK_RESPONSE_CLOSE);
1224+
1225+
panel_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1226+
_("_Help"), "help-browser", GTK_RESPONSE_HELP);
1227+
1228+
dialog->back_button = panel_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1229+
_("_Back"), "go-previous",
1230+
PANEL_ADDTO_RESPONSE_BACK);
1231+
1232+
dialog->add_button = panel_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1233+
_("_Add"), "list-add",
1234+
PANEL_ADDTO_RESPONSE_ADD);
1235+
1236+
panel_dialog_add_button (GTK_DIALOG (dialog->addto_dialog),
1237+
_("_Close"), "window-close",
1238+
GTK_RESPONSE_CLOSE);
1239+
12341240
gtk_widget_set_sensitive (GTK_WIDGET (dialog->add_button), FALSE);
12351241

12361242
gtk_dialog_set_default_response (GTK_DIALOG (dialog->addto_dialog),

‎mate-panel/panel-applet-frame.c‎

Lines changed: 10 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -33,6 +33,8 @@
3333
#include <gdk/gdk.h>
3434
#include <gdk/gdkx.h>
3535

36+
#include <libpanel-util/panel-gtk.h>
37+
3638
#include "panel-applets-manager.h"
3739
#include "panel-profile.h"
3840
#include "panel.h"
@@ -948,17 +950,18 @@ mate_panel_applet_frame_loading_failed (const char *iid,
948950
g_free (problem_txt);
949951

950952
if (locked_down) {
951-
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
952-
"gtk-ok", LOADING_FAILED_RESPONSE_DONT_DELETE,
953-
NULL);
953+
panel_dialog_add_button (GTK_DIALOG (dialog),
954+
_("_OK"), "gtk-ok", LOADING_FAILED_RESPONSE_DONT_DELETE);
954955
} else {
955956
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
956957
_("Do you want to delete the applet "
957958
"from your configuration?"));
958-
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
959-
PANEL_STOCK_DONT_DELETE, LOADING_FAILED_RESPONSE_DONT_DELETE,
960-
"gtk-delete", LOADING_FAILED_RESPONSE_DELETE,
961-
NULL);
959+
960+
gtk_dialog_add_button (GTK_DIALOG (dialog),
961+
PANEL_STOCK_DONT_DELETE, LOADING_FAILED_RESPONSE_DONT_DELETE);
962+
963+
panel_dialog_add_button (GTK_DIALOG (dialog),
964+
_("_Delete"), "edit-delete", LOADING_FAILED_RESPONSE_DELETE);
962965
}
963966

964967
gtk_dialog_set_default_response (GTK_DIALOG (dialog),

‎mate-panel/panel-ditem-editor.c‎

Lines changed: 21 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,7 @@
3434
#include <libpanel-util/panel-keyfile.h>
3535
#include <libpanel-util/panel-show.h>
3636
#include <libpanel-util/panel-xdg.h>
37+
#include <libpanel-util/panel-gtk.h>
3738

3839
#include "panel-ditem-editor.h"
3940
#include "panel-icon-names.h"
@@ -648,24 +649,29 @@ panel_ditem_editor_make_ui (PanelDItemEditor *dialog)
648649
gtk_label_set_mnemonic_widget (GTK_LABEL (priv->comment_label),
649650
priv->comment_entry);
650651

651-
priv->help_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
652-
"gtk-help",
653-
GTK_RESPONSE_HELP);
654-
priv->revert_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
655-
"gtk-revert-to-saved",
656-
REVERT_BUTTON);
652+
priv->help_button = panel_dialog_add_button (GTK_DIALOG (dialog),
653+
_("_Help"), "help-browser",
654+
GTK_RESPONSE_HELP);
655+
656+
priv->revert_button = panel_dialog_add_button (GTK_DIALOG (dialog),
657+
_("_Revert"), "document-revert",
658+
REVERT_BUTTON);
659+
657660
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
658661
REVERT_BUTTON,
659662
FALSE);
660-
priv->close_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
661-
"gtk-close",
662-
GTK_RESPONSE_CLOSE);
663-
priv->cancel_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
664-
"gtk-cancel",
665-
GTK_RESPONSE_CANCEL);
666-
priv->ok_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
667-
"gtk-ok",
668-
GTK_RESPONSE_OK);
663+
664+
priv->close_button = panel_dialog_add_button (GTK_DIALOG (dialog),
665+
_("_Close"), "window-close",
666+
GTK_RESPONSE_CLOSE);
667+
668+
priv->cancel_button = panel_dialog_add_button (GTK_DIALOG (dialog),
669+
_("_Cancel"), "process-stop",
670+
GTK_RESPONSE_CANCEL);
671+
672+
priv->ok_button = panel_dialog_add_button (GTK_DIALOG (dialog),
673+
_("_OK"), "gtk-ok",
674+
GTK_RESPONSE_OK);
669675

670676
/* FIXME: There needs to be a way to edit ALL keys/sections */
671677
}

‎mate-panel/panel-force-quit.c‎

Lines changed: 9 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -34,6 +34,8 @@
3434

3535
#include <X11/extensions/XInput2.h>
3636

37+
#include <libpanel-util/panel-gtk.h>
38+
3739
#include "panel-icon-names.h"
3840
#include "panel-stock-icons.h"
3941

@@ -224,12 +226,13 @@ kill_window_question (gpointer window)
224226
"to exit, unsaved changes in any open documents "
225227
"in it might get lost."));
226228

227-
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
228-
"gtk-cancel",
229-
GTK_RESPONSE_CANCEL,
230-
PANEL_STOCK_FORCE_QUIT,
231-
GTK_RESPONSE_ACCEPT,
232-
NULL);
229+
panel_dialog_add_button (GTK_DIALOG (dialog),
230+
_("_Cancel"), "process-stop",
231+
GTK_RESPONSE_CANCEL);
232+
233+
gtk_dialog_add_button (GTK_DIALOG (dialog),
234+
PANEL_STOCK_FORCE_QUIT,
235+
GTK_RESPONSE_ACCEPT);
233236

234237
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
235238
GTK_RESPONSE_CANCEL);

‎mate-panel/panel-recent.c‎

Lines changed: 8 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@
3131

3232
#include <libpanel-util/panel-error.h>
3333
#include <libpanel-util/panel-show.h>
34+
#include <libpanel-util/panel-gtk.h>
3435

3536
#include "menu.h"
3637
#include "panel-util.h"
@@ -150,10 +151,13 @@ recent_documents_clear_cb (GtkMenuItem *menuitem,
150151
"\342\200\242 All items from the Places \342\206\222 Recent Documents menu item.\n"
151152
"\342\200\242 All items from the recent documents list in all applications."));
152153

153-
gtk_dialog_add_buttons (GTK_DIALOG (clear_recent_dialog),
154-
"gtk-cancel", GTK_RESPONSE_CANCEL,
155-
PANEL_STOCK_CLEAR, GTK_RESPONSE_ACCEPT,
156-
NULL);
154+
panel_dialog_add_button (GTK_DIALOG (clear_recent_dialog),
155+
_("_Cancel"), "process-stop",
156+
GTK_RESPONSE_CANCEL);
157+
158+
gtk_dialog_add_button (GTK_DIALOG (clear_recent_dialog),
159+
PANEL_STOCK_CLEAR,
160+
GTK_RESPONSE_ACCEPT);
157161

158162
gtk_container_set_border_width (GTK_CONTAINER (clear_recent_dialog), 6);
159163

‎mate-panel/panel.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -22,6 +22,7 @@
2222
#include <gtk/gtkx.h> /* for GTK_IS_SOCKET */
2323

2424
#include <libpanel-util/panel-glib.h>
25+
#include <libpanel-util/panel-gtk.h>
2526

2627
#include "panel.h"
2728

@@ -1342,10 +1343,14 @@ panel_deletion_dialog (PanelToplevel *toplevel)
13421343

13431344
gtk_message_dialog_format_secondary_text (GTK_MESSAGE_DIALOG (dialog),
13441345
"%s", text2);
1345-
gtk_dialog_add_buttons (GTK_DIALOG (dialog),
1346-
"gtk-cancel", GTK_RESPONSE_CANCEL,
1347-
"gtk-delete", GTK_RESPONSE_OK,
1348-
NULL);
1346+
1347+
panel_dialog_add_button (GTK_DIALOG (dialog),
1348+
_("_Cancel"), "process-stop",
1349+
GTK_RESPONSE_CANCEL);
1350+
1351+
panel_dialog_add_button (GTK_DIALOG (dialog),
1352+
_("_Delete"), "edit-delete",
1353+
GTK_RESPONSE_OK);
13491354

13501355
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
13511356

0 commit comments

Comments
 (0)