static void modest_main_window_show_toolbar (ModestWindow *window,
gboolean show_toolbar);
+static void on_queue_changed (ModestMailOperationQueue *queue,
+ ModestMailOperation *mail_op,
+ ModestMailOperationQueueNotification type,
+ ModestMainWindow *self);
+
static void on_account_update (TnyAccountStore *account_store,
gchar *account_name,
gpointer user_data);
ModestConfEvent event,
ModestMainWindow *self);
+static void
+set_toolbar_mode (ModestMainWindow *self,
+ ModestToolBarModes mode);
+
/* list my signals */
enum {
/* MY_SIGNAL_1, */
GtkWidget *contents_widget;
/* Progress observers */
- GtkWidget *progress_widget;
+ GtkWidget *progress_bar;
+ GSList *progress_widgets;
+
+ /* Tollbar items */
+ GtkWidget *progress_toolitem;
+ GtkWidget *cancel_toolitem;
+ GtkWidget *sort_toolitem;
+ GtkWidget *refresh_toolitem;
/* On-demand widgets */
GtkWidget *accounts_popup;
GtkWidget *details_widget;
+
ModestHeaderView *header_view;
ModestFolderView *folder_view;
priv->accounts_popup = NULL;
priv->details_widget = NULL;
+ priv->progress_widgets = NULL;
+ priv->progress_bar = NULL;
+
priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT;
priv->contents_style = MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS;
}
static void
modest_main_window_finalize (GObject *obj)
{
+ ModestMainWindowPrivate *priv;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj);
+
+ g_slist_free (priv->progress_widgets);
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
NULL);
g_signal_connect (G_OBJECT(self), "delete-event", G_CALLBACK(on_delete_event), self);
+ /* Mail Operation Queue */
+ g_signal_connect (G_OBJECT (modest_runtime_get_mail_operation_queue ()),
+ "queue-changed",
+ G_CALLBACK (on_queue_changed),
+ self);
+
/* Track changes in the device name */
g_signal_connect (G_OBJECT(modest_runtime_get_conf ()),
"key_changed",
return FALSE;
}
-void
-modest_main_window_set_toolbar_mode (ModestMainWindow *self,
- ModestToolBarModes mode)
-{
- ModestMainWindowPrivate *priv;
- ModestWindowPrivate *parent_priv;
- GtkAction *action;
- gboolean transfer_mode= FALSE;
- gboolean normal_mode= FALSE;
-
-
- g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
-
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
- parent_priv = MODEST_WINDOW_GET_PRIVATE (self);
-
- switch (mode) {
- case TOOLBAR_MODE_NORMAL:
- normal_mode = TRUE;
- transfer_mode = FALSE;
- gtk_widget_hide (priv->progress_widget);
- break;
- case TOOLBAR_MODE_TRANSFER:
- normal_mode = FALSE;
- transfer_mode = TRUE;
- gtk_widget_show (priv->progress_widget);
- break;
- default:
- normal_mode = TRUE;
- transfer_mode = FALSE;
- gtk_widget_hide (priv->progress_widget);
- }
-
- /* Transfer mode toolitems */
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
- if (action != NULL)
- gtk_action_set_visible (action, transfer_mode);
-
- /* Normal mode toolitems */
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
- if (action != NULL)
- gtk_action_set_visible (action, normal_mode);
- action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
- if (action != NULL)
- gtk_action_set_visible (action, normal_mode);
-}
void
modest_main_window_set_style (ModestMainWindow *self,
set_homogeneous, NULL);
/* Add ProgressBar (Transfer toolbar) */
- priv->progress_widget = modest_progress_bar_widget_new ();
- gtk_widget_set_no_show_all (priv->progress_widget, TRUE);
- modest_progress_bar_widget_set_status (MODEST_PROGRESS_BAR_WIDGET(priv->progress_widget), 0);
+ priv->progress_bar = modest_progress_bar_widget_new ();
+ gtk_widget_set_no_show_all (priv->progress_bar, TRUE);
placeholder = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ProgressBarView");
insert_index = gtk_toolbar_get_item_index(GTK_TOOLBAR (parent_priv->toolbar), GTK_TOOL_ITEM(placeholder));
tool_item = GTK_WIDGET (gtk_tool_item_new ());
- gtk_container_add (GTK_CONTAINER (tool_item), priv->progress_widget);
+/* gtk_widget_set_no_show_all (tool_item, TRUE); */
+ gtk_container_add (GTK_CONTAINER (tool_item), priv->progress_bar);
/* gtk_tool_item_set_expand (GTK_TOOL_ITEM (tool_item), TRUE); */
/* gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (tool_item), TRUE); */
gtk_toolbar_insert(GTK_TOOLBAR(parent_priv->toolbar), GTK_TOOL_ITEM (tool_item), insert_index);
+
+ priv->progress_toolitem = tool_item;
+ priv->cancel_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
+ priv->refresh_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive");
+ priv->sort_toolitem = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSort");
+
+ /* Add it to the observers list */
+ priv->progress_widgets = g_slist_prepend(priv->progress_widgets, priv->progress_bar);
/* Add to window */
hildon_window_add_toolbar (HILDON_WINDOW (self),
if (show_toolbar) {
gtk_widget_show (GTK_WIDGET (parent_priv->toolbar));
- modest_main_window_set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
} else
gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
}
if (!parent_priv->toolbar)
return;
- if (priv->accounts_popup)
+ 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;
+ }
/* Get accounts */
account_list = tny_simple_list_new ();
g_list_free (children);
}
}
+
+static void
+set_toolbar_mode (ModestMainWindow *self,
+ ModestToolBarModes mode)
+{
+ ModestWindowPrivate *parent_priv;
+ ModestMainWindowPrivate *priv;
+ GtkAction *sort_action, *refresh_action, *cancel_action;
+
+ g_return_if_fail (MODEST_IS_MAIN_WINDOW (self));
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+ parent_priv = MODEST_WINDOW_GET_PRIVATE(self);
+
+ cancel_action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToolbarCancel");
+ 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");
+
+ switch (mode) {
+ case TOOLBAR_MODE_NORMAL:
+/* gtk_action_set_visible (sort_action, TRUE); */
+/* gtk_action_set_visible (refresh_action, TRUE); */
+/* gtk_action_set_visible (cancel_action, FALSE); */
+/* gtk_widget_hide (priv->progress_toolitem); */
+/* gtk_widget_hide (priv->progress_bar); */
+ gtk_widget_show (priv->sort_toolitem);
+ gtk_widget_show (priv->refresh_toolitem);
+ gtk_widget_hide (priv->progress_bar);
+ gtk_widget_hide (priv->cancel_toolitem);
+ break;
+ case TOOLBAR_MODE_TRANSFER:
+/* gtk_action_set_visible (sort_action, FALSE); */
+/* gtk_action_set_visible (refresh_action, FALSE); */
+/* gtk_action_set_visible (cancel_action, TRUE); */
+/* gtk_widget_show (priv->progress_toolitem); */
+/* gtk_widget_show (priv->progress_bar); */
+ gtk_widget_hide (priv->sort_toolitem);
+ gtk_widget_hide (priv->refresh_toolitem);
+ gtk_widget_show (priv->progress_bar);
+ gtk_widget_show (priv->cancel_toolitem);
+ break;
+ default:
+/* gtk_action_set_visible (sort_action, TRUE); */
+/* gtk_action_set_visible (refresh_action, TRUE); */
+/* gtk_action_set_visible (cancel_action, FALSE); */
+/* gtk_widget_hide (priv->progress_toolitem); */
+/* gtk_widget_hide (priv->progress_bar); */
+ gtk_widget_show (priv->sort_toolitem);
+ gtk_widget_show (priv->refresh_toolitem);
+ gtk_widget_hide (priv->progress_bar);
+ gtk_widget_hide (priv->cancel_toolitem);
+ }
+}
+
+static void
+on_queue_changed (ModestMailOperationQueue *queue,
+ ModestMailOperation *mail_op,
+ ModestMailOperationQueueNotification type,
+ ModestMainWindow *self)
+{
+ GSList *tmp;
+ ModestMainWindowPrivate *priv;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
+
+ tmp = priv->progress_widgets;
+
+ switch (type) {
+ case MODEST_MAIL_OPERATION_QUEUE_OPERATION_ADDED:
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_TRANSFER);
+ while (tmp) {
+ modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+ mail_op);
+ tmp = g_slist_next (tmp);
+ }
+ break;
+ case MODEST_MAIL_OPERATION_QUEUE_OPERATION_REMOVED:
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
+ while (tmp) {
+ modest_progress_object_remove_operation (MODEST_PROGRESS_OBJECT (tmp->data),
+ mail_op);
+ tmp = g_slist_next (tmp);
+ }
+ break;
+ }
+}
projects / modest / blobdiff