This is a manual merge of branch drop split view intro trunk.
[modest] / src / hildon2 / modest-account-view-window.c
index 060f324..9cbfed1 100644 (file)
@@ -35,6 +35,7 @@
 
 #include <modest-runtime.h>
 #include "modest-platform.h"
+#include "modest-text-utils.h"
 #include "modest-account-protocol.h"
 #include <modest-account-mgr-helpers.h>
 #include <string.h>
@@ -43,6 +44,7 @@
 #include "modest-account-settings-dialog.h"
 #include <modest-utils.h>
 #include "widgets/modest-ui-constants.h"
+#include <hildon/hildon-pannable-area.h>
 
 /* 'private'/'protected' functions */
 static void                            modest_account_view_window_class_init   (ModestAccountViewWindowClass *klass);
@@ -60,8 +62,6 @@ typedef struct _ModestAccountViewWindowPrivate ModestAccountViewWindowPrivate;
 struct _ModestAccountViewWindowPrivate {
        GtkWidget           *new_button;
        GtkWidget           *edit_button;
-       GtkWidget           *delete_button;
-       GtkWidget           *close_button;
        ModestAccountView   *account_view;
        guint acc_removed_handler;
 };
@@ -127,24 +127,6 @@ modest_account_view_window_finalize (GObject *self)
 }
 
 
-static void
-on_selection_changed (GtkTreeSelection *sel, ModestAccountViewWindow *self)
-{
-       ModestAccountViewWindowPrivate *priv;
-       GtkTreeModel                   *model;
-       GtkTreeIter                     iter;
-       gboolean                        has_selection;
-       
-       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-       has_selection =
-               gtk_tree_selection_get_selected (sel, &model, &iter);
-
-       /* Set the status of the buttons */
-       gtk_widget_set_sensitive (priv->edit_button, has_selection);
-       gtk_widget_set_sensitive (priv->delete_button, has_selection);
-}
-
 /** Check whether any connections are active, and cancel them if 
  * the user wishes.
  * Returns TRUE is there was no problem, 
@@ -230,63 +212,6 @@ check_for_active_account (ModestAccountViewWindow *self, const gchar* account_na
 }
 
 static void
-on_delete_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
-{
-       ModestAccountViewWindowPrivate *priv;
-       ModestAccountMgr *account_mgr;
-       gchar *account_title = NULL, *account_name = NULL;
-       
-       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-       account_mgr = modest_runtime_get_account_mgr(); 
-       account_name = modest_account_view_get_selected_account (priv->account_view);
-       if(!account_name)
-               return;
-
-       account_title = modest_account_mgr_get_display_name(account_mgr, account_name);
-       /* This could happen if the account is being deleted */
-       if (!account_title)
-               return;
-       
-       if (check_for_active_account (self, account_name)) {
-               /* The warning text depends on the account type: */
-               gchar *txt = NULL;      
-               gint response;
-               ModestProtocol *protocol;
-
-               protocol = modest_protocol_registry_get_protocol_by_type (modest_runtime_get_protocol_registry (),
-                                                                         modest_account_mgr_get_store_protocol (account_mgr, account_name));
-               txt = modest_protocol_get_translation (protocol, MODEST_PROTOCOL_TRANSLATION_DELETE_MAILBOX, account_title);
-               if (txt == NULL) {
-                       txt = g_strdup_printf (_("emev_nc_delete_mailbox"), 
-                                              account_title);
-               }
-               
-               response = modest_platform_run_confirmation_dialog (GTK_WINDOW (self), txt);
-               g_free (txt);
-               txt = NULL;
-               
-               if (response == GTK_RESPONSE_OK) {
-                       /* Remove account. If it succeeds then it also removes
-                          the account from the ModestAccountView: */                             
-                       gboolean is_default = FALSE;
-                       gchar *default_account_name = modest_account_mgr_get_default_account (account_mgr);
-                       if (default_account_name && (strcmp (default_account_name, account_name) == 0))
-                               is_default = TRUE;
-                       g_free (default_account_name);
-                       
-                               gboolean removed = modest_account_mgr_remove_account (account_mgr, account_name);
-                               if (!removed) {
-                                       g_warning ("%s: modest_account_mgr_remove_account() failed.\n", __FUNCTION__);
-                               }
-
-               }
-               g_free (account_title);
-       }               
-       g_free (account_name);
-}
-
-static void
 on_account_settings_dialog_response (GtkDialog *dialog,
                                     gint response,
                                     gpointer user_data)
