Use number entry API

diff --git a/src/hildon2/modest-connection-specific-smtp-edit-window.c b/src/hildon2/modest-connection-specific-smtp-edit-window.c
index 79d8286..077240e 100644 (file)
--- a/src/hildon2/modest-connection-specific-smtp-edit-window.c
+++ b/src/hildon2/modest-connection-specific-smtp-edit-window.c
@@ -293,8 +293,8 @@ security_picker_set_port (ModestConnectionSpecificSmtpEditWindowPrivate *priv)
                        MODEST_SERVERSECURITY_PICKER (priv->outgoing_security_picker));
 
        if(port_number != 0) {
-               modest_number_editor_set_value (
-                       MODEST_NUMBER_EDITOR (priv->entry_port), port_number);
+               modest_number_entry_set_value (
+                       priv->entry_port, port_number);
        }
 }
 
@@ -455,7 +455,8 @@ modest_connection_specific_smtp_edit_window_init (ModestConnectionSpecificSmtpEd
        
        /* The port number widgets: */
        if (!priv->entry_port)
-               priv->entry_port = GTK_WIDGET (modest_number_editor_new (PORT_RANGE_MIN, PORT_RANGE_MAX));
+               priv->entry_port = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
+                                                                              PORT_RANGE_MIN, PORT_RANGE_MAX);
        captioned = modest_maemo_utils_create_captioned (title_sizegroup, value_sizegroup,
                                                         _("mcen_fi_emailsetup_port"), FALSE, priv->entry_port);
        gtk_widget_add_events(GTK_WIDGET(priv->entry_port), GDK_FOCUS_CHANGE_MASK);
@@ -556,8 +557,8 @@ modest_connection_specific_smtp_edit_window_set_connection (
                modest_server_account_settings_get_auth_protocol (server_settings));
                
                /* port: */
-               modest_number_editor_set_value (
-                       MODEST_NUMBER_EDITOR (priv->entry_port), 
+               modest_number_entry_set_value (
+                       priv->entry_port, 
                        modest_server_account_settings_get_port (server_settings));
                
                
@@ -604,7 +605,7 @@ modest_connection_specific_smtp_edit_window_get_settings (ModestConnectionSpecif
        
        /* port: */
        modest_server_account_settings_set_port (server_settings,
-                                                modest_number_editor_get_value (MODEST_NUMBER_EDITOR (priv->entry_port)));
+                                                modest_number_entry_get_value (priv->entry_port));
                        
        return server_settings;
 }

diff --git a/src/hildon2/modest-default-account-settings-dialog.c b/src/hildon2/modest-default-account-settings-dialog.c
index 35f49a3..540ca69 100644 (file)
--- a/src/hildon2/modest-default-account-settings-dialog.c
+++ b/src/hildon2/modest-default-account-settings-dialog.c
@@ -56,6 +56,7 @@
 #include <tny-account.h>
 #include <tny-status.h>
 #include <modest-scrollable.h>
+#include <modest-toolkit-factory.h>
 
 #include <gconf/gconf-client.h>
 #include <string.h> /* For strlen(). */
@@ -211,16 +212,16 @@ on_modified_checkbutton_toggled (GtkWidget *button, gpointer user_data)
 }
 
 static void
-on_modified_number_editor_changed (ModestNumberEditor *number_editor, gint new_value, gpointer user_data)
+on_modified_number_entry_changed (GtkWidget *number_entry, gint new_value, gpointer user_data)
 {
        set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE);
 }
 
 static void       
-on_number_editor_notify (ModestNumberEditor *editor, GParamSpec *arg1, gpointer user_data)
+on_number_entry_notify (GtkWidget *entry, GParamSpec *arg1, gpointer user_data)
 {
        ModestDefaultAccountSettingsDialog *dialog = MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data);
-       gint value = modest_number_editor_get_value (editor);
+       gint value = modest_number_entry_get_value (entry);
 
        gtk_dialog_set_response_sensitive (GTK_DIALOG (dialog), GTK_RESPONSE_OK, value > 0);
 }
