invoke_enable_buttons_vfunc (ModestEasysetupWizardDialog *wizard_dialog)
{
ModestWizardDialogClass *klass = MODEST_WIZARD_DIALOG_GET_CLASS (wizard_dialog);
-
+
/* Call the vfunc, which may be overridden by derived classes: */
if (klass->enable_buttons) {
GtkNotebook *notebook = NULL;
g_object_get (wizard_dialog, "wizard-notebook", ¬ebook, NULL);
-
+
const gint current_page_num = gtk_notebook_get_current_page (notebook);
if (current_page_num == -1)
return;
-
+
GtkWidget* current_page_widget = gtk_notebook_get_nth_page (notebook, current_page_num);
(*(klass->enable_buttons))(MODEST_WIZARD_DIALOG (wizard_dialog), current_page_widget);
}
static void
on_caption_entry_changed (GtkEditable *editable, gpointer user_data)
{
- ModestEasysetupWizardDialog *self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
- g_assert(self);
+ ModestEasysetupWizardDialog *self;
+ gboolean mandatory, empty;
+ ModestEasysetupWizardDialogPrivate *priv;
+
+ g_return_if_fail (user_data);
+
+ self = MODEST_EASYSETUP_WIZARD_DIALOG (user_data);
+ priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
+
invoke_enable_buttons_vfunc(self);
+
+ empty = !g_utf8_collate (gtk_entry_get_text (GTK_ENTRY (editable)), "");
+ mandatory = ((GtkWidget *) editable == priv->entry_account_title) ||
+ ((GtkWidget *) editable == priv->entry_user_username) ||
+ ((GtkWidget *) editable == priv->entry_user_email);
+
+ /* Show a banner & get focus */
+ if (empty && mandatory) {
+ modest_platform_information_banner ((GtkWidget *) editable, NULL,
+ _CS("ckct_ib_enter_some_text"));
+ gtk_widget_grab_focus (GTK_WIDGET (editable));
+ }
}
static void
create_page_welcome (ModestEasysetupWizardDialog *self)
{
GtkWidget *box;
+ GtkWidget *align;
GtkWidget *label;
ModestEasysetupWizardDialogPrivate *priv;
box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
label = gtk_label_new(_("mcen_ia_emailsetup_intro"));
priv->check_support_progress = gtk_progress_bar_new ();
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
/* So that it is not truncated: */
- gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_box_pack_end (GTK_BOX (box), priv->check_support_progress, FALSE, FALSE, 0);
+ gtk_container_add (GTK_CONTAINER (align), box);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+ gtk_widget_show (align);
+ return GTK_WIDGET (align);
}
static void
update_user_email_from_provider (ModestEasysetupWizardDialog *self)
{
ModestEasysetupWizardDialogPrivate *priv;
- gchar* provider_id;
- gchar* domain_name = NULL;
+ gchar* provider_id = NULL, *with_at = NULL;
g_assert(self);
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (self);
/* Fill the providers combo, based on the selected country: */
provider_id = modest_provider_picker_get_active_provider_id (
MODEST_PROVIDER_PICKER (priv->account_serviceprovider_picker));
-
- if(provider_id)
- domain_name = modest_presets_get_domain (priv->presets, provider_id);
-
- if(!domain_name)
- domain_name = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
-
+
+ if (provider_id) {
+ gchar *domain_name = modest_presets_get_domain (priv->presets, provider_id);
+ with_at = g_strdup_printf ("%c%s", '@', domain_name);
+ g_free (domain_name);
+ }
+
+ /* The sample address already contains the '@' */
+ if (!with_at)
+ with_at = g_strdup (MODEST_EXAMPLE_EMAIL_ADDRESS);
+
if (priv->entry_user_email)
- hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), domain_name);
-
- g_free (domain_name);
-
+ hildon_entry_set_text (HILDON_ENTRY (priv->entry_user_email), with_at);
+
+ g_free (with_at);
g_free (provider_id);
}
create_page_account_details (ModestEasysetupWizardDialog *self)
{
GtkWidget *caption;
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
GtkWidget *label = gtk_label_new(_("mcen_ia_accountdetails"));
ModestEasysetupWizardDialogPrivate* priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
- gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
/* Create a size group to be used by all captions.
gtk_box_pack_start (GTK_BOX (box), priv->account_country_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
gtk_widget_show (priv->account_country_picker);
- GtkWidget *separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
- gtk_widget_show (separator);
-
/* The service provider widgets: */
priv->account_serviceprovider_picker = GTK_WIDGET (modest_provider_picker_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_HORIZONTAL));
priv->account_serviceprovider_picker);
g_signal_connect (G_OBJECT (priv->account_serviceprovider_picker), "value-changed",
G_CALLBACK (on_serviceprovider_picker_button_value_changed), self);
- gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), priv->account_serviceprovider_picker, FALSE, FALSE, 0);
gtk_widget_show (priv->account_serviceprovider_picker);
/* The description widgets: */
caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mcen_fi_account_title"), FALSE,
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_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
/* Prevent the use of some characters in the account title,
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
- return GTK_WIDGET (box);
+ return GTK_WIDGET (align);
}
static GtkWidget*
GtkSizeGroup* value_sizegroup;
GtkWidget *box;
ModestEasysetupWizardDialogPrivate *priv;
+ GtkWidget *align;
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE(self);
g_signal_connect(G_OBJECT(priv->entry_user_name), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_name);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
/* Prevent the use of some characters in the name,
caption = create_captioned (self, title_sizegroup, value_sizegroup, _("mail_fi_username"), FALSE,
priv->entry_user_username);
gtk_widget_show (priv->entry_user_username);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(priv->entry_user_username), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (caption);
g_signal_connect(G_OBJECT(priv->entry_user_password), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (priv->entry_user_password);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
/* The email address widgets: */
_("mcen_li_emailsetup_email_address"), FALSE, priv->entry_user_email);
update_user_email_from_provider (self);
gtk_widget_show (priv->entry_user_email);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
g_signal_connect(G_OBJECT(priv->entry_user_email), "changed",
G_CALLBACK(on_easysetup_changed), self);
gtk_widget_show (caption);
g_object_unref (title_sizegroup);
g_object_unref (value_sizegroup);
- return GTK_WIDGET (box);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ return GTK_WIDGET (align);
}
static GtkWidget*
create_page_complete_easysetup (ModestEasysetupWizardDialog *self)
{
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
- gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
- gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 1.0);
+ gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ return GTK_WIDGET (align);
}
/** Change the caption title for the incoming server,
{
ModestProtocolRegistry *protocol_registry;
ModestEasysetupWizardDialogPrivate* priv;
- GtkWidget *box;
+ GtkWidget *box;
+ GtkWidget *align;
GtkWidget *pannable;
GtkWidget *label;
GtkSizeGroup *title_sizegroup;
/* Show note that account type cannot be changed in future: */
label = gtk_label_new (_("mcen_ia_emailsetup_account_type"));
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
priv->incoming_servertype_picker = GTK_WIDGET (modest_servertype_picker_new (MODEST_EDITABLE_SIZE,
HILDON_BUTTON_ARRANGEMENT_HORIZONTAL,
TRUE));
- hildon_button_set_title (HILDON_BUTTON (priv->incoming_servertype_picker), _("mcen_li_emailsetup_type"));
+ modest_maemo_utils_set_hbutton_layout (title_sizegroup, value_sizegroup,
+ _("mcen_li_emailsetup_type"),
+ priv->incoming_servertype_picker);
g_signal_connect (G_OBJECT (priv->incoming_servertype_picker), "value-changed",
G_CALLBACK (on_picker_button_value_changed), self);
- gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), priv->incoming_servertype_picker, FALSE, FALSE, 0);
gtk_widget_show (priv->incoming_servertype_picker);
priv->entry_incomingserver = hildon_entry_new (MODEST_EDITABLE_SIZE);
FALSE, 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);
+ gtk_box_pack_start (GTK_BOX (box), priv->caption_incoming, FALSE, FALSE, 0);
gtk_widget_show (priv->caption_incoming);
/* Change the caption title when the servertype changes,
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_INCOMING,
FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->incoming_security,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
gtk_widget_show_all (priv->incoming_security);
/* Set default selection */
MODEST_SERVERTYPE_PICKER (priv->incoming_servertype_picker),
MODEST_PROTOCOLS_STORE_POP);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
gtk_widget_show (GTK_WIDGET (box));
ModestEasysetupWizardDialogPrivate *priv;
gchar *smtp_caption_label;
GtkWidget *pannable;
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_NONE);
pannable = hildon_pannable_area_new ();
smtp_caption_label, TRUE, priv->entry_outgoingserver);
g_free (smtp_caption_label);
gtk_widget_show (priv->entry_outgoingserver);
- gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), caption, FALSE, FALSE, 0);
gtk_widget_show (caption);
set_default_custom_servernames (self);
modest_maemo_security_options_view_new (MODEST_SECURITY_OPTIONS_OUTGOING,
FALSE, title_sizegroup, value_sizegroup);
gtk_box_pack_start (GTK_BOX (box), priv->outgoing_security,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
gtk_widget_show (priv->outgoing_security);
GtkWidget *separator = gtk_hseparator_new ();
- gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), separator, FALSE, FALSE, 0);
gtk_widget_show (separator);
/* connection-specific checkbox: */
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
/* Connection-specific SMTP-Severs Edit button: */
priv->button_outgoing_smtp_servers = gtk_button_new_with_label (_("mcen_bd_advsetup_optional_smtp"));
HILDON_SIZE_FINGER_HEIGHT | HILDON_SIZE_AUTO_WIDTH);
gtk_widget_show (priv->button_outgoing_smtp_servers);
gtk_box_pack_start (GTK_BOX (box), priv->button_outgoing_smtp_servers,
- FALSE, FALSE, MODEST_MARGIN_HALF);
+ FALSE, FALSE, 0);
/* Only enable the button when the checkbox is checked: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
G_CALLBACK (on_entry_outgoing_servername_changed), self);
- hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), box);
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, 0, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), align);
gtk_container_set_focus_vadjustment (GTK_CONTAINER (box),
hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (pannable)));
gtk_widget_show (GTK_WIDGET (box));
static GtkWidget*
create_page_complete_custom (ModestEasysetupWizardDialog *self)
{
+ GtkWidget *align;
GtkWidget *box = gtk_vbox_new (FALSE, MODEST_MARGIN_DEFAULT);
GtkWidget *label = gtk_label_new(_("mcen_ia_emailsetup_setup_complete"));
GtkWidget *button_edit = gtk_button_new_with_label (_("mcen_fi_advanced_settings"));
gtk_misc_set_alignment (GTK_MISC (label), 0, 0.5);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_box_pack_start (GTK_BOX (box), label, FALSE, FALSE, 0);
gtk_widget_show (label);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.0);
gtk_widget_set_size_request (label, LABELS_WIDTH, -1);
gtk_label_set_line_wrap (GTK_LABEL (label), TRUE);
+ gtk_misc_set_padding (GTK_MISC (label), MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE);
+ gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
gtk_box_pack_start (GTK_BOX (box), label, TRUE, TRUE, 0);
gtk_widget_show (label);
gtk_widget_show (button_edit);
- gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, MODEST_MARGIN_HALF);
+ gtk_box_pack_start (GTK_BOX (box), button_edit, FALSE, FALSE, 0);
g_signal_connect (G_OBJECT (button_edit), "clicked",
G_CALLBACK (on_button_edit_advanced_settings), self);
gtk_widget_show (GTK_WIDGET (box));
- return GTK_WIDGET (box);
+
+ align = gtk_alignment_new (0.0, 0.0, 1.0, 1.0);
+ gtk_alignment_set_padding (GTK_ALIGNMENT (align), 0, MODEST_MARGIN_DOUBLE, MODEST_MARGIN_DOUBLE, 0);
+ gtk_widget_show (align);
+ gtk_container_add (GTK_CONTAINER (align), box);
+
+ return GTK_WIDGET (align);
}
/* Get data */
priv = MODEST_EASYSETUP_WIZARD_DIALOG_GET_PRIVATE (dialog);
g_object_get (dialog, "wizard-notebook", ¬ebook, NULL);
-
+
/* Disable the Finish button until we are on the last page,
* because HildonWizardDialog enables this for all but the
* first page */
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
MODEST_WIZARD_DIALOG_FINISH,
FALSE);
- enable_next = priv->check_support_done;
+
+ /* If the check support is not done then do not enable
+ the wizard to continue */
+ enable_next = enable_next && priv->check_support_done;
}
-
+
gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog),
MODEST_WIZARD_DIALOG_NEXT,
enable_next);
projects / modest / blobdiff