Changeset 28

Timestamp:

11/01/07 17:52:19

Author:

pvanhoof

Message:

• • • • Implemented moving messages around
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-folder-selector.c (modified) (1 diff)
• trunk/src/tmut-folder-view.c (modified) (9 diffs)
• trunk/src/tmut-folder-view.h (modified) (1 diff)
• trunk/src/tmut-menu-view.c (modified) (2 diffs)

trunk/ChangeLog

@@ -5 +5 @@
-        * Further refactoring
-        * Implemented moving folders around
+        * Implemented moving messages around
-
-2007-10-31  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-folder-selector.c

@@ -107 +107 @@
-                        priv->current = TNY_FOLDER_STORE (g_object_ref (folder));
-
+                        g_object_ref (self);
-                        g_signal_emit (G_OBJECT (self), 
-                                tmut_folder_selector_signals [TMUT_FOLDER_SELECTOR_FOLDER_SELECTED], 0);
-
+
-
-                        g_object_unref (folder);

trunk/src/tmut-folder-view.c

@@ -19 +19 @@
-
-#include "tmut-folder-view.h"
+#include "tmut-folder-selector.h"
-#include "tmut-msg-view.h"
-#include "tmut-ringtone-player.h"
@@ -26 +27 @@
-#include <tny-folder-monitor.h>
-#include <tny-gtk-header-list-model.h>
+#include <tny-simple-list.h>
-
-static GObjectClass *parent_class = NULL;
@@ -38 +40 @@
-        TnyFolderObserver *ringtone_player;
-        TMutShellWindow *shell;
+        TnyAccountStore *account_store;
-};
-
@@ -45 +48 @@
-
-
+static void 
+status_update (GObject *sender, TnyStatus *status, gpointer user_data)
+{
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (user_data);
+
+        if (priv->shell)
+                gtk_progress_set_percentage (tmut_shell_window_get_progress (priv->shell), 
+                                tny_status_get_fraction (status));
+
+        return;
+}
+
+
+
+static void 
+on_move_done (TnyFolder *folder, gboolean canceled, GError *err, gpointer user_data)
+{
+        TMutFolderView *self = TMUT_FOLDER_VIEW (user_data);
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
+        gchar *msg = "";
+
+        if (canceled)
+                msg = "User canceled the operation";
+        else if (err)
+                msg = err->message;
+
+        if (err || canceled) 
+        {
+                GtkWidget *dialog = gtk_message_dialog_new (
+                                GTK_WINDOW (gtk_widget_get_parent (GTK_WIDGET (priv->shell))),
+                                GTK_DIALOG_DESTROY_WITH_PARENT,
+                                GTK_MESSAGE_ERROR, GTK_BUTTONS_CLOSE, msg);
+                g_signal_connect_swapped (dialog, "response",
+                        G_CALLBACK (gtk_widget_destroy), dialog);
+                gtk_widget_show_all (dialog);
+        }
+
+        if (err)
+                g_error_free (err);
+
+        g_object_unref (user_data);
+
+        return;
+}
+
+typedef struct {
+        TMutFolderView *self;
+        gboolean delete_originals;
+        TnyList *items;
+} OnMoveSelectedInfo;
+
+static void
+on_folder_selected_for_move (GtkWidget *widget, gpointer user_data)
+{
+        OnMoveSelectedInfo *info = (OnMoveSelectedInfo *) user_data;
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (info->self);
+        TnyFolderStore *into = tmut_folder_selector_get_current (TMUT_FOLDER_SELECTOR (widget));
+
+        if (into) 
+        {
+                if (into != (TnyFolderStore *) priv->folder && TNY_IS_FOLDER (into))
+                        tny_folder_transfer_msgs_async (priv->folder, 
+                                info->items, TNY_FOLDER (into), info->delete_originals,
+                                on_move_done, status_update, 
+                                g_object_ref (info->self));
+
+                g_object_unref (into);
+        }
+
+        tmut_shell_window_back (priv->shell);
+
+        return;
+}
+
+static void
+on_folder_selected_for_move_destroy (GtkWidget *widget, gpointer user_data)
+{
+        OnMoveSelectedInfo *info = (OnMoveSelectedInfo *) user_data;
+
+        g_object_unref (info->self);
+        g_object_unref (info->items);
+
+        g_slice_free (OnMoveSelectedInfo, info);
+
+        return;
+}
+
+void
+tmut_folder_view_on_message_move_activated (GObject *sender, TMutFolderView *self)
+{
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
+        GtkTreeSelection *selection = gtk_tree_view_get_selection (priv->headers_treeview);
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+
+        if (gtk_tree_selection_get_selected (selection, &model, &iter)) 
+        {
+                TnyHeader *header = NULL;
+
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_HEADER_LIST_MODEL_INSTANCE_COLUMN, 
+                        &header, -1);
+
+                if (header) 
+                {
+                        TnyFolder *folder;
+                        TMutFolderSelector *view;
+                        OnMoveSelectedInfo *info;
+                        gboolean del_originals = TRUE;
+
+                        info = g_slice_new0 (OnMoveSelectedInfo);
+                        info->self = TMUT_FOLDER_VIEW (g_object_ref (self));
+                        info->items = tny_simple_list_new ();
+
+                        tny_list_prepend (info->items, G_OBJECT (header));
+
+                        /* TODO: make this choosable */
+                        info->delete_originals = TRUE;
+
+                        view = tmut_folder_selector_new ();
+
+                        tny_account_store_view_set_account_store (TNY_ACCOUNT_STORE_VIEW (view), 
+                                priv->account_store);
+
+                        g_signal_connect (G_OBJECT (view), "folder-selected",
+                                G_CALLBACK (on_folder_selected_for_move), info);
+                        g_signal_connect (G_OBJECT (view), "destroy",
+                                G_CALLBACK (on_folder_selected_for_move_destroy), info);
+                        gtk_widget_show (GTK_WIDGET (view));
+
+                        tmut_shell_window_set_child (
+                                tmut_shell_child_get_window (TMUT_SHELL_CHILD (self)), 
+                                TMUT_SHELL_CHILD (view), "Select destination");
+
+                        g_object_unref (folder);
+                }
+        }
+
+        return;
+}
+
+
-
-void
@@ -56 +201 @@
-}
-
-void
-tmut_folder_view_on_message_move_activated (GObject *sender, TMutFolderView *self)
-{
-        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
-
-g_print ("move message\n");
-
-        return;
-}
-
-static void
@@ -111 +247 @@
-
-        gtk_box_pack_start (GTK_BOX (self), GTK_WIDGET (menu_button), FALSE, TRUE, 0);
-
-        return;
-}
-
-static void 
-status_update (GObject *sender, TnyStatus *status, gpointer user_data)
-{
-        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (user_data);
-
-        if (priv->shell)
-                gtk_progress_set_percentage (tmut_shell_window_get_progress (priv->shell), 
-                                tny_status_get_fraction (status));
-
-        return;
@@ -252 +376 @@
-        GtkWidget *widget, *sw;
-
+        priv->account_store = NULL;
-        priv->monitor = NULL;
-        priv->ringtone_player = NULL;
@@ -296 +421 @@
-
-        tmut_folder_view_deactivate_folder (priv);
+
+        if (priv->account_store)
+                g_object_unref (priv->account_store);
-
-        if (priv->ringtone_player)
@@ -330 +458 @@
- **/
-TMutFolderView*
-void
+TnyAccountStore *account_store
-{
-        TMutFolderView *self = g_object_new (TMUT_TYPE_FOLDER_VIEW, NULL);
+        TMutFolderViewPriv *priv = TMUT_FOLDER_VIEW_GET_PRIVATE (self);
+
+        priv->account_store = TNY_ACCOUNT_STORE (g_object_ref (account_store));
-
-        return TMUT_FOLDER_VIEW (self);

trunk/src/tmut-folder-view.h

@@ -58 +58 @@
-
-GType tmut_folder_view_get_type (void);
-void
+TnyAccountStore *account_store
-
-void tmut_folder_view_set_active_folder (TMutFolderView *self, TnyFolder *folder);

trunk/src/tmut-menu-view.c

@@ -153 +153 @@
-                                &folder, -1);
-                        if (folder) {
-                                TnyFolderStore *into = NULL;
-                                gboolean del_originals = TRUE;
-
@@ -461 +460 @@
-                        if (!folder)
-                                return;
-
+priv->account_store
-                        tmut_folder_view_set_active_folder (view, folder);
-                        gtk_widget_show (GTK_WIDGET (view));