From 8bccaf62cdebd3d40eadc56f7c6c38cb927b133e Mon Sep 17 00:00:00 2001 From: Colin Leroy Date: Sat, 24 Jul 2004 10:04:16 +0000 Subject: [PATCH] Fix shift+down, add pgup/pgdn/home/end --- ChangeLog-gtk2.claws | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/summaryview.c | 24 ++++++++++++++++++++++-- 4 files changed, 29 insertions(+), 3 deletions(-) diff --git a/ChangeLog-gtk2.claws b/ChangeLog-gtk2.claws index becc1618a..bec421ee2 100644 --- a/ChangeLog-gtk2.claws +++ b/ChangeLog-gtk2.claws @@ -1,3 +1,8 @@ +2004-07-24 [colin] 0.9.12cvs33.13 + + * src/summaryview.c + Fix Shift+Down, add Home/End/PgUp/PgDown + 2004-07-21 [colin] 0.9.12cvs33.12 * src/prefs_common.c diff --git a/PATCHSETS b/PATCHSETS index 086dc26a4..adba8163a 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -66,3 +66,4 @@ ( cvs diff -u -r 1.382.2.31 -r 1.382.2.32 src/compose.c; cvs diff -u -r 1.23.2.3 -r 1.23.2.4 src/crash.c; cvs diff -u -r 1.8.2.1 -r 1.8.2.2 src/export.c; cvs diff -u -r 1.13.2.2 -r 1.13.2.3 src/import.c; cvs diff -u -r 1.94.2.22 -r 1.94.2.23 src/messageview.c; cvs diff -u -r 1.83.2.12 -r 1.83.2.13 src/mimeview.c; cvs diff -u -r 1.5.2.1 -r 1.5.2.2 src/prefs_spelling.c; cvs diff -u -r 1.3.2.5 -r 1.3.2.6 src/prefs_themes.c; cvs diff -u -r 1.395.2.23 -r 1.395.2.24 src/summaryview.c; cvs diff -u -r 1.2.2.8 -r 1.2.2.9 src/gtk/filesel.c; cvs diff -u -r 1.1.4.1 -r 1.1.4.2 src/gtk/filesel.h; cvs diff -u -r 1.5.2.3 -r 1.5.2.4 src/gtk/pluginwindow.c; ) > 0.9.12cvs33.10.patchset ( cvs diff -u -r 1.2.2.9 -r 1.2.2.10 src/gtk/filesel.c; ) > 0.9.12cvs33.11.patchset ( cvs diff -u -r 1.204.2.16 -r 1.204.2.17 src/prefs_common.c; ) > 0.9.12cvs33.12.patchset +( cvs diff -u -r 1.395.2.24 -r 1.395.2.25 src/summaryview.c; ) > 0.9.12cvs33.13.patchset diff --git a/configure.ac b/configure.ac index 48d2ea4a3..d2956c31b 100644 --- a/configure.ac +++ b/configure.ac @@ -13,7 +13,7 @@ INTERFACE_AGE=0 BINARY_AGE=0 EXTRA_VERSION=33 EXTRA_RELEASE= -EXTRA_GTK2_VERSION=.12 +EXTRA_GTK2_VERSION=.13 if test \( $EXTRA_VERSION -eq 0 \) -o \( "x$EXTRA_RELEASE" != "x" \); then VERSION=${MAJOR_VERSION}.${MINOR_VERSION}.${MICRO_VERSION}${EXTRA_RELEASE}${EXTRA_GTK2_VERSION} diff --git a/src/summaryview.c b/src/summaryview.c index ac8fcb6f0..8195bce89 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -4355,7 +4355,27 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event, /* Deprecated - what are the non-deprecated equivalents? */ if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL) gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0); - + summaryview->selected = next; + return TRUE; + } + } + break; + case GDK_Home: + case GDK_End: + if ((node = summaryview->selected) != NULL) { + GtkCTreeNode *next = NULL; + next = (event->keyval == GDK_Home) + ? gtk_ctree_node_nth(ctree, 0) + : gtk_ctree_node_nth(ctree, + g_list_length(GTK_CLIST(ctree)->row_list)-1); + if (next) { + gtk_sctree_select_with_state + (GTK_SCTREE(ctree), next, event->state); + + /* Deprecated - what are the non-deprecated equivalents? */ + if (gtk_ctree_node_is_visible(GTK_CTREE(ctree), next) != GTK_VISIBILITY_FULL) + gtk_ctree_node_moveto(GTK_CTREE(ctree), next, 0, 0, 0); + summaryview->selected = next; return TRUE; } } @@ -4408,7 +4428,7 @@ static gboolean summary_key_pressed(GtkWidget *widget, GdkEventKey *event, default: break; } - return TRUE; + return FALSE; } static void quicksearch_execute_cb(QuickSearch *quicksearch, gpointer data) -- 2.25.1