Added management of edit mode and edit toolbar in header window.
authorJose Dapena Paz <jdapena@igalia.com>
Wed, 10 Dec 2008 17:00:42 +0000 (17:00 +0000)
committerJose Dapena Paz <jdapena@igalia.com>
Wed, 10 Dec 2008 17:00:42 +0000 (17:00 +0000)
Things done:
   * Added edit toolbar
   * Set window fullscreen in edit mode
   * Force a queue resize for header view after setting ui mode
   * Edit mode in header window set selection as multiple

pmo-drop-split-view-r6739

src/hildon2/modest-header-window.c

index e18b1ff..9277e15 100644 (file)
@@ -31,6 +31,7 @@
 #include <modest-osso-state-saving.h>
 #include <libosso.h>
 #include <hildon/hildon-pannable-area.h>
+#include <hildon/hildon-edit-toolbar.h>
 #include <modest-window-mgr.h>
 #include <modest-signal-mgr.h>
 #include <modest-runtime.h>
@@ -55,6 +56,12 @@ typedef enum {
        CONTENTS_STATE_HEADERS = 2
 } ContentsState;
 
+typedef enum {
+       EDIT_MODE_COMMAND_NONE = 0,
+       EDIT_MODE_COMMAND_MOVE = 1,
+       EDIT_MODE_COMMAND_DELETE = 2,
+} EditModeCommand;
+
 typedef struct _ModestHeaderWindowPrivate ModestHeaderWindowPrivate;
 struct _ModestHeaderWindowPrivate {
 
@@ -62,8 +69,12 @@ struct _ModestHeaderWindowPrivate {
        GtkWidget *empty_view;
        GtkWidget *contents_view;
        GtkWidget *new_message_button;
+       GtkWidget *edit_toolbar;
 
+       /* state bar */
        ContentsState contents_state;
+       gboolean edit_mode;
+       EditModeCommand edit_command;
 
        TnyFolder *folder;
 
@@ -115,7 +126,16 @@ static void on_header_activated (ModestHeaderView *header_view,
 static void on_updating_msg_list (ModestHeaderView *header_view,
                                  gboolean starting,
                                  gpointer user_data);
-
+static void set_edit_mode (ModestHeaderWindow *self,
+                          EditModeCommand command);
+static void edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
+                                        ModestHeaderWindow *self);
+static void edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
+                                       ModestHeaderWindow *self);
+static void set_delete_edit_mode (GtkButton *button,
+                                 ModestHeaderWindow *self);
+static void set_moveto_edit_mode (GtkButton *button,
+                                 ModestHeaderWindow *self);
 
 /* globals */
 static GtkWindowClass *parent_class = NULL;
@@ -182,6 +202,9 @@ modest_header_window_init (ModestHeaderWindow *obj)
        
        priv->header_view = NULL;
        priv->empty_view = NULL;
+       priv->edit_mode = FALSE;
+       priv->edit_command = EDIT_MODE_COMMAND_NONE;
+       priv->edit_toolbar = NULL;
        priv->contents_view = NULL;
        priv->contents_state = CONTENTS_STATE_NONE;
        priv->folder = NULL;
@@ -344,7 +367,7 @@ modest_header_window_new (TnyFolder *folder)
 
        setup_menu (self);
 
-       gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->new_message_button, FALSE, FALSE, 0);
+       gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->new_message_button, FALSE, FALSE, 0);
        hildon_pannable_area_add_with_viewport (HILDON_PANNABLE_AREA (pannable), priv->contents_view);
        gtk_container_add (GTK_CONTAINER (self), pannable);
 
@@ -454,6 +477,10 @@ static void setup_menu (ModestHeaderWindow *self)
                     G_CALLBACK (modest_ui_actions_on_details));
        add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_sort"),
                     G_CALLBACK (modest_ui_actions_on_sort));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_delete"),
+                    G_CALLBACK (set_delete_edit_mode));
+       add_to_menu (self, HILDON_APP_MENU (app_menu), _("mcen_me_inbox_moveto"),
+                    G_CALLBACK (set_moveto_edit_mode));
 
        hildon_stackable_window_set_main_menu (HILDON_STACKABLE_WINDOW (self), 
                                               HILDON_APP_MENU (app_menu));
@@ -526,11 +553,11 @@ set_contents_state (ModestHeaderWindow *self,
        /* Add the new content */
        switch (state) {
        case CONTENTS_STATE_EMPTY:
-               gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->empty_view, TRUE, TRUE, 0);
+               gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->empty_view, TRUE, TRUE, 0);
                gtk_widget_show (priv->empty_view);
                break;
        case CONTENTS_STATE_HEADERS:
