*/
#include <glib/gi18n.h>
-#include <gtk/gtkaboutdialog.h>
#include <gtk/gtktreeviewcolumn.h>
+#include <modest-runtime.h>
-#include <modest-widget-memory.h>
-#include <modest-icon-factory.h>
+#include <widgets/modest-main-window.h>
+#include <widgets/modest-window-priv.h>
+#include <widgets/modest-msg-edit-window.h>
+#include "modest-account-view-window.h"
-#include <widgets/modest-toolbar.h>
-#include "modest-main-window.h"
-#include "modest-account-view-window.h"
+#include "modest-widget-memory.h"
+#include "modest-ui-actions.h"
+#include "modest-main-window-ui.h"
#include "modest-account-mgr.h"
#include "modest-conf.h"
-#include "modest-edit-msg-window.h"
-#include "modest-icon-names.h"
-#include "modest-tny-platform-factory.h"
-#include "modest-tny-msg-actions.h"
+#include <modest-tny-msg.h>
#include "modest-mail-operation.h"
+#include "modest-icon-names.h"
/* 'private'/'protected' functions */
static void modest_main_window_class_init (ModestMainWindowClass *klass);
static void restore_sizes (ModestMainWindow *self);
static void save_sizes (ModestMainWindow *self);
-static void get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data);
+
+static gboolean on_header_view_button_press_event (ModestHeaderView *header_view,
+ GdkEventButton *event,
+ ModestMainWindow *self);
+
+static gboolean on_folder_view_button_press_event (ModestFolderView *folder_view,
+ GdkEventButton *event,
+ ModestMainWindow *self);
+
+static gboolean show_context_popup_menu (ModestMainWindow *window,
+ GtkTreeView *tree_view,
+ GdkEventButton *event,
+ GtkWidget *menu);
+
+static void connect_signals (ModestMainWindow *self);
+
/* list my signals */
enum {
typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
struct _ModestMainWindowPrivate {
- GtkWidget *toolbar;
- GtkWidget *menubar;
-
GtkWidget *folder_paned;
GtkWidget *msg_paned;
GtkWidget *main_paned;
- ModestWidgetFactory *widget_factory;
- TnyPlatformFactory *factory;
-
- ModestHeaderView *header_view;
- ModestFolderView *folder_view;
- ModestMsgView *msg_preview;
+ GtkWidget *online_toggle;
+ GtkWidget *folder_info_label;
};
ModestMailOperationReplyType reply_type;
ModestMailOperationForwardType forward_type;
gchar *from;
+ TnyIterator *iter;
} GetMsgAsyncHelper;
/* globals */
(GInstanceInitFunc) modest_main_window_init,
NULL
};
- my_type = g_type_register_static (GTK_TYPE_WINDOW,
+ my_type = g_type_register_static (MODEST_TYPE_WINDOW,
"ModestMainWindow",
&my_info, 0);
}
gobject_class->finalize = modest_main_window_finalize;
g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
-
- /* signal definitions go here, e.g.: */
-/* signals[MY_SIGNAL_1] = */
-/* g_signal_new ("my_signal_1",....); */
-/* signals[MY_SIGNAL_2] = */
-/* g_signal_new ("my_signal_2",....); */
-/* etc. */
}
static void
modest_main_window_init (ModestMainWindow *obj)
{
ModestMainWindowPrivate *priv;
-
+ TnyFolderStoreQuery *query;
+
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- priv->factory = modest_tny_platform_factory_get_instance ();
+ priv->folder_paned = NULL;
+ priv->msg_paned = NULL;
+ priv->main_paned = NULL;
+
+ /* folder view */
+ query = tny_folder_store_query_new ();
+ tny_folder_store_query_add_item (query, NULL,
+ TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED);
+
+ obj->folder_view =
+ MODEST_FOLDER_VIEW(modest_folder_view_new (modest_runtime_get_account_store(),
+ query));
+ if (!obj->folder_view)
+ g_printerr ("modest: cannot instantiate folder view\n");
+ g_object_unref (G_OBJECT (query));
+
+ /* header view */
+ obj->header_view =
+ MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
+ if (!obj->header_view)
+ g_printerr ("modest: cannot instantiate header view\n");
+
+ /* msg preview */
+ obj->msg_preview = MODEST_MSG_VIEW(modest_msg_view_new (NULL));
+ if (!obj->msg_preview)
+ g_printerr ("modest: cannot instantiate msgpreiew\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);
+
+ /* status bar */
+ obj->status_bar = gtk_statusbar_new ();
+ gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR(obj->status_bar),
+ FALSE);
+
+ /* progress bar */
+ obj->progress_bar = gtk_progress_bar_new ();
+ gtk_progress_bar_set_fraction (GTK_PROGRESS_BAR(obj->progress_bar), 1.0);
+ gtk_progress_bar_set_ellipsize (GTK_PROGRESS_BAR(obj->progress_bar),
+ PANGO_ELLIPSIZE_END);
}
static void
modest_main_window_finalize (GObject *obj)
{
- ModestMainWindowPrivate *priv;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
- if (priv->widget_factory) {
- g_object_unref (G_OBJECT(priv->widget_factory));
- priv->widget_factory = NULL;
- }
-
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
static void
-on_menu_about (GtkWidget *widget, gpointer data)
-{
- GtkWidget *about;
- const gchar *authors[] = {
- "Dirk-Jan C. Binnema <dirk-jan.binnema@nokia.com>",
- NULL
- };
- about = gtk_about_dialog_new ();
- gtk_about_dialog_set_name (GTK_ABOUT_DIALOG(about), PACKAGE_NAME);
- gtk_about_dialog_set_version (GTK_ABOUT_DIALOG(about),PACKAGE_VERSION);
- gtk_about_dialog_set_copyright (
- GTK_ABOUT_DIALOG(about),
- _("Copyright (c) 2006, Nokia Corporation\n"
- "All rights reserved."));
- gtk_about_dialog_set_comments ( GTK_ABOUT_DIALOG(about),
- _("a modest e-mail client\n\n"
- "design and implementation: Dirk-Jan C. Binnema\n"
- "contributions from the fine people at KernelConcepts and Igalia\n"
- "uses the tinymail email framework written by Philip van Hoof"));
- gtk_about_dialog_set_authors (GTK_ABOUT_DIALOG(about), authors);
- gtk_about_dialog_set_website (GTK_ABOUT_DIALOG(about), "http://modest.garage.maemo.org");
-
- gtk_dialog_run (GTK_DIALOG (about));
- gtk_widget_destroy(about);
-}
-
-
-static void
-on_menu_accounts (ModestMainWindow *self, guint action, GtkWidget *widget)
+restore_sizes (ModestMainWindow *self)
{
- GtkWidget *account_win;
+ ModestConf *conf;
ModestMainWindowPrivate *priv;
-
- g_return_if_fail (widget);
- g_return_if_fail (self);
+ ModestWindowPrivate *parent_priv;
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- account_win = modest_account_view_window_new (priv->widget_factory);
-
- gtk_window_set_transient_for (GTK_WINDOW(account_win),
- GTK_WINDOW(self));
-
- gtk_widget_show (account_win);
-}
-
-
-static void
-on_menu_new_message (ModestMainWindow *self, guint action, GtkWidget *widget)
-{
- GtkWidget *msg_win;
- ModestMainWindowPrivate *priv;
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-
- msg_win = modest_edit_msg_window_new (priv->widget_factory,
- MODEST_EDIT_TYPE_NEW,
- NULL);
- gtk_widget_show (msg_win);
-}
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
-static void
-get_msg_cb (TnyFolder *folder, TnyMsg *msg, GError **err, gpointer user_data)
-{
- GtkWidget *msg_win;
- TnyHeader *new_header;
- TnyMsg *new_msg;
- ModestMainWindowPrivate *priv;
- ModestEditType edit_type = -2;
- GetMsgAsyncHelper *helper;
-
- helper = (GetMsgAsyncHelper *) (user_data);
- priv = helper->main_window_private;
-
- /* FIXME: select proper action */
- new_msg = NULL;
- switch (helper->action) {
- case 1:
- new_msg =
- modest_mail_operation_create_reply_mail (msg, helper->from, helper->reply_type,
- MODEST_MAIL_OPERATION_REPLY_MODE_SENDER);
- edit_type = MODEST_EDIT_TYPE_REPLY;
- break;
- case 2:
- new_msg =
- modest_mail_operation_create_reply_mail (msg, helper->from, helper->reply_type,
- MODEST_MAIL_OPERATION_REPLY_MODE_ALL);
- edit_type = MODEST_EDIT_TYPE_REPLY;
- break;
- case 3:
- new_msg =
- modest_mail_operation_create_forward_mail (msg, helper->from, helper->forward_type);
- edit_type = MODEST_EDIT_TYPE_FORWARD;
- break;
- default:
- g_warning ("unexpected action type: %d", helper->action);
- }
+ conf = modest_runtime_get_conf ();
- if (new_msg) {
- /* Set from */
- new_header = tny_msg_get_header (new_msg);
- tny_header_set_from (new_header, helper->from);
-
- /* Show edit window */
- msg_win = modest_edit_msg_window_new (priv->widget_factory,
- edit_type,
- new_msg);
- gtk_widget_show (msg_win);
-
- /* Clean and go on */
- g_object_unref (new_msg);
- }
+ modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
+ "modest-folder-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned),
+ "modest-msg-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
+ "modest-main-paned");
+ modest_widget_memory_restore (conf, G_OBJECT(self->header_view),"header-view");
+ modest_widget_memory_restore (conf,G_OBJECT(self), "modest-main-window");
}
+
static void
-on_menu_reply_forward (ModestMainWindow *self, guint action, GtkWidget *widget)
+save_sizes (ModestMainWindow *self)
{
+ ModestWindowPrivate *parent_priv;
ModestMainWindowPrivate *priv;
- ModestHeaderView *header_view;
- TnyList *header_list;
- TnyIterator *iter;
- gchar *reply_key, *forward_key;
- ModestMailOperationReplyType reply_type;
- ModestMailOperationForwardType forward_type;
ModestConf *conf;
- GError *error;
- GetMsgAsyncHelper *helper;
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
-
- header_view = modest_widget_factory_get_header_view (priv->widget_factory);
- header_list = modest_header_view_get_selected_headers (header_view);
-
- /* Get reply and forward types */
- error = NULL;
- reply_key = g_strdup_printf ("%s/%s", MODEST_CONF_NAMESPACE, MODEST_CONF_REPLY_TYPE);
- reply_type = modest_conf_get_int (conf, reply_key, &error);
- if (error || reply_type == 0) {
- g_warning ("key %s not defined", reply_key);
- reply_type = MODEST_MAIL_OPERATION_REPLY_TYPE_CITE;
- if (error) {
- g_error_free (error);
- error = NULL;
- }
- }
- g_free (reply_key);
- forward_key = g_strdup_printf ("%s/%s", MODEST_CONF_NAMESPACE, MODEST_CONF_FORWARD_TYPE);
- forward_type = modest_conf_get_int (conf, forward_key, &error);
- if (error || forward_type == 0) {
- g_warning ("key %s not defined", forward_key);
- forward_type = MODEST_MAIL_OPERATION_FORWARD_TYPE_INLINE;
- if (error) {
- g_error_free (error);
- error = NULL;
- }
- }
- g_free (forward_key);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ conf = modest_runtime_get_conf ();
- if (header_list) {
- TnyHeader *header;
- TnyFolder *folder;
- gchar *from, *email_key;
- const gchar *account_name;
-
- /* We assume that we can only select messages of the
- same folder and that we reply all of them from the
- same account. In fact the interface currently only
- allows single selection */
- account_name = modest_folder_view_get_selected_account (priv->folder_view);
- email_key = g_strdup_printf ("%s/%s/%s", MODEST_ACCOUNT_NAMESPACE,
- account_name, MODEST_ACCOUNT_EMAIL);
- from = modest_conf_get_string (conf, email_key, NULL);
- g_free (email_key);
-
- iter = tny_list_create_iterator (header_list);
- header = TNY_HEADER (tny_iterator_get_current (iter));
- folder = tny_header_get_folder (header);
-
- do {
- /* Since it's not an object, we need to create
- it each time due to it's not a GObject and
- we can not do a g_object_ref. No need to
- free it, tinymail will do it for us. */
- helper = g_slice_new0 (GetMsgAsyncHelper);
- helper->main_window_private = priv;
- helper->reply_type = reply_type;
- helper->forward_type = forward_type;
- helper->action = action;
- helper->from = from;
-
- /* Get msg from header */
- header = TNY_HEADER (tny_iterator_get_current (iter));
- tny_folder_get_msg_async (folder, header, get_msg_cb, helper);
- tny_iterator_next (iter);
-
- } while (!tny_iterator_is_done (iter));
-
- /* Clean */
- g_free (from);
- g_object_unref (G_OBJECT (iter));
- g_object_unref (G_OBJECT (folder));
- }
+ modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
+ modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
+ "modest-folder-paned");
+ modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned),
+ "modest-msg-paned");
+ modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
+ "modest-main-paned");
+ modest_widget_memory_save (conf, G_OBJECT(self->header_view), "header-view");
}
-static void
-on_menu_quit (ModestMainWindow *self, guint action, GtkWidget *widget)
-{
- save_sizes (self);
- gtk_widget_destroy (GTK_WIDGET(self));
-}
static void
-on_menu_delete (ModestMainWindow *self, guint action, GtkWidget *widget)
+on_connection_changed (TnyDevice *device, gboolean online, ModestMainWindow *self)
{
+ GtkWidget *icon;
+ const gchar *icon_name;
ModestMainWindowPrivate *priv;
- ModestHeaderView *header_view;
- TnyList *header_list;
- TnyIterator *iter;
- GtkTreeModel *model;
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-
- header_view = modest_widget_factory_get_header_view (priv->widget_factory);
- header_list = modest_header_view_get_selected_headers (header_view);
-
- if (header_list) {
- iter = tny_list_create_iterator (header_list);
- model = gtk_tree_view_get_model (GTK_TREE_VIEW (header_view));
- if (GTK_IS_TREE_MODEL_SORT (model))
- model = gtk_tree_model_sort_get_model (GTK_TREE_MODEL_SORT (model));
- do {
- TnyHeader *header;
- ModestMailOperation *mail_op;
-
- header = TNY_HEADER (tny_iterator_get_current (iter));
- /* TODO: thick grain mail operation involving
- a list of objects. Composite pattern ??? */
- mail_op = modest_mail_operation_new ();
-
- /* Move to trash */
- modest_mail_operation_remove_msg (mail_op, header, TRUE);
-
- /* Remove from tree model */
- tny_list_remove (TNY_LIST (model), G_OBJECT (header));
-
- g_object_unref (G_OBJECT (mail_op));
- g_object_unref (header);
- tny_iterator_next (iter);
-
- } while (!tny_iterator_is_done (iter));
- }
-}
-
-
-/* Our menu, an array of GtkItemFactoryEntry structures that defines each menu item */
-static GtkItemFactoryEntry menu_items[] = {
- { "/_File", NULL, NULL, 0, "<Branch>", NULL },
- { "/File/_New", "<control>N", NULL, 0, "<StockItem>", GTK_STOCK_NEW },
- { "/File/_Open", "<control>O", NULL, 0, "<StockItem>", GTK_STOCK_OPEN },
- { "/File/_Save", "<control>S", NULL, 0, "<StockItem>", GTK_STOCK_SAVE },
- { "/File/Save _As", NULL, NULL, 0, "<Item>", NULL },
- { "/File/sep1", NULL, NULL, 0, "<Separator>", NULL },
- { "/File/_Quit", "<CTRL>Q", on_menu_quit, 0, "<StockItem>", GTK_STOCK_QUIT },
-
- { "/_Edit", NULL, NULL, 0, "<Branch>", NULL },
- { "/Edit/_Undo", "<CTRL>Z", NULL, 0, "<StockItem>", GTK_STOCK_UNDO },
- { "/Edit/_Redo", "<shift><CTRL>Z", NULL, 0, "<StockItem>", GTK_STOCK_REDO },
- { "/File/sep1", NULL, NULL, 0, "<Separator>", NULL },
- { "/Edit/Cut", "<control>X", NULL, 0, "<StockItem>", GTK_STOCK_CUT },
- { "/Edit/Copy", "<CTRL>C", NULL, 0, "<StockItem>", GTK_STOCK_COPY },
- { "/Edit/Paste", NULL, NULL, 0, "<StockItem>", GTK_STOCK_PASTE},
- { "/Edit/sep1", NULL, NULL, 0, "<Separator>", NULL },
- { "/Edit/Delete", "<CTRL>Q", NULL, 0, "<Item>" ,NULL},
- { "/Edit/Select all", "<CTRL>A", NULL, 0, "<Item>" ,NULL},
- { "/Edit/Deelect all", "<Shift><CTRL>A", NULL, 0, "<Item>" ,NULL},
-
- { "/_Actions", NULL, NULL, 0, "<Branch>" ,NULL},
- { "/Actions/_New Message", NULL, on_menu_new_message, 0, "<Item>",NULL },
- { "/Actions/_Reply", NULL, on_menu_reply_forward, 1, "<Item>" ,NULL},
- { "/Actions/_Forward", NULL, on_menu_reply_forward, 3, "<Item>" ,NULL},
- { "/Actions/_Bounce", NULL, NULL, 0, "<Item>",NULL },
-
- { "/_Options", NULL, NULL, 0, "<Branch>" ,NULL},
- { "/Options/_Accounts", NULL, on_menu_accounts,0, "<Item>" ,NULL},
- { "/Options/_Contacts", NULL, NULL, 0, "<Item>" ,NULL },
-
-
- { "/_Help", NULL, NULL, 0, "<Branch>" ,NULL},
- { "/_Help/About", NULL, on_menu_about, 0, "<StockItem>", GTK_STOCK_ABOUT},
-};
-
-static gint nmenu_items = sizeof (menu_items) / sizeof (menu_items[0]);
-
-
-static GtkWidget *
-menubar_new (ModestMainWindow *self)
-{
- GtkItemFactory *item_factory;
- GtkAccelGroup *accel_group;
-
- /* Make an accelerator group (shortcut keys) */
- accel_group = gtk_accel_group_new ();
-
- /* Make an ItemFactory (that makes a menubar) */
- item_factory = gtk_item_factory_new (GTK_TYPE_MENU_BAR, "<main>",
- accel_group);
-
- /* This function generates the menu items. Pass the item factory,
- the number of items in the array, the array itself, and any
- callback data for the the menu items. */
- gtk_item_factory_create_items (item_factory, nmenu_items, menu_items, self);
-
- ///* Attach the new accelerator group to the window. */
- gtk_window_add_accel_group (GTK_WINDOW (self), accel_group);
- /* Finally, return the actual menu bar created by the item factory. */
- return gtk_item_factory_get_widget (item_factory, "<main>");
-}
+ g_return_if_fail (device);
+ g_return_if_fail (self);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ icon_name = online ? GTK_STOCK_CONNECT : GTK_STOCK_DISCONNECT;
+ icon = gtk_image_new_from_icon_name (icon_name, GTK_ICON_SIZE_BUTTON);
+ /* Block handlers in order to avoid unnecessary calls */
+ //g_signal_handler_block (G_OBJECT (priv->online_toggle), priv->toggle_button_signal);
+ gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(priv->online_toggle), online);
+ //g_signal_handler_unblock (G_OBJECT (online_toggle), priv->toggle_button_signal);
-static ModestHeaderView*
-header_view_new (ModestMainWindow *self)
-{
- int i;
- GList *columns = NULL;
- ModestHeaderView *header_view;
- ModestMainWindowPrivate *priv;
- ModestHeaderViewColumn cols[] = {
- MODEST_HEADER_VIEW_COLUMN_MSGTYPE,
- MODEST_HEADER_VIEW_COLUMN_ATTACH,
-/* MODEST_HEADER_VIEW_COLUMN_COMPACT_HEADER, */
- MODEST_HEADER_VIEW_COLUMN_FROM,
- MODEST_HEADER_VIEW_COLUMN_SUBJECT,
- MODEST_HEADER_VIEW_COLUMN_RECEIVED_DATE
- };
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ gtk_button_set_image (GTK_BUTTON(priv->online_toggle), icon);
+ //statusbar_push (widget_factory, 0, online ? _("Modest went online") : _("Modest went offline"));
- for (i = 0 ; i != sizeof(cols) / sizeof(ModestHeaderViewColumn); ++i)
- columns = g_list_append (columns, GINT_TO_POINTER(cols[i]));
+ /* If Modest has became online and the header view has a
+ header selected then show it */
+ /* FIXME: there is a race condition if some account needs to
+ ask the user for a password */
- header_view = modest_widget_factory_get_header_view (priv->widget_factory);
- modest_header_view_set_columns (header_view, columns);
- g_list_free (columns);
+/* if (online) { */
+/* GtkTreeSelection *selected; */
- return header_view;
+/* selected = gtk_tree_view_get_selection (GTK_TREE_VIEW (header_view)); */
+/* _modest_header_view_change_selection (selected, header_view); */
+/* } */
}
-static void
-on_toolbar_button_clicked (ModestToolbar *toolbar, ModestToolbarButton button_id,
- ModestMainWindow *self)
+void
+on_online_toggle_toggled (GtkToggleButton *toggle, ModestMainWindow *self)
{
- GtkTreeSelection *sel;
- GtkTreeIter iter;
- GtkTreeModel *model;
+ gboolean online;
+ TnyDevice *device;
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
-
- switch (button_id) {
- case MODEST_TOOLBAR_BUTTON_NEW_MAIL:
- on_menu_new_message (self, 0, NULL);
- break;
- case MODEST_TOOLBAR_BUTTON_REPLY:
- on_menu_reply_forward (self, 1, NULL);
- break;
- case MODEST_TOOLBAR_BUTTON_REPLY_ALL:
- on_menu_reply_forward (self, 2, NULL);
- break;
- case MODEST_TOOLBAR_BUTTON_FORWARD:
- on_menu_reply_forward (self, 3, NULL);
- break;
- case MODEST_TOOLBAR_BUTTON_SEND_RECEIVE:
-
- case MODEST_TOOLBAR_BUTTON_NEXT:
- sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->header_view));
- if (sel) {
- gtk_tree_selection_get_selected (sel, &model, &iter);
- gtk_tree_model_iter_next (model, &iter);
- gtk_tree_selection_select_iter (sel, &iter);
- }
-
- case MODEST_TOOLBAR_BUTTON_PREV:
- /* if (sel) { */
-/* gtk_tree_selection_get_selected (sel, &model, &iter); */
-/* gtk_tree_model_iter_prev (model, &iter); */
-/* gtk_tree_selection_select_iter (sel, &iter); */
-/* } */
-
- break;
- case MODEST_TOOLBAR_BUTTON_DELETE:
- on_menu_delete (self, 0, GTK_WIDGET (toolbar));
- break;
-
- default:
- g_printerr ("modest: key %d pressed\n", button_id);
- }
-}
+ device = tny_account_store_get_device
+ (TNY_ACCOUNT_STORE(modest_runtime_get_account_store()));
-static ModestToolbar*
-toolbar_new (ModestMainWindow *self)
-{
- int i;
- ModestToolbar *toolbar;
- GSList *buttons = NULL;
- ModestMainWindowPrivate *priv;
+ online = gtk_toggle_button_get_active (GTK_TOGGLE_BUTTON(priv->online_toggle));
- ModestToolbarButton button_ids[] = {
- MODEST_TOOLBAR_BUTTON_NEW_MAIL,
- MODEST_TOOLBAR_BUTTON_REPLY,
- MODEST_TOOLBAR_BUTTON_REPLY_ALL,
- MODEST_TOOLBAR_BUTTON_FORWARD,
- MODEST_TOOLBAR_SEPARATOR,
- MODEST_TOOLBAR_BUTTON_SEND_RECEIVE,
- MODEST_TOOLBAR_SEPARATOR,
- MODEST_TOOLBAR_BUTTON_PREV,
- MODEST_TOOLBAR_BUTTON_NEXT,
- MODEST_TOOLBAR_SEPARATOR,
- MODEST_TOOLBAR_BUTTON_DELETE
- };
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ if (online)
+ tny_device_force_online (device);
+ else
+ tny_device_force_offline (device);
- for (i = 0 ; i != sizeof(button_ids) / sizeof(ModestToolbarButton); ++i)
- buttons = g_slist_append (buttons, GINT_TO_POINTER(button_ids[i]));
-
- toolbar = modest_widget_factory_get_main_toolbar (priv->widget_factory, buttons);
- g_slist_free (buttons);
-
- g_signal_connect (G_OBJECT(toolbar), "button_clicked",
- G_CALLBACK(on_toolbar_button_clicked), self);
-
- return toolbar;
+ g_object_unref (G_OBJECT (device));
}
-
+static gboolean
+on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
+{
+ save_sizes (self);
+ return FALSE;
+}
static void
-restore_sizes (ModestMainWindow *self)
+on_destroy (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
{
- ModestConf *conf;
- ModestMainWindowPrivate *priv;
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
-
- modest_widget_memory_restore (conf,G_OBJECT(self),
- "modest-main-window");
- modest_widget_memory_restore (conf, G_OBJECT(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_restore (conf, G_OBJECT(priv->msg_paned),
- "modest-msg-paned");
- modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
- "modest-main-paned");
- modest_widget_memory_restore (conf, G_OBJECT(priv->header_view),
- "header-view");
+ gtk_main_quit();
}
+
static void
-save_sizes (ModestMainWindow *self)
-{
+connect_signals (ModestMainWindow *self)
+{
+ ModestWindowPrivate *parent_priv;
ModestMainWindowPrivate *priv;
- ModestConf *conf;
+ TnyDevice *device;
+ ModestTnyAccountStore *account_store;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- conf = modest_tny_platform_factory_get_modest_conf_instance (priv->factory);
-
- modest_widget_memory_save (conf,G_OBJECT(self), "modest-main-window");
- modest_widget_memory_save (conf, G_OBJECT(priv->folder_paned),
- "modest-folder-paned");
- modest_widget_memory_save (conf, G_OBJECT(priv->msg_paned),
- "modest-msg-paned");
- modest_widget_memory_save (conf, G_OBJECT(priv->main_paned),
- "modest-main-paned");
- modest_widget_memory_save (conf, G_OBJECT(priv->header_view), "header-view");
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ account_store = modest_runtime_get_account_store ();
+ device = tny_account_store_get_device(TNY_ACCOUNT_STORE(account_store));
+
+ /* folder view */
+ g_signal_connect (G_OBJECT(self->folder_view), "folder_selection_changed",
+ G_CALLBACK(modest_ui_actions_on_folder_selection_changed), self);
+ g_signal_connect (G_OBJECT(self->folder_view), "folder_moved",
+ G_CALLBACK(modest_ui_actions_on_folder_moved), NULL);
+ g_signal_connect (G_OBJECT(self->folder_view), "button-press-event",
+ G_CALLBACK (on_folder_view_button_press_event),self);
+ g_signal_connect (self->folder_view,"popup-menu",
+ G_CALLBACK (on_folder_view_button_press_event),self);
+
+ /* header view */
+ g_signal_connect (G_OBJECT(self->header_view), "status_update",
+ G_CALLBACK(modest_ui_actions_on_header_status_update), self);
+ g_signal_connect (G_OBJECT(self->header_view), "header_selected",
+ G_CALLBACK(modest_ui_actions_on_header_selected), self);
+ g_signal_connect (G_OBJECT(self->header_view), "header_activated",
+ G_CALLBACK(modest_ui_actions_on_header_activated), self);
+ g_signal_connect (G_OBJECT(self->header_view), "item_not_found",
+ G_CALLBACK(modest_ui_actions_on_item_not_found), self);
+ g_signal_connect (G_OBJECT(self->header_view), "button-press-event",
+ G_CALLBACK (on_header_view_button_press_event), self);
+ g_signal_connect (G_OBJECT(self->header_view),"popup-menu",
+ G_CALLBACK (on_header_view_button_press_event), self);
+
+ /* msg preview */
+ g_signal_connect (G_OBJECT(self->msg_preview), "link_clicked",
+ G_CALLBACK(modest_ui_actions_on_msg_link_clicked), self);
+ g_signal_connect (G_OBJECT(self->msg_preview), "link_hover",
+ G_CALLBACK(modest_ui_actions_on_msg_link_hover), self);
+ g_signal_connect (G_OBJECT(self->msg_preview), "attachment_clicked",
+ G_CALLBACK(modest_ui_actions_on_msg_attachment_clicked), self);
+
+ /* Account store */
+ g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "accounts_reloaded",
+ G_CALLBACK (modest_ui_actions_on_accounts_reloaded), self);
+
+ /* 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), NULL);
+
+ /* window */
+ g_signal_connect (G_OBJECT(self), "destroy", G_CALLBACK(on_destroy), NULL);
+ g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
}
+
static GtkWidget*
wrapped_in_scrolled_window (GtkWidget *widget, gboolean needs_viewport)
{
}
-static gboolean
-on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
-{
- save_sizes (self);
- return FALSE;
-}
-GtkWidget*
-modest_main_window_new (ModestWidgetFactory *widget_factory)
+ModestWindow *
+modest_main_window_new (void)
{
GObject *obj;
+ ModestMainWindow *self;
ModestMainWindowPrivate *priv;
-
+ ModestWindowPrivate *parent_priv;
GtkWidget *main_vbox;
GtkWidget *status_hbox;
GtkWidget *header_win, *folder_win;
+ GtkActionGroup *action_group;
+ GError *error = NULL;
+
+ obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL);
+ self = MODEST_MAIN_WINDOW(obj);
- g_return_val_if_fail (widget_factory, NULL);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ /* ***************** */
+ parent_priv->ui_manager = gtk_ui_manager_new();
+ action_group = gtk_action_group_new ("ModestMainWindowActions");
+
+ /* Add common actions */
+ gtk_action_group_add_actions (action_group,
+ modest_action_entries,
+ G_N_ELEMENTS (modest_action_entries),
+ obj);
+
+ gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0);
+ g_object_unref (action_group);
+
+ /* Load the UI definition */
+ gtk_ui_manager_add_ui_from_file (parent_priv->ui_manager,
+ MODEST_UIDIR "modest-main-window-ui.xml", &error);
+ if (error != NULL) {
+ g_printerr ("modest: could not merge modest-main-window-ui.xml: %s", error->message);
+ g_error_free (error);
+ error = NULL;
+ }
+ /* *************** */
- obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL);
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
+ /* Add accelerators */
+ gtk_window_add_accel_group (GTK_WINDOW (obj),
+ gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
- g_object_ref (widget_factory);
- priv->widget_factory = widget_factory;
+ /* Toolbar / Menubar */
+ parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar");
+ parent_priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar");
- /* widgets from factory */
- priv->folder_view = modest_widget_factory_get_folder_view (widget_factory);
- priv->header_view = header_view_new (MODEST_MAIN_WINDOW(obj));
- priv->msg_preview = modest_widget_factory_get_msg_preview (widget_factory);
-
- folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view),
- FALSE);
- header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view),
- FALSE);
-
- /* tool/menubar */
- priv->menubar = menubar_new (MODEST_MAIN_WINDOW(obj));
- priv->toolbar = GTK_WIDGET(toolbar_new (MODEST_MAIN_WINDOW(obj)));
+ gtk_toolbar_set_tooltips (GTK_TOOLBAR (parent_priv->toolbar), TRUE);
+ folder_win = wrapped_in_scrolled_window (GTK_WIDGET(self->folder_view), FALSE);
+ header_win = wrapped_in_scrolled_window (GTK_WIDGET(self->header_view), FALSE);
/* paned */
priv->folder_paned = gtk_vpaned_new ();
gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win);
gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned);
gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win);
- gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(priv->msg_preview));
-
- gtk_widget_show (GTK_WIDGET(priv->header_view));
- gtk_tree_view_columns_autosize (GTK_TREE_VIEW(priv->header_view));
+ gtk_paned_add2 (GTK_PANED(priv->msg_paned), GTK_WIDGET(self->msg_preview));
+ gtk_widget_show (GTK_WIDGET(self->header_view));
/* status bar / progress */
status_hbox = gtk_hbox_new (FALSE, 0);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_folder_info_label (widget_factory),
- FALSE,FALSE, 6);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_status_bar(widget_factory),
- TRUE, TRUE, 0);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_progress_bar(widget_factory),
- FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(status_hbox),
- modest_widget_factory_get_online_toggle(widget_factory),
- FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(status_hbox), priv->folder_info_label, FALSE,FALSE, 6);
+ gtk_box_pack_start (GTK_BOX(status_hbox), self->status_bar, TRUE, TRUE, 0);
+ gtk_box_pack_start (GTK_BOX(status_hbox), self->progress_bar,FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(status_hbox), priv->online_toggle,FALSE, FALSE, 0);
/* putting it all together... */
main_vbox = gtk_vbox_new (FALSE, 6);
- gtk_box_pack_start (GTK_BOX(main_vbox), priv->menubar, FALSE, FALSE, 0);
- gtk_box_pack_start (GTK_BOX(main_vbox), priv->toolbar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->menubar, FALSE, FALSE, 0);
+ gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->toolbar, FALSE, FALSE, 0);
gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_paned, TRUE, TRUE,0);
gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0);
gtk_container_add (GTK_CONTAINER(obj), main_vbox);
restore_sizes (MODEST_MAIN_WINDOW(obj));
- gtk_window_set_title (GTK_WINDOW(obj), "Modest");
- gtk_window_set_icon (GTK_WINDOW(obj),
- modest_icon_factory_get_icon (MODEST_APP_ICON));
-
+ gtk_window_set_title (GTK_WINDOW(obj), _("Modest"));
+ gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL);
gtk_widget_show_all (main_vbox);
+
+ /* Init toggle in correct state */
+ //modest_ui_actions_on_connection_changed (device, tny_device_is_online (device), self);
+
+ connect_signals (MODEST_MAIN_WINDOW(obj));
+ return (ModestWindow *) obj;
+}
+
+static gboolean
+on_header_view_button_press_event (ModestHeaderView *header_view,
+ GdkEventButton *event,
+ ModestMainWindow *self)
+{
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ GtkWidget *menu;
+ ModestWindowPrivate *parent_priv;
+
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewContextMenu");
+
+ return show_context_popup_menu (self,
+ GTK_TREE_VIEW (header_view),
+ event,
+ menu);
+ }
+
+ return FALSE;
+}
- g_signal_connect (G_OBJECT(obj), "delete-event",
- G_CALLBACK(on_delete_event), obj);
+static gboolean
+on_folder_view_button_press_event (ModestFolderView *folder_view,
+ GdkEventButton *event,
+ ModestMainWindow *self)
+{
+ if (event->type == GDK_BUTTON_PRESS && event->button == 3) {
+ GtkWidget *menu;
+ ModestWindowPrivate *parent_priv;
- return GTK_WIDGET(obj);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
+ menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewContextMenu");
+
+ return show_context_popup_menu (self,
+ GTK_TREE_VIEW (folder_view),
+ event,
+ menu);
+ }
+
+ return FALSE;
+}
+
+static gboolean
+show_context_popup_menu (ModestMainWindow *window,
+ GtkTreeView *tree_view,
+ GdkEventButton *event,
+ GtkWidget *menu)
+{
+ g_return_val_if_fail (menu, FALSE);
+
+ if (event != NULL) {
+ /* Ensure that the header is selected */
+ GtkTreeSelection *selection;
+
+ selection = gtk_tree_view_get_selection (tree_view);
+
+ if (gtk_tree_selection_count_selected_rows (selection) <= 1) {
+ GtkTreePath *path;
+
+ /* Get tree path for row that was clicked */
+ if (gtk_tree_view_get_path_at_pos (tree_view,
+ (gint) event->x,
+ (gint) event->y,
+ &path,
+ NULL, NULL, NULL)) {
+ gtk_tree_selection_unselect_all (selection);
+ gtk_tree_selection_select_path (selection, path);
+ gtk_tree_path_free (path);
+ }
+ }
+
+ /* Show popup */
+ if (gtk_tree_selection_count_selected_rows(selection) == 1)
+ gtk_menu_popup (GTK_MENU (menu), NULL, NULL,
+ NULL, NULL,
+ event->button, event->time);
+ }
+ return TRUE;
}
projects / modest / blobdiff