#include <hildon/hildon-program.h>
#endif /*MODEST_HILDON_VERSION_0*/
+#define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions"
/* 'private'/'protected' functions */
static void modest_main_window_class_init (ModestMainWindowClass *klass);
gpointer userdata);
static void connect_signals (ModestMainWindow *self);
-static void restore_sizes (ModestMainWindow *self);
-static void save_sizes (ModestMainWindow *self);
+
+static void restore_settings (ModestMainWindow *self);
+static void save_state (ModestWindow *self);
static void modest_main_window_show_toolbar (ModestWindow *window,
gboolean show_toolbar);
ModestConfEvent event,
ModestMainWindow *self);
-static void
-set_toolbar_mode (ModestMainWindow *self,
- ModestToolBarModes mode);
+static void set_toolbar_mode (ModestMainWindow *self,
+ ModestToolBarModes mode);
+static void on_show_account_action_activated (GtkAction *action,
+ gpointer user_data);
+
+static void on_send_receive_csm_activated (GtkMenuItem *item,
+ gpointer user_data);
/* list my signals */
enum {
/* MY_SIGNAL_1, */
GtkWidget *refresh_toolitem;
ModestToolBarModes current_toolbar_mode;
+ /* Merge ids used to add/remove accounts to the ViewMenu*/
+ GByteArray *merge_ids;
+
/* On-demand widgets */
GtkWidget *accounts_popup;
GtkWidget *details_widget;
+ /* Optimized view enabled */
+ gboolean optimized_view;
ModestHeaderView *header_view;
ModestFolderView *folder_view;
{ "ToolbarToggleView", MODEST_STOCK_SPLIT_VIEW, N_("gqn_toolb_rss_fldonoff"), "<CTRL>t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), FALSE },
};
-
/************************************************************************/
GType
{
GObjectClass *gobject_class;
gobject_class = (GObjectClass*) klass;
- ModestWindowClass *modest_window_class;
-
- modest_window_class = (ModestWindowClass *) klass;
+ ModestWindowClass *modest_window_class = (ModestWindowClass *) klass;
parent_class = g_type_class_peek_parent (klass);
gobject_class->finalize = modest_main_window_finalize;
- modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
-
g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate));
+
+ modest_window_class->show_toolbar_func = modest_main_window_show_toolbar;
+ modest_window_class->save_state_func = save_state;
}
static void
priv->accounts_popup = NULL;
priv->details_widget = NULL;
+ priv->optimized_view = FALSE;
+
priv->progress_widgets = NULL;
priv->progress_bar = NULL;
priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL;
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS;
+
+ priv->merge_ids = NULL;
}
static void
g_slist_free (priv->progress_widgets);
+ g_byte_array_free (priv->merge_ids, TRUE);
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
static void
-restore_sizes (ModestMainWindow *self)
+restore_settings (ModestMainWindow *self)
{
ModestConf *conf;
ModestMainWindowPrivate *priv;
static void
-save_sizes (ModestMainWindow *self)
+save_state (ModestWindow *window)
{
ModestConf *conf;
+ ModestMainWindow* self = MODEST_MAIN_WINDOW(window);
ModestMainWindowPrivate *priv;
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
static gboolean
on_delete_event (GtkWidget *widget, GdkEvent *event, ModestMainWindow *self)
{
- save_sizes (self);
+ modest_window_save_state (MODEST_WINDOW(self));
return FALSE;
}
* as per the specification:
* (without the check for >0 accounts, though that is not specified): */
if (online) {
- do_send_receive (MODEST_WINDOW (self));
+ modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (self));
}
}
G_CALLBACK (on_account_update),
self);
+ /* Account store */
+ g_signal_connect (G_OBJECT (modest_runtime_get_account_store()), "password_requested",
+ G_CALLBACK (modest_ui_actions_on_password_requested), self);
+
/* Device */
g_signal_connect (G_OBJECT(modest_runtime_get_device()), "connection_changed",
G_CALLBACK(on_connection_changed), self);
gboolean
sync_accounts_cb (ModestMainWindow *win)
{
- do_send_receive (MODEST_WINDOW(win));
+ modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win));
return FALSE; /* Do not call this idle handler again. */
}
/* Allow hibernation if the program has gone to the background: */
/* However, prevent hibernation while the settings are being changed: */
- gboolean settings_dialog_is_open = FALSE;
-
- if (settings_dialog_is_open)
+ const gboolean hibernation_prevented =
+ modest_window_mgr_get_hibernation_is_prevented (
+ modest_runtime_get_window_mgr ());
+
+ if (hibernation_prevented)
hildon_program_set_can_hibernate (app, FALSE);
else {
-
/* Allow hibernation, after saving the state: */
modest_osso_save_state();
hildon_program_set_can_hibernate (app, TRUE);
modest_conf_get_bool (conf, MODEST_CONF_SHOW_TOOLBAR_FULLSCREEN, NULL));
hildon_window_set_menu (HILDON_WINDOW (self), GTK_MENU (parent_priv->menubar));
+ /* Get device name */
+ modest_maemo_utils_get_device_name ();
+
/* folder view */
query = tny_folder_store_query_new ();
tny_folder_store_query_add_item (query, NULL,
modest_folder_view_set_style (priv->folder_view,
MODEST_FOLDER_VIEW_STYLE_SHOW_ONE);
- /* Get device name */
- modest_maemo_utils_get_device_name ();
-
/* header view */
priv->header_view =
MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS));
gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0);
gtk_container_add (GTK_CONTAINER(self), priv->main_vbox);
- restore_sizes (MODEST_MAIN_WINDOW(self));
+ restore_settings (MODEST_MAIN_WINDOW(self));
/* Set window icon */
window_icon = modest_platform_get_icon (MODEST_APP_ICON);
/* do send & receive when we are idle */
g_idle_add ((GSourceFunc)sync_accounts_cb, self);
-
HildonProgram *app = hildon_program_get_instance ();
hildon_program_add_window (app, HILDON_WINDOW (self));
GtkWidget *placeholder = NULL;
gint insert_index;
- parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ /* Set optimized view status */
+ priv->optimized_view = !show_toolbar;
- if (!parent_priv->toolbar && show_toolbar) {
+ if (!parent_priv->toolbar) {
parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager,
"/ToolBar");
NULL, self);
}
- /* TODO: Why is this sometimes NULL? murrayc */
- if (parent_priv->toolbar) {
- if (show_toolbar) {
- /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */
- /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
- gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+ if (show_toolbar) {
+ /* Quick hack: this prevents toolbar icons "dance" when progress bar show status is changed */
+ /* TODO: resize mode migth be GTK_RESIZE_QUEUE, in order to avoid unneccesary shows */
+ gtk_container_set_resize_mode (GTK_CONTAINER(parent_priv->toolbar), GTK_RESIZE_IMMEDIATE);
+
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+ } else
+ gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
- gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
- set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
- } else
- gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
- }
}
-/*
- * TODO: modify the menu dynamically. Add handlers to each item of the
- * menu when created
- */
+static gint
+compare_display_names (ModestAccountData *a,
+ ModestAccountData *b)
+{
+ return strcmp (a->display_name, b->display_name);
+}
+
static void
on_account_update (TnyAccountStore *account_store,
gchar *accout_name,
gpointer user_data)
{
+ GSList *account_names, *iter, *accounts;
ModestMainWindow *self;
ModestMainWindowPrivate *priv;
ModestWindowPrivate *parent_priv;
- TnyList *account_list;
- GtkWidget *item, *send_receive_button;
- TnyIterator *iter;
ModestAccountMgr *mgr;
+ gint i, num_accounts;
+ ModestAccountData *account_data;
+ GtkActionGroup *action_group;
+ GList *groups;
gchar *default_account;
-
+ GtkWidget *send_receive_button, *item;
+
self = MODEST_MAIN_WINDOW (user_data);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self);
parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
- /* If there is no toolbar then exit */
- if (!parent_priv->toolbar)
- return;
+ /* Get enabled account IDs */
+ mgr = modest_runtime_get_account_mgr ();
+ account_names = modest_account_mgr_account_names (mgr, TRUE);
+ iter = account_names;
+ accounts = NULL;
- if (priv->accounts_popup && gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)) ) {
- /* gtk_menu_detach will also unreference the popup,
- * so we can forget about this instance, and create a new one later:
- */
- gtk_menu_detach (GTK_MENU (priv->accounts_popup));
- priv->accounts_popup = NULL;
- }
+ while (iter) {
+ account_data = modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
+ accounts = g_slist_prepend (accounts, account_data);
- /* Get accounts */
- account_list = tny_simple_list_new ();
- tny_account_store_get_accounts (account_store,
- account_list,
- TNY_ACCOUNT_STORE_STORE_ACCOUNTS);
+ iter = iter->next;
+ }
+ g_slist_free (account_names);
+
+ /* Order the list of accounts by its display name */
+ accounts = g_slist_sort (accounts, (GCompareFunc) compare_display_names);
+ num_accounts = g_slist_length (accounts);
+
+ /* Delete old send&receive popup items. We can not just do a
+ menu_detach because it does not work well with
+ tap_and_hold */
+ if (priv->accounts_popup)
+ gtk_container_foreach (GTK_CONTAINER (priv->accounts_popup), (GtkCallback) gtk_widget_destroy, NULL);
+
+ /* Delete old entries in the View menu. Do not free groups, it
+ belongs to Gtk+ */
+ groups = gtk_ui_manager_get_action_groups (parent_priv->ui_manager);
+ while (groups) {
+ if (!strcmp (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS,
+ gtk_action_group_get_name (GTK_ACTION_GROUP (groups->data)))) {
+ gtk_ui_manager_remove_action_group (parent_priv->ui_manager,
+ GTK_ACTION_GROUP (groups->data));
+ groups = NULL;
+ /* Remove uis */
+ if (priv->merge_ids) {
+ for (i = 0; i < priv->merge_ids->len; i++)
+ gtk_ui_manager_remove_ui (parent_priv->ui_manager, priv->merge_ids->data[i]);
+ g_byte_array_free (priv->merge_ids, TRUE);
+ }
+ /* We need to call this in order to ensure
+ that the new actions are added in the right
+ order (alphabetical */
+ gtk_ui_manager_ensure_update (parent_priv->ui_manager);
+ } else
+ groups = g_list_next (groups);
+ }
+ priv->merge_ids = g_byte_array_sized_new (num_accounts);
- /* If there is only one account do not show any menu */
- if (tny_list_get_length (account_list) <= 1)
- goto free;
-
/* Get send receive button */
- send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
+ send_receive_button = gtk_ui_manager_get_widget (parent_priv->ui_manager,
"/ToolBar/ToolbarSendReceive");
/* Create the menu */
- priv->accounts_popup = gtk_menu_new ();
- item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
- gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
- item = gtk_separator_menu_item_new ();
- gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ if (num_accounts > 1) {
+ if (!priv->accounts_popup)
+ priv->accounts_popup = gtk_menu_new ();
+ item = gtk_menu_item_new_with_label (_("mcen_me_toolbar_sendreceive_all"));
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ g_signal_connect (G_OBJECT (item),
+ "activate",
+ G_CALLBACK (on_send_receive_csm_activated),
+ NULL);
+ item = gtk_separator_menu_item_new ();
+ gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ }
- iter = tny_list_create_iterator (account_list);
- mgr = modest_runtime_get_account_mgr ();
+ /* Create a new action group */
default_account = modest_account_mgr_get_default_account (mgr);
-
- do {
- TnyAccount *acc = NULL;
- const gchar *acc_name = NULL;
-
- /* Create tool item */
- acc = TNY_ACCOUNT (tny_iterator_get_current (iter));
- if (acc)
- acc_name = tny_account_get_name (acc);
-
- /* Create display name */
- gchar *display_name = NULL;
- if (acc_name) {
- if (default_account && !(strcmp (default_account, acc_name) == 0))
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), acc_name);
- else
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"), acc_name);
- }
+ action_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
+ for (i = 0; i < num_accounts; i++) {
+ GtkAction *new_action;
+ gchar* item_name, *display_name;
+ guint8 merge_id;
+
+ account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+
+ /* Create display name. The default account is shown differently */
+ if (default_account && !(strcmp (default_account, account_data->account_name) == 0))
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"),
+ account_data->display_name);
else
- {
- /* TODO: This probably should never happen: */
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"), "");
- }
-
-
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"),
+ account_data->display_name);
+
+ /* Create action and add it to the action group. The
+ action name must be the account name, this way we
+ could know in the handlers the account to show */
+ new_action = gtk_action_new (account_data->account_name, display_name, NULL, NULL);
+ gtk_action_group_add_action (action_group, new_action);
+
+ /* Add ui from account data. We allow 2^9-1 account
+ changes in a single execution because we're
+ downcasting the guint to a guint8 in order to use a
+ GByteArray, it should be enough */
+ item_name = g_strconcat (account_data->account_name, "Menu");
+ merge_id = (guint8) gtk_ui_manager_new_merge_id (parent_priv->ui_manager);
+ priv->merge_ids = g_byte_array_append (priv->merge_ids, &merge_id, 1);
+ gtk_ui_manager_add_ui (parent_priv->ui_manager,
+ merge_id,
+ "/MenuBar/ViewMenu/ViewMenuAdditions",
+ item_name,
+ account_data->account_name,
+ GTK_UI_MANAGER_MENUITEM,
+ FALSE);
+
+ /* Connect the action signal "activate" */
+ g_signal_connect (G_OBJECT (new_action),
+ "activate",
+ G_CALLBACK (on_show_account_action_activated),
+ self);
+
+ /* Create item and add it to the send&receive CSM */
item = gtk_menu_item_new_with_label (display_name);
-
- /* Free */
- g_free (display_name);
- g_object_unref (acc);
-
- /* Append item */
gtk_menu_shell_append (GTK_MENU_SHELL (priv->accounts_popup), GTK_WIDGET (item));
+ g_signal_connect_data (G_OBJECT (item),
+ "activate",
+ G_CALLBACK (on_send_receive_csm_activated),
+ g_strdup (account_data->account_name),
+ (GClosureNotify) g_free,
+ 0);
+
+ /* Frees */
+ g_free (display_name);
+ g_free (item_name);
+ modest_account_mgr_free_account_data (mgr, account_data);
+ }
+ gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 1);
- /* Go to next */
- tny_iterator_next (iter);
-
- } while (!tny_iterator_is_done (iter));
-
- g_object_unref (iter);
-
- /* Mandatory in order to view the menu contents */
- gtk_widget_show_all (priv->accounts_popup);
-
- /* Setup tap_and_hold */
- gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+ if (priv->accounts_popup) {
+ /* Mandatory in order to view the menu contents */
+ gtk_widget_show_all (priv->accounts_popup);
- free:
+ /* Setup tap_and_hold just if was not done before*/
+ if (!gtk_menu_get_attach_widget (GTK_MENU (priv->accounts_popup)))
+ gtk_widget_tap_and_hold_setup (send_receive_button, priv->accounts_popup, NULL, 0);
+ }
- /* Free */
- g_object_unref (account_list);
+ /* Frees */
+ g_slist_free (accounts);
+ g_free (default_account);
}
/*
set_toolbar_mode (ModestMainWindow *self,
ModestToolBarModes mode)
{
- ModestWindowPrivate *parent_priv;
- ModestMainWindowPrivate *priv;
- GtkAction *sort_action, *refresh_action, *cancel_action;
-
+ ModestWindowPrivate *parent_priv = NULL;
+ ModestMainWindowPrivate *priv = NULL;
+ GtkAction *sort_action = NULL, *refresh_action = NULL, *cancel_action = NULL;
+
g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ g_return_if_fail (GTK_IS_TOOLBAR(parent_priv->toolbar));
sort_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
refresh_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
if (cancel_action)
gtk_action_set_visible (cancel_action, FALSE);
+
+ /* Hide toolbar if optimized view is enabled */
+ if (priv->optimized_view)
+ gtk_widget_hide (GTK_WIDGET(parent_priv->toolbar));
break;
case TOOLBAR_MODE_TRANSFER:
if (sort_action)
}
if (priv->progress_bar)
gtk_widget_show (priv->progress_bar);
+
+ /* Show toolbar if it's hiden (optimized view ) */
+ if (priv->optimized_view)
+ gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
break;
default:
g_return_if_reached ();
}
-
- gtk_widget_show_all (GTK_WIDGET (self));
}
static void
break;
case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED:
if (mode == TOOLBAR_MODE_TRANSFER) {
+
while (tmp) {
modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
mail_op);
tmp = g_slist_next (tmp);
}
-
+
/* If no more operations are being observed, NORMAL mode is enabled again */
if (observers_empty (self))
set_toolbar_mode (self, TOOLBAR_MODE_NORMAL);
break;
}
}
+
+static void
+on_show_account_action_activated (GtkAction *action,
+ gpointer user_data)
+{
+ ModestAccountData *acc_data;
+ ModestMainWindow *self;
+ ModestMainWindowPrivate *priv;
+ ModestAccountMgr *mgr;
+ const gchar *acc_name;
+
+ self = MODEST_MAIN_WINDOW (user_data);
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ /* Get account data */
+ acc_name = gtk_action_get_name (action);
+ mgr = modest_runtime_get_account_mgr ();
+ acc_data = modest_account_mgr_get_account_data (mgr, acc_name);
+
+ /* Set the new visible & active account */
+ if (acc_data->store_account) {
+ modest_folder_view_set_account_id_of_visible_server_account (priv->folder_view,
+ acc_data->store_account->account_name);
+ }
+
+ /* Free */
+ modest_account_mgr_free_account_data (mgr, acc_data);
+}
+
+static void
+on_send_receive_csm_activated (GtkMenuItem *item,
+ gpointer user_data)
+{
+ ModestWindow *win;
+
+ win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
+
+ /* If user_data == NULL, we must update all (CSM option All) */
+ if (!user_data) {
+ modest_ui_actions_do_send_receive_all (win);
+ } else {
+ modest_ui_actions_do_send_receive ((const gchar *)user_data, win);
+ }
+}
projects / modest / blobdiff