From b4d9b7e00b350376b25f3de6b709f9cd07ea81ca Mon Sep 17 00:00:00 2001 From: Not Zed Date: Fri, 18 Jun 2004 04:43:59 +0000 Subject: use mail dialogs.glade. 2004-06-18 Not Zed * em-vfolder-rule.c (get_widget): use mail dialogs.glade. * mail-dialogs.glade: move the vfolder-source window here from mail-config.glade. * Makefile.am (glade_DATA): fix the glade list. * mail-license.glade, subscribe-dialog.glade, mail-security.glade, * mail-search.glade: Merged into mail-dialogs.glade. Should be easier to manage. * message-tag-followup.c (construct): use mail dialogs glade file. * mail-account-gui.c (display_license): use mail dialogs glade file. * em-subscribe-editor.c (em_subscribe_editor_new): use new glade file. * em-format-html-display.c (em_format_html_display_search): use merged glade file. (efhd_xpkcs7mime_validity_clicked): same. * mail-dialogs.glade: merge various glade files into here. svn path=/trunk/; revision=26409 --- mail/ChangeLog | 26 + mail/Makefile.am | 2 +- mail/em-format-html-display.c | 4 +- mail/em-subscribe-editor.c | 2 +- mail/em-vfolder-rule.c | 2 +- mail/mail-account-gui.c | 2 +- mail/mail-config.glade | 278 ------- mail/mail-dialogs.glade | 1606 +++++++++++++++++++++++++++++++++++++++++ mail/mail-license.glade | 207 ------ mail/mail-search.glade | 170 ----- mail/mail-security.glade | 329 --------- mail/message-tag-followup.c | 2 +- mail/subscribe-dialog.glade | 313 -------- 13 files changed, 1639 insertions(+), 1304 deletions(-) create mode 100644 mail/mail-dialogs.glade delete mode 100644 mail/mail-license.glade delete mode 100644 mail/mail-search.glade delete mode 100644 mail/mail-security.glade delete mode 100644 mail/subscribe-dialog.glade diff --git a/mail/ChangeLog b/mail/ChangeLog index 5284eb2d7e..92c16e2aad 100644 --- a/mail/ChangeLog +++ b/mail/ChangeLog @@ -1,3 +1,29 @@ +2004-06-18 Not Zed + + * em-vfolder-rule.c (get_widget): use mail dialogs.glade. + + * mail-dialogs.glade: move the vfolder-source window here from + mail-config.glade. + + * Makefile.am (glade_DATA): fix the glade list. + + * mail-license.glade, subscribe-dialog.glade, mail-security.glade, + * mail-search.glade: Merged into mail-dialogs.glade. Should be + easier to manage. + + * message-tag-followup.c (construct): use mail dialogs glade file. + + * mail-account-gui.c (display_license): use mail dialogs glade file. + + * em-subscribe-editor.c (em_subscribe_editor_new): use new glade + file. + + * em-format-html-display.c (em_format_html_display_search): use + merged glade file. + (efhd_xpkcs7mime_validity_clicked): same. + + * mail-dialogs.glade: merge various glade files into here. + 2004-06-17 Not Zed ** See #59885. diff --git a/mail/Makefile.am b/mail/Makefile.am index 29e4f303e9..d830f00882 100644 --- a/mail/Makefile.am +++ b/mail/Makefile.am @@ -224,7 +224,7 @@ em-filter-i18n.h: filtertypes.xml vfoldertypes.xml searchtypes.xml sed -n -e 's:.*\(.*\):char *s = N_("\1");:p' | \ sort -u >> $@ -glade_DATA = mail-config.glade subscribe-dialog.glade message-tags.glade mail-search.glade mail-security.glade +glade_DATA = mail-config.glade mail-dialogs.glade MARSHAL_GENERATED = em-marshal.c em-marshal.h @EVO_MARSHAL_RULE@ diff --git a/mail/em-format-html-display.c b/mail/em-format-html-display.c index ae704152b8..ee02347d08 100644 --- a/mail/em-format-html-display.c +++ b/mail/em-format-html-display.c @@ -503,7 +503,7 @@ em_format_html_display_search(EMFormatHTMLDisplay *efhd) return; } - xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-search.glade", "search_message_dialog", NULL); + xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "search_message_dialog", NULL); if (xml == NULL) { g_warning("Cannot open search dialog glade file"); /* ?? */ @@ -792,7 +792,7 @@ efhd_xpkcs7mime_validity_clicked(GtkWidget *button, EMFormatHTMLPObject *pobject /* FIXME: window raise? */ return; - xml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-security.glade", "message_security_dialog", NULL); + xml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-dialogs.glade", "message_security_dialog", NULL); po->widget = glade_xml_get_widget(xml, "message_security_dialog"); vbox = glade_xml_get_widget(xml, "signature_vbox"); diff --git a/mail/em-subscribe-editor.c b/mail/em-subscribe-editor.c index 4a11790748..da53eb1a53 100644 --- a/mail/em-subscribe-editor.c +++ b/mail/em-subscribe-editor.c @@ -829,7 +829,7 @@ GtkDialog *em_subscribe_editor_new(void) se = g_malloc0(sizeof(*se)); e_dlist_init(&se->stores); - xml = glade_xml_new (EVOLUTION_GLADEDIR "/subscribe-dialog.glade", "subscribe_dialog", NULL); + xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "subscribe_dialog", NULL); if (xml == NULL) { /* ?? */ return NULL; diff --git a/mail/em-vfolder-rule.c b/mail/em-vfolder-rule.c index ec4f9bbb2a..f7afd05a35 100644 --- a/mail/em-vfolder-rule.c +++ b/mail/em-vfolder-rule.c @@ -604,7 +604,7 @@ get_widget(FilterRule *fr, RuleContext *rc) data->rc = rc; data->vr = vr; - gui = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", "vfolder_source_frame", NULL); + gui = glade_xml_new(EVOLUTION_GLADEDIR "/mail-dialogs.glade", "vfolder_source_frame", NULL); frame = glade_xml_get_widget(gui, "vfolder_source_frame"); g_object_set_data_full((GObject *)frame, "data", data, g_free); diff --git a/mail/mail-account-gui.c b/mail/mail-account-gui.c index 83605dbbfd..ce2fed3417 100644 --- a/mail/mail-account-gui.c +++ b/mail/mail-account-gui.c @@ -225,7 +225,7 @@ display_license (CamelProvider *prov) char *label_text, *dialog_title; gboolean status; - xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-license.glade", "lic_dialog", NULL); + xml = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "lic_dialog", NULL); top_widget = glade_xml_get_widget (xml, "lic_dialog"); text_entry = GTK_TEXT_VIEW (glade_xml_get_widget (xml, "textview1")); diff --git a/mail/mail-config.glade b/mail/mail-config.glade index aabf7d60ee..967a7a6d71 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -8374,282 +8374,4 @@ for display purposes only. - - 6 - True - - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - False - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - gtk-apply - True - GTK_RELIEF_NORMAL - 0 - - - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 6 - - - - True - <b>vFolder Sources</b> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - 6 - True - False - 6 - - - - True - True - 0 - - - - True - - - - True - specific folders only - True - - - - - - True - with all local folders - True - - - - - - True - with all active remote folders - True - - - - - - True - with all local and active remote folders - True - - - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - em_vfolder_editor_sourcelist_new - 0 - 0 - Fri, 13 Dec 2002 00:22:39 GMT - - - 0 - True - True - - - - - - True - False - 1 - - - - True - GTK_BUTTONBOX_DEFAULT_STYLE - 6 - - - - True - True - True - gtk-add - True - GTK_RELIEF_NORMAL - - - - - - True - True - True - gtk-remove - True - GTK_RELIEF_NORMAL - - - - - 0 - False - False - - - - - 0 - False - False - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 3 - True - True - - - - - - diff --git a/mail/mail-dialogs.glade b/mail/mail-dialogs.glade new file mode 100644 index 0000000000..d0aba915ac --- /dev/null +++ b/mail/mail-dialogs.glade @@ -0,0 +1,1606 @@ + + + + + + + + 6 + True + Find in Message + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_CENTER + False + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-find + True + GTK_RELIEF_NORMAL + -3 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 6 + + + + True + False + 12 + + + + True + Find: + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + True + True + 0 + + True + * + False + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + + False + False + GTK_JUSTIFY_CENTER + False + False + 1 + 0.5 + 0 + 0 + + + 0 + False + True + + + + + + True + True + Case Sensitive + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 6 + True + Security Information + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + True + True + True + GTK_POS_TOP + False + False + + + + 12 + True + False + 18 + + + + True + False + 6 + + + + True + <span weight="bold">Digital Signature</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 0 + + + + + + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + <span weight="bold">Encryption</span> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 12 + 0 + + + 0 + False + False + + + + + + True + 1 + 1 + False + 2 + 6 + + + + True + False + 0 + + + + + + + 0 + 1 + 0 + 1 + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + False + False + + + + + False + True + + + + + + True + Summary + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + + + + + + True + Details + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + tab + + + + + 0 + True + True + + + + + + + + Folder Subscriptions + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + 600 + 400 + True + False + False + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-refresh + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-close + True + GTK_RELIEF_NORMAL + -7 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 12 + True + False + 12 + + + + True + False + 12 + + + + True + S_erver: + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + store_menu + + + 0 + False + False + + + + + + True + True + 0 + + + + + + + True + None Selected + True + + + + + + + + 0 + False + False + + + + + + True + GTK_PROGRESS_LEFT_TO_RIGHT + 0 + 0.1 + + + + 0 + False + False + GTK_PACK_END + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_START + 6 + + + + True + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-add + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Subscribe + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + + True + True + True + GTK_RELIEF_NORMAL + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-remove + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + _Unsubscribe + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + False + GTK_PACK_END + + + + + 0 + True + True + + + + + 0 + True + True + + + + + + + + True + License Agreement + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + True + + + + True + False + 0 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-no + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + GTK_RELIEF_NORMAL + -3 + + + + True + 0.5 + 0.5 + 0 + 0 + + + + True + False + 2 + + + + True + gtk-yes + 4 + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + Accept License + True + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 0 + + + + True + + Please read carefully the license agreement displayed + below and tick the check box for accepting it + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + True + GTK_POLICY_ALWAYS + GTK_POLICY_ALWAYS + GTK_SHADOW_NONE + GTK_CORNER_TOP_LEFT + + + + 500 + 400 + True + True + True + GTK_JUSTIFY_LEFT + GTK_WRAP_NONE + True + 0 + 0 + 0 + 0 + 0 + 0 + + + + + + 0 + True + True + + + + + + True + True + Tick this to accept the license agreement + True + GTK_RELIEF_NORMAL + False + False + True + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 6 + Flag to Follow Up + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + True + False + 12 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + 0 + + + + + 0 + False + True + GTK_PACK_END + + + + + + 6 + True + False + 12 + + + + True + False + 6 + + + + True + e_create_image_widget + stock_mail-flag-for-followup + + 0 + 0 + + + 0 + False + False + + + + + + True + The messages you have selected for follow up are listed below. +Please select a follow up action from the "Flag" menu. + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + 0 + False + False + + + + + + True + GTK_POLICY_AUTOMATIC + GTK_POLICY_AUTOMATIC + GTK_SHADOW_IN + GTK_CORNER_TOP_LEFT + + + + True + True + True + False + False + True + + + + + 0 + True + True + + + + + + True + 3 + 3 + False + 6 + 6 + + + + True + _Flag: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + combo-entry + + + 0 + 1 + 0 + 1 + fill + + + + + + + True + _Due By: + True + False + GTK_JUSTIFY_CENTER + False + False + 0 + 0.5 + 0 + 0 + + + 0 + 1 + 1 + 2 + fill + + + + + + + True + True + gtk-clear + True + GTK_RELIEF_NORMAL + + + 2 + 3 + 0 + 1 + fill + + + + + + + True + False + True + False + True + False + + + + True + True + True + True + 0 + + True + * + False + + + + + + True + GTK_SELECTION_BROWSE + + + + True + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + + + + + + + 1 + 2 + 0 + 1 + + + + + + + True + target_date_new + 0 + 0 + Sat, 09 Feb 2002 00:20:24 GMT + + + 1 + 3 + 1 + 2 + fill + + + + + + True + True + C_ompleted + True + GTK_RELIEF_NORMAL + False + False + True + + + 1 + 3 + 2 + 3 + fill + + + + + + 0 + False + False + + + + + 0 + True + True + + + + + + + + 6 + True + + GTK_WINDOW_TOPLEVEL + GTK_WIN_POS_NONE + False + True + False + False + + + + True + False + 6 + + + + True + GTK_BUTTONBOX_END + + + + True + True + True + gtk-cancel + True + GTK_RELIEF_NORMAL + -6 + + + + + + True + True + True + gtk-apply + True + GTK_RELIEF_NORMAL + 0 + + + + + + True + True + True + gtk-ok + True + GTK_RELIEF_NORMAL + -5 + + + + + 0 + False + True + GTK_PACK_END + + + + + + True + False + 6 + + + + True + <b>vFolder Sources</b> + False + True + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + False + 0 + + + + True + + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + 6 + True + False + 6 + + + + True + True + 0 + + + + True + + + + True + specific folders only + True + + + + + + True + with all local folders + True + + + + + + True + with all active remote folders + True + + + + + + True + with all local and active remote folders + True + + + + + + + 0 + False + False + + + + + + True + False + 6 + + + + True + em_vfolder_editor_sourcelist_new + 0 + 0 + Fri, 13 Dec 2002 00:22:39 GMT + + + 0 + True + True + + + + + + True + False + 1 + + + + True + GTK_BUTTONBOX_DEFAULT_STYLE + 6 + + + + True + True + True + gtk-add + True + GTK_RELIEF_NORMAL + + + + + + True + True + True + gtk-remove + True + GTK_RELIEF_NORMAL + + + + + 0 + False + False + + + + + 0 + False + False + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 0 + True + True + + + + + 3 + True + True + + + + + + + diff --git a/mail/mail-license.glade b/mail/mail-license.glade deleted file mode 100644 index a74f611d2d..0000000000 --- a/mail/mail-license.glade +++ /dev/null @@ -1,207 +0,0 @@ - - - - - - - True - License Agreement - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - True - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-no - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - GTK_RELIEF_NORMAL - -3 - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-yes - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - Accept License - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - True - GTK_PACK_END - - - - - - True - False - 0 - - - - True - - Please read carefully the license agreement displayed - below and tick the check box for accepting it - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - GTK_POLICY_ALWAYS - GTK_POLICY_ALWAYS - GTK_SHADOW_NONE - GTK_CORNER_TOP_LEFT - - - - 500 - 400 - True - True - True - GTK_JUSTIFY_LEFT - GTK_WRAP_NONE - True - 0 - 0 - 0 - 0 - 0 - 0 - - - - - - 0 - True - True - - - - - - True - True - Tick this to accept the license agreement - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - - - diff --git a/mail/mail-search.glade b/mail/mail-search.glade deleted file mode 100644 index 10d36746a6..0000000000 --- a/mail/mail-search.glade +++ /dev/null @@ -1,170 +0,0 @@ - - - - - - - - 6 - True - Find in Message - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_CENTER - False - True - False - False - - - - True - False - 12 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-cancel - True - GTK_RELIEF_NORMAL - -6 - - - - - - True - True - True - gtk-find - True - GTK_RELIEF_NORMAL - -3 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - False - 6 - - - - True - False - 12 - - - - True - Find: - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - True - True - True - 0 - - True - * - False - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - - False - False - GTK_JUSTIFY_CENTER - False - False - 1 - 0.5 - 0 - 0 - - - 0 - False - True - - - - - - True - True - Case Sensitive - True - GTK_RELIEF_NORMAL - False - False - True - - - 0 - False - False - - - - - 0 - True - True - - - - - - - diff --git a/mail/mail-security.glade b/mail/mail-security.glade deleted file mode 100644 index dfe490a7e5..0000000000 --- a/mail/mail-security.glade +++ /dev/null @@ -1,329 +0,0 @@ - - - - - - - - 6 - True - Security Information - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - True - False - False - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-ok - True - GTK_RELIEF_NORMAL - -5 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 6 - True - True - True - True - GTK_POS_TOP - False - False - - - - 12 - True - False - 18 - - - - True - False - 6 - - - - True - <span weight="bold">Digital Signature</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - False - - - - - - True - 1 - 1 - False - 2 - 6 - - - - True - False - 0 - - - - - - - 0 - 1 - 0 - 1 - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - <span weight="bold">Encryption</span> - False - True - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - False - 0 - - - - True - - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 12 - 0 - - - 0 - False - False - - - - - - True - 1 - 1 - False - 2 - 6 - - - - True - False - 0 - - - - - - - 0 - 1 - 0 - 1 - - - - - 0 - True - True - - - - - 0 - True - True - - - - - 0 - False - False - - - - - False - True - - - - - - True - Summary - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - - - - - - True - Details - False - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - tab - - - - - 0 - True - True - - - - - - - diff --git a/mail/message-tag-followup.c b/mail/message-tag-followup.c index 681b0a8d72..edc015eb0b 100644 --- a/mail/message-tag-followup.c +++ b/mail/message-tag-followup.c @@ -304,7 +304,7 @@ construct (MessageTagEditor *editor) gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->vbox), 0); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (editor)->action_area), 12); - gui = glade_xml_new (EVOLUTION_GLADEDIR "/message-tags.glade", "followup_editor", NULL); + gui = glade_xml_new (EVOLUTION_GLADEDIR "/mail-dialogs.glade", "followup_editor", NULL); widget = glade_xml_get_widget (gui, "toplevel"); diff --git a/mail/subscribe-dialog.glade b/mail/subscribe-dialog.glade deleted file mode 100644 index 6f8238efa4..0000000000 --- a/mail/subscribe-dialog.glade +++ /dev/null @@ -1,313 +0,0 @@ - - - - - - - - Folder Subscriptions - GTK_WINDOW_TOPLEVEL - GTK_WIN_POS_NONE - False - 600 - 400 - True - False - False - - - - True - False - 0 - - - - True - GTK_BUTTONBOX_END - - - - True - True - True - gtk-refresh - True - GTK_RELIEF_NORMAL - 0 - - - - - - True - True - True - gtk-close - True - GTK_RELIEF_NORMAL - -7 - - - - - 0 - False - True - GTK_PACK_END - - - - - - 12 - True - False - 12 - - - - True - False - 12 - - - - True - S_erver: - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - store_menu - - - 0 - False - False - - - - - - True - True - 0 - - - - - - - True - None Selected - True - - - - - - - - 0 - False - False - - - - - - True - GTK_PROGRESS_LEFT_TO_RIGHT - 0 - 0.1 - - - - 0 - False - False - GTK_PACK_END - - - - - 0 - False - False - - - - - - True - False - 6 - - - - True - GTK_BUTTONBOX_START - 6 - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-add - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Subscribe - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - - True - True - True - GTK_RELIEF_NORMAL - - - - True - 0.5 - 0.5 - 0 - 0 - - - - True - False - 2 - - - - True - gtk-remove - 4 - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - True - _Unsubscribe - True - False - GTK_JUSTIFY_LEFT - False - False - 0.5 - 0.5 - 0 - 0 - - - 0 - False - False - - - - - - - - - - - 0 - False - False - GTK_PACK_END - - - - - 0 - True - True - - - - - 0 - True - True - - - - - - - -- cgit