#include <glib/gi18n.h>
#include <gdk/gdkkeysyms.h>
#include "modest-widget-factory.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>
/* callbacks */
-static void on_folder_selected (ModestFolderView *folder_view,
- TnyFolder *folder,
- ModestWidgetFactory *self);
+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,
typedef struct _ModestWidgetFactoryPrivate ModestWidgetFactoryPrivate;
struct _ModestWidgetFactoryPrivate {
- TnyPlatformFactory *fact;
- TnyAccountStore *account_store;
- ModestProtocolMgr *proto_mgr;
+ 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->fact = modest_tny_platform_factory_get_instance ();
+ 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 ();
FALSE);
}
+
static void
modest_widget_factory_finalize (GObject *obj)
{
g_object_unref (G_OBJECT(priv->proto_mgr));
priv->proto_mgr = NULL;
}
+
+ G_OBJECT_CLASS(parent_class)->finalize (obj);
}
+/* FIXME: uninit these as well */
static void
init_signals (ModestWidgetFactory *self)
{
-
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);
static void
-on_folder_selected (ModestFolderView *folder_view, TnyFolder *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_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);
+ 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), "");
}
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);
}
gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox));
if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) {
- *password = g_strdup(gtk_entry_get_text (GTK_ENTRY(entry)));
+ *password = g_strdup (gtk_entry_get_text (GTK_ENTRY(entry)));
*cancel = FALSE;
} else {
*password = NULL;
projects / modest / blobdiff