Skip to content

Commit 68fb5e4

Browse files
sc0wsc0w
committed
avoid gtk_dialog_add_buttons with stock ids
1 parent dfb6585 commit 68fb5e4

File tree

8 files changed

+65
-30
lines changed

8 files changed

+65
-30
lines changed

‎eel/eel-stock-dialogs.c‎

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -191,7 +191,7 @@ trash_dialog_response_callback (GtkDialog *dialog,
191191
gtk_widget_destroy (GTK_WIDGET (dialog));
192192
}
193193

194-
void
194+
GtkWidget*
195195
eel_dialog_add_button (GtkDialog *dialog,
196196
const gchar *button_text,
197197
const gchar *icon_name,
@@ -207,6 +207,8 @@ eel_dialog_add_button (GtkDialog *dialog,
207207
gtk_widget_set_can_default (button, TRUE);
208208
gtk_widget_show (button);
209209
gtk_dialog_add_action_widget (GTK_DIALOG (dialog), button, response_id);
210+
211+
return button;
210212
}
211213

212214
static gboolean

‎eel/eel-stock-dialogs.h‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ int eel_run_simple_dialog (GtkWidget *parent,
4949
const char *primary_text,
5050
const char *secondary_text,
5151
...);
52-
void eel_dialog_add_button (GtkDialog *dialog,
52+
GtkWidget* eel_dialog_add_button (GtkDialog *dialog,
5353
const gchar *button_text,
5454
const gchar *icon_name,
5555
gint response_id);

‎libcaja-private/caja-mime-actions.c‎

Lines changed: 16 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -814,7 +814,12 @@ get_executable_text_file_action (GtkWindow *parent_window, CajaFile *file)
814814
_("Run in _Terminal"), RESPONSE_RUN_IN_TERMINAL,
815815
_("_Display"), RESPONSE_DISPLAY,
816816
parent_window);
817-
gtk_dialog_add_button (dialog, "gtk-cancel", GTK_RESPONSE_CANCEL);
817+
818+
eel_dialog_add_button (dialog,
819+
_("_Cancel"),
820+
"process-stop",
821+
GTK_RESPONSE_CANCEL);
822+
818823
gtk_dialog_add_button (dialog, _("_Run"), RESPONSE_RUN);
819824
gtk_dialog_set_default_response (dialog, GTK_RESPONSE_CANCEL);
820825
gtk_widget_show (GTK_WIDGET (dialog));
@@ -1361,7 +1366,10 @@ show_unhandled_type_error (ActivateParametersInstall *parameters)
13611366

13621367
gtk_dialog_add_button (GTK_DIALOG (dialog), _("_Select Application"), GTK_RESPONSE_ACCEPT);
13631368

1364-
gtk_dialog_add_button (GTK_DIALOG (dialog), "gtk-ok", GTK_RESPONSE_OK);
1369+
eel_dialog_add_button (GTK_DIALOG (dialog),
1370+
_("_OK"),
1371+
"gtk-ok",
1372+
GTK_RESPONSE_OK);
13651373

13661374
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_OK);
13671375

@@ -1713,8 +1721,12 @@ activate_desktop_file (ActivateParameters *parameters,
17131721
gtk_dialog_add_button (GTK_DIALOG (dialog),
17141722
_("Mark as _Trusted"), RESPONSE_MARK_TRUSTED);
17151723
}
1716-
gtk_dialog_add_button (GTK_DIALOG (dialog),
1717-
"gtk-cancel", GTK_RESPONSE_CANCEL);
1724+
1725+
eel_dialog_add_button (GTK_DIALOG (dialog),
1726+
_("_Cancel"),
1727+
"process-stop",
1728+
GTK_RESPONSE_CANCEL);
1729+
17181730
gtk_dialog_set_default_response (GTK_DIALOG (dialog), GTK_RESPONSE_CANCEL);
17191731

