#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkstock.h>
#include "modest-hildon-includes.h"
}
static void
-on_modified_checkbutton_toggled (GtkButton *button, gpointer user_data)
+on_modified_checkbutton_toggled (GtkWidget *button, gpointer user_data)
{
set_modified (MODEST_DEFAULT_ACCOUNT_SETTINGS_DIALOG (user_data), TRUE);
}
} else if (HILDON_IS_PICKER_BUTTON (widget)) {
g_signal_connect (G_OBJECT (widget), "value-changed",
G_CALLBACK (on_modified_picker_changed), self);
- } else if (HILDON_IS_CHECK_BUTTON (widget)) {
+ } else if (modest_is_togglable (widget)) {
g_signal_connect (G_OBJECT (widget), "toggled",
G_CALLBACK (on_modified_checkbutton_toggled), self);
}
/* The leave-messages widgets: */
if(!priv->checkbox_leave_messages) {
priv->checkbox_leave_messages =
- hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
- gtk_button_set_label (GTK_BUTTON (priv->checkbox_leave_messages),
- _("mcen_fi_advsetup_leave_on_server"));
- gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_leave_messages), 0.0, 0.5);
+ modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+ _("mcen_fi_advsetup_leave_on_server"));
}
connect_for_modified (self, priv->checkbox_leave_messages);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_leave_messages, FALSE, FALSE, 0);
}
static void
-on_check_button_clicked (GtkButton *button, gpointer user_data)
+on_check_button_clicked (GtkWidget *button, gpointer user_data)
{
GtkWidget *widget = GTK_WIDGET (user_data);
/* Enable the widget only if the check button is active: */
- const gboolean enable = hildon_check_button_get_active (HILDON_CHECK_BUTTON (button));
+ const gboolean enable = modest_togglable_get_active (button);
gtk_widget_set_sensitive (widget, enable);
}
/* Make the sensitivity of a widget depend on a check button.
*/
static void
-enable_widget_for_checkbutton (GtkWidget *widget, GtkButton* button)
+enable_widget_for_checkbutton (GtkWidget *widget, GtkWidget* button)
{
g_signal_connect (G_OBJECT (button), "clicked",
G_CALLBACK (on_check_button_clicked), widget);
/* connection-specific checkbox: */
if (!priv->checkbox_outgoing_smtp_specific) {
- priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (MODEST_EDITABLE_SIZE);
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- FALSE);
- gtk_button_set_label (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- _("mcen_fi_advsetup_connection_smtp"));
- gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific), 0.0, 0.5);
+ priv->checkbox_outgoing_smtp_specific =
+ modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+ _("mcen_fi_advsetup_connection_smtp"));
+ modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific,
+ FALSE);
}
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
/* Only enable the button when the checkbox is checked: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
- GTK_BUTTON (priv->checkbox_outgoing_smtp_specific));
+ priv->checkbox_outgoing_smtp_specific);
g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
G_CALLBACK (on_button_outgoing_smtp_servers), self);
gtk_entry_set_text( GTK_ENTRY (priv->entry_user_email),
null_means_empty (modest_account_settings_get_email_address (settings)));
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages),
- modest_account_settings_get_leave_messages_on_server (settings));
+ modest_togglable_set_active (priv->checkbox_leave_messages,
+ modest_account_settings_get_leave_messages_on_server (settings));
incoming_account = modest_account_settings_get_store_settings (settings);
if (incoming_account) {
const gboolean has_specific =
modest_account_settings_get_use_connection_specific_smtp (settings);
- hildon_check_button_set_active (
- HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- has_specific);
+ modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific,
+ has_specific);
g_object_unref (outgoing_account);
}
modest_account_settings_set_signature (priv->settings, signature);
}
- leave_on_server = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->checkbox_leave_messages));
+ leave_on_server = modest_togglable_get_active (priv->checkbox_leave_messages);
modest_account_settings_set_leave_messages_on_server (priv->settings, leave_on_server);
store_settings = modest_account_settings_get_store_settings (priv->settings);
/* Save connection-specific SMTP server accounts: */
modest_account_settings_set_use_connection_specific_smtp
(priv->settings,
- hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ modest_togglable_get_active(priv->checkbox_outgoing_smtp_specific));
/* this configuration is not persistent, we should not save */
if (account_name != NULL)
#include <gtk/gtklabel.h>
#include <gtk/gtkentry.h>
#include <gtk/gtkbutton.h>
-#include <gtk/gtkcheckbutton.h>
#include <gtk/gtkmessagedialog.h>
#include <gtk/gtkseparator.h>
#include "modest-country-picker.h"
}
static void
-on_check_button_changed (HildonCheckButton *button, gpointer user_data)
+on_check_button_changed (GtkWidget *button, gpointer user_data)
{
GtkWidget *widget = GTK_WIDGET (user_data);
/* Enable the widget only if the check button is active: */
- const gboolean enable = hildon_check_button_get_active (button);
+ const gboolean enable = modest_togglable_get_active (button);
gtk_widget_set_sensitive (widget, enable);
}
/* Make the sensitivity of a widget depend on a check button.
*/
static void
-enable_widget_for_checkbutton (GtkWidget *widget, HildonCheckButton* button)
+enable_widget_for_checkbutton (GtkWidget *widget, GtkWidget* button)
{
g_signal_connect (G_OBJECT (button), "toggled",
G_CALLBACK (on_check_button_changed), widget);
gtk_widget_show (separator);
/* connection-specific checkbox: */
- priv->checkbox_outgoing_smtp_specific = hildon_check_button_new (HILDON_SIZE_FINGER_HEIGHT);
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- FALSE);
- gtk_button_set_label (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- _("mcen_fi_advsetup_connection_smtp"));
- gtk_button_set_alignment (GTK_BUTTON (priv->checkbox_outgoing_smtp_specific),
- 0.0, 0.5);
+ priv->checkbox_outgoing_smtp_specific = modest_toolkit_factory_create_check_button
+ (modest_runtime_get_toolkit_factory (),
+ _("mcen_fi_advsetup_connection_smtp"));
+ modest_togglable_set_active (priv->checkbox_outgoing_smtp_specific,
+ FALSE);
gtk_widget_show (priv->checkbox_outgoing_smtp_specific);
gtk_box_pack_start (GTK_BOX (box), priv->checkbox_outgoing_smtp_specific,
/* Only enable the button when the checkbox is checked: */
enable_widget_for_checkbutton (priv->button_outgoing_smtp_servers,
- HILDON_CHECK_BUTTON (priv->checkbox_outgoing_smtp_specific));
+ priv->checkbox_outgoing_smtp_specific);
g_signal_connect (G_OBJECT (priv->button_outgoing_smtp_servers), "clicked",
G_CALLBACK (on_button_outgoing_smtp_servers), self);
if (priv->checkbox_outgoing_smtp_specific) {
modest_account_settings_set_use_connection_specific_smtp
(priv->settings,
- hildon_check_button_get_active(HILDON_CHECK_BUTTON(priv->checkbox_outgoing_smtp_specific)));
+ modest_togglable_get_active(priv->checkbox_outgoing_smtp_specific));
}
display_name = get_entered_account_title (self);
gtk_box_pack_start (GTK_BOX (vbox), separator, FALSE, FALSE, MODEST_MARGIN_DEFAULT);
/* Auto update */
- ppriv->auto_update = hildon_check_button_new (MODEST_EDITABLE_SIZE);
- gtk_button_set_label (GTK_BUTTON (ppriv->auto_update), _("mcen_fi_options_autoupdate"));
- gtk_button_set_alignment (GTK_BUTTON (ppriv->auto_update), 0.0, 0.5);
+ ppriv->auto_update = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+ _("mcen_fi_options_autoupdate"));
gtk_box_pack_start (GTK_BOX (vbox), ppriv->auto_update, FALSE, FALSE, 0);
g_signal_connect (ppriv->auto_update, "clicked", G_CALLBACK (on_auto_update_clicked), self);
g_return_if_fail (MODEST_IS_GLOBAL_SETTINGS_DIALOG (dialog));
ppriv = MODEST_GLOBAL_SETTINGS_DIALOG_GET_PRIVATE (dialog);
- if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (ppriv->auto_update))) {
+ if (modest_togglable_get_active (ppriv->auto_update)) {
gtk_widget_set_sensitive (ppriv->connect_via, TRUE);
gtk_widget_set_sensitive (ppriv->update_interval, TRUE);
} else {
error = NULL;
checked = FALSE;
}
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->auto_update), checked);
+ modest_togglable_set_active (ppriv->auto_update, checked);
ppriv->initial_state.auto_update = checked;
/* Connected by */
#include "modest-secureauth-picker.h"
#include "modest-maemo-utils.h"
#include <modest-number-editor.h>
-#include <hildon/hildon-check-button.h>
#include "modest-hildon-includes.h"
#define PORT_MIN 1
if (MODEST_SECURITY_OPTIONS_VIEW (self)->type == MODEST_SECURITY_OPTIONS_INCOMING) {
/* Activate and dim checkbutton if it's secure */
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (ppriv->auth_view),
- is_secure);
+ modest_togglable_set_active (ppriv->auth_view,
+ is_secure);
gtk_widget_set_sensitive (ppriv->auth_view, !is_secure);
} else {
_("mcen_li_emailsetup_secure_connection"),
ppriv->security_view);
- ppriv->auth_view = hildon_check_button_new (MODEST_EDITABLE_SIZE);
- gtk_button_set_label (GTK_BUTTON (ppriv->auth_view), _("mcen_li_emailsetup_secure_authentication"));
- gtk_button_set_alignment (GTK_BUTTON (ppriv->auth_view), 0.0, 0.5);
+ ppriv->auth_view = modest_toolkit_factory_create_check_button (modest_runtime_get_toolkit_factory (),
+ _("mcen_li_emailsetup_secure_authentication"));
/* Track changes in UI */
g_signal_connect (G_OBJECT (ppriv->security_view), "value-changed",
auth_proto = modest_secureauth_picker_get_active_secureauth (picker);
is_secure = modest_protocol_registry_protocol_type_is_secure (protocol_registry,
auth_proto);
- } else if (HILDON_IS_CHECK_BUTTON (ppriv->auth_view)) {
- is_secure = hildon_check_button_get_active (HILDON_CHECK_BUTTON (ppriv->auth_view));
+ } else if (modest_is_togglable (ppriv->auth_view)) {
+ is_secure = modest_togglable_get_active (ppriv->auth_view);
}
if (is_secure &&
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);
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);
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')
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));
gint *id;
/* Get values from UI */
+ state->auto_update = modest_togglable_get_active (priv->auto_update);
#ifdef MODEST_TOOLKIT_HILDON2
id = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->connect_via));
- state->auto_update = hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auto_update));
state->default_account = modest_selector_picker_get_active_id (MODEST_SELECTOR_PICKER (priv->default_account_selector));
#else
id = modest_combo_box_get_active_id (MODEST_COMBO_BOX (priv->connect_via));
- state->auto_update = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auto_update));
state->default_account = NULL;
#endif
state->connect_via = *id;
/* Active the authentication checkbox */
if (modest_protocol_registry_protocol_type_is_secure (modest_runtime_get_protocol_registry (),
secure_auth))
-#ifdef MODEST_TOOLKIT_HILDON2
- hildon_check_button_set_active (HILDON_CHECK_BUTTON (priv->auth_view),
- TRUE);
-#else
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON (priv->auth_view),
- TRUE);
-#endif
+ modest_togglable_set_active (priv->auth_view,
+ TRUE);
} else {
#ifdef MODEST_TOOLKIT_HILDON2
modest_secureauth_picker_set_active_secureauth (
#endif
if (self->type == MODEST_SECURITY_OPTIONS_INCOMING) {
-#ifdef MODEST_TOOLKIT_HILDON2
- if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view))) {
-#else
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view))) {
-#endif
+ if (modest_togglable_get_active (priv->auth_view)) {
if (!modest_protocol_registry_protocol_type_is_secure (proto_registry,
security_proto)) {
/* TODO */
if (priv->full) {
}
} else {
-#ifdef MODEST_TOOLKIT_HILDON2
- if (hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view)))
-#else
- if (gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view)))
-#endif
+ if (modest_togglable_get_active (priv->auth_view))
state->auth = priv->initial_state.auth;
else
state->auth = MODEST_PROTOCOLS_AUTH_NONE;
modest_serversecurity_combo_box_get_active_serversecurity (MODEST_SERVERSECURITY_COMBO_BOX (priv->security_view));
#endif
-#ifdef MODEST_TOOLKIT_HILDON2
auth_active =
- hildon_check_button_get_active (HILDON_CHECK_BUTTON (priv->auth_view));
-#else
- auth_active =
- gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON (priv->auth_view));
-#endif
+ modest_togglable_get_active (priv->auth_view);
is_secure =
modest_protocol_registry_protocol_type_has_tag (protocol_registry,
security_incoming_type,
}
#endif
}
+
+gboolean
+modest_is_togglable (GtkWidget *widget)
+{
+#ifdef MODEST_TOOLKIT_HILDON2
+ return HILDON_IS_CHECK_BUTTON (widget);
+#else
+ return GTK_IS_CHECK_MENU_ITEM (widget) || GTK_IS_TOGGLE_BUTTON (widget);
+#endif
+}
void
modest_togglable_set_active (GtkWidget *widget, gboolean active);
+gboolean
+modest_is_togglable (GtkWidget *widget);
+
G_END_DECLS
#endif /* __MODEST_WP_TEXT_VIEW_H__ */