-               gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->header_view, TRUE, TRUE, 0);
+               gtk_box_pack_end (GTK_BOX (priv->contents_view), priv->header_view, TRUE, TRUE, 0);
                gtk_widget_show (priv->header_view);
                break;
        case CONTENTS_STATE_NONE:
@@ -635,3 +662,97 @@ on_updating_msg_list (ModestHeaderView *header_view,
                }
        }
 }
+
+static void
+set_edit_mode (ModestHeaderWindow *self,
+              EditModeCommand command)
+{
+       ModestHeaderWindowPrivate *priv;
+
+       priv = MODEST_HEADER_WINDOW_GET_PRIVATE (self);
+       if (priv->edit_toolbar) {
+               gtk_widget_destroy (priv->edit_toolbar);
+               priv->edit_toolbar = NULL;
+       }
+
+       if (command == EDIT_MODE_COMMAND_NONE) {
+               if (priv->edit_mode) {
+                       priv->edit_mode = FALSE;
+                       priv->edit_command = command;
+                       g_object_set (G_OBJECT (priv->header_view), 
+                                     "hildon-ui-mode", HILDON_UI_MODE_NORMAL, 
+                                     NULL);
+                       gtk_widget_queue_resize (priv->header_view);
+                       gtk_window_unfullscreen (GTK_WINDOW (self));
+               }
+       } else {
+               if (!priv->edit_mode) {
+                       GtkTreeSelection *selection;
+
+                       g_object_set (G_OBJECT (priv->header_view),
+                                     "hildon-ui-mode", HILDON_UI_MODE_EDIT,
+                                     NULL);
+                       selection = gtk_tree_view_get_selection (GTK_TREE_VIEW (priv->header_view));
+                       gtk_tree_selection_set_mode (selection, GTK_SELECTION_MULTIPLE);
+
+                       priv->edit_mode = TRUE;
+                       priv->edit_command = command;
+
+                       /* Setup toolbar */
+                       priv->edit_toolbar = hildon_edit_toolbar_new ();
+                       switch (command) {
+                       case EDIT_MODE_COMMAND_DELETE:
+                               hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
+                                                              _("TODO: Select messages to delete"));
+                               hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
+                                                                     _("TODO: Delete"));
+                               break;
+                       case EDIT_MODE_COMMAND_MOVE:
+                               hildon_edit_toolbar_set_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
+                                                              _("TODO: Select messages to move"));
+                               hildon_edit_toolbar_set_button_label (HILDON_EDIT_TOOLBAR (priv->edit_toolbar),
+                                                                     _("TODO: Move"));
+                               break;
+                       case EDIT_MODE_COMMAND_NONE:
+                               g_assert ("Shouldn't reach");
+                       }
+                       gtk_box_pack_start (GTK_BOX (priv->contents_view), priv->edit_toolbar, FALSE, FALSE, 0);
+                       g_signal_connect (G_OBJECT (priv->edit_toolbar), "button-clicked",
+                                         G_CALLBACK (edit_toolbar_button_clicked), (gpointer) self);
+                       g_signal_connect (G_OBJECT (priv->edit_toolbar), "arrow-clicked",
+                                         G_CALLBACK (edit_toolbar_arrow_clicked), (gpointer) self);
+                       gtk_widget_show (priv->edit_toolbar);
+
+                       gtk_widget_queue_resize (priv->header_view);
+                       gtk_window_fullscreen (GTK_WINDOW (self));
+               }
+       }
+}
+
+static void
+edit_toolbar_button_clicked (HildonEditToolbar *toolbar,
+                            ModestHeaderWindow *self)
+{
+       set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
+}
+
+static void
+edit_toolbar_arrow_clicked (HildonEditToolbar *toolbar,
+                           ModestHeaderWindow *self)
+{
+       set_edit_mode (self, EDIT_MODE_COMMAND_NONE);
+}
+
+static void
+set_delete_edit_mode (GtkButton *button,
+                     ModestHeaderWindow *self)
+{
+       set_edit_mode (self, EDIT_MODE_COMMAND_DELETE);
+}
+
+static void
+set_moveto_edit_mode (GtkButton *button,
+                   ModestHeaderWindow *self)
+{
+       set_edit_mode (self, EDIT_MODE_COMMAND_MOVE);
+}