X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-maemo-global-settings-dialog.c;h=3eee973f2138cdf7ea32873cfc98cc5235875768;hb=1e992fe6d5d1bb508a84cba052e0c18f555767c7;hp=cae83cda19b0808296f871ce5cfc68c3e514981b;hpb=f9f685750fedb032086044c6d7cee9c4a5d99d90;p=modest

diff --git a/src/maemo/modest-maemo-global-settings-dialog.c b/src/maemo/modest-maemo-global-settings-dialog.c
index cae83cd..3eee973 100644
--- a/src/maemo/modest-maemo-global-settings-dialog.c
+++ b/src/maemo/modest-maemo-global-settings-dialog.c
@@ -61,6 +61,8 @@
 #define MSG_SIZE_DEF_VAL 1000
 #define MSG_SIZE_MIN_VAL 1
 
+#define DEFAULT_FOCUS_WIDGET "default-focus-widget"
+
 /* 'private'/'protected' functions */
 static void modest_maemo_global_settings_dialog_class_init (ModestMaemoGlobalSettingsDialogClass *klass);
 static void modest_maemo_global_settings_dialog_init       (ModestMaemoGlobalSettingsDialog *obj);
@@ -136,6 +138,28 @@ modest_maemo_global_settings_dialog_class_init (ModestMaemoGlobalSettingsDialogC
 	MODEST_GLOBAL_SETTINGS_DIALOG_CLASS (klass)->current_connection_func = current_connection;
 }
 
+
+static void
+on_switch_page (GtkNotebook *notebook, GtkNotebookPage *page, guint page_num, gpointer user_data)
+{
+	/* grab the focus to the default element in the current page */
+	GtkWidget *child, *focus_item;
+	
+	child = gtk_notebook_get_nth_page (notebook, page_num);
+	if (!child) {
+		g_printerr ("modest: cannot get nth page\n");
+		return;
+	}
+	
+	focus_item = GTK_WIDGET(g_object_get_data (G_OBJECT(child), DEFAULT_FOCUS_WIDGET));
+	if (!focus_item) {
+		g_printerr ("modest: cannot get focus item\n");
+		return;
+	}
+
+	gtk_widget_grab_focus (focus_item);
+}
+
 static void
 modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 {
@@ -155,6 +179,8 @@ modest_maemo_global_settings_dialog_init (ModestMaemoGlobalSettingsDialog *self)
 	gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), ppriv->notebook);
 	gtk_container_set_border_width (GTK_CONTAINER (GTK_DIALOG (self)->vbox), MODEST_MARGIN_HALF);
 
+	g_signal_connect (G_OBJECT(ppriv->notebook), "switch-page", G_CALLBACK(on_switch_page), NULL);
+	
 	/* Load current config */
 	_modest_global_settings_dialog_load_conf (MODEST_GLOBAL_SETTINGS_DIALOG (self));
 	gtk_widget_show_all (ppriv->notebook);
@@ -242,8 +268,8 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	size_group = gtk_size_group_new (GTK_SIZE_GROUP_HORIZONTAL);
 
 	/* Size limit */
-	ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);;
-	hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);;
+	ppriv->size_limit = hildon_number_editor_new (MSG_SIZE_MIN_VAL, MSG_SIZE_MAX_VAL);
+	hildon_number_editor_set_value (HILDON_NUMBER_EDITOR (ppriv->size_limit), MSG_SIZE_DEF_VAL);
 	g_signal_connect (ppriv->size_limit, "range_error", G_CALLBACK (on_range_error), self);
 	caption = hildon_caption_new (size_group, 
 				      _("mcen_fi_advsetup_sizelimit"), 
@@ -264,6 +290,9 @@ create_updating_page (ModestMaemoGlobalSettingsDialog *self)
 	/* Add to vbox */
 	gtk_box_pack_start (GTK_BOX (vbox), vbox_limit, FALSE, FALSE, MODEST_MARGIN_HALF);
 
+	/* set the special magic default widget as the DEFAULT_FOCUS_WIDGET gobject property */
+	g_object_set_data (G_OBJECT(vbox), DEFAULT_FOCUS_WIDGET, (gpointer)ppriv->auto_update);
+	
 	return vbox;
 }
 
@@ -306,6 +335,9 @@ create_composing_page (ModestMaemoGlobalSettingsDialog *self)
 				      HILDON_CAPTION_MANDATORY);
 	gtk_box_pack_start (GTK_BOX (vbox), caption, FALSE, FALSE, MODEST_MARGIN_HALF);
 
+	/* set the special magic default widget as the DEFAULT_FOCUS_WIDGET gobject property */
+	g_object_set_data (G_OBJECT(vbox), DEFAULT_FOCUS_WIDGET, (gpointer)ppriv->msg_format);
+
 	return vbox;
 }