@@ -231,10 +232,10 @@ on_number_editor_notify (ModestNumberEditor *editor, GParamSpec *arg1, gpointer
 static void
 connect_for_modified (ModestDefaultAccountSettingsDialog *self, GtkWidget *widget)
 {
-       if (MODEST_IS_NUMBER_EDITOR (widget)) {
+       if (modest_is_number_entry (widget)) {
                g_signal_connect (G_OBJECT (widget), "notify::value",
-                       G_CALLBACK (on_modified_number_editor_changed), self);
-               g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_editor_notify), self);
+                       G_CALLBACK (on_modified_number_entry_changed), self);
+               g_signal_connect (G_OBJECT (widget), "notify", G_CALLBACK (on_number_entry_notify), self);
        }
        else if (GTK_IS_ENTRY (widget)) {
                g_signal_connect (G_OBJECT (widget), "changed",

diff --git a/src/hildon2/modest-maemo-security-options-view.c b/src/hildon2/modest-maemo-security-options-view.c
index 9cc1143..069372c 100644 (file)
--- a/src/hildon2/modest-maemo-security-options-view.c
+++ b/src/hildon2/modest-maemo-security-options-view.c
@@ -38,7 +38,6 @@
 #include "modest-serversecurity-picker.h"
 #include "modest-secureauth-picker.h"
 #include "modest-maemo-utils.h"
-#include <modest-number-editor.h>
 #include "modest-hildon-includes.h"
 
 #define PORT_MIN 1
@@ -64,7 +63,9 @@ G_DEFINE_TYPE (ModestMaemoSecurityOptionsView,
 
 static void on_entry_changed (GtkEditable *editable, gpointer user_data);
 
+#ifdef MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
 static void on_valid_changed (ModestNumberEditor *editor, gboolean valid, ModestSecurityOptionsView *self);
+#endif
 
 /* Tracks changes in the incoming security picker */
 static void
@@ -100,8 +101,8 @@ on_security_changed (GtkWidget *widget,
                        modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
                
                if(port_number) {
-                       modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), 
-                                                       port_number);
+                       modest_number_entry_set_value (ppriv->port_view,
+                                                      port_number);
                }
        }
 }
@@ -171,7 +172,8 @@ create_incoming_security (ModestSecurityOptionsView* self,
        gtk_widget_show (ppriv->auth_view);
 
        if (ppriv->full) {
-               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+               ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
+                                                                              PORT_MIN, PORT_MAX);
                entry_caption =
                        modest_maemo_utils_create_captioned_with_size_type (title_size_group,
                                                                            value_size_group,
@@ -185,8 +187,10 @@ create_incoming_security (ModestSecurityOptionsView* self,
                gtk_widget_show (entry_caption);
 
                /* Track changes in UI */
+#ifdef MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
                g_signal_connect (G_OBJECT (ppriv->port_view), "valid-changed",
                                            G_CALLBACK (on_valid_changed), self);
+#endif
        }
 }
 
@@ -239,7 +243,7 @@ on_entry_changed (GtkEditable *editable,
 
        if (!priv->missing_data &&
            ppriv->full &&
-           !modest_number_editor_is_valid (MODEST_NUMBER_EDITOR (ppriv->port_view)))
+           !modest_number_entry_is_valid (ppriv->port_view))
                priv->missing_data = TRUE;
 
        /* Emit a signal to notify if mandatory data is missing */
@@ -247,6 +251,7 @@ on_entry_changed (GtkEditable *editable,
                               priv->missing_data, NULL);
 }
 
