commit a7399bf5cb41ad8ea54030f922c19fae0c73b9b4
parent fd59d052be2693a619db4712e8c81e8f735795ce
Author: Oliver Lowe <o@olowe.co>
Date: Mon, 11 Aug 2025 20:55:07 +1000
Just scroll using scrollbars and/or wheel, arrow keys etc.
No need for a button in the View menu to scroll some window
Diffstat:
2 files changed, 0 insertions(+), 90 deletions(-)
diff --git a/src/mainwindow.c b/src/mainwindow.c
@@ -330,15 +330,6 @@ 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,
@@ -589,13 +580,6 @@ static GtkActionEntry mainwin_entries[] =
{"View/Goto/NextPart", NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
{"View/Goto/PrevPart", NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
- /* {"View/Scroll/---", NULL, "---", NULL, NULL, NULL }, */
- {"View/Scroll", NULL, N_("Message scroll"), NULL, NULL, NULL },
- {"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"), NULL, NULL, NULL }, /* set_charset_cb */
{"View/Encoding/---", NULL, "---", NULL, NULL, NULL },
@@ -1595,11 +1579,6 @@ MainWindow *main_window_create()
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "Separator8", "View/Goto/---", GTK_UI_MANAGER_SEPARATOR)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(mainwin->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", 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)
@@ -4830,30 +4809,6 @@ static void goto_unread_folder_cb(GtkAction *action, gpointer data)
folderview_select_next_with_flag(mainwin->folderview, MSG_UNREAD);
}
-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
@@ -140,15 +140,6 @@ 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);
@@ -254,12 +245,6 @@ static GtkActionEntry msgview_entries[] =
/* {"View/Goto/---", NULL, "---", NULL, NULL, NULL }, */
{"View/Goto/NextPart", NULL, N_("Next part"), "A", NULL, G_CALLBACK(goto_next_part_cb) },
{"View/Goto/PrevPart", NULL, N_("Previous part"), "Z", NULL, G_CALLBACK(goto_prev_part_cb) },
- {"View/Scroll", NULL, N_("Message scroll"), NULL, NULL, NULL },
- {"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"), NULL, NULL, NULL }, /* set_charset_cb */
{"View/Encoding/---", NULL, "---", NULL, NULL, NULL },
@@ -530,12 +515,6 @@ static void messageview_add_toolbar(MessageView *msgview, GtkWidget *window)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "NextPart", "View/Goto/NextPart", GTK_UI_MANAGER_MENUITEM)
MENUITEM_ADDUI_MANAGER(msgview->ui_manager, "/Menu/View/Goto", "PrevPart", "View/Goto/PrevPart", 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)
@@ -2699,30 +2678,6 @@ 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;
