X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmodest-widget-factory.c;h=3ab285cbfadcb2a732acc3f02aed1d6f6dbb6b91;hp=f2853ea97d730ed104c00a10808c1bf4add41158;hb=9ad90e9053e1e0cc87885f714f513061ac734632;hpb=5fbaec5e4a94c7620074e621246742e5749ed68c diff --git a/src/modest-widget-factory.c b/src/modest-widget-factory.c index f2853ea..3ab285c 100644 --- a/src/modest-widget-factory.c +++ b/src/modest-widget-factory.c @@ -28,7 +28,9 @@ */ #include "modest-widget-factory.h" -/* include other impl specific header files */ +#include +#include +#include /* 'private'/'protected' functions */ static void modest_widget_factory_class_init (ModestWidgetFactoryClass *klass); @@ -38,9 +40,9 @@ static void modest_widget_factory_finalize (GObject *obj); /* callbacks */ static void on_folder_selected (ModestFolderView *folder_view, - TnyMsgFolderIface *folder, + TnyFolder *folder, ModestWidgetFactory *self); -static void on_message_selected (ModestHeaderView *header_view, TnyMsgIface *msg, +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); @@ -51,6 +53,17 @@ static void on_msg_link_clicked (ModestMsgView *msgview, const gchar* lin static void on_msg_attachment_clicked (ModestMsgView *msgview, int index, ModestWidgetFactory *self); +static void on_connection_changed (TnyDevice *device, gboolean online, + ModestWidgetFactory *self); +static void on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *factory); + +static void on_password_requested (ModestTnyAccountStore *account_store, const gchar* account_name, + gchar **password, gboolean *cancel, ModestWidgetFactory *self); + +static void on_item_not_found (ModestHeaderView* header_view, ModestItemType type, + ModestWidgetFactory *self); + + /* list my signals */ enum { /* MY_SIGNAL_1, */ @@ -58,34 +71,24 @@ enum { LAST_SIGNAL }; - -enum _StatusID { - STATUS_ID_HEADER, - STATUS_ID_FOLDER, - STATUS_ID_MESSAGE, - - STATUS_ID_NUM -}; -typedef enum _StatusID StatusID; - typedef struct _ModestWidgetFactoryPrivate ModestWidgetFactoryPrivate; struct _ModestWidgetFactoryPrivate { ModestTnyAccountStore *account_store; ModestAccountMgr *account_mgr; ModestConf *conf; + ModestProtocolMgr *proto_mgr; ModestHeaderView *header_view; ModestFolderView *folder_view; ModestMsgView *msg_preview; + ModestToolbar *main_toolbar, *edit_toolbar; GtkWidget *progress_bar; GtkWidget *status_bar; - - gboolean auto_connect; + GtkWidget *folder_info_label; - StatusID status_bar_ctx[STATUS_ID_NUM]; - + GtkWidget *online_toggle; }; #define MODEST_WIDGET_FACTORY_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_WIDGET_FACTORY, \ @@ -111,6 +114,7 @@ modest_widget_factory_get_type (void) sizeof(ModestWidgetFactory), 1, /* n_preallocs */ (GInstanceInitFunc) modest_widget_factory_init, + NULL }; my_type = g_type_register_static (G_TYPE_OBJECT, "ModestWidgetFactory", @@ -140,6 +144,7 @@ modest_widget_factory_init (ModestWidgetFactory *obj) priv->conf = NULL; priv->account_mgr = NULL; priv->account_store = NULL; + 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), @@ -147,16 +152,6 @@ modest_widget_factory_init (ModestWidgetFactory *obj) priv->status_bar = gtk_statusbar_new (); gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(priv->status_bar), FALSE); - - priv->status_bar_ctx[STATUS_ID_HEADER] = - gtk_statusbar_get_context_id (GTK_STATUSBAR(priv->status_bar), - "header"); - priv->status_bar_ctx[STATUS_ID_MESSAGE] = - gtk_statusbar_get_context_id (GTK_STATUSBAR(priv->status_bar), - "message"); - priv->status_bar_ctx[STATUS_ID_FOLDER] = - gtk_statusbar_get_context_id (GTK_STATUSBAR(priv->status_bar), - "folder"); } static void @@ -174,7 +169,12 @@ modest_widget_factory_finalize (GObject *obj) g_object_unref (G_OBJECT(priv->conf)); priv->conf = NULL; } - + + if (priv->proto_mgr) { + g_object_unref (G_OBJECT(priv->proto_mgr)); + priv->proto_mgr = NULL; + } + if (priv->account_store) { g_object_unref (G_OBJECT(priv->account_store)); priv->account_store = NULL; @@ -182,6 +182,57 @@ modest_widget_factory_finalize (GObject *obj) } + +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); + + /* header view */ + g_signal_connect (G_OBJECT(priv->header_view), "status_update", + G_CALLBACK(on_header_status_update), self); + g_signal_connect (G_OBJECT(priv->header_view), "message_selected", + G_CALLBACK(on_message_selected), self); + g_signal_connect (G_OBJECT(priv->header_view), "item_not_found", + G_CALLBACK(on_item_not_found), self); + + + /* msg preview */ + 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); + + /* account store */ + g_signal_connect (G_OBJECT(priv->account_store), "password_requested", + G_CALLBACK(on_password_requested), self); + + /* FIXME: const casting is evil ==> tinymail */ + device = (TnyDevice*)tny_account_store_get_device + (TNY_ACCOUNT_STORE(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_is_online (device), + self); + } +} + static gboolean init_widgets (ModestWidgetFactory *self) { @@ -190,8 +241,7 @@ init_widgets (ModestWidgetFactory *self) /* folder view */ if (!(priv->folder_view = - MODEST_FOLDER_VIEW(modest_folder_view_new - (TNY_ACCOUNT_STORE_IFACE(priv->account_store))))) { + MODEST_FOLDER_VIEW(modest_folder_view_new (priv->account_store)))) { g_printerr ("modest: cannot instantiate folder view\n"); return FALSE; } @@ -203,28 +253,25 @@ init_widgets (ModestWidgetFactory *self) 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"); return FALSE; } - if (priv->auto_connect) { - 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); - } + + /* 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); + return TRUE; } @@ -232,8 +279,7 @@ init_widgets (ModestWidgetFactory *self) ModestWidgetFactory* modest_widget_factory_new (ModestConf *conf, ModestTnyAccountStore *account_store, - ModestAccountMgr *account_mgr, - gboolean auto_connect) + ModestAccountMgr *account_mgr) { GObject *obj; ModestWidgetFactoryPrivate *priv; @@ -245,8 +291,6 @@ modest_widget_factory_new (ModestConf *conf, obj = g_object_new(MODEST_TYPE_WIDGET_FACTORY, NULL); priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(obj); - priv->auto_connect = auto_connect; - g_object_ref (G_OBJECT(conf)); priv->conf = conf; @@ -321,43 +365,151 @@ modest_widget_factory_get_status_bar (ModestWidgetFactory *self) } + +static const GSList* +get_transports (ModestWidgetFactory *self) +{ + ModestWidgetFactoryPrivate *priv; + GSList *transports = NULL; + GSList *cursor, *accounts; + + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); + + cursor = accounts = modest_account_mgr_account_names (priv->account_mgr, NULL); + while (cursor) { + ModestAccountData *data; + gchar *account_name = (gchar*)cursor->data; + + data = modest_account_mgr_get_account_data (priv->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)account_name, + (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) +{ + ModestWidgetFactoryPrivate *priv; + const GSList *list = NULL; + GtkWidget* combo_box; + + g_return_val_if_fail (self, NULL); + + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); + + switch (type) { + case MODEST_COMBO_BOX_TYPE_STORE_PROTOS: + list = modest_protocol_mgr_get_store_protocols (priv->proto_mgr); + break; + case MODEST_COMBO_BOX_TYPE_TRANSPORT_PROTOS: + list = modest_protocol_mgr_get_transport_protocols (priv->proto_mgr); + break; + case MODEST_COMBO_BOX_TYPE_SECURITY_PROTOS: + list = modest_protocol_mgr_get_security_protocols (priv->proto_mgr); + break; + case MODEST_COMBO_BOX_TYPE_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_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_store_combo (ModestWidgetFactory *self) +modest_widget_factory_get_online_toggle (ModestWidgetFactory *self) { - GtkWidget *combo; - GtkListStore *store; - GtkTreeIter iter; - const gchar **protos, **cursor; + g_return_val_if_fail (self, NULL); + return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->online_toggle; +} + + +GtkWidget* +modest_widget_factory_get_folder_info_label (ModestWidgetFactory *self) +{ g_return_val_if_fail (self, NULL); + return MODEST_WIDGET_FACTORY_GET_PRIVATE(self)->folder_info_label; +} + +ModestToolbar* +modest_widget_factory_get_main_toolbar (ModestWidgetFactory *self, + GSList *items) +{ + ModestWidgetFactoryPrivate *priv; + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); - combo = gtk_combo_box_new_text (); - cursor = protos = modest_proto_store_protos (); - while (cursor && *cursor) { - gtk_combo_box_append_text (GTK_COMBO_BOX(combo), - (const gchar*)*cursor); - ++cursor; + if (priv->main_toolbar) + return priv->main_toolbar; + + priv->main_toolbar = modest_toolbar_new (items); + if (!priv->main_toolbar) { + g_printerr ("modest: failed to create main toolbar\n"); + return NULL; } - gtk_combo_box_set_active (GTK_COMBO_BOX(combo), 0); - return combo; + return priv->main_toolbar; +} + + +ModestToolbar* +modest_widget_factory_get_edit_toolbar (ModestWidgetFactory *self, + GSList *items) +{ + return modest_toolbar_new (items); } static void -on_folder_selected (ModestFolderView *folder_view, TnyMsgFolderIface *folder, +on_folder_selected (ModestFolderView *folder_view, TnyFolder *folder, ModestWidgetFactory *self) { ModestWidgetFactoryPrivate *priv; + 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); + + gtk_label_set_label (GTK_LABEL(priv->folder_info_label), txt); + g_free (txt); + } else + gtk_label_set_label (GTK_LABEL(priv->folder_info_label), ""); } static void -on_message_selected (ModestHeaderView *folder_view, TnyMsgIface *msg, +on_message_selected (ModestHeaderView *folder_view, TnyMsg *msg, ModestWidgetFactory *self) { ModestWidgetFactoryPrivate *priv; @@ -367,26 +519,67 @@ on_message_selected (ModestHeaderView *folder_view, TnyMsgIface *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) +{ + /* we need to test types, as this callback maybe called after the + * widgets have been destroyed + */ + if (GTK_IS_STATUSBAR(data->status_bar)) + gtk_statusbar_remove (GTK_STATUSBAR(data->status_bar), + 0, data->msg_id); + if (GTK_IS_PROGRESS_BAR(data->progress_bar)) + gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(data->progress_bar), + 1.0); + g_free (data); + 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); - if (msg && status_id) { - gchar *msg = g_strdup_printf ("%s", msg); - gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_bar)); - gtk_statusbar_push (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_HEADER], - msg); - g_free (msg); - } else { - gtk_statusbar_pop (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_HEADER]); - gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(priv->progress_bar), - 1.0); - } + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); + + gtk_progress_bar_pulse (GTK_PROGRESS_BAR(priv->progress_bar)); + statusbar_push (self, 0, msg); } @@ -396,14 +589,8 @@ on_msg_link_hover (ModestMsgView *msgview, const gchar* link, { ModestWidgetFactoryPrivate *priv; priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); - - if (link) - gtk_statusbar_push (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_MESSAGE], - link); - else - gtk_statusbar_pop (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_MESSAGE]); + + statusbar_push (self, 0, link); } @@ -412,28 +599,151 @@ static void on_msg_link_clicked (ModestMsgView *msgview, const gchar* link, ModestWidgetFactory *self) { - ModestWidgetFactoryPrivate *priv; - priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); - - if (link) { - gchar *msg = g_strdup_printf (_("Opening %s..."), link); - gtk_statusbar_push (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_MESSAGE], - msg); - g_free (msg); - } + 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) { + gchar *msg; + + msg = g_strdup_printf (_("Opening attachment %d..."), index); + statusbar_push (self, 0, msg); + + g_free (msg); +} + + +static void +on_connection_changed (TnyDevice *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")); + + statusbar_push (self, 0, online ? _("Modest went online") : _("Modest went offline")); +} + + +static void +on_online_toggle_toggled (GtkToggleButton *toggle, ModestWidgetFactory *self) +{ + gboolean online; + const TnyDevice *device; + ModestWidgetFactoryPrivate *priv; - gchar *msg = g_strdup_printf (_("Opening attachment %d..."), index); - gtk_statusbar_push (GTK_STATUSBAR(priv->status_bar), - priv->status_bar_ctx[STATUS_ID_MESSAGE], - msg); - g_free (msg); + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); + online = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(priv->online_toggle)); + device = tny_account_store_get_device + (TNY_ACCOUNT_STORE(priv->account_store)); + + /* FIXME: const casting should not be necessary ==> tinymail */ + if (online) /* we're moving to online state */ + tny_device_force_online ((TnyDevice*)device); + else /* we're moving to offline state */ + tny_device_force_offline ((TnyDevice*)device); +} + + +static void on_item_not_found (ModestHeaderView* header_view, ModestItemType type, + ModestWidgetFactory *self) +{ + /* FIXME ==> ask from UI... */ + GtkWidget *dialog; + gchar *txt; + gboolean online; + gchar *item = type == MODEST_ITEM_TYPE_FOLDER ? "folder" : "message"; + + TnyDevice *device; + ModestWidgetFactoryPrivate *priv; + + priv = MODEST_WIDGET_FACTORY_GET_PRIVATE(self); + device = tny_account_store_get_device + (TNY_ACCOUNT_STORE(priv->account_store)); + + online = tny_device_is_online (device); + if (online) { + /* already online -- the item is simply not there... */ + dialog = gtk_message_dialog_new (NULL, + GTK_DIALOG_MODAL, + GTK_MESSAGE_WARNING, + GTK_BUTTONS_OK, + _("The %s you selected cannot be found"), + item); + gtk_dialog_run (GTK_DIALOG(dialog)); + } else { + + dialog = gtk_dialog_new_with_buttons (_("Connection requested"), + NULL, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + NULL); + + txt = g_strdup_printf (_("This %s is not available in offline mode.\n" + "Do you want to get online?"), item); + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), + gtk_label_new (txt), FALSE, FALSE, 0); + gtk_widget_show_all (GTK_WIDGET(GTK_DIALOG(dialog)->vbox)); + g_free (txt); + + gtk_window_set_default_size (GTK_WINDOW(dialog), 300, 300); + if (gtk_dialog_run (GTK_DIALOG(dialog)) == GTK_RESPONSE_ACCEPT) + tny_device_force_online (device); + } + gtk_widget_destroy (dialog); +} + + + +static void +on_password_requested (ModestTnyAccountStore *account_store, const gchar* account_name, + gchar **password, gboolean *cancel, ModestWidgetFactory *self) +{ + gchar *txt; + GtkWidget *dialog, *entry; + + dialog = gtk_dialog_new_with_buttons (_("Password requested"), + NULL, + GTK_DIALOG_MODAL, + GTK_STOCK_CANCEL, + GTK_RESPONSE_REJECT, + GTK_STOCK_OK, + GTK_RESPONSE_ACCEPT, + 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); + + entry = gtk_entry_new_with_max_length (40); + gtk_entry_set_visibility (GTK_ENTRY(entry), FALSE); + gtk_entry_set_invisible_char (GTK_ENTRY(entry), 0x2022); /* bullet unichar */ + + gtk_box_pack_start (GTK_BOX(GTK_DIALOG(dialog)->vbox), entry, + TRUE, FALSE, 0); + + 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))); + *cancel = FALSE; + } else { + *password = NULL; + *cancel = TRUE; + } + gtk_widget_destroy (dialog); } +