Use scrollable in signature editor and connection setting specific

smtp window.

diff --git a/src/hildon2/modest-connection-specific-smtp-window.c b/src/hildon2/modest-connection-specific-smtp-window.c
index e2f312e..9087019 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-window.c
@@ -41,7 +41,8 @@
 #include <gtk/gtktreeview.h>
 #include <gtk/gtkcellrenderertext.h>
 #include <gtk/gtkliststore.h>
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
+#include <modest-toolkit-factory.h>
 #include <hildon/hildon-gtk.h>
 #include <gtk/gtkbutton.h>
 #include <gtk/gtkhbox.h>
@@ -68,7 +69,7 @@ struct _ModestConnectionSpecificSmtpWindowPrivate
        GtkTreeView *treeview;
        GtkTreeModel *model;
        GtkWidget *no_connection_label;
-       GtkWidget *pannable;
+       GtkWidget *scrollable;
        ModestAccountMgr *account_manager;
 };
 
@@ -235,17 +236,17 @@ modest_connection_specific_smtp_window_fill_with_connections (ModestConnectionSp
 #endif /*MODEST_HAVE_CONIC */
 
        GtkWidget *child;
-       child = gtk_bin_get_child (GTK_BIN (priv->pannable));
+       child = gtk_bin_get_child (GTK_BIN (priv->scrollable));
        if (child) {
-               gtk_container_remove (GTK_CONTAINER (priv->pannable), child);
+               gtk_container_remove (GTK_CONTAINER (priv->scrollable), child);
        }
 
        if (empty) {
-               hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), 
-                                                       priv->no_connection_label);
+               modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), 
+                                                    priv->no_connection_label);
                gtk_widget_show (priv->no_connection_label);
        } else {
-               gtk_container_add (GTK_CONTAINER (priv->pannable), GTK_WIDGET (priv->treeview));
+               gtk_container_add (GTK_CONTAINER (priv->scrollable), GTK_WIDGET (priv->treeview));
                gtk_widget_show (GTK_WIDGET (priv->treeview));
        }
 }
@@ -399,14 +400,13 @@ modest_connection_specific_smtp_window_init (ModestConnectionSpecificSmtpWindow
        gtk_widget_show (label);
        gtk_box_pack_start (GTK_BOX (vbox), label, FALSE, FALSE, 0);
 
-       /* Put the treeview in a pannable and add it to the box: */
-       priv->pannable = hildon_pannable_area_new ();
+       /* Put the treeview in a scrollable and add it to the box: */
+       priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
        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);
-       g_object_set (G_OBJECT (priv->pannable), "initial-hint", TRUE, NULL);
-       gtk_widget_show (priv->pannable);
+       gtk_widget_show (priv->scrollable);
        gtk_widget_show (align);
-       gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->pannable));
+       gtk_container_add (GTK_CONTAINER (align), GTK_WIDGET (priv->scrollable));
        gtk_box_pack_start (GTK_BOX (vbox), GTK_WIDGET (align), TRUE, TRUE, 0);
        gtk_widget_show (vbox);
 

diff --git a/src/hildon2/modest-hildon-pannable-area-scrollable.c b/src/hildon2/modest-hildon-pannable-area-scrollable.c
index 7686437..f4e7a7f 100644 (file)
--- a/src/hildon2/modest-hildon-pannable-area-scrollable.c
+++ b/src/hildon2/modest-hildon-pannable-area-scrollable.c
@@ -91,7 +91,9 @@ G_DEFINE_TYPE_EXTENDED    (ModestHildonPannableAreaScrollable,
 GtkWidget *
 modest_hildon_pannable_area_scrollable_new                            (void)
 {
-    GtkWidget *scrollable = g_object_new (MODEST_TYPE_HILDON_PANNABLE_AREA_SCROLLABLE, NULL);
+       GtkWidget *scrollable = g_object_new (MODEST_TYPE_HILDON_PANNABLE_AREA_SCROLLABLE, 
+                                             "initial-hint", TRUE, 
+                                             NULL);
 
     return scrollable;
 }

diff --git a/src/hildon2/modest-signature-editor-dialog.c b/src/hildon2/modest-signature-editor-dialog.c
index 69cd063..aad2be5 100644 (file)
--- a/src/hildon2/modest-signature-editor-dialog.c
+++ b/src/hildon2/modest-signature-editor-dialog.c
@@ -37,7 +37,8 @@
 #include <gtk/gtkvbox.h>
 #include <gtk/gtktextview.h>
 #include <gtk/gtklabel.h>
-#include <hildon/hildon-pannable-area.h>
+#include <modest-scrollable.h>
+#include <modest-toolkit-factory.h>
 #include <gtk/gtkstock.h>
 #include <glib/gi18n.h>
 #include <modest-maemo-utils.h>
@@ -55,7 +56,7 @@ struct _ModestSignatureEditorDialogPrivate
 {
        GtkWidget *checkbox_use;
        GtkWidget *label;
-       GtkWidget *pannable;
+       GtkWidget *scrollable;
        GtkWidget *textview;
 
        guint correct_scroll_idle;
@@ -185,10 +186,10 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self)
        
        gtk_widget_show (top_box);
 
-       priv->pannable = hildon_pannable_area_new ();
-       hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (priv->pannable), align);
-       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), priv->pannable);
-       gtk_widget_show (priv->pannable);               
+       priv->scrollable = modest_toolkit_factory_create_scrollable (modest_runtime_get_toolkit_factory ());
+       modest_scrollable_add_with_viewport (MODEST_SCROLLABLE (priv->scrollable), align);
+       gtk_container_add (GTK_CONTAINER (GTK_DIALOG (self)->vbox), priv->scrollable);
+       gtk_widget_show (priv->scrollable);             
 
        gtk_widget_show (box);
        gtk_widget_set_size_request (GTK_WIDGET (self), -1, MODEST_DIALOG_WINDOW_MAX_HEIGHT);
@@ -280,7 +281,7 @@ correct_scroll_idle_func (gpointer userdata)
        offset_min = priv->textview->allocation.y + rectangle.y;
        offset_max = offset_min + rectangle.height;
 
-       vadj = hildon_pannable_area_get_vadjustment (HILDON_PANNABLE_AREA (priv->pannable));
+       vadj = modest_scrollable_get_vadjustment (MODEST_SCROLLABLE (priv->scrollable));
        offset_min = MAX (offset_min - 48, 0);
        offset_max = MIN (offset_max + 48, vadj->upper);
 
@@ -296,7 +297,7 @@ correct_scroll_idle_func (gpointer userdata)
 
                if ((offset_center < center_top) ||
                    (offset_center > center_bottom))
-                       hildon_pannable_area_scroll_to (HILDON_PANNABLE_AREA (priv->pannable), -1, offset_center);
+                       modest_scrollable_scroll_to (MODEST_SCROLLABLE (priv->scrollable), -1, offset_center);
        }
 
        priv->correct_scroll_idle = 0;