Skip to content

Commit 15f06ce

Browse files
sc0wsc0w
committed
avoid 'gtk_dialog_add_buttons' with stock ids
1 parent 78648af commit 15f06ce

File tree

6 files changed

+33
-38
lines changed

6 files changed

+33
-38
lines changed

‎plugins/spell/pluma-spell-language-dialog.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -129,14 +129,9 @@ create_dialog (PlumaSpellLanguageDialog *dlg,
129129
NULL
130130
};
131131

132-
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
133-
"gtk-cancel",
134-
GTK_RESPONSE_CANCEL,
135-
"gtk-ok",
136-
GTK_RESPONSE_OK,
137-
"gtk-help",
138-
GTK_RESPONSE_HELP,
139-
NULL);
132+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Cancel"), "process-stop", GTK_RESPONSE_CANCEL);
133+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_OK"), "gtk-ok", GTK_RESPONSE_OK);
134+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP);
140135

141136
gtk_window_set_title (GTK_WINDOW (dlg), _("Set language"));
142137
gtk_window_set_modal (GTK_WINDOW (dlg), TRUE);

‎pluma/dialogs/pluma-close-confirmation-dialog.c‎

Lines changed: 16 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -151,8 +151,10 @@ set_logout_mode (PlumaCloseConfirmationDialog *dlg,
151151
_("Close _without Saving"),
152152
GTK_RESPONSE_NO);
153153

154-
gtk_dialog_add_button (GTK_DIALOG (dlg),
155-
"gtk-cancel", GTK_RESPONSE_CANCEL);
154+
pluma_dialog_add_button (GTK_DIALOG (dlg),
155+
_("_Cancel"),
156+
"process-stop",
157+
GTK_RESPONSE_CANCEL);
156158
}
157159

158160
if (dlg->priv->disable_save_to_disk)
@@ -162,7 +164,7 @@ set_logout_mode (PlumaCloseConfirmationDialog *dlg,
162164
}
163165
else
164166
{
165-
const gchar *icon_id = "gtk-save";
167+
const gchar *icon_id = "document-save";
166168

167169
if (GET_MODE (dlg->priv) == SINGLE_DOC_MODE)
168170
{
@@ -172,12 +174,19 @@ set_logout_mode (PlumaCloseConfirmationDialog *dlg,
172174

173175
if (pluma_document_get_readonly (doc) ||
174176
pluma_document_is_untitled (doc))
175-
icon_id = "gtk-save-as";
177+
icon_id = "document-save-as";
176178
}
177179

178-
gtk_dialog_add_button (GTK_DIALOG (dlg),
179-
icon_id,
180-
GTK_RESPONSE_YES);
180+
if (g_strcmp0 (icon_id, "document-save") == 0)
181+
pluma_dialog_add_button (GTK_DIALOG (dlg),
182+
_("_Save"),
183+
icon_id,
184+
GTK_RESPONSE_YES);
185+
else
186+
pluma_dialog_add_button (GTK_DIALOG (dlg),
187+
_("Save _As"),
188+
icon_id,
189+
GTK_RESPONSE_YES);
181190

182191
gtk_dialog_set_default_response (GTK_DIALOG (dlg),
183192
GTK_RESPONSE_YES);

‎pluma/dialogs/pluma-encodings-dialog.c‎

Lines changed: 3 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -309,14 +309,9 @@ pluma_encodings_dialog_init (PlumaEncodingsDialog *dlg)
309309

310310
dlg->priv = PLUMA_ENCODINGS_DIALOG_GET_PRIVATE (dlg);
311311

312-
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
313-
"gtk-cancel",
314-
GTK_RESPONSE_CANCEL,
315-
"gtk-ok",
316-
GTK_RESPONSE_OK,
317-
"gtk-help",
318-
GTK_RESPONSE_HELP,
319-
NULL);
312+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Cancel"), "process-stop", GTK_RESPONSE_CANCEL);
313+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_OK"), "gtk-ok", GTK_RESPONSE_OK);
314+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP);
320315

321316
gtk_window_set_title (GTK_WINDOW (dlg), _("Character Encodings"));
322317
gtk_window_set_default_size (GTK_WINDOW (dlg), 650, 400);

‎pluma/dialogs/pluma-preferences-dialog.c‎

Lines changed: 2 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1081,12 +1081,8 @@ pluma_preferences_dialog_init (PlumaPreferencesDialog *dlg)
10811081

10821082
dlg->priv = PLUMA_PREFERENCES_DIALOG_GET_PRIVATE (dlg);
10831083

1084-
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
1085-
"gtk-close",
1086-
GTK_RESPONSE_CLOSE,
1087-
"gtk-help",
1088-
GTK_RESPONSE_HELP,
1089-
NULL);
1084+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Close"), "window-close", GTK_RESPONSE_CLOSE);
1085+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Help"), "help-browser", GTK_RESPONSE_HELP);
10901086

10911087
gtk_window_set_title (GTK_WINDOW (dlg), _("Pluma Preferences"));
10921088
gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);

‎pluma/dialogs/pluma-search-dialog.c‎

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -330,9 +330,7 @@ pluma_search_dialog_init (PlumaSearchDialog *dlg)
330330
gtk_window_set_resizable (GTK_WINDOW (dlg), FALSE);
331331
gtk_window_set_destroy_with_parent (GTK_WINDOW (dlg), TRUE);
332332

333-
gtk_dialog_add_buttons (GTK_DIALOG (dlg),
334-
"gtk-close", GTK_RESPONSE_CANCEL,
335-
NULL);
333+
pluma_dialog_add_button (GTK_DIALOG (dlg), _("_Close"), "window-close", GTK_RESPONSE_CANCEL);
336334

337335
/* HIG defaults */
338336
gtk_container_set_border_width (GTK_CONTAINER (dlg), 5);

‎pluma/pluma-commands-file.c‎

Lines changed: 8 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -579,9 +579,10 @@ replace_read_only_file (GtkWindow *parent, GFile *file)
579579
_("Do you want to try to replace it "
580580
"with the one you are saving?"));
581581

582-
gtk_dialog_add_button (GTK_DIALOG (dialog),
583-
"gtk-cancel",
584-
GTK_RESPONSE_CANCEL);
582+
pluma_dialog_add_button (GTK_DIALOG (dialog),
583+
_("_Cancel"),
584+
"process-stop",
585+
GTK_RESPONSE_CANCEL);
585586

586587
pluma_dialog_add_button (GTK_DIALOG (dialog),
587588
_("_Replace"),
@@ -1218,9 +1219,10 @@ revert_dialog (PlumaWindow *window,
12181219

12191220
gtk_window_set_resizable (GTK_WINDOW (dialog), FALSE);
12201221

1221-
gtk_dialog_add_button (GTK_DIALOG (dialog),
1222-
"gtk-cancel",
1223-
GTK_RESPONSE_CANCEL);
1222+
pluma_dialog_add_button (GTK_DIALOG (dialog),
1223+
_("_Cancel"),
1224+
"process-stop",
1225+
GTK_RESPONSE_CANCEL);
12241226

12251227
pluma_dialog_add_button (GTK_DIALOG (dialog),
12261228
_("_Revert"),

0 commit comments

Comments
 (0)