From 9ba45697b503c507088ef141b7f99e5bb6eebff2 Mon Sep 17 00:00:00 2001 From: Srinivasa Ragavan Date: Tue, 14 Jul 2009 09:40:39 +0530 Subject: Add tip to specify port as part of the server name. String suggestion from Matthew Barnes. --- mail/em-account-editor.c | 7 + mail/mail-config.glade | 342 +++++++++++++++++++++++++++++++++++------------ 2 files changed, 266 insertions(+), 83 deletions(-) diff --git a/mail/em-account-editor.c b/mail/em-account-editor.c index df8ede8be0..f2d93a7363 100644 --- a/mail/em-account-editor.c +++ b/mail/em-account-editor.c @@ -102,6 +102,7 @@ typedef struct _EMAccountEditorService { GtkEntry *path; GtkLabel *pathlabel; GtkWidget *pathentry; + GtkWidget *port_hint; GtkWidget *ssl_frame; GtkComboBox *use_ssl; @@ -1676,6 +1677,12 @@ emae_setup_service (EMAccountEditor *emae, EMAccountEditorService *service, Glad service->pathentry = glade_xml_get_widget (xml, info->pathentry); } + service->port_hint = glade_xml_get_widget (xml, "port_hint"); + if (!service->provider || CAMEL_PROVIDER_NEEDS(service->provider, CAMEL_URL_PART_HOST)) + gtk_widget_show (service->port_hint); + else + gtk_widget_hide (service->port_hint); + service->ssl_frame = glade_xml_get_widget (xml, info->security_frame); gtk_widget_hide (service->ssl_frame); service->ssl_hbox = glade_xml_get_widget (xml, info->ssl_hbox); diff --git a/mail/mail-config.glade b/mail/mail-config.glade index 68dd62c26a..586dc854b1 100644 --- a/mail/mail-config.glade +++ b/mail/mail-config.glade @@ -1226,35 +1226,6 @@ For example: "Work" or "Personal" 6 12 - - - True - _Server: - True - False - GTK_JUSTIFY_LEFT - False - False - 0 - 0.5 - 0 - 0 - source_host - PANGO_ELLIPSIZE_NONE - -1 - False - 0 - - - 0 - 1 - 0 - 1 - fill - - - - True @@ -1284,27 +1255,6 @@ For example: "Work" or "Personal" - - - True - True - True - True - 0 - - True - * - False - - - 1 - 2 - 0 - 1 - - - - True @@ -1372,6 +1322,138 @@ For example: "Work" or "Personal" + + + + True + False + 3 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + False + 3 + + + + True + 4 + gtk-dialog-info + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + If the server uses a non-standard port then specify the server address as "server-name:port-number" + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + + + + 1 + 2 + 0 + 1 + fill + fill + + + + + + True + False + 0 + + + + True + _Server: + True + False + GTK_JUSTIFY_LEFT + False + False + 0 + 0.5 + 0 + 0 + source_host + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + 1 + 0 + 1 + fill + fill + + 0 @@ -2023,55 +2105,149 @@ For example: "Work" or "Personal" 2 False 6 - 12 + 6 - + True - _Server: - True - False - GTK_JUSTIFY_RIGHT - False - False - 1 - 0.5 - 0 - 0 - transport_host - PANGO_ELLIPSIZE_NONE - -1 - False - 0 + False + 3 + + + + True + True + True + True + 0 + + True + * + False + + + 0 + False + False + + + + + + True + False + 3 + + + + True + 4 + gtk-dialog-info + 0.5 + 0.5 + 0 + 0 + + + 0 + False + False + + + + + + True + If the server uses a non-standard port then specify the server address as "server-name:port-number" + False + False + GTK_JUSTIFY_LEFT + False + False + 0.5 + 0.5 + 0 + 0 + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + True + True + + - 0 - 1 + 1 + 2 0 1 - fill - + fill - + True - True - True - True - 0 - - True - * - False + False + 0 + + + + True + False + 0 + + + + True + _Server: + True + False + GTK_JUSTIFY_RIGHT + False + False + 1 + 0.5 + 0 + 0 + transport_host + PANGO_ELLIPSIZE_NONE + -1 + False + 0 + + + 0 + False + False + + + + + 0 + False + False + + - 1 - 2 + 0 + 1 0 1 - + fill + fill -- cgit v1.2.3