"Add to contacts" dialog must not be in edit mode

[modest] / src / hildon2 / modest-signature-editor-dialog.c

diff --git a/src/hildon2/modest-signature-editor-dialog.c b/src/hildon2/modest-signature-editor-dialog.c
index 69cd063..bcb1ef6 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;
@@ -124,14 +125,14 @@ enable_widgets (ModestSignatureEditorDialog *self)
        ModestSignatureEditorDialogPrivate *priv = 
                SIGNATURE_EDITOR_DIALOG_GET_PRIVATE (self);
                
-       const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_use));
+       const gboolean enable = modest_togglable_get_active (priv->checkbox_use);
        gtk_widget_set_sensitive (priv->label, enable);
        gtk_widget_set_sensitive (priv->textview, enable);
        gtk_text_view_set_editable (GTK_TEXT_VIEW (priv->textview), enable);
 }
 
 static void
-on_toggle_button_changed (GtkToggleButton *togglebutton, gpointer user_data)
+on_toggle_button_changed (GtkWidget *togglebutton, gpointer user_data)
 {
        ModestSignatureEditorDialog *self = MODEST_SIGNATURE_EDITOR_DIALOG (user_data);
        enable_widgets (self);
@@ -149,10 +150,8 @@ modest_signature_editor_dialog_init (ModestSignatureEditorDialog *self)
        GtkWidget *box = GTK_DIALOG(self)->vbox; /* gtk_vbox_new (FALSE, MODEST_MARGIN_HALF); */
        top_box = gtk_vbox_new (FALSE, 0);
 
-       priv->checkbox_use = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
-       gtk_button_set_label (GTK_BUTTON (priv->checkbox_use), 
-                             _("mcen_fi_email_signatures_use_signature"));
-       gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_use), 0.0, 0.5);
+       priv->checkbox_use = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+                                                                        _("mcen_fi_email_signatures_use_signature"));
        gtk_box_pack_start (GTK_BOX (top_box), priv->checkbox_use, FALSE, FALSE, 0);
        gtk_widget_show (priv->checkbox_use);
        
@@ -185,10 +184,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);
@@ -223,7 +222,7 @@ modest_signature_editor_dialog_set_settings (
        gtk_label_set_ellipsize (GTK_LABEL (priv->label),  PANGO_ELLIPSIZE_END);
        g_free (label_text);
        
-       hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_use), use_signature);
+       modest_togglable_set_active (priv->checkbox_use, use_signature);
        
        GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->textview));
        if (signature && signature[0] != '\0')
@@ -245,7 +244,7 @@ modest_signature_editor_dialog_get_settings (
                
        g_assert(use_signature);
        
-       *use_signature = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_use));
+       *use_signature = modest_togglable_get_active (priv->checkbox_use);
                        
        GtkTextBuffer *buffer = hildon_text_view_get_buffer (HILDON_TEXT_VIEW (priv->textview));
        
@@ -280,7 +279,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 +295,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;