commit 7ff97c375325b267a9374433c6b78ea7da648bbf
parent e5e19ac09fa1e8bb131f095215a2c05f30d98491
Author: Colin Leroy <colin@colino.net>
Date: Wed, 31 Aug 2011 16:54:54 +0000
2011-08-31 [colin] 3.7.10cvs13
* AUTHORS
* src/gtk/authors.h
* src/mainwindow.c
* src/messageview.c
* src/gtk/authors.h
Apply Steve Rader's patch from bug #2388, "Add
message view scrolling menu items"
Diffstat:
7 files changed, 105 insertions(+), 2 deletions(-)
diff --git a/AUTHORS b/AUTHORS
@@ -284,3 +284,4 @@ contributors (in addition to the above; based on Changelog)
Reed Loden
Sebastien Bigaret
Mikhail Efremov
+ Steve Rader
diff --git a/ChangeLog b/ChangeLog
@@ -1,3 +1,13 @@
+2011-08-31 [colin] 3.7.10cvs13
+
+ * AUTHORS
+ * src/gtk/authors.h
+ * src/mainwindow.c
+ * src/messageview.c
+ * src/gtk/authors.h
+ Apply Steve Rader's patch from bug #2388, "Add
+ message view scrolling menu items"
+
2011-08-30 [colin] 3.7.10cvs12
* src/gtk/prefswindow.c
diff --git a/PATCHSETS b/PATCHSETS
@@ -4216,3 +4216,4 @@
( cvs diff -u -r 1.13.2.46 -r 1.13.2.47 src/common/socket.c; cvs diff -u -r 1.9.2.45 -r 1.9.2.46 src/common/ssl.c; ) > 3.7.10cvs10.patchset
( cvs diff -u -r 1.654.2.4291 -r 1.654.2.4292 configure.ac; cvs diff -u -r 1.9.2.46 -r 1.9.2.47 src/common/ssl.c; ) > 3.7.10cvs11.patchset
( cvs diff -u -r 1.12.2.55 -r 1.12.2.56 src/gtk/prefswindow.c; ) > 3.7.10cvs12.patchset
+( cvs diff -u -r 1.100.2.78 -r 1.100.2.79 AUTHORS; cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/authors.h; cvs diff -u -r 1.274.2.327 -r 1.274.2.328 src/mainwindow.c; cvs diff -u -r 1.94.2.217 -r 1.94.2.218 src/messageview.c; cvs diff -u -r 1.1.2.72 -r 1.1.2.73 src/gtk/authors.h; ) > 3.7.10cvs13.patchset
diff --git a/configure.ac b/configure.ac
@@ -12,7 +12,7 @@ MINOR_VERSION=7
MICRO_VERSION=10
INTERFACE_AGE=0
BINARY_AGE=0
-EXTRA_VERSION=12
+EXTRA_VERSION=13
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=
diff --git a/src/gtk/authors.h b/src/gtk/authors.h
@@ -210,6 +210,7 @@ static char *CONTRIBS_LIST[] = {
"Martin Pool",
"Quar",
"Don Quijote",
+"Steve Rader",
"Jens Rantil",
"Ravemax",
"Ivan Rayner",
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -314,6 +314,15 @@ static void goto_folder_cb (GtkAction *action,
static void goto_unread_folder_cb(GtkAction *action,
gpointer data);
+static void scroll_prev_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_prev_page_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_page_cb (GtkAction *action,
+ gpointer data);
+
static void copy_cb (GtkAction *action,
gpointer data);
static void allsel_cb (GtkAction *action,
@@ -551,8 +560,15 @@ static GtkActionEntry mainwin_entries[] =
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextUnreadFolder", NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
{"View/Goto/OtherFolder", NULL, N_("_Other folder..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
- /* {"View/---", NULL, "---", NULL, NULL, NULL }, */
+ /* {"View/Scroll/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Scroll", NULL, N_("Message Scroll") },
+ {"View/Scroll/PrevLine", NULL, N_("Previous line"), NULL, NULL, G_CALLBACK(scroll_prev_line_cb) },
+ {"View/Scroll/NextLine", NULL, N_("Next line"), NULL, NULL, G_CALLBACK(scroll_next_line_cb) },
+ {"View/Scroll/PrevPage", NULL, N_("Previous page"), NULL, NULL, G_CALLBACK(scroll_prev_page_cb) },
+ {"View/Scroll/NextPage", NULL, N_("Next page"), NULL, NULL, G_CALLBACK(scroll_next_page_cb) },
+
+ /* {"View/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Encoding", NULL, N_("Character _encoding") }, /* set_charset_cb */
{"View/Encoding/---", NULL, "---" },
#define ENC_ACTION(cs_char,c_char,string) \
@@ -1722,6 +1738,11 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator6", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Separator4", "View/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
@@ -4792,6 +4813,30 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
folderview_select_next_unread(mainwin->folderview, FALSE);
}
+static void scroll_prev_line_cb(GtkAction *action, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ mimeview_scroll_one_line(mainwin->messageview->mimeview,TRUE);
+}
+
+static void scroll_next_line_cb(GtkAction *action, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ mimeview_scroll_one_line(mainwin->messageview->mimeview,FALSE);
+}
+
+static void scroll_prev_page_cb(GtkAction *action, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ mimeview_scroll_page(mainwin->messageview->mimeview,TRUE);
+}
+
+static void scroll_next_page_cb(GtkAction *action, gpointer data)
+{
+ MainWindow *mainwin = (MainWindow *)data;
+ mimeview_scroll_page(mainwin->messageview->mimeview,FALSE);
+}
+
static void copy_cb(GtkAction *action, gpointer data)
{
MainWindow *mainwin = (MainWindow *)data;
diff --git a/src/messageview.c b/src/messageview.c
@@ -135,6 +135,15 @@ static void goto_unread_folder_cb (GtkAction *action,
static void goto_folder_cb (GtkAction *action,
gpointer data);
+static void scroll_prev_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_line_cb (GtkAction *action,
+ gpointer data);
+static void scroll_next_page_cb (GtkAction *action,
+ gpointer data);
+static void scroll_prev_page_cb (GtkAction *action,
+ gpointer data);
+
static void set_charset_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
static void set_decode_cb (GtkAction *action, GtkRadioAction *current, gpointer data);
@@ -224,6 +233,12 @@ static GtkActionEntry msgview_entries[] =
{"View/Goto/NextUnreadFolder", NULL, N_("Next unread _folder"), "<shift>G", NULL, G_CALLBACK(goto_unread_folder_cb) },
{"View/Goto/OtherFolder", NULL, N_("_Other folder..."), "G", NULL, G_CALLBACK(goto_folder_cb) },
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
+ {"View/Scroll", NULL, N_("Message Scroll") },
+ {"View/Scroll/PrevLine", NULL, N_("Previous line"), NULL, NULL, G_CALLBACK(scroll_prev_line_cb) },
+ {"View/Scroll/NextLine", NULL, N_("Next line"), NULL, NULL, G_CALLBACK(scroll_next_line_cb) },
+ {"View/Scroll/PrevPage", NULL, N_("Previous page"), NULL, NULL, G_CALLBACK(scroll_prev_page_cb) },
+ {"View/Scroll/NextPage", NULL, N_("Next page"), NULL, NULL, G_CALLBACK(scroll_next_page_cb) },
+ /* {"View/Scroll/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Encoding", NULL, N_("Character _encoding") }, /* set_charset_cb */
{"View/Encoding/---", NULL, "---" },
@@ -484,6 +499,12 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextUnreadFolder", "View/Goto/NextUnreadFolder", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "OtherFolder", "View/Goto/OtherFolder", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Scroll", "View/Scroll", GTK_UI_MANAGER_MENU)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevLine", "View/Scroll/PrevLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextLine", "View/Scroll/NextLine", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "PrevPage", "View/Scroll/PrevPage", GTK_UI_MANAGER_MENUITEM)
+ MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Scroll", "NextPage", "View/Scroll/NextPage", GTK_UI_MANAGER_MENUITEM)
+
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Separator1", "View/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View", "Encoding", "View/Encoding", GTK_UI_MANAGER_MENU)
@@ -2446,6 +2467,30 @@ static void goto_folder_cb(GtkAction *action, gpointer data)
}
}
+static void scroll_prev_line_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_one_line(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_line_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_one_line(messageview->mimeview,FALSE);
+}
+
+static void scroll_prev_page_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_page(messageview->mimeview,TRUE);
+}
+
+static void scroll_next_page_cb(GtkAction *action, gpointer data)
+{
+ MessageView *messageview = (MessageView *)data;
+ mimeview_scroll_page(messageview->mimeview,FALSE);
+}
+
static void set_charset_cb(GtkAction *action, GtkRadioAction *current, gpointer data)
{
MessageView *messageview = (MessageView *)data;