@@ -317,11 +242,14 @@ on_account_settings_dialog_response (GtkDialog *dialog,
 }
 
 static void
-on_edit_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
+on_account_activated (GtkTreeView *account_view,
+                     GtkTreePath *path,
+                     GtkTreeViewColumn *column,
+                     ModestAccountViewWindow *self)
 {
        ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE (self);
        
-       gchar* account_name = modest_account_view_get_selected_account (priv->account_view);
+       gchar* account_name = modest_account_view_get_path_account (priv->account_view, path);
        if (!account_name)
                return;
                
@@ -388,100 +316,63 @@ on_new_button_clicked (GtkWidget *button, ModestAccountViewWindow *self)
 }
 
 static void
-on_close_button_clicked (GtkWidget *button, gpointer user_data)
-{              
-       ModestAccountViewWindow *self = MODEST_ACCOUNT_VIEW_WINDOW (user_data);
-
-       gtk_dialog_response (GTK_DIALOG (self), GTK_RESPONSE_OK);
-}
-
-static void
 setup_button_box (ModestAccountViewWindow *self, GtkButtonBox *box)
 {
        ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-       
-       gtk_button_box_set_spacing (GTK_BUTTON_BOX (box), 6);
-       gtk_button_box_set_layout (GTK_BUTTON_BOX (box), 
-                                  GTK_BUTTONBOX_START);
-       
-       priv->new_button     = gtk_button_new_from_stock(_("mcen_bd_new"));
-       priv->edit_button = gtk_button_new_with_label(_("mcen_bd_edit"));
-       priv->delete_button  = gtk_button_new_from_stock(_("mcen_bd_delete"));
-       priv->close_button    = gtk_button_new_from_stock(_("mcen_bd_close"));
-       
+
+       priv->new_button     = gtk_button_new_from_stock(_HL("wdgt_bd_new"));
+       hildon_gtk_widget_set_theme_size (priv->new_button,
+                                         HILDON_SIZE_FINGER_HEIGHT);
+
        g_signal_connect (G_OBJECT(priv->new_button), "clicked",
                          G_CALLBACK(on_new_button_clicked),
                          self);
-       g_signal_connect (G_OBJECT(priv->delete_button), "clicked",
-                         G_CALLBACK(on_delete_button_clicked),
-                         self);
-       g_signal_connect (G_OBJECT(priv->edit_button), "clicked",
-                         G_CALLBACK(on_edit_button_clicked),
-                         self);
-       g_signal_connect (G_OBJECT(priv->close_button), "clicked",
-                         G_CALLBACK(on_close_button_clicked),
-                         self);
-
-       gtk_box_pack_start (GTK_BOX(box), priv->new_button, FALSE, FALSE,2);
-       gtk_box_pack_start (GTK_BOX(box), priv->edit_button, FALSE, FALSE,2);
-       gtk_box_pack_start (GTK_BOX(box), priv->delete_button, FALSE, FALSE,2);
-       gtk_box_pack_start (GTK_BOX(box), priv->close_button, FALSE, FALSE,2);
-
-       /* Should has been created by window_vbox_new */
-       if (priv->account_view) {
-               GtkTreeSelection *sel;
-               sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
-               if (gtk_tree_selection_count_selected_rows (sel) == 0) {
-                       gtk_widget_set_sensitive (priv->edit_button, FALSE);
-                       gtk_widget_set_sensitive (priv->delete_button, FALSE);  
-               }
-       }
+       gtk_box_pack_start (GTK_BOX(box), priv->new_button, FALSE, FALSE,0);
 
        gtk_widget_show_all (GTK_WIDGET (box));
 }
 
