* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.h>
+#include <tny-gtk-account-list-model.h>
+#include <tny-gtk-folder-store-tree-model.h>
+#include <tny-account-store.h>
+#include <tny-device.h>
+#include <tny-folder-store-query.h>
#include "modest-widget-factory.h"
-#include <tny-account-store-iface.h>
-#include <tny-device-iface.h>
+#include "modest-widget-memory.h"
+#include "modest-protocol-mgr.h"
+#include "modest-tny-platform-factory.h"
+#include "modest-account-mgr.h"
+#include "modest-mail-operation.h"
+#include "widgets/modest-header-view-priv.h"
/* 'private'/'protected' functions */
static void modest_widget_factory_class_init (ModestWidgetFactoryClass *klass);
static void modest_widget_factory_finalize (GObject *obj);
-/* callbacks */
-static void on_folder_selected (ModestFolderView *folder_view,
- TnyMsgFolderIface *folder,
- ModestWidgetFactory *self);
-static void on_message_selected (ModestHeaderView *header_view, TnyMsgIface *msg,
- ModestWidgetFactory *self);
-static void on_header_status_update (ModestHeaderView *header_view, const gchar *msg,
- gint status_id, ModestWidgetFactory *self);
-static void on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
- ModestWidgetFactory *self);
-static void on_msg_link_clicked (ModestMsgView *msgview, const gchar* link,
- ModestWidgetFactory *self);
-static void on_msg_attachment_clicked (ModestMsgView *msgview, int index,
- ModestWidgetFactory *self);
-
-static void on_connection_changed (TnyDeviceIface *device, gboolean online,
- ModestWidgetFactory *self);
-static void on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *factory);
-
-
/* list my signals */
enum {
/* MY_SIGNAL_1, */
typedef struct _ModestWidgetFactoryPrivate ModestWidgetFactoryPrivate;
struct _ModestWidgetFactoryPrivate {
- ModestTnyAccountStore *account_store;
- ModestAccountMgr *account_mgr;
- ModestConf *conf;
+ TnyPlatformFactory *fact;
+ ModestProtocolMgr *proto_mgr;
+ TnyAccountStore *account_store;
- ModestHeaderView *header_view;
- ModestFolderView *folder_view;
- ModestMsgView *msg_preview;
+ ModestHeaderView *header_view;
+ ModestFolderView *folder_view;
+ ModestMsgView *msg_preview;
- GtkWidget *progress_bar;
- GtkWidget *status_bar;
+ GtkWidget *progress_bar;
+ GtkWidget *status_bar;
+ GtkWidget *folder_info_label;
- GtkWidget *online_toggle;
+ GtkWidget *online_toggle;
};
#define MODEST_WIDGET_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_WIDGET_FACTORY, \
sizeof(ModestWidgetFactory),
1, /* n_preallocs */
(GInstanceInitFunc) modest_widget_factory_init,
+ NULL
};
my_type = g_type_register_static (G_TYPE_OBJECT,
"ModestWidgetFactory",
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
- priv->conf = NULL;
- priv->account_mgr = NULL;
- priv->account_store = NULL;
+ 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->progress_bar = gtk_progress_bar_new ();
gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar),
FALSE);
}
+
static void
modest_widget_factory_finalize (GObject *obj)
{
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
- if (priv->account_mgr) {
- g_object_unref (G_OBJECT(priv->account_mgr));
- priv->account_mgr = NULL;
+ if (priv->proto_mgr) {
+ g_object_unref (G_OBJECT(priv->proto_mgr));
+ priv->proto_mgr = NULL;
}
- if (priv->conf) {
- g_object_unref (G_OBJECT(priv->conf));
- priv->conf = NULL;
- }
-
- if (priv->account_store) {
- g_object_unref (G_OBJECT(priv->account_store));
- priv->account_store = NULL;
- }
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
-
-static void
-init_signals (ModestWidgetFactory *self)
-{
-
- TnyDeviceIface *device;
- ModestWidgetFactoryPrivate *priv;
-
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- g_signal_connect (G_OBJECT(priv->header_view), "message_selected",
- G_CALLBACK(on_message_selected), self);
- g_signal_connect (G_OBJECT(priv->folder_view), "folder_selected",
- G_CALLBACK(on_folder_selected), self);
- g_signal_connect (G_OBJECT(priv->header_view), "status_update",
- G_CALLBACK(on_header_status_update), self);
- g_signal_connect (G_OBJECT(priv->msg_preview), "link_clicked",
- G_CALLBACK(on_msg_link_clicked), self);
- g_signal_connect (G_OBJECT(priv->msg_preview), "link_hover",
- G_CALLBACK(on_msg_link_hover), self);
- g_signal_connect (G_OBJECT(priv->msg_preview), "attachment_clicked",
- G_CALLBACK(on_msg_attachment_clicked), self);
-
- /* FIXME: const casting is evil ==> tinymail */
- device = (TnyDeviceIface*)tny_account_store_iface_get_device
- (TNY_ACCOUNT_STORE_IFACE(priv->account_store));
- if (device) {
- g_signal_connect (G_OBJECT(device), "connection_changed",
- G_CALLBACK(on_connection_changed), self);
- g_signal_connect (G_OBJECT(priv->online_toggle), "toggled",
- G_CALLBACK(on_online_toggle_toggled), self);
-
- /* init toggle in correct state */
- on_connection_changed (device,
- tny_device_iface_is_online (device),
- self);
- }
-}
-
static gboolean
init_widgets (ModestWidgetFactory *self)
{
ModestWidgetFactoryPrivate *priv;
+ TnyFolderStoreQuery *query;
+
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
/* 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 (priv->account_store)))) {
+ MODEST_FOLDER_VIEW(modest_folder_view_new (MODEST_TNY_ACCOUNT_STORE (priv->account_store),
+ query)))) {
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)))) {
+ (NULL, NULL,0)))) {
g_printerr ("modest: cannot instantiate header view\n");
return FALSE;
}
-
-
+
/* msg preview */
if (!(priv->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL)))) {
g_printerr ("modest: cannot instantiate header view\n");
}
+
/* online/offline combo */
priv->online_toggle = gtk_toggle_button_new ();
+
+ /* label with number of items, unread items for
+ the current folder */
+ priv->folder_info_label = gtk_label_new (NULL);
- init_signals (self);
+/* init_signals (self); */
return TRUE;
}
ModestWidgetFactory*
-modest_widget_factory_new (ModestConf *conf,
- ModestTnyAccountStore *account_store,
- ModestAccountMgr *account_mgr)
+modest_widget_factory_new (void)
{
GObject *obj;
ModestWidgetFactoryPrivate *priv;
- g_return_val_if_fail (account_store, NULL);
- g_return_val_if_fail (account_mgr, NULL);
- g_return_val_if_fail (conf, NULL);
-
- obj = g_object_new(MODEST_TYPE_WIDGET_FACTORY, NULL);
+ obj = g_object_new (MODEST_TYPE_WIDGET_FACTORY, NULL);
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj);
- g_object_ref (G_OBJECT(conf));
- priv->conf = conf;
-
- g_object_ref (G_OBJECT(account_mgr));
- priv->account_mgr = account_mgr;
-
- g_object_ref (G_OBJECT(account_store));
- 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);
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 (priv->account_mgr);
+ return modest_account_view_new (account_mgr);
}
}
+
+static const GSList*
+get_transports (ModestWidgetFactory *self)
+{
+ ModestWidgetFactoryPrivate *priv;
+ ModestAccountMgr *account_mgr;
+ GSList *transports = NULL;
+ GSList *cursor, *accounts;
+
+ priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
+
+ account_mgr =
+ modest_tny_platform_factory_get_modest_account_mgr_instance (priv->fact);
+ cursor = accounts = modest_account_mgr_account_names (account_mgr, NULL);
+ while (cursor) {
+ ModestAccountData *data;
+ gchar *account_name = (gchar*)cursor->data;
+
+ data = modest_account_mgr_get_account_data (account_mgr, account_name);
+ if (data && data->transport_account) {
+ 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);
+ }
+ /* don't free account name; it's freed when the transports list is freed */
+ cursor = cursor->next;
+ }
+ g_slist_free (accounts);
+
+ return transports;
+}
+
+
GtkWidget*
modest_widget_factory_get_combo_box (ModestWidgetFactory *self, ModestComboBoxType type)
{
- GtkWidget *combo_box;
- const gchar **protos, **cursor;
-
+ ModestWidgetFactoryPrivate *priv;
+ const GSList *list = NULL;
+ GtkWidget* combo_box;
+
g_return_val_if_fail (self, NULL);
- combo_box = gtk_combo_box_new_text ();
+ priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
switch (type) {
case MODEST_COMBO_BOX_TYPE_STORE_PROTOS:
- cursor = protos = modest_proto_store_protos ();
+ list = modest_protocol_mgr_get_store_protocols (priv->proto_mgr);
break;
case MODEST_COMBO_BOX_TYPE_TRANSPORT_PROTOS:
- cursor = protos = modest_proto_transport_protos ();
+ list = modest_protocol_mgr_get_transport_protocols (priv->proto_mgr);
break;
case MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS:
- cursor = protos = modest_proto_security_protos ();
+ list = modest_protocol_mgr_get_security_protocols (priv->proto_mgr);
break;
case MODEST_COMBO_BOX_TYPE_AUTH_PROTOS:
- cursor = protos = modest_proto_auth_protos ();
+ list = modest_protocol_mgr_get_auth_protocols (priv->proto_mgr);
+ break;
+ case MODEST_COMBO_BOX_TYPE_TRANSPORTS:
+ list = get_transports (self);
break;
default:
- g_assert_not_reached ();
- }
- while (cursor && *cursor) {
- gtk_combo_box_append_text (GTK_COMBO_BOX(combo_box),
- (const gchar*)*cursor);
- ++cursor;
+ g_warning ("invalid combo box type: %d", type);
+ return NULL;
}
+
+ combo_box = modest_combo_box_new (list);
gtk_combo_box_set_active (GTK_COMBO_BOX(combo_box), 0);
return combo_box;
-
GtkWidget*
modest_widget_factory_get_online_toggle (ModestWidgetFactory *self)
{
-static void
-on_folder_selected (ModestFolderView *folder_view, TnyMsgFolderIface *folder,
- ModestWidgetFactory *self)
-{
- ModestWidgetFactoryPrivate *priv;
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- modest_header_view_set_folder (priv->header_view, folder);
-}
-
-
-static void
-on_message_selected (ModestHeaderView *folder_view, TnyMsgIface *msg,
- ModestWidgetFactory *self)
-{
- ModestWidgetFactoryPrivate *priv;
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- modest_msg_view_set_message (priv->msg_preview, msg);
-}
-
-
-/*
- * below some stuff to clearup statusbar messages after 1,5 seconds....
- */
-typedef struct {
- GtkWidget *status_bar;
- GtkWidget *progress_bar;
- guint msg_id;
-} StatusRemoveData;
-
-
-static gboolean
-on_statusbar_remove_msg (StatusRemoveData *data)
-{
- gtk_statusbar_remove (GTK_STATUSBAR(data->status_bar), 0, data->msg_id);
- g_free (data);
-
- gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(data->progress_bar), 1.0);
-
- return FALSE;
-}
-
-
-static void
-statusbar_push (ModestWidgetFactory *self, guint context_id, const gchar *msg)
-{
- guint id;
- StatusRemoveData *data;
- ModestWidgetFactoryPrivate *priv;
-
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- if (!msg)
- return;
-
- id = gtk_statusbar_push (GTK_STATUSBAR(priv->status_bar), 0, msg);
-
- data = g_new (StatusRemoveData, 1);
- data->status_bar = priv->status_bar;
- data->progress_bar = priv->progress_bar;
- data->msg_id = id;
-
- g_timeout_add (1500, (GSourceFunc)on_statusbar_remove_msg, data);
-}
-/****************************************************************************/
-
-
-static void
-on_header_status_update (ModestHeaderView *header_view, const gchar *msg,
- gint status_id, ModestWidgetFactory *self)
-{
- ModestWidgetFactoryPrivate *priv;
-
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_bar));
- statusbar_push (self, 0, msg);
-}
-
-
-static void
-on_msg_link_hover (ModestMsgView *msgview, const gchar* link,
- ModestWidgetFactory *self)
-{
- ModestWidgetFactoryPrivate *priv;
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- statusbar_push (self, 0, link);
-
-}
-
-
-static void
-on_msg_link_clicked (ModestMsgView *msgview, const gchar* link,
- ModestWidgetFactory *self)
-{
- gchar *msg;
- msg = g_strdup_printf (_("Opening %s..."), link);
- statusbar_push (self, 0, msg);
- g_free (msg);
-}
-
-static void
-on_msg_attachment_clicked (ModestMsgView *msgview, int index,
- ModestWidgetFactory *self)
+GtkWidget*
+modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self)
{
- gchar *msg;
-
- msg = g_strdup_printf (_("Opening attachment %d..."), index);
- statusbar_push (self, 0, msg);
-
- g_free (msg);
+ g_return_val_if_fail (self, NULL);
+ return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->folder_info_label;
}
-static void
-on_connection_changed (TnyDeviceIface *device, gboolean online,
- ModestWidgetFactory *self)
-{
- ModestWidgetFactoryPrivate *priv;
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(priv->online_toggle),
- online);
- gtk_button_set_label (GTK_BUTTON(priv->online_toggle),
- online ? _("Online") : _("Offline"));
+/*********************** 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; */
- statusbar_push (self, 0, online ? _("Modest went online") : _("Modest went offline"));
-}
-
-
-static void
-on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *self)
-{
- gboolean online;
- const TnyDeviceIface *device;
- ModestWidgetFactoryPrivate *priv;
+/* selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (folder_view)); */
+/* gtk_tree_selection_get_selected (selection, &model, &iter); */
- priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
- online = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(priv->online_toggle));
- device = tny_account_store_iface_get_device
- (TNY_ACCOUNT_STORE_IFACE(priv->account_store));
-
- /* FIXME: const casting should not be necessary ==> tinymail */
- if (online) /* we're moving to online state */
- tny_device_iface_force_online ((TnyDeviceIface*)device);
- else /* we're moving to offline state */
- tny_device_iface_force_offline ((TnyDeviceIface*)device);
-}
+/* 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