+#ifdef MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
 static void
 on_valid_changed (ModestNumberEditor *editor,
                  gboolean valid,
@@ -254,6 +259,7 @@ on_valid_changed (ModestNumberEditor *editor,
 {
        on_entry_changed (NULL, (gpointer) self);
 }
+#endif
 
 static void
 create_outgoing_security (ModestSecurityOptionsView* self,
@@ -328,7 +334,8 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                                                            ppriv->pwd_entry,
                                                                            MODEST_EDITABLE_SIZE);
 
-               ppriv->port_view = GTK_WIDGET (modest_number_editor_new (PORT_MIN, PORT_MAX));
+               ppriv->port_view = modest_toolkit_factory_create_number_entry (modest_runtime_get_toolkit_factory (),
+                                                                              PORT_MIN, PORT_MAX);
                port_caption =
                        modest_maemo_utils_create_captioned_with_size_type (title_size_group,
                                                                            value_size_group,
@@ -346,8 +353,10 @@ create_outgoing_security (ModestSecurityOptionsView* self,
                                  G_CALLBACK (on_auth_changed), self);
                g_signal_connect (G_OBJECT (ppriv->user_entry), "changed",
                                  G_CALLBACK (on_entry_changed), self);
+#ifdef MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
                g_signal_connect (G_OBJECT (ppriv->port_view), "valid-changed",
                                            G_CALLBACK (on_valid_changed), self);
+#endif
        }
 
        /* Initialize widgets */
@@ -439,8 +448,8 @@ modest_maemo_security_options_view_load_settings (ModestSecurityOptionsView* sel
        } else if (ppriv->full) {
                /* Keep the user-entered port-number, or the
                 * already-appropriate automatic port number */
-               modest_number_editor_set_value (MODEST_NUMBER_EDITOR (ppriv->port_view), 
-                                               port_number);
+               modest_number_entry_set_value (ppriv->port_view,
+                                              port_number);
        }
        /* Frees */
        g_object_unref (server_settings);
@@ -462,7 +471,7 @@ modest_maemo_security_options_view_save_settings (ModestSecurityOptionsView* sel
                server_settings = modest_account_settings_get_transport_settings (settings);
 
        if (ppriv->full) {
-               server_port = modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
+               server_port = modest_number_entry_get_value (ppriv->port_view);
        } else {
                server_port = modest_serversecurity_picker_get_active_serversecurity_port (MODEST_SERVERSECURITY_PICKER (ppriv->security_view));
        }
@@ -493,7 +502,7 @@ modest_maemo_security_options_view_changed (ModestSecurityOptionsView* self,
                server_settings = modest_account_settings_get_transport_settings (settings);
        
        server_port = 
-               modest_number_editor_get_value (MODEST_NUMBER_EDITOR (ppriv->port_view));
+               modest_number_entry_get_value (ppriv->port_view);
 
        /* Frees */
        g_object_unref (server_settings);

diff --git a/src/widgets/modest-global-settings-dialog.c b/src/widgets/modest-global-settings-dialog.c
index 5641555..f7185ee 100644 (file)
--- a/src/widgets/modest-global-settings-dialog.c
+++ b/src/widgets/modest-global-settings-dialog.c
@@ -259,13 +259,7 @@ get_current_settings (ModestGlobalSettingsDialogPrivate *priv,
        state->default_account = NULL;
 #endif
        state->connect_via = *id;
-#ifndef MODEST_TOOLKIT_GTK
-#ifndef MODEST_TOOLKIT_HILDON2
-       state->size_limit = hildon_number_editor_get_value (HILDON_NUMBER_EDITOR (priv->size_limit));
-#endif
-#else
-       state->size_limit = gtk_spin_button_get_value (GTK_SPIN_BUTTON (priv->size_limit));
-#endif
+       state->size_limit = modest_number_entry_get_value (priv->size_limit);
 
 #ifdef MODEST_TOOLKIT_HILDON2
        id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->update_interval));

diff --git a/src/widgets/modest-toolkit-factory.c b/src/widgets/modest-toolkit-factory.c
index a9dd28a..989500a 100644 (file)
--- a/src/widgets/modest-toolkit-factory.c
+++ b/src/widgets/modest-toolkit-factory.c
@@ -40,7 +40,6 @@
 #define USE_GTK_CHECK_BUTTON
 #define USE_GTK_CHECK_MENU
 #define USE_GTK_ENTRY
-#define USE_GTK_SPIN_BUTTON
 #endif
 
 #ifdef USE_SCROLLED_WINDOW

diff --git a/src/widgets/modest-toolkit-factory.h b/src/widgets/modest-toolkit-factory.h
index 27900ef..075d988 100644 (file)
--- a/src/widgets/modest-toolkit-factory.h
+++ b/src/widgets/modest-toolkit-factory.h
@@ -103,6 +103,14 @@ modest_number_entry_set_value (GtkWidget *widget, gint value);
 gboolean
 modest_number_entry_is_valid (GtkWidget *widget);
 
+#ifndef MODEST_TOOLKIT_HILDON2
+#define USE_GTK_SPIN_BUTTON
+#endif
+
+#ifndef USE_GTK_SPIN_BUTTON
+#define MODEST_NUMBER_ENTRY_SUPPORT_VALID_CHANGED
+#endif
+
 G_END_DECLS
 
 #endif /* __MODEST_WP_TEXT_VIEW_H__ */