X-Git-Url: http://git.maemo.org/git/?a=blobdiff_plain;f=src%2Fgnome%2Fmodest-main-window.c;h=cf2bed425179621747ad6cdfa2512002f97df61c;hb=b69345f02a040bdf9148f53f81f1e2d16c7379f3;hp=6bbbfe424f8b02259072f45da2b106d7cf4bbcd2;hpb=5b40130eaeb3d38dd2e17788f251855b63d0a233;p=modest diff --git a/src/gnome/modest-main-window.c b/src/gnome/modest-main-window.c index 6bbbfe4..cf2bed4 100644 --- a/src/gnome/modest-main-window.c +++ b/src/gnome/modest-main-window.c @@ -37,17 +37,18 @@ #include #include #include +#include "widgets/modest-progress-bar.h" #include #include "modest-widget-memory.h" #include "modest-ui-actions.h" #include "modest-main-window-ui.h" +#include "modest-main-window-ui-dimming.h" #include "modest-account-mgr.h" -#include "modest-conf.h" +#include "modest-defs.h" #include #include "modest-mail-operation.h" #include "modest-icon-names.h" -#include "modest-gnome-info-bar.h" /* 'private'/'protected' functions */ static void modest_main_window_class_init (ModestMainWindowClass *klass); @@ -70,18 +71,13 @@ static gboolean show_context_popup_menu (ModestMainWindow *windo GtkWidget *menu); static void connect_signals (ModestMainWindow *self); +static void setup_toolbar (ModestMainWindow *window); static void on_queue_changed (ModestMailOperationQueue *queue, ModestMailOperation *mail_op, ModestMailOperationQueueNotification type, ModestMainWindow *self); -static void on_header_status_update (ModestHeaderView *header_view, - const gchar *msg, - gint num, - gint total, - ModestMainWindow *main_window); - static void on_header_selected (ModestHeaderView *header_view, TnyHeader *header, ModestMainWindow *main_window); @@ -101,6 +97,8 @@ struct _ModestMainWindowPrivate { GtkWidget *folder_paned; GtkWidget *msg_paned; GtkWidget *main_paned; + GtkWidget *main_vbox; + GtkWidget *header_win; GtkWidget *online_toggle; GtkWidget *folder_info_label; @@ -109,6 +107,8 @@ struct _ModestMainWindowPrivate { ModestFolderView *folder_view; ModestMsgView *msg_preview; + ModestMainWindowStyle style; + GtkWidget *status_bar; GtkWidget *progress_bar; @@ -124,6 +124,37 @@ struct _ModestMainWindowPrivate { /* globals */ static GtkWindowClass *parent_class = NULL; +static const GtkActionEntry modest_folder_view_action_entries [] = { + + /* Folder View CSM actions */ + { "FolderViewCSMNewFolder", NULL, N_("mcen_ti_new_folder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_new_folder) }, + { "FolderViewCSMRenameFolder", NULL, N_("mcen_me_user_renamefolder"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_rename_folder) }, + { "FolderViewCSMPasteMsgs", NULL, N_("mcen_me_inbox_paste"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_paste)}, + { "FolderViewCSMDeleteFolder", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_folder) }, + { "FolderViewCSMSearchMessages", NULL, N_("mcen_me_inbox_search"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_search_messages) }, + { "FolderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_csm_help) }, +}; + +static const GtkActionEntry modest_header_view_action_entries [] = { + + /* Header View CSM actions */ + { "HeaderViewCSMOpen", NULL, N_("mcen_me_inbox_open"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_open) }, + { "HeaderViewCSMReply", NULL, N_("mcen_me_inbox_reply"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply) }, + { "HeaderViewCSMReplyAll", NULL, N_("mcen_me_inbox_replytoall"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_reply_all) }, + { "HeaderViewCSMForward", NULL, N_("mcen_me_inbox_forward"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_forward) }, + { "HeaderViewCSMCut", NULL, N_("mcen_me_inbox_cut"), "X", NULL, G_CALLBACK (modest_ui_actions_on_cut) }, + { "HeaderViewCSMCopy", NULL, N_("mcen_me_inbox_copy"), "C", NULL, G_CALLBACK (modest_ui_actions_on_copy) }, + { "HeaderViewCSMPaste", NULL, N_("mcen_me_inbox_paste"), "V", NULL, G_CALLBACK (modest_ui_actions_on_paste) }, + { "HeaderViewCSMDelete", NULL, N_("mcen_me_inbox_delete"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_delete_message) }, + { "HeaderViewCSMCancelSending", NULL, N_("mcen_me_outbox_cancelsend"), NULL, NULL, G_CALLBACK (modest_ui_actions_cancel_send) }, + { "HeaderViewCSMHelp", NULL, N_("mcen_me_inbox_help"), NULL, NULL, G_CALLBACK (modest_ui_actions_on_help) }, +}; + +static const GtkToggleActionEntry modest_main_window_toggle_action_entries [] = { + { "ToggleFolders", MODEST_STOCK_SPLIT_VIEW, N_("mcen_me_inbox_hidefolders"), "t", NULL, G_CALLBACK (modest_ui_actions_toggle_folders_view), TRUE }, +}; + + /* uncomment the following if you have defined any signals */ /* static guint signals[LAST_SIGNAL] = {0}; */ @@ -165,6 +196,24 @@ modest_main_window_class_init (ModestMainWindowClass *klass) g_type_class_add_private (gobject_class, sizeof(ModestMainWindowPrivate)); } +static GtkWidget * +create_main_bar (GtkWidget *progress_bar) +{ + GtkWidget *status_bar, *main_bar; + + main_bar = gtk_hbox_new (FALSE, 6); + + /* Status bar */ + status_bar = gtk_statusbar_new (); + gtk_statusbar_set_has_resize_grip (GTK_STATUSBAR (status_bar), FALSE); + + /* Pack */ + gtk_box_pack_start (GTK_BOX (main_bar), status_bar, TRUE, TRUE, 0); + gtk_box_pack_start (GTK_BOX (main_bar), progress_bar, FALSE, FALSE, 0); + + return main_bar; +} + static void modest_main_window_init (ModestMainWindow *obj) { @@ -173,6 +222,7 @@ modest_main_window_init (ModestMainWindow *obj) TnyFolderStoreQuery *query; GtkWidget *icon; gboolean online; + GtkWidget *progress_bar; priv = MODEST_MAIN_WINDOW_GET_PRIVATE(obj); @@ -191,6 +241,8 @@ modest_main_window_init (ModestMainWindow *obj) gtk_toggle_button_set_active (GTK_TOGGLE_BUTTON(priv->online_toggle), online); gtk_button_set_image (GTK_BUTTON(priv->online_toggle),icon); + priv->style = MODEST_MAIN_WINDOW_STYLE_SPLIT; + /* Paned */ priv->folder_paned = gtk_vpaned_new (); priv->main_paned = gtk_hpaned_new (); @@ -198,9 +250,10 @@ modest_main_window_init (ModestMainWindow *obj) /* Main bar */ priv->folder_info_label = gtk_label_new (NULL); - priv->main_bar = modest_gnome_info_bar_new (); + progress_bar = modest_progress_bar_new (); + priv->main_bar = create_main_bar (progress_bar); priv->progress_widgets = g_slist_prepend (priv->progress_widgets, - priv->main_bar); + progress_bar); /* msg preview */ priv->msg_preview = MODEST_MSG_VIEW(tny_platform_factory_new_msg_view @@ -210,7 +263,7 @@ modest_main_window_init (ModestMainWindow *obj) /* header view */ priv->header_view = - MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_DETAILS)); + MODEST_HEADER_VIEW(modest_header_view_new (NULL, MODEST_HEADER_VIEW_STYLE_TWOLINES)); if (!priv->header_view) g_printerr ("modest: cannot instantiate header view\n"); @@ -220,6 +273,7 @@ modest_main_window_init (ModestMainWindow *obj) TNY_FOLDER_STORE_QUERY_OPTION_SUBSCRIBED); priv->folder_view = MODEST_FOLDER_VIEW (modest_folder_view_new (query)); + gtk_tree_view_set_headers_visible (GTK_TREE_VIEW (priv->folder_view), FALSE); if (!priv->folder_view) g_printerr ("modest: cannot instantiate folder view\n"); g_object_unref (G_OBJECT (query)); @@ -361,12 +415,6 @@ connect_signals (ModestMainWindow *self) g_signal_connect (G_OBJECT(priv->msg_preview), "recpt-activated", G_CALLBACK(modest_ui_actions_on_msg_recpt_activated), self); - /* Account store */ - /* Emmitted by our TnyAccountStore::get_password_func() implementation, - * This is not a normal part of tinymail: */ - 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(priv->online_toggle), "toggled", G_CALLBACK(on_online_toggle_toggled), self); @@ -401,7 +449,24 @@ wrapped_in_scrolled_window (GtkWidget *widget, gboolean needs_viewport) return win; } +static void +setup_toolbar (ModestMainWindow *self) +{ + ModestMainWindowPrivate *priv; + ModestWindowPrivate *parent_priv; + GtkWidget *item; + priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); + + item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageNew"); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE); + item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarMessageReply"); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE); + item = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar/ToolbarSendReceive"); + gtk_tool_item_set_is_important (GTK_TOOL_ITEM (item), TRUE); + +} ModestWindow * @@ -411,12 +476,13 @@ modest_main_window_new (void) ModestMainWindow *self; ModestMainWindowPrivate *priv; ModestWindowPrivate *parent_priv; - GtkWidget *main_vbox; GtkWidget *status_hbox; - GtkWidget *header_win, *folder_win; + GtkWidget *folder_win; GtkWidget *preview_scroll; GtkActionGroup *action_group; GError *error = NULL; + ModestDimmingRulesGroup *menu_rules_group = NULL; + ModestDimmingRulesGroup *toolbar_rules_group = NULL; obj = g_object_new(MODEST_TYPE_MAIN_WINDOW, NULL); self = MODEST_MAIN_WINDOW(obj); @@ -428,6 +494,10 @@ modest_main_window_new (void) parent_priv->ui_manager = gtk_ui_manager_new(); parent_priv->ui_dimming_manager = modest_ui_dimming_manager_new (); 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 (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, @@ -435,6 +505,25 @@ modest_main_window_new (void) G_N_ELEMENTS (modest_action_entries), obj); + gtk_action_group_add_actions (action_group, + modest_header_view_action_entries, + G_N_ELEMENTS (modest_header_view_action_entries), + self); + + gtk_action_group_add_actions (action_group, + modest_folder_view_action_entries, + G_N_ELEMENTS (modest_folder_view_action_entries), + self); + + gtk_action_group_add_toggle_actions (action_group, + modest_toggle_action_entries, + G_N_ELEMENTS (modest_toggle_action_entries), + self); + gtk_action_group_add_toggle_actions (action_group, + modest_main_window_toggle_action_entries, + G_N_ELEMENTS (modest_toggle_action_entries), + self); + gtk_ui_manager_insert_action_group (parent_priv->ui_manager, action_group, 0); g_object_unref (action_group); @@ -447,6 +536,22 @@ modest_main_window_new (void) error = NULL; } + /* Add common dimming rules */ + modest_dimming_rules_group_add_rules (menu_rules_group, + modest_main_window_menu_dimming_entries, + G_N_ELEMENTS (modest_main_window_menu_dimming_entries), + MODEST_WINDOW (self)); + modest_dimming_rules_group_add_rules (toolbar_rules_group, + modest_main_window_toolbar_dimming_entries, + G_N_ELEMENTS (modest_main_window_toolbar_dimming_entries), + MODEST_WINDOW (self)); + + /* Insert dimming rules group for this window */ + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, menu_rules_group); + modest_ui_dimming_manager_insert_rules_group (parent_priv->ui_dimming_manager, toolbar_rules_group); + g_object_unref (menu_rules_group); + g_object_unref (toolbar_rules_group); + /* Add accelerators */ gtk_window_add_accel_group (GTK_WINDOW (obj), gtk_ui_manager_get_accel_group (parent_priv->ui_manager)); @@ -455,9 +560,10 @@ modest_main_window_new (void) parent_priv->toolbar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/ToolBar"); parent_priv->menubar = gtk_ui_manager_get_widget (parent_priv->ui_manager, "/MenuBar"); + setup_toolbar (MODEST_MAIN_WINDOW (obj)); gtk_toolbar_set_tooltips (GTK_TOOLBAR (parent_priv->toolbar), TRUE); folder_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->folder_view), FALSE); - header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view), FALSE); + priv->header_win = wrapped_in_scrolled_window (GTK_WIDGET(priv->header_view), FALSE); /* Paned */ preview_scroll = gtk_scrolled_window_new (NULL, NULL); @@ -465,7 +571,7 @@ modest_main_window_new (void) GTK_POLICY_AUTOMATIC, GTK_POLICY_AUTOMATIC); gtk_paned_add1 (GTK_PANED(priv->main_paned), folder_win); gtk_paned_add2 (GTK_PANED(priv->main_paned), priv->msg_paned); - gtk_paned_add1 (GTK_PANED(priv->msg_paned), header_win); + gtk_paned_add1 (GTK_PANED(priv->msg_paned), priv->header_win); gtk_container_add (GTK_CONTAINER (preview_scroll), GTK_WIDGET(priv->msg_preview)); gtk_paned_add2 (GTK_PANED(priv->msg_paned), preview_scroll); @@ -477,16 +583,16 @@ modest_main_window_new (void) gtk_box_pack_start (GTK_BOX(status_hbox), priv->online_toggle,FALSE, FALSE, 0); /* putting it all together... */ - main_vbox = gtk_vbox_new (FALSE, 0); - gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->menubar, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(main_vbox), parent_priv->toolbar, FALSE, FALSE, 0); - gtk_box_pack_start (GTK_BOX(main_vbox), priv->main_paned, TRUE, TRUE,0); - gtk_box_pack_start (GTK_BOX(main_vbox), status_hbox, FALSE, FALSE, 0); - gtk_container_add (GTK_CONTAINER(obj), main_vbox); + priv->main_vbox = gtk_vbox_new (FALSE, 0); + gtk_box_pack_start (GTK_BOX(priv->main_vbox), parent_priv->menubar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(priv->main_vbox), parent_priv->toolbar, FALSE, FALSE, 0); + gtk_box_pack_start (GTK_BOX(priv->main_vbox), priv->main_paned, TRUE, TRUE,0); + gtk_box_pack_start (GTK_BOX(priv->main_vbox), status_hbox, FALSE, FALSE, 0); + gtk_container_add (GTK_CONTAINER(obj), priv->main_vbox); gtk_window_set_title (GTK_WINDOW(obj), _("Modest")); gtk_window_set_icon_from_file (GTK_WINDOW(obj), MODEST_APP_ICON, NULL); - gtk_widget_show_all (main_vbox); + gtk_widget_show_all (priv->main_vbox); /* Do some tasks on show */ g_signal_connect (G_OBJECT(self), "show", G_CALLBACK (modest_main_window_on_show), NULL); @@ -611,32 +717,69 @@ on_queue_changed (ModestMailOperationQueue *queue, } } -static void -on_header_status_update (ModestHeaderView *header_view, - const gchar *msg, gint num, - gint total, ModestMainWindow *self) +void +modest_main_window_set_style (ModestMainWindow *self, + ModestMainWindowStyle style) { ModestMainWindowPrivate *priv; - gchar *txt; + ModestWindowPrivate *parent_priv; + GtkAction *action; + gboolean active; + + g_return_if_fail (MODEST_IS_MAIN_WINDOW (self)); priv = MODEST_MAIN_WINDOW_GET_PRIVATE(self); + parent_priv = MODEST_WINDOW_GET_PRIVATE(self); - /* Set progress */ - txt = g_strdup_printf (_("Downloading %d of %d"), num, total); - modest_gnome_info_bar_set_progress (MODEST_GNOME_INFO_BAR (priv->main_bar), - (const gchar*) txt, - num, total); - g_free (txt); - - /* Set status message */ - modest_gnome_info_bar_set_message (MODEST_GNOME_INFO_BAR (priv->main_bar), msg); -} + /* no change -> nothing to do */ + if (priv->style == style) + return; -void -modest_main_window_set_style (ModestMainWindow *self, - ModestMainWindowStyle style) -{ - /* TODO */ + /* Get toggle button and update the state if needed. This will + happen only when the set_style is not invoked from the UI, + for example when it's called from widget memory */ + action = gtk_ui_manager_get_action (parent_priv->ui_manager, "/ToolBar/ToggleFolders"); + active = gtk_toggle_action_get_active (GTK_TOGGLE_ACTION (action)); + if ((active && style == MODEST_MAIN_WINDOW_STYLE_SIMPLE) || + (!active && style == MODEST_MAIN_WINDOW_STYLE_SPLIT)) { + g_signal_handlers_block_by_func (action, modest_ui_actions_toggle_folders_view, self); + gtk_toggle_action_set_active (GTK_TOGGLE_ACTION (action), !active); + g_signal_handlers_unblock_by_func (action, modest_ui_actions_toggle_folders_view, self); + } + + priv->style = style; + switch (style) { + case MODEST_MAIN_WINDOW_STYLE_SIMPLE: + /* Remove main paned */ + g_object_ref (priv->main_paned); + gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->main_paned); + + /* Reparent the contents widget to the main vbox */ + gtk_widget_reparent (priv->header_win, priv->main_vbox); + + break; + case MODEST_MAIN_WINDOW_STYLE_SPLIT: + /* Remove header view */ + g_object_ref (priv->header_win); + gtk_container_remove (GTK_CONTAINER (priv->main_vbox), priv->header_win); + + /* Reparent the main paned */ + gtk_paned_add2 (GTK_PANED (priv->main_paned), priv->header_win); + gtk_container_add (GTK_CONTAINER (priv->main_vbox), priv->main_paned); + + break; + default: + g_return_if_reached (); + } + +/* /\* Let header view grab the focus if it's being shown *\/ */ +/* if (priv->contents_style == MODEST_MAIN_WINDOW_CONTENTS_STYLE_HEADERS) */ +/* gtk_widget_grab_focus (GTK_WIDGET (priv->header_view)); */ +/* else */ +/* gtk_widget_grab_focus (GTK_WIDGET (priv->contents_widget)); */ + + /* Show changes */ + gtk_widget_show_all (GTK_WIDGET (priv->main_vbox)); } @@ -753,6 +896,8 @@ save_state (ModestWindow *window) 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->msg_paned), + MODEST_CONF_MSG_PANED_KEY); modest_widget_memory_save (conf, G_OBJECT(priv->folder_view), MODEST_CONF_FOLDER_VIEW_KEY); }