17201732
g_signal_connect (dialog, "response",

‎libcaja-private/caja-open-with-dialog.c‎

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -931,15 +931,18 @@ caja_open_with_dialog_init (CajaOpenWithDialog *dialog)
931931
gtk_widget_show (GTK_WIDGET (dialog->details->checkbox));
932932
gtk_box_pack_start (GTK_BOX (vbox), dialog->details->checkbox, FALSE, FALSE, 0);
933933

934-
gtk_dialog_add_button (GTK_DIALOG (dialog),
935-
"gtk-remove",
934+
eel_dialog_add_button (GTK_DIALOG (dialog),
935+
_("_Remove"),
936+
"list-remove",
936937
RESPONSE_REMOVE);
938+
937939
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
938940
RESPONSE_REMOVE,
939941
FALSE);
940942

941-
gtk_dialog_add_button (GTK_DIALOG (dialog),
942-
"gtk-cancel",
943+
eel_dialog_add_button (GTK_DIALOG (dialog),
944+
_("_Cancel"),
945+
"process-stop",
943946
GTK_RESPONSE_CANCEL);
944947

945948

‎src/caja-connect-server-dialog.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1113,14 +1113,16 @@ caja_connect_server_dialog_init (CajaConnectServerDialog *dialog)
11131113
G_BINDING_DEFAULT |
11141114
G_BINDING_SYNC_CREATE);
11151115

1116-
1117-
1118-
gtk_dialog_add_button (GTK_DIALOG (dialog),
1119-
"gtk-help",
1116+
eel_dialog_add_button (GTK_DIALOG (dialog),
1117+
_("_Help"),
1118+
"help-browser",
11201119
GTK_RESPONSE_HELP);
1121-
gtk_dialog_add_button (GTK_DIALOG (dialog),
1122-
"gtk-cancel",
1120+
1121+
eel_dialog_add_button (GTK_DIALOG (dialog),
1122+
_("_Cancel"),
1123+
"process-stop",
11231124
GTK_RESPONSE_CANCEL);
1125+
11241126
connect_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
11251127
_("C_onnect"),
11261128
RESPONSE_CONNECT);

‎src/caja-location-dialog.c‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -185,15 +185,21 @@ caja_location_dialog_init (CajaLocationDialog *dialog)
185185
gtk_box_pack_start (GTK_BOX (gtk_dialog_get_content_area (GTK_DIALOG (dialog))),
186186
box, FALSE, TRUE, 0);
187187

188-
gtk_dialog_add_button (GTK_DIALOG (dialog),
189-
"gtk-help",
188+
eel_dialog_add_button (GTK_DIALOG (dialog),
189+
_("_Help"),
190+
"help-browser",
190191
GTK_RESPONSE_HELP);
191-
gtk_dialog_add_button (GTK_DIALOG (dialog),
192-
"gtk-cancel",
192+
193+
eel_dialog_add_button (GTK_DIALOG (dialog),
194+
_("_Cancel"),
195+
"process-stop",
193196
GTK_RESPONSE_CANCEL);
194-
gtk_dialog_add_button (GTK_DIALOG (dialog),
195-
"gtk-open",
197+
198+
eel_dialog_add_button (GTK_DIALOG (dialog),
199+
_("_Open"),
200+
"document-open",
196201
RESPONSE_OPEN);
202+
197203
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
198204
RESPONSE_OPEN);
199205

‎src/file-manager/fm-directory-view.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1337,8 +1337,10 @@ action_save_search_as_callback (GtkAction *action,
13371337
0,
13381338
"gtk-cancel", GTK_RESPONSE_CANCEL,
13391339
NULL);
1340-
save_button = gtk_dialog_add_button (GTK_DIALOG (dialog),
1341-
"gtk-save", GTK_RESPONSE_OK);
1340+
1341+
save_button = eel_dialog_add_button (GTK_DIALOG (dialog), _("_Save"),
1342+
"document-save", GTK_RESPONSE_OK);
1343+
13421344
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
13431345
GTK_RESPONSE_OK);
13441346
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -10269,8 +10271,11 @@ ask_link_action (FMDirectoryView *view)
1026910271

1027010272
gtk_dialog_add_button (GTK_DIALOG (dialog),
1027110273
_("Make a _Link"), 0);
10272-
gtk_dialog_add_button (GTK_DIALOG (dialog),
10273-
"gtk-cancel", 1);
10274+
10275+
eel_dialog_add_button (GTK_DIALOG (dialog),
10276+
_("_Cancel"),
10277+
"process-stop", 1);
10278+
1027410279
gtk_dialog_add_button (GTK_DIALOG (dialog),
1027510280
_("_Download"), 2);
1027610281

‎src/file-manager/fm-properties-window.c‎

Lines changed: 9 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -5168,10 +5168,15 @@ create_properties_window (StartupData *startup_data)
51685168
/* append pages from available views */
51695169
append_extension_pages (window);
51705170

5171-
gtk_dialog_add_buttons (GTK_DIALOG (window),
5172-
"gtk-help", GTK_RESPONSE_HELP,
5173-
"gtk-close", GTK_RESPONSE_CLOSE,
5174-
NULL);
5171+
eel_dialog_add_button (GTK_DIALOG (window),
5172+
_("_Help"),
5173+
"help-browser",
5174+
GTK_RESPONSE_HELP);
5175+
5176+
eel_dialog_add_button (GTK_DIALOG (window),
5177+
_("_Close"),
5178+
"window-close",
5179+
GTK_RESPONSE_CLOSE);
51755180

51765181
/* FIXME - HIGificiation, should be done inside GTK+ */
51775182
gtk_container_set_border_width (GTK_CONTAINER (gtk_dialog_get_content_area (GTK_DIALOG (window))), 12);

0 commit comments

Comments
 (0)