Modified webpage: now tinymail repository is in gitorious.

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

diff --git a/src/widgets/modest-wizard-dialog.c b/src/widgets/modest-wizard-dialog.c
index 401d922..c2792d1 100644 (file)
--- a/src/widgets/modest-wizard-dialog.c
+++ b/src/widgets/modest-wizard-dialog.c
@@ -41,26 +41,15 @@
  */
 
 #include <config.h>
  */
 
 #include <config.h>

-#include <gtk/gtkdialog.h>
-#include <gtk/gtknotebook.h>
-#include <gtk/gtkimage.h>
-#include <gtk/gtkbox.h>
-#include <gtk/gtkhbox.h>
-#include <gtk/gtkvbox.h>
-#include <gtk/gtkbutton.h>

 #include <gtk/gtk.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 
 #include <gtk/gtk.h>
 
 #ifdef HAVE_CONFIG_H
 #include <config.h>
 #endif
 

-#ifndef MODEST_TOOLKIT_GTK
-#if MODEST_HILDON_API == 0
-#include <hildon-widgets/hildon-defines.h>
-#else
+#ifdef MODEST_TOOLKIT_HILDON2

 #include <hildon/hildon-defines.h>
 #include <hildon/hildon-defines.h>

-#endif /*MODEST_HILDON_API == 0*/
-#endif /*!MODEST_TOOLKIT_GTK*/
+#endif

 
 #include "modest-wizard-dialog.h"
 #include "modest-debug.h"
 
 #include "modest-wizard-dialog.h"
 #include "modest-debug.h"

@@ -265,16 +254,11 @@ init (ModestWizardDialog *wizard_dialog)
 #ifdef MODEST_TOOLKIT_GTK
     priv->image = gtk_image_new_from_stock (GTK_STOCK_PREFERENCES, GTK_ICON_SIZE_DIALOG);
 #else /*MODEST_TOOLKIT_GTK*/
 #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);
-#else      

     static int icon_size = 0;
     if (!icon_size)
            icon_size = gtk_icon_size_register("modest_wizard", 50, 50);
     priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
                                                icon_size);
     static int icon_size = 0;
     if (!icon_size)
            icon_size = gtk_icon_size_register("modest_wizard", 50, 50);
     priv->image = gtk_image_new_from_icon_name ("qgn_widg_wizard",
                                                icon_size);

-#endif /*MODEST_HILDON_API == 0*/

 #endif /*!MODEST_TOOLKIT_GTK*/
 #endif /*MODEST_TOOLKIT_HILDON2 */
     /* Default values for user provided properties */
 #endif /*!MODEST_TOOLKIT_GTK*/
 #endif /*MODEST_TOOLKIT_HILDON2 */
     /* Default values for user provided properties */

@@ -490,48 +474,33 @@ create_title (ModestWizardDialog *wizard_dialog)
     gchar *str = NULL;
     ModestWizardDialogPrivate *priv = NULL;
     GtkNotebook *notebook = NULL;
     gchar *str = NULL;
     ModestWizardDialogPrivate *priv = NULL;
     GtkNotebook *notebook = NULL;

+    gint pages, current;
+    const gchar *steps;

 
     g_return_if_fail (MODEST_IS_WIZARD_DIALOG(wizard_dialog));
     g_return_if_fail (wizard_dialog->priv != NULL);
 
 
     g_return_if_fail (MODEST_IS_WIZARD_DIALOG(wizard_dialog));
     g_return_if_fail (wizard_dialog->priv != NULL);
 

-    priv = wizard_dialog->priv;    
+    priv = wizard_dialog->priv;

     notebook = priv->notebook;
 
     if (!notebook)
         return;
 
     /* Get page information, we'll need that when creating title */
     notebook = priv->notebook;
 
     if (!notebook)
         return;
 
     /* Get page information, we'll need that when creating title */

-    gint pages = gtk_notebook_get_n_pages (notebook);
+    pages = gtk_notebook_get_n_pages (notebook);

     if (pages == 0)
     if (pages == 0)

-      return;
-       
-    gint current = gtk_notebook_get_current_page (priv->notebook);
+           return;
+
+    current = gtk_notebook_get_current_page (priv->notebook);

     if (current < 0)
     if (current < 0)

-        current = 0;
-
-    /* the welcome title on the initial page */
-    /* This is the standard wizard title, with, e.g., 1/4 at the end,
-        * but the Modest UI spec does not want this. */
-       /*
-    if (current == 0) {
-        str = g_strdup_printf (_HL("ecdg_ti_wizard_welcome"), 
-                priv->wizard_name, pages);
-    } else {
-    */
-       const gchar *steps = gtk_notebook_get_tab_label_text (notebook,
-               gtk_notebook_get_nth_page (notebook, current));
-                
-               /* This is the standard wizard title, with, e.g., 1/4 at the end,
-                * but the Modest UI spec does not want this.
-                */
-               /*
-        str = g_strdup_printf (_HL("ecdg_ti_wizard_step"), 
-                priv->wizard_name, current + 1, pages, steps);
-        */
-
-        str = g_strdup_printf ((steps&&*steps)?_HL("%s: %s"):_HL("%s"), 
-                priv->wizard_name, steps);
-    /* } */
+           current = 0;
+
+    steps = gtk_notebook_get_tab_label_text (notebook,
+                                            gtk_notebook_get_nth_page (notebook, current));
+
+    str = g_strdup_printf ((steps&&*steps)?_HL("%s%s %s"):_HL("%s"),
+                          priv->wizard_name, _HL("ecdg_ti_caption_separator"),
+                          steps);

 
     /* Update the dialog to display the generated title */
     gtk_window_set_title (GTK_WINDOW (wizard_dialog), str);
 
     /* Update the dialog to display the generated title */
     gtk_window_set_title (GTK_WINDOW (wizard_dialog), str);