Skip to content

Commit 4fb3590

Browse files
sc0wsc0w
committed
avoid gtk_dialog_new_with_buttons with stock ids
1 parent e0c69f8 commit 4fb3590

File tree

5 files changed

+124
-61
lines changed

5 files changed

+124
-61
lines changed

‎src/caja-emblem-sidebar.c‎

Lines changed: 36 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -281,16 +281,24 @@ create_rename_emblem_dialog (CajaEmblemSidebar *emblem_sidebar,
281281
image = gtk_image_new_from_pixbuf (pixbuf);
282282
entry = gtk_entry_new ();
283283

284-
dialog = gtk_dialog_new_with_buttons (_("Rename Emblem"),
285-
NULL,
286-
0,
287-
"gtk-cancel",
288-
GTK_RESPONSE_CANCEL,
289-
"gtk-ok",
290-
GTK_RESPONSE_OK,
291-
"gtk-help",
292-
GTK_RESPONSE_HELP,
293-
NULL);
284+
dialog = gtk_dialog_new ();
285+
gtk_window_set_title (GTK_WINDOW (dialog), _("Rename Emblem"));
286+
gtk_window_set_transient_for (GTK_WINDOW (dialog), NULL);
287+
288+
eel_dialog_add_button (GTK_DIALOG (dialog),
289+
_("_Cancel"),
290+
"process-stop",
291+
GTK_RESPONSE_CANCEL);
292+
293+
eel_dialog_add_button (GTK_DIALOG (dialog),
294+
_("_OK"),
295+
"gtk-ok",
296+
GTK_RESPONSE_OK);
297+
298+
eel_dialog_add_button (GTK_DIALOG (dialog),
299+
_("_Help"),
300+
"help-browser",
301+
GTK_RESPONSE_HELP);
294302

295303
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
296304
GTK_RESPONSE_OK);
@@ -534,16 +542,24 @@ create_add_emblems_dialog (CajaEmblemSidebar *emblem_sidebar,
534542

535543
first_entry = NULL;
536544

537-
dialog = gtk_dialog_new_with_buttons (_("Add Emblems..."),
538-
NULL,
539-
0,
540-
"gtk-cancel",
541-
GTK_RESPONSE_CANCEL,
542-
"gtk-ok",
543-
GTK_RESPONSE_OK,
544-
"gtk-help",
545-
GTK_RESPONSE_HELP,
546-
NULL);
545+
dialog = gtk_dialog_new ();
546+
gtk_window_set_title (GTK_WINDOW (dialog), _("Add Emblems..."));
547+
gtk_window_set_transient_for (GTK_WINDOW (dialog), NULL);
548+
549+
eel_dialog_add_button (GTK_DIALOG (dialog),
550+
_("_Cancel"),
551+
"process-stop",
552+
GTK_RESPONSE_CANCEL);
553+
554+
eel_dialog_add_button (GTK_DIALOG (dialog),
555+
_("_OK"),
556+
"gtk-ok",
557+
GTK_RESPONSE_OK);
558+
559+
eel_dialog_add_button (GTK_DIALOG (dialog),
560+
_("_Help"),
561+
"help-browser",
562+
GTK_RESPONSE_HELP);
547563

548564
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
549565
GTK_RESPONSE_OK);

‎src/caja-property-browser.c‎

Lines changed: 26 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -1103,11 +1103,19 @@ caja_emblem_dialog_new (CajaPropertyBrowser *property_browser)
11031103
GtkWidget *label;
11041104
GtkWidget *grid = gtk_grid_new ();
11051105

1106-
dialog = gtk_dialog_new_with_buttons (_("Create a New Emblem"),
1107-
GTK_WINDOW (property_browser), 0,
1108-
"gtk-cancel", GTK_RESPONSE_CANCEL,
1109-
"gtk-ok", GTK_RESPONSE_OK,
1110-
NULL);
1106+
dialog = gtk_dialog_new ();
1107+
gtk_window_set_title (GTK_WINDOW (dialog), _("Create a New Emblem"));
1108+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (property_browser));
1109+
1110+
eel_dialog_add_button (GTK_DIALOG (dialog),
1111+
_("_Cancel"),
1112+
"process-stop",
1113+
GTK_RESPONSE_CANCEL);
1114+
1115+
eel_dialog_add_button (GTK_DIALOG (dialog),
1116+
_("_OK"),
1117+
"gtk-ok",
1118+
GTK_RESPONSE_OK);
11111119

