Add folderview_get_opened_item() function.

[claws.git] / src / folderview.c

diff --git a/src/folderview.c b/src/folderview.c
index 45e65374702dd41c2cfbbd595b2e9494416a1051..90141651fd6e260dcf6539af70fc6bc7e54d5116 100644 (file)
--- a/src/folderview.c
+++ b/src/folderview.c
@@ -552,9 +552,9 @@ void folderview_set_column_order(FolderView *folderview)
        }
 
        if (folderview->selected)
-               sel_item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(ctree), folderview->selected);
+               sel_item = folderview_get_selected_item(folderview);
        if (folderview->opened)
-               op_item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(ctree), folderview->opened);
+               op_item = folderview_get_opened_item(folderview);
 
        debug_print("recreating tree...\n");
        gtk_widget_destroy(folderview->ctree);
@@ -769,9 +769,9 @@ void folderview_set(FolderView *folderview)
        main_window_cursor_wait(mainwin);
 
        if (folderview->selected)
-               sel_item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+               sel_item = folderview_get_selected_item(folderview);
        if (folderview->opened)
-               op_item = gtk_cmctree_node_get_row_data(ctree, folderview->opened);
+               op_item = folderview_get_opened_item(folderview);
 
        folderview->selected = NULL;
        folderview->opened = NULL;
@@ -830,16 +830,20 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
        FolderView *folderview = (FolderView *)data;
        FolderItem *item;
        AlertValue val;
+       gchar *message;
        
        item = folderview_get_selected_item(folderview);
        if (item == NULL)
                return;
 
