This is a manual merge of branch drop split view intro trunk.

[modest] / src / widgets / modest-wizard-dialog.c

diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c
index 2e8ce6e..e6d71e6 100644 (file)
--- a/src/widgets/modest-wizard-dialog.c
+++ b/src/widgets/modest-wizard-dialog.c
@@ -249,7 +249,12 @@ init (ModestWizardDialog *wizard_dialog)
     gtk_dialog_set_has_separator (dialog, FALSE);
     wizard_dialog->priv = priv;
     priv->box = GTK_BOX (gtk_hbox_new (FALSE, 0));
-#ifndef MODEST_TOOLKIT_GTK
+#ifdef MODEST_TOOLKIT_HILDON2
+    priv->image = NULL;
+#else
+#ifdef MODEST_TOOLKIT_GTK
+    priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG);
+#else /*MODEST_TOOLKIT_GTK*/
 #if MODEST_HILDON_API == 0
     priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
                                                HILDON_ICON_SIZE_WIDG_WIZARD);
@@ -260,9 +265,8 @@ init (ModestWizardDialog *wizard_dialog)
     priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
                                                icon_size);
 #endif /*MODEST_HILDON_API == 0*/
-#else /*MODEST_TOOLKIT_GTK*/
-    priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG);
 #endif /*!MODEST_TOOLKIT_GTK*/
+#endif /*MODEST_TOOLKIT_HILDON2 */
     /* Default values for user provided properties */
     priv->notebook = NULL;
     priv->wizard_name = NULL;
@@ -271,15 +275,22 @@ init (ModestWizardDialog *wizard_dialog)
     /* Build wizard layout */
     gtk_box_pack_start_defaults (GTK_BOX (dialog->vbox), GTK_WIDGET (priv->box));
     gtk_box_pack_start_defaults (GTK_BOX (priv->box), GTK_WIDGET (vbox));
-    gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (priv->image), FALSE, FALSE, 0);
+    if (priv->image)
+      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("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);
+#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);
@@ -548,8 +559,9 @@ response (ModestWizardDialog   *wizard_dialog,
     
     /* If first page, previous and finish are disabled, 
        if last page, next is disabled */
-    make_buttons_sensitive (wizard_dialog,
-            !is_first /* previous */, !is_first /* finish */, !is_last /* next*/);
+/*     make_buttons_sensitive (wizard_dialog, */
+/*             !is_first /\* previous *\/, !is_first /\* finish *\/, !is_last /\* next*\/); */
+    make_buttons_sensitive (wizard_dialog, TRUE, TRUE, TRUE);
             
     /* Allow derived classes to disable buttons to prevent navigation,
      * according to their own validation logic: */
@@ -560,10 +572,12 @@ response (ModestWizardDialog   *wizard_dialog,
 
     /* We show the default image on first and last pages */
     last = gtk_notebook_get_n_pages (notebook) - 1;
-    if (current == last || current == 0)
-        gtk_widget_show (GTK_WIDGET(priv->image));
-    else
-        gtk_widget_hide (GTK_WIDGET(priv->image));
+    if (priv->image) {
+           if (current == last || current == 0)
+                   gtk_widget_show (GTK_WIDGET(priv->image));
+           else
+                   gtk_widget_hide (GTK_WIDGET(priv->image));
+    }
 
     /* New page number may appear in the title, update it */
     if (priv->autotitle)