folder moving updates (context menu, dnd for mbox)

diff --git a/ChangeLog.claws b/ChangeLog.claws
index 02df2bb12c0f5f3f76cdeed54e52e30b9879d054..37167fa7f37df81a284173660864a0c7b98886fb 100644 (file)
--- a/ChangeLog.claws
+++ b/ChangeLog.claws
@@ -1,3 +1,12 @@
+2002-11-30 [colin]     0.8.6claws46
+
+       * src/folder.c
+               Add a test to folder moving, remove a statusbar_print
+       * src/folderview.c
+               Add Move folder... context-menu item
+               Factorize folder moving code
+               Enable folder DND for mbox
+

 2002-11-30 [christoph] 0.8.6claws45
 
        * ac/aspell.m4
 2002-11-30 [christoph] 0.8.6claws45
 
        * ac/aspell.m4

diff --git a/configure.in b/configure.in
index 638ebd0331543f14d399c60f58a620023062e278..645d5868e68963bb724a14477ab49365aa441547 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -11,7 +11,7 @@ MINOR_VERSION=8
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0
 MICRO_VERSION=6
 INTERFACE_AGE=0
 BINARY_AGE=0

-EXTRA_VERSION=claws45
+EXTRA_VERSION=claws46

 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target
 VERSION=$MAJOR_VERSION.$MINOR_VERSION.$MICRO_VERSION$EXTRA_VERSION
 
 dnl set $target

diff --git a/src/folder.c b/src/folder.c
index 4066d55fe85235f626a663c6ace157ff93ef976d..f96777f428c971d32f4cf1b3ebe9d6d0a685a9d6 100644 (file)
--- a/src/folder.c
+++ b/src/folder.c
@@ -1530,8 +1530,6 @@ FolderItem *folder_item_move_recursive (FolderItem *src, FolderItem *dest)
                return NULL;
        }
        
                return NULL;
        }
        

-       statusbar_print_all(_("Moving %s to %s..."), src->name, new_item->path);
-

        if (new_item->folder == NULL)
                new_item->folder = dest->folder;
 
        if (new_item->folder == NULL)
                new_item->folder = dest->folder;
 


@@ -1620,7 +1618,7 @@ gint folder_item_move_to(FolderItem *src, FolderItem *dest, FolderItem **new_ite
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 
        phys_srcpath = folder_item_get_path(src);
        phys_dstpath = g_strconcat(folder_item_get_path(dest),G_DIR_SEPARATOR_S,g_basename(phys_srcpath),NULL);
 

-       if (src->parent == dest) {
+       if (src->parent == dest || src == dest) {

                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);
                g_free(src_identifier);
                g_free(dst_identifier);
                g_free(phys_srcpath);

diff --git a/src/folderview.c b/src/folderview.c
index 893fbe391475dcacad7b772604d28352e52bcfb0..3bf61ad4c9ad4043ded20fc1b5969414d7db05c5 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -59,6 +59,7 @@
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"
 #include "prefs_folder_item.h"
 #include "account.h"
 #include "folder.h"

+#include "foldersel.h"

 #include "inc.h"
 #include "statusbar.h"
 
 #include "inc.h"
 #include "statusbar.h"
 


@@ -266,10 +267,15 @@ static void folderview_scoring_cb(FolderView *folderview, guint action,
                                  GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);
                                  GtkWidget *widget);
 static void folderview_processing_cb(FolderView *folderview, guint action,
                                     GtkWidget *widget);

+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+                              FolderItem *to_folder);
+static void folderview_move_to_cb(FolderView *folderview);
+

 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_cb, 0, NULL},
 static GtkItemFactoryEntry folderview_mbox_popup_entries[] =
 {
        {N_("/Create _new folder..."),  NULL, folderview_new_mbox_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_mbox_folder_cb, 0, NULL},

+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},

        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Remove _mailbox"),        NULL, folderview_remove_mailbox_cb, 0, NULL},


@@ -285,6 +291,7 @@ static GtkItemFactoryEntry folderview_mail_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_folder_cb,    0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb, 0, NULL},

+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},

        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb, 0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),


@@ -305,6 +312,7 @@ static GtkItemFactoryEntry folderview_imap_popup_entries[] =
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/Create _new folder..."),  NULL, folderview_new_imap_folder_cb, 0, NULL},
        {N_("/_Rename folder..."),      NULL, folderview_rename_folder_cb,   0, NULL},

