* SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
*/
+#include <glib/gi18n.h>
+#include <gdk/gdkkeysyms.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 <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-tny-platform-factory.h"
+#include "modest-account-mgr.h"
+#include "modest-mail-operation.h"
+
/* 'private'/'protected' functions */
static void modest_widget_factory_class_init (ModestWidgetFactoryClass *klass);
/* callbacks */
-static void on_folder_selected (ModestFolderView *folder_view,
- TnyFolderIface *folder,
- ModestWidgetFactory *self);
-static void on_message_selected (ModestHeaderView *header_view, TnyMsgIface *msg,
+static void on_folder_selection_changed (ModestFolderView *folder_view,
+ TnyFolder *folder, gboolean selected,
+ ModestWidgetFactory *self);
+static void on_folder_key_press_event (ModestFolderView *header_view,
+ GdkEventKey *event,
+ gpointer user_data);
+static void on_message_selected (ModestHeaderView *header_view, TnyMsg *msg,
ModestWidgetFactory *self);
static void on_header_status_update (ModestHeaderView *header_view, const gchar *msg,
- gint status_id, ModestWidgetFactory *self);
+ gint num, gint total, 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,
static void on_msg_attachment_clicked (ModestMsgView *msgview, int index,
ModestWidgetFactory *self);
-static void on_connection_changed (TnyDeviceIface *device, gboolean online,
+static void on_connection_changed (TnyDevice *device, gboolean online,
ModestWidgetFactory *self);
static void on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *factory);
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;
- ModestToolbar *main_toolbar, *edit_toolbar;
+ ModestHeaderView *header_view;
+ ModestFolderView *folder_view;
+ ModestMsgView *msg_preview;
+ ModestToolbar *main_toolbar, *edit_toolbar;
- GtkWidget *progress_bar;
- GtkWidget *status_bar;
- GtkWidget *folder_info_label;
+ 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, \
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);
}
+/* FIXME: uninit these as well */
static void
init_signals (ModestWidgetFactory *self)
{
-
- TnyDeviceIface *device;
+ TnyDevice *device;
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
/* folder view */
- g_signal_connect (G_OBJECT(priv->folder_view), "folder_selected",
- G_CALLBACK(on_folder_selected), self);
+ g_signal_connect (G_OBJECT(priv->folder_view), "folder_selection_changed",
+ G_CALLBACK(on_folder_selection_changed), self);
+ g_signal_connect (G_OBJECT(priv->folder_view), "key-press-event",
+ G_CALLBACK(on_folder_key_press_event), self);
/* header view */
g_signal_connect (G_OBJECT(priv->header_view), "status_update",
G_CALLBACK(on_msg_attachment_clicked), self);
/* account store */
- g_signal_connect (G_OBJECT(priv->account_store), "password_requested",
+ g_signal_connect (G_OBJECT (priv->account_store), "password_requested",
G_CALLBACK(on_password_requested), self);
/* FIXME: const casting is evil ==> tinymail */
- device = (TnyDeviceIface*)tny_account_store_iface_get_device
- (TNY_ACCOUNT_STORE_IFACE(priv->account_store));
+ device = (TnyDevice*) tny_account_store_get_device (priv->account_store);
if (device) {
g_signal_connect (G_OBJECT(device), "connection_changed",
G_CALLBACK(on_connection_changed), self);
/* init toggle in correct state */
on_connection_changed (device,
- tny_device_iface_is_online (device),
+ tny_device_is_online (device),
self);
}
}
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 =
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, TnyFolderIface *folder,
- ModestWidgetFactory *self)
+on_folder_selection_changed (ModestFolderView *folder_view, TnyFolder *folder,
+ gboolean selected,
+ ModestWidgetFactory *self)
{
ModestWidgetFactoryPrivate *priv;
- gchar *txt;
+ gchar *txt;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- modest_header_view_set_folder (priv->header_view, folder);
-
- if (folder) {
- guint num, unread;
-
- num = tny_folder_iface_get_all_count (folder);
- unread = tny_folder_iface_get_unread_count (folder);
- txt = g_strdup_printf (_("%d %s, %d unread"),
- num, num==1 ? _("item") : _("items"), unread);
+ if (folder) {
+ ModestConf *conf;
- gtk_label_set_label (GTK_LABEL(priv->folder_info_label), txt);
- g_free (txt);
+ conf = modest_tny_platform_factory_get_modest_conf_instance (priv->fact);
+
+ if (!selected) { /* the folder was unselected; save it's settings */
+ modest_widget_memory_save (conf, G_OBJECT (priv->header_view),
+ "header-view");
+ } else { /* the folder was selected */
+ guint num, unread;
+ num = tny_folder_get_all_count (folder);
+ unread = tny_folder_get_unread_count (folder);
+
+ txt = g_strdup_printf (_("%d %s, %d unread"),
+ num, num==1 ? _("item") : _("items"), unread);
+ gtk_label_set_label (GTK_LABEL(priv->folder_info_label), txt);
+ g_free (txt);
+
+ modest_header_view_set_folder (priv->header_view, folder);
+ modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
+ "header-view");
+ }
} else
- gtk_label_set_label (GTK_LABEL(priv->folder_info_label), "");
+ gtk_label_set_label (GTK_LABEL(priv->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));
+}
+/****************************************************/
static void
-on_message_selected (ModestHeaderView *folder_view, TnyMsgIface *msg,
+on_message_selected (ModestHeaderView *folder_view, TnyMsg *msg,
ModestWidgetFactory *self)
{
ModestWidgetFactoryPrivate *priv;
static void
on_header_status_update (ModestHeaderView *header_view, const gchar *msg,
- gint status_id, ModestWidgetFactory *self)
+ gint num, gint total, ModestWidgetFactory *self)
{
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
-
- gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_bar));
+
+ if (total != 0)
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar),
+ (gdouble)num/(gdouble)total);
+ else
+ gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_bar));
+
statusbar_push (self, 0, msg);
}
static void
-on_connection_changed (TnyDeviceIface *device, gboolean online,
+on_connection_changed (TnyDevice *device, gboolean online,
ModestWidgetFactory *self)
{
ModestWidgetFactoryPrivate *priv;
on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *self)
{
gboolean online;
- const TnyDeviceIface *device;
+ const TnyDevice *device;
ModestWidgetFactoryPrivate *priv;
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));
+ device = tny_account_store_get_device (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);
+ tny_device_force_online ((TnyDevice*)device);
else /* we're moving to offline state */
- tny_device_iface_force_offline ((TnyDeviceIface*)device);
+ tny_device_force_offline ((TnyDevice*)device);
}
-static void on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
- ModestWidgetFactory *self)
+static void
+on_item_not_found (ModestHeaderView* header_view, ModestItemType type,
+ ModestWidgetFactory *self)
{
/* FIXME ==> ask from UI... */
GtkWidget *dialog;
gboolean online;
gchar *item = type == MODEST_ITEM_TYPE_FOLDER ? "folder" : "message";
- TnyDeviceIface *device;
+ TnyDevice *device;
ModestWidgetFactoryPrivate *priv;
priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self);
- device = tny_account_store_iface_get_device
- (TNY_ACCOUNT_STORE_IFACE(priv->account_store));
+ device = tny_account_store_get_device (priv->account_store);
- online = tny_device_iface_is_online (device);
+ online = tny_device_is_online (device);
if (online) {
/* already online -- the item is simply not there... */
dialog = gtk_message_dialog_new (NULL,
gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300);
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT)
- tny_device_iface_force_online (device);
+ tny_device_force_online (device);
}
gtk_widget_destroy (dialog);
}
gchar **password, gboolean *cancel, ModestWidgetFactory *self)
{
gchar *txt;
- GtkWidget *dialog, *entry;
+ GtkWidget *dialog, *entry, *remember_pass_check;
dialog = gtk_dialog_new_with_buttons (_("Password requested"),
NULL,
txt = g_strdup_printf (_("Please enter your password for %s"), account_name);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), gtk_label_new(txt),
FALSE, FALSE, 0);
- g_free (txt);
+ g_free (txt);
entry = gtk_entry_new_with_max_length (40);
gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE);
gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry,
TRUE, FALSE, 0);
-
+
+ remember_pass_check = gtk_check_button_new_with_label (_("Remember password"));
+ gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), remember_pass_check,
+ TRUE, FALSE, 0);
+
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
} else {
*password = NULL;
*cancel = TRUE;
- }
+ }
gtk_widget_destroy (dialog);
}
projects / modest / blobdiff