From 51372832576ac3b1423ee599cc5b142aabdebd42 Mon Sep 17 00:00:00 2001 From: Jose Dapena Paz Date: Mon, 6 Oct 2008 14:56:55 +0000 Subject: [PATCH] * Migrated to hildon 2 check buttons and thumbable controls in global settings, account settings and account wizard. * More fixes. pmo-trunk-r5918 --- .../modest-connection-specific-smtp-edit-window.c | 8 +- src/hildon2/modest-country-picker.c | 7 +- src/hildon2/modest-country-picker.h | 3 +- .../modest-default-account-settings-dialog.c | 229 ++++++++------------ src/hildon2/modest-easysetup-wizard-dialog.c | 83 +++---- src/hildon2/modest-hildon-includes.h | 23 +- src/hildon2/modest-limit-retrieve-picker.c | 7 +- src/hildon2/modest-limit-retrieve-picker.h | 3 +- src/hildon2/modest-maemo-global-settings-dialog.c | 35 ++- src/hildon2/modest-maemo-security-options-view.c | 54 ++--- src/hildon2/modest-maemo-utils.c | 53 +++++ src/hildon2/modest-maemo-utils.h | 11 + src/hildon2/modest-msg-edit-window.c | 26 ++- src/hildon2/modest-provider-picker.c | 7 +- src/hildon2/modest-provider-picker.h | 3 +- src/hildon2/modest-retrieve-picker.c | 7 +- src/hildon2/modest-retrieve-picker.h | 3 +- src/hildon2/modest-secureauth-picker.c | 7 +- src/hildon2/modest-secureauth-picker.h | 3 +- src/hildon2/modest-selector-picker.c | 8 +- src/hildon2/modest-selector-picker.h | 4 +- src/hildon2/modest-serversecurity-picker.c | 7 +- src/hildon2/modest-serversecurity-picker.h | 3 +- src/hildon2/modest-servertype-picker.c | 8 +- src/hildon2/modest-servertype-picker.h | 4 +- src/widgets/modest-progress-bar.c | 1 - src/widgets/modest-security-options-view.c | 19 ++ src/widgets/modest-ui-constants.h | 4 + src/widgets/modest-wizard-dialog.c | 10 +- 29 files changed, 361 insertions(+), 279 deletions(-) diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c index ae1fb79..94ae043 100644 --- a/src/hildon2/modest-connection-specific-smtp-edit-window.c +++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c @@ -312,7 +312,9 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd /* The secure authentication widgets: */ if (!priv->outgoing_auth_picker) { - priv->outgoing_auth_picker = GTK_WIDGET (modest_secureauth_picker_new ()); + priv->outgoing_auth_picker = + GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); hildon_button_set_title (HILDON_BUTTON (priv->outgoing_auth_picker), _("mcen_li_emailsetup_secure_authentication")); } g_signal_connect (G_OBJECT (priv->outgoing_auth_picker), "value-changed", G_CALLBACK(on_change), self); @@ -355,7 +357,9 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd /* The secure connection widgets: */ if (!priv->outgoing_security_picker) - priv->outgoing_security_picker = GTK_WIDGET (modest_serversecurity_picker_new ()); + priv->outgoing_security_picker = + GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); modest_serversecurity_picker_fill ( MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker), MODEST_PROTOCOLS_TRANSPORT_SMTP); modest_serversecurity_picker_set_active_serversecurity ( diff --git a/src/hildon2/modest-country-picker.c b/src/hildon2/modest-country-picker.c index 38be4c0..1a6d777 100644 --- a/src/hildon2/modest-country-picker.c +++ b/src/hildon2/modest-country-picker.c @@ -296,11 +296,12 @@ modest_country_picker_load_data(ModestCountryPicker *self) } ModestCountryPicker* -modest_country_picker_new (void) +modest_country_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { return g_object_new (MODEST_TYPE_COUNTRY_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); } diff --git a/src/hildon2/modest-country-picker.h b/src/hildon2/modest-country-picker.h index a091d7e..2664747 100644 --- a/src/hildon2/modest-country-picker.h +++ b/src/hildon2/modest-country-picker.h @@ -66,7 +66,8 @@ typedef struct { GType modest_country_picker_get_type (void); -ModestCountryPicker* modest_country_picker_new (void); +ModestCountryPicker* modest_country_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); void modest_country_picker_load_data(ModestCountryPicker *self); diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c index 22aa32c..24b854f 100644 --- a/src/hildon2/modest-default-account-settings-dialog.c +++ b/src/hildon2/modest-default-account-settings-dialog.c @@ -29,7 +29,6 @@ #include -#include #include #include #include @@ -62,6 +61,7 @@ #include #include /* For strlen(). */ + /* Include config.h so that _() works: */ #ifdef HAVE_CONFIG_H #include @@ -99,7 +99,7 @@ struct _ModestDefaultAccountSettingsDialogPrivate ModestProtocolType protocol_authentication_incoming; - GtkNotebook *notebook; + GtkWidget *main_container; GtkWidget *page_account_details; GtkWidget *entry_account_title; @@ -205,7 +205,7 @@ on_modified_entry_changed (GtkEditable *editable, gpointer user_data) } static void -on_modified_checkbox_toggled (GtkToggleButton *togglebutton, gpointer user_data) +on_modified_checkbutton_clicked (GtkButton *button, gpointer user_data) { set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE); } @@ -242,9 +242,9 @@ connect_for_modified (ModestDefaultAccountSettingsDialog *self, GtkWidget *widge } else if (HILDON_IS_PICKER_BUTTON (widget)) { g_signal_connect (G_OBJECT (widget), "value-changed", G_CALLBACK (on_modified_picker_changed), self); - } else if (GTK_IS_TOGGLE_BUTTON (widget)) { - g_signal_connect (G_OBJECT (widget), "toggled", - G_CALLBACK (on_modified_checkbox_toggled), self); + } else if (GTK_IS_BUTTON (widget)) { + g_signal_connect (G_OBJECT (widget), "clicked", + G_CALLBACK (on_modified_checkbutton_clicked), self); } } @@ -256,31 +256,16 @@ on_caption_entry_changed (GtkEditable *editable, gpointer user_data) enable_buttons(self); } -/** This is a convenience function to create a caption containing a mandatory widget. - * When the widget is edited, the enable_buttons() vfunc will be called. - */ static GtkWidget* -create_caption_new_with_asterisk(ModestDefaultAccountSettingsDialog *self, - GtkSizeGroup *group, - const gchar *value, - GtkWidget *control, - GtkWidget *icon, - HildonCaptionStatus flag) +create_captioned (ModestDefaultAccountSettingsDialog *self, + GtkSizeGroup *group, + const gchar *label_text, + GtkWidget *control) { - GtkWidget *caption = NULL; - - /* Note: Previously, the translated strings already contained the "*", - * Comment out this code if they do again. - */ - /* Add a * character to indicate mandatory fields, - * as specified in our "Email UI Specification": */ - if (flag == HILDON_CAPTION_MANDATORY) { - gchar* title = g_strdup_printf("%s*", value); - caption = hildon_caption_new (group, title, control, icon, flag); - g_free(title); - } - else - caption = hildon_caption_new (group, value, control, icon, flag); + + GtkWidget *result; + + result = modest_maemo_utils_create_captioned (group, label_text, control); /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -291,7 +276,7 @@ create_caption_new_with_asterisk(ModestDefaultAccountSettingsDialog *self, } - return caption; + return result; } static void @@ -335,24 +320,19 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkAdjustment *focus_adjustment = NULL; GtkSizeGroup* sizegroup; - GtkWidget *scrollwin; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - scrollwin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The description widgets: */ priv->entry_account_title = GTK_WIDGET (modest_validating_entry_new ()); /* Do use auto-capitalization: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_account_title), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); - GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_account_title"), - priv->entry_account_title, NULL, HILDON_CAPTION_MANDATORY); + GtkWidget *caption = create_captioned (self, sizegroup, _("mcen_fi_account_title"), + 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); @@ -384,15 +364,18 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) on_entry_max, self); /* The retrieve picker: */ - priv->retrieve_picker = GTK_WIDGET (modest_retrieve_picker_new ()); - hildon_button_set_title (HILDON_BUTTON (priv->retrieve_picker), _("mcen_fi_advsetup_retrievetype")); + priv->retrieve_picker = GTK_WIDGET (modest_retrieve_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); + modest_maemo_utils_create_picker_layout (sizegroup, _("mcen_fi_advsetup_retrievetype"), priv->retrieve_picker); + gtk_widget_show (priv->retrieve_picker); connect_for_modified (self, priv->retrieve_picker); gtk_box_pack_start (GTK_BOX (box), priv->retrieve_picker, FALSE, FALSE, MODEST_MARGIN_HALF); /* The limit-retrieve picker: */ - priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new ()); - hildon_button_set_title (HILDON_BUTTON (priv->limit_retrieve_picker), _("mcen_fi_advsetup_limit_retrieve")); + priv->limit_retrieve_picker = GTK_WIDGET (modest_limit_retrieve_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); + modest_maemo_utils_create_picker_layout (sizegroup, _("mcen_fi_advsetup_limit_retrieve"), 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 (box), priv->limit_retrieve_picker, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -401,8 +384,9 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) if(!priv->checkbox_leave_messages) priv->checkbox_leave_messages = gtk_check_button_new (); if (!priv->caption_leave_messages) { - priv->caption_leave_messages = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), - priv->checkbox_leave_messages, NULL, HILDON_CAPTION_MANDATORY); + priv->caption_leave_messages = + create_captioned (self, sizegroup, _("mcen_fi_advsetup_leave_on_server"), + priv->checkbox_leave_messages); } gtk_widget_show (priv->checkbox_leave_messages); @@ -414,13 +398,7 @@ create_page_account_details (ModestDefaultAccountSettingsDialog *self) gtk_widget_show (GTK_WIDGET (box)); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box); - gtk_widget_show (scrollwin); - - focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - - return GTK_WIDGET (scrollwin); + return GTK_WIDGET (box); } static gchar* @@ -499,17 +477,12 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box; - GtkAdjustment *focus_adjustment = NULL; GtkSizeGroup* sizegroup; - GtkWidget *scrollwin; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); - scrollwin = gtk_scrolled_window_new (NULL, NULL); - gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrollwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); /* The name widgets: */ priv->entry_user_name = GTK_WIDGET (modest_validating_entry_new ()); @@ -521,8 +494,9 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64); modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name), on_entry_max, self); - GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_name"), priv->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL); + GtkWidget *caption = + create_captioned (self, sizegroup, + _("mcen_li_emailsetup_name"), 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); @@ -544,8 +518,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) priv->entry_user_username = GTK_WIDGET (modest_validating_entry_new ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL); - caption = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_username"), - priv->entry_user_username, NULL, HILDON_CAPTION_MANDATORY); + caption = create_captioned (self, sizegroup, _("mail_fi_username"), + 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); @@ -566,14 +540,14 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) on_entry_max, self); /* The password widgets: */ - priv->entry_user_password = gtk_entry_new (); + priv->entry_user_password = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_password), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */ - caption = create_caption_new_with_asterisk (self, sizegroup, - _("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL); + caption = create_captioned (self, sizegroup, + _("mail_fi_password"), 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); @@ -583,8 +557,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) priv->entry_user_email = GTK_WIDGET (modest_validating_entry_new ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL); - caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_email_address"), priv->entry_user_email, NULL, HILDON_CAPTION_MANDATORY); + caption = create_captioned (self, sizegroup, + _("mcen_li_emailsetup_email_address"), priv->entry_user_email); 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); @@ -600,9 +574,7 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) /* Signature button: */ if (!priv->button_signature) priv->button_signature = gtk_button_new_with_label (_("mcen_bd_edit")); - caption = hildon_caption_new (sizegroup, _("mcen_fi_email_signature"), - priv->button_signature, NULL, HILDON_CAPTION_OPTIONAL); - hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); + caption = create_captioned (self, sizegroup, _("mcen_fi_email_signature"), priv->button_signature); gtk_widget_show (priv->button_signature); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -613,13 +585,8 @@ create_page_user_details (ModestDefaultAccountSettingsDialog *self) G_CALLBACK (on_button_signature), self); gtk_widget_show (GTK_WIDGET (box)); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW (scrollwin), box); - gtk_widget_show (scrollwin); - focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - - return GTK_WIDGET (scrollwin); + return GTK_WIDGET (box); } /* Change the caption title for the incoming server */ @@ -668,7 +635,7 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) /* The incoming server widgets: */ if(!priv->entry_incomingserver) - priv->entry_incomingserver = gtk_entry_new (); + priv->entry_incomingserver = hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_incomingserver), HILDON_GTK_INPUT_MODE_FULL); @@ -678,8 +645,8 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) /* The caption title will be updated in update_incoming_server_title(). * so this default text will never be seen: */ /* (Note: Changing the title seems pointless. murrayc) */ - priv->caption_incoming = create_caption_new_with_asterisk (self, sizegroup, - "Incoming Server", priv->entry_incomingserver, NULL, HILDON_CAPTION_MANDATORY); + priv->caption_incoming = create_captioned (self, sizegroup, + "Incoming Server", 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); @@ -701,25 +668,25 @@ create_page_incoming (ModestDefaultAccountSettingsDialog *self) } static void -on_toggle_button_changed (GtkToggleButton *togglebutton, gpointer user_data) +on_check_button_clicked (GtkButton *button, gpointer user_data) { GtkWidget *widget = GTK_WIDGET (user_data); - /* Enable the widget only if the toggle button is active: */ - const gboolean enable = gtk_toggle_button_get_active (togglebutton); + /* Enable the widget only if the check button is active: */ + const gboolean enable = hildon_check_button_get_active (button); gtk_widget_set_sensitive (widget, enable); } -/* Make the sensitivity of a widget depend on a toggle button. +/* Make the sensitivity of a widget depend on a check button. */ static void -enable_widget_for_togglebutton (GtkWidget *widget, GtkToggleButton* button) +enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button) { - g_signal_connect (G_OBJECT (button), "toggled", - G_CALLBACK (on_toggle_button_changed), widget); + g_signal_connect (G_OBJECT (button), "clicked", + G_CALLBACK (on_check_button_clicked), widget); /* Set the starting sensitivity: */ - on_toggle_button_changed (button, widget); + on_check_button_clicked (button, widget); } static void @@ -757,16 +724,9 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE); - GtkAdjustment *focus_adjustment = NULL; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE (self); - /* Put it all in a scrolled window, so that all widgets can be - * accessed even when the on-screen keyboard is visible: */ - GtkWidget *scrollwin = gtk_scrolled_window_new(NULL, NULL); - gtk_scrolled_window_set_policy(GTK_SCROLLED_WINDOW(scrollwin), - GTK_POLICY_NEVER, GTK_POLICY_AUTOMATIC); - /* 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. */ @@ -774,11 +734,12 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* The outgoing server widgets: */ if (!priv->entry_outgoingserver) - priv->entry_outgoingserver = gtk_entry_new (); + priv->entry_outgoingserver = + hildon_entry_new (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); - GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL); + GtkWidget *caption = create_captioned (self, sizegroup, + _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver); 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); @@ -800,12 +761,12 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* connection-specific checkbox: */ if (!priv->checkbox_outgoing_smtp_specific) { - priv->checkbox_outgoing_smtp_specific = gtk_check_button_new (); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific), + priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (MODEST_EDITABLE_SIZE); + hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), FALSE); } - caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), - priv->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL); + caption = create_captioned (self, sizegroup, _("mcen_fi_advsetup_connection_smtp"), + priv->checkbox_outgoing_smtp_specific); gtk_widget_show (priv->checkbox_outgoing_smtp_specific); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -814,16 +775,15 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) /* Connection-specific SMTP-Severs Edit button: */ if (!priv->button_outgoing_smtp_servers) priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit")); - caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), - priv->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL); - hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); + caption = create_captioned (self, sizegroup, _("mcen_fi_advsetup_optional_smtp"), + priv->button_outgoing_smtp_servers); gtk_widget_show (priv->button_outgoing_smtp_servers); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Only enable the button when the checkbox is checked: */ - enable_widget_for_togglebutton (priv->button_outgoing_smtp_servers, - GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific)); + enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers, + GTK_BUTTON (priv->checkbox_outgoing_smtp_specific)); g_object_unref (sizegroup); @@ -831,13 +791,8 @@ create_page_outgoing (ModestDefaultAccountSettingsDialog *self) G_CALLBACK (on_button_outgoing_smtp_servers), self); gtk_widget_show (GTK_WIDGET (box)); - gtk_scrolled_window_add_with_viewport (GTK_SCROLLED_WINDOW(scrollwin), box); - gtk_widget_show(scrollwin); - - focus_adjustment = gtk_scrolled_window_get_vadjustment (GTK_SCROLLED_WINDOW (scrollwin)); - gtk_container_set_focus_vadjustment (GTK_CONTAINER (box), focus_adjustment); - return GTK_WIDGET (scrollwin); + return GTK_WIDGET (box); } static gboolean @@ -1016,15 +971,14 @@ static void modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog *self) { ModestDefaultAccountSettingsDialogPrivate *priv; + GtkWidget *pannable; priv = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG_GET_PRIVATE(self); priv->incoming_security = NULL; priv->outgoing_security = NULL; - /* Create the notebook to be used by the GtkDialog base class: - * Each page of the notebook will be a page of the wizard: */ - priv->notebook = GTK_NOTEBOOK (gtk_notebook_new()); + priv->main_container = gtk_vbox_new (FALSE, MODEST_MARGIN_DOUBLE); priv->settings = modest_account_settings_new (); /* Get the account manager object, @@ -1044,23 +998,36 @@ modest_default_account_settings_dialog_init (ModestDefaultAccountSettingsDialog priv->page_outgoing = create_page_outgoing (self); /* Add the notebook pages: */ - gtk_notebook_append_page (priv->notebook, priv->page_account_details, - gtk_label_new (_("mcen_ti_account_settings_account"))); - gtk_notebook_append_page (priv->notebook, priv->page_user_details, - gtk_label_new (_("mcen_ti_account_settings_userinfo"))); - gtk_notebook_append_page (priv->notebook, priv->page_incoming, - gtk_label_new (_("mcen_ti_advsetup_retrieval"))); - gtk_notebook_append_page (priv->notebook, priv->page_outgoing, - gtk_label_new (_("mcen_ti_advsetup_sending"))); + gtk_box_pack_start (GTK_BOX (priv->main_container), + modest_maemo_utils_create_group_box (_("mcen_ti_account_settings_account"), + priv->page_account_details), + FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->main_container), + modest_maemo_utils_create_group_box (_("mcen_ti_account_settings_userinfo"), + priv->page_user_details), + FALSE, FALSE, 0); + + gtk_box_pack_start (GTK_BOX (priv->main_container), + modest_maemo_utils_create_group_box (_("mcen_ti_advsetup_retrieval"), + priv->page_incoming), + FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (priv->main_container), + modest_maemo_utils_create_group_box (_("mcen_ti_advsetup_sending"), + priv->page_outgoing), + FALSE, FALSE, 0); GtkDialog *dialog = GTK_DIALOG (self); - gtk_container_add (GTK_CONTAINER (dialog->vbox), GTK_WIDGET (priv->notebook)); + pannable = hildon_pannable_area_new (); + hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->main_container); + 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->notebook)); + gtk_widget_show (GTK_WIDGET (priv->main_container)); + gtk_widget_show (GTK_WIDGET (pannable)); /* Add the buttons: */ gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_dialog_ok"), GTK_RESPONSE_OK); - gtk_dialog_add_button (GTK_DIALOG(self), _("mcen_bd_dialog_cancel"), GTK_RESPONSE_CANCEL); + + gtk_window_set_default_size (GTK_WINDOW (self), -1, 340); /* Connect to the dialog's response signal: */ /* We use connect-before @@ -1103,7 +1070,6 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo ModestProtocolRegistry *protocol_registry; const gchar *account_name, *server_account_name; ModestDefaultAccountSettingsDialogPrivate *priv; - gint page_num; gboolean username_known; g_return_if_fail (MODEST_IS_ACCOUNT_SETTINGS_DIALOG (dialog)); @@ -1146,8 +1112,8 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo modest_account_settings_get_retrieve_limit (settings)); - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->checkbox_leave_messages), - modest_account_settings_get_leave_messages_on_server (settings)); + hildon_check_button_set_active (GTK_BUTTON (priv->checkbox_leave_messages), + modest_account_settings_get_leave_messages_on_server (settings)); if (incoming_account) { @@ -1228,16 +1194,13 @@ modest_default_account_settings_dialog_load_settings (ModestAccountSettingsDialo const gboolean has_specific = modest_account_settings_get_use_connection_specific_smtp (settings); - gtk_toggle_button_set_active ( - GTK_TOGGLE_BUTTON (priv->checkbox_outgoing_smtp_specific), + hildon_check_button_set_active ( + GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), has_specific); g_object_unref (outgoing_account); } /* Switch to user page */ - page_num = gtk_notebook_page_num (priv->notebook,priv->page_user_details); - gtk_notebook_set_current_page (priv->notebook, page_num); - /* Check if we allow changes or not */ server_account_name = modest_server_account_settings_get_account_name (incoming_account); username_known = @@ -1299,7 +1262,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) MODEST_LIMIT_RETRIEVE_PICKER (priv->limit_retrieve_picker)); modest_account_settings_set_retrieve_limit (priv->settings, retrieve_limit); - leave_on_server = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->checkbox_leave_messages)); + leave_on_server = hildon_check_button_get_active (GTK_BUTTON (priv->checkbox_leave_messages)); modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server); store_settings = modest_account_settings_get_store_settings (priv->settings); @@ -1344,7 +1307,7 @@ save_configuration (ModestDefaultAccountSettingsDialog *dialog) /* Save connection-specific SMTP server accounts: */ modest_account_settings_set_use_connection_specific_smtp (priv->settings, - gtk_toggle_button_get_active(GTK_TOGGLE_BUTTON(priv->checkbox_outgoing_smtp_specific))); + hildon_check_button_get_active(GTK_BUTTON(priv->checkbox_outgoing_smtp_specific))); /* this configuration is not persistent, we should not save */ if (account_name != NULL) diff --git a/src/hildon2/modest-easysetup-wizard-dialog.c b/src/hildon2/modest-easysetup-wizard-dialog.c index 98961c3..6c6ab47 100644 --- a/src/hildon2/modest-easysetup-wizard-dialog.c +++ b/src/hildon2/modest-easysetup-wizard-dialog.c @@ -258,27 +258,14 @@ on_picker_button_value_changed (HildonPickerButton *widget, gpointer user_data) * When the widget is edited, the enable_buttons() vfunc will be called. */ static GtkWidget* -create_caption_new_with_asterisk (ModestEasysetupWizardDialog *self, - GtkSizeGroup *group, - const gchar *value, - GtkWidget *control, - GtkWidget *icon, - HildonCaptionStatus flag) +create_captioned (ModestEasysetupWizardDialog *self, + GtkSizeGroup *group, + const gchar *value, + GtkWidget *control) { - GtkWidget *caption = NULL; - - /* Note: Previously, the translated strings already contained the "*", - * Comment out this code if they do again. - */ - /* Add a * character to indicate mandatory fields, - * as specified in our "Email UI Specification": */ - if (flag == HILDON_CAPTION_MANDATORY) { - gchar* title = g_strdup_printf("%s*", value); - caption = hildon_caption_new (group, title, control, icon, flag); - g_free(title); - } - else - caption = hildon_caption_new (group, value, control, icon, flag); + + GtkWidget *result; + result = modest_maemo_utils_create_captioned (group, value, control); /* Connect to the appropriate changed signal for the widget, * so we can ask for the prev/next buttons to be enabled/disabled appropriately: @@ -293,7 +280,7 @@ create_caption_new_with_asterisk (ModestEasysetupWizardDialog *self, G_CALLBACK (on_caption_combobox_changed), self); } - return caption; + return result; } static GtkWidget* @@ -382,7 +369,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self) GtkSizeGroup* sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The country widgets: */ - priv->account_country_picker = GTK_WIDGET (modest_country_picker_new ()); + priv->account_country_picker = GTK_WIDGET (modest_country_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); hildon_button_set_title (HILDON_BUTTON (priv->account_country_picker), _("mcen_fi_country")); g_signal_connect (G_OBJECT (priv->account_country_picker), "value-changed", G_CALLBACK (on_picker_button_value_changed), self); @@ -394,7 +382,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self) gtk_widget_show (separator); /* The service provider widgets: */ - priv->account_serviceprovider_picker = GTK_WIDGET (modest_provider_picker_new ()); + priv->account_serviceprovider_picker = GTK_WIDGET (modest_provider_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); hildon_button_set_title (HILDON_BUTTON (priv->account_serviceprovider_picker), _("mcen_fi_serviceprovider")); g_signal_connect (G_OBJECT (priv->account_serviceprovider_picker), "value-changed", G_CALLBACK (on_picker_button_value_changed), self); @@ -421,8 +410,8 @@ create_page_account_details (ModestEasysetupWizardDialog *self) g_free (default_account_name); default_account_name = NULL; - caption = create_caption_new_with_asterisk (self, sizegroup, _("mcen_fi_account_title"), - priv->entry_account_title, NULL, HILDON_CAPTION_MANDATORY); + caption = create_captioned (self, sizegroup, _("mcen_fi_account_title"), + priv->entry_account_title); gtk_widget_show (priv->entry_account_title); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -484,8 +473,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) gtk_entry_set_max_length (GTK_ENTRY (priv->entry_user_name), 64); modest_validating_entry_set_max_func (MODEST_VALIDATING_ENTRY (priv->entry_user_name), on_entry_max, self); - GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_name"), priv->entry_user_name, NULL, HILDON_CAPTION_OPTIONAL); + GtkWidget *caption = create_captioned (self, sizegroup, + _("mcen_li_emailsetup_name"), priv->entry_user_name); g_signal_connect(G_OBJECT(priv->entry_user_name), "changed", G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (priv->entry_user_name); @@ -508,9 +497,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_username), HILDON_GTK_INPUT_MODE_FULL); - caption = create_caption_new_with_asterisk (self, sizegroup, _("mail_fi_username"), - priv->entry_user_username, - NULL, HILDON_CAPTION_MANDATORY); + caption = create_captioned (self, sizegroup, _("mail_fi_username"), + priv->entry_user_username); gtk_widget_show (priv->entry_user_username); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); g_signal_connect(G_OBJECT(priv->entry_user_username), "changed", @@ -537,8 +525,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_INVISIBLE); gtk_entry_set_visibility (GTK_ENTRY (priv->entry_user_password), FALSE); /* gtk_entry_set_invisible_char (GTK_ENTRY (priv->entry_user_password), '*'); */ - caption = create_caption_new_with_asterisk (self, sizegroup, - _("mail_fi_password"), priv->entry_user_password, NULL, HILDON_CAPTION_OPTIONAL); + caption = create_captioned (self, sizegroup, + _("mail_fi_password"), priv->entry_user_password); g_signal_connect(G_OBJECT(priv->entry_user_password), "changed", G_CALLBACK(on_easysetup_changed), self); gtk_widget_show (priv->entry_user_password); @@ -549,8 +537,8 @@ create_page_user_details (ModestEasysetupWizardDialog *self) priv->entry_user_email = GTK_WIDGET (modest_validating_entry_new ()); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_user_email), HILDON_GTK_INPUT_MODE_FULL); - caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_email_address"), priv->entry_user_email, NULL, HILDON_CAPTION_MANDATORY); + caption = create_captioned (self, sizegroup, + _("mcen_li_emailsetup_email_address"), priv->entry_user_email); gtk_entry_set_text (GTK_ENTRY (priv->entry_user_email), MODEST_EXAMPLE_EMAIL_ADDRESS); /* Default text. */ gtk_widget_show (priv->entry_user_email); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -712,7 +700,9 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) sizegroup = gtk_size_group_new(GTK_SIZE_GROUP_HORIZONTAL); /* The incoming server widgets: */ - priv->incoming_servertype_picker = GTK_WIDGET (modest_servertype_picker_new (TRUE)); + priv->incoming_servertype_picker = GTK_WIDGET (modest_servertype_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT, + TRUE)); hildon_button_set_title (HILDON_BUTTON (priv->incoming_servertype_picker), _("mcen_li_emailsetup_type")); g_signal_connect (G_OBJECT (priv->incoming_servertype_picker), "value-changed", G_CALLBACK (on_picker_button_value_changed), self); @@ -728,10 +718,9 @@ create_page_custom_incoming (ModestEasysetupWizardDialog *self) /* The caption title will be updated in update_incoming_server_title(). * so this default text will never be seen: */ /* (Note: Changing the title seems pointless. murrayc) */ - priv->caption_incoming = create_caption_new_with_asterisk (self, sizegroup, - "Incoming Server", - priv->entry_incomingserver, - NULL, HILDON_CAPTION_MANDATORY); + priv->caption_incoming = create_captioned (self, sizegroup, + "Incoming Server", + priv->entry_incomingserver); update_incoming_server_title (self); gtk_widget_show (priv->entry_incomingserver); gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -837,8 +826,8 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) G_CALLBACK (on_easysetup_changed), self); /* Auto-capitalization is the default, so let's turn it off: */ hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->entry_outgoingserver), HILDON_GTK_INPUT_MODE_FULL); - GtkWidget *caption = create_caption_new_with_asterisk (self, sizegroup, - _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver, NULL, HILDON_CAPTION_OPTIONAL); + GtkWidget *caption = create_captioned (self, sizegroup, + _("mcen_li_emailsetup_smtp"), priv->entry_outgoingserver); gtk_widget_show (priv->entry_outgoingserver); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); @@ -864,16 +853,16 @@ create_page_custom_outgoing (ModestEasysetupWizardDialog *self) g_signal_connect (G_OBJECT (priv->checkbox_outgoing_smtp_specific), "toggled", G_CALLBACK (on_easysetup_changed), self); - caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_connection_smtp"), - priv->checkbox_outgoing_smtp_specific, NULL, HILDON_CAPTION_OPTIONAL); + caption = modest_maemo_utils_create_captioned (sizegroup, _("mcen_fi_advsetup_connection_smtp"), + priv->checkbox_outgoing_smtp_specific); gtk_widget_show (priv->checkbox_outgoing_smtp_specific); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); gtk_widget_show (caption); /* Connection-specific SMTP-Severs Edit button: */ priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_edit")); - caption = hildon_caption_new (sizegroup, _("mcen_fi_advsetup_optional_smtp"), - priv->button_outgoing_smtp_servers, NULL, HILDON_CAPTION_OPTIONAL); + caption = modest_maemo_utils_create_captioned (sizegroup, _("mcen_fi_advsetup_optional_smtp"), + priv->button_outgoing_smtp_servers); hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); gtk_widget_show (priv->button_outgoing_smtp_servers); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); @@ -946,8 +935,8 @@ create_page_complete_custom (ModestEasysetupWizardDialog *self) gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); gtk_widget_show (label); - GtkWidget *caption = hildon_caption_new (NULL, _("mcen_fi_advanced_settings"), - button_edit, NULL, HILDON_CAPTION_OPTIONAL); + GtkWidget *caption = modest_maemo_utils_create_captioned (NULL, _("mcen_fi_advanced_settings"), + button_edit); hildon_caption_set_child_expand (HILDON_CAPTION (caption), FALSE); gtk_widget_show (button_edit); gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF); diff --git a/src/hildon2/modest-hildon-includes.h b/src/hildon2/modest-hildon-includes.h index 6dd1306..0609d4d 100644 --- a/src/hildon2/modest-hildon-includes.h +++ b/src/hildon2/modest-hildon-includes.h @@ -58,22 +58,6 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, #include #endif /*MODEST_HILDON_NOTIFY*/ -#if MODEST_HILDON_API == 0 -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include -#include - -#else - -#if MODEST_HILDON_API >= 1 #include #include #include @@ -87,9 +71,10 @@ k * OR CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, #include #include #include - -#endif /*__MODEST_HAVE_HILDON1_WIDGETS*/ -#endif /*__MODEST_HAVE_HILDON0_WIDGETS_*/ +#include +#include +#include +#include /* backward compatibility... */ diff --git a/src/hildon2/modest-limit-retrieve-picker.c b/src/hildon2/modest-limit-retrieve-picker.c index 8c1f5a8..9634370 100644 --- a/src/hildon2/modest-limit-retrieve-picker.c +++ b/src/hildon2/modest-limit-retrieve-picker.c @@ -104,7 +104,8 @@ modest_limit_retrieve_picker_init (ModestLimitRetrievePicker *self) } ModestLimitRetrievePicker* -modest_limit_retrieve_picker_new (void) +modest_limit_retrieve_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { ModestLimitRetrievePicker *self; ModestLimitRetrievePickerPrivate *priv; @@ -112,8 +113,8 @@ modest_limit_retrieve_picker_new (void) GtkWidget *selector; self = g_object_new (MODEST_TYPE_LIMIT_RETRIEVE_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_LIMIT_RETRIEVE_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-limit-retrieve-picker.h b/src/hildon2/modest-limit-retrieve-picker.h index f71bb09..b06c37e 100644 --- a/src/hildon2/modest-limit-retrieve-picker.h +++ b/src/hildon2/modest-limit-retrieve-picker.h @@ -66,7 +66,8 @@ typedef struct { GType modest_limit_retrieve_picker_get_type (void); -ModestLimitRetrievePicker* modest_limit_retrieve_picker_new (void); +ModestLimitRetrievePicker* modest_limit_retrieve_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); gint modest_limit_retrieve_picker_get_active_limit_retrieve (ModestLimitRetrievePicker *picker); diff --git a/src/hildon2/modest-maemo-global-settings-dialog.c b/src/hildon2/modest-maemo-global-settings-dialog.c index 4ed2a82..f445457 100644 --- a/src/hildon2/modest-maemo-global-settings-dialog.c +++ b/src/hildon2/modest-maemo-global-settings-dialog.c @@ -153,8 +153,7 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self) gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->updating_page); gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF); - - /* gtk_window_set_default_size (GTK_WINDOW (self), 700, 300); */ + gtk_window_set_default_size (GTK_WINDOW (self), -1, 340); /* Load current config */ _modest_global_settings_dialog_load_conf (MODEST_GLOBAL_SETTINGS_DIALOG (self)); @@ -192,6 +191,7 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) GtkWidget *vbox, *vbox_update, *vbox_limit, *label, *hbox; GtkSizeGroup *size_group; ModestGlobalSettingsDialogPrivate *ppriv; + GtkWidget *pannable; ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (self); vbox = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT); @@ -200,7 +200,7 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); /* Auto update */ - ppriv->auto_update = hildon_check_button_new (HILDON_SIZE_AUTO); + ppriv->auto_update = hildon_check_button_new (MODEST_EDITABLE_SIZE); gtk_button_set_label (GTK_BUTTON (ppriv->auto_update), _("mcen_fi_options_autoupdate")); gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->auto_update, FALSE, FALSE, MODEST_MARGIN_HALF); g_signal_connect (ppriv->auto_update, "clicked", G_CALLBACK (on_auto_update_clicked), self); @@ -211,8 +211,11 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) * that uses it, because the ModestSelectorPicker uses the ID opaquely, * 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_selector_picker_new (ppriv->connect_via_list, g_int_equal); - hildon_button_set_title (HILDON_BUTTON (ppriv->connect_via), _("mcen_fi_options_connectiontype")); + ppriv->connect_via = modest_selector_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT, + ppriv->connect_via_list, g_int_equal); + modest_maemo_utils_create_picker_layout (size_group, _("mcen_fi_options_connectiontype"), + ppriv->connect_via); gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->connect_via, FALSE, FALSE, MODEST_MARGIN_HALF); /* Update interval */ @@ -221,8 +224,11 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) * that uses it, because the ModestSelectorPicker uses the ID opaquely, * 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_selector_picker_new (ppriv->update_interval_list, g_int_equal); - hildon_button_set_title (HILDON_BUTTON (ppriv->update_interval), _("mcen_fi_options_updateinterval")); + ppriv->update_interval = modest_selector_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT, + ppriv->update_interval_list, g_int_equal); + modest_maemo_utils_create_picker_layout (size_group, _("mcen_fi_options_updateinterval"), + ppriv->update_interval); gtk_box_pack_start (GTK_BOX (vbox_update), ppriv->update_interval, FALSE, FALSE, MODEST_MARGIN_HALF); /* Add to vbox */ @@ -255,12 +261,21 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self) * that uses it, because the ModestSelectorPicker uses the ID opaquely, * 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_selector_picker_new (ppriv->msg_format_list, g_int_equal); - hildon_button_set_title (HILDON_BUTTON (ppriv->msg_format), _("mcen_fi_options_messageformat")); + ppriv->msg_format = modest_selector_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT, + ppriv->msg_format_list, g_int_equal); + modest_maemo_utils_create_picker_layout (size_group, _("mcen_fi_options_messageformat"), + ppriv->msg_format); gtk_box_pack_start (GTK_BOX (vbox), ppriv->msg_format, FALSE, FALSE, MODEST_MARGIN_HALF); - return vbox; + pannable = hildon_pannable_area_new (); + + hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), vbox); + gtk_widget_show (vbox); + gtk_widget_show (pannable); + + return pannable; } diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c index 72c8f2f..cebf7cc 100644 --- a/src/hildon2/modest-maemo-security-options-view.c +++ b/src/hildon2/modest-maemo-security-options-view.c @@ -37,8 +37,9 @@ #include "widgets/modest-validating-entry.h" #include "modest-serversecurity-picker.h" #include "modest-secureauth-picker.h" -#include +#include "modest-maemo-utils.h" #include +#include #define PORT_MIN 1 #define PORT_MAX 65535 @@ -75,8 +76,8 @@ on_security_changed (GtkWidget *widget, if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) { /* Activate and dim checkbutton if it's secure */ - gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (ppriv->auth_view), - is_secure); + hildon_check_button_set_active (GTK_BUTTON (ppriv->auth_view), + is_secure); gtk_widget_set_sensitive (ppriv->auth_view, !is_secure); } else { @@ -134,20 +135,22 @@ create_incoming_security (ModestSecurityOptionsView* self, ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self); /* Create widgets for incoming security */ - ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new ()); - hildon_button_set_title (HILDON_BUTTON (ppriv->security_view), _("mcen_li_emailsetup_secure_connection")); + ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); + modest_maemo_utils_create_picker_layout (size_group, + _("mcen_li_emailsetup_secure_connection"), + ppriv->security_view); if (ppriv->full) { ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX)); - entry_caption = hildon_caption_new (size_group, _("mcen_fi_emailsetup_port"), - ppriv->port_view, NULL, - HILDON_CAPTION_OPTIONAL); + entry_caption = modest_maemo_utils_create_captioned (size_group, _("mcen_fi_emailsetup_port"), + ppriv->port_view); } - ppriv->auth_view = gtk_check_button_new (); - check_caption = - hildon_caption_new (size_group, _("mcen_li_emailsetup_secure_authentication"), - ppriv->auth_view, NULL, HILDON_CAPTION_OPTIONAL); + ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE); + check_caption = modest_maemo_utils_create_captioned (size_group, + _("mcen_li_emailsetup_secure_authentication"), + ppriv->auth_view); /* Track changes in UI */ g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed", @@ -229,14 +232,18 @@ create_outgoing_security (ModestSecurityOptionsView* self, ppriv = MODEST_SECURITY_OPTIONS_VIEW_GET_PRIVATE (self); /* The secure connection widgets */ - ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new ()); + ppriv->security_view = GTK_WIDGET (modest_serversecurity_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); modest_serversecurity_picker_fill (MODEST_SERVERSECURITY_PICKER (ppriv->security_view), MODEST_PROTOCOLS_TRANSPORT_SMTP); - hildon_button_set_title (HILDON_BUTTON (ppriv->security_view), _("mcen_li_emailsetup_secure_connection")); + modest_maemo_utils_create_picker_layout (size_group, _("mcen_li_emailsetup_secure_connection"), + ppriv->security_view); /* The secure authentication widgets */ - ppriv->auth_view = GTK_WIDGET (modest_secureauth_picker_new ()); - hildon_button_set_title (HILDON_BUTTON (ppriv->auth_view), _("mcen_li_emailsetup_secure_authentication")); + ppriv->auth_view = GTK_WIDGET (modest_secureauth_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT)); + modest_maemo_utils_create_picker_layout (size_group, _("mcen_li_emailsetup_secure_authentication"), + ppriv->auth_view); if (ppriv->full) { gchar *user_label; @@ -249,9 +256,8 @@ create_outgoing_security (ModestSecurityOptionsView* self, HILDON_GTK_INPUT_MODE_FULL); user_label = g_strdup_printf("%s*", _("mail_fi_username")); - user_caption = hildon_caption_new (size_group, user_label, - ppriv->user_entry, NULL, - HILDON_CAPTION_MANDATORY); + user_caption = modest_maemo_utils_create_captioned (size_group, user_label, + ppriv->user_entry); g_free (user_label); /* Prevent the use of some characters. Limit the max @@ -271,14 +277,12 @@ create_outgoing_security (ModestSecurityOptionsView* self, HILDON_GTK_INPUT_MODE_INVISIBLE); gtk_entry_set_visibility (GTK_ENTRY (ppriv->pwd_entry), FALSE); - pwd_caption = hildon_caption_new (size_group, _("mail_fi_password"), - ppriv->pwd_entry, NULL, - HILDON_CAPTION_OPTIONAL); + pwd_caption = modest_maemo_utils_create_captioned (size_group, _("mail_fi_password"), + ppriv->pwd_entry); ppriv->port_view = GTK_WIDGET (hildon_number_editor_new (PORT_MIN, PORT_MAX)); - port_caption = hildon_caption_new (size_group, _("mcen_fi_emailsetup_port"), - ppriv->port_view, NULL, - HILDON_CAPTION_OPTIONAL); + port_caption = modest_maemo_utils_create_captioned (size_group, _("mcen_fi_emailsetup_port"), + ppriv->port_view); } /* Track changes in UI */ diff --git a/src/hildon2/modest-maemo-utils.c b/src/hildon2/modest-maemo-utils.c index d1a10c7..12a1817 100644 --- a/src/hildon2/modest-maemo-utils.c +++ b/src/hildon2/modest-maemo-utils.c @@ -51,6 +51,7 @@ #include "modest-maemo-utils.h" #include "modest-text-utils.h" #include "modest-platform.h" +#include "modest-ui-constants.h" /* * For getting and tracking the Bluetooth name @@ -288,3 +289,55 @@ modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager, return new_menu; } + +GtkWidget * +modest_maemo_utils_create_captioned (GtkSizeGroup *group, + const gchar *label_text, + GtkWidget *control) +{ + GtkWidget *label; + GtkWidget *box; + + label = gtk_label_new (label_text); + gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); + gtk_widget_show (label); + box = gtk_hbox_new (FALSE, MODEST_MARGIN_NONE); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), control, TRUE, TRUE, MODEST_MARGIN_HALF); + if (group) + gtk_size_group_add_widget (group, label); + + hildon_gtk_widget_set_theme_size (control, HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH); + + return box; +} + +void +modest_maemo_utils_create_picker_layout (GtkSizeGroup *sizegroup, + const gchar *label, + GtkWidget *picker) +{ + hildon_button_set_title (HILDON_BUTTON (picker), label); + if (sizegroup) + hildon_button_add_title_size_group (HILDON_BUTTON (picker), sizegroup); + hildon_button_set_alignment (HILDON_BUTTON (picker), 0.0, 0.5, 1.0, 0.0); + hildon_button_set_title_alignment (HILDON_BUTTON (picker), 0.0, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (picker), 0.0, 0.5); +} + +GtkWidget * +modest_maemo_utils_create_group_box (const gchar *label_text, GtkWidget *contents) +{ + GtkWidget *label; + GtkWidget *box; + + label = gtk_label_new (label_text); + gtk_widget_show (label); + + box = gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); + gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX (box), contents, TRUE, TRUE, 0); + gtk_widget_show (box); + + return box; +} diff --git a/src/hildon2/modest-maemo-utils.h b/src/hildon2/modest-maemo-utils.h index c9b889b..cb5a71f 100644 --- a/src/hildon2/modest-maemo-utils.h +++ b/src/hildon2/modest-maemo-utils.h @@ -123,4 +123,15 @@ void modest_maemo_utils_set_osso_context (osso_context_t *osso_context); */ GtkWidget *modest_maemo_utils_get_manager_menubar_as_menu (GtkUIManager *manager, const gchar *item_name); +GtkWidget *modest_maemo_utils_create_captioned (GtkSizeGroup *group, + const gchar *label_text, + GtkWidget *control); + +void +modest_maemo_utils_create_picker_layout (GtkSizeGroup *sizegroup, + const gchar *label, + GtkWidget *picker); + +GtkWidget *modest_maemo_utils_create_group_box (const gchar *label, GtkWidget *contents); + #endif /*__MODEST_MAEMO_UTILS_H__*/ diff --git a/src/hildon2/modest-msg-edit-window.c b/src/hildon2/modest-msg-edit-window.c index 8d48ce8..df85374 100644 --- a/src/hildon2/modest-msg-edit-window.c +++ b/src/hildon2/modest-msg-edit-window.c @@ -78,6 +78,7 @@ #endif #include #include "modest-maemo-utils.h" +#include #define DEFAULT_FONT_SIZE 3 @@ -737,6 +738,7 @@ init_window (ModestMsgEditWindow *obj) #if (GTK_MINOR_VERSION >= 10) GdkAtom deserialize_type; #endif + priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj); parent_priv = MODEST_WINDOW_GET_PRIVATE (obj); @@ -793,7 +795,12 @@ init_window (ModestMsgEditWindow *obj) /* Note: This ModestPairList* must exist for as long as the picker * that uses it, because the ModestSelectorPicker uses the ID opaquely, * so it can't know how to manage its memory. */ - priv->from_field = modest_selector_picker_new (NULL, g_str_equal); + priv->from_field = modest_selector_picker_new (MODEST_EDITABLE_SIZE, + MODEST_EDITABLE_ARRANGEMENT, + NULL, g_str_equal); + hildon_button_set_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5, 1.0, 0.0); + hildon_button_set_title_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5); + hildon_button_set_value_alignment (HILDON_BUTTON (priv->from_field), 0.0, 0.5); priv->to_field = modest_recpt_editor_new (); priv->cc_field = modest_recpt_editor_new (); @@ -801,7 +808,8 @@ init_window (ModestMsgEditWindow *obj) subject_box = gtk_hbox_new (FALSE, 0); priv->priority_icon = gtk_image_new (); gtk_box_pack_start (GTK_BOX (subject_box), priv->priority_icon, FALSE, FALSE, 0); - priv->subject_field = gtk_entry_new_with_max_length (SUBJECT_MAX_LENGTH); + priv->subject_field = hildon_entry_new (MODEST_EDITABLE_SIZE); + gtk_entry_set_max_length (GTK_ENTRY (priv->subject_field) ,SUBJECT_MAX_LENGTH); g_object_set (G_OBJECT (priv->subject_field), "truncate-multiline", TRUE, NULL); hildon_gtk_entry_set_input_mode (GTK_ENTRY (priv->subject_field), HILDON_GTK_INPUT_MODE_FULL | HILDON_GTK_INPUT_MODE_AUTOCAP); @@ -810,7 +818,7 @@ init_window (ModestMsgEditWindow *obj) GTK_WIDGET_UNSET_FLAGS (GTK_WIDGET (priv->add_attachment_button), GTK_CAN_FOCUS); gtk_button_set_relief (GTK_BUTTON (priv->add_attachment_button), GTK_RELIEF_NONE); gtk_button_set_focus_on_click (GTK_BUTTON (priv->add_attachment_button), FALSE); - gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 1.0); + gtk_button_set_alignment (GTK_BUTTON (priv->add_attachment_button), 1.0, 0.5); attachment_icon = gtk_image_new_from_icon_name (MODEST_HEADER_ICON_ATTACH, GTK_ICON_SIZE_BUTTON); gtk_container_add (GTK_CONTAINER (priv->add_attachment_button), attachment_icon); gtk_box_pack_start (GTK_BOX (subject_box), priv->add_attachment_button, FALSE, FALSE, 0); @@ -818,14 +826,16 @@ init_window (ModestMsgEditWindow *obj) priv->header_box = gtk_vbox_new (FALSE, 0); - to_caption = hildon_caption_new (size_group, _("mail_va_to"), priv->to_field, NULL, 0); - priv->cc_caption = hildon_caption_new (size_group, _("mail_va_cc"), priv->cc_field, NULL, 0); - priv->bcc_caption = hildon_caption_new (size_group, _("mail_va_hotfix1"), priv->bcc_field, NULL, 0); - subject_caption = hildon_caption_new (size_group, _("mail_va_subject"), subject_box, NULL, 0); - priv->attachments_caption = hildon_caption_new (size_group, _("mail_va_attachment"), priv->attachments_view, NULL, 0); + hildon_button_add_title_size_group (HILDON_BUTTON (priv->from_field), size_group); + to_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_to"), priv->to_field); + priv->cc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_cc"), priv->cc_field); + priv->bcc_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_hotfix1"), priv->bcc_field); + subject_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_subject"), subject_box); + priv->attachments_caption = modest_maemo_utils_create_captioned (size_group, _("mail_va_attachment"), priv->attachments_view); g_object_unref (size_group); size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL); + hildon_button_add_value_size_group (HILDON_BUTTON (priv->from_field), size_group); modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->to_field), size_group); modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->cc_field), size_group); modest_recpt_editor_set_field_size_group (MODEST_RECPT_EDITOR (priv->bcc_field), size_group); diff --git a/src/hildon2/modest-provider-picker.c b/src/hildon2/modest-provider-picker.c index a8daf4c..4fb130c 100644 --- a/src/hildon2/modest-provider-picker.c +++ b/src/hildon2/modest-provider-picker.c @@ -136,7 +136,8 @@ modest_provider_picker_init (ModestProviderPicker *self) } ModestProviderPicker* -modest_provider_picker_new (void) +modest_provider_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { ModestProviderPickerPrivate *priv; ModestProviderPicker *self; @@ -144,8 +145,8 @@ modest_provider_picker_new (void) GtkWidget *selector; self = g_object_new (MODEST_TYPE_PROVIDER_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-provider-picker.h b/src/hildon2/modest-provider-picker.h index e9709fb..17082c6 100644 --- a/src/hildon2/modest-provider-picker.h +++ b/src/hildon2/modest-provider-picker.h @@ -82,7 +82,8 @@ typedef struct { GType modest_provider_picker_get_type (void); -ModestProviderPicker* modest_provider_picker_new (void); +ModestProviderPicker* modest_provider_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); void modest_provider_picker_fill (ModestProviderPicker *combobox, ModestPresets *presets, gint mcc); diff --git a/src/hildon2/modest-retrieve-picker.c b/src/hildon2/modest-retrieve-picker.c index 82b34cb..cbe34f7 100644 --- a/src/hildon2/modest-retrieve-picker.c +++ b/src/hildon2/modest-retrieve-picker.c @@ -108,7 +108,8 @@ modest_retrieve_picker_init (ModestRetrievePicker *self) ModestRetrievePicker* -modest_retrieve_picker_new (void) +modest_retrieve_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { ModestRetrievePicker *self; ModestRetrievePickerPrivate *priv; @@ -116,8 +117,8 @@ modest_retrieve_picker_new (void) GtkWidget *selector; self = g_object_new (MODEST_TYPE_RETRIEVE_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_RETRIEVE_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-retrieve-picker.h b/src/hildon2/modest-retrieve-picker.h index 59f4656..f1d4239 100644 --- a/src/hildon2/modest-retrieve-picker.h +++ b/src/hildon2/modest-retrieve-picker.h @@ -68,7 +68,8 @@ typedef struct { GType modest_retrieve_picker_get_type (void); -ModestRetrievePicker* modest_retrieve_picker_new (void); +ModestRetrievePicker* modest_retrieve_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); void modest_retrieve_picker_fill (ModestRetrievePicker *picker, ModestProtocolType protocol); diff --git a/src/hildon2/modest-secureauth-picker.c b/src/hildon2/modest-secureauth-picker.c index 103226b..7b15cdb 100644 --- a/src/hildon2/modest-secureauth-picker.c +++ b/src/hildon2/modest-secureauth-picker.c @@ -105,7 +105,8 @@ modest_secureauth_picker_init (ModestSecureauthPicker *self) } ModestSecureauthPicker* -modest_secureauth_picker_new (void) +modest_secureauth_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { ModestSecureauthPicker *self; ModestSecureauthPickerPrivate *priv; @@ -113,8 +114,8 @@ modest_secureauth_picker_new (void) GtkWidget *selector; self = g_object_new (MODEST_TYPE_SECUREAUTH_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_SECUREAUTH_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-secureauth-picker.h b/src/hildon2/modest-secureauth-picker.h index 952ba9b..962fab6 100644 --- a/src/hildon2/modest-secureauth-picker.h +++ b/src/hildon2/modest-secureauth-picker.h @@ -67,7 +67,8 @@ typedef struct { GType modest_secureauth_picker_get_type (void); -ModestSecureauthPicker* modest_secureauth_picker_new (void); +ModestSecureauthPicker* modest_secureauth_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); ModestProtocolType modest_secureauth_picker_get_active_secureauth (ModestSecureauthPicker *picker); diff --git a/src/hildon2/modest-selector-picker.c b/src/hildon2/modest-selector-picker.c index 7011653..e808c02 100644 --- a/src/hildon2/modest-selector-picker.c +++ b/src/hildon2/modest-selector-picker.c @@ -180,7 +180,9 @@ modest_selector_picker_set_pair_list (ModestSelectorPicker *self, ModestPairList GtkWidget* -modest_selector_picker_new (ModestPairList *pairs, GEqualFunc id_equal_func) +modest_selector_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement, + ModestPairList *pairs, GEqualFunc id_equal_func) { GtkTreeModel *model; GObject *obj; @@ -188,8 +190,8 @@ modest_selector_picker_new (ModestPairList *pairs, GEqualFunc id_equal_func) GtkTreeIter iter; obj = G_OBJECT(g_object_new(MODEST_TYPE_SELECTOR_PICKER, - "size", HILDON_SIZE_AUTO, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, + "size", size, + "arrangement", arrangement, NULL)); priv = MODEST_SELECTOR_PICKER_GET_PRIVATE(obj); diff --git a/src/hildon2/modest-selector-picker.h b/src/hildon2/modest-selector-picker.h index a353504..9decb23 100644 --- a/src/hildon2/modest-selector-picker.h +++ b/src/hildon2/modest-selector-picker.h @@ -77,7 +77,9 @@ GType modest_selector_picker_get_type (void) G_GNUC_CONST; * * Returns: a new ModestSelectorPicker instance, or NULL in case of failure */ -GtkWidget* modest_selector_picker_new (ModestPairList* pairs, +GtkWidget* modest_selector_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement, + ModestPairList* pairs, GEqualFunc id_equal_func); /** diff --git a/src/hildon2/modest-serversecurity-picker.c b/src/hildon2/modest-serversecurity-picker.c index 267f6e1..9fbe520 100644 --- a/src/hildon2/modest-serversecurity-picker.c +++ b/src/hildon2/modest-serversecurity-picker.c @@ -107,7 +107,8 @@ touch_selector_print_func (HildonTouchSelector *selector) } ModestServersecurityPicker* -modest_serversecurity_picker_new (void) +modest_serversecurity_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement) { ModestServersecurityPicker *self; ModestServersecurityPickerPrivate *priv; @@ -115,8 +116,8 @@ modest_serversecurity_picker_new (void) GtkWidget *selector; self = g_object_new (MODEST_TYPE_SERVERSECURITY_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_SERVERSECURITY_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-serversecurity-picker.h b/src/hildon2/modest-serversecurity-picker.h index 9f9499e..4a77bf9 100644 --- a/src/hildon2/modest-serversecurity-picker.h +++ b/src/hildon2/modest-serversecurity-picker.h @@ -67,7 +67,8 @@ typedef struct { GType modest_serversecurity_picker_get_type (void); -ModestServersecurityPicker* modest_serversecurity_picker_new (void); +ModestServersecurityPicker* modest_serversecurity_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement); void modest_serversecurity_picker_fill (ModestServersecurityPicker *picker, ModestProtocolType protocol); diff --git a/src/hildon2/modest-servertype-picker.c b/src/hildon2/modest-servertype-picker.c index b7dd05b..ceb522e 100644 --- a/src/hildon2/modest-servertype-picker.c +++ b/src/hildon2/modest-servertype-picker.c @@ -159,7 +159,9 @@ modest_servertype_picker_fill (ModestServertypePicker *self, } ModestServertypePicker* -modest_servertype_picker_new (gboolean filter_providers) +modest_servertype_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement, + gboolean filter_providers) { ModestServertypePicker *self; ModestServertypePickerPrivate *priv; @@ -167,8 +169,8 @@ modest_servertype_picker_new (gboolean filter_providers) GtkWidget *selector; self = g_object_new (MODEST_TYPE_SERVERTYPE_PICKER, - "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL, - "size", HILDON_SIZE_AUTO, + "arrangement", arrangement, + "size", size, NULL); priv = MODEST_SERVERTYPE_PICKER_GET_PRIVATE (self); diff --git a/src/hildon2/modest-servertype-picker.h b/src/hildon2/modest-servertype-picker.h index b8ea73a..89ff747 100644 --- a/src/hildon2/modest-servertype-picker.h +++ b/src/hildon2/modest-servertype-picker.h @@ -67,7 +67,9 @@ typedef struct { GType modest_servertype_picker_get_type (void); -ModestServertypePicker* modest_servertype_picker_new (gboolean filter_providers); +ModestServertypePicker* modest_servertype_picker_new (HildonSizeType size, + HildonButtonArrangement arrangement, + gboolean filter_providers); ModestProtocolType modest_servertype_picker_get_active_servertype (ModestServertypePicker *picker); diff --git a/src/widgets/modest-progress-bar.c b/src/widgets/modest-progress-bar.c index 289882b..a871ab9 100644 --- a/src/widgets/modest-progress-bar.c +++ b/src/widgets/modest-progress-bar.c @@ -30,7 +30,6 @@ #include #include #include -#include #include "widgets/modest-progress-bar.h" #include "modest-tny-account.h" #include "modest-platform.h" diff --git a/src/widgets/modest-security-options-view.c b/src/widgets/modest-security-options-view.c index db7e100..94eca02 100644 --- a/src/widgets/modest-security-options-view.c +++ b/src/widgets/modest-security-options-view.c @@ -37,6 +37,7 @@ #ifdef MODEST_TOOLKIT_HILDON2 #include "modest-serversecurity-picker.h" #include "modest-secureauth-picker.h" +#include #else #include "widgets/modest-serversecurity-combo-box.h" #include "widgets/modest-secureauth-combo-box.h" @@ -104,8 +105,13 @@ modest_security_options_view_load_settings (ModestSecurityOptionsView* self, /* Active the authentication checkbox */ if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (), secure_auth)) +#ifdef MODEST_TOOLKIT_HILDON2 + hildon_check_button_set_active (GTK_BUTTON (priv->auth_view), + TRUE); +#else gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->auth_view), TRUE); +#endif } else { #ifdef MODEST_TOOLKIT_HILDON2 modest_secureauth_picker_set_active_secureauth ( @@ -151,7 +157,11 @@ modest_security_options_view_save_settings (ModestSecurityOptionsView* self, #endif if (self->type == MODEST_SECURITY_OPTIONS_INCOMING) { +#ifdef MODEST_TOOLKIT_HILDON2 + if (hildon_check_button_get_active (GTK_BUTTON (priv->auth_view))) { +#else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view))) { +#endif if (!modest_protocol_registry_protocol_type_is_secure (proto_registry, security_proto)) { /* TODO */ @@ -241,7 +251,11 @@ get_current_state (ModestSecurityOptionsView* self, if (priv->full) { } } else { +#ifdef MODEST_TOOLKIT_HILDON2 + if (hildon_check_button_get_active (GTK_BUTTON (priv->auth_view))) +#else if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view))) +#endif state->auth = priv->initial_state.auth; else state->auth = MODEST_PROTOCOLS_AUTH_NONE; @@ -316,8 +330,13 @@ modest_security_options_view_auth_check (ModestSecurityOptionsView* self) modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view)); #endif +#ifdef MODEST_TOOLKIT_HILDON2 + auth_active = + hildon_check_button_get_active (GTK_BUTTON (priv->auth_view)); +#else auth_active = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view)); +#endif is_secure = modest_protocol_registry_protocol_type_has_tag (protocol_registry, security_incoming_type, diff --git a/src/widgets/modest-ui-constants.h b/src/widgets/modest-ui-constants.h index a16ed12..fc92a8f 100644 --- a/src/widgets/modest-ui-constants.h +++ b/src/widgets/modest-ui-constants.h @@ -45,6 +45,10 @@ #define MODEST_DIALOG_WINDOW_MIN_HEIGHT 172 #define MODEST_DIALOG_WINDOW_MAX_WIDTH 642 #define MODEST_DIALOG_WINDOW_MIN_WIDTH 172 +#ifdef MODEST_TOOLKIT_HILDON2 +#define MODEST_EDITABLE_SIZE (HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH) +#define MODEST_EDITABLE_ARRANGEMENT (HILDON_BUTTON_ARRANGEMENT_HORIZONTAL) +#endif #else /* MODEST_TOOLKIT_GTK */ /* TODO: review this values with GNOME HIG */ #define MODEST_MARGIN_DEFAULT 6 diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c index 2e8ce6e..16ce274 100644 --- a/src/widgets/modest-wizard-dialog.c +++ b/src/widgets/modest-wizard-dialog.c @@ -274,12 +274,18 @@ init (ModestWizardDialog *wizard_dialog) gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0); /* Add response buttons: finish, previous, next, cancel */ -#ifndef MODEST_TOOLKIT_GTK +#ifdef MODEST_TOOLKIT_HILDON1 gtk_dialog_add_button (dialog, _HL("ecdg_bd_wizard_finish"), MODEST_WIZARD_DIALOG_FINISH); gtk_dialog_add_button (dialog, _HL("ecdg_bd_wizard_previous"), MODEST_WIZARD_DIALOG_PREVIOUS); gtk_dialog_add_button (dialog, _HL("ecdg_bd_wizard_next"), MODEST_WIZARD_DIALOG_NEXT); gtk_dialog_add_button (dialog, _HL("ecdg_bd_wizard_cancel"), MODEST_WIZARD_DIALOG_CANCEL); -#else +#endif +#ifdef MODEST_TOOLKIT_HILDON2 + gtk_dialog_add_button (dialog, _HL("wdgt_bd_finish "), MODEST_WIZARD_DIALOG_FINISH); + gtk_dialog_add_button (dialog, _HL("wdgt_bd_previous "), MODEST_WIZARD_DIALOG_PREVIOUS); + gtk_dialog_add_button (dialog, _HL("wdgt_bd_next "), MODEST_WIZARD_DIALOG_NEXT); +#endif +#ifdef MODEST_TOOLKIT_GTK gtk_dialog_add_button (dialog, GTK_STOCK_SAVE, MODEST_WIZARD_DIALOG_FINISH); gtk_dialog_add_button (dialog, GTK_STOCK_GO_BACK, MODEST_WIZARD_DIALOG_PREVIOUS); gtk_dialog_add_button (dialog, GTK_STOCK_GO_FORWARD, MODEST_WIZARD_DIALOG_NEXT); -- 1.7.9.5