-static GtkWidget*
+static void
 window_vbox_new (ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
-
-       GtkWidget *main_vbox     = gtk_vbox_new (FALSE, 6);
-       GtkWidget *main_hbox     = gtk_hbox_new (FALSE, 6);
-       
-       priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
-
-       /* Only force the height, the width of the widget will depend
-          on the size of the column titles */
-       gtk_widget_set_size_request (GTK_WIDGET(priv->account_view), -1, 400);
-       gtk_widget_show (GTK_WIDGET (priv->account_view));
-
-       GtkTreeSelection *sel = gtk_tree_view_get_selection (GTK_TREE_VIEW(priv->account_view));
-       g_signal_connect (G_OBJECT(sel), "changed",  G_CALLBACK(on_selection_changed),
-                         self);
-                         
-       GtkWidget *scrolled_window = gtk_scrolled_window_new (NULL, NULL);
-       gtk_container_set_border_width (GTK_CONTAINER (scrolled_window), MODEST_MARGIN_DEFAULT);
-       gtk_scrolled_window_set_policy (GTK_SCROLLED_WINDOW (scrolled_window), GTK_POLICY_NEVER, 
-               GTK_POLICY_AUTOMATIC);
-       gtk_container_add (GTK_CONTAINER (scrolled_window), GTK_WIDGET (priv->account_view));
-       gtk_widget_show (GTK_WIDGET (scrolled_window));
-       
-       gtk_box_pack_start (GTK_BOX(main_hbox), GTK_WIDGET(scrolled_window), TRUE, TRUE, 2);
-       
-       gtk_box_pack_start (GTK_BOX(main_vbox), main_hbox, TRUE, TRUE, 2);
-       gtk_widget_show (GTK_WIDGET (main_hbox));
-       gtk_widget_show (GTK_WIDGET (main_vbox));
-
-       return main_vbox;
 }
 
 
 static void
 modest_account_view_window_init (ModestAccountViewWindow *self)
 {
-       ModestAccountViewWindowPrivate *priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
+       ModestAccountViewWindowPrivate *priv;
+       GtkWidget *main_vbox, *pannable;
+
+
+       /* Specify a default size */
+       gtk_window_set_default_size (GTK_WINDOW (self), -1, 320);
+       
+       /* This seems to be necessary to make the window show at the front with decoration.
+        * If we use property type=GTK_WINDOW_TOPLEVEL instead of the default GTK_WINDOW_POPUP+decoration, 
+        * then the window will be below the others. */
+       gtk_window_set_type_hint (GTK_WINDOW (self),
+                           GDK_WINDOW_TYPE_HINT_DIALOG);
 
+       priv = MODEST_ACCOUNT_VIEW_WINDOW_GET_PRIVATE(self);
        priv->acc_removed_handler = 0;
+       priv->account_view = modest_account_view_new (modest_runtime_get_account_mgr());
+
+       main_vbox = GTK_DIALOG (self)->vbox;
+
+       pannable = hildon_pannable_area_new ();
+       g_object_set (G_OBJECT (pannable), "initial-hint", TRUE, NULL);
+       gtk_container_set_border_width (GTK_CONTAINER (pannable), MODEST_MARGIN_DEFAULT);
+       gtk_widget_show (pannable);
+       gtk_container_add (GTK_CONTAINER (pannable), 
+                          GTK_WIDGET (priv->account_view));
+       gtk_widget_show (GTK_WIDGET (priv->account_view));
+
+       g_signal_connect (G_OBJECT (priv->account_view), "row-activated",
+                         G_CALLBACK (on_account_activated), self);
+
+       gtk_box_pack_start (GTK_BOX(main_vbox), pannable, TRUE, TRUE, MODEST_MARGIN_HALF);
+
 }
 
 static void
@@ -510,9 +401,7 @@ modest_account_view_window_new (void)
        ModestAccountMgr *account_mgr = modest_runtime_get_account_mgr ();
 
        /* Add widgets */
-       gtk_box_pack_start (GTK_BOX((GTK_DIALOG (self)->vbox)), 
-                           window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self)), 
-                           TRUE, TRUE, 2);
+       window_vbox_new (MODEST_ACCOUNT_VIEW_WINDOW (self));
        
        setup_button_box (MODEST_ACCOUNT_VIEW_WINDOW (self), GTK_BUTTON_BOX (GTK_DIALOG (self)->action_area));