-       if (folderview->summaryview->folder_item != item
-       &&  prefs_common.ask_mark_all_read) {
+       message = recursive? _("Do you really want to mark all mails in this "
+                              "folder and its sub-folders as read?") :
+                            _("Do you really want to mark all mails in this "
+                              "folder as read?");
+       if (folderview->summaryview->folder_item != item &&
+           prefs_common.ask_mark_all_read) {
                val = alertpanel_full(_("Mark all as read"),
-                       _("Do you really want to mark all mails in this "
-                         "folder as read?"), GTK_STOCK_NO, GTK_STOCK_YES, NULL,
+                         message, GTK_STOCK_NO, GTK_STOCK_YES, NULL,
                          TRUE, NULL, ALERT_QUESTION, G_ALERTDEFAULT);
 
                if ((val & ~G_ALERTDISABLE) != G_ALERTALTERNATE)
@@ -847,7 +851,6 @@ static void mark_all_read_handler(GtkAction *action, gpointer data, gboolean rec
                else if (val & G_ALERTDISABLE)
                        prefs_common.ask_mark_all_read = FALSE;
        }
-
        
        folder_item_update_freeze();
        if (folderview->summaryview->folder_item != item && !recursive)
@@ -988,6 +991,14 @@ FolderItem *folderview_get_selected_item(FolderView *folderview)
        return gtk_cmctree_node_get_row_data(ctree, folderview->selected);
 }
 
+FolderItem *folderview_get_opened_item(FolderView *folderview)
+{
+       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
+
+       if (!folderview->opened) return NULL;
+       return gtk_cmctree_node_get_row_data(ctree, folderview->opened);
+}
+
 static void folderview_set_folders(FolderView *folderview)
 {
        GList *list;
@@ -1743,7 +1754,7 @@ static void set_special_folder(GtkCMCTree *ctree, FolderItem *item,
 
                node = gtk_cmctree_find_by_row_data(ctree, root, item);
                if (!node)
-                       g_warning("%s not found.\n", item->path);
+                       g_warning("%s not found.", item->path);
                else {
                        parent = GTK_CMCTREE_ROW(node)->parent;
                        if (*prev && parent == GTK_CMCTREE_ROW(*prev)->parent)
@@ -1992,6 +2003,9 @@ static gboolean folderview_button_released(GtkWidget *ctree, GdkEventButton *eve
 static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                       FolderView *folderview)
 {
+       GtkCMCTreeNode *node;
+       FolderItem *item;
+
        if (!event) return FALSE;
 
        if (quicksearch_has_focus(folderview->summaryview->quicksearch))
@@ -1999,13 +2013,14 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
 
        switch (event->keyval) {
        case GDK_KEY_Right:
-#ifndef GENERIC_UMPC
-       case GDK_KEY_Return:
-       case GDK_KEY_KP_Enter:
-#endif
                if (folderview->selected) {
-                       folderview_select_node(folderview,
-                                              folderview->selected);
+                       if (GTK_CMCTREE_ROW(folderview->selected)->children != NULL
+                                       && !GTK_CMCTREE_ROW(folderview->selected)->expanded)
+                               gtk_cmctree_expand(GTK_CMCTREE(folderview->ctree),
+                                               folderview->selected);
+                       else
+                               folderview_select_node(folderview,
+                                                      folderview->selected);
                }
                break;
 #ifdef GENERIC_UMPC
@@ -2016,6 +2031,12 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                folderview->selected);
                }
                break;  
+#else
+       case GDK_KEY_Return:
+       case GDK_KEY_KP_Enter:
+               if (folderview->selected)
+                       folderview_select_node(folderview, folderview->selected);
+               break;
 #endif
        case GDK_KEY_space:
                BREAK_ON_MODIFIER_KEY();
@@ -2029,6 +2050,39 @@ static gboolean folderview_key_pressed(GtkWidget *widget, GdkEventKey *event,
                                                       folderview->selected);
                }
                break;
+       case GDK_KEY_Left:
+               if (folderview->selected) {
+                       if (GTK_CMCTREE_ROW(folderview->selected)->expanded) {
+                               gtk_cmctree_collapse(GTK_CMCTREE(folderview->ctree),
+                                               folderview->selected);
+                       } else {
+                               if ((item = gtk_cmctree_node_get_row_data(GTK_CMCTREE(folderview->ctree),
+                                               folderview->selected))) {
+                                       if ((node = gtk_cmctree_find_by_row_data(GTK_CMCTREE(folderview->ctree),
+                                                       NULL, folder_item_parent(item)))) {
+                                               gtk_sctree_select(GTK_SCTREE(folderview->ctree), node);
+                                               if (!gtk_cmctree_node_is_visible(GTK_CMCTREE(folderview->ctree), node))
+                                                       gtk_cmctree_node_moveto(GTK_CMCTREE(folderview->ctree),
+                                                                       node, -1, 0, 0);
+                                       }
+                               }
+                       }
+               }
+               break;
+       case GDK_KEY_Home:
+       case GDK_KEY_End:
+               if (event->keyval == GDK_KEY_Home)
+                       node = gtk_cmctree_node_nth(GTK_CMCTREE(folderview->ctree), 0);
+               else
+                       node = gtk_cmctree_last(GTK_CMCTREE(folderview->ctree),
+                                       gtk_cmctree_node_nth(GTK_CMCTREE(folderview->ctree), 0));
+
+               gtk_sctree_select(GTK_SCTREE(folderview->ctree), node);
+
+               if (!gtk_cmctree_node_is_visible(GTK_CMCTREE(folderview->ctree), node))
+                       gtk_cmctree_node_moveto(GTK_CMCTREE(folderview->ctree),
+                                       node, -1, 0, 0);
+               break;
        default:
                break;
        }
@@ -2304,7 +2358,6 @@ static void folderview_create_folder_node(FolderView *folderview, FolderItem *it
 static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        GSList *mlist = NULL;
        GSList *cur = NULL;
@@ -2312,7 +2365,7 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
        PrefsAccount *ac;
 
        if (!folderview->selected) return;
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
 
@@ -2348,14 +2401,13 @@ static void folderview_empty_trash_cb(GtkAction *action, gpointer data)
 static void folderview_send_queue_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        FolderItem *special_queue = NULL;
        PrefsAccount *ac;
        gchar *errstr = NULL;
 
        if (!folderview->selected) return;
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
 
@@ -2410,12 +2462,11 @@ static void folderview_search_cb(GtkAction *action, gpointer data)
 static void folderview_run_processing_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
 
@@ -2427,12 +2478,11 @@ static void folderview_run_processing_cb(GtkAction *action, gpointer data)
 static void folderview_property_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
 
        if (!folderview->selected) return;
 
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
 
@@ -2569,13 +2619,12 @@ static gint folderview_clist_compare(GtkCMCList *clist,
 static void folderview_processing_cb(GtkAction *action, gpointer data)
 {
        FolderView *folderview = (FolderView *)data;
-       GtkCMCTree *ctree = GTK_CMCTREE(folderview->ctree);
        FolderItem *item;
        gchar *id, *title;
 
        if (!folderview->selected) return;
 
-       item = gtk_cmctree_node_get_row_data(ctree, folderview->selected);
+       item = folderview_get_selected_item(folderview);
        cm_return_if_fail(item != NULL);
        cm_return_if_fail(item->folder != NULL);
 
@@ -2757,7 +2806,7 @@ static void folderview_drag_data_get(GtkWidget        *widget,
                                               source, strlen(source));
                }
        } else {
-               g_warning("unknown info %d\n", info);
+               g_warning("unknown info %d", info);
        }
 }