2005-07-12 [paul] 1.9.12cvs39

	* AUTHORS
	* src/toolbar.c
	* src/toolbar.h
		add a 'Go to Prev' button to the toolbar.
		correct tooltip text of go to buttons.
		based on patch by Yang Guilong <bamanzi@gmail.com>

diff --git a/AUTHORS b/AUTHORS
index 6902eb8f4fd163447b8a2a86e789e16cdd9dc703..8edeb5d1d55e51bc6e21ad139cfdef8382ea3d2b 100644 (file)
--- a/AUTHORS
+++ b/AUTHORS
@@ -226,3 +226,4 @@ contributors (beside the above; based on Changelog)
        Luca Cavalli
        Tim Mann
        M. Benkmann
+       Yang Guilong

diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws
index b60acdf838a2478fdf779cd42c7cd4252e1c51c7..1069c12c3a1767cd22c3e9b152586d023a5668b5 100644 (file)
--- a/ChangeLog-gtk2.claws
+++ b/ChangeLog-gtk2.claws
@@ -1,3 +1,12 @@
+2005-07-12 [paul]      1.9.12cvs39
+
+       * AUTHORS
+       * src/toolbar.c
+       * src/toolbar.h
+               add a 'Go to Prev' button to the toolbar.
+               correct tooltip text of go to buttons.
+               based on patch by Yang Guilong <bamanzi@gmail.com>
+
 2005-07-12 [colin]     1.9.12cvs38
 
        * src/statusbar.c

diff --git a/PATCHSETS b/PATCHSETS
index 99aba9e10144b5d39302392a74e36119be33ae4f..91bec3684f407c0296371744f7fb376f6bdd74aa 100644 (file)
--- a/PATCHSETS
+++ b/PATCHSETS
@@ -633,3 +633,4 @@
 ( cvs diff -u -r 1.149.2.28 -r 1.149.2.29 src/inc.c;  cvs diff -u -r 1.96.2.61 -r 1.96.2.62 src/textview.c;  cvs diff -u -r 1.395.2.91 -r 1.395.2.92 src/summaryview.c;  ) > 1.9.12cvs36.patchset
 ( cvs diff -u -r 1.5.12.4 -r 1.5.12.5 src/editjpilot.c;  ) > 1.9.12cvs37.patchset
 ( cvs diff -u -r 1.5.2.5 -r 1.5.2.6 src/statusbar.c;  ) > 1.9.12cvs38.patchset
+( cvs diff -u -r 1.100.2.21 -r 1.100.2.22 AUTHORS;  cvs diff -u -r 1.43.2.19 -r 1.43.2.20 src/toolbar.c;  cvs diff -u -r 1.19.2.3 -r 1.19.2.4 src/toolbar.h;  ) > 1.9.12cvs39.patchset

diff --git a/configure.ac b/configure.ac
index 9e4675be42a857cacaea4df19a453cc5508747db..add54c77e6d1c9dd15665ae2efe1fe80513086be 100644 (file)
--- a/configure.ac
+++ b/configure.ac
@@ -11,7 +11,7 @@ MINOR_VERSION=9
 MICRO_VERSION=12
 INTERFACE_AGE=0
 BINARY_AGE=0
-EXTRA_VERSION=38
+EXTRA_VERSION=39
 EXTRA_RELEASE=
 EXTRA_GTK2_VERSION=
 

