Add new folder action in modest folder window

[modest] / src / hildon2 / modest-folder-window.c

diff --git a/src/hildon2/modest-folder-window.c b/src/hildon2/modest-folder-window.c
index 6e0b656..2b3c11a 100644 (file)
--- a/src/hildon2/modest-folder-window.c
+++ b/src/hildon2/modest-folder-window.c
@@ -42,9 +42,11 @@
 #include <modest-account-mgr-helpers.h>
 #include <modest-defs.h>
 #include <modest-ui-actions.h>
+#include <modest-window.h>
 #include <hildon/hildon-program.h>
 #include <hildon/hildon-banner.h>
 #include <tny-account-store-view.h>
+#include <modest-header-window.h>
 
 /* 'private'/'protected' functions */
 static void modest_folder_window_class_init  (ModestFolderWindowClass *klass);
@@ -55,6 +57,9 @@ static void connect_signals (ModestFolderWindow *self);
 static void modest_folder_window_disconnect_signals (ModestWindow *self);
 
 static gboolean on_zoom_minus_plus_not_implemented (ModestWindow *window);
+static void on_folder_activated (ModestFolderView *folder_view,
+                                TnyFolder *folder,
+                                gpointer userdata);
 static void add_to_menu (ModestFolderWindow *self,
                         HildonAppMenu *menu,
                         gchar *label,
@@ -171,6 +176,9 @@ connect_signals (ModestFolderWindow *self)
        priv = MODEST_FOLDER_WINDOW_GET_PRIVATE(self);
 
        /* folder view */
+       priv->sighandlers = modest_signal_mgr_connect (priv->sighandlers, 
+                                                      G_OBJECT (priv->folder_view), "folder-activated", 
+                                                      G_CALLBACK (on_folder_activated), self);
 
        /* TODO: connect folder view activate */
        
@@ -355,19 +363,65 @@ static void setup_menu (ModestFolderWindow *self)
 
        app_menu = hildon_app_menu_new ();
 
+       /* folders actions */
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new folder"),
+                    G_CALLBACK (modest_ui_actions_on_new_folder));
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_user_renamefolder"), */
+/*                  G_CALLBACK ()); */
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: move folder"), */
+/*                  G_CALLBACK ()); */
+/*     add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: delete folder"), */
+/*                  G_CALLBACK ()); */
+
+       /* new message */
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_viewer_newemail"),
                     G_CALLBACK (modest_ui_actions_on_new_msg));
+
+       /* send receive actions should be only one visible always */
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sendandreceive"),
                     G_CALLBACK (modest_ui_actions_on_send_receive));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_outbox_cancelsend"),
+                    G_CALLBACK (modest_ui_actions_cancel_send));
 
        /* Settings menu buttons */
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: new account"),
+                    G_CALLBACK (modest_ui_actions_on_new_account));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("TODO: edit accounts"),
+                    G_CALLBACK (modest_ui_actions_on_accounts));
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_options"),
                     G_CALLBACK (modest_ui_actions_on_settings));
-       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_accounts"),
-                    G_CALLBACK (modest_ui_actions_on_accounts));
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_globalsmtpservers"),
                     G_CALLBACK (modest_ui_actions_on_smtp_servers));
        
        hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
                                               HILDON_APP_MENU (app_menu));
 }
+
+static void
+on_folder_activated (ModestFolderView *folder_view,
+                    TnyFolder *folder,
+                    gpointer userdata)
+{
+       ModestFolderWindowPrivate *priv = NULL;
+       ModestWindow *headerwin;
+       ModestFolderWindow *self = (ModestFolderWindow *) userdata;
+
+       g_return_if_fail (MODEST_IS_FOLDER_WINDOW(self));
+
+       priv = MODEST_FOLDER_WINDOW_GET_PRIVATE (self);
+
+       if (!folder)
+               return;
+
+       if (!TNY_IS_FOLDER (folder))
+               return;
+
+       headerwin = modest_header_window_new (folder);
+       modest_window_mgr_register_window (modest_runtime_get_window_mgr (), 
+                                          MODEST_WINDOW (headerwin),
+                                          MODEST_WINDOW (self));
+
+       modest_window_set_active_account (MODEST_WINDOW (headerwin), 
+                                         modest_window_get_active_account (MODEST_WINDOW (self)));
+       gtk_widget_show (GTK_WIDGET (headerwin));
+}