X-Git-Url: http://git.maemo.org/git/?p=modest;a=blobdiff_plain;f=src%2Fmaemo%2Fmodest-main-window.c;h=80abed1dc0d386cfcab8d7a6449c91f58d3dee48;hp=2232a2e3cf9d5509b762e9f9f1cc63da8ad3a6b0;hb=e0521cac248602856888d8dffd4e34857737e57a;hpb=7929406e046ed92142ff337bd9161e6a16e1d04e diff --git a/src/maemo/modest-main-window.c b/src/maemo/modest-main-window.c index 2232a2e..80abed1 100644 --- a/src/maemo/modest-main-window.c +++ b/src/maemo/modest-main-window.c @@ -66,12 +66,6 @@ #include "modest-text-utils.h" #include "modest-signal-mgr.h" -#ifdef MODEST_HAVE_HILDON0_WIDGETS -#include -#else -#include -#endif /*MODEST_HAVE_HILDON0_WIDGETS*/ - #define MODEST_MAIN_WINDOW_ACTION_GROUP_ADDITIONS "ModestMainWindowActionAdditions" #define XALIGN 0.5 @@ -112,15 +106,17 @@ static void on_queue_changed (ModestMailOperationQueue *queue, static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window); -static void -on_account_inserted (TnyAccountStore *accoust_store, - TnyAccount *account, - gpointer user_data); +static void on_account_inserted (TnyAccountStore *accoust_store, + TnyAccount *account, + gpointer user_data); -static void -on_account_removed (TnyAccountStore *accoust_store, - TnyAccount *account, - gpointer user_data); +static void on_account_removed (TnyAccountStore *accoust_store, + TnyAccount *account, + gpointer user_data); + +static void on_account_changed (TnyAccountStore *account_store, + TnyAccount *account, + gpointer user_data); static void on_default_account_changed (ModestAccountMgr* mgr, gpointer user_data); @@ -146,9 +142,6 @@ static void on_show_account_action_toggled (GtkToggleAction *action, 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); @@ -221,6 +214,7 @@ struct _ModestMainWindowPrivate { ModestMainWindowStyle style; ModestMainWindowContentsStyle contents_style; + gboolean wait_for_settings; guint progress_bar_timeout; guint restore_paned_timeout; @@ -232,6 +226,9 @@ struct _ModestMainWindowPrivate { /* "Updating" banner for header view */ GtkWidget *updating_banner; guint updating_banner_timeout; + + /* Display state */ + osso_display_state_t display_state; }; #define MODEST_MAIN_WINDOW_GET_PRIVATE(o) (G_TYPE_INSTANCE_GET_PRIVATE((o), \ MODEST_TYPE_MAIN_WINDOW, \ @@ -349,6 +346,7 @@ modest_main_window_init (ModestMainWindow *obj) priv->progress_bar = NULL; priv->current_toolbar_mode = TOOLBAR_MODE_NORMAL; priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT; + priv->wait_for_settings = TRUE; priv->contents_style = -1; /* invalid contents style. We need this to select it for the first time */ priv->merge_ids = NULL; priv->optimized_view = FALSE; @@ -358,6 +356,7 @@ modest_main_window_init (ModestMainWindow *obj) priv->sighandlers = NULL; priv->updating_banner = NULL; priv->updating_banner_timeout = 0; + priv->display_state = OSSO_DISPLAY_ON; modest_window_mgr_register_help_id (modest_runtime_get_window_mgr(), GTK_WINDOW(obj), @@ -373,10 +372,9 @@ modest_main_window_finalize (GObject *obj) /* Sanity check: shouldn't be needed, the window mgr should call this function before */ - modest_main_window_disconnect_signals (MODEST_WINDOW (obj)); - + modest_main_window_disconnect_signals (MODEST_WINDOW (obj)); modest_main_window_cleanup_queue_error_signals ((ModestMainWindow *) obj); - + g_slist_free (priv->progress_widgets); g_byte_array_free (priv->merge_ids, TRUE); @@ -400,7 +398,7 @@ modest_main_window_finalize (GObject *obj) g_source_remove (priv->restore_paned_timeout); priv->restore_paned_timeout = 0; } - + G_OBJECT_CLASS(parent_class)->finalize (obj); } @@ -411,7 +409,7 @@ modest_main_window_get_child_widget (ModestMainWindow *self, ModestMainWindowPrivate *priv; GtkWidget *widget; - g_return_val_if_fail (self, NULL); + g_return_val_if_fail (self && MODEST_IS_MAIN_WINDOW(self), NULL); g_return_val_if_fail (widget_type >= 0 && widget_type < MODEST_MAIN_WINDOW_WIDGET_TYPE_NUM, NULL); @@ -469,10 +467,10 @@ restore_settings (ModestMainWindow *self, gboolean do_folder_view_too) modest_widget_memory_restore (conf, G_OBJECT(priv->folder_view), MODEST_CONF_FOLDER_VIEW_KEY); - modest_widget_memory_restore (conf, G_OBJECT(priv->main_paned), - MODEST_CONF_MAIN_PANED_KEY); +/* 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); + g_timeout_add (250, (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 */ @@ -492,10 +490,10 @@ save_state (ModestWindow *window) modest_widget_memory_save (conf,G_OBJECT(self), MODEST_CONF_MAIN_WINDOW_KEY); - modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), - MODEST_CONF_MAIN_PANED_KEY); - // modest_widget_memory_save (conf, G_OBJECT(priv->header_view), - // MODEST_CONF_HEADER_VIEW_KEY); + /* Only save main paned position if we're in split mode */ + if (priv->style == MODEST_MAIN_WINDOW_STYLE_SPLIT) + modest_widget_memory_save (conf, G_OBJECT(priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), MODEST_CONF_FOLDER_VIEW_KEY); } @@ -508,6 +506,14 @@ compare_display_names (ModestAccountSettings *a, modest_account_settings_get_display_name (b)); } +/* We use this function to prevent the send&receive CSM to be shown + when there are less than two account */ +static gboolean +tap_and_hold_query_cb (GtkWidget *widget, GdkEvent *event) +{ + return TRUE; +} + static void update_menus (ModestMainWindow* self) { @@ -697,17 +703,14 @@ update_menus (ModestMainWindow* self) /* Create item and add it to the send&receive CSM. If there is only one account then it'll be no menu */ - if (priv->accounts_popup) { + if (num_accounts > 1) { GtkWidget *label = gtk_label_new(NULL); gtk_misc_set_alignment (GTK_MISC (label), 0.0, 0.5); - if (default_account && (strcmp(account_name, default_account) == 0)) - { + if (default_account && (strcmp(account_name, default_account) == 0)) { gchar *escaped = g_markup_printf_escaped ("%s", display_name); gtk_label_set_markup (GTK_LABEL (label), escaped); g_free (escaped); - } - else - { + } else { gtk_label_set_text (GTK_LABEL (label), display_name); } @@ -735,56 +738,82 @@ update_menus (ModestMainWindow* self) * 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++) { - ModestAccountSettings *settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i); + gchar *item_name, *path; + GtkWidget *item; + ModestAccountSettings *settings; const gchar *account_name; + gboolean is_default; + settings = (ModestAccountSettings *) g_slist_nth_data (accounts, i); account_name = modest_account_settings_get_account_name (settings); + is_default = (account_name && default_account && !strcmp (account_name, default_account)); - 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(path); - - if (item) { - GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); - if (GTK_IS_LABEL (child)) { - const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + /* Get the item of the view menu */ + item_name = g_strconcat (account_name, "Menu", NULL); + path = g_strconcat ("/MenuBar/ViewMenu/ViewMenuAdditions/", item_name, NULL); + item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); + g_free(path); + + if (item) { + GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); + if (GTK_IS_LABEL (child)) { + const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + if (is_default) { gchar *bold_name = g_markup_printf_escaped("%s", cur_name); gtk_label_set_markup (GTK_LABEL (child), bold_name); g_free (bold_name); } + gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); } + } - path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL); - item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); - g_free (path); - - if (item) { - GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); - if (GTK_IS_LABEL (child)) { - const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + /* Get the item of the tools menu */ + path = g_strconcat("/MenuBar/ToolsMenu/ToolsSendReceiveMainMenu/ToolsMenuAdditions/", item_name, NULL); + item = gtk_ui_manager_get_widget (parent_priv->ui_manager, path); + g_free (path); + + if (item) { + GtkWidget *child = gtk_bin_get_child (GTK_BIN (item)); + if (GTK_IS_LABEL (child)) { + const gchar *cur_name = gtk_label_get_text (GTK_LABEL (child)); + if (is_default) { gchar *bold_name = g_markup_printf_escaped("%s", cur_name); gtk_label_set_markup (GTK_LABEL (child), bold_name); g_free (bold_name); } + gtk_label_set_ellipsize (GTK_LABEL (child), PANGO_ELLIPSIZE_END); } - - g_free(item_name); } + g_free(item_name); g_object_unref (settings); } - if (priv->accounts_popup) { + if (num_accounts > 1) { + /* Disconnect the tap-and-hold-query if it's connected */ + if (modest_signal_mgr_is_connected (priv->sighandlers, + G_OBJECT (send_receive_button), + "tap-and-hold-query")) + priv->sighandlers = modest_signal_mgr_disconnect (priv->sighandlers, + G_OBJECT (send_receive_button), + "tap-and-hold-query"); + /* Mandatory in order to view the menu contents */ gtk_widget_show_all (priv->accounts_popup); /* 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); + } else { + /* Connect the tap-and-hold-query in order not to show the CSM */ + if (!modest_signal_mgr_is_connected (priv->sighandlers, + G_OBJECT (send_receive_button), + "tap-and-hold-query")) + priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, + G_OBJECT (send_receive_button), + "tap-and-hold-query", + G_CALLBACK (tap_and_hold_query_cb), + NULL); } /* Frees */ @@ -836,8 +865,8 @@ _folder_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) { g_return_if_fail (MODEST_IS_MAIN_WINDOW (user_data)); - /* Update dimmed */ - modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW(user_data)); } static void @@ -847,8 +876,8 @@ _header_view_csm_menu_activated (GtkWidget *widget, gpointer user_data) /* Update visibility */ - /* Update dimmed */ - modest_window_check_dimming_rules_group (MODEST_WINDOW (user_data), "ModestMenuDimmingRules"); + /* Update dimmed */ + modest_ui_actions_check_menu_dimming_rules (MODEST_WINDOW(user_data)); } static void @@ -977,41 +1006,29 @@ connect_signals (ModestMainWindow *self) 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, + G_OBJECT (modest_runtime_get_account_store ()), + "account_changed", + G_CALLBACK (on_account_changed), + self); + + priv->sighandlers = + modest_signal_mgr_connect (priv->sighandlers, G_OBJECT (modest_runtime_get_account_store()), "password_requested", G_CALLBACK (modest_ui_actions_on_password_requested), self); } -#if 0 -/** Idle handler, to send/receive at startup .*/ -gboolean -sync_accounts_cb (ModestMainWindow *win) -{ - modest_ui_actions_do_send_receive (NULL, MODEST_WINDOW (win)); - return FALSE; /* Do not call this idle handler again. */ -} -#endif - static void on_hildon_program_is_topmost_notify(GObject *self, - GParamSpec *propert_param, gpointer user_data) + GParamSpec *propert_param, + gpointer user_data) { HildonProgram *app = HILDON_PROGRAM (self); - /* - ModestWindow* self = MODEST_WINDOW(user_data); - */ - /* Note that use of hildon_program_set_can_hibernate() * is generally referred to as "setting the killable flag", * though hibernation does not seem equal to death. @@ -1022,13 +1039,16 @@ on_hildon_program_is_topmost_notify(GObject *self, * because hibernation should only happen when the application * is in the background: */ hildon_program_set_can_hibernate (app, FALSE); + + /* Remove new mail visual notifications */ + modest_platform_remove_new_mail_notifications (TRUE); } else { /* Allow hibernation if the program has gone to the background: */ /* However, prevent hibernation while the settings are being changed: */ const gboolean hibernation_prevented = modest_window_mgr_get_hibernation_is_prevented ( - modest_runtime_get_window_mgr ()); + modest_runtime_get_window_mgr ()); if (hibernation_prevented) hildon_program_set_can_hibernate (app, FALSE); @@ -1037,8 +1057,7 @@ on_hildon_program_is_topmost_notify(GObject *self, modest_osso_save_state(); hildon_program_set_can_hibernate (app, TRUE); } - } - + } } static void @@ -1064,7 +1083,9 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) modest_osso_load_state (); /* Restore window & widget settings */ + priv->wait_for_settings = TRUE; restore_settings (MODEST_MAIN_WINDOW(self), TRUE); + priv->wait_for_settings = FALSE; /* Check if accounts exist and show the account wizard if not */ gboolean accounts_exist = @@ -1088,6 +1109,19 @@ modest_main_window_on_show (GtkWidget *self, gpointer user_data) } } +static void +osso_display_event_cb (osso_display_state_t state, + gpointer data) +{ + ModestMainWindowPrivate *priv = MODEST_MAIN_WINDOW_GET_PRIVATE (data); + + priv->display_state = state; + + /* Stop blinking if the screen becomes on */ + if (priv->display_state == OSSO_DISPLAY_ON) + modest_platform_remove_new_mail_notifications (TRUE); +} + ModestWindow * modest_main_window_new (void) { @@ -1099,6 +1133,7 @@ modest_main_window_new (void) ModestDimmingRulesGroup *toolbar_rules_group = NULL; GtkActionGroup *action_group = NULL; GError *error = NULL; + HildonProgram *app; ModestConf *conf = NULL; GtkAction *action = NULL; GdkPixbuf *window_icon; @@ -1113,8 +1148,8 @@ modest_main_window_new (void) action_group = gtk_action_group_new ("ModestMainWindowActions"); gtk_action_group_set_translation_domain (action_group, GETTEXT_PACKAGE); - menu_rules_group = modest_dimming_rules_group_new ("ModestMenuDimmingRules", FALSE); - toolbar_rules_group = modest_dimming_rules_group_new ("ModestToolbarDimmingRules", TRUE); + menu_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_MENU, FALSE); + toolbar_rules_group = modest_dimming_rules_group_new (MODEST_DIMMING_RULES_TOOLBAR, TRUE); /* Add common actions */ gtk_action_group_add_actions (action_group, @@ -1175,7 +1210,7 @@ modest_main_window_new (void) gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); /* Menubar. Update the state of some toggles */ - parent_priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar"); + parent_priv->menubar = modest_maemo_utils_get_manager_menubar_as_menu (parent_priv->ui_manager, "/MenuBar"); conf = modest_runtime_get_conf (); action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/MenuBar/ViewMenu/ViewShowToolbarMainMenu/ViewShowToolbarNormalScreenMenu"); @@ -1234,7 +1269,7 @@ modest_main_window_new (void) gtk_container_add (GTK_CONTAINER(self), priv->main_vbox); - HildonProgram *app = hildon_program_get_instance (); + app = hildon_program_get_instance (); hildon_program_add_window (app, HILDON_WINDOW (self)); g_signal_connect (G_OBJECT(app), "notify::is-topmost", @@ -1244,18 +1279,23 @@ modest_main_window_new (void) G_CALLBACK (modest_main_window_on_show), folder_win); /* Set window icon */ - window_icon = modest_platform_get_icon (MODEST_APP_ICON); + window_icon = modest_platform_get_icon (MODEST_APP_ICON, MODEST_ICON_SIZE_BIG); if (window_icon) { gtk_window_set_icon (GTK_WINDOW (self), window_icon); g_object_unref (window_icon); } + /* Listen for changes in the screen, we don't want to show a + led pattern when the display is on for example */ + osso_hw_set_display_event_cb (modest_maemo_utils_get_osso_context (), + osso_display_event_cb, + self); + /* Dont't restore settings here, * because it requires a gtk_widget_show(), * and we don't want to do that until later, * so that the UI is not visible for non-menu D-Bus activation. */ - /* restore_settings (MODEST_MAIN_WINDOW(self), FALSE); */ return MODEST_WINDOW(self); } @@ -1293,6 +1333,10 @@ modest_main_window_set_style (ModestMainWindow *self, priv->style = style; switch (style) { case MODEST_MAIN_WINDOW_STYLE_SIMPLE: + + if (!priv->wait_for_settings) + modest_widget_memory_save (modest_runtime_get_conf (), G_OBJECT (priv->main_paned), + MODEST_CONF_MAIN_PANED_KEY); /* Remove main paned */ g_object_ref (priv->main_paned); gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned); @@ -1310,6 +1354,8 @@ modest_main_window_set_style (ModestMainWindow *self, gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->contents_widget); gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned); + g_timeout_add (500, (GSourceFunc) restore_paned_timeout_handler, self); + break; default: g_return_if_reached (); @@ -1336,6 +1382,53 @@ modest_main_window_get_style (ModestMainWindow *self) return priv->style; } +static void +toolbar_resize (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + ModestWindowPrivate *parent_priv = NULL; + GtkWidget *widget; + gint static_button_size; + ModestWindowMgr *mgr; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + + mgr = modest_runtime_get_window_mgr (); + static_button_size = modest_window_mgr_get_fullscreen_mode (mgr)?118:108; + + if (parent_priv->toolbar) { + /* left size buttons */ + widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew"); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE); + gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1); + widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE); + gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1); + widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarDeleteMessage"); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE); + gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1); + widget = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToggleFolders"); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), FALSE); + gtk_widget_set_size_request (GTK_WIDGET (widget), static_button_size, -1); + + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), FALSE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->refresh_toolitem), TRUE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->refresh_toolitem), TRUE); + gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->sort_toolitem), TRUE); + gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->sort_toolitem), TRUE); + } + +} + static gboolean @@ -1359,20 +1452,14 @@ modest_main_window_window_state_event (GtkWidget *widget, GdkEventWindowState *e if (is_fullscreen != active) { gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (fs_toggle_action), is_fullscreen); } + + toolbar_resize (MODEST_MAIN_WINDOW (widget)); } return FALSE; } -static void -set_homogeneous (GtkWidget *widget, - gpointer data) -{ - gtk_tool_item_set_expand (GTK_TOOL_ITEM (widget), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (widget), TRUE); -} - static void modest_main_window_show_toolbar (ModestWindow *self, gboolean show_toolbar) @@ -1397,19 +1484,12 @@ modest_main_window_show_toolbar (ModestWindow *self, "/ToolBar"); gtk_widget_set_no_show_all (parent_priv->toolbar, TRUE); - /* Set homogeneous toolbar */ - gtk_container_foreach (GTK_CONTAINER (parent_priv->toolbar), - set_homogeneous, NULL); - priv->progress_toolitem = GTK_WIDGET (gtk_tool_item_new ()); 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"); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->progress_toolitem), TRUE); - gtk_tool_item_set_homogeneous (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); - gtk_tool_item_set_expand (GTK_TOOL_ITEM (priv->cancel_toolitem), FALSE); - + toolbar_resize (MODEST_MAIN_WINDOW (self)); + /* Add ProgressBar (Transfer toolbar) */ priv->progress_bar = modest_progress_bar_widget_new (); gtk_widget_set_no_show_all (priv->progress_bar, TRUE); @@ -1476,7 +1556,11 @@ on_account_inserted (TnyAccountStore *accoust_store, TnyAccount *account, gpointer user_data) { - update_menus (MODEST_MAIN_WINDOW (user_data)); + /* Transport accounts and local ones (MMC and the Local + folders account do now cause menu changes */ + if (TNY_IS_STORE_ACCOUNT (account) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + update_menus (MODEST_MAIN_WINDOW (user_data)); } static void @@ -1491,19 +1575,31 @@ on_account_removed (TnyAccountStore *accoust_store, TnyAccount *account, gpointer user_data) { - update_menus (MODEST_MAIN_WINDOW (user_data)); + /* Transport accounts and local ones (MMC and the Local + folders account do now cause menu changes */ + if (TNY_IS_STORE_ACCOUNT (account) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + update_menus (MODEST_MAIN_WINDOW (user_data)); } static void -on_account_updated (ModestAccountMgr* mgr, - gchar* account_name, +on_account_changed (TnyAccountStore *account_store, + TnyAccount *account, gpointer user_data) { ModestMainWindow *win = MODEST_MAIN_WINDOW (user_data); + /* We need to refresh the details widget because it could have changed */ 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); } + + /* Update the menus as well, the account name could be + changed. Transport accounts and local ones (MMC and the + Local folders account do now cause menu changes */ + if (TNY_IS_STORE_ACCOUNT (account) && + modest_tny_folder_store_is_remote (TNY_FOLDER_STORE (account))) + update_menus (MODEST_MAIN_WINDOW (user_data)); } /* @@ -1643,6 +1739,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) (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); @@ -1670,6 +1767,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) 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); @@ -1683,6 +1781,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) 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); @@ -1693,6 +1792,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) 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); @@ -1710,6 +1810,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *account) 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)) { @@ -1730,6 +1831,7 @@ create_details_widget (GtkWidget *styled_widget, TnyAccount *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 (label); } @@ -1803,41 +1905,41 @@ on_msg_count_changed (ModestHeaderView *header_view, { gboolean folder_empty = FALSE; gboolean all_marked_as_deleted = FALSE; - TnyFolderChangeChanged changed; ModestMainWindowPrivate *priv; - + g_return_if_fail (MODEST_IS_MAIN_WINDOW (main_window)); g_return_if_fail (TNY_IS_FOLDER(folder)); - g_return_if_fail (TNY_IS_FOLDER_CHANGE(change)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE (main_window); - - changed = tny_folder_change_get_changed (change); - - /* If something changes */ - if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) - folder_empty = (tny_folder_change_get_new_all_count (change) == 0); - else - folder_empty = (tny_folder_get_all_count (TNY_FOLDER (folder)) == 0); - -/* Check header removed (hide marked as DELETED headers) */ - if (changed & TNY_FOLDER_CHANGE_CHANGED_EXPUNGED_HEADERS) { - modest_header_view_refilter (MODEST_HEADER_VIEW(priv->header_view)); + + if (change != NULL) { + TnyFolderChangeChanged changed; + + changed = tny_folder_change_get_changed (change); + /* If something changes */ + if ((changed) & TNY_FOLDER_CHANGE_CHANGED_ALL_COUNT) + folder_empty = (((guint) tny_folder_change_get_new_all_count (change)) == 0); + else + folder_empty = (((guint) tny_folder_get_all_count (TNY_FOLDER (folder))) == 0); + + /* Play a sound (if configured) and make the LED blink */ + if (changed & TNY_FOLDER_CHANGE_CHANGED_ADDED_HEADERS) { + modest_platform_push_email_notification (); + } } /* Check if all messages are marked to be deleted */ all_marked_as_deleted = modest_header_view_is_empty (header_view); - folder_empty = folder_empty || all_marked_as_deleted ; - + folder_empty = folder_empty || all_marked_as_deleted; + /* Set contents style of headers view */ if (folder_empty) { modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_EMPTY); gtk_widget_grab_focus (GTK_WIDGET (priv->folder_view)); - } - else { + } else { modest_main_window_set_contents_style (main_window, MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS); - } + } } @@ -2131,6 +2233,7 @@ get_toolbar_mode_from_mail_operation (ModestMainWindow *self, /* Get toolbar mode from operation id*/ switch (modest_mail_operation_get_type_operation (mail_op)) { + case MODEST_MAIL_OPERATION_TYPE_SEND_AND_RECEIVE: case MODEST_MAIL_OPERATION_TYPE_RECEIVE: case MODEST_MAIL_OPERATION_TYPE_OPEN: mode = TOOLBAR_MODE_TRANSFER; @@ -2178,8 +2281,13 @@ on_mail_operation_started (ModestMailOperation *mail_op, /* Add operation observers and change toolbar if neccessary*/ tmp = priv->progress_widgets; if (mode == TOOLBAR_MODE_TRANSFER) { - if (mode_changed) - set_toolbar_transfer_mode(self); + if (mode_changed) { + GObject *source = modest_mail_operation_get_source(mail_op); + if (G_OBJECT (self) == source) { + set_toolbar_transfer_mode(self); + } + g_object_unref (source); + } while (tmp) { modest_progress_object_add_operation (MODEST_PROGRESS_OBJECT (tmp->data), @@ -2369,9 +2477,9 @@ refresh_account (const gchar *account_name) /* If account_name == NULL, we must update all (option All) */ if (!account_name) - modest_ui_actions_do_send_receive_all (win); + modest_ui_actions_do_send_receive_all (win, FALSE); else - modest_ui_actions_do_send_receive (account_name, win); + modest_ui_actions_do_send_receive (account_name, FALSE, win); } @@ -2581,3 +2689,15 @@ on_updating_msg_list (ModestHeaderView *header_view, } } } + +gboolean +modest_main_window_screen_is_on (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv = NULL; + + g_return_val_if_fail (MODEST_IS_MAIN_WINDOW(self), FALSE); + + priv = MODEST_MAIN_WINDOW_GET_PRIVATE (self); + + return (priv->display_state == OSSO_DISPLAY_ON) ? TRUE : FALSE; +}