#include "modest-tny-account.h"
#include "modest-tny-folder.h"
#include "modest-conf.h"
+#include <modest-utils.h>
#include <modest-maemo-utils.h>
#include "modest-tny-platform-factory.h"
#include "modest-tny-msg.h"
static void modest_main_window_finalize (GObject *obj);
static gboolean modest_main_window_window_state_event (GtkWidget *widget,
- GdkEventWindowState *event,
- gpointer userdata);
+ GdkEventWindowState *event,
+ gpointer userdata);
static void connect_signals (ModestMainWindow *self);
static void save_state (ModestWindow *self);
-static void
-update_menus (ModestMainWindow* self);
+static void update_menus (ModestMainWindow* self);
static void modest_main_window_show_toolbar (ModestWindow *window,
gboolean show_toolbar);
static void on_refresh_account_action_activated (GtkAction *action,
gpointer user_data);
+static void on_account_updated (ModestAccountMgr* mgr, gchar* account_name,
+ gpointer user_data);
+
static void on_send_receive_csm_activated (GtkMenuItem *item,
gpointer user_data);
GdkEventFocus *event,
gpointer userdata);
-static void modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
- TnyFolderStore *folder_store,
- gboolean selected,
- ModestMainWindow *main_window);
+static void on_folder_selection_changed (ModestFolderView *folder_view,
+ TnyFolderStore *folder_store,
+ gboolean selected,
+ ModestMainWindow *main_window);
static void set_at_least_one_account_visible(ModestMainWindow *self);
+static void on_updating_msg_list (ModestHeaderView *header_view,
+ gboolean starting,
+ gpointer user_data);
+
+static gboolean restore_paned_timeout_handler (gpointer *data);
+
typedef struct _ModestMainWindowPrivate ModestMainWindowPrivate;
struct _ModestMainWindowPrivate {
GtkWidget *msg_paned;
ModestMainWindowContentsStyle contents_style;
guint progress_bar_timeout;
+ guint restore_paned_timeout;
/* Signal handler UIDs */
GList *queue_err_signals;
GSList *sighandlers;
+
+ /* "Updating" banner for header view */
+ GtkWidget *updating_banner;
+ guint updating_banner_timeout;
};
#define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \
MODEST_TYPE_MAIN_WINDOW, \
priv->optimized_view = FALSE;
priv->send_receive_in_progress = FALSE;
priv->progress_bar_timeout = 0;
+ priv->restore_paned_timeout = 0;
priv->sighandlers = NULL;
+ priv->updating_banner = NULL;
+ priv->updating_banner_timeout = 0;
+
+ modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(),
+ GTK_WINDOW(obj),
+ "applications_email_mainview");
}
static void
priv->progress_bar_timeout = 0;
}
+ if (priv->updating_banner_timeout > 0) {
+ g_source_remove (priv->updating_banner_timeout);
+ priv->updating_banner_timeout = 0;
+ }
+
+ if (priv->updating_banner) {
+ gtk_widget_destroy (priv->updating_banner);
+ priv->updating_banner = NULL;
+ }
+
+ if (priv->restore_paned_timeout > 0) {
+ g_source_remove (priv->restore_paned_timeout);
+ priv->restore_paned_timeout = 0;
+ }
+
G_OBJECT_CLASS(parent_class)->finalize (obj);
}
return widget ? GTK_WIDGET(widget) : NULL;
}
+static gboolean
+restore_paned_timeout_handler (gpointer *data)
+{
+ ModestMainWindow *main_window = MODEST_MAIN_WINDOW (data);
+ ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
+ ModestConf *conf;
+
+ /* Timeouts are outside the main lock */
+ gdk_threads_enter ();
+ if (GTK_WIDGET_VISIBLE (main_window)) {
+ conf = modest_runtime_get_conf ();
+ modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
+ MODEST_CONF_MAIN_PANED_KEY);
+ }
+ gdk_threads_leave ();
+
+ return FALSE;
+}
+
static void
restore_settings (ModestMainWindow *self, gboolean do_folder_view_too)
modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned),
MODEST_CONF_MAIN_PANED_KEY);
+ g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self);
+
/* We need to force a redraw here in order to get the right
position of the horizontal paned separator */
gtk_widget_show (GTK_WIDGET (self));
}
static gint
-compare_display_names (ModestAccountData *a,
- ModestAccountData *b)
+compare_display_names (ModestAccountSettings *a,
+ ModestAccountSettings *b)
{
- return strcmp (a->display_name, b->display_name);
+ return strcmp (modest_account_settings_get_display_name (a),
+ modest_account_settings_get_display_name (b));
}
static void
gint i, num_accounts;
GList *groups;
gchar *default_account;
+ const gchar *active_account_name;
GtkWidget *send_receive_button, *item;
GtkAction *send_receive_all = NULL;
GSList *radio_group;
accounts = NULL;
while (iter) {
- ModestAccountData *account_data =
- modest_account_mgr_get_account_data (mgr, (gchar*) iter->data);
- accounts = g_slist_prepend (accounts, account_data);
+ ModestAccountSettings *settings =
+ modest_account_mgr_load_account_settings (mgr, (gchar*) iter->data);
+ accounts = g_slist_prepend (accounts, settings);
iter = iter->next;
}
send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
- gtk_action_set_visible (send_receive_all, num_accounts > 1);
+ gtk_action_set_visible (send_receive_all, num_accounts > 0);
/* Delete old send&receive popup items. We can not just do a
menu_detach because it does not work well with
}
/* We need to call this in order to ensure
that the new actions are added in the right
- order (alphabetical */
+ order (alphabetical) */
gtk_ui_manager_ensure_update (parent_priv->ui_manager);
} else
groups = g_list_next (groups);
/* Create a new action group */
default_account = modest_account_mgr_get_default_account (mgr);
+ active_account_name = modest_window_get_active_account (MODEST_WINDOW (self));
+
+ if (!active_account_name)
+ modest_window_set_active_account (MODEST_WINDOW (self), default_account);
+
priv->view_additions_group = gtk_action_group_new (MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS);
radio_group = NULL;
for (i = 0; i < num_accounts; i++) {
- gchar *display_name = NULL;
-
- ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+ gchar *display_name = NULL;
+ const gchar *account_name;
+ ModestAccountSettings *settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i);
- /* Create display name. The UI specification specifies a different format string
- * to use for the default account, though both seem to be "%s", so
- * I don't see what the point is. murrayc. */
- if (default_account && account_data->account_name &&
- !(strcmp (default_account, account_data->account_name) == 0)) {
- display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"),
- account_data->display_name);
+ if (!settings) {
+ g_warning ("%s: BUG: account_data == NULL", __FUNCTION__);
+ continue;
}
- else {
+ account_name = modest_account_settings_get_account_name (settings);
+
+ if (default_account && account_name &&
+ !(strcmp (default_account, account_name) == 0)) {
+ display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_default"),
+ modest_account_settings_get_display_name (settings));
+ } else {
display_name = g_strdup_printf (_("mcen_me_toolbar_sendreceive_mailbox_n"),
- account_data->display_name);
+ modest_account_settings_get_display_name (settings));
}
-
+
/* 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 */
- if(account_data && account_data->account_name) {
+ if (settings && account_name) {
gchar* item_name, *refresh_action_name;
guint8 merge_id = 0;
GtkAction *view_account_action, *refresh_account_action;
- view_account_action = GTK_ACTION (gtk_radio_action_new (account_data->account_name,
+ view_account_action = GTK_ACTION (gtk_radio_action_new (account_name,
display_name, NULL, NULL, 0));
gtk_action_group_add_action (priv->view_additions_group, view_account_action);
gtk_radio_action_set_group (GTK_RADIO_ACTION (view_account_action), radio_group);
radio_group = gtk_radio_action_get_group (GTK_RADIO_ACTION (view_account_action));
- if (default_account && account_data->account_name &&
- (strcmp (default_account, account_data->account_name) == 0)) {
- gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (view_account_action), TRUE);
+ if (active_account_name) {
+ if (active_account_name && account_name &&
+ (strcmp (active_account_name, account_name) == 0)) {
+ gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (view_account_action), TRUE);
+ }
}
/* 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", NULL);
+ item_name = g_strconcat (account_name, "Menu", NULL);
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,
+ account_name,
GTK_UI_MANAGER_MENUITEM,
FALSE);
self);
/* Create the items for the Tools->Send&Receive submenu */
- refresh_action_name = g_strconcat ("SendReceive", account_data->account_name, NULL);
+ refresh_action_name = g_strconcat ("SendReceive", account_name, NULL);
refresh_account_action = gtk_action_new ((const gchar*) refresh_action_name,
display_name, NULL, NULL);
gtk_action_group_add_action (priv->view_additions_group, refresh_account_action);
g_signal_connect_data (G_OBJECT (refresh_account_action),
"activate",
G_CALLBACK (on_refresh_account_action_activated),
- g_strdup (account_data->account_name),
+ g_strdup (account_name),
(GClosureNotify) g_free,
0);
if (priv->accounts_popup) {
GtkWidget *label = gtk_label_new(NULL);
gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5);
- if (default_account && (strcmp(account_data->account_name, default_account) == 0))
+ if (default_account && (strcmp(account_name, default_account) == 0))
{
gchar *escaped = g_markup_printf_escaped ("<b>%s</b>", display_name);
gtk_label_set_markup (GTK_LABEL (label), escaped);
g_signal_connect_data (G_OBJECT (item),
"activate",
G_CALLBACK (on_send_receive_csm_activated),
- g_strdup (account_data->account_name),
+ g_strdup (account_name),
(GClosureNotify) g_free,
0);
}
* group being inserted. This makes the default account appear in bold.
* I agree it is a rather ugly way, but I don't see another possibility. armin. */
for (i = 0; i < num_accounts; i++) {
- ModestAccountData *account_data = (ModestAccountData *) g_slist_nth_data (accounts, i);
+ ModestAccountSettings *settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i);
+ const gchar *account_name;
- if(account_data->account_name && default_account &&
- strcmp (account_data->account_name, default_account) == 0) {
- gchar *item_name = g_strconcat (account_data->account_name, "Menu", NULL);
+ account_name = modest_account_settings_get_account_name (settings);
+
+ if(account_name && default_account &&
+ strcmp (account_name, default_account) == 0) {
+ gchar *item_name = g_strconcat (account_name, "Menu", NULL);
gchar *path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL);
GtkWidget *item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
g_free (bold_name);
}
}
-
+
path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL);
item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path);
g_free (path);
g_free(item_name);
}
- modest_account_mgr_free_account_data (mgr, account_data);
+ g_object_unref (settings);
}
if (priv->accounts_popup) {
G_OBJECT(priv->folder_view), "key-press-event",
G_CALLBACK(on_inner_widgets_key_pressed), self);
priv->sighandlers =
- modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view), "folder_selection_changed",
- G_CALLBACK (modest_main_window_on_folder_selection_changed), self);
+ modest_signal_mgr_connect (priv->sighandlers, G_OBJECT(priv->folder_view),
+ "folder_selection_changed",
+ G_CALLBACK (on_folder_selection_changed),
+ self);
priv->sighandlers =
- modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view), "folder-display-name-changed",
- G_CALLBACK (modest_ui_actions_on_folder_display_name_changed), self);
+ modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->folder_view),
+ "folder-display-name-changed",
+ G_CALLBACK (modest_ui_actions_on_folder_display_name_changed),
+ self);
priv->sighandlers =
- modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view), "focus-in-event",
- G_CALLBACK (on_folder_view_focus_in), self);
+ modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->folder_view),
+ "focus-in-event",
+ G_CALLBACK (on_folder_view_focus_in),
+ self);
/* Folder view CSM */
menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/FolderViewCSM");
priv->sighandlers =
modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (priv->header_view), "focus-in-event",
G_CALLBACK (on_header_view_focus_in), self);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (priv->header_view),
+ "updating-msg-list",
+ G_CALLBACK (on_updating_msg_list),
+ self);
/* Header view CSM */
menu = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/HeaderViewCSM");
gtk_widget_tap_and_hold_setup (GTK_WIDGET (priv->header_view), menu, NULL, 0);
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
- G_CALLBACK(_header_view_csm_menu_activated),
- self);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,G_OBJECT(priv->header_view), "tap-and-hold",
+ G_CALLBACK(_header_view_csm_menu_activated),
+ self);
/* window */
- priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event",
- G_CALLBACK (modest_main_window_window_state_event),
- NULL);
-
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,G_OBJECT (self), "window-state-event",
+ G_CALLBACK (modest_main_window_window_state_event),
+ NULL);
+
/* Mail Operation Queue */
priv->sighandlers =
modest_signal_mgr_connect (priv->sighandlers,
G_CALLBACK (on_default_account_changed),
self);
+ priv->sighandlers =
+ modest_signal_mgr_connect (priv->sighandlers,
+ G_OBJECT (modest_runtime_get_account_mgr ()),
+ "account_updated",
+ G_CALLBACK (on_account_updated),
+ self);
/* Account store */
priv->sighandlers =
modest_signal_mgr_connect (priv->sighandlers,
priv->folder_view = MODEST_FOLDER_VIEW (modest_platform_create_folder_view (NULL));
wrap_in_scrolled_window (folder_win, GTK_WIDGET(priv->folder_view));
-/* wrap_in_scrolled_window (priv->contents_widget, GTK_WIDGET(priv->header_view)); */
gtk_widget_show (GTK_WIDGET (priv->folder_view));
/* Connect signals */
- connect_signals ((ModestMainWindow*)self);
+ connect_signals (MODEST_MAIN_WINDOW (self));
/* Set account store */
tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (priv->folder_view),
* hibernation: */
modest_osso_load_state ();
- /* Restore window & widget settings */
-
+ /* Restore window & widget settings */
restore_settings (MODEST_MAIN_WINDOW(self), TRUE);
- /* The UI spec wants us to show a connection dialog when the application is
- * started by the user, if there is no connection.
- * Do this before showing the account wizard,
- * because wizard needs a connection to discover capabilities. */
- modest_platform_connect_and_wait (GTK_WINDOW (self), NULL);
-
/* Check if accounts exist and show the account wizard if not */
gboolean accounts_exist =
modest_account_mgr_has_accounts(modest_runtime_get_account_mgr(), TRUE);
accounts = modest_account_mgr_account_names (modest_runtime_get_account_mgr (), TRUE);
send_receive_all = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsSendReceiveAllMenu");
- gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 1);
+ gtk_action_set_visible (send_receive_all, g_slist_length (accounts) > 0);
modest_account_mgr_free_account_names (accounts);
+ update_menus (MODEST_MAIN_WINDOW (self));
}
}
gtk_ui_manager_get_accel_group (parent_priv->ui_manager));
/* Menubar. Update the state of some toggles */
- parent_priv->menubar = modest_maemo_utils_menubar_to_menu (parent_priv->ui_manager);
+ parent_priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar");
conf = modest_runtime_get_conf ();
action = gtk_ui_manager_get_action (parent_priv->ui_manager,
"/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu");
return MODEST_WINDOW(self);
}
-gboolean
-modest_main_window_close_all (ModestMainWindow *self)
-{
- GtkWidget *note;
- GtkResponseType response;
-
- /* Create the confirmation dialog MSG-NOT308 */
- note = hildon_note_new_confirmation_add_buttons (GTK_WINDOW (self),
- _("emev_nc_close_windows"),
- _("mcen_bd_yes"), GTK_RESPONSE_YES,
- _("mcen_bd_no"), GTK_RESPONSE_NO,
- NULL);
-
- response = gtk_dialog_run (GTK_DIALOG (note));
- gtk_widget_destroy (GTK_WIDGET (note));
-
- if (response == GTK_RESPONSE_YES)
- return TRUE;
- else
- return FALSE;
-}
-
-
void
modest_main_window_set_style (ModestMainWindow *self,
ModestMainWindowStyle style)
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);
+ if (modest_main_window_transfer_mode_enabled (MODEST_MAIN_WINDOW(self)))
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_TRANSFER);
+ else
+ set_toolbar_mode (MODEST_MAIN_WINDOW(self), TOOLBAR_MODE_NORMAL);
} else {
gtk_widget_hide (GTK_WIDGET (parent_priv->toolbar));
action_name = "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu";
action = gtk_ui_manager_get_action (parent_priv->ui_manager, action_name);
- modest_maemo_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
+ modest_utils_toggle_action_set_active_block_notify (GTK_TOGGLE_ACTION (action),
show_toolbar);
}
update_menus (MODEST_MAIN_WINDOW (user_data));
}
+static void
+on_account_updated (ModestAccountMgr* mgr,
+ gchar* account_name,
+ gpointer user_data)
+{
+ ModestMainWindow *win = MODEST_MAIN_WINDOW (user_data);
+
+ if (modest_main_window_get_contents_style(win) == MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS) {
+ modest_main_window_set_contents_style (win, MODEST_MAIN_WINDOW_CONTENTS_STYLE_DETAILS);
+ }
+}
+
/*
* This function manages the key events used to navigate between
* header and folder views (when the window is in split view)
if (event->keyval == GDK_Left)
gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view));
else if ((event->keyval == GDK_Return)||(event->keyval == GDK_KP_Enter)) {
- hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message"));
- return TRUE;
+ guint selected_headers = modest_header_view_count_selected_headers (MODEST_HEADER_VIEW (widget));
+ if (selected_headers > 1) {
+ hildon_banner_show_information (NULL, NULL, _("mcen_ib_select_one_message"));
+ return TRUE;
+ }
}
} else if (MODEST_IS_FOLDER_VIEW (widget) && event->keyval == GDK_Right)
gtk_widget_grab_focus (GTK_WIDGET (priv->header_view));
static gchar *
get_gray_color_markup (GtkWidget *styled_widget)
{
- gchar *gray_color_markup;
-
+ gchar *gray_color_markup = NULL;
+#ifndef MODEST_HAVE_HILDON0_WIDGETS
/* Obtain the secondary text color. We need a realized widget, that's why
we get styled_widget from outside */
-#ifndef MODEST_HAVE_HILDON0_WIDGETS
GdkColor color;
- gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color);
- gray_color_markup = modest_text_utils_get_color_string (&color);
-#else
- gray_color_markup = g_strdup ("#BBBBBB");
-#endif
+ if (gtk_style_lookup_color (styled_widget->style, "SecondaryTextColor", &color))
+ gray_color_markup = modest_text_utils_get_color_string (&color);
+#endif /*MODEST_HAVE_HILDON0_WIDGETS*/
+
+ if (!gray_color_markup)
+ gray_color_markup = g_strdup ("#BBBBBB");
+
return gray_color_markup;
}
(const gchar *) gray_color_markup);
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
g_free (device_name);
g_free (label);
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
g_string_free (proto, TRUE);
g_free (label);
modest_tny_folder_store_get_message_count (folder_store));
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
g_free (label);
modest_tny_folder_store_get_folder_count (folder_store));
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
g_free (label);
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
g_free (label);
} else if (TNY_IS_ACCOUNT(folder_store)) {
TnyAccount *account = TNY_ACCOUNT(folder_store);
time_t last_updated;
- gchar *last_updated_string;
+ const gchar *last_updated_string;
/* Get last updated from configuration */
last_updated = modest_account_mgr_get_last_updated (modest_runtime_get_account_mgr (),
tny_account_get_id (account));
gray_color_markup, _("mcen_ti_lastupdated"), last_updated_string);
label_w = gtk_label_new (NULL);
gtk_label_set_markup (GTK_LABEL (label_w), label);
+ gtk_label_set_ellipsize (GTK_LABEL (label_w), PANGO_ELLIPSIZE_END);
gtk_box_pack_start (GTK_BOX (vbox), label_w, FALSE, FALSE, 0);
- g_free (last_updated_string);
g_free (label);
}
gtk_action_set_visible (refresh_action, FALSE);
if (cancel_action)
gtk_action_set_visible (cancel_action, TRUE);
+ if (priv->progress_bar)
+ gtk_widget_show (priv->progress_bar);
if (priv->progress_toolitem) {
gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE);
gtk_widget_show (priv->progress_toolitem);
}
- if (priv->progress_bar)
- gtk_widget_show (priv->progress_bar);
/* Show toolbar if it's hiden (optimized view ) */
if (priv->optimized_view)
{
ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self);
GtkAction *action;
+ ModestAccountMgr *mgr;
+ ModestAccountSettings *settings;
+ ModestServerAccountSettings *store_settings = NULL;
/* Get account data */
- ModestAccountMgr *mgr = modest_runtime_get_account_mgr ();
- ModestAccountData *acc_data = modest_account_mgr_get_account_data (mgr, acc_name);
+ mgr = modest_runtime_get_account_mgr ();
+ settings = modest_account_mgr_load_account_settings (mgr, acc_name);
+ if (settings)
+ store_settings = modest_account_settings_get_store_settings (settings);
/* Set the new visible & active account */
- if (acc_data && acc_data->store_account) {
- modest_folder_view_set_account_id_of_visible_server_account (priv->folder_view,
- acc_data->store_account->account_name);
- modest_window_set_active_account (MODEST_WINDOW (self), acc_data->account_name);
- action = gtk_action_group_get_action (priv->view_additions_group, acc_data->account_name);
+ if (settings && (modest_server_account_settings_get_account_name (store_settings)!= NULL)) {
+ const gchar *account_name;
+
+ account_name = modest_account_settings_get_account_name (settings);
+
+ modest_folder_view_set_account_id_of_visible_server_account
+ (priv->folder_view,
+ modest_server_account_settings_get_account_name (store_settings));
+ modest_window_set_active_account (MODEST_WINDOW (self), account_name);
+ action = gtk_action_group_get_action (priv->view_additions_group, account_name);
if (action != NULL) {
if (!gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action))) {
- modest_maemo_toggle_action_set_active_block_notify (
+ modest_utils_toggle_action_set_active_block_notify (
GTK_TOGGLE_ACTION (action),
TRUE);
}
/* Free */
- if (acc_data)
- modest_account_mgr_free_account_data (mgr, acc_data);
+ if (settings) {
+ g_object_unref (store_settings);
+ g_object_unref (settings);
+ }
}
/* Make sure that at least one account is "viewed": */
}
const gchar *active_server_account_name =
- modest_folder_view_get_account_id_of_visible_server_account (priv->folder_view);
+ modest_folder_view_get_account_id_of_visible_server_account (priv->folder_view);
+
if (!active_server_account_name ||
!modest_account_mgr_account_exists (account_mgr, active_server_account_name, TRUE))
{
gchar* first_modest_name = modest_account_mgr_get_first_account_name (account_mgr);
- if (first_modest_name) {
+ gchar* default_modest_name = modest_account_mgr_get_default_account (account_mgr);
+ if (default_modest_name) {
+ set_account_visible (self, default_modest_name);
+ } else if (first_modest_name) {
set_account_visible (self, first_modest_name);
- g_free (first_modest_name);
}
+ g_free (first_modest_name);
+ g_free (default_modest_name);
}
}
refresh_account (const gchar *account_name)
{
ModestWindow *win;
-
- win = MODEST_WINDOW (modest_window_mgr_get_main_window (modest_runtime_get_window_mgr ()));
-
+
+ /* win must already exists here, obviously */
+ win = modest_window_mgr_get_main_window (modest_runtime_get_window_mgr (),
+ FALSE);
+ if (!win) {
+ g_warning ("%s: BUG: no main window!", __FUNCTION__);
+ return;
+ }
+
/* If account_name == NULL, we must update all (option All) */
if (!account_name)
modest_ui_actions_do_send_receive_all (win);
}
static gboolean
-on_folder_view_focus_in (GtkWidget *widget,
- GdkEventFocus *event,
- gpointer userdata)
+on_folder_view_focus_in (GtkWidget *widget, GdkEventFocus *event, gpointer userdata)
{
ModestMainWindow *main_window = NULL;
gpointer userdata)
{
ModestMainWindow *main_window = NULL;
- ModestMainWindowPrivate *priv = NULL;
g_return_val_if_fail (MODEST_IS_MAIN_WINDOW (userdata), FALSE);
+
main_window = MODEST_MAIN_WINDOW (userdata);
- priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window);
/* Update toolbar dimming state */
modest_ui_actions_check_toolbar_dimming_rules (MODEST_WINDOW (main_window));
}
static void
-modest_main_window_on_folder_selection_changed (ModestFolderView *folder_view,
- TnyFolderStore *folder_store,
- gboolean selected,
- ModestMainWindow *main_window)
+on_folder_selection_changed (ModestFolderView *folder_view,
+ TnyFolderStore *folder_store,
+ gboolean selected,
+ ModestMainWindow *main_window)
{
ModestWindowPrivate *parent_priv = MODEST_WINDOW_GET_PRIVATE (main_window);
GtkAction *action = NULL;
show_clipboard = show_delete = show_cancel_send = TRUE;
show_reply = show_forward = FALSE;
break;
+ case TNY_FOLDER_TYPE_INVALID:
+ g_warning ("%s: BUG: TNY_FOLDER_TYPE_INVALID", __FUNCTION__);
+ break;
default:
show_reply = show_forward = show_clipboard = show_delete = TRUE;
show_cancel_send = FALSE;
return TRUE;
}
+static gboolean
+show_updating_banner (gpointer user_data)
+{
+ ModestMainWindowPrivate *priv = NULL;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
+
+ if (priv->updating_banner == NULL) {
+
+ /* We're outside the main lock */
+ gdk_threads_enter ();
+ priv->updating_banner =
+ modest_platform_animation_banner (GTK_WIDGET (user_data), NULL,
+ _CS ("ckdg_pb_updating"));
+ gdk_threads_leave ();
+ }
+
+ /* Remove timeout */
+ priv->updating_banner_timeout = 0;
+ return FALSE;
+}
+
+/**
+ * We use this function to show/hide a progress banner showing
+ * "Updating" while the header view is being filled. We're not showing
+ * it unless the update takes more than 2 seconds
+ *
+ * If starting = TRUE then the refresh is starting, otherwise it means
+ * that is has just finished
+ */
+static void
+on_updating_msg_list (ModestHeaderView *header_view,
+ gboolean starting,
+ gpointer user_data)
+{
+ ModestMainWindowPrivate *priv = NULL;
+
+ priv = MODEST_MAIN_WINDOW_GET_PRIVATE (user_data);
+
+ /* Remove old timeout */
+ if (priv->updating_banner_timeout > 0) {
+ g_source_remove (priv->updating_banner_timeout);
+ priv->updating_banner_timeout = 0;
+ }
+
+ /* Create a new timeout */
+ if (starting) {
+ priv->updating_banner_timeout =
+ g_timeout_add (2000, show_updating_banner, user_data);
+ } else {
+ /* Remove the banner if exists */
+ if (priv->updating_banner) {
+ gtk_widget_destroy (priv->updating_banner);
+ priv->updating_banner = NULL;
+ }
+ }
+}