diff options
| author | Christian Persch <chpe@cvs.gnome.org> | 2005-11-15 21:35:38 +0800 |
|---|---|---|
| committer | Christian Persch <chpe@src.gnome.org> | 2005-11-15 21:35:38 +0800 |
| commit | aa6924e780e8755002d638cfa4f28eef14dd8152 (patch) | |
| tree | 7f4566bfd6d283290ea8e9e991102a66e108b9f8 /src | |
| parent | df708b818ae51b9e76a47504534104fa5b96e880 (diff) | |
| download | gsoc2013-epiphany-aa6924e780e8755002d638cfa4f28eef14dd8152.tar.gz gsoc2013-epiphany-aa6924e780e8755002d638cfa4f28eef14dd8152.tar.zst gsoc2013-epiphany-aa6924e780e8755002d638cfa4f28eef14dd8152.zip | |
Don't put the prefs/pdm dialogue over all windows. Make the add-language
2005-11-15 Christian Persch <chpe@cvs.gnome.org>
* data/glade/epiphany.glade:
* data/glade/prefs-dialog.glade:
* data/glade/print.glade:
* src/pdm-dialog.c: (pdm_dialog_response_cb), (pdm_dialog_init):
* src/prefs-dialog.c: (setup_add_language_dialog),
(prefs_dialog_init):
Don't put the prefs/pdm dialogue over all windows. Make the
add-language dialogue modal to the prefs dialogue.
Diffstat (limited to 'src')
| -rwxr-xr-x | src/pdm-dialog.c | 17 | ||||
| -rw-r--r-- | src/prefs-dialog.c | 12 |
2 files changed, 17 insertions, 12 deletions
diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index 6fb5e444a..69482153f 100755 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -988,17 +988,13 @@ pdm_dialog_response_cb (GtkDialog *widget, int response, PdmDialog *dialog) { - switch (response) + if (response == GTK_RESPONSE_HELP) { - case GTK_RESPONSE_CLOSE: - g_object_unref (dialog); - break; - case GTK_RESPONSE_HELP: - pdm_dialog_show_help (dialog); - break; - default: - break; + pdm_dialog_show_help (dialog); + return; } + + g_object_unref (dialog); } static void pdm_dialog_init (PdmDialog *dialog) @@ -1019,6 +1015,9 @@ pdm_dialog_init (PdmDialog *dialog) properties[PROP_NOTEBOOK].id, ¬ebook, NULL); + ephy_gui_ensure_window_group (GTK_WINDOW (window)); + + gtk_window_set_role (GTK_WINDOW (window), "epiphany-cookie-manager"); gtk_window_set_icon_name (GTK_WINDOW (window), "web-browser"); g_signal_connect (window, "response", diff --git a/src/prefs-dialog.c b/src/prefs-dialog.c index 2ec678c6b..1b407519e 100644 --- a/src/prefs-dialog.c +++ b/src/prefs-dialog.c @@ -785,7 +785,7 @@ static EphyDialog * setup_add_language_dialog (PrefsDialog *pd) { EphyDialog *dialog; - GtkWidget *window; + GtkWidget *window, *parent; GtkListStore *store; GtkTreeModel *sortmodel; GtkTreeView *treeview; @@ -795,10 +795,10 @@ setup_add_language_dialog (PrefsDialog *pd) GtkTreeIter iter; int i; - window = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[WINDOW_PROP].id); + parent = ephy_dialog_get_control (EPHY_DIALOG (pd), properties[WINDOW_PROP].id); dialog = EPHY_DIALOG (g_object_new (EPHY_TYPE_DIALOG, - "parent-window", window, + "parent-window", parent, "default-width", 260, "default-height", 230, NULL)); @@ -837,6 +837,9 @@ setup_add_language_dialog (PrefsDialog *pd) add_lang_props[LANGUAGE_DIALOG].id, &window, NULL); + gtk_window_group_add_window (GTK_WINDOW (parent)->group, GTK_WINDOW (window)); + gtk_window_set_modal (GTK_WINDOW (window), TRUE); + gtk_tree_view_set_reorderable (GTK_TREE_VIEW (treeview), FALSE); gtk_tree_view_set_model (treeview, sortmodel); @@ -1272,6 +1275,9 @@ prefs_dialog_init (PrefsDialog *pd) properties[CLEAR_CACHE_BUTTON_PROP].id, &clear_cache_button, NULL); + ephy_gui_ensure_window_group (GTK_WINDOW (window)); + + gtk_window_set_role (GTK_WINDOW (window), "epiphany-preferences"); gtk_window_set_icon_name (GTK_WINDOW (window), GTK_STOCK_PREFERENCES); g_signal_connect (window, "response", |