11121120
/* install the grid in the dialog */
11131121
gtk_container_set_border_width (GTK_CONTAINER (grid), 5);
@@ -1175,11 +1183,19 @@ caja_color_selection_dialog_new (CajaPropertyBrowser *property_browser)
11751183

11761184
GtkWidget *grid = gtk_grid_new ();
11771185

1178-
dialog = gtk_dialog_new_with_buttons (_("Create a New Color:"),
1179-
GTK_WINDOW (property_browser), 0,
1180-
"gtk-cancel", GTK_RESPONSE_CANCEL,
1181-
"gtk-ok", GTK_RESPONSE_OK,
1182-
NULL);
1186+
dialog = gtk_dialog_new ();
1187+
gtk_window_set_title (GTK_WINDOW (dialog), _("Create a New Color:"));
1188+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (property_browser));
1189+
1190+
eel_dialog_add_button (GTK_DIALOG (dialog),
1191+
_("_Cancel"),
1192+
"process-stop",
1193+
GTK_RESPONSE_CANCEL);
1194+
1195+
eel_dialog_add_button (GTK_DIALOG (dialog),
1196+
_("_OK"),
1197+
"gtk-ok",
1198+
GTK_RESPONSE_OK);
11831199

11841200
/* install the grid in the dialog */
11851201
gtk_widget_show (grid);

‎src/caja-query-editor.c‎

Lines changed: 10 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -710,11 +710,16 @@ type_combo_changed (GtkComboBox *combo_box, CajaQueryEditorRow *row)
710710

711711

712712
toplevel = gtk_widget_get_toplevel (GTK_WIDGET (combo_box));
713-
dialog = gtk_dialog_new_with_buttons (_("Select type"),
714-
GTK_WINDOW (toplevel),
715-
0,
716-
"gtk-ok", GTK_RESPONSE_OK,
717-
NULL);
713+
714+
dialog = gtk_dialog_new ();
715+
gtk_window_set_title (GTK_WINDOW (dialog), _("Select type"));
716+
gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (toplevel));
717+
718+
eel_dialog_add_button (GTK_DIALOG (dialog),
719+
_("_OK"),
720+
"gtk-ok",
721+
GTK_RESPONSE_OK);
722+
718723
gtk_window_set_default_size (GTK_WINDOW (dialog), 400, 600);
719724

720725
scrolled = gtk_scrolled_window_new (NULL, NULL);

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

Lines changed: 41 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -1194,16 +1194,26 @@ select_pattern (FMDirectoryView *view)
11941194
GtkWidget *entry;
11951195
char *example_pattern;
11961196

