in global settings, account settings and account wizard.
* More fixes.
pmo-trunk-r5918
/* 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);
/* 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 (
}
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);
}
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);
#include <glib/gi18n.h>
-#include <gtk/gtknotebook.h>
#include <gtk/gtkvbox.h>
#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gconf/gconf-client.h>
#include <string.h> /* For strlen(). */
+
/* Include config.h so that _() works: */
#ifdef HAVE_CONFIG_H
#include <config.h>
ModestProtocolType protocol_authentication_incoming;
- GtkNotebook *notebook;
+ GtkWidget *main_container;
GtkWidget *page_account_details;
GtkWidget *entry_account_title;
}
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);
}
} 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);
}
}
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:
}
- return caption;
+ return result;
}
static void
{
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);
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);
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);
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*
{
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 ());
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);
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);
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);
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);
/* 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);
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 */
/* 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);
/* 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);
}
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
{
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. */
/* 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);
/* 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);
/* 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);
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
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,
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
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));
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) {
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 =
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);
/* 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)
* 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:
G_CALLBACK (on_caption_combobox_changed), self);
}
- return caption;
+ return result;
}
static GtkWidget*
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);
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);
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);
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);
/* 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",
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);
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);
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);
/* 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);
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);
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);
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);
#include <hildon/hildon-notification.h>
#endif /*MODEST_HILDON_NOTIFY*/
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-color-selector.h>
-#include <hildon-widgets/hildon-color-button.h>
-#include <hildon-widgets/hildon-banner.h>
-#include <hildon-widgets/hildon-caption.h>
-#include <hildon-widgets/hildon-number-editor.h>
-#include <hildon-widgets/hildon-note.h>
-#include <hildon-widgets/hildon-file-chooser-dialog.h>
-#include <hildon-widgets/hildon-font-selection-dialog.h>
-#include <hildon-widgets/hildon-find-toolbar.h>
-#include <hildon-widgets/hildon-sort-dialog.h>
-#include <hildon-widgets/hildon-program.h>
-
-#else
-
-#if MODEST_HILDON_API >= 1
#include <hildon/hildon-helper.h>
#include <hildon/hildon-file-chooser-dialog.h>
#include <hildon/hildon-color-chooser.h>
#include <hildon/hildon-sort-dialog.h>
#include <hildon/hildon-number-editor.h>
#include <hildon/hildon-program.h>
-
-#endif /*__MODEST_HAVE_HILDON1_WIDGETS*/
-#endif /*__MODEST_HAVE_HILDON0_WIDGETS_*/
+#include <hildon/hildon-entry.h>
+#include <hildon/hildon-picker-button.h>
+#include <hildon/hildon-check-button.h>
+#include <hildon/hildon-pannable-area.h>
/* backward compatibility... */
}
ModestLimitRetrievePicker*
-modest_limit_retrieve_picker_new (void)
+modest_limit_retrieve_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestLimitRetrievePicker *self;
ModestLimitRetrievePickerPrivate *priv;
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);
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);
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));
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);
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);
* 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 */
* 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 */
* 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;
}
#include "widgets/modest-validating-entry.h"
#include "modest-serversecurity-picker.h"
#include "modest-secureauth-picker.h"
-#include <hildon/hildon-caption.h>
+#include "modest-maemo-utils.h"
#include <hildon/hildon-number-editor.h>
+#include <hildon/hildon-check-button.h>
#define PORT_MIN 1
#define PORT_MAX 65535
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 {
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",
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;
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
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 */
#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
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;
+}
*/
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__*/
#endif
#include <modest-utils.h>
#include "modest-maemo-utils.h"
+#include <modest-ui-constants.h>
#define DEFAULT_FONT_SIZE 3
#if (GTK_MINOR_VERSION >= 10)
GdkAtom deserialize_type;
#endif
+
priv = MODEST_MSG_EDIT_WINDOW_GET_PRIVATE(obj);
parent_priv = MODEST_WINDOW_GET_PRIVATE (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 ();
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);
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);
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);
}
ModestProviderPicker*
-modest_provider_picker_new (void)
+modest_provider_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestProviderPickerPrivate *priv;
ModestProviderPicker *self;
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);
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);
ModestRetrievePicker*
-modest_retrieve_picker_new (void)
+modest_retrieve_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestRetrievePicker *self;
ModestRetrievePickerPrivate *priv;
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);
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);
}
ModestSecureauthPicker*
-modest_secureauth_picker_new (void)
+modest_secureauth_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestSecureauthPicker *self;
ModestSecureauthPickerPrivate *priv;
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);
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);
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;
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);
*
* 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);
/**
}
ModestServersecurityPicker*
-modest_serversecurity_picker_new (void)
+modest_serversecurity_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestServersecurityPicker *self;
ModestServersecurityPickerPrivate *priv;
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);
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);
}
ModestServertypePicker*
-modest_servertype_picker_new (gboolean filter_providers)
+modest_servertype_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement,
+ gboolean filter_providers)
{
ModestServertypePicker *self;
ModestServertypePickerPrivate *priv;
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);
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);
#include <string.h>
#include <glib/gi18n.h>
#include <gtk/gtk.h>
-#include <widgets/modest-combo-box.h>
#include "widgets/modest-progress-bar.h"
#include "modest-tny-account.h"
#include "modest-platform.h"
#ifdef MODEST_TOOLKIT_HILDON2
#include "modest-serversecurity-picker.h"
#include "modest-secureauth-picker.h"
+#include <hildon/hildon-check-button.h>
#else
#include "widgets/modest-serversecurity-combo-box.h"
#include "widgets/modest-secureauth-combo-box.h"
/* 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 (
#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 */
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;
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,
#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
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);
projects / modest / commitdiff