+       {N_("/M_ove folder..."),        NULL, folderview_move_to_cb, 0, NULL},

        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),
        {N_("/_Delete folder"),         NULL, folderview_delete_folder_cb,   0, NULL},
        {N_("/---"),                    NULL, NULL, 0, "<Separator>"},
        {N_("/_Check for new messages"),


@@ -1452,6 +1460,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
        gboolean mark_all_read   = FALSE;
        gboolean new_folder      = FALSE;
        gboolean rename_folder   = FALSE;
        gboolean mark_all_read   = FALSE;
        gboolean new_folder      = FALSE;
        gboolean rename_folder   = FALSE;

+       gboolean move_folder     = FALSE;

        gboolean delete_folder   = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;
        gboolean delete_folder   = FALSE;
        gboolean update_tree     = FALSE;
        gboolean rescan_tree     = FALSE;


@@ -1514,7 +1523,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                        if (item->parent == NULL)
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)
                        if (item->parent == NULL)
                                update_tree = rescan_tree = TRUE;
                        else if (item->stype == F_NORMAL)

-                               rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;
+                               move_folder = rename_folder = delete_folder = folder_scoring = folder_processing = TRUE;

                        else if (item->stype == F_INBOX)
                                folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_TRASH)
                        else if (item->stype == F_INBOX)
                                folder_scoring = folder_processing = TRUE;
                        else if (item->stype == F_TRASH)


@@ -1541,6 +1550,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(mail_factory, "/Mark all read", mark_all_read);
                SET_SENS(mail_factory, "/Create new folder...", new_folder);
                SET_SENS(mail_factory, "/Rename folder...", rename_folder);
                SET_SENS(mail_factory, "/Mark all read", mark_all_read);
                SET_SENS(mail_factory, "/Create new folder...", new_folder);
                SET_SENS(mail_factory, "/Rename folder...", rename_folder);

+               SET_SENS(mail_factory, "/Move folder...", move_folder);

                SET_SENS(mail_factory, "/Delete folder", delete_folder);
                SET_SENS(mail_factory, "/Check for new messages", update_tree);
                SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(mail_factory, "/Delete folder", delete_folder);
                SET_SENS(mail_factory, "/Check for new messages", update_tree);
                SET_SENS(mail_factory, "/Rebuild folder tree", rescan_tree);


@@ -1555,6 +1565,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                SET_SENS(imap_factory, "/Mark all read", mark_all_read);
                SET_SENS(imap_factory, "/Create new folder...", new_folder);
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);
                SET_SENS(imap_factory, "/Mark all read", mark_all_read);
                SET_SENS(imap_factory, "/Create new folder...", new_folder);
                SET_SENS(imap_factory, "/Rename folder...", rename_folder);

+               SET_SENS(imap_factory, "/Move folder...", move_folder);

                SET_SENS(imap_factory, "/Delete folder", delete_folder);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);
                SET_SENS(imap_factory, "/Delete folder", delete_folder);
                SET_SENS(imap_factory, "/Check for new messages", update_tree);
                SET_SENS(imap_factory, "/Rebuild folder tree", rescan_tree);


@@ -1580,6 +1591,7 @@ static void folderview_button_pressed(GtkWidget *ctree, GdkEventButton *event,
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(mbox_factory, "/Create new folder...", new_folder);
                SET_SENS(mbox_factory, "/Rename folder...", rename_folder);
                menu_set_insensitive_all(GTK_MENU_SHELL(popup));
                SET_SENS(mbox_factory, "/Create new folder...", new_folder);
                SET_SENS(mbox_factory, "/Rename folder...", rename_folder);

+               SET_SENS(mbox_factory, "/Move folder...", move_folder);

                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);
                SET_SENS(mbox_factory, "/Delete folder", delete_folder);
                SET_SENS(news_factory, "/Properties...", folder_property);
                SET_SENS(mbox_factory, "/Processing...", folder_processing);


@@ -2531,6 +2543,77 @@ static void folderview_recollapse_nodes(FolderView *folderview, GtkCTreeNode *no
        g_slist_free(done);
 }
 
        g_slist_free(done);
 }
 

