#include <tny-gtk-account-list-model.h>
#include <tny-gtk-folder-store-tree-model.h>
#include <tny-account-store.h>
+#include <tny-simple-list.h>
#include <tny-device.h>
#include <tny-folder-store-query.h>
#include "modest-widget-factory.h"
#include "modest-widget-memory.h"
-#include "modest-protocol-mgr.h"
+#include <modest-protocol-info.h>
#include "modest-tny-platform-factory.h"
-#include "modest-account-mgr.h"
+
+#include <modest-account-mgr.h>
+#include <modest-account-mgr-helpers.h>
+#include <modest-runtime.h>
+
#include "modest-mail-operation.h"
#include "widgets/modest-header-view-priv.h"
};
typedef struct _ModestWidgetFactoryPrivate ModestWidgetFactoryPrivate;
-struct _ModestWidgetFactoryPrivate {
-
- TnyPlatformFactory *fact;
- ModestProtocolMgr *proto_mgr;
- TnyAccountStore *account_store;
+struct _ModestWidgetFactoryPrivate {
+
+ ModestTnyAccountStore *account_store;
ModestHeaderView *header_view;
ModestFolderView *folder_view;
{
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
-
- priv->fact = modest_tny_platform_factory_get_instance ();
- priv->account_store = tny_platform_factory_new_account_store (priv->fact);
- priv->proto_mgr = modest_protocol_mgr_new ();
+
+ priv->account_store = NULL;
priv->progress_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar),
1.0);
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(priv->progress_bar),
+ PANGO_ELLIPSIZE_END);
priv->status_bar = gtk_statusbar_new ();
gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(priv->status_bar),
FALSE);
static void
modest_widget_factory_finalize (GObject *obj)
{
- ModestWidgetFactoryPrivate *priv;
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
-
- if (priv->proto_mgr) {
- g_object_unref (G_OBJECT(priv->proto_mgr));
- priv->proto_mgr = NULL;
- }
-
+ /* no need to unref account_store; we don't own the reference */
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
/* folder view */
query = tny_folder_store_query_new ();
tny_folder_store_query_add_item (query, NULL, TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
- if (!(priv->folder_view =
- MODEST_FOLDER_VIEW(modest_folder_view_new (MODEST_TNY_ACCOUNT_STORE (priv->account_store),
- query)))) {
+
+ priv->folder_view = MODEST_FOLDER_VIEW(modest_folder_view_new (priv->account_store,query));
+ if (!priv->folder_view) {
g_printerr ("modest: cannot instantiate folder view\n");
return FALSE;
- }
+ }
g_object_unref (G_OBJECT (query));
-
+
/* header view */
- if (!(priv->header_view =
- MODEST_HEADER_VIEW(modest_header_view_new
- (NULL, NULL,MODEST_HEADER_VIEW_STYLE_NORMAL)))) {
+ priv->header_view =
+ MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
+ if (!priv->header_view) {
g_printerr ("modest: cannot instantiate header view\n");
return FALSE;
}
-
-
+
/* msg preview */
- if (!(priv->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL)))) {
+ priv->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL));
+ if (!priv->msg_preview) {
g_printerr ("modest: cannot instantiate header view\n");
return FALSE;
}
-
-
/* online/offline combo */
priv->online_toggle = gtk_toggle_button_new ();
the current folder */
priv->folder_info_label = gtk_label_new (NULL);
-/* init_signals (self); */
-
return TRUE;
}
ModestWidgetFactory*
-modest_widget_factory_new (void)
+modest_widget_factory_new (ModestTnyAccountStore *account_store)
{
GObject *obj;
ModestWidgetFactoryPrivate *priv;
+ g_return_val_if_fail (account_store, NULL);
+
obj = g_object_new (MODEST_TYPE_WIDGET_FACTORY, NULL);
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
-
+
+ priv->account_store = account_store;
+
if (!init_widgets (MODEST_WIDGET_FACTORY(obj))) {
g_printerr ("modest: widget factory failed to init widgets\n");
g_object_unref (obj);
ModestAccountView*
modest_widget_factory_get_account_view (ModestWidgetFactory *self)
{
- ModestWidgetFactoryPrivate *priv;
- ModestAccountMgr *account_mgr;
-
- g_return_val_if_fail (self, NULL);
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- account_mgr =
- modest_tny_platform_factory_get_modest_account_mgr_instance (priv->fact);
-
- return modest_account_view_new (account_mgr);
+ return modest_account_view_new (modest_runtime_get_account_mgr());
}
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
- account_mgr =
- modest_tny_platform_factory_get_modest_account_mgr_instance (priv->fact);
+ account_mgr = modest_runtime_get_account_mgr();
cursor = accounts = modest_account_mgr_account_names (account_mgr, NULL);
while (cursor) {
ModestAccountData *data;
data = modest_account_mgr_get_account_data (account_mgr, account_name);
if (data && data->transport_account) {
+ ModestPair *pair;
gchar *display_name = g_strdup_printf ("%s (%s)", data->email, account_name);
- ModestPair *pair = modest_pair_new ((gpointer) data,
- (gpointer) display_name , TRUE);
- transports = g_slist_append (transports, pair);
+ pair = modest_pair_new ((gpointer) data,
+ (gpointer) display_name , TRUE);
+ transports = g_slist_prepend (transports, pair);
}
/* don't free account name; it's freed when the transports list is freed */
cursor = cursor->next;
}
+#if 0
+static const GSList*
+get_stores (ModestWidgetFactory *self, gboolean only_remote)
+{
+ ModestWidgetFactoryPrivate *priv;
+ TnyAccountStore *account_store;
+ TnyList *stores;
+ TnyIterator *iter;
+
+ priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
+
+ account_store =
+ tny_platform_factory_new_account_store (priv->fact);
+
+ stores = tny_simple_list_new ();
+ tny_account_store_get_accounts (account_store, stores,
+ TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+
+ /* simply return all the stores */
+ if (!only_remote)
+ return stores;
+
+ /* remove the non-remote stores from the list */
+ if (only_remote) {
+ iter = tny_list_create_iterator (stores);
+ while (!tny_iterator_is_done (iter)) {
+ TnyAccount *acc = (TnyAccount*)tny_iterator_get_current(iter);
+ /* is it a local account? if so, remove */
+ ModestProtocol proto = modest_protocol_info_get_protocol (tny_account_get_proto(acc));
+ if (modest_protocol_info_protocol_is_local_store(proto))
+ tny_list_remove (stores, acc); /* FIXME: iter still valid? */
+ tny_iterator_next (iter);
+ }
+ g_object_unref (G_OBJECT(iter));
+ }
+ return stores;
+}
+#endif
+
GtkWidget*
modest_widget_factory_get_combo_box (ModestWidgetFactory *self, ModestComboBoxType type)
{
ModestWidgetFactoryPrivate *priv;
- const GSList *list = NULL;
+ ModestPairList *protos = NULL;
GtkWidget* combo_box;
g_return_val_if_fail (self, NULL);
switch (type) {
case MODEST_COMBO_BOX_TYPE_STORE_PROTOS:
- list = modest_protocol_mgr_get_store_protocols (priv->proto_mgr);
+ protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_STORE);
break;
case MODEST_COMBO_BOX_TYPE_TRANSPORT_PROTOS:
- list = modest_protocol_mgr_get_transport_protocols (priv->proto_mgr);
+ protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_TRANSPORT);
break;
case MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS:
- list = modest_protocol_mgr_get_security_protocols (priv->proto_mgr);
+ protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_SECURITY);
break;
case MODEST_COMBO_BOX_TYPE_AUTH_PROTOS:
- list = modest_protocol_mgr_get_auth_protocols (priv->proto_mgr);
+ protos = modest_protocol_info_get_protocol_pair_list (MODEST_PROTOCOL_TYPE_AUTH);
break;
case MODEST_COMBO_BOX_TYPE_TRANSPORTS:
- list = get_transports (self);
+ protos = (ModestPairList *) get_transports (self);
break;
+/* case MODEST_COMBO_BOX_TYPE_REMOTE_STORES: */
+/* // FIXME */
+/* list = get_stores (self, TRUE); /\* get all *remote* stores *\/ */
+/* combo_box = gtk_combo_box_new_with_model (GTK_TREE_MODEL(list)); */
+/* g_object_unref (G_OBJECT(list)); */
+/* //return combo_box; */
default:
g_warning ("invalid combo box type: %d", type);
return NULL;
}
- combo_box = modest_combo_box_new (list);
+ combo_box = modest_combo_box_new (protos);
+ g_slist_free (protos);
+
gtk_combo_box_set_active (GTK_COMBO_BOX(combo_box), 0);
return combo_box;
g_return_val_if_fail (self, NULL);
return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->folder_info_label;
}
-
-
-/*********************** Test code ********************/
-/* static void */
-/* on_folder_key_press_event (ModestFolderView *folder_view, GdkEventKey *event, gpointer user_data) */
-/* { */
-/* GtkTreeSelection *selection; */
-/* GtkTreeModel *model; */
-/* GtkTreeIter iter; */
-/* TnyFolderStore *folder; */
-/* gint type; */
-/* ModestMailOperation *mail_op; */
-
-/* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); */
-/* gtk_tree_selection_get_selected (selection, &model, &iter); */
-
-/* gtk_tree_model_get (model, &iter, */
-/* TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, &type, */
-/* TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, &folder, */
-/* -1); */
-
-/* mail_op = modest_mail_operation_new (); */
-
-/* if (event->keyval == GDK_C || event->keyval == GDK_c) { */
-/* if (type != TNY_FOLDER_TYPE_ROOT) */
-/* modest_mail_operation_create_folder (mail_op, folder, "New"); */
-/* } else if (event->keyval == GDK_D || event->keyval == GDK_d) { */
-/* if (type != TNY_FOLDER_TYPE_ROOT) */
-/* modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), FALSE); */
-/* } else if (event->keyval == GDK_N || event->keyval == GDK_n) { */
-/* if (type != TNY_FOLDER_TYPE_ROOT) */
-/* modest_mail_operation_rename_folder (mail_op, TNY_FOLDER (folder), "New Name"); */
-/* } else if (event->keyval == GDK_T || event->keyval == GDK_t) { */
-/* if (type != TNY_FOLDER_TYPE_ROOT) */
-/* modest_mail_operation_remove_folder (mail_op, TNY_FOLDER (folder), TRUE); */
-/* } */
-
-/* g_object_unref (G_OBJECT (mail_op)); */
-/* } */
projects / modest / blobdiff