1197-
dialog = gtk_dialog_new_with_buttons (_("Select Items Matching"),
1198-
fm_directory_view_get_containing_window (view),
1199-
GTK_DIALOG_DESTROY_WITH_PARENT,
1200-
"gtk-help",
1201-
GTK_RESPONSE_HELP,
1202-
"gtk-cancel",
1203-
GTK_RESPONSE_CANCEL,
1204-
"gtk-ok",
1205-
GTK_RESPONSE_OK,
1206-
NULL);
1197+
dialog = gtk_dialog_new ();
1198+
gtk_window_set_title (GTK_WINDOW (dialog), _("Select Items Matching"));
1199+
gtk_window_set_transient_for (GTK_WINDOW (dialog), fm_directory_view_get_containing_window (view));
1200+
gtk_window_set_destroy_with_parent (GTK_WINDOW (dialog), TRUE);
1201+
1202+
eel_dialog_add_button (GTK_DIALOG (dialog),
1203+
_("_Help"),
1204+
"help-browser",
1205+
GTK_RESPONSE_HELP);
1206+
1207+
eel_dialog_add_button (GTK_DIALOG (dialog),
1208+
_("_Cancel"),
1209+
"process-stop",
1210+
GTK_RESPONSE_CANCEL);
1211+
1212+
eel_dialog_add_button (GTK_DIALOG (dialog),
1213+
_("_OK"),
1214+
"gtk-ok",
1215+
GTK_RESPONSE_OK);
1216+
12071217
gtk_dialog_set_default_response (GTK_DIALOG (dialog),
12081218
GTK_RESPONSE_OK);
12091219
gtk_container_set_border_width (GTK_CONTAINER (dialog), 5);
@@ -1332,11 +1342,14 @@ action_save_search_as_callback (GtkAction *action,
13321342
CAJA_IS_SEARCH_DIRECTORY (directory_view->details->model)) {
13331343
search = CAJA_SEARCH_DIRECTORY (directory_view->details->model);
13341344

1335-
dialog = gtk_dialog_new_with_buttons (_("Save Search as"),
1336-
fm_directory_view_get_containing_window (directory_view),
1337-
0,
1338-
"gtk-cancel", GTK_RESPONSE_CANCEL,
1339-
NULL);
1345+
dialog = gtk_dialog_new ();
1346+
gtk_window_set_title (GTK_WINDOW (dialog), _("Save Search as"));
1347+
gtk_window_set_transient_for (GTK_WINDOW (dialog), fm_directory_view_get_containing_window (directory_view));
1348+
1349+
eel_dialog_add_button (GTK_DIALOG (dialog),
1350+
_("_Cancel"),
1351+
"process-stop",
1352+
GTK_RESPONSE_CANCEL);
13401353

13411354
save_button = eel_dialog_add_button (GTK_DIALOG (dialog), _("_Save"),
13421355
"document-save", GTK_RESPONSE_OK);
@@ -6984,12 +6997,19 @@ action_connect_to_server_link_callback (GtkAction *action,
69846997

69856998
if (uri != NULL) {
69866999
title = g_strdup_printf (_("Connect to Server %s"), name);
6987-
dialog = gtk_dialog_new_with_buttons (title,
6988-
fm_directory_view_get_containing_window (view),
6989-
0,
6990-
"gtk-cancel", GTK_RESPONSE_CANCEL,
6991-
_("_Connect"), GTK_RESPONSE_OK,
6992-
NULL);
7000+
7001+
dialog = gtk_dialog_new ();
7002+
gtk_window_set_title (GTK_WINDOW (dialog), title);
7003+
gtk_window_set_transient_for (GTK_WINDOW (dialog), fm_directory_view_get_containing_window (view));
7004+
7005+
eel_dialog_add_button (GTK_DIALOG (dialog),
7006+
_("_Cancel"),
7007+
"process-stop",
7008+
GTK_RESPONSE_CANCEL);
7009+
7010+
gtk_dialog_add_button (GTK_DIALOG (dialog),
7011+
_("_Connect"),
7012+
GTK_RESPONSE_OK);
69937013

69947014
g_object_set_data_full (G_OBJECT (dialog), "link-uri", g_strdup (uri), g_free);
69957015
g_object_set_data_full (G_OBJECT (dialog), "link-icon", g_strdup (icon_name), g_free);

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

Lines changed: 11 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -36,6 +36,7 @@
3636
#include <eel/eel-gdk-extensions.h>
3737
#include <eel/eel-glib-extensions.h>
3838
#include <eel/eel-gtk-macros.h>
39+
#include <eel/eel-stock-dialogs.h>
3940
#include <gdk/gdk.h>
4041
#include <gdk/gdkkeysyms.h>
4142
#include <gtk/gtk.h>
@@ -2531,11 +2532,16 @@ create_column_editor (FMListView *view)
25312532
str = g_strdup_printf (_("%s Visible Columns"), name);
25322533
g_free (name);
25332534

2534-
window = gtk_dialog_new_with_buttons (str,
2535-
GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))),
2536-
GTK_DIALOG_DESTROY_WITH_PARENT,
2537-
"gtk-close", GTK_RESPONSE_CLOSE,
2538-
NULL);
2535+
window = gtk_dialog_new ();
2536+
gtk_window_set_title (GTK_WINDOW (window), str);
2537+
gtk_window_set_transient_for (GTK_WINDOW (window), GTK_WINDOW (gtk_widget_get_toplevel (GTK_WIDGET (view))));
2538+
gtk_window_set_destroy_with_parent (GTK_WINDOW (window), TRUE);
2539+
2540+
eel_dialog_add_button (GTK_DIALOG (window),
2541+
_("_Close"),
2542+
"window-close",
2543+
GTK_RESPONSE_CLOSE);
2544+
25392545
g_free (str);
25402546
g_signal_connect (window, "response",
25412547
G_CALLBACK (column_editor_response_callback), NULL);

0 commit comments

Comments
 (0)