+static void folderview_move_to_cb(FolderView *folderview) 
+{
+       FolderItem *from_folder = NULL, *to_folder = NULL;
+
+       if (folderview->selected)
+               from_folder = gtk_ctree_node_get_row_data(GTK_CTREE(folderview->ctree), folderview->selected);
+       if (!from_folder || from_folder->folder->type == F_NEWS)
+               return;
+
+       to_folder = foldersel_folder_sel(from_folder->folder, FOLDER_SEL_MOVE, NULL);
+       
+       if (!to_folder || to_folder->folder->type == F_NEWS)
+               return;
+
+       folderview_move_to(folderview, from_folder, to_folder);
+}
+
+static void folderview_move_to(FolderView *folderview, FolderItem *from_folder,
+                              FolderItem *to_folder)
+{
+       FolderItem *from_parent = NULL;
+       FolderItem *new_folder = NULL;
+       GtkCTreeNode *src_node = NULL;
+       gchar *buf;
+       gint status;
+
+       src_node = gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), NULL, from_folder);
+       from_parent = from_folder->parent;
+       buf = g_strdup_printf(_("Moving %s to %s..."), from_folder->name, to_folder->name);
+       STATUSBAR_PUSH(folderview->mainwin, buf);
+       g_free(buf);
+       summary_clear_all(folderview->summaryview);
+       folderview->opened = NULL;
+       folderview->selected = NULL;
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), FALSE);
+       inc_lock();
+       main_window_cursor_wait(folderview->mainwin);
+       if ((status = folder_item_move_to(from_folder, to_folder, &new_folder)) == F_MOVE_OK) {
+               main_window_cursor_normal(folderview->mainwin);
+               STATUSBAR_POP(folderview->mainwin);
+               if (src_node)
+                       gtk_ctree_remove_node(GTK_CTREE(folderview->ctree), src_node);
+               else 
+                       debug_print("can't remove src node: is null\n");
+
+               folderview_create_folder_node_recursive(folderview, new_folder);
+               folder_update_item(from_parent, TRUE);
+               folder_update_item_recursive(new_folder, TRUE); 
+               folderview_sort_folders(folderview, 
+                       gtk_ctree_find_by_row_data(GTK_CTREE(folderview->ctree), 
+                               NULL, new_folder->parent), new_folder->folder);
+               folderview_select(folderview, new_folder);
+       } else {
+               main_window_cursor_normal(folderview->mainwin);
+               STATUSBAR_POP(folderview->mainwin);
+               switch (status) {
+               case F_MOVE_FAILED_DEST_IS_PARENT:
+                       alertpanel_error(_("Source and destination are the same."));
+                       break;
+               case F_MOVE_FAILED_DEST_IS_CHILD:
+                       alertpanel_error(_("Can't move a folder to one of its children."));
+                       break;
+               default:
+                       alertpanel_error(_("Move failed!"));
+                       break;
+               }
+       }       
+       inc_unlock();           
+       gtk_widget_set_sensitive(GTK_WIDGET(folderview->ctree), TRUE);
+}
+

 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,
 static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                                          GdkDragContext *context,
                                          gint            x,


@@ -2553,6 +2636,7 @@ static gboolean folderview_drag_motion_cb(GtkWidget      *widget,
                    src_item && src_item != item) {
                        switch (item->folder->type) {
                        case F_MH:
                    src_item && src_item != item) {
                        switch (item->folder->type) {
                        case F_MH:

+                       case F_MBOX:

                        case F_IMAP:
                                acceptable = TRUE;
                                break;
                        case F_IMAP:
                                acceptable = TRUE;
                                break;


@@ -2676,53 +2760,9 @@ static void folderview_drag_received_cb(GtkWidget        *widget,
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }
                        gtk_drag_finish(drag_context, FALSE, FALSE, time);                      
                        return;
                }

-               src_parent = src_item->parent;
-               src_node = gtk_ctree_find_by_row_data(GTK_CTREE(widget), NULL, src_item);

 
 

-               buf = g_strdup_printf(_("Moving %s to %s..."), src_item->name, item->name);
-               STATUSBAR_PUSH(folderview->mainwin, buf);
-               g_free(buf);
-               summary_clear_all(folderview->summaryview);
-               folderview->opened = NULL;
-               folderview->selected = NULL;
-               gtk_widget_set_sensitive(folderview->ctree, FALSE);
-               inc_lock();
-               main_window_cursor_wait(folderview->mainwin);
-               if ((status = folder_item_move_to(src_item, item, &new_item)) == F_MOVE_OK) {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, TRUE, TRUE, time);
-               
-                       if (src_node)
-                               gtk_ctree_remove_node(GTK_CTREE(widget), src_node);
-                       else 
-                               debug_print("can't remove src node: is null\n");
-
-                       STATUSBAR_POP(folderview->mainwin);
-                       folderview_create_folder_node_recursive(folderview, new_item);
-                       folder_update_item(src_parent, TRUE);
-                       folder_update_item_recursive(new_item, TRUE); 
-                       folderview_sort_folders(folderview, 
-                               gtk_ctree_find_by_row_data(GTK_CTREE(widget), 
-                                       NULL, new_item->parent), new_item->folder);
-                       folderview_select(folderview, new_item);
-               } else {
-                       main_window_cursor_normal(folderview->mainwin);
-                       gtk_drag_finish(drag_context, FALSE, FALSE, time);
-                       STATUSBAR_POP(folderview->mainwin);
-                       switch (status) {
-                       case F_MOVE_FAILED_DEST_IS_PARENT:
-                               alertpanel_error(_("Source and destination are the same."));
-                               break;
-                       case F_MOVE_FAILED_DEST_IS_CHILD:
-                               alertpanel_error(_("Can't move a folder to one of its children."));
-                               break;
-                       default:
-                               alertpanel_error(_("Move failed!"));
-                               break;
-                       }
-               }       
-               inc_unlock();           
-               gtk_widget_set_sensitive(folderview->ctree, TRUE);
+               folderview_move_to(folderview, src_item, item);
+               gtk_drag_finish(drag_context, TRUE, TRUE, time);

        }
        folderview->nodes_to_recollapse = NULL;
 }
        }
        folderview->nodes_to_recollapse = NULL;
 }