From 5ddf55d5203d0df352b0ccf55c43bbd948b92e14 Mon Sep 17 00:00:00 2001 From: Murray Cumming Date: Sun, 29 Apr 2007 11:17:58 +0000 Subject: [PATCH] 2007-04-29 rray Cumming * src/maemo/modest-maemo-ui-constants.h: Add a MODEST_MARGIN_NONE constant, so it is easy to find where this is used. * src/maemo/easysetup/modest-easysetup-wizard.c: (create_page_welcome), (create_page_account_details), (create_page_user_details), (create_page_complete_easysetup), (create_page_custom_incoming), (create_page_custom_outgoing), (create_page_complete_custom): * src/maemo/modest-account-settings-dialog.c: (create_page_account_details), (create_page_user_details), (create_page_incoming), (create_page_outgoing): * src/maemo/modest-account-view-window.c: (window_vbox_new): * src/maemo/modest-connection-specific-smtp-edit-window.c: (modest_connection_specific_smtp_edit_window_init): * src/maemo/modest-connection-specific-smtp-window.c: (modest_connection_specific_smtp_window_init): * src/maemo/modest-signature-editor-dialog.c: (modest_signature_editor_dialog_init): Use the correct padding/spacing/borders and scrolling policy as per the Email Application Layout Guide, if I have understood it. pmo-trunk-r1714 --- ChangeLog2 | 23 ++++++++++++++++++++ src/maemo/easysetup/modest-easysetup-wizard.c | 14 ++++++------ src/maemo/modest-account-settings-dialog.c | 8 +++---- src/maemo/modest-account-view-window.c | 4 ++++ .../modest-connection-specific-smtp-edit-window.c | 1 + src/maemo/modest-connection-specific-smtp-window.c | 5 ++++- src/maemo/modest-maemo-ui-constants.h | 1 + src/maemo/modest-signature-editor-dialog.c | 3 ++- 8 files changed, 46 insertions(+), 13 deletions(-) diff --git a/ChangeLog2 b/ChangeLog2 index 6bb884f..0880189 100644 --- a/ChangeLog2 +++ b/ChangeLog2 @@ -1,3 +1,26 @@ +2007-04-29 rray Cumming + + * src/maemo/modest-maemo-ui-constants.h: Add a MODEST_MARGIN_NONE constant, so + it is easy to find where this is used. + + * src/maemo/easysetup/modest-easysetup-wizard.c: + (create_page_welcome), (create_page_account_details), + (create_page_user_details), (create_page_complete_easysetup), + (create_page_custom_incoming), (create_page_custom_outgoing), + (create_page_complete_custom): + * src/maemo/modest-account-settings-dialog.c: + (create_page_account_details), (create_page_user_details), + (create_page_incoming), (create_page_outgoing): + * src/maemo/modest-account-view-window.c: (window_vbox_new): + * src/maemo/modest-connection-specific-smtp-edit-window.c: + (modest_connection_specific_smtp_edit_window_init): + * src/maemo/modest-connection-specific-smtp-window.c: + (modest_connection_specific_smtp_window_init): + * src/maemo/modest-signature-editor-dialog.c: + (modest_signature_editor_dialog_init): Use the correct padding/spacing/borders + and scrolling policy as per the Email Application Layout Guide, if I have + understood it. + 2007-04-27 Murray Cumming * src/modest-tny-account-store.c: (modest_tny_account_store_init): diff --git a/src/maemo/easysetup/modest-easysetup-wizard.c b/src/maemo/easysetup/modest-easysetup-wizard.c index 7a8361e..fca8102 100644 --- a/src/maemo/easysetup/modest-easysetup-wizard.c +++ b/src/maemo/easysetup/modest-easysetup-wizard.c @@ -192,7 +192,7 @@ static GtkWidget* create_caption_new_with_asterix(ModestEasysetupWizardDialog *s static GtkWidget* create_page_welcome (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_intro")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -250,7 +250,7 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data) static GtkWidget* create_page_account_details (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (label); @@ -383,7 +383,7 @@ create_page_account_details (ModestEasysetupWizardDialog *self) static GtkWidget* create_page_user_details (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -472,7 +472,7 @@ create_page_user_details (ModestEasysetupWizardDialog *self) static GtkWidget* create_page_complete_easysetup (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); @@ -524,7 +524,7 @@ static void on_combo_servertype_changed(GtkComboBox *combobox, gpointer user_dat static GtkWidget* create_page_custom_incoming (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -633,7 +633,7 @@ on_button_outgoing_smtp_servers (GtkButton *button, gpointer user_data) static GtkWidget* create_page_custom_outgoing (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -742,7 +742,7 @@ on_button_edit_advanced_settings (GtkButton *button, gpointer user_data) } static GtkWidget* create_page_complete_custom (ModestEasysetupWizardDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); diff --git a/src/maemo/modest-account-settings-dialog.c b/src/maemo/modest-account-settings-dialog.c index 6632390..ed0e1c6 100644 --- a/src/maemo/modest-account-settings-dialog.c +++ b/src/maemo/modest-account-settings-dialog.c @@ -227,7 +227,7 @@ on_entry_max (ModestValidatingEntry *self, gpointer user_data) static GtkWidget* create_page_account_details (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails")); gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (label); @@ -345,7 +345,7 @@ on_button_signature (GtkButton *button, gpointer user_data) static GtkWidget* create_page_user_details (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -480,7 +480,7 @@ static void update_incoming_server_security_choices (ModestAccountSettingsDialog static GtkWidget* create_page_incoming (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. @@ -635,7 +635,7 @@ on_combo_incoming_security_changed (GtkComboBox *widget, gpointer user_data) static GtkWidget* create_page_outgoing (ModestAccountSettingsDialog *self) { - GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); /* 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. diff --git a/src/maemo/modest-account-view-window.c b/src/maemo/modest-account-view-window.c index 4a14f06..ad889e4 100644 --- a/src/maemo/modest-account-view-window.c +++ b/src/maemo/modest-account-view-window.c @@ -39,6 +39,7 @@ #include "modest-tny-platform-factory.h" #include "maemo/easysetup/modest-easysetup-wizard.h" #include "maemo/modest-account-settings-dialog.h" +#include "maemo/modest-maemo-ui-constants.h" /* 'private'/'protected' functions */ static void modest_account_view_window_class_init (ModestAccountViewWindowClass *klass); @@ -292,6 +293,9 @@ window_vbox_new (ModestAccountViewWindow *self) self); GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view)); gtk_widget_show (GTK_WIDGET (scrolled_window)); diff --git a/src/maemo/modest-connection-specific-smtp-edit-window.c b/src/maemo/modest-connection-specific-smtp-edit-window.c index 790852e..fbd89b7 100644 --- a/src/maemo/modest-connection-specific-smtp-edit-window.c +++ b/src/maemo/modest-connection-specific-smtp-edit-window.c @@ -111,6 +111,7 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd CONNECTION_SPECIFIC_SMTP_EDIT_WINDOW_GET_PRIVATE (self); GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */ + gtk_box_set_spacing (GTK_BOX (box), MODEST_MARGIN_NONE); gtk_container_set_border_width (GTK_CONTAINER (box), MODEST_MARGIN_HALF); /* Create a size group to be used by all captions. diff --git a/src/maemo/modest-connection-specific-smtp-window.c b/src/maemo/modest-connection-specific-smtp-window.c index 5a58945..35a8b38 100644 --- a/src/maemo/modest-connection-specific-smtp-window.c +++ b/src/maemo/modest-connection-specific-smtp-window.c @@ -305,10 +305,13 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow /* The application must call modest_connection_specific_smtp_window_fill_with_connections(). */ - GtkWidget *vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + GtkWidget *vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); /* Put the treeview in a scrolled window and add it to the box: */ GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT); + gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, + GTK_POLICY_AUTOMATIC); gtk_widget_show (scrolled_window); gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->treeview)); gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (scrolled_window), TRUE, TRUE, MODEST_MARGIN_HALF); diff --git a/src/maemo/modest-maemo-ui-constants.h b/src/maemo/modest-maemo-ui-constants.h index f1a609f..9938252 100644 --- a/src/maemo/modest-maemo-ui-constants.h +++ b/src/maemo/modest-maemo-ui-constants.h @@ -39,5 +39,6 @@ #define MODEST_MARGIN_DOUBLE 12 #define MODEST_MARGIN_TRIPLE 18 #define MODEST_MARGIN_HALF 3 +#define MODEST_MARGIN_NONE 0 #endif /*__MODEST_MAEMO_UI_CONSTANTS_H__*/ diff --git a/src/maemo/modest-signature-editor-dialog.c b/src/maemo/modest-signature-editor-dialog.c index 745b1b6..005bc8d 100644 --- a/src/maemo/modest-signature-editor-dialog.c +++ b/src/maemo/modest-signature-editor-dialog.c @@ -122,8 +122,9 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self) gtk_widget_show (priv->label); priv->scrolledwindow = gtk_scrolled_window_new (NULL, NULL); + gtk_container_set_border_width (GTK_CONTAINER (priv->scrolledwindow), MODEST_MARGIN_DEFAULT); gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (priv->scrolledwindow), - GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); + GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); gtk_scrolled_window_set_shadow_type (GTK_SCROLLED_WINDOW (priv->scrolledwindow), GTK_SHADOW_IN); gtk_box_pack_start (GTK_BOX (box), priv->scrolledwindow, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (priv->scrolledwindow); -- 1.7.9.5