Modified webpage: now tinymail repository is in gitorious.

[modest] / src / widgets / modest-default-global-settings-dialog.c

diff --git a/src/widgets/modest-default-global-settings-dialog.c b/src/widgets/modest-default-global-settings-dialog.c
index f7c6c35..b8d483c 100644 (file)
--- a/src/widgets/modest-default-global-settings-dialog.c
+++ b/src/widgets/modest-default-global-settings-dialog.c
@@ -141,10 +141,14 @@ modest_default_global_settings_dialog_init (ModestDefaultGlobalSettingsDialog *s
        ppriv->updating_page = create_updating_page (self);
        top_vbox = gtk_vbox_new (FALSE, 0);
        align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
-       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+       gtk_alignment_set_padding (GTK_ALIGNMENT (align), 
+                                  MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 
+                                  MODEST_MARGIN_DOUBLE, MODEST_MARGIN_TRIPLE);
 
        /* Add the buttons: */
+       gtk_dialog_add_button (GTK_DIALOG (self), GTK_STOCK_CANCEL, GTK_RESPONSE_CANCEL);
        gtk_dialog_add_button (GTK_DIALOG (self), _HL_SAVE, GTK_RESPONSE_OK);
+       gtk_dialog_set_has_separator (GTK_DIALOG (self), FALSE);
 
        /* Set the default focusable widgets */
        g_object_set_data (G_OBJECT(ppriv->updating_page), DEFAULT_FOCUS_WIDGET,
@@ -154,7 +158,7 @@ modest_default_global_settings_dialog_init (ModestDefaultGlobalSettingsDialog *s
        gtk_container_add (GTK_CONTAINER (align), top_vbox);
        gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), align);
        gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
-       gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
+       gtk_window_set_default_size (GTK_WINDOW (self), MODEST_DIALOG_WINDOW_MAX_WIDTH, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
 
        gtk_widget_show (align);
        gtk_widget_show (top_vbox);
@@ -196,6 +200,7 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
        ModestGlobalSettingsDialogPrivate *ppriv;
        GtkWidget *scrollable, *separator;
        ModestDefaultGlobalSettingsDialogPrivate *priv;
+       PangoAttrList *attr_list;
 
        priv = MODEST_DEFAULT_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
        ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self);
@@ -208,7 +213,7 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
        ppriv->accounts_list = get_accounts_list ();
        ppriv->default_account_selector = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
                                                                                  ppriv->accounts_list,
-                                                                                 g_str_equal);
+                                                                                 g_str_equal, TRUE);
        if (ppriv->accounts_list == NULL) {
                gtk_widget_set_sensitive (GTK_WIDGET (ppriv->default_account_selector), FALSE);
        } else {
@@ -245,7 +250,7 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
         * so it can't know how to manage its memory. */
        ppriv->msg_format_list = _modest_global_settings_dialog_get_msg_formats ();
        ppriv->msg_format = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
-                                                                   ppriv->msg_format_list, g_int_equal);
+                                                                   ppriv->msg_format_list, g_int_equal, TRUE);
        if (GTK_IS_COMBO_BOX (ppriv->msg_format)) {
                GtkWidget *caption;
                caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
@@ -273,6 +278,10 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
 
        /* Separator label */
        separator = gtk_label_new (_("mcen_ti_updating"));
+       attr_list = pango_attr_list_new ();
+       pango_attr_list_insert (attr_list, pango_attr_weight_new (PANGO_WEIGHT_BOLD));
+       gtk_label_set_attributes (GTK_LABEL (separator), attr_list);
+       pango_attr_list_unref (attr_list);
        gtk_label_set_justify ((GtkLabel *) separator, GTK_JUSTIFY_CENTER);
        gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT);
 
@@ -289,7 +298,7 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
         * so it can't know how to manage its memory. */ 
        ppriv->connect_via_list = _modest_global_settings_dialog_get_connected_via ();
        ppriv->connect_via = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
-                                                                    ppriv->connect_via_list, g_int_equal);
+                                                                    ppriv->connect_via_list, g_int_equal, TRUE);
        if (GTK_IS_COMBO_BOX (ppriv->connect_via)) {
                GtkWidget *caption;
                caption = modest_toolkit_utils_create_vcaptioned (title_size_group,
@@ -311,7 +320,7 @@ create_updating_page (ModestDefaultGlobalSettingsDialog *self)
         * so it can't know how to manage its memory. */ 
        ppriv->update_interval_list = _modest_global_settings_dialog_get_update_interval ();
        ppriv->update_interval = modest_toolkit_factory_create_selector (modest_runtime_get_toolkit_factory (),
-                                                                        ppriv->update_interval_list, g_int_equal);
+                                                                        ppriv->update_interval_list, g_int_equal, TRUE);
        if (GTK_IS_COMBO_BOX (ppriv->update_interval)) {
                GtkWidget *caption;
                caption = modest_toolkit_utils_create_vcaptioned (title_size_group,