diff options
| author | Matthew Barnes <mbarnes@redhat.com> | 2010-09-12 23:01:13 +0800 |
|---|---|---|
| committer | Matthew Barnes <mbarnes@redhat.com> | 2010-09-13 20:28:59 +0800 |
| commit | 2798ae38f43ce9a75f77644046b8f717a3dcf906 (patch) | |
| tree | 2da72693ae83734c95a46693274518dbbef89ca0 | |
| parent | 64c7c97daabf958704bb2ffb45daea89b3cdb997 (diff) | |
| download | gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar.gz gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar.bz2 gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar.lz gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar.xz gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.tar.zst gsoc2013-evolution-2798ae38f43ce9a75f77644046b8f717a3dcf906.zip | |
mail-config.ui cleanups.
- Fix GtkVBox orientations.
- Reduce container widgets.
- Remove unused widgets.
| -rw-r--r-- | mail/em-account-editor.c | 56 | ||||
| -rw-r--r-- | mail/mail-config.ui | 4618 | ||||
| -rw-r--r-- | modules/mail/em-composer-prefs.c | 5 | ||||
| -rw-r--r-- | modules/mail/em-mailer-prefs.c | 17 |
4 files changed, 2006 insertions, 2690 deletions
diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index 3a3368c631..aaff1b0ecf 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -2222,8 +2222,8 @@ emae_identity_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Identity"))); } - emae_queue_widgets (emae, builder, "account_vbox", "identity_required_table", - "identity_optional_table", "identity_optional_frame", + emae_queue_widgets (emae, builder, "account_vbox", "identity-required-table", + "identity-optional-table", "identity_optional_frame", "identity_address", NULL); g_object_unref (builder); @@ -2261,7 +2261,7 @@ emae_receive_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Receiving Email"))); } - emae_queue_widgets (emae, builder, "source_type_table", "table4", "vbox181", "vbox179", NULL); + emae_queue_widgets (emae, builder, "source-type-table", "table4", "vbox181", "vbox179", NULL); g_object_unref (builder); @@ -2743,7 +2743,7 @@ emae_send_page (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget *ol gtk_notebook_append_page ((GtkNotebook *)parent, w, gtk_label_new (_("Sending Email"))); } - emae_queue_widgets (emae, builder, "transport_type_table", "vbox12", "vbox183", "vbox61", NULL); + emae_queue_widgets (emae, builder, "transport-type-table", "vbox12", "vbox183", "vbox61", NULL); g_object_unref (builder); @@ -3143,14 +3143,14 @@ static EMConfigItem emae_editor_items[] = { { E_CONFIG_BOOK, (gchar *) "" }, { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity-required-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity-optional-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade }, /* Most sections for this is auto-generated from the camel config */ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, @@ -3158,14 +3158,14 @@ static EMConfigItem emae_editor_items[] = { { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/10.config", (gchar *) "transport-server-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/20.security", (gchar *) "transport-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/30.auth", (gchar *) "transport-auth-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "50.security", (gchar *) "vboxSecurityBorder", emae_security_page }, /* 1x1 table (!) not vbox: { E_CONFIG_SECTION, "50.security/00.gpg", "table19", emae_widget_glade }, */ @@ -3211,14 +3211,14 @@ static EMConfigItem emae_assistant_items[] = { { E_CONFIG_PAGE, (gchar *) "00.identity", (gchar *) "vboxIdentityBorder", emae_identity_page }, { E_CONFIG_SECTION, (gchar *) "00.identity/00.name", (gchar *) "account_vbox", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity_required_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity_optional_table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/10.required", (gchar *) "identity-required-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.identity/20.info", (gchar *) "identity-optional-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.receive", (gchar *) "vboxSourceBorder", emae_receive_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source_type_table", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "table4", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/20.security", (gchar *) "vbox181", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.receive/30.auth", (gchar *) "vbox179", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/00.type", (gchar *) "source-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/10.config", (gchar *) "source-config-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/20.security", (gchar *) "source-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "10.receive/30.auth", (gchar *) "source-auth-table", emae_widget_glade }, /* Most sections for this is auto-generated fromt the camel config */ { E_CONFIG_PAGE, (gchar *) "20.receive_options", (gchar *) N_("Receiving Options"), }, @@ -3226,14 +3226,14 @@ static EMConfigItem emae_assistant_items[] = { { E_CONFIG_ITEM_TABLE, (gchar *) "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, }, { E_CONFIG_PAGE, (gchar *) "30.send", (gchar *) "vboxTransportBorder", emae_send_page }, - { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport_type_table", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/10.config", (gchar *) "vbox12", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/20.security", (gchar *) "vbox183", emae_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "30.send/30.auth", (gchar *) "vbox61", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/00.type", (gchar *) "transport-type-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/10.config", (gchar *) "transport-server-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/20.security", (gchar *) "transport-security-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "30.send/30.auth", (gchar *) "transport-auth-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.defaults", (gchar *) "vboxFoldersBorder", emae_defaults_page }, - { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "vbox184", emae_widget_glade }, - { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "table8", emae_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "40.defaults/00.folders", (gchar *) "special-folders-table", emae_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.defaults/10.composing", (gchar *) "composing-messages-table", emae_widget_glade }, { E_CONFIG_PAGE, (gchar *) "40.management", (gchar *) "management_frame", emae_management_page }, diff --git a/mail/mail-config.ui b/mail/mail-config.ui index 3796decdb2..ee700e260a 100644 --- a/mail/mail-config.ui +++ b/mail/mail-config.ui @@ -122,13 +122,15 @@ <object class="GtkVBox" id="vboxIdentityBorder"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="management_frame"> + <object class="GtkVBox" id="management-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label470"> + <object class="GtkLabel" id="management-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Account Information</property> @@ -143,27 +145,18 @@ </packing> </child> <child> - <object class="GtkHBox" id="hbox172"> + <object class="GtkAlignment" id="management-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label568"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table12"> + <object class="GtkTable" id="management-table"> <property name="visible">True</property> <property name="column_spacing">6</property> <property name="row_spacing">2</property> <child> <object class="GtkVBox" id="account_vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="management_description_label"> @@ -200,7 +193,7 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="management_name"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="has_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="position">1</property> @@ -215,9 +208,6 @@ For example: "Work" or "Personal"</property> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -232,11 +222,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="identity_required_frame"> + <object class="GtkVBox" id="identity-required-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label464"> + <object class="GtkLabel" id="identity-required-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Required Information</property> @@ -251,97 +242,79 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox170"> + <object class="GtkAlignment" id="identity-required-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label569"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table10"> + <object class="GtkTable" id="identity-required-table"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="identity_required_table"> + <object class="GtkEntry" id="identity_address"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkEntry" id="identity_address"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <accessibility> - <relation type="labelled-by" target="identity_address_label"/> - <relation type="labelled-by" target="label464"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="identity_address_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Email _Address:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">identity_address</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="identity_full_name_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Full Nam_e:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">identity_full_name</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="identity_full_name"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <accessibility> - <relation type="labelled-by" target="label464"/> - <relation type="labelled-by" target="identity_full_name_label"/> - </accessibility> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <accessibility> + <relation type="labelled-by" target="identity-required-header"/> + <relation type="labelled-by" target="identity_address_label"/> + </accessibility> </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="identity_address_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Email _Address:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">identity_address</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="identity_full_name_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Full Nam_e:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">identity_full_name</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="identity_full_name"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <accessibility> + <relation type="labelled-by" target="identity_full_name_label"/> + <relation type="labelled-by" target="identity-required-header"/> + </accessibility> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -356,11 +329,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="identity_optional_frame"> + <object class="GtkVBox" id="identity-optional-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label466"> + <object class="GtkLabel" id="identity-optional-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Optional Information</property> @@ -375,21 +349,11 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox171"> + <object class="GtkAlignment" id="identity-optional-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label570"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="identity_optional_table"> + <object class="GtkTable" id="identity-optional-table"> <property name="visible">True</property> <property name="n_rows">4</property> <property name="n_columns">2</property> @@ -429,7 +393,7 @@ For example: "Work" or "Personal"</property> <property name="label" translatable="yes">Add Ne_w Signature...</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> <signal name="clicked" handler="sigAddNewClicked"/> </object> @@ -454,9 +418,10 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="identity_organization"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> <accessibility> + <relation type="labelled-by" target="identity-optional-header"/> <relation type="labelled-by" target="identity_organization_label"/> - <relation type="labelled-by" target="label466"/> </accessibility> </object> <packing> @@ -486,9 +451,10 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="identity_reply_to"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> <accessibility> - <relation type="labelled-by" target="label466"/> <relation type="labelled-by" target="reply_to_label"/> + <relation type="labelled-by" target="identity-optional-header"/> </accessibility> </object> <packing> @@ -531,9 +497,6 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -548,271 +511,283 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <object class="GtkLabel" id="label31"> - <property name="visible">True</property> - <property name="label" translatable="yes">Identity</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> <object class="GtkVBox" id="vboxSourceBorder"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="source_vbox"> + <object class="GtkTable" id="source-type-table"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="n_rows">2</property> + <property name="n_columns">3</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="source_type_table"> + <object class="GtkLabel" id="source_type_label"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="source_type_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Server _Type:</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">source_type_dropdown</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label442"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Description:</property> - <property name="justify">center</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="source_description"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">description</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="source_type_dropdown"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Server _Type:</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">source_type_dropdown</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkHSeparator" id="hseparator2"> + <object class="GtkLabel" id="label442"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Description:</property> + <property name="justify">center</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="source_description"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">description</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="source_type_dropdown"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="source-separator"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="source-config-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="source-config-header"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Configuration</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="source_frame"> + <object class="GtkAlignment" id="source-config-alignment"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label472"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Configuration</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox173"> + <object class="GtkTable" id="source-config-table"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkLabel" id="label565"> + <object class="GtkLabel" id="source_host_label"> <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">source_host</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkTable" id="table13"> + <object class="GtkLabel" id="source_user_label"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> - <child> - <object class="GtkTable" id="table4"> - <property name="visible">True</property> - <property name="n_rows">3</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="source_host_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Server:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">source_host</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="source_user_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">User_name:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">source_user</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="source_host"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="source_user"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="source_path_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Path:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkFileChooserButton" id="source_path_entry"> - <property name="visible">True</property> - <property name="title" translatable="yes">Mailbox location</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="y_options"></property> - </packing> - </child> - </object> - </child> + <property name="xalign">1</property> + <property name="label" translatable="yes">User _Name:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">source_user</property> </object> <packing> - <property name="position">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="source_host"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="source_user"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="source_path_label"> + <property name="visible">True</property> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Path:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkFileChooserButton" id="source_path_entry"> + <property name="visible">True</property> + <property name="title" translatable="yes">Mailbox location</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="y_options"></property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="source-security-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="source-security-header"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Security</property> + <property name="mnemonic_widget">source_auth_dropdown</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="source_security_frame"> + <object class="GtkAlignment" id="source-security-alignment"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label515"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Security</property> - <property name="mnemonic_widget">source_auth_dropdown</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox201"> + <object class="GtkVBox" id="source-security-vbox"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label567"> + <object class="GtkHBox" id="source_ssl_hbox"> <property name="visible">True</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="lblSourceUseSSL"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Use Secure Connection:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">source_use_ssl</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="source_use_ssl"> + <property name="visible">True</property> + <property name="model">use_ssl_model</property> + <child> + <object class="GtkCellRendererText" id="source_use_ssl_renderer"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> @@ -821,44 +796,13 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox181"> + <object class="GtkHBox" id="source_ssl_disabled"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="source_ssl_hbox"> + <object class="GtkImage" id="image2"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="lblSourceUseSSL"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Use Secure Connection:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">source_use_ssl</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="source_use_ssl"> - <property name="visible">True</property> - <property name="model">use_ssl_model</property> - <child> - <object class="GtkCellRendererText" id="source_use_ssl_renderer"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="stock">gtk-dialog-warning</property> </object> <packing> <property name="expand">False</property> @@ -867,38 +811,18 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="source_ssl_disabled"> + <object class="GtkLabel" id="label514"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label514"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property> - <property name="justify">center</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property> + <property name="justify">center</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -908,98 +832,71 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="source-auth-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="source-auth-header"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">_Authentication Type</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">source_auth_dropdown</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="source_auth_frame"> + <object class="GtkAlignment" id="source-auth-alignment"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label474"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Authentication Type</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">source_auth_dropdown</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox174"> + <object class="GtkVBox" id="source-auth-vbox"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label566"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox179"> + <object class="GtkHBox" id="hbox199"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox199"> + <object class="GtkComboBox" id="source_auth_dropdown"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkComboBox" id="source_auth_dropdown"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="source_check_supported"> - <property name="label" translatable="yes">Ch_eck for Supported Types</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="source_remember_password"> - <property name="label" translatable="yes">Re_member password</property> + <object class="GtkButton" id="source_check_supported"> + <property name="label" translatable="yes">Ch_eck for Supported Types</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Note: you will not be prompted for a password until you connect for the first time</property> + <property name="receives_default">True</property> <property name="use_underline">True</property> - <property name="draw_indicator">True</property> </object> <packing> <property name="expand">False</property> @@ -1009,149 +906,248 @@ For example: "Work" or "Personal"</property> </child> </object> <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="source_remember_password"> + <property name="label" translatable="yes">Re_member password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="position">0</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> - <object class="GtkLabel" id="label33"> - <property name="visible">True</property> - <property name="label" translatable="yes">Receiving Email</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> <object class="GtkVBox" id="vboxTransportBorder"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="transport_vbox"> + <object class="GtkTable" id="transport-type-table"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="n_rows">2</property> + <property name="n_columns">3</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="transport_type_table"> + <object class="GtkLabel" id="transport_type_label"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">3</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="transport_type_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Server _Type:</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">transport_type_dropdown</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label50"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">Description:</property> - <property name="justify">right</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="transport_type_dropdown"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="transport_description"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="yalign">0</property> - <property name="label" translatable="yes">description</property> - <property name="wrap">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Server _Type:</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">transport_type_dropdown</property> </object> <packing> - <property name="position">0</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkHSeparator" id="hseparator3"> + <object class="GtkLabel" id="label50"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">Description:</property> + <property name="justify">right</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="transport_type_dropdown"> + <property name="visible">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="transport_description"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="yalign">0</property> + <property name="label" translatable="yes">description</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHSeparator" id="transport-separator"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="transport-server-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="transport-server-header"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Server Configuration</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> - <property name="position">1</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="transport_frame"> + <object class="GtkAlignment" id="transport-server-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="transport_server_frame"> + <object class="GtkTable" id="transport-server-table"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkLabel" id="label476"> + <object class="GtkLabel" id="transport_host_label"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Server Configuration</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="xalign">1</property> + <property name="label" translatable="yes">_Server:</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">transport_host</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkHBox" id="hbox175"> + <object class="GtkEntry" id="transport_host"> <property name="visible">True</property> - <property name="spacing">12</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="transport_needs_auth"> + <property name="label" translatable="yes">Ser_ver requires authentication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="transport-security-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="transport-security-header"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Security</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="transport-security-alignment"> + <property name="visible">True</property> + <property name="left_padding">12</property> + <child> + <object class="GtkTable" id="transport-security-table"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="row_spacing">6</property> + <child> + <object class="GtkHBox" id="transport_ssl_disabled"> + <property name="visible">True</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label562"> + <object class="GtkImage" id="image1"> <property name="visible">True</property> + <property name="stock">gtk-dialog-warning</property> </object> <packing> <property name="expand">False</property> @@ -1160,109 +1156,38 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkTable" id="table15"> + <object class="GtkLabel" id="transport_ssl_disabled_label"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> - <child> - <object class="GtkVBox" id="vbox12"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkTable" id="table6"> - <property name="visible">True</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="transport_host_label"> - <property name="visible">True</property> - <property name="xalign">1</property> - <property name="label" translatable="yes">_Server:</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">transport_host</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="transport_host"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="transport_needs_auth"> - <property name="label" translatable="yes">Ser_ver requires authentication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property> + <property name="justify">center</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkVBox" id="transport_security_frame"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label517"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Security</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox203"> + <object class="GtkHBox" id="transport_ssl_hbox"> <property name="visible">True</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label564"> + <object class="GtkLabel" id="lblTransportUseSSL"> <property name="visible">True</property> + <property name="label" translatable="yes">_Use Secure Connection:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">transport_use_ssl</property> </object> <packing> <property name="expand">False</property> @@ -1271,305 +1196,203 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox183"> + <object class="GtkComboBox" id="transport_use_ssl"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkHBox" id="transport_ssl_hbox"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="lblTransportUseSSL"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Use Secure Connection:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">transport_use_ssl</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="transport_use_ssl"> - <property name="visible">True</property> - <property name="model">use_ssl_model</property> - <child> - <object class="GtkCellRendererText" id="transport_use_ssl_renderer"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> + <property name="model">use_ssl_model</property> <child> - <object class="GtkHBox" id="transport_ssl_disabled"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="stock">gtk-dialog-warning</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="transport_ssl_disabled_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">SSL is not supported in this build of Evolution</property> - <property name="justify">center</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> + <object class="GtkCellRendererText" id="transport_use_ssl_renderer"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="transport-auth-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="transport-auth-header"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Authentication</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="transport-auth-alignment"> + <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="transport_auth_frame"> + <object class="GtkTable" id="transport-auth-table"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="n_rows">3</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkLabel" id="label478"> + <object class="GtkLabel" id="transport_auth_label"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Authentication</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <property name="xalign">1</property> + <property name="label" translatable="yes">T_ype:</property> + <property name="use_underline">True</property> + <property name="justify">center</property> + <property name="mnemonic_widget">transport_auth_dropdown</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkHBox" id="hbox176"> + <object class="GtkLabel" id="transport_user_label"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label563"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="xalign">1</property> + <property name="label" translatable="yes">User _Name:</property> + <property name="use_underline">True</property> + <property name="justify">right</property> + <property name="mnemonic_widget">transport_user</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="transport_user"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="transport_remember_password"> + <property name="label" translatable="yes">Remember _password</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment1"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xscale">0</property> <child> - <object class="GtkTable" id="table16"> + <object class="GtkHBox" id="hbox195"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox61"> + <object class="GtkComboBox" id="transport_auth_dropdown"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkTable" id="table31"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="transport_auth_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">T_ype:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">transport_auth_dropdown</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="transport_user_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">User_name:</property> - <property name="use_underline">True</property> - <property name="justify">right</property> - <property name="mnemonic_widget">transport_user</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="transport_user"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox195"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkComboBox" id="transport_auth_dropdown"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="transport_check_supported"> - <property name="label" translatable="yes">Ch_eck for Supported Types</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="fixed5"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="transport_remember_password"> - <property name="label" translatable="yes">Remember _password</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="transport_check_supported"> + <property name="label" translatable="yes">Ch_eck for Supported Types</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="right_attach">2</property> </packing> </child> + <child> + <placeholder/> + </child> </object> - <packing> - <property name="position">2</property> - </packing> </child> </object> <packing> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">4</property> </packing> </child> </object> - <object class="GtkLabel" id="label34"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sending Mail</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> <object class="GtkVBox" id="vboxFoldersBorder"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="folders_frame"> + <object class="GtkVBox" id="special-folders-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label482"> + <object class="GtkLabel" id="special-folders-header"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Sent and Draft Messages</property> + <property name="label" translatable="yes">Special Folders</property> <attributes> <attribute name="weight" value="bold"/> </attributes> @@ -1581,250 +1404,163 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox177"> + <object class="GtkAlignment" id="special-folders-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label560"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="xscale">0</property> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table17"> + <object class="GtkTable" id="special-folders-table"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="n_rows">5</property> + <property name="n_columns">2</property> + <property name="column_spacing">12</property> + <property name="row_spacing">6</property> <child> - <object class="GtkVBox" id="vbox184"> + <object class="GtkLabel" id="drafts_label"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Drafts _Folder:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="sent_label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sent _Messages Folder:</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="EMFolderSelectionButton" id="sent_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title">Select Sent Folder</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="EMFolderSelectionButton" id="drafts_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title">Select Drafts Folder</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="trash_folder_check"> + <property name="label" translatable="yes">_Trash Folder:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="EMFolderSelectionButton" id="trash_folder_butt"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title">Select Trash Folder</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="junk_folder_check"> + <property name="label" translatable="yes">_Junk Folder:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="EMFolderSelectionButton" id="junk_folder_butt"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title">Select Junk Folder</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options">GTK_FILL</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="revert-button-alignment"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="xscale">0</property> <child> - <object class="GtkTable" id="folders_table"> + <object class="GtkButton" id="default_folders_button"> + <property name="label">gtk-revert-to-saved</property> <property name="visible">True</property> - <property name="n_rows">5</property> - <property name="n_columns">3</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="drafts_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Drafts _Folder:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="sent_label"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Sent _Messages Folder:</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="EMFolderSelectionButton" id="sent_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="title">Select Sent Folder</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="EMFolderSelectionButton" id="drafts_button"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="title">Select Drafts Folder</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="fixed9"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="fixed8"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox216"> - <property name="visible">True</property> - <child> - <object class="GtkButton" id="default_folders_button"> - <property name="label">gtk-revert-to-saved</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="fixed12"> - <property name="visible">True</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">3</property> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="trash_folder_check"> - <property name="label" translatable="yes">_Trash Folder:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="EMFolderSelectionButton" id="trash_folder_butt"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="title">Select Trash Folder</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="junk_folder_check"> - <property name="label" translatable="yes">_Junk Folder:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="EMFolderSelectionButton" id="junk_folder_butt"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="receives_default">False</property> - <property name="title">Select Junk Folder</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="trash_folder_fixed"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkFixed" id="junk_folder_fixed"> - <property name="visible">True</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> </object> - <packing> - <property name="position">0</property> - </packing> </child> </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + </packing> + </child> + <child> + <placeholder/> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -1839,11 +1575,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="frame2"> + <object class="GtkVBox" id="composing-messages-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label484"> + <object class="GtkLabel" id="composing-messages-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Composing Messages</property> @@ -1858,170 +1595,73 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox178"> + <object class="GtkAlignment" id="composing-messages-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label561"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table18"> + <object class="GtkTable" id="composing-messages-table"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="n_rows">4</property> + <property name="row_spacing">6</property> <child> - <object class="GtkTable" id="table8"> + <object class="GtkAlignment" id="always-bcc-alignment"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> + <property name="left_padding">18</property> <child> - <object class="GtkVBox" id="vbox186"> + <object class="GtkEntry" id="bcc_addrs"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="always_cc"> - <property name="label" translatable="yes">Alway_s carbon-copy (cc) to:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox210"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label522"> - <property name="visible">True</property> - <property name="xpad">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table32"> - <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> - <child> - <object class="GtkVBox" id="vbox187"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="cc_addrs"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> </child> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="always_bcc"> + <property name="label" translatable="yes">Always _blind carbon-copy (bcc) to:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="always-cc-alignment"> + <property name="visible">True</property> + <property name="left_padding">18</property> <child> - <object class="GtkVBox" id="vbox188"> + <object class="GtkEntry" id="cc_addrs"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="always_bcc"> - <property name="label" translatable="yes">Always _blind carbon-copy (bcc) to:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox211"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label523"> - <property name="visible">True</property> - <property name="xpad">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table33"> - <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> - <child> - <object class="GtkVBox" id="vbox189"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkEntry" id="bcc_addrs"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - </packing> </child> </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="always_cc"> + <property name="label" translatable="yes">Alway_s carbon-copy (cc) to:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -2036,11 +1676,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox205"> + <object class="GtkVBox" id="message-receipts-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label578"> + <object class="GtkLabel" id="message-receipts-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Message Receipts</property> @@ -2055,21 +1696,11 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox231"> + <object class="GtkAlignment" id="message-receipts-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label581"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox232"> + <object class="GtkHBox" id="message-receipts-hbox"> <property name="visible">True</property> <property name="spacing">12</property> <child> @@ -2094,38 +1725,32 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">2</property> </packing> </child> </object> - <object class="GtkLabel" id="label35"> - <property name="visible">True</property> - <property name="label" translatable="yes">Defaults</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> <object class="GtkVBox" id="vboxSecurityBorder"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="general_vbox"> + <object class="GtkVBox" id="security-general-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel" id="security-general-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">General</property> @@ -2140,19 +1765,9 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox3"> + <object class="GtkAlignment" id="security-general-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> <object class="GtkCheckButton" id="pgp_no_imip_sign"> <property name="label" translatable="yes">_Do not sign meeting requests (for Outlook compatibility)</property> @@ -2162,16 +1777,9 @@ For example: "Work" or "Personal"</property> <property name="use_underline">True</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -2183,11 +1791,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="pgp_frame"> + <object class="GtkVBox" id="pgp-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label486"> + <object class="GtkLabel" id="pgp-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Pretty Good Privacy (PGP/GPG)</property> @@ -2202,27 +1811,18 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox179"> + <object class="GtkAlignment" id="pgp-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label558"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table19"> + <object class="GtkTable" id="pgp-table"> <property name="visible">True</property> <property name="column_spacing">6</property> <property name="row_spacing">2</property> <child> <object class="GtkVBox" id="vboxPGP"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hbox63"> @@ -2246,6 +1846,7 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="pgp_key"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="position">1</property> @@ -2347,9 +1948,6 @@ For example: "Work" or "Personal"</property> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -2364,11 +1962,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="smime_vbox"> + <object class="GtkVBox" id="smime-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label519"> + <object class="GtkLabel" id="smime-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Secure MIME (S/MIME)</property> @@ -2383,19 +1982,9 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox206"> + <object class="GtkAlignment" id="smime-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label559"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> <object class="GtkTable" id="smime_table"> <property name="visible">True</property> @@ -2407,6 +1996,7 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="smime_sign_key"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="left_attach">1</property> @@ -2420,6 +2010,7 @@ For example: "Work" or "Personal"</property> <object class="GtkEntry" id="smime_encrypt_key"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="left_attach">1</property> @@ -2529,7 +2120,7 @@ For example: "Work" or "Personal"</property> <object class="GtkButton" id="smime_encrypt_key_select"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <child> <object class="GtkAlignment" id="alignment28"> <property name="visible">True</property> @@ -2577,7 +2168,7 @@ For example: "Work" or "Personal"</property> <object class="GtkButton" id="smime_encrypt_key_clear"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <child> <object class="GtkAlignment" id="alignment35"> <property name="visible">True</property> @@ -2632,116 +2223,6 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox209"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="smime_sign_key_select"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <child> - <object class="GtkAlignment" id="alignment29"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox2"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="stock">gtk-open</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label2"> - <property name="visible">True</property> - <property name="label" translatable="yes">_Select...</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="smime_sign_key_clear"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <child> - <object class="GtkAlignment" id="alignment34"> - <property name="visible">True</property> - <property name="xscale">0</property> - <property name="yscale">0</property> - <child> - <object class="GtkHBox" id="hbox229"> - <property name="visible">True</property> - <property name="spacing">2</property> - <child> - <object class="GtkImage" id="image9"> - <property name="visible">True</property> - <property name="stock">gtk-clear</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label576"> - <property name="visible">True</property> - <property name="label" translatable="yes">Cle_ar</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options">GTK_FILL</property> - </packing> - </child> - <child> <object class="GtkLabel" id="smime_hash_algo_label"> <property name="visible">True</property> <property name="xalign">0</property> @@ -2784,12 +2265,121 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <placeholder/> + <object class="GtkAlignment" id="alignment4"> + <property name="visible">True</property> + <property name="yalign">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox209"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="smime_sign_key_select"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkAlignment" id="alignment29"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox2"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image4"> + <property name="visible">True</property> + <property name="stock">gtk-open</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label2"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Select...</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="smime_sign_key_clear"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <child> + <object class="GtkAlignment" id="alignment34"> + <property name="visible">True</property> + <property name="xscale">0</property> + <property name="yscale">0</property> + <child> + <object class="GtkHBox" id="hbox229"> + <property name="visible">True</property> + <property name="spacing">2</property> + <child> + <object class="GtkImage" id="image9"> + <property name="visible">True</property> + <property name="stock">gtk-clear</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label576"> + <property name="visible">True</property> + <property name="label" translatable="yes">Cle_ar</property> + <property name="use_underline">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">3</property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -2804,12 +2394,6 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <object class="GtkLabel" id="lblSecurity"> - <property name="visible">True</property> - <property name="label" translatable="yes">Security</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> <object class="GtkListStore" id="use_ssl_model"> <columns> <!-- column-name Label --> @@ -2840,13 +2424,15 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxMailGeneral"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="FontsFrame"> + <object class="GtkVBox" id="message-fonts-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label492"> + <object class="GtkLabel" id="message-fonts-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Message Fonts</property> @@ -2861,27 +2447,18 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox182"> + <object class="GtkAlignment" id="message-fonts-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label540"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table22"> + <object class="GtkTable" id="message-fonts-table"> <property name="visible">True</property> <property name="column_spacing">6</property> <property name="row_spacing">2</property> <child> <object class="GtkVBox" id="vboxMessageFonts"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="radFontUseSame"> @@ -2923,7 +2500,7 @@ For example: "Work" or "Personal"</property> <object class="GtkFontButton" id="FontFixed"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <property name="title" translatable="yes">Select HTML fixed width font</property> <signal name="font_set" handler="changed"/> </object> @@ -2940,7 +2517,7 @@ For example: "Work" or "Personal"</property> <object class="GtkFontButton" id="FontVariable"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <property name="title" translatable="yes">Select HTML variable width font</property> <signal name="font_set" handler="changed"/> </object> @@ -2975,9 +2552,6 @@ For example: "Work" or "Personal"</property> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -2992,11 +2566,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="MessageDisplayFrame"> + <object class="GtkVBox" id="message-display-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label494"> + <object class="GtkLabel" id="message-display-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Message Display</property> @@ -3011,122 +2586,104 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox183"> + <object class="GtkAlignment" id="message-display-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label541"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table23"> + <object class="GtkVBox" id="message-display-vbox"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vboxMessageDisplay"> + <object class="GtkHBox" id="hboxHighlightColor"> <property name="visible">True</property> <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hboxHighlightColor"> + <object class="GtkCheckButton" id="chkHighlightCitations"> + <property name="label" translatable="yes">Highlight _quotations with</property> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="chkHighlightCitations"> - <property name="label" translatable="yes">Highlight _quotations with</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkColorButton" id="colorButtonHighlightCitations"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="title" translatable="yes">Pick a color</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblColor"> - <property name="visible">True</property> - <property name="label" translatable="yes">color</property> - <property name="justify">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="position">4</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hboxDefaultCharset"> + <object class="GtkColorButton" id="colorButtonHighlightCitations"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="lblDefaultCharset"> - <property name="visible">True</property> - <property name="label" translatable="yes">Default character e_ncoding:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="title" translatable="yes">Pick a color</property> + <property name="color">#000000000000</property> </object> <packing> - <property name="position">5</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkCheckButton" id="view-check"> - <property name="label" translatable="yes">Apply the same _view settings to all folders</property> + <object class="GtkLabel" id="lblColor"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="label" translatable="yes">color</property> + <property name="justify">center</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hboxDefaultCharset"> + <property name="visible">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="lblDefaultCharset"> + <property name="visible">True</property> + <property name="label" translatable="yes">Default character e_ncoding:</property> <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="justify">center</property> </object> <packing> - <property name="position">7</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> </packing> </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="view-check"> + <property name="label" translatable="yes">Apply the same _view settings to all folders</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> + <packing> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -3141,11 +2698,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="DeleteMailFrame"> + <object class="GtkVBox" id="delete-mail-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label496"> + <object class="GtkLabel" id="delete-mail-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Delete Mail</property> @@ -3160,77 +2718,43 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox184"> + <object class="GtkAlignment" id="delete-mail-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label542"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkTable" id="table24"> + <object class="GtkVBox" id="delete-mail-vbox"> <property name="visible">True</property> - <property name="column_spacing">6</property> - <property name="row_spacing">2</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vboxDeletingMail"> + <object class="GtkHBox" id="hbox220"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="spacing">4</property> <child> - <object class="GtkHBox" id="hbox220"> + <object class="GtkCheckButton" id="chkEmptyTrashOnExit"> + <property name="label" translatable="yes">Empty trash folders on e_xit</property> <property name="visible">True</property> - <property name="spacing">4</property> - <child> - <object class="GtkCheckButton" id="chkEmptyTrashOnExit"> - <property name="label" translatable="yes">Empty trash folders on e_xit</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="comboboxEmptyTrashDays"> - <property name="visible">True</property> - <property name="model">model1</property> - <child> - <object class="GtkCellRendererText" id="renderer1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> + <property name="expand">False</property> + <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkCheckButton" id="chkConfirmExpunge"> - <property name="label" translatable="yes">Confirm _when expunging a folder</property> + <object class="GtkComboBox" id="comboboxEmptyTrashDays"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="model">model1</property> + <child> + <object class="GtkCellRendererText" id="renderer1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> <property name="expand">False</property> @@ -3239,11 +2763,24 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chkConfirmExpunge"> + <property name="label" translatable="yes">Confirm _when expunging a folder</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -3258,6 +2795,9 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> + <packing> + <property name="tab_fill">False</property> + </packing> </child> <child type="tab"> <object class="GtkLabel" id="lblMailGeneral"> @@ -3274,29 +2814,21 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxHtmlMail"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkLabel" id="label530"> + <object class="GtkVBox" id="html-general-section"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">General</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox215"> - <property name="visible">True</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label538"> + <object class="GtkLabel" id="html-general-header"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">General</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -3305,43 +2837,48 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox173"> + <object class="GtkAlignment" id="html-general-alignment"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkCheckButton" id="chkShowAnimatedImages"> - <property name="label" translatable="yes" comments="If enabled, show animation; if disabled, only display a static image without any animation">_Show image animations</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkCheckButton" id="chkPromptWantHTML"> - <property name="label" translatable="yes">_Prompt on sending HTML mail to contacts that do not want them</property> + <object class="GtkVBox" id="html-general-vbox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkCheckButton" id="chkShowAnimatedImages"> + <property name="label" translatable="yes" comments="If enabled, show animation; if disabled, only display a static image without any animation">_Show image animations</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chkPromptWantHTML"> + <property name="label" translatable="yes">_Prompt on sending HTML mail to contacts that do not want them</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -3349,15 +2886,16 @@ For example: "Work" or "Personal"</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkVBox" id="vboxLoadingImages"> + <object class="GtkVBox" id="loading-images-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label500"> + <object class="GtkLabel" id="loading-images-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Loading Images</property> @@ -3372,22 +2910,13 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox186"> + <object class="GtkAlignment" id="loading-images-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label539"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox190"> + <object class="GtkVBox" id="loading-images-vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkRadioButton" id="radImagesNever"> @@ -3396,6 +2925,7 @@ For example: "Work" or "Personal"</property> <property name="can_focus">True</property> <property name="receives_default">False</property> <property name="use_underline">True</property> + <property name="active">True</property> <property name="draw_indicator">True</property> </object> <packing> @@ -3437,16 +2967,9 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -3454,12 +2977,13 @@ For example: "Work" or "Personal"</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="position">1</property> + <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -3478,9 +3002,10 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="frameColours"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label502"> + <object class="GtkLabel" id="labels-section"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Labels</property> @@ -3527,28 +3052,21 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxHeaderTab"> <property name="visible">True</property> <property name="border_width">12</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox206"> + <object class="GtkVBox" id="photograph-section"> <property name="visible">True</property> - <property name="spacing">3</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkHBox" id="hbox238"> + <object class="GtkLabel" id="photograph-header"> <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label587"> - <property name="visible">True</property> - <property name="label" translatable="yes">Sender Photograph</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="xalign">0</property> + <property name="label" translatable="yes">Sender Photograph</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -3557,11 +3075,14 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox1"> + <object class="GtkAlignment" id="photograph-alignment"> <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox239"> + <object class="GtkVBox" id="photograph-vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="photo_show"> <property name="label" translatable="yes">_Show the photograph of sender in the message preview</property> @@ -3574,20 +3095,9 @@ For example: "Work" or "Personal"</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="padding">10</property> <property name="position">0</property> </packing> </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox240"> - <property name="visible">True</property> <child> <object class="GtkCheckButton" id="photo_local"> <property name="label" translatable="yes">S_earch for sender photograph only in local address books</property> @@ -3600,16 +3110,10 @@ For example: "Work" or "Personal"</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="padding">10</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -3626,29 +3130,20 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkLabel" id="label524"> + <object class="GtkVBox" id="message-headers-section"> <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Displayed Message Headers</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">txtHeaders</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox212"> - <property name="visible">True</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label536"> + <object class="GtkLabel" id="message-headers-header"> <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Displayed Message Headers</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">txtHeaders</property> + <attributes> + <attribute name="weight" value="bold"/> + </attributes> </object> <packing> <property name="expand">False</property> @@ -3657,99 +3152,119 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox199"> + <object class="GtkAlignment" id="message-headers-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkEntry" id="txtHeaders"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow49"> + <object class="GtkHBox" id="message-headers-hbox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> + <property name="spacing">12</property> <child> - <object class="GtkTreeView" id="treeHeaders"> + <object class="GtkVBox" id="vbox199"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="treeHeaders-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Mail Headers Table</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkEntry" id="txtHeaders"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolledwindow49"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="treeHeaders"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="treeHeaders-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Mail Headers Table</property> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="position">1</property> + </packing> </child> </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="vbox200"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="cmdHeadersAdd"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="cmdHeadersRemove"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkVBox" id="vbox200"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkButton" id="cmdHeadersAdd"> - <property name="label">gtk-add</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="cmdHeadersRemove"> - <property name="label">gtk-remove</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox210"> + <object class="GtkVBox" id="datetime-format-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label591"> + <object class="GtkLabel" id="datetime-format-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Date/Time Format</property> @@ -3766,21 +3281,11 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox245"> + <object class="GtkAlignment" id="datetime-format-alignment"> <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label592"> - <property name="visible">True</property> - <property name="xpad">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="datetime_format_table"> + <object class="GtkTable" id="datetime-format-table"> <property name="visible">True</property> <property name="n_columns">3</property> <child> @@ -3793,9 +3298,6 @@ For example: "Work" or "Personal"</property> <placeholder/> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -3805,12 +3307,14 @@ For example: "Work" or "Personal"</property> </object> <packing> <property name="expand">False</property> - <property name="position">3</property> + <property name="fill">False</property> + <property name="position">2</property> </packing> </child> </object> <packing> <property name="position">3</property> + <property name="tab_fill">False</property> </packing> </child> <child type="tab"> @@ -3825,15 +3329,18 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox161"> + <object class="GtkVBox" id="vboxJunk"> <property name="visible">True</property> <property name="border_width">12</property> - <property name="spacing">6</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox192"> + <object class="GtkVBox" id="junk-general-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label526"> + <object class="GtkLabel" id="junk-general-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">General</property> @@ -3848,103 +3355,145 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkTable" id="table34"> + <object class="GtkAlignment" id="junk-general-alignment"> <property name="visible">True</property> - <property name="border_width">12</property> - <property name="n_rows">9</property> - <property name="row_spacing">3</property> + <property name="left_padding">12</property> <child> - <object class="GtkHBox" id="hbox235"> + <object class="GtkTable" id="junk-general-table"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="n_rows">9</property> + <property name="row_spacing">3</property> <child> - <object class="GtkLabel" id="label586"> + <object class="GtkHBox" id="hbox235"> <property name="visible">True</property> - <property name="label" translatable="yes">_Default junk plugin:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">default_junk_plugin</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="label586"> + <property name="visible">True</property> + <property name="label" translatable="yes">_Default junk plugin:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">default_junk_plugin</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="padding">6</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="default_junk_plugin"> + <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="padding">6</property> - <property name="position">0</property> + <property name="top_attach">7</property> + <property name="bottom_attach">8</property> + <property name="x_options">GTK_FILL</property> </packing> </child> <child> - <object class="GtkComboBox" id="default_junk_plugin"> + <object class="GtkCheckButton" id="chkCheckIncomingMail"> + <property name="label" translatable="yes">Check incoming _messages for junk</property> <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">4</property> </packing> </child> - </object> - <packing> - <property name="top_attach">7</property> - <property name="bottom_attach">8</property> - <property name="x_options">GTK_FILL</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chkCheckIncomingMail"> - <property name="label" translatable="yes">Check incoming _messages for junk</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">Checks incoming mail messages to be Junk</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">4</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox236"> - <property name="visible">True</property> - <property name="spacing">3</property> <child> - <object class="GtkImage" id="plugin_image"> + <object class="GtkHBox" id="hbox236"> <property name="visible">True</property> - <property name="icon_name">gtk-info</property> + <property name="spacing">3</property> + <child> + <object class="GtkImage" id="plugin_image"> + <property name="visible">True</property> + <property name="icon_name">gtk-info</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="plugin_status"> + <property name="visible">True</property> + <property name="use_markup">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="top_attach">8</property> + <property name="bottom_attach">9</property> + <property name="x_options">GTK_FILL</property> + <property name="x_padding">15</property> </packing> </child> <child> - <object class="GtkLabel" id="plugin_status"> + <object class="GtkHBox" id="hbox237"> <property name="visible">True</property> - <property name="use_markup">True</property> + <property name="spacing">4</property> + <child> + <object class="GtkCheckButton" id="junk_empty_check"> + <property name="label" translatable="yes">Delete junk messages on e_xit</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="junk_empty_combobox"> + <property name="visible">True</property> + <property name="model">model2</property> + <child> + <object class="GtkCellRendererText" id="renderer2"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="x_padding">4</property> </packing> </child> - </object> - <packing> - <property name="top_attach">8</property> - <property name="bottom_attach">9</property> - <property name="x_options">GTK_FILL</property> - <property name="x_padding">15</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox237"> - <property name="visible">True</property> - <property name="spacing">4</property> <child> - <object class="GtkCheckButton" id="junk_empty_check"> - <property name="label" translatable="yes">Delete junk messages on e_xit</property> + <object class="GtkCheckButton" id="junk_header_check"> + <property name="label" translatable="yes">Check cu_stom headers for junk</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> @@ -3952,102 +3501,136 @@ For example: "Work" or "Personal"</property> <property name="draw_indicator">True</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="top_attach">2</property> + <property name="bottom_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">4</property> </packing> </child> <child> - <object class="GtkComboBox" id="junk_empty_combobox"> + <object class="GtkHBox" id="hbox243"> <property name="visible">True</property> - <property name="model">model2</property> + <property name="spacing">6</property> <child> - <object class="GtkCellRendererText" id="renderer2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkScrolledWindow" id="scrolledwindow51"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTreeView" id="junk_header_tree"> + <property name="visible">True</property> + <property name="can_focus">True</property> + </object> + </child> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVButtonBox" id="vbuttonbox26"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="layout_style">start</property> + <child> + <object class="GtkButton" id="junk_header_add"> + <property name="label">gtk-add</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="junk_header_remove"> + <property name="label">gtk-remove</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">True</property> + <property name="use_stock">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_padding">22</property> </packing> </child> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="x_padding">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="junk_header_check"> - <property name="label" translatable="yes">Check cu_stom headers for junk</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">2</property> - <property name="bottom_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">4</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox243"> - <property name="visible">True</property> - <property name="spacing">6</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow51"> + <object class="GtkCheckButton" id="lookup_book"> + <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="junk_header_tree"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - </child> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> </object> <packing> - <property name="position">0</property> + <property name="top_attach">4</property> + <property name="bottom_attach">5</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">4</property> </packing> </child> <child> - <object class="GtkVButtonBox" id="vbuttonbox26"> + <object class="GtkCheckButton" id="junk_lookup_local_only"> + <property name="label" translatable="yes">_Lookup in local address book only</property> <property name="visible">True</property> - <property name="layout_style">spread</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="top_attach">5</property> + <property name="bottom_attach">6</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + <property name="x_padding">25</property> + </packing> + </child> + <child> + <object class="GtkHBox" id="hbox244"> + <property name="visible">True</property> + <property name="spacing">6</property> <child> - <object class="GtkButton" id="junk_header_add"> - <property name="label">gtk-add</property> + <object class="GtkImage" id="image11"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="stock">gtk-info</property> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkButton" id="junk_header_remove"> - <property name="label">gtk-remove</property> + <object class="GtkLabel" id="label590"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> + <property name="label" translatable="yes">Option is ignored if a match for custom junk headers is found.</property> </object> <packing> <property name="expand">False</property> @@ -4057,82 +3640,12 @@ For example: "Work" or "Personal"</property> </child> </object> <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_padding">22</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="lookup_book"> - <property name="label" translatable="yes">Do not mar_k messages as junk if sender is in my address book</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">4</property> - <property name="bottom_attach">5</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">4</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="junk_lookup_local_only"> - <property name="label" translatable="yes">_Lookup in local address book only</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="top_attach">5</property> - <property name="bottom_attach">6</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - <property name="x_padding">25</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox244"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="image11"> - <property name="visible">True</property> - <property name="stock">gtk-info</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label590"> - <property name="visible">True</property> - <property name="label" translatable="yes">Option is ignored if a match for custom junk headers is found.</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="top_attach">6</property> + <property name="bottom_attach">7</property> + <property name="x_options">GTK_FILL</property> </packing> </child> </object> - <packing> - <property name="top_attach">6</property> - <property name="bottom_attach">7</property> - <property name="x_options">GTK_FILL</property> - </packing> </child> </object> <packing> @@ -4146,23 +3659,13 @@ For example: "Work" or "Personal"</property> <property name="position">0</property> </packing> </child> - <child> - <object class="GtkVBox" id="vbox195"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> </object> <packing> <property name="position">4</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="label473"> + <object class="GtkLabel" id="lblJunk"> <property name="visible">True</property> <property name="label" translatable="yes">Junk</property> <property name="use_underline">True</property> @@ -4180,13 +3683,15 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxComposerGeneral"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">18</property> <child> - <object class="GtkVBox" id="frameBehavior"> + <object class="GtkVBox" id="default-behavior-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label504"> + <object class="GtkLabel" id="default-behavior-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Default Behavior</property> @@ -4201,27 +3706,18 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox189"> + <object class="GtkAlignment" id="default-behavior-alignment"> <property name="visible">True</property> + <property name="left_padding">12</property> <child> - <object class="GtkLabel" id="label505"> - <property name="visible">True</property> - <property name="xpad">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table28"> + <object class="GtkTable" id="default-behavior-table"> <property name="visible">True</property> <property name="column_spacing">6</property> <property name="row_spacing">2</property> <child> <object class="GtkVBox" id="vboxBehavior"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">8</property> <child> <object class="GtkCheckButton" id="chkSendHTML"> @@ -4466,6 +3962,7 @@ For example: "Work" or "Personal"</property> <child> <object class="GtkVBox" id="vboxTopPosting"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">8</property> <child> <object class="GtkHBox" id="hbox242"> @@ -4522,9 +4019,6 @@ For example: "Work" or "Personal"</property> <property name="position">1</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="position">0</property> @@ -4538,17 +4032,26 @@ For example: "Work" or "Personal"</property> </object> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkVBox" id="alerts-section"> + <property name="visible">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkLabel" id="labelAlerts"> + <object class="GtkLabel" id="alerts-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Alerts</property> @@ -4559,31 +4062,21 @@ For example: "Work" or "Personal"</property> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox190"> + <object class="GtkAlignment" id="alerts-alignment"> <property name="visible">True</property> <child> - <object class="GtkLabel" id="label507"> - <property name="visible">True</property> - <property name="xpad">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="table29"> + <object class="GtkTable" id="alerts-table"> <property name="visible">True</property> <property name="column_spacing">6</property> <property name="row_spacing">2</property> <child> - <object class="GtkVBox" id="vboxAlerts"> + <object class="GtkVBox" id="alerts-vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="chkPromptEmptySubject"> @@ -4663,22 +4156,17 @@ For example: "Work" or "Personal"</property> </object> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> @@ -4698,13 +4186,15 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxSignatures"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox201"> + <object class="GtkVBox" id="signature-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label548"> + <object class="GtkLabel" id="signature-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Sig_natures</property> @@ -4720,7 +4210,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkAlignment" id="alignSignatures"> + <object class="GtkAlignment" id="signature-alignment"> <property name="visible">True</property> <property name="left_padding">12</property> <child> @@ -4737,11 +4227,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="vbox202"> + <object class="GtkVBox" id="signature-preview-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label551"> + <object class="GtkLabel" id="signature-preview-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Preview</property> @@ -4756,23 +4247,13 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox162"> + <object class="GtkAlignment" id="signature-preview-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label552"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkScrolledWindow" id="scrolled-sig"> + <object class="GtkScrolledWindow" id="signature-preview-scrolled-window"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> <property name="hscrollbar_policy">automatic</property> <property name="vscrollbar_policy">automatic</property> <property name="shadow_type">in</property> @@ -4780,14 +4261,9 @@ For example: "Work" or "Personal"</property> <placeholder/> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> <property name="position">1</property> </packing> </child> @@ -4819,13 +4295,15 @@ For example: "Work" or "Personal"</property> <object class="GtkVBox" id="vboxSpellChecking"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkVBox" id="vbox196"> + <object class="GtkVBox" id="languages-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label534"> + <object class="GtkLabel" id="languages-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">_Languages</property> @@ -4842,109 +4320,69 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox218"> + <object class="GtkAlignment" id="languages-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label555"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vbox197"> + <object class="GtkTable" id="languages-table"> <property name="visible">True</property> - <property name="spacing">6</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">6</property> <child> - <object class="GtkVBox" id="vbox178"> + <object class="GtkImage" id="pixmapSpellInfo"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkHBox" id="hbox192"> - <property name="visible">True</property> - <child> - <object class="GtkHBox" id="hboxLanguages"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow48"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hscrollbar_policy">automatic</property> - <property name="vscrollbar_policy">automatic</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="listSpellCheckLanguage"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <child internal-child="accessible"> - <object class="AtkObject" id="listSpellCheckLanguage-atkobject"> - <property name="AtkObject::accessible-name" translatable="yes">Languages Table</property> - </object> - </child> - </object> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> + <property name="yalign">0</property> + <property name="stock">gtk-dialog-info</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options"></property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="languages-label"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">The list of languages here reflects only the languages for which you have a dictionary installed.</property> + <property name="wrap">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="languages-scrolled-window"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">automatic</property> + <property name="vscrollbar_policy">automatic</property> + <property name="shadow_type">in</property> <child> - <object class="GtkHBox" id="hboxSpelling"> + <object class="GtkTreeView" id="listSpellCheckLanguage"> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="pixmapSpellInfo"> - <property name="visible">True</property> - <property name="yalign">0</property> - <property name="stock">gtk-dialog-info</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblSpellChecking"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">The list of languages here reflects only the languages for which you have a dictionary installed.</property> - <property name="wrap">True</property> + <property name="can_focus">True</property> + <property name="headers_visible">False</property> + <child internal-child="accessible"> + <object class="AtkObject" id="listSpellCheckLanguage-atkobject"> + <property name="AtkObject::accessible-name" translatable="yes">Languages Table</property> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> </child> </object> <packing> - <property name="position">0</property> + <property name="right_attach">2</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -4957,11 +4395,12 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkVBox" id="frameSpellChecking"> + <object class="GtkVBox" id="spell-options-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label508"> + <object class="GtkLabel" id="spell-options-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Options</property> @@ -4976,22 +4415,13 @@ For example: "Work" or "Personal"</property> </packing> </child> <child> - <object class="GtkHBox" id="hbox191"> + <object class="GtkAlignment" id="spell-options-alignment"> <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <object class="GtkLabel" id="label556"> - <property name="visible">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkVBox" id="vboxOptions"> + <object class="GtkVBox" id="spell-options-vbox"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="chkEnableSpellChecking"> @@ -5030,8 +4460,9 @@ For example: "Work" or "Personal"</property> <object class="GtkColorButton" id="colorButtonSpellCheckColor"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="receives_default">True</property> <property name="title" translatable="yes">Pick a color</property> + <property name="color">#000000000000</property> </object> <packing> <property name="expand">False</property> @@ -5046,9 +4477,6 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <packing> - <property name="position">1</property> - </packing> </child> </object> <packing> @@ -5067,7 +4495,7 @@ For example: "Work" or "Personal"</property> </packing> </child> <child type="tab"> - <object class="GtkLabel" id="label450"> + <object class="GtkLabel" id="lblSpellChecking"> <property name="visible">True</property> <property name="label" translatable="yes">Spell Checking</property> <property name="use_underline">True</property> @@ -5079,150 +4507,22 @@ For example: "Work" or "Personal"</property> </packing> </child> </object> - <object class="GtkWindow" id="font_tab"> - <property name="title" translatable="yes">Font Properties</property> - <child> - <object class="GtkVBox" id="toplevel"> - <property name="visible">True</property> - <property name="spacing">12</property> - <child> - <placeholder/> - </child> - <child> - <object class="GtkVBox" id="frame4"> - <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label512"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Printed Fonts</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkHBox" id="hbox194"> - <property name="visible">True</property> - <child> - <object class="GtkLabel" id="label513"> - <property name="visible">True</property> - <property name="xpad">12</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkTable" id="tblPrint"> - <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> - <property name="column_spacing">12</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="lblPrintVariable"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">V_ariable-width:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">print_variable</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblPrintFixed"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Fi_xed-width:</property> - <property name="use_underline">True</property> - <property name="justify">center</property> - <property name="mnemonic_widget">print_fixed</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkFontButton" id="print_fixed"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="title" translatable="yes">Select HTML fixed width font for printing</property> - <signal name="font_set" handler="changed"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkFontButton" id="print_variable"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="title" translatable="yes">Select HTML variable width font for printing</property> - <signal name="font_set" handler="changed"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> <object class="GtkDialog" id="add_script_signature"> <property name="type_hint">normal</property> <child internal-child="vbox"> <object class="GtkVBox" id="dialog-vbox1"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">12</property> <child> <object class="GtkVBox" id="vbox160"> <property name="visible">True</property> + <property name="orientation">vertical</property> <child> <object class="GtkVBox" id="vbox_add_script_signature"> <property name="visible">True</property> <property name="border_width">12</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkHBox" id="hboxImageAndHelp"> @@ -5429,13 +4729,15 @@ for display purposes only. </property> <object class="GtkVBox" id="vboxNetworkGeneral"> <property name="visible">True</property> <property name="border_width">12</property> - <property name="spacing">18</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkVBox" id="frameProxy"> + <object class="GtkVBox" id="proxy-section"> <property name="visible">True</property> + <property name="orientation">vertical</property> <property name="spacing">6</property> <child> - <object class="GtkLabel" id="label76"> + <object class="GtkLabel" id="proxy-header"> <property name="visible">True</property> <property name="xalign">0</property> <property name="label" translatable="yes">Proxy Settings</property> @@ -5448,252 +4750,79 @@ for display purposes only. </property> </packing> </child> <child> - <object class="GtkVBox" id="vboxProxy"> + <object class="GtkAlignment" id="proxy-alignment"> <property name="visible">True</property> - <property name="border_width">12</property> - <property name="spacing">8</property> - <child> - <object class="GtkRadioButton" id="rdoSysSettings"> - <property name="label" translatable="yes">_Use system defaults</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="rdoNoProxy"> - <property name="label" translatable="yes">_Direct connection to the Internet</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">rdoSysSettings</property> - </object> - <packing> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkRadioButton" id="rdoManualProxy"> - <property name="label" translatable="yes">_Manual proxy configuration:</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - <property name="group">rdoSysSettings</property> - </object> - <packing> - <property name="position">2</property> - </packing> - </child> + <property name="left_padding">12</property> <child> - <object class="GtkAlignment" id="alignment27"> + <object class="GtkVBox" id="proxy-vbox"> <property name="visible">True</property> - <property name="left_padding">24</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkVBox" id="vbox18"> + <object class="GtkRadioButton" id="rdoSysSettings"> + <property name="label" translatable="yes">_Use system defaults</property> <property name="visible">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkTable" id="table9"> - <property name="visible">True</property> - <property name="n_rows">4</property> - <property name="n_columns">4</property> - <property name="column_spacing">6</property> - <property name="row_spacing">6</property> - <child> - <object class="GtkLabel" id="lblHttpHost"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">H_TTP Proxy:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">txtHttpHost</property> - </object> - <packing> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblHttpsHost"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_Secure HTTP Proxy:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">txtHttpsHost</property> - </object> - <packing> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblIgnoreHosts"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">No _Proxy for:</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">txtIgnoreHosts</property> - </object> - <packing> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="txtHttpHost"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="txtHttpsHost"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">2</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblHttpPort"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkLabel" id="lblHttpsPort"> - <property name="visible">True</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">Port:</property> - </object> - <packing> - <property name="left_attach">2</property> - <property name="right_attach">3</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="x_options">GTK_FILL</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spnHttpPort"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment4</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkSpinButton" id="spnHttpsPort"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="adjustment">adjustment5</property> - <property name="climb_rate">1</property> - </object> - <packing> - <property name="left_attach">3</property> - <property name="right_attach">4</property> - <property name="top_attach">1</property> - <property name="bottom_attach">2</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <object class="GtkEntry" id="txtIgnoreHosts"> - <property name="visible">True</property> - <property name="can_focus">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="right_attach">4</property> - <property name="top_attach">3</property> - <property name="bottom_attach">4</property> - <property name="y_options"></property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="chkUseAuth"> - <property name="label" translatable="yes">Use Authe_ntication</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rdoNoProxy"> + <property name="label" translatable="yes">_Direct connection to the Internet</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">rdoSysSettings</property> + </object> + <packing> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkRadioButton" id="rdoManualProxy"> + <property name="label" translatable="yes">_Manual proxy configuration:</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + <property name="group">rdoSysSettings</property> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment27"> + <property name="visible">True</property> + <property name="left_padding">24</property> <child> - <object class="GtkAlignment" id="alignment26"> + <object class="GtkVBox" id="vbox18"> <property name="visible">True</property> - <property name="left_padding">24</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkTable" id="table11"> + <object class="GtkTable" id="table9"> <property name="visible">True</property> - <property name="n_rows">2</property> - <property name="n_columns">2</property> + <property name="n_rows">4</property> + <property name="n_columns">4</property> <property name="column_spacing">6</property> - <property name="row_spacing">3</property> + <property name="row_spacing">6</property> <child> - <object class="GtkLabel" id="lblAuthUser"> + <object class="GtkLabel" id="lblHttpHost"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Us_ername:</property> + <property name="label" translatable="yes">H_TTP Proxy:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">txtAuthUser</property> + <property name="mnemonic_widget">txtHttpHost</property> </object> <packing> <property name="x_options">GTK_FILL</property> @@ -5701,12 +4830,12 @@ for display purposes only. </property> </packing> </child> <child> - <object class="GtkLabel" id="lblAuthPwd"> + <object class="GtkLabel" id="lblHttpsHost"> <property name="visible">True</property> <property name="xalign">0</property> - <property name="label" translatable="yes">Pass_word:</property> + <property name="label" translatable="yes">_Secure HTTP Proxy:</property> <property name="use_underline">True</property> - <property name="mnemonic_widget">txtAuthPwd</property> + <property name="mnemonic_widget">txtHttpsHost</property> </object> <packing> <property name="top_attach">1</property> @@ -5716,47 +4845,234 @@ for display purposes only. </property> </packing> </child> <child> - <object class="GtkEntry" id="txtAuthUser"> + <object class="GtkLabel" id="lblIgnoreHosts"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">No _Proxy for:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">txtIgnoreHosts</property> + </object> + <packing> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="txtHttpHost"> <property name="visible">True</property> <property name="can_focus">True</property> + <property name="invisible_char">●</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> + <property name="y_options"></property> </packing> </child> <child> - <object class="GtkEntry" id="txtAuthPwd"> + <object class="GtkEntry" id="txtHttpsHost"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="visibility">False</property> + <property name="invisible_char">●</property> </object> <packing> <property name="left_attach">1</property> <property name="right_attach">2</property> <property name="top_attach">1</property> <property name="bottom_attach">2</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lblHttpPort"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lblHttpsPort"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Port:</property> + </object> + <packing> + <property name="left_attach">2</property> + <property name="right_attach">3</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spnHttpPort"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">adjustment4</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkSpinButton" id="spnHttpsPort"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + <property name="adjustment">adjustment5</property> + <property name="climb_rate">1</property> + </object> + <packing> + <property name="left_attach">3</property> + <property name="right_attach">4</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="y_options"></property> </packing> </child> + <child> + <object class="GtkEntry" id="txtIgnoreHosts"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">4</property> + <property name="top_attach">3</property> + <property name="bottom_attach">4</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> + <packing> + <property name="expand">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="chkUseAuth"> + <property name="label" translatable="yes">Use Authe_ntication</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="use_underline">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkAlignment" id="alignment26"> + <property name="visible">True</property> + <property name="left_padding">24</property> + <child> + <object class="GtkTable" id="table11"> + <property name="visible">True</property> + <property name="n_rows">2</property> + <property name="n_columns">2</property> + <property name="column_spacing">6</property> + <property name="row_spacing">3</property> + <child> + <object class="GtkLabel" id="lblAuthUser"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Us_ername:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">txtAuthUser</property> + </object> + <packing> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkLabel" id="lblAuthPwd"> + <property name="visible">True</property> + <property name="xalign">0</property> + <property name="label" translatable="yes">Pass_word:</property> + <property name="use_underline">True</property> + <property name="mnemonic_widget">txtAuthPwd</property> + </object> + <packing> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + <property name="x_options">GTK_FILL</property> + <property name="y_options"></property> + </packing> + </child> + <child> + <object class="GtkEntry" id="txtAuthUser"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="txtAuthPwd"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="invisible_char">●</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="right_attach">2</property> + <property name="top_attach">1</property> + <property name="bottom_attach">2</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="position">2</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="position">2</property> - </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="position">3</property> + </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="position">3</property> - </packing> </child> </object> <packing> - <property name="expand">False</property> <property name="position">1</property> </packing> </child> diff --git a/modules/mail/em-composer-prefs.c b/modules/mail/em-composer-prefs.c index 584936cb67..366fa5d6e4 100644 --- a/modules/mail/em-composer-prefs.c +++ b/modules/mail/em-composer-prefs.c @@ -542,7 +542,7 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, /* Signatures */ signature_list = e_get_signature_list (); - container = e_builder_get_widget (prefs->builder, "alignSignatures"); + container = e_builder_get_widget (prefs->builder, "signature-alignment"); widget = e_signature_manager_new (signature_list); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); @@ -568,7 +568,8 @@ em_composer_prefs_construct (EMComposerPrefs *prefs, signature_tree_view = e_signature_manager_get_tree_view ( E_SIGNATURE_MANAGER (widget)); - container = e_builder_get_widget (prefs->builder, "scrolled-sig"); + container = e_builder_get_widget ( + prefs->builder, "signature-preview-scrolled-window"); widget = e_signature_preview_new (); gtk_container_add (GTK_CONTAINER (container), widget); gtk_widget_show (widget); diff --git a/modules/mail/em-mailer-prefs.c b/modules/mail/em-mailer-prefs.c index 944c007007..d5cde4f79f 100644 --- a/modules/mail/em-mailer-prefs.c +++ b/modules/mail/em-mailer-prefs.c @@ -634,20 +634,19 @@ emmp_widget_glade (EConfig *ec, EConfigItem *item, GtkWidget *parent, GtkWidget static EMConfigItem emmp_items[] = { { E_CONFIG_BOOK, (gchar *) "", (gchar *) "preferences_toplevel", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "00.general", (gchar *) "vboxMailGeneral", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/00.fonts", (gchar *) "vboxMessageFonts", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "vboxMessageDisplay", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "vboxDeletingMail", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "00.general/30.newmail", (gchar *) "vboxNewMailNotify", emmp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "00.general/00.fonts", (gchar *) "message-fonts-table", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/10.display", (gchar *) "message-display-vbox", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "00.general/20.delete", (gchar *) "delete-mail-vbox", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "10.html", (gchar *) "vboxHtmlMail", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "vbox173", emmp_widget_glade }, - { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "vbox190", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/00.general", (gchar *) "mail-general-vbox", emmp_widget_glade }, + { E_CONFIG_SECTION, (gchar *) "10.html/10.images", (gchar *) "loading-images-vbox", emmp_widget_glade }, { E_CONFIG_PAGE, (gchar *) "20.labels", (gchar *) "frameColours", emmp_widget_glade }, /* this is a table, so we can't use it { E_CONFIG_SECTION, "20.labels/00.labels", "tableColours", emmp_widget_glade }, */ { E_CONFIG_PAGE, (gchar *) "30.headers", (gchar *) "vboxHeaderTab", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_PAGE, "30.headers/00.headers", "vbox199", emmp_widget_glade }, */ - { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vbox161", emmp_widget_glade }, + { E_CONFIG_PAGE, (gchar *) "40.junk", (gchar *) "vboxJunk", emmp_widget_glade }, /* no subvbox for section { E_CONFIG_SECTION, "40.junk/00.general", xxx, emmp_widget_glade } */ - { E_CONFIG_SECTION, (gchar *) "40.junk/10.options", (gchar *) "vbox204", emmp_widget_glade }, + { E_CONFIG_SECTION_TABLE, (gchar *) "40.junk/10.options", (gchar *) "junk-general-table", emmp_widget_glade }, }; static void @@ -1053,7 +1052,7 @@ em_mailer_prefs_construct (EMMailerPrefs *prefs, g_slist_free (header_add_list); /* date/time format */ - table = e_builder_get_widget (prefs->builder, "datetime_format_table"); + table = e_builder_get_widget (prefs->builder, "datetime-format-table"); /* To Translators: 'Table column' is a label for configurable date/time format for table columns showing a date in message list */ e_datetime_format_add_setup_widget (table, 0, "mail", "table", DTFormatKindDateTime, _("_Table column:")); /* To Translators: 'Date header' is a label for configurable date/time format for 'Date' header in mail message window/preview */ |