Changeset 41

Timestamp:

11/05/07 12:00:01

Author:

pvanhoof

Message:

• • • • Copy, Move and Rename folder implementations
        

Files:

• trunk/ChangeLog (modified) (1 diff)
• trunk/src/tmut-menu-view.c (modified) (10 diffs)
• trunk/src/tmut-menu-view.h (modified) (1 diff)

trunk/ChangeLog

@@ -5 +5 @@
-        tmut_msg_creator_set_forward_msg
-        * Implemented From-combobox in TMutMsgCreator
+        * Copy, Move and Rename folder implementations
-
-2007-11-02  Philip Van Hoof  <pvanhoof@gnome.org>

trunk/src/tmut-menu-view.c

@@ -89 +89 @@
-        return;
-}
+typedef enum {
+        DO_COPY,
+        DO_MOVE
+} MoveCopyOption;
-
-typedef struct {
@@ -132 +136 @@
-}
-
+
-void
-tmut_menu_view_on_folder_move_activated (GObject *sender, TMutMenuView *self
+folder_mover_helper (GObject *sender, TMutMenuView *self, MoveCopyOption option
-{
-        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
@@ -163 +168 @@
-                                info->from = TNY_FOLDER (g_object_ref (folder));
-
-/* TODO: make this choosable */
-
+if (option == DO_MOVE)
+       
-
-                                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);
@@ -174 +178 @@
-                                        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)), 
@@ -186 +189 @@
-        return;
-}
+
+
+void 
+tmut_menu_view_on_folder_copy_activated (GObject *sender, TMutMenuView *self)
+{
+        folder_mover_helper (sender, self, DO_COPY);
+        return;
+}
+
+void
+tmut_menu_view_on_folder_move_activated (GObject *sender, TMutMenuView *self)
+{
+        folder_mover_helper (sender, self, DO_MOVE);
+        return;
+}
+
+
+void 
+tmut_menu_view_on_folder_rename_activated (GObject *sender, TMutMenuView *self)
+{
+        TMutMenuViewPriv *priv = TMUT_MENU_VIEW_GET_PRIVATE (self);
+        GtkTreeSelection *selection = gtk_tree_view_get_selection (priv->folders_treeview);
+        GtkTreeModel *model;
+        GtkTreeIter iter;
+
+        if (gtk_tree_selection_get_selected (selection, &model, &iter)) 
+        {
+                gint type;
+                gtk_tree_model_get (model, &iter, 
+                        TNY_GTK_FOLDER_STORE_TREE_MODEL_TYPE_COLUMN, 
+                        &type, -1);
+
+                if (type != TNY_FOLDER_TYPE_ROOT) 
+                {
+                        TnyFolder *folder;
+
+                        gtk_tree_model_get (model, &iter, 
+                                TNY_GTK_FOLDER_STORE_TREE_MODEL_INSTANCE_COLUMN, 
+                                &folder, -1);
+
+                        if (folder) 
+                        {
+                                GtkWidget *dialog, *entry;
+                                gint result;
+
+                                dialog = gtk_dialog_new_with_buttons (_("Rename folder"),
+                                                GTK_WINDOW (priv->shell),
+                                                GTK_DIALOG_MODAL,
+                                                GTK_STOCK_OK, GTK_RESPONSE_ACCEPT,
+                                                GTK_STOCK_CANCEL,GTK_RESPONSE_REJECT,
+                                                NULL);
+
+                                entry = gtk_entry_new ();
+                                gtk_entry_set_text (GTK_ENTRY (entry), tny_folder_get_name (folder));
+                                gtk_container_add (GTK_CONTAINER (GTK_DIALOG(dialog)->vbox), entry);
+                                gtk_widget_show (entry);
+
+                                if (gtk_dialog_run (GTK_DIALOG (dialog)) == GTK_RESPONSE_ACCEPT) 
+                                {
+                                        const gchar *newname = gtk_entry_get_text (GTK_ENTRY (entry));
+
+                                        tny_folder_copy_async (folder, tny_folder_get_folder_store (folder), 
+                                                newname, TRUE, on_copy_done, 
+                                                status_update, g_object_ref (self));
+                                }
+
+                                if (dialog)
+                                        gtk_widget_destroy (dialog);
+
+                                g_object_unref (folder);
+                        }
+                }
+        }
+
+        return;}
-
-void
@@ -348 +426 @@
-        GtkMenu *menu;
-        GtkWidget *fcreate_menuitem, *fmove_menuitem, *fdel_menuitem, 
-
+, *fcopy_menuitem, *frename_menuitem
-        GtkButton *menu_button;
-
@@ -354 +432 @@
-        menu = GTK_MENU (gtk_menu_new ());
-        fcreate_menuitem = gtk_menu_item_new_with_label (_("Create new folder"));
-
+
+
+
-        fdel_menuitem = gtk_menu_item_new_with_label (_("Delete a folder"));
-        nmsg_menuitem = gtk_menu_item_new_with_label (_("New message"));
@@ -360 +440 @@
-        gtk_widget_show (fcreate_menuitem);
-        gtk_widget_show (fmove_menuitem);
+        gtk_widget_show (fcopy_menuitem);
+        gtk_widget_show (frename_menuitem);
-        gtk_widget_show (fdel_menuitem);
-        gtk_widget_show (GTK_WIDGET (menu));
@@ -365 +447 @@
-        gtk_menu_prepend (menu, nmsg_menuitem);
-        gtk_menu_prepend (menu, fcreate_menuitem);
+        gtk_menu_prepend (menu, fcopy_menuitem);
-        gtk_menu_prepend (menu, fmove_menuitem);
+        gtk_menu_prepend (menu, frename_menuitem);
-        gtk_menu_prepend (menu, fdel_menuitem);
-        gtk_menu_attach_to_widget (menu, GTK_WIDGET (menu_button), NULL);
@@ -378 +462 @@
-        g_signal_connect (G_OBJECT (fmove_menuitem), "activate",
-                G_CALLBACK (tmut_menu_view_on_folder_move_activated), self);
+        g_signal_connect (G_OBJECT (fcopy_menuitem), "activate",
+                G_CALLBACK (tmut_menu_view_on_folder_copy_activated), self);
+        g_signal_connect (G_OBJECT (frename_menuitem), "activate",
+                G_CALLBACK (tmut_menu_view_on_folder_rename_activated), self);
-        g_signal_connect (G_OBJECT (fdel_menuitem), "activate",
-                G_CALLBACK (tmut_menu_view_on_folder_delete_activated), self);

trunk/src/tmut-menu-view.h

@@ -66 +66 @@
-
-/* Preimplemented handlers for your action performers */
+void tmut_menu_view_on_folder_rename_activated (GObject *sender, TMutMenuView *self);
-void tmut_menu_view_on_folder_move_activated (GObject *sender, TMutMenuView *self);
+void tmut_menu_view_on_folder_copy_activated (GObject *sender, TMutMenuView *self);
-void tmut_menu_view_on_folder_create_activated (GObject *sender, TMutMenuView *self);
-void tmut_menu_view_on_folder_delete_activated (GObject *sender, TMutMenuView *self);