*/
#include "modest-provider-picker.h"
+#include <hildon/hildon-touch-selector-entry.h>
#include <gtk/gtkliststore.h>
#include <gtk/gtkcelllayout.h>
#include <gtk/gtkcellrenderertext.h>
#include <modest-text-utils.h>
#include "modest-protocol-registry.h"
#include "modest-runtime.h"
+#include <modest-account-protocol.h>
#include <stdlib.h>
#include <string.h> /* For memcpy() */
MODEL_COL_ID_TYPE
};
+static gint
+id_type_index (ModestProviderPickerIdType id_type)
+{
+ switch (id_type) {
+ case MODEST_PROVIDER_PICKER_ID_OTHER:
+ return 2;
+ break;
+ case MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL:
+ return 1;
+ break;
+ case MODEST_PROVIDER_PICKER_ID_PROVIDER:
+ default:
+ return 0;
+ }
+}
/*
* strictly, we should sort providers with mcc=0 after the other ones.... but, we don't have
provider_sort_func (GtkTreeModel *model, GtkTreeIter *iter1, GtkTreeIter *iter2, gpointer user_data)
{
gchar *prov1, *prov2;
+ ModestProviderPickerIdType id_type1, id_type2;
gint retval;
- gtk_tree_model_get (model, iter1, MODEL_COL_NAME, &prov1, -1);
- gtk_tree_model_get (model, iter2, MODEL_COL_NAME, &prov2, -1);
+ gtk_tree_model_get (model, iter1,
+ MODEL_COL_NAME, &prov1,
+ MODEL_COL_ID_TYPE, &id_type1,
+ -1);
+ gtk_tree_model_get (model, iter2,
+ MODEL_COL_NAME, &prov2,
+ MODEL_COL_ID_TYPE, &id_type2,
+ -1);
+
+ retval = id_type_index (id_type2) - id_type_index (id_type1);
+ if (retval != 0)
+ goto end;
if (strcmp (prov1, prov2) == 0)
retval = 0;
retval = 1;
else
retval = modest_text_utils_utf8_strcmp (prov1, prov2, TRUE);
-
+end:
g_free (prov1);
g_free (prov2);
}
static gchar *
-touch_selector_print_func (HildonTouchSelector *selector)
+touch_selector_print_func (HildonTouchSelector *selector, gpointer userdata)
{
GtkTreeIter iter;
if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector), 0, &iter)) {
}
ModestProviderPicker*
-modest_provider_picker_new (void)
+modest_provider_picker_new (HildonSizeType size,
+ HildonButtonArrangement arrangement)
{
ModestProviderPickerPrivate *priv;
ModestProviderPicker *self;
GtkCellRenderer *renderer;
GtkWidget *selector;
+ HildonTouchSelectorColumn *column;
self = g_object_new (MODEST_TYPE_PROVIDER_PICKER,
- "arrangement", HILDON_BUTTON_ARRANGEMENT_VERTICAL,
- "size", HILDON_SIZE_AUTO,
+ "arrangement", arrangement,
+ "size", size,
NULL);
priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
renderer = gtk_cell_renderer_text_new ();
g_object_set (G_OBJECT (renderer), "ellipsize", PANGO_ELLIPSIZE_END, NULL);
- selector = hildon_touch_selector_new ();
- hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (priv->model),
- renderer, "text", MODEL_COL_NAME, NULL);
+ selector = hildon_touch_selector_entry_new ();
+ hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector),
+ (HildonTouchSelectorPrintFunc) touch_selector_print_func);
+ column = hildon_touch_selector_append_column (HILDON_TOUCH_SELECTOR (selector), GTK_TREE_MODEL (priv->model),
+ renderer, "text", MODEL_COL_NAME, NULL);
+ hildon_touch_selector_entry_set_text_column (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+ MODEL_COL_NAME);
+ /* Set this _after_ loading from file, it makes loading faster */
hildon_touch_selector_set_model (HILDON_TOUCH_SELECTOR (selector), 0, GTK_TREE_MODEL (priv->model));
- hildon_touch_selector_set_print_func (HILDON_TOUCH_SELECTOR (selector), touch_selector_print_func);
+ hildon_touch_selector_entry_set_input_mode (HILDON_TOUCH_SELECTOR_ENTRY (selector),
+ HILDON_GTK_INPUT_MODE_ALPHA |
+ HILDON_GTK_INPUT_MODE_SPECIAL |
+ HILDON_GTK_INPUT_MODE_AUTOCAP);
+
hildon_picker_button_set_selector (HILDON_PICKER_BUTTON (self), HILDON_TOUCH_SELECTOR (selector));
modest_provider_picker_set_others_provider (MODEST_PROVIDER_PICKER (self));
registry = modest_runtime_get_protocol_registry ();
provider_protos = modest_protocol_registry_get_by_tag (registry,
MODEST_PROTOCOL_REGISTRY_PROVIDER_PROTOCOLS);
- tmp = provider_protos;
- while (tmp) {
+ for (tmp = provider_protos; tmp != NULL; tmp = g_slist_next (tmp)) {
+
GtkTreeIter iter;
ModestProtocol *proto = MODEST_PROTOCOL (tmp->data);
const gchar *name = modest_protocol_get_display_name (proto);
/* only add store protocols, no need to duplicate them */
- if (modest_protocol_registry_protocol_type_has_tag (registry,
- modest_protocol_get_type_id (proto),
- MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS)) {
- gtk_list_store_append (liststore, &iter);
- gtk_list_store_set (liststore, &iter,
- MODEL_COL_ID, modest_protocol_get_name (proto),
- MODEL_COL_NAME, name,
- MODEL_COL_ID_TYPE, MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL,
- -1);
+ if (!modest_protocol_registry_protocol_type_has_tag (registry,
+ modest_protocol_get_type_id (proto),
+ MODEST_PROTOCOL_REGISTRY_STORE_PROTOCOLS))
+ continue;
+
+ if (modest_protocol_registry_protocol_type_has_tag
+ (registry,
+ modest_protocol_get_type_id (proto),
+ MODEST_PROTOCOL_REGISTRY_SINGLETON_PROVIDER_PROTOCOLS)) {
+ /* Check if there's already an account configured with this account type */
+ if (modest_account_mgr_singleton_protocol_exists (modest_runtime_get_account_mgr (),
+ modest_protocol_get_type_id (proto)))
+ continue;
}
- tmp = g_slist_next (tmp);
+
+ if (MODEST_ACCOUNT_PROTOCOL (proto) &&
+ !modest_account_protocol_is_supported (MODEST_ACCOUNT_PROTOCOL (proto))) {
+ continue;
+ }
+
+ gtk_list_store_append (liststore, &iter);
+ gtk_list_store_set (liststore, &iter,
+ MODEL_COL_ID, modest_protocol_get_name (proto),
+ MODEL_COL_NAME, name,
+ MODEL_COL_ID_TYPE, MODEST_PROVIDER_PICKER_ID_PLUGIN_PROTOCOL,
+ -1);
}
g_slist_free (provider_protos);
selector = GTK_WIDGET (hildon_picker_button_get_selector (HILDON_PICKER_BUTTON(self)));
- if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (self), 0, &active)) {
+ if (hildon_touch_selector_get_selected (HILDON_TOUCH_SELECTOR (selector), 0, &active)) {
ModestProviderPickerPrivate *priv = MODEST_PROVIDER_PICKER_GET_PRIVATE (self);
ModestProviderPickerIdType id_type;
projects / modest / blobdiff