ModestMailOperation *mail_op,
ModestMailOperationQueueNotification type,
ModestFolderWindow *self);
+static void on_activity_changed (ModestFolderView *view,
+ gboolean activity,
+ ModestFolderWindow *folder_window);
+static void on_visible_account_changed (ModestFolderView *folder_view,
+ const gchar *account_id,
+ gpointer user_data);
+static void on_account_changed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data);
typedef struct _ModestFolderWindowPrivate ModestFolderWindowPrivate;
struct _ModestFolderWindowPrivate {
}
static void
-on_visible_account_changed (ModestFolderView *folder_view,
- const gchar *account_id,
- gpointer user_data)
-{
- if (account_id) {
- TnyAccount *acc =
- modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
- MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
- account_id);
- if (acc) {
- const gchar *name;
- const gchar *mailbox;
- gchar *title = NULL;
- ModestFolderWindowPrivate *priv;
-
- priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
-
- mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view));
- if (mailbox) {
- title = g_strdup (mailbox);
- } else {
- name = modest_tny_account_get_parent_modest_account_name_for_server_account (acc);
- title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
- name);
- }
- if (title) {
- gtk_window_set_title (GTK_WINDOW (user_data), title);
- g_free (title);
- } else {
- gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name"));
- }
- g_object_unref (acc);
- }
- } else {
- gtk_window_set_title (GTK_WINDOW (user_data), _("mcen_ap_name"));
- }
-}
-
-static void
connect_signals (ModestFolderWindow *self)
{
ModestFolderWindowPrivate *priv;
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
/* folder view */
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT (priv->folder_view), "folder-activated",
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->folder_view), "folder-activated",
G_CALLBACK (on_folder_activated), self);
priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
"visible-account-changed",
G_CALLBACK (on_visible_account_changed), self);
- priv->sighandlers =
- modest_signal_mgr_connect (priv->sighandlers,
- G_OBJECT (priv->new_message_button),
- "clicked",
- G_CALLBACK (modest_ui_actions_on_new_msg), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->folder_view),
+ "activity-changed",
+ G_CALLBACK (on_activity_changed), self);
+
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->new_message_button),
+ "clicked",
+ G_CALLBACK (modest_ui_actions_on_new_msg), self);
+ priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (modest_runtime_get_account_store()),
+ "account-changed",
+ G_CALLBACK (on_account_changed), self);
}
ModestWindow *
G_CALLBACK (edit_mode_changed), (gpointer) self);
action_area_box = hildon_tree_view_get_action_area_box (GTK_TREE_VIEW (priv->folder_view));
- priv->new_message_button = hildon_button_new (0, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
+ priv->new_message_button = hildon_button_new (MODEST_EDITABLE_SIZE, HILDON_BUTTON_ARRANGEMENT_HORIZONTAL);
hildon_button_set_title (HILDON_BUTTON (priv->new_message_button), _("mcen_ti_new_message"));
new_message_pixbuf = modest_platform_get_icon ("general_add", MODEST_ICON_SIZE_BIG);
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
modest_folder_view_set_mailbox (MODEST_FOLDER_VIEW (priv->folder_view), mailbox);
+ modest_window_set_active_mailbox (MODEST_WINDOW (self), mailbox);
+}
+
+static void
+edit_account (GtkButton *button,
+ ModestFolderWindow *self)
+{
}
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_folder_window_delete));
/* send receive actions should be only one visible always */
- modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self),
- _("mcen_me_inbox_sendandreceive"),
- NULL,
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_inbox_sendandreceive"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_on_send_receive),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_send_receive));
modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_outbox_cancelsend"), NULL,
APP_MENU_CALLBACK (modest_ui_actions_cancel_send),
MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_cancel_sending_all));
+
+ modest_hildon2_window_add_to_menu (MODEST_HILDON2_WINDOW (self), _("mcen_me_edit_account"), NULL,
+ APP_MENU_CALLBACK (edit_account),
+ MODEST_DIMMING_CALLBACK (modest_ui_dimming_rules_on_edit_accounts));
}
static void
priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
- if (!folder)
- return;
-
- if (!TNY_IS_FOLDER (folder))
+ if (!folder || !TNY_IS_FOLDER (folder))
return;
/* We cannot open noselect folders (fake ones) */
if (tny_folder_get_caps (folder) & TNY_FOLDER_CAPS_NOSELECT)
return;
- headerwin = modest_header_window_new (folder, modest_window_get_active_account (MODEST_WINDOW (self)));
+ headerwin = modest_header_window_new (folder,
+ modest_window_get_active_account (MODEST_WINDOW (self)),
+ modest_window_get_active_mailbox (MODEST_WINDOW (self)));
if (modest_window_mgr_register_window (modest_runtime_get_window_mgr (),
MODEST_WINDOW (headerwin),
if (has_active_operations (self)) {
priv->progress_hint = TRUE;
+ } else {
+ priv->progress_hint = FALSE;
}
if (!priv->progress_hint && priv->current_store_account) {
priv->current_store_account);
}
+ if (!priv->progress_hint) {
+ priv->progress_hint = modest_folder_view_get_activity (MODEST_FOLDER_VIEW (priv->folder_view));
+ }
+
modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW (self));
if (GTK_WIDGET_VISIBLE (self)) {
}
}
+static void
+on_activity_changed (ModestFolderView *view,
+ gboolean activity,
+ ModestFolderWindow *folder_window)
+{
+ g_return_if_fail (MODEST_IS_FOLDER_WINDOW (folder_window));
+
+ update_progress_hint (folder_window);
+}
+
+
+static void
+update_window_title (ModestFolderWindow *self,
+ TnyAccount *account)
+{
+ if (account) {
+ const gchar *name;
+ const gchar *mailbox;
+ gchar *title = NULL;
+ ModestFolderWindowPrivate *priv;
+
+ priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+ mailbox = modest_folder_view_get_mailbox (MODEST_FOLDER_VIEW (priv->folder_view));
+ if (mailbox) {
+ title = g_strdup (mailbox);
+ } else {
+ name = modest_tny_account_get_parent_modest_account_name_for_server_account (account);
+ title = modest_account_mgr_get_display_name (modest_runtime_get_account_mgr(),
+ name);
+ }
+ if (title) {
+ gtk_window_set_title (GTK_WINDOW (self), title);
+ g_free (title);
+ } else {
+ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name"));
+ }
+ } else {
+ gtk_window_set_title (GTK_WINDOW (self), _("mcen_ap_name"));
+ }
+}
+
+static void
+on_visible_account_changed (ModestFolderView *folder_view,
+ const gchar *account_id,
+ gpointer user_data)
+{
+ TnyAccount *account;
+
+ if (!account_id)
+ return;
+
+ account = modest_tny_account_store_get_tny_account_by (modest_runtime_get_account_store(),
+ MODEST_TNY_ACCOUNT_STORE_QUERY_ID,
+ account_id);
+
+ /* Update window title */
+ if (account) {
+ update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
+ g_object_unref (account);
+ }
+}
+
+static void
+on_account_changed (TnyAccountStore *account_store,
+ TnyAccount *account,
+ gpointer user_data)
+{
+ const gchar *acc_id, *visible;
+ ModestFolderWindowPrivate *priv;
+
+ if (!TNY_IS_STORE_ACCOUNT (account))
+ return;
+
+ priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (user_data);
+
+ acc_id = tny_account_get_id (account);
+ visible = modest_folder_view_get_account_id_of_visible_server_account (MODEST_FOLDER_VIEW (priv->folder_view));
+
+ /* Update title if the visible account is the one that have just changed */
+ if (acc_id && visible && !g_utf8_collate (acc_id, visible))
+ update_window_title (MODEST_FOLDER_WINDOW (user_data), account);
+}
projects / modest / blobdiff