diff --git a/src/toolbar.c b/src/toolbar.c
index 8629ade7af561ee1b33d24f1bfe79e339beed27d..7e4568af29830bca08be0777a7cd7643ff32ada7 100644 (file)
--- a/src/toolbar.c
+++ b/src/toolbar.c
@@ -110,6 +110,8 @@ static void toolbar_reply_to_sender_cb              (GtkWidget      *widget,
 static void toolbar_forward_cb                 (GtkWidget      *widget,
                                                 gpointer        data);
 
+static void toolbar_prev_unread_cb             (GtkWidget      *widget,
+                                                gpointer        data);
 static void toolbar_next_unread_cb             (GtkWidget      *widget,
                                                 gpointer        data);
 
@@ -164,9 +166,10 @@ struct {
        { "A_FORWARD",          N_("Forward Message")                      }, 
        { "A_DELETE",           N_("Delete Message")                       },
        { "A_EXECUTE",          N_("Execute")                              },
-       { "A_GOTO_NEXT",        N_("Goto Next Message")                    },
-       { "A_IGNORE_THREAD",    N_("Ignore thread")                     },
-       { "A_PRINT",            N_("Print")                             },
+       { "A_GOTO_PREV",        N_("Go to Previous Unread Message")        },
+       { "A_GOTO_NEXT",        N_("Go to Next Unread Message")            },
+       { "A_IGNORE_THREAD",    N_("Ignore thread")                        },
+       { "A_PRINT",            N_("Print")                                },
 
        { "A_SEND",             N_("Send Message")                         },
        { "A_SENDL",            N_("Put into queue folder and send later") },
@@ -294,8 +297,8 @@ GList *toolbar_get_action_items(ToolbarType source)
                gint main_items[]   = { A_RECEIVE_ALL,   A_RECEIVE_CUR,   A_SEND_QUEUED,
                                        A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER, 
                                        A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD, 
-                                       A_DELETE,        A_EXECUTE,       A_GOTO_NEXT, 
-                                       A_IGNORE_THREAD, A_PRINT,  
+                                       A_DELETE,        A_EXECUTE,       A_GOTO_PREV, 
+                                       A_GOTO_NEXT,    A_IGNORE_THREAD,  A_PRINT,
                                        A_ADDRBOOK,      A_SYL_ACTIONS };
 
                for (i = 0; i < sizeof main_items / sizeof main_items[0]; i++)  {
@@ -323,8 +326,8 @@ GList *toolbar_get_action_items(ToolbarType source)
        else if (source == TOOLBAR_MSGVIEW) {
                gint msgv_items[] =   { A_COMPOSE_EMAIL, A_REPLY_MESSAGE, A_REPLY_SENDER,
                                        A_REPLY_ALL,     A_REPLY_ML,      A_FORWARD,
-                                       A_DELETE,        A_GOTO_NEXT,     A_ADDRBOOK,
-                                       A_SYL_ACTIONS };        
+                                       A_DELETE,        A_GOTO_PREV,     A_GOTO_NEXT,
+                                       A_ADDRBOOK,      A_SYL_ACTIONS };       
 
                for (i = 0; i < sizeof msgv_items / sizeof msgv_items[0]; i++) 
                        items = g_list_append(items, gettext(toolbar_text[msgv_items[i]].descr));
@@ -382,6 +385,7 @@ static void toolbar_set_default_main(void)
                { A_SEPARATOR,     0,                                 ("")         },
                { A_DELETE,        STOCK_PIXMAP_CLOSE,                _("Delete")  },
                { A_EXECUTE,       STOCK_PIXMAP_EXEC,                 _("Execute") },
+               { A_GOTO_PREV,     STOCK_PIXMAP_UP_ARROW,             _("Previous")},
                { A_GOTO_NEXT,     STOCK_PIXMAP_DOWN_ARROW,           _("Next")    }
        };
        
@@ -1012,6 +1016,44 @@ static void toolbar_forward_cb(GtkWidget *widget, gpointer data)
        toolbar_reply(data, COMPOSE_FORWARD);
 }
 
+/*
+ * Goto Prev Unread Message
+ */
+static void toolbar_prev_unread_cb(GtkWidget *widget, gpointer data)
+{
+       ToolbarItem *toolbar_item = (ToolbarItem*)data;
+       MainWindow *mainwin;
+       MessageView *msgview;
+
+       g_return_if_fail(toolbar_item != NULL);
+
+       switch (toolbar_item->type) {
+       case TOOLBAR_MAIN:
+               mainwin = (MainWindow*)toolbar_item->parent;
+               summary_select_prev_unread(mainwin->summaryview);
+               break;
+               
+       case TOOLBAR_MSGVIEW:
+               msgview = (MessageView*)toolbar_item->parent;
+               summary_select_prev_unread(msgview->mainwin->summaryview);
+               
+               /* Now we need to update the messageview window */
+               if (msgview->mainwin->summaryview->selected) {
+                       GtkCTree *ctree = GTK_CTREE(msgview->mainwin->summaryview->ctree);
+                       
+                       MsgInfo * msginfo = gtk_ctree_node_get_row_data(ctree, 
+                                                                       msgview->mainwin->summaryview->selected);
+                      
+                       messageview_show(msgview, msginfo, 
+                                        msgview->all_headers);
+               } else {
+                       gtk_widget_destroy(msgview->window);
+               }
+               break;
+       default:
+               debug_print("toolbar event not supported\n");
+       }
+}
 
 /*
  * Goto Next Unread Message
@@ -1225,6 +1267,7 @@ static void toolbar_buttons_cb(GtkWidget   *widget,
                { A_FORWARD,            toolbar_forward_cb              },
                { A_DELETE,             toolbar_delete_cb               },
                { A_EXECUTE,            toolbar_exec_cb                 },
+               { A_GOTO_PREV,          toolbar_prev_unread_cb          },
                { A_GOTO_NEXT,          toolbar_next_unread_cb          },
                { A_IGNORE_THREAD,      toolbar_ignore_thread_cb        },
                { A_PRINT,              toolbar_print_cb                },
@@ -1460,11 +1503,19 @@ Toolbar *toolbar_create(ToolbarType      type,
                                             toolbar_data->exec_btn,
                                           _("Execute"), NULL);
                        break;
+               case A_GOTO_PREV:
+                       toolbar_data->prev_btn = item;
+                       gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
+                                            toolbar_data->prev_btn,
+                                            _("Go to Previous Unread Message"),
+                                            NULL);
+                       break;
                case A_GOTO_NEXT:
                        toolbar_data->next_btn = item;
                        gtk_tooltips_set_tip(GTK_TOOLTIPS(toolbar_tips), 
                                             toolbar_data->next_btn,
-                                            _("Goto Next Message"), NULL);
+                                            _("Go to Next Unread Message"),
+                                            NULL);
                        break;
                
                /* Compose Toolbar */
@@ -1783,6 +1834,7 @@ void toolbar_init(Toolbar * toolbar) {
        toolbar->replylist_btn          = NULL;
        toolbar->fwd_btn                = NULL;
        toolbar->delete_btn             = NULL;
+       toolbar->prev_btn               = NULL;
        toolbar->next_btn               = NULL;
        toolbar->exec_btn               = NULL;
 

diff --git a/src/toolbar.h b/src/toolbar.h
index 6e491d3d2feef8fe71f50d335e090f2ec9d1a34d..57d58d8f8545639030afb6fd2535bbe9871dc126 100644 (file)
--- a/src/toolbar.h
+++ b/src/toolbar.h
@@ -63,6 +63,7 @@ struct _Toolbar {
        ComboButton *fwd_combo;
        
        GtkWidget *delete_btn;
+       GtkWidget *prev_btn;
        GtkWidget *next_btn;
        GtkWidget *exec_btn;
 
@@ -147,6 +148,7 @@ enum {
        A_FORWARD,
        A_DELETE,
        A_EXECUTE,
+       A_GOTO_PREV,
        A_GOTO_NEXT,
        A_IGNORE_THREAD,
        A_PRINT,