diff options
| author | SoniEx2 <endermoneymod@gmail.com> | 2022-12-18 13:43:01 -0300 |
|---|---|---|
| committer | SoniEx2 <endermoneymod@gmail.com> | 2022-12-18 13:43:01 -0300 |
| commit | 014b242df803089c34084de3d806a7c4e4dad75e (patch) | |
| tree | 12dd5534a445fedc63b8219e48951bff0b3d2283 /src/fe-gtk/setup.c | |
| parent | d049be950cfaca6311b575890e81521d62db68d7 (diff) | |
| parent | bb7a03e9f68a775ca93dd6ad8ea61e4f1d2ba81b (diff) | |
Merge remote-tracking branch 'upstream/master' into default
Diffstat (limited to 'src/fe-gtk/setup.c')
| -rw-r--r-- | src/fe-gtk/setup.c | 18 |
1 files changed, 11 insertions, 7 deletions
diff --git a/src/fe-gtk/setup.c b/src/fe-gtk/setup.c index a7e3a15c..2f0589bd 100644 --- a/src/fe-gtk/setup.c +++ b/src/fe-gtk/setup.c @@ -48,6 +48,7 @@ GtkStyle *create_input_style (GtkStyle *); #define LABEL_INDENT 12 +static GtkWidget *setup_window = NULL; static int last_selected_page = 0; static int last_selected_row = 0; /* sound row */ static gboolean color_change; @@ -1105,8 +1106,8 @@ setup_browsefile_cb (GtkWidget *button, GtkWidget *entry) filter = "image/*"; filter_type = FRF_MIMETYPES; #endif - gtkutil_file_req (_("Select an Image File"), setup_filereq_cb, - entry, NULL, filter, filter_type|FRF_RECENTLYUSED); + gtkutil_file_req (GTK_WINDOW (setup_window), _("Select an Image File"), setup_filereq_cb, + entry, NULL, filter, filter_type|FRF_RECENTLYUSED|FRF_MODAL); } static void @@ -1141,7 +1142,7 @@ setup_fontsel_cancel (GtkWidget *button, GtkFontSelectionDialog *dialog) static void setup_browsefolder_cb (GtkWidget *button, GtkEntry *entry) { - gtkutil_file_req (_("Select Download Folder"), setup_filereq_cb, entry, (char*)gtk_entry_get_text (entry), NULL, FRF_CHOOSEFOLDER); + gtkutil_file_req (GTK_WINDOW (setup_window), _("Select Download Folder"), setup_filereq_cb, entry, (char*)gtk_entry_get_text (entry), NULL, FRF_CHOOSEFOLDER|FRF_MODAL); } static void @@ -1154,6 +1155,9 @@ setup_browsefont_cb (GtkWidget *button, GtkWidget *entry) dialog = (GtkFontSelectionDialog *) gtk_font_selection_dialog_new (_("Select font")); font_dialog = (GtkWidget *)dialog; /* global var */ + gtk_window_set_transient_for (GTK_WINDOW (font_dialog), GTK_WINDOW (setup_window)); + gtk_window_set_modal (GTK_WINDOW (font_dialog), TRUE); + sel = (GtkFontSelection *) gtk_font_selection_dialog_get_font_selection (dialog); if (gtk_entry_get_text (GTK_ENTRY (entry))[0]) @@ -1457,6 +1461,8 @@ setup_color_cb (GtkWidget *button, gpointer userdata) g_object_set_data (G_OBJECT (ok_button), "b", button); gtk_widget_set_sensitive (help_button, FALSE); gtk_color_selection_set_current_color (GTK_COLOR_SELECTION (gtk_color_selection_dialog_get_color_selection (cdialog)), color); + gtk_window_set_transient_for (GTK_WINDOW (dialog), GTK_WINDOW (setup_window)); + gtk_window_set_modal (GTK_WINDOW (dialog), TRUE); gtk_widget_show (dialog); g_object_unref (cancel_button); @@ -1711,8 +1717,8 @@ setup_snd_browse_cb (GtkWidget *button, GtkEntry *entry) filter_type = FRF_MIMETYPES; #endif - gtkutil_file_req (_("Select a sound file"), setup_snd_filereq_cb, entry, - sounds_dir, filter, FRF_FILTERISINITIAL|filter_type); + gtkutil_file_req (GTK_WINDOW (setup_window), _("Select a sound file"), setup_snd_filereq_cb, entry, + sounds_dir, filter, FRF_MODAL|FRF_FILTERISINITIAL|filter_type); g_free (sounds_dir); } @@ -2336,8 +2342,6 @@ setup_close_cb (GtkWidget *win, GtkWidget **swin) void setup_open (void) { - static GtkWidget *setup_window = NULL; - if (setup_window) { gtk_window_present (GTK_WINDOW (setup_window)); |