X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fhildon2%2Fmodest-default-account-settings-dialog.c;h=7db9aa63a3ba9e5a006b8d3e5edfc9c612f533b9;hb=b1609ebd5a812e5e570911f85454b2df0ecb3891;hp=4359cf9519c70ed745108483a2466b96743358ea;hpb=3134dde54de90a0e76c273809cded2d11c52559a;p=modest diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 4359cf9..7db9aa6 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -343,7 +343,7 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) priv->entry_account_title); gtk_widget_show (priv->entry_account_title); connect_for_modified (self, priv->entry_account_title); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); /* Prevent the use of some characters in the account title, @@ -380,7 +380,7 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) gtk_widget_show (priv->retrieve_picker); connect_for_modified (self, priv->retrieve_picker); - gtk_box_pack_start (GTK_BOX (hbox), priv->retrieve_picker, TRUE, TRUE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (hbox), priv->retrieve_picker, TRUE, TRUE, 0); /* The limit-retrieve picker: */ priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new (MODEST_EDITABLE_SIZE, @@ -390,8 +390,8 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) priv->limit_retrieve_picker); gtk_widget_show (priv->limit_retrieve_picker); connect_for_modified (self, priv->limit_retrieve_picker); - gtk_box_pack_start (GTK_BOX (hbox), priv->limit_retrieve_picker, TRUE, TRUE, MODEST_MARGIN_HALF); - gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (hbox), priv->limit_retrieve_picker, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (box), hbox, FALSE, FALSE, 0); gtk_widget_show (hbox); /* The leave-messages widgets: */ @@ -403,7 +403,7 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_leave_messages), 0.0, 0.5); } connect_for_modified (self, priv->checkbox_leave_messages); - gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, 0); gtk_widget_show (priv->checkbox_leave_messages); g_object_unref (title_sizegroup); @@ -496,7 +496,10 @@ on_button_delete (GtkButton *button, gpointer user_data) self = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - account_title = get_entered_account_title (self); + if (priv->modified) + account_title = g_strdup (priv->original_account_title); + else + account_title = get_entered_account_title (self); removed = modest_ui_actions_on_delete_account (GTK_WINDOW (self), priv->account_name, @@ -537,7 +540,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) _("mcen_li_emailsetup_name"), FALSE, priv->entry_user_name); gtk_widget_show (priv->entry_user_name); connect_for_modified (self, priv->entry_user_name); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); @@ -561,7 +564,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) priv->entry_user_username); gtk_widget_show (priv->entry_user_username); connect_for_modified (self, priv->entry_user_username); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); /* Prevent the use of some characters in the username, @@ -589,7 +592,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) _("mail_fi_password"), FALSE, priv->entry_user_password); gtk_widget_show (priv->entry_user_password); connect_for_modified (self, priv->entry_user_password); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); /* The email address widgets: */ @@ -601,7 +604,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */ gtk_widget_show (priv->entry_user_email); connect_for_modified (self, priv->entry_user_email); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); /* Set max length as in the UI spec: @@ -693,7 +696,7 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) "Incoming Server", FALSE, priv->entry_incomingserver); gtk_widget_show (priv->entry_incomingserver); connect_for_modified (self, priv->entry_incomingserver); - gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, 0); gtk_widget_show (priv->caption_incoming); /* Incoming security widgets */ @@ -701,7 +704,7 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING, TRUE, title_sizegroup, value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->incoming_security, - FALSE, FALSE, MODEST_MARGIN_HALF); + FALSE, FALSE, 0); gtk_widget_show (priv->incoming_security); @@ -729,7 +732,7 @@ enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button) { g_signal_connect (G_OBJECT (button), "clicked", G_CALLBACK (on_check_button_clicked), widget); - + /* Set the starting sensitivity: */ on_check_button_clicked (button, widget); } @@ -747,10 +750,9 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) smtp_win = modest_connection_specific_smtp_window_new (); modest_connection_specific_smtp_window_fill_with_connections (smtp_win, priv->account_manager); - /* Show the window: */ + /* Show the window: */ modest_window_mgr_set_modal (modest_runtime_get_window_mgr (), GTK_WINDOW (smtp_win), GTK_WINDOW (self)); gtk_widget_show (GTK_WIDGET (smtp_win)); - priv->modified = TRUE; } static void @@ -772,13 +774,13 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - + /* Create a size group to be used by all captions. * Note that HildonCaption does not create a default size group if we do not specify one. * We use GTK_SIZE_GROUP_HORIZONTAL, so that the widths are the same. */ GtkSizeGroup *title_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); GtkSizeGroup *value_sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - + /* The outgoing server widgets: */ if (!priv->entry_outgoingserver) priv->entry_outgoingserver = @@ -791,7 +793,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) g_free (smtp_caption_label); gtk_widget_show (priv->entry_outgoingserver); connect_for_modified (self, priv->entry_outgoingserver); - gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0); gtk_widget_show (caption); /* Outgoing security widgets */ @@ -799,13 +801,13 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING, TRUE, title_sizegroup, value_sizegroup); gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security, - FALSE, FALSE, MODEST_MARGIN_HALF); + FALSE, FALSE, 0); gtk_widget_show (priv->outgoing_security); g_signal_connect (priv->outgoing_security, "missing-mandatory-data", G_CALLBACK (on_missing_mandatory_data), self); GtkWidget *separator = gtk_hseparator_new (); - gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT); gtk_widget_show (separator); /* connection-specific checkbox: */ @@ -819,7 +821,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) } gtk_widget_show (priv->checkbox_outgoing_smtp_specific); gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific, - FALSE, FALSE, MODEST_MARGIN_HALF); + FALSE, FALSE, 0); connect_for_modified (self, priv->checkbox_outgoing_smtp_specific); /* Connection-specific SMTP-Severs Edit button: */ @@ -828,7 +830,7 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) hildon_gtk_widget_set_theme_size (priv->button_outgoing_smtp_servers, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); gtk_widget_show (priv->button_outgoing_smtp_servers); - gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers, FALSE, FALSE, 0); /* Only enable the button when the checkbox is checked: */ enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers, @@ -1044,13 +1046,14 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *pannable; GtkWidget *separator; + GtkWidget *align; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self); priv->incoming_security = NULL; priv->outgoing_security = NULL; - priv->main_container = gtk_vbox_new (FALSE, MODEST_MARGIN_DOUBLE); + priv->main_container = gtk_vbox_new (FALSE, 0); priv->settings = modest_account_settings_new (); /* Get the account manager object, @@ -1079,14 +1082,14 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog separator = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (priv->main_container), separator, - FALSE, FALSE, 0); + FALSE, FALSE, MODEST_MARGIN_DEFAULT); gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (priv->main_container), priv->page_incoming, FALSE, FALSE, 0); separator = gtk_hseparator_new (); gtk_box_pack_start (GTK_BOX (priv->main_container), separator, - FALSE, FALSE, 0); + FALSE, FALSE, MODEST_MARGIN_DEFAULT); gtk_widget_show (separator); gtk_box_pack_start (GTK_BOX (priv->main_container), priv->page_outgoing, @@ -1095,16 +1098,21 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog GtkDialog *dialog = GTK_DIALOG (self); pannable = hildon_pannable_area_new (); g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL); - hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->main_container); + + 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_widget_show (align); + gtk_container_add (GTK_CONTAINER (align), priv->main_container); + + hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align); gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (pannable)); - gtk_container_set_border_width (GTK_CONTAINER (dialog->vbox), MODEST_MARGIN_HALF); gtk_widget_show (GTK_WIDGET (priv->main_container)); gtk_widget_show (GTK_WIDGET (pannable)); /* Add the buttons: */ gtk_dialog_add_button (GTK_DIALOG(self), _HL("wdgt_bd_save"), GTK_RESPONSE_OK); - gtk_window_set_default_size (GTK_WINDOW (self), -1, 340); + gtk_window_set_default_size (GTK_WINDOW (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT); /* Connect to the dialog's "response" and "delete-event" signals */ g_signal_connect (G_OBJECT (self), "response", G_CALLBACK (on_response), self);