From 03347735a65b75cc0d40ee7ee9c17ee612584544 Mon Sep 17 00:00:00 2001 From: Diego Escalante Urrelo Date: Sun, 9 Oct 2011 21:14:58 -0500 Subject: pdm-dialog: port cookie properties to GtkGrid Build the Cookie Properties dialog with GtkBuilder instead of handcraft from the past. Bug #661347 --- data/glade/epiphany.ui | 784 ++++++++++++++++++++++++++++++++----------------- src/pdm-dialog.c | 127 +++----- 2 files changed, 558 insertions(+), 353 deletions(-) diff --git a/data/glade/epiphany.ui b/data/glade/epiphany.ui index 08c67b4a5..25e771f00 100644 --- a/data/glade/epiphany.ui +++ b/data/glade/epiphany.ui @@ -1,20 +1,508 @@ - + - - + + + False + 5 + Cookie properties + True + True + dialog + pdm_dialog + + + True + False + vertical + 2 + + + False + end + + + gtk-close + False + True + True + True + False + True + + + False + True + 0 + + + + + False + True + end + 0 + + + + + True + False + 6 + 6 + 12 + + + True + False + start + Content: + + + + + + 0 + 0 + 1 + 1 + + + + + True + False + start + Path: + + + + + + 0 + 1 + 1 + 1 + + + + + True + False + start + Send for: + + + + + + 0 + 2 + 1 + 1 + + + + + True + False + start + Expires: + + + + + + 0 + 3 + 1 + 1 + + + + + True + False + start + label + True + end + + + 1 + 0 + 1 + 1 + + + + + True + False + start + label + True + end + + + 1 + 1 + 1 + 1 + + + + + True + False + start + label + True + end + + + 1 + 2 + 1 + 1 + + + + + True + False + start + label + True + end + + + 1 + 3 + 1 + 1 + + + + + + + + + + + + + + False + True + 1 + + + + + + close_cookie_properties_button + + + + False + 5 + Text Encoding + epiphany-encoding-chooser + 300 + 420 + dialog + + + True + False + vertical + 2 + + + True + False + end + + + gtk-close + False + True + True + True + False + False + True + + + False + False + 0 + + + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 1 + + + + + False + True + end + 0 + + + + + True + False + 5 + 18 + + + True + False + + + <b>_Automatic</b> + False + True + True + False + False + True + True + + + False + False + 0 + + + + + True + False + 12 + + + True + False + Use the encoding specified by the document + True + + + + + False + True + 1 + + + + + False + False + 0 + + + + + True + False + 6 + + + <b>_Use a different encoding:</b> + False + True + True + False + False + True + True + automatic_button + + + False + False + 0 + + + + + True + False + 12 + + + True + True + never + in + + + + + + + + True + True + 1 + + + + + True + True + 1 + + + + + False + True + 1 + + + + + + okbutton2 + encoding_help_button + + 400 300 + False 5 Personal Data epiphany-cookie-manager True normal - + True + False vertical 2 + + + True + False + end + + + gtk-help + False + True + True + True + False + False + True + + + False + False + 0 + + + + + False + True + True + True + False + False + + + True + False + 0 + 0 + + + True + False + 2 + + + True + False + gtk-clear + + + False + False + 0 + + + + + True + False + Clear _All... + True + + + False + False + 1 + + + + + + + + + False + False + 1 + + + + + gtk-close + False + True + True + True + False + False + True + + + False + False + 2 + + + + + False + True + end + 0 + + True @@ -23,40 +511,46 @@ True + False 12 6 True True - automatic - automatic in True True + + + + True + True 0 True - vertical + False 6 start gtk-remove + False True False True True False + False True @@ -68,11 +562,13 @@ gtk-properties + False True False True True False + False True @@ -93,6 +589,7 @@ True + False Cookies @@ -102,45 +599,51 @@ True + False 12 - vertical 6 True + False 6 True True - automatic - automatic in True True + + + + True + True 0 True - vertical + False 6 start gtk-remove + False True False True True False + False True @@ -152,20 +655,25 @@ False + True 1 + True + True 0 _Show passwords + False True True False + False True True @@ -183,6 +691,7 @@ True + False Passwords @@ -192,99 +701,11 @@ + True + True 1 - - - True - end - - - gtk-help - True - True - True - False - True - - - False - False - 0 - - - - - True - True - True - False - - - True - 0 - 0 - - - True - 2 - - - True - gtk-clear - - - False - False - 0 - - - - - True - Clear _All... - True - - - False - False - 1 - - - - - - - - - False - False - 1 - - - - - gtk-close - True - True - True - False - True - - - False - False - 2 - - - - - False - end - 0 - - @@ -293,165 +714,4 @@ closebutton1 - - 5 - Text Encoding - epiphany-encoding-chooser - 300 - 420 - dialog - - - True - vertical - 2 - - - True - 5 - vertical - 18 - - - True - vertical - - - <b>_Automatic</b> - True - True - False - True - True - - - False - False - 0 - - - - - True - 12 - - - True - Use the encoding specified by the document - True - - - - - False - 1 - - - - - False - False - 0 - - - - - True - vertical - 6 - - - <b>_Use a different encoding:</b> - True - True - False - True - True - automatic_button - - - False - False - 0 - - - - - True - 12 - - - True - True - never - automatic - in - - - - - - - - 1 - - - - - 1 - - - - - 1 - - - - - True - end - - - gtk-close - True - True - True - False - True - - - False - False - 0 - - - - - gtk-help - True - True - True - False - True - - - False - False - 1 - - - - - False - end - 0 - - - - - - okbutton2 - encoding_help_button - - diff --git a/src/pdm-dialog.c b/src/pdm-dialog.c index c243c16e0..fe92f8bf9 100644 --- a/src/pdm-dialog.c +++ b/src/pdm-dialog.c @@ -604,93 +604,51 @@ setup_action (PdmActionInfo *action) } /* "Cookies" tab */ +static void +cookie_dialog_response_cb (GtkDialog *widget, + int response, + EphyDialog *cookie_dialog) +{ + g_object_unref (cookie_dialog); +} static void show_cookies_properties (PdmDialog *dialog, SoupCookie *info) { - GtkWidget *gdialog; - GtkWidget *table; - GtkWidget *label; + EphyDialog *cookie_dialog; + GtkWidget *cookie_widget; GtkWidget *parent; - GtkWidget *content_area; + GtkWidget *content_label; + GtkWidget *path_label; + GtkWidget *send_label; + GtkWidget *expires_label; char *str; - parent = ephy_dialog_get_control (EPHY_DIALOG(dialog), "pdm_dialog"); - - gdialog = gtk_dialog_new_with_buttons - (_("Cookie Properties"), - GTK_WINDOW (parent), - GTK_DIALOG_DESTROY_WITH_PARENT, - GTK_STOCK_CLOSE, 0, NULL); - ephy_state_add_window (GTK_WIDGET (gdialog), "cookie_properties", - -1, -1, FALSE, - EPHY_STATE_WINDOW_SAVE_SIZE | EPHY_STATE_WINDOW_SAVE_POSITION); - gtk_container_set_border_width (GTK_CONTAINER (gdialog), 5); - content_area = gtk_dialog_get_content_area (GTK_DIALOG (gdialog)); - gtk_box_set_spacing (GTK_BOX (content_area), 14); /* 24 = 2 * 5 + 14 */ - - table = gtk_table_new (2, 4, FALSE); - gtk_container_set_border_width (GTK_CONTAINER (table), 5); - gtk_table_set_row_spacings (GTK_TABLE (table), 6); - gtk_table_set_col_spacings (GTK_TABLE (table), 12); - gtk_widget_show (table); - - str = g_strconcat ("", _("Content:"), "", NULL); - label = gtk_label_new (str); - g_free (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 0, 1, - GTK_FILL, GTK_FILL, 0, 0); - - label = gtk_label_new (info->value); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 0, 1); + parent = ephy_dialog_get_control (EPHY_DIALOG (dialog), "pdm_dialog"); - str = g_strconcat ("", _("Path:"), "", NULL); - label = gtk_label_new (str); - g_free (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 1, 2, - GTK_FILL, GTK_FILL, 0, 0); - - label = gtk_label_new (info->path); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_label_set_ellipsize (GTK_LABEL (label), PANGO_ELLIPSIZE_END); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 1, 2); + cookie_dialog = ephy_dialog_new_with_parent (parent); + ephy_dialog_construct (cookie_dialog, + ephy_file ("epiphany.ui"), + "cookie_properties_dialog", + NULL); - str = g_strconcat ("", _("Send for:"), "", NULL); - label = gtk_label_new (str); - g_free (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 2, 3, - GTK_FILL, GTK_FILL, 0, 0); + ephy_dialog_get_controls (EPHY_DIALOG (cookie_dialog), + "cookie_properties_dialog", &cookie_widget, + "content_val_label", &content_label, + "path_val_label", &path_label, + "send_val_label", &send_label, + "expires_val_label", &expires_label, + NULL); - label = gtk_label_new (info->secure ? _("Encrypted connections only") : _("Any type of connection") ); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 2, 3); + g_signal_connect (cookie_widget, "response", + G_CALLBACK (cookie_dialog_response_cb), cookie_dialog); - str = g_strconcat ("", _("Expires:"), "", NULL); - label = gtk_label_new (str); - g_free (str); - gtk_label_set_use_markup (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0); - gtk_widget_show (label); - gtk_table_attach (GTK_TABLE (table), label, 0, 1, 3, 4, - GTK_FILL, GTK_FILL, 0, 0); + gtk_label_set_text (GTK_LABEL (content_label), info->value); + gtk_label_set_text (GTK_LABEL (path_label), info->path); + gtk_label_set_text (GTK_LABEL (send_label), info->secure ? + _("Encrypted connections only") : + _("Any type of connection")); if (info->expires == NULL) { @@ -703,23 +661,10 @@ show_cookies_properties (PdmDialog *dialog, time_t out = soup_date_to_time_t(info->expires); str = eel_strdup_strftime ("%c", localtime_r (&out, &t)); } - label = gtk_label_new (str); + gtk_label_set_text (GTK_LABEL (expires_label), str); g_free (str); - gtk_label_set_selectable (GTK_LABEL (label), TRUE); - gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5); - gtk_widget_show (label); - gtk_table_attach_defaults (GTK_TABLE (table), label, 1, 2, 3, 4); - - gtk_box_pack_start (GTK_BOX (content_area), - table, - FALSE, FALSE, 0); - - gtk_window_group_add_window (ephy_gui_ensure_window_group (GTK_WINDOW (parent)), - GTK_WINDOW (gdialog)); - - gtk_dialog_run (GTK_DIALOG (gdialog)); - gtk_widget_destroy (gdialog); + ephy_dialog_run (cookie_dialog); } static void @@ -1524,7 +1469,7 @@ pdm_dialog_init (PdmDialog *dialog) priv = dialog->priv = EPHY_PDM_DIALOG_GET_PRIVATE (dialog); - ephy_dialog_construct (EPHY_DIALOG(dialog), + ephy_dialog_construct (EPHY_DIALOG (dialog), ephy_file ("epiphany.ui"), "pdm_dialog", NULL); -- cgit v1.2.3