[evolution-patches] Simplifications to the Account Creation UI
- From: Srinivasa Ragavan <sragavan novell com>
- To: evolution-patches gnome org, kharish novell com
- Cc:
- Subject: [evolution-patches] Simplifications to the Account Creation UI
- Date: Tue, 22 Nov 2005 15:27:56 +0530
Hi,
I have done some simplifications to the Account creation UI, so that the
account can be created with minimal input and clear distinction of
advanced and basic options. The changes are following
* Remove the Optional input of Reply To, Default Account etc
* Remove the Receiving Options page.
* Move Soap Port in GW and GAL Server in Exchange to Receiving options
page.
* Remove Management Page and move he account name widget to the Initial
page and declare it as optional.
* In IMAP and other providers move the Auth and SSL section to the
Advanced Options Expander.
The pages in the account editor dialog remains same. It is just the
pages and options are shuffled in account creation to simplify it.
I have attached the patch and please review it. Please provide your
inputs on the idea.
Thanks
Srini.
Index: em-account-editor.c
===================================================================
RCS file: /cvs/gnome/evolution/mail/em-account-editor.c,v
retrieving revision 1.36
diff -u -p -r1.36 em-account-editor.c
--- em-account-editor.c 21 Sep 2005 06:41:27 -0000 1.36
+++ em-account-editor.c 22 Nov 2005 09:40:28 -0000
@@ -118,12 +118,15 @@ typedef struct _EMAccountEditorService {
struct _GtkLabel *pathlabel;
struct _GtkWidget *pathentry;
+ struct _GtkExpander *advanced_expander;
+ struct _GtkVBox *advanced_vbox;
struct _GtkWidget *ssl_frame;
struct _GtkComboBox *use_ssl;
struct _GtkWidget *ssl_hbox;
struct _GtkWidget *no_ssl;
struct _GtkWidget *auth_frame;
+ struct _GtkWidget *auth_top_frame;
struct _GtkComboBox *authtype;
struct _GtkWidget *authitem;
@@ -165,7 +168,6 @@ typedef struct _EMAccountEditorPrivate {
/* account management */
GtkEntry *identity_entries[5];
struct _GtkToggleButton *default_account;
- struct _GtkWidget *management_frame;
/* special folders */
struct _GtkButton *drafts_folder_button;
@@ -802,6 +804,7 @@ emae_account_entry(EMAccountEditor *emae
if (text)
gtk_entry_set_text(entry, text);
g_object_set_data((GObject *)entry, "account-item", GINT_TO_POINTER(item));
+ g_object_set_data((GObject *)entry, "account-name", name);
g_signal_connect(entry, "changed", G_CALLBACK(emae_account_entry_changed), emae);
gtk_widget_set_sensitive((GtkWidget *)entry, e_account_writable(emae->account, item));
@@ -967,6 +970,7 @@ smime_encrypt_key_selected(GtkWidget *di
{
EMAccountEditorPrivate *gui = emae->priv;
+
if (key != NULL) {
gtk_entry_set_text(gui->smime_encrypt_key, key);
smime_changed(emae);
@@ -1069,11 +1073,14 @@ static struct _service_info {
char *needs_auth;
char *auth_frame;
+ char *auth_top_frame;
char *authtype;
char *authtype_check;
char *remember_password;
+ char *advanced_expander;
+ char *advanced_vbox;
struct _provider_host_info *host_info;
} emae_service_info[CAMEL_NUM_PROVIDER_TYPES] = {
@@ -1081,18 +1088,20 @@ static struct _service_info {
"source_frame", "source_type_dropdown",
"source_vbox", "source_description", "source_host", "source_host_label", "source_user", "source_user_label", "source_path", "source_path_label", "source_path_entry",
"source_security_frame", "source_ssl_hbox", "source_use_ssl", "source_ssl_disabled",
- NULL, "source_auth_frame",
+ NULL, "source_auth_frame", NULL,
"source_auth_dropdown", "source_check_supported",
"source_remember_password",
+ "advanced_expander", "advanced_vbox",
emae_source_host_info,
},
{ E_ACCOUNT_TRANSPORT_URL, E_ACCOUNT_TRANSPORT_SAVE_PASSWD,
"transport_frame", "transport_type_dropdown",
"transport_vbox", "transport_description", "transport_host", "transport_host_label", "transport_user", "transport_user_label", NULL, NULL, NULL,
"transport_security_frame", "transport_ssl_hbox", "transport_use_ssl", "transport_ssl_disabled",
- "transport_needs_auth", "transport_auth_frame",
+ "transport_needs_auth", "auth_advanced_table", "transport_auth_frame",
"transport_auth_dropdown", "transport_check_supported",
"transport_remember_password",
+ "advanced_expander", "advanced_vbox",
emae_transport_host_info,
},
};
@@ -1248,11 +1257,19 @@ emae_service_provider_changed(EMAccountE
}
emae_refresh_authtype(service->emae, service);
+
+ if (service->provider->url_flags & CAMEL_URL_PART_AUTH || service->provider->url_flags & CAMEL_URL_NEED_AUTH)
+ gtk_widget_show((GtkWidget *)service->advanced_expander);
+ else
+ gtk_widget_hide((GtkWidget *)service->advanced_expander);
+
if (service->needs_auth && !CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_AUTH))
gtk_widget_show((GtkWidget *)service->needs_auth);
} else {
if (service->needs_auth)
gtk_widget_hide((GtkWidget *)service->needs_auth);
+ gtk_widget_hide((GtkWidget *)service->advanced_expander);
+
}
#ifdef HAVE_SSL
gtk_widget_hide(service->no_ssl);
@@ -1276,6 +1293,7 @@ emae_service_provider_changed(EMAccountE
gtk_widget_hide(service->frame);
gtk_widget_hide(service->auth_frame);
gtk_widget_hide(service->ssl_frame);
+ gtk_widget_hide(service->advanced_expander);
}
/* FIXME: linked services? */
@@ -1633,6 +1651,12 @@ emae_setup_service(EMAccountEditor *emae
service->needs_auth = NULL;
}
+ service->advanced_expander = glade_xml_get_widget (xml, info->advanced_expander);
+ service->advanced_vbox = glade_xml_get_widget (xml, info->advanced_vbox);
+
+ if (info->auth_top_frame)
+ service->auth_top_frame = glade_xml_get_widget (xml, info->auth_top_frame);
+
if (!e_account_writable (emae->account, info->account_uri_key))
gtk_widget_set_sensitive(service->container, FALSE);
else
@@ -1695,8 +1719,6 @@ emae_identity_page(EConfig *ec, EConfigI
for (i=0;i<sizeof(emae_identity_entries)/sizeof(emae_identity_entries[0]);i++)
gui->identity_entries[i] = emae_account_entry(emae, emae_identity_entries[i].name, emae_identity_entries[i].item, xml);
- gui->management_frame = glade_xml_get_widget(xml, "management_frame");
-
gui->default_account = GTK_TOGGLE_BUTTON (glade_xml_get_widget (xml, "management_default"));
if (!mail_config_get_default_account ()
|| (account == mail_config_get_default_account ()))
@@ -1712,16 +1734,22 @@ emae_identity_page(EConfig *ec, EConfigI
}
w = glade_xml_get_widget(xml, item->label);
+
if (((EConfig *)gui->config)->type == E_CONFIG_DRUID) {
GladeXML *druidxml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", "identity_page", NULL);
GtkWidget *page = glade_xml_get_widget(druidxml, "identity_page");
+ GtkWidget * optional = glade_xml_get_widget (xml, "identity_optional_frame");
gtk_box_pack_start((GtkBox*)((GnomeDruidPageStandard *)page)->vbox, w, TRUE, TRUE, 0);
+
w = page;
g_object_unref(druidxml);
gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
+ gtk_widget_hide (optional);
+ gtk_widget_show(glade_xml_get_widget(xml, "label_optional_account"));
} else {
gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Identity")));
+ gtk_widget_hide(glade_xml_get_widget(xml, "label_optional_account"));
}
emae_queue_widgets(emae, xml, "account_vbox", "identity_required_table", "identity_optional_table", NULL);
@@ -1756,12 +1784,17 @@ emae_receive_page(EConfig *ec, EConfigIt
w = page;
g_object_unref(druidxml);
gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
+ emae_queue_widgets(emae, xml, "source_type_table", "table4", "vbox181", "vbox179", NULL);
+
+ gtk_widget_reparent (gui->source.ssl_frame, gui->source.advanced_vbox);
+ gtk_widget_reparent (gui->source.auth_frame, gui->source.advanced_vbox);
} else {
gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Receiving Email")));
+ emae_queue_widgets(emae, xml, "source_type_table", "table4", "vbox181", "vbox179", NULL);
+ gtk_widget_hide (gui->source.advanced_expander);
+
}
- emae_queue_widgets(emae, xml, "source_type_table", "table4", "vbox181", "vbox179", NULL);
-
g_object_unref(xml);
return w;
@@ -2107,12 +2140,18 @@ emae_send_page(EConfig *ec, EConfigItem
w = page;
g_object_unref(druidxml);
gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
+
+ emae_queue_widgets(emae, xml, "transport_type_table", "vbox12", "vbox183", "vbox61", NULL);
+
+ gtk_widget_reparent (gui->transport.ssl_frame, gui->transport.advanced_vbox);
+ gtk_widget_reparent (gui->transport.auth_top_frame, gui->transport.advanced_vbox);
+
} else {
gtk_notebook_append_page((GtkNotebook *)parent, w, gtk_label_new(_("Sending Email")));
+ emae_queue_widgets(emae, xml, "transport_type_table", "vbox12", "vbox183", "vbox61", NULL);
+ gtk_widget_hide (gui->transport.advanced_expander);
}
- emae_queue_widgets(emae, xml, "transport_type_table", "vbox12", "vbox183", "vbox61", NULL);
-
g_object_unref(xml);
return w;
@@ -2281,27 +2320,6 @@ static EMConfigItem emae_editor_items[]
};
static GtkWidget *
-emae_management_page(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
-{
- EMAccountEditor *emae = data;
- EMAccountEditorPrivate *gui = emae->priv;
- GtkWidget *w;
-
- w = gui->management_frame;
- if (((EConfig *)gui->config)->type == E_CONFIG_DRUID) {
- GladeXML *druidxml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", "management_page", NULL);
- GtkWidget *page = glade_xml_get_widget(druidxml, "management_page");
-
- gtk_widget_reparent(w, ((GnomeDruidPageStandard *)page)->vbox);
- w = page;
- g_object_unref(druidxml);
- gnome_druid_append_page((GnomeDruid *)parent, (GnomeDruidPage *)page);
- }
-
- return w;
-}
-
-static GtkWidget *
emae_widget_druid_glade(EConfig *ec, EConfigItem *item, struct _GtkWidget *parent, struct _GtkWidget *old, void *data)
{
GladeXML *druidxml = glade_xml_new(EVOLUTION_GLADEDIR "/mail-config.glade", item->label, NULL);
@@ -2323,7 +2341,6 @@ static EMConfigItem emae_druid_items[] =
{ E_CONFIG_PAGE_START, "0.start", "start_page", emae_widget_druid_glade },
{ E_CONFIG_PAGE, "00.identity", "vboxIdentityBorder", emae_identity_page },
- { E_CONFIG_SECTION, "00.identity/00.name", "account_vbox", emae_widget_glade },
{ E_CONFIG_SECTION_TABLE, "00.identity/10.required", "identity_required_table", emae_widget_glade },
{ E_CONFIG_SECTION_TABLE, "00.identity/20.info", "identity_optional_table", emae_widget_glade },
@@ -2333,19 +2350,12 @@ static EMConfigItem emae_druid_items[] =
{ E_CONFIG_SECTION, "10.receive/20.security", "vbox181", emae_widget_glade },
{ E_CONFIG_SECTION, "10.receive/30.auth", "vbox179", emae_widget_glade },
- /* Most sections for this is auto-generated fromt the camel config */
- { E_CONFIG_PAGE, "20.receive_options", N_("Receiving Options"), },
- { E_CONFIG_SECTION_TABLE, "20.receive_options/10.mailcheck", N_("Checking for New Mail"), },
- { E_CONFIG_ITEM_TABLE, "20.receive_options/10.mailcheck/00.autocheck", NULL, emae_receive_options_item, },
-
{ E_CONFIG_PAGE, "30.send", "vboxTransportBorder", emae_send_page },
{ E_CONFIG_SECTION_TABLE, "30.send/00.type", "transport_type_table", emae_widget_glade },
{ E_CONFIG_SECTION, "30.send/10.config", "vbox12", emae_widget_glade },
{ E_CONFIG_SECTION, "30.send/20.security", "vbox183", emae_widget_glade },
{ E_CONFIG_SECTION, "30.send/30.auth", "vbox61", emae_widget_glade },
- { E_CONFIG_PAGE, "40.management", "management_frame", emae_management_page },
-
{ E_CONFIG_PAGE_FINISH, "999.end", "finish_page", emae_widget_druid_glade },
{ 0 },
};
@@ -2433,6 +2443,7 @@ emae_check_complete(EConfig *ec, const c
gtk_entry_set_text(emae->priv->identity_entries[1], uname);
g_free(uname);
}
+ gtk_widget_grab_focus (emae->priv->identity_entries[2]);
}
} else if (!strcmp(pageid, "10.receive")) {
if (!emae->priv->receive_set) {
@@ -2453,6 +2464,8 @@ emae_check_complete(EConfig *ec, const c
emae->priv->extra_provider = emae->priv->source.provider;
emae_auto_detect(emae);
}
+ } else if (!strcmp(pageid, "30.send")) {
+ gtk_entry_set_text(emae->priv->transport.hostname, gtk_entry_get_text(emae->priv->source.hostname));
} else if (!strcmp(pageid, "40.management")) {
if (!emae->priv->management_set) {
char *template;
@@ -2536,7 +2549,20 @@ emae_commit(EConfig *ec, GSList *items,
account = emae->original;
e_account_list_change(accounts, account);
} else {
- d(printf("Adding new account '%s'\n", e_account_get_string(emae->account, E_ACCOUNT_NAME)));
+ if (!e_account_get_string(emae->account, E_ACCOUNT_NAME)) {
+ char *template, *tmp;
+ unsigned int i = 0, len;
+
+ emae->priv->management_set = 1;
+ tmp = e_account_get_string(emae->account, E_ACCOUNT_ID_ADDRESS);
+ len = strlen(tmp);
+ template = alloca(len + 14);
+ strcpy(template, tmp);
+ while (mail_config_get_account_by_name(template))
+ sprintf(template + len, " (%d)", i++);
+ e_account_set_string (emae->account, E_ACCOUNT_NAME, template);
+ }
+
e_account_list_add(accounts, emae->account);
account = emae->account;
@@ -2610,50 +2636,54 @@ em_account_editor_construct(EMAccountEdi
for (i=0;items[i].path;i++)
l = g_slist_prepend(l, &items[i]);
e_config_add_items((EConfig *)ec, l, emae_commit, NULL, emae_free, emae);
+
+ /* Show the receive options only in the Account Editor and not Druid */
+ if (((EConfig *)gui->config)->type != E_CONFIG_DRUID) {
- /* This is kinda yuck, we're dynamically mapping from the 'old style' extensibility api to the new one */
- l = NULL;
- have = g_hash_table_new(g_str_hash, g_str_equal);
- index = 20;
- for (prov=gui->providers;prov;prov=g_list_next(prov)) {
+ /* This is kinda yuck, we're dynamically mapping from the 'old style' extensibility api to the new one */
+ l = NULL;
+ have = g_hash_table_new(g_str_hash, g_str_equal);
+ index = 20;
+ for (prov=gui->providers;prov;prov=g_list_next(prov)) {
CamelProviderConfEntry *entries = ((CamelProvider *)prov->data)->extra_conf;
- for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) {
- struct _receive_options_item *item;
- char *name = entries[i].name;
- int myindex = index;
-
- if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START
- || name == NULL
- || g_hash_table_lookup(have, name))
- continue;
-
- /* override mailcheck since we also insert our own mailcheck item at this index */
- if (name && !strcmp(name, "mailcheck"))
- myindex = 10;
-
- item = g_malloc0(sizeof(*item));
- item->item.type = E_CONFIG_SECTION_TABLE;
- item->item.path = g_strdup_printf("20.receive_options/%02d.%s", myindex, name?name:"unnamed");
- item->item.label = entries[i].text;
-
- l = g_slist_prepend(l, item);
-
- item = g_malloc0(sizeof(*item));
- item->item.type = E_CONFIG_ITEM_TABLE;
- item->item.path = g_strdup_printf("20.receive_options/%02d.%s/80.camelitem", myindex, name?name:"unnamed");
- item->item.factory = emae_receive_options_extra_item;
- item->item.user_data = entries[i].name;
-
- l = g_slist_prepend(l, item);
-
- index += 10;
- g_hash_table_insert(have, entries[i].name, have);
+ for (i=0;entries && entries[i].type != CAMEL_PROVIDER_CONF_END;i++) {
+ struct _receive_options_item *item;
+ char *name = entries[i].name;
+ int myindex = index;
+
+ if (entries[i].type != CAMEL_PROVIDER_CONF_SECTION_START
+ || name == NULL
+ || g_hash_table_lookup(have, name))
+ continue;
+
+ /* override mailcheck since we also insert our own mailcheck item at this index */
+ if (name && !strcmp(name, "mailcheck"))
+ myindex = 10;
+
+ item = g_malloc0(sizeof(*item));
+ item->item.type = E_CONFIG_SECTION_TABLE;
+ item->item.path = g_strdup_printf("20.receive_options/%02d.%s", myindex, name?name:"unnamed");
+ item->item.label = entries[i].text;
+
+ l = g_slist_prepend(l, item);
+
+ item = g_malloc0(sizeof(*item));
+ item->item.type = E_CONFIG_ITEM_TABLE;
+ item->item.path = g_strdup_printf("20.receive_options/%02d.%s/80.camelitem", myindex, name?name:"unnamed");
+ item->item.factory = emae_receive_options_extra_item;
+ item->item.user_data = entries[i].name;
+
+ l = g_slist_prepend(l, item);
+
+ index += 10;
+ g_hash_table_insert(have, entries[i].name, have);
+ }
}
+ g_hash_table_destroy(have);
+ e_config_add_items((EConfig *)ec, l, NULL, NULL, emae_free_auto, emae);
+ gui->extra_items = l;
}
- g_hash_table_destroy(have);
- e_config_add_items((EConfig *)ec, l, NULL, NULL, emae_free_auto, emae);
- gui->extra_items = l;
e_config_add_page_check((EConfig *)ec, NULL, emae_check_complete, emae);
Index: mail-config.glade
===================================================================
RCS file: /cvs/gnome/evolution/mail/mail-config.glade,v
retrieving revision 1.161
diff -u -p -r1.161 mail-config.glade
--- mail-config.glade 27 Jul 2005 11:40:23 -0000 1.161
+++ mail-config.glade 22 Nov 2005 09:41:30 -0000
@@ -16,6 +16,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GnomeDruid" id="druid">
@@ -59,6 +61,10 @@ Click "Forward" to begin. </pr
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -100,6 +106,10 @@ Click "Forward" to begin. </pr
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -141,6 +151,10 @@ Click "Forward" to begin. </pr
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -183,6 +197,10 @@ This name will be used for display purpo
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -228,6 +246,8 @@ Click "Apply" to save your set
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkNotebook" id="account_editor_notebook">
@@ -266,6 +286,10 @@ Click "Apply" to save your set
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -293,6 +317,10 @@ Click "Apply" to save your set
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -317,19 +345,74 @@ Click "Apply" to save your set
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="management_description_label">
+ <widget class="GtkVBox" id="vbox210">
<property name="visible">True</property>
- <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="management_description_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">Type the name by which you would like to refer to this account.
For example: "Work" or "Personal"</property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox234">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label_optional_account">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes">This is optional. If not specified, it will be auto filled with email address</property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -347,7 +430,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="management_name_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Name:</property>
+ <property name="label" translatable="yes">Account _Name:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_RIGHT</property>
@@ -358,6 +441,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">management_name</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -374,7 +461,7 @@ For example: "Work" or "P
<property name="editable">True</property>
<property name="visibility">True</property>
<property name="max_length">0</property>
- <property name="text" translatable="yes"></property>
+ <property name="text" translatable="yes"> </property>
<property name="has_frame">True</property>
<property name="invisible_char">*</property>
<property name="activates_default">False</property>
@@ -441,6 +528,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -468,6 +559,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -518,7 +613,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="identity_address_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">Email _Address:</property>
+ <property name="label" translatable="yes">Emai_l Address:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -529,6 +624,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">identity_address</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -543,7 +642,7 @@ For example: "Work" or "P
<child>
<widget class="GtkLabel" id="identity_full_name_label">
<property name="visible">True</property>
- <property name="label" translatable="yes">_Full Name:</property>
+ <property name="label" translatable="yes">Full N_ame:</property>
<property name="use_underline">True</property>
<property name="use_markup">False</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
@@ -554,6 +653,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">identity_full_name</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -634,6 +737,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -661,6 +768,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -692,6 +803,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">signature_dropdown</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -787,6 +902,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">identity_organization</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -833,6 +952,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">identity_reply_to</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -906,6 +1029,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -948,6 +1075,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_type_dropdown</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -972,6 +1103,10 @@ For example: "Work" or "P
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -996,6 +1131,10 @@ For example: "Work" or "P
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1050,7 +1189,7 @@ For example: "Work" or "P
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label472">
+ <widget class="GtkLabel" id="configuration_label">
<property name="visible">True</property>
<property name="label" translatable="yes"><span weight="bold">Configuration</span></property>
<property name="use_underline">False</property>
@@ -1062,6 +1201,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1089,6 +1232,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1129,6 +1276,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_host</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1154,6 +1305,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_user</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1221,6 +1376,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_path</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1295,6 +1454,60 @@ For example: "Work" or "P
</child>
<child>
+ <widget class="GtkExpander" id="advanced_expander">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="expanded">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="advanced_vbox">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label584">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span weight="bold">_Advanced Options</span></property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
<widget class="GtkVBox" id="source_security_frame">
<property name="visible">True</property>
<property name="homogeneous">False</property>
@@ -1313,6 +1526,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1340,6 +1557,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1374,6 +1595,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">source_use_ssl</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1440,6 +1665,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1495,6 +1724,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1522,6 +1755,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1647,6 +1884,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1689,6 +1930,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">transport_type_dropdown</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1713,6 +1958,10 @@ For example: "Work" or "P
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1754,6 +2003,10 @@ For example: "Work" or "P
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -1796,7 +2049,7 @@ For example: "Work" or "P
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label476">
+ <widget class="GtkLabel" id="configuration_label">
<property name="visible">True</property>
<property name="label" translatable="yes"><span weight="bold">Server Configuration</span></property>
<property name="use_underline">False</property>
@@ -1808,6 +2061,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1835,6 +2092,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -1881,6 +2142,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">transport_host</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1919,25 +2184,6 @@ For example: "Work" or "P
<property name="fill">True</property>
</packing>
</child>
-
- <child>
- <widget class="GtkCheckButton" id="transport_needs_auth">
- <property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Ser_ver requires authentication</property>
- <property name="use_underline">True</property>
- <property name="relief">GTK_RELIEF_NORMAL</property>
- <property name="focus_on_click">True</property>
- <property name="active">False</property>
- <property name="inconsistent">False</property>
- <property name="draw_indicator">True</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -1969,51 +2215,88 @@ For example: "Work" or "P
</child>
<child>
- <widget class="GtkVBox" id="transport_security_frame">
+ <widget class="GtkVBox" id="vbox209">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">0</property>
<child>
- <widget class="GtkLabel" id="label517">
+ <widget class="GtkExpander" id="advanced_expander">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold">Security</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="can_focus">True</property>
+ <property name="expanded">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkVBox" id="advanced_vbox">
+ <property name="border_width">6</property>
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="label585">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span weight="bold">_Advanced Options</span></property>
+ <property name="use_underline">True</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="type">label_item</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="hbox203">
+ <widget class="GtkVBox" id="transport_security_frame">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">12</property>
+ <property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label564">
+ <widget class="GtkLabel" id="label517">
<property name="visible">True</property>
- <property name="label" translatable="yes"></property>
+ <property name="label" translatable="yes"><span weight="bold">Security</span></property>
<property name="use_underline">False</property>
- <property name="use_markup">False</property>
+ <property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2023,102 +2306,148 @@ For example: "Work" or "P
</child>
<child>
- <widget class="GtkVBox" id="vbox183">
+ <widget class="GtkHBox" id="hbox203">
<property name="visible">True</property>
<property name="homogeneous">False</property>
- <property name="spacing">6</property>
+ <property name="spacing">12</property>
<child>
- <widget class="GtkHBox" id="transport_ssl_hbox">
+ <widget class="GtkLabel" id="label564">
<property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">12</property>
-
- <child>
- <widget 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="use_markup">False</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
- <property name="mnemonic_widget">transport_use_ssl</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
-
- <child>
- <widget class="Custom" id="transport_use_ssl">
- <property name="visible">True</property>
- <property name="creation_function">em_account_editor_ssl_selector_new</property>
- <property name="int1">0</property>
- <property name="int2">0</property>
- <property name="last_modification_time">Tue, 03 Aug 2004 07:23:50 GMT</property>
- </widget>
- <packing>
- <property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
- </packing>
- </child>
+ <property name="label" translatable="yes"></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">True</property>
- <property name="fill">True</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
</packing>
</child>
<child>
- <widget class="GtkHBox" id="transport_ssl_disabled">
+ <widget class="GtkVBox" id="vbox183">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkImage" id="image1">
+ <widget class="GtkHBox" id="transport_ssl_hbox">
<property name="visible">True</property>
- <property name="stock">gtk-dialog-warning</property>
- <property name="icon_size">4</property>
- <property name="xalign">0.5</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">12</property>
+
+ <child>
+ <widget 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="use_markup">False</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="mnemonic_widget">transport_use_ssl</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="Custom" id="transport_use_ssl">
+ <property name="visible">True</property>
+ <property name="creation_function">em_account_editor_ssl_selector_new</property>
+ <property name="int1">0</property>
+ <property name="int2">0</property>
+ <property name="last_modification_time">Tue, 03 Aug 2004 07:23:50 GMT</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="transport_ssl_disabled_label">
+ <widget class="GtkHBox" id="transport_ssl_disabled">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>SSL is not supported in this build of Evolution</b></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_CENTER</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">6</property>
+
+ <child>
+ <widget class="GtkImage" id="image1">
+ <property name="visible">True</property>
+ <property name="stock">gtk-dialog-warning</property>
+ <property name="icon_size">4</property>
+ <property name="xalign">0.5</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="transport_ssl_disabled_label">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><b>SSL is not supported in this build of Evolution</b></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_CENTER</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
- <property name="expand">False</property>
- <property name="fill">False</property>
+ <property name="expand">True</property>
+ <property name="fill">True</property>
</packing>
</child>
</widget>
@@ -2157,18 +2486,67 @@ For example: "Work" or "P
<property name="spacing">6</property>
<child>
- <widget class="GtkLabel" id="label478">
+ <widget class="GtkVBox" id="vbox207">
<property name="visible">True</property>
- <property name="label" translatable="yes"><span weight="bold">Authentication</span></property>
- <property name="use_underline">False</property>
- <property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
- <property name="wrap">False</property>
- <property name="selectable">False</property>
- <property name="xalign">0</property>
- <property name="yalign">0.5</property>
- <property name="xpad">0</property>
- <property name="ypad">0</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkLabel" id="label478">
+ <property name="visible">True</property>
+ <property name="label" translatable="yes"><span weight="bold">Authentication</span></property>
+ <property name="use_underline">False</property>
+ <property name="use_markup">True</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="wrap">False</property>
+ <property name="selectable">False</property>
+ <property name="xalign">0</property>
+ <property name="yalign">0.5</property>
+ <property name="xpad">0</property>
+ <property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
+ </widget>
+ <packing>
+ <property name="padding">0</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkHBox" id="hbox233">
+ <property name="visible">True</property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <widget class="GtkCheckButton" id="transport_needs_auth">
+ <property name="visible">True</property>
+ <property name="can_focus">True</property>
+ <property name="label" translatable="yes">Ser_ver requires authentication</property>
+ <property name="use_underline">True</property>
+ <property name="relief">GTK_RELIEF_NORMAL</property>
+ <property name="focus_on_click">True</property>
+ <property name="active">False</property>
+ <property name="inconsistent">False</property>
+ <property name="draw_indicator">True</property>
+ </widget>
+ <packing>
+ <property name="padding">11</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
+ </widget>
+ <packing>
+ <property name="padding">3</property>
+ <property name="expand">False</property>
+ <property name="fill">False</property>
+ </packing>
+ </child>
</widget>
<packing>
<property name="padding">0</property>
@@ -2196,6 +2574,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2214,13 +2596,13 @@ For example: "Work" or "P
<property name="column_spacing">6</property>
<child>
- <widget class="GtkVBox" id="vbox61">
+ <widget class="GtkVBox" id="auth_advanced_table">
<property name="visible">True</property>
<property name="homogeneous">False</property>
<property name="spacing">6</property>
<child>
- <widget class="GtkTable" id="table31">
+ <widget class="GtkTable" id="auth_table">
<property name="visible">True</property>
<property name="n_rows">2</property>
<property name="n_columns">2</property>
@@ -2242,6 +2624,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">transport_auth_dropdown</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2267,6 +2653,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">transport_user</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2444,6 +2834,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -2476,6 +2870,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2503,6 +2901,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2549,6 +2951,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">drafts_button</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2574,6 +2980,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">sent_button</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -2743,6 +3153,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2770,6 +3184,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2840,6 +3258,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -2956,6 +3378,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3076,6 +3502,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3103,6 +3533,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3130,6 +3564,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3142,6 +3580,8 @@ For example: "Work" or "P
<widget class="GtkComboBox" id="receipt_policy_dropdown">
<property name="visible">True</property>
<property name="items" translatable="yes"></property>
+ <property name="add_tearoffs">False</property>
+ <property name="focus_on_click">True</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3190,6 +3630,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -3222,6 +3666,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3249,6 +3697,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3292,6 +3744,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">pgp_key</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3450,6 +3906,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3477,6 +3937,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3631,6 +4095,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">smime_encrypt_key</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -3656,6 +4124,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">smime_sign_key</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -3728,6 +4200,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3802,6 +4278,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3892,6 +4372,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -3966,6 +4450,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4035,6 +4523,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -4056,6 +4548,8 @@ For example: "Work" or "P
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkHBox" id="toplevel">
@@ -4159,6 +4653,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4254,6 +4752,8 @@ For example: "Work" or "P
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkNotebook" id="preferences_toplevel">
@@ -4291,6 +4791,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4318,6 +4822,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4383,6 +4891,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">FontVariable</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -4452,6 +4964,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">FontFixed</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -4518,6 +5034,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4545,6 +5065,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4625,6 +5149,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4694,6 +5222,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4729,6 +5261,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">omenuCharset</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4827,6 +5363,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4854,6 +5394,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -4989,6 +5533,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5016,6 +5564,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5118,6 +5670,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">txtNotifyPlaySound</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5212,6 +5768,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -5238,6 +5798,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5265,6 +5829,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5350,6 +5918,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5377,6 +5949,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5490,6 +6066,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -5516,6 +6096,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5543,6 +6127,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5830,6 +6418,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -5857,6 +6449,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">txtHeaders</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5884,6 +6480,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -5934,8 +6534,11 @@ For example: "Work" or "P
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
- <atkproperty name="AtkObject::accessible_name" translatable="yes">Mail Headers Table</atkproperty>
+ <atkproperty name="AtkObject::accessible_name" translatable="yes">Mail Headers Table</atkproperty>
</accessibility>
</widget>
</child>
@@ -6026,6 +6629,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -6058,6 +6665,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6085,6 +6696,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6112,6 +6727,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6180,6 +6799,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6207,6 +6830,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6259,6 +6886,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6280,6 +6911,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6335,6 +6970,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -6356,6 +6995,8 @@ For example: "Work" or "P
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkNotebook" id="composer_toplevel">
@@ -6393,6 +7034,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6420,6 +7065,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6503,6 +7152,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -6698,6 +7351,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">omenuCharset</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -6723,6 +7380,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">omenuCharset</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -6776,6 +7437,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6803,6 +7468,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6912,6 +7581,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -6945,6 +7618,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">listSignatures</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6972,6 +7649,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -6993,6 +7674,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7017,6 +7702,9 @@ For example: "Work" or "P
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Signatures Table</atkproperty>
</accessibility>
@@ -7111,6 +7799,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7181,6 +7873,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7254,6 +7950,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7281,6 +7981,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7341,6 +8045,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -7374,6 +8082,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">listSpellCheckLanguage</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7401,6 +8113,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7449,9 +8165,12 @@ For example: "Work" or "P
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
<accessibility>
<atkproperty name="AtkObject::accessible_name" translatable="yes">Languages Table</atkproperty>
- </accessibility>
+ </accessibility>
</widget>
</child>
</widget>
@@ -7512,6 +8231,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7574,6 +8297,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7601,6 +8328,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7654,6 +8385,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">colorpickerSpellCheckColor</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7725,6 +8460,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -7746,6 +8485,8 @@ For example: "Work" or "P
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<child>
<widget class="GtkVBox" id="toplevel">
@@ -7776,6 +8517,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7803,6 +8548,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">12</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -7834,6 +8583,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">print_variable</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -7859,6 +8612,10 @@ For example: "Work" or "P
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">print_fixed</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -7950,6 +8707,8 @@ For example: "Work" or "P
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="has_separator">False</property>
<child internal-child="vbox">
@@ -8020,6 +8779,10 @@ For example: "Work" or "P
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -8106,6 +8869,10 @@ for display purposes only. </property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="padding">0</property>
@@ -8144,6 +8911,10 @@ for display purposes only. </property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">entry_add_script_name</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -8169,6 +8940,10 @@ for display purposes only. </property>
<property name="xpad">0</property>
<property name="ypad">0</property>
<property name="mnemonic_widget">combo-entry2</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
Index: exchange-operations/exchange-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/exchange-operations/exchange-account-setup.c,v
retrieving revision 1.21
diff -u -p -r1.21 exchange-account-setup.c
--- exchange-operations/exchange-account-setup.c 28 Sep 2005 14:30:54 -0000 1.21
+++ exchange-operations/exchange-account-setup.c 22 Nov 2005 09:22:35 -0000
@@ -53,6 +53,7 @@
GtkWidget* org_gnome_exchange_settings(EPlugin *epl, EConfigHookItemFactoryData *data);
GtkWidget *org_gnome_exchange_owa_url(EPlugin *epl, EConfigHookItemFactoryData *data);
+
gboolean org_gnome_exchange_check_options(EPlugin *epl, EConfigHookPageCheckData *data);
GtkWidget *org_gnome_exchange_auth_section (EPlugin *epl, EConfigHookItemFactoryData *data);
void org_gnome_exchange_commit (EPlugin *epl, EConfigHookItemFactoryData *data);
@@ -422,6 +423,25 @@ print_error (const char *owa_url, E2kAut
}
static void
+gal_server_changed (GtkWidget *entry, EAccount *account)
+{
+ CamelURL *url;
+ const char *s_url;
+ char *url_string;
+
+ s_url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+
+ url = camel_url_new (s_url, NULL);
+ camel_url_set_param (url, "ad_server", gtk_entry_get_text (entry));
+
+ url_string = camel_url_to_string (url, 0);
+ e_account_set_string (account, E_ACCOUNT_SOURCE_URL, url_string);
+ e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, url_string);
+ g_free (url_string);
+ camel_url_free (url);
+}
+
+static void
owa_authenticate_user(GtkWidget *button, EConfig *config)
{
EMConfigTargetAccount *target_account = (EMConfigTargetAccount *)config->target;
@@ -431,6 +451,7 @@ owa_authenticate_user(GtkWidget *button,
char *url_string;
const char *source_url, *id_name, *owa_url;
char *at, *user;
+ GtkWidget *gal, *label;
gboolean valid = FALSE;
ExchangeParams *exchange_params;
@@ -462,6 +483,8 @@ owa_authenticate_user(GtkWidget *button,
It must use camel_session_ask_password, and it should return an exception for any problem,
which should then be shown using e-error */
+ gal = g_object_get_data (config, "server-entry");
+ label = g_object_get_data (config, "server-label");
owa_url = camel_url_get_param (url, "owa_url");
if (camel_url_get_param (url, "authmech"))
@@ -475,6 +498,14 @@ owa_authenticate_user(GtkWidget *button,
print_error (owa_url, result);
camel_url_set_host (url, valid ? exchange_params->host : "");
+ if (valid && config->type == E_CONFIG_DRUID) {
+ gtk_widget_set_sensitive (gal, TRUE);
+ gtk_entry_set_text (gal, exchange_params->ad_server);
+ g_signal_connect ( gal, "changed", G_CALLBACK (gal_server_changed), target_account->account);
+ } else {
+ g_signal_handlers_disconnect_by_func(config, gal_server_changed, target_account->account);
+ }
+
if (valid)
camel_url_set_authmech (url, exchange_params->is_ntlm ? "NTLM" : "Basic");
camel_url_set_param (url, "ad_server", valid ? exchange_params->ad_server: NULL);
@@ -568,10 +599,13 @@ org_gnome_exchange_owa_url(EPlugin *epl,
GtkWidget *owa_entry;
CamelURL *url;
int row;
- GtkWidget *hbox, *label, *button;
-
+ GtkWidget *hbox, *label, *button, *label1, *gal;
+ struct _EAccount *account;
+
target_account = (EMConfigTargetAccount *)data->config->target;
+ account = target_account->account;
source_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
+
url = camel_url_new(source_url, NULL);
if (url == NULL
|| strcmp(url->protocol, "exchange") != 0) {
@@ -633,6 +667,16 @@ org_gnome_exchange_owa_url(EPlugin *epl,
gtk_entry_set_text(GTK_ENTRY (owa_entry), owa_url);
gtk_label_set_mnemonic_widget((GtkLabel *)label, owa_entry);
+ if (data->config->type == E_CONFIG_DRUID) {
+ label1 = gtk_label_new_with_mnemonic (_("_GAL Server:"));
+ gal = gtk_entry_new ();
+ gtk_label_set_mnemonic_widget((GtkLabel *)label1, gal);
+ gtk_widget_show (gal);
+ gtk_widget_show (label1);
+ g_object_set_data((GObject *)data->config, "server-label", label1);
+ g_object_set_data((GObject *)data->config, "server-entry", gal);
+ }
+
button = gtk_button_new_with_mnemonic (_("A_uthenticate"));
gtk_widget_set_sensitive (button, owa_url && owa_url[0]);
@@ -643,8 +687,15 @@ org_gnome_exchange_owa_url(EPlugin *epl,
gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
gtk_table_attach (GTK_TABLE (data->parent), hbox, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ if (data->config->type == E_CONFIG_DRUID) {
+ gtk_table_attach (GTK_TABLE (data->parent), label1, 0, 1, row+1, row+2, 0, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (data->parent), gal, 1, 2, row+1, row+2, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+ gtk_widget_set_sensitive (gal, FALSE);
+ }
+
g_signal_connect (owa_entry, "changed", G_CALLBACK(owa_editor_entry_changed), data->config);
g_object_set_data((GObject *)owa_entry, "authenticate-button", button);
+
g_signal_connect (button, "clicked", G_CALLBACK(owa_authenticate_user), data->config);
/* Track the authenticate label, so we can destroy it if e-config is to destroy the hbox */
Index: groupwise-account-setup/groupwise-account-setup.c
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/groupwise-account-setup.c,v
retrieving revision 1.5
diff -u -p -r1.5 groupwise-account-setup.c
--- groupwise-account-setup/groupwise-account-setup.c 24 Aug 2005 03:15:13 -0000 1.5
+++ groupwise-account-setup/groupwise-account-setup.c 22 Nov 2005 09:22:37 -0000
@@ -27,6 +27,7 @@
#include "camel-gw-listener.h"
#include <gtk/gtk.h>
+#include "e-util/e-i18n.h"
#include "mail/em-config.h"
static CamelGwListener *config_listener = NULL;
@@ -51,6 +52,77 @@ e_plugin_lib_enable (EPluginLib *ep, int
return 0;
}
+static void
+entry_port_changed (GtkWidget *entry, EAccount *account)
+{
+ CamelURL *url;
+ const char *s_url;
+ char *url_string;
+
+ s_url = e_account_get_string (account, E_ACCOUNT_SOURCE_URL);
+
+ url = camel_url_new (s_url, NULL);
+ camel_url_set_param (url, "soap_port", gtk_entry_get_text (entry));
+
+ url_string = camel_url_to_string (url, 0);
+ e_account_set_string (account, E_ACCOUNT_SOURCE_URL, url_string);
+ e_account_set_string (account, E_ACCOUNT_TRANSPORT_URL, url_string);
+ g_free (url_string);
+ camel_url_free (url);
+}
+
+GtkWidget * org_gnome_groupwise_account_setup_port(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
+
+GtkWidget *
+org_gnome_groupwise_account_setup_port(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data)
+{
+ GtkWidget *label, *entry;
+ int row;
+ CamelURL *url;
+ const char *s_url;
+ char *url_string;
+ EMConfigTargetAccount *target_account = (EMConfigTargetAccount *)data->config->target;
+
+ s_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
+ url = camel_url_new(s_url, NULL);
+
+ if (url == NULL
+ || strcmp(url->protocol, "groupwise") != 0) {
+ if (url)
+ camel_url_free(url);
+
+ return NULL;
+ }
+
+ if (data->old && data->config->type != E_CONFIG_DRUID)
+ return data->old;
+
+ /* FIXME, with new soap camel provider we don't need extra settings in receiving options page, Remove them
+ from camel-groupwise-provider.c once soap provider is ready and add any groupwise sepcific settings like "add contacts automatically to Frequent contacts folder" here*/
+ s_url = e_account_get_string (target_account->account, E_ACCOUNT_SOURCE_URL);
+ url = camel_url_new_with_base (NULL, s_url);
+ camel_url_set_param (url, "soap_port", "7191");
+
+ url_string = camel_url_to_string (url, 0);
+ e_account_set_string (target_account->account, E_ACCOUNT_SOURCE_URL, url_string);
+ e_account_set_string (target_account->account, E_ACCOUNT_TRANSPORT_URL, url_string);
+ g_free (url_string);
+ camel_url_free (url);
+
+ label = gtk_label_new_with_mnemonic (_("Post Office Agent Soap P_ort"));
+ entry = gtk_entry_new();
+ gtk_entry_set_text (entry, "7191");
+
+ gtk_widget_show (label);
+ gtk_widget_show (entry);
+ row = ((GtkTable *)data->parent)->nrows;
+ g_signal_connect (entry, "changed", G_CALLBACK(entry_port_changed), target_account->account);
+
+ gtk_table_attach (GTK_TABLE (data->parent), label, 0, 1, row, row+1, 0, 0, 0, 0);
+ gtk_table_attach (GTK_TABLE (data->parent), entry, 1, 2, row, row+1, GTK_FILL|GTK_EXPAND, GTK_FILL, 0, 0);
+
+ return data->old;
+}
GtkWidget * org_gnome_groupwise_account_setup(struct _EPlugin *epl, struct _EConfigHookItemFactoryData *data);
@@ -59,7 +131,7 @@ org_gnome_groupwise_account_setup(struct
{
if (data->old)
return data->old;
- /* FIXME, with new soap camel provider we don't need extra settings in receiving options page, Remove them
+ /* FIXME, with new soap camel provider we don't need extra settings in receiving options page, Remove them
from camel-groupwise-provider.c once soap provider is ready and add any groupwise sepcific settings like "add contacts automatically to Frequent contacts folder" here*/
return NULL;
Index: groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml
===================================================================
RCS file: /cvs/gnome/evolution/plugins/groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml,v
retrieving revision 1.2
diff -u -p -r1.2 org-gnome-gw-account-setup.eplug.xml
--- groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml 13 Jul 2005 10:05:42 -0000 1.2
+++ groupwise-account-setup/org-gnome-gw-account-setup.eplug.xml 22 Nov 2005 09:22:37 -0000
@@ -7,7 +7,7 @@
<hook class="org.gnome.evolution.mail.config:1.0">
<group target="account" id="org.gnome.evolution.mail.config.accountDruid">
- <item type="item_table" path="20.receive_options/30.soapport/50.dummy" factory="org_gnome_groupwise_account_setup"/>
+ <item type="item_table" path="10.receive/10.config/10.soap" factory="org_gnome_groupwise_account_setup_port"/>
</group>
</hook>
<hook class="org.gnome.evolution.mail.config:1.0">
[
Date Prev][
Date Next] [
Thread Prev][
Thread Next]
[
Thread Index]
[
Date Index]
[
Author Index]
