From 8223fed3fe153c27acafe113e85019f962e2008d Mon Sep 17 00:00:00 2001 From: =?utf8?q?Pawe=C5=82=20P=C4=99kala?= Date: Fri, 10 Sep 2010 19:46:22 +0000 Subject: [PATCH] 2010-09-10 [pawel] 3.7.6cvs32 * src/mainwindow.c * src/summaryview.c * src/toolbar.c Make Tab key switch between FolderView, MsgView and SummaryView only, other widgets have/can have their own keybindings anyway --- ChangeLog | 9 +++++++++ PATCHSETS | 1 + configure.ac | 2 +- src/mainwindow.c | 1 + src/summaryview.c | 1 + src/toolbar.c | 6 ++++++ 6 files changed, 19 insertions(+), 1 deletion(-) diff --git a/ChangeLog b/ChangeLog index 8f8be4eda..286db6a06 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,12 @@ +2010-09-10 [pawel] 3.7.6cvs32 + + * src/mainwindow.c + * src/summaryview.c + * src/toolbar.c + Make Tab key switch between FolderView, MsgView and + SummaryView only, other widgets have/can have their own + keybindings anyway + 2010-08-25 [colin] 3.7.6cvs31 * src/procmime.c diff --git a/PATCHSETS b/PATCHSETS index 86edbe3fd..c2bfeb24d 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4027,3 +4027,4 @@ ( cvs diff -u -r 1.149.2.100 -r 1.149.2.101 src/inc.c; cvs diff -u -r 1.17.2.56 -r 1.17.2.57 src/send_message.c; cvs diff -u -r 1.5.2.26 -r 1.5.2.27 src/statusbar.c; cvs diff -u -r 1.43.2.116 -r 1.43.2.117 src/toolbar.c; ) > 3.7.6cvs29.patchset ( cvs diff -u -r 1.115.2.228 -r 1.115.2.229 src/main.c; ) > 3.7.6cvs30.patchset ( cvs diff -u -r 1.49.2.132 -r 1.49.2.133 src/procmime.c; cvs diff -u -r 1.100.2.74 -r 1.100.2.75 AUTHORS; cvs diff -u -r 1.1.2.67 -r 1.1.2.68 src/gtk/authors.h; cvs diff -u -r 1.1.4.9 -r 1.1.4.10 src/common/base64.c; cvs diff -u -r 1.1.4.7 -r 1.1.4.8 src/common/base64.h; ) > 3.7.6cvs31.patchset +( cvs diff -u -r 1.274.2.313 -r 1.274.2.314 src/mainwindow.c; cvs diff -u -r 1.395.2.420 -r 1.395.2.421 src/summaryview.c; cvs diff -u -r 1.43.2.117 -r 1.43.2.118 src/toolbar.c; ) > 3.7.6cvs32.patchset diff --git a/configure.ac b/configure.ac index 081ff6c98..8003635fa 100644 --- a/configure.ac +++ b/configure.ac @@ -12,7 +12,7 @@ MINOR_VERSION=7 MICRO_VERSION=6 INTERFACE_AGE=0 BINARY_AGE=0 -EXTRA_VERSION=31 +EXTRA_VERSION=32 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/mainwindow.c b/src/mainwindow.c index c7cb2dec6..61a9ee057 100644 --- a/src/mainwindow.c +++ b/src/mainwindow.c @@ -2035,6 +2035,7 @@ MainWindow *main_window_create() online_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_ONLINE); offline_pixmap = stock_pixmap_widget(hbox_stat, STOCK_PIXMAP_OFFLINE); online_switch = gtk_button_new (); + gtk_widget_set_can_focus(online_switch, FALSE); CLAWS_SET_TIP(online_switch, _("You are online. Click the icon to go offline")); offline_switch = gtk_button_new (); diff --git a/src/summaryview.c b/src/summaryview.c index a6edba449..a20709c8b 100644 --- a/src/summaryview.c +++ b/src/summaryview.c @@ -539,6 +539,7 @@ SummaryView *summary_create(MainWindow *mainwin) toggle_search = gtk_toggle_button_new(); gtk_toggle_button_set_active(GTK_TOGGLE_BUTTON(toggle_search), prefs_common.show_searchbar); + gtk_widget_set_can_focus(toggle_search, FALSE); gtk_widget_show(toggle_search); CLAWS_SET_TIP(toggle_search, _("Toggle quick search bar")); diff --git a/src/toolbar.c b/src/toolbar.c index 13616d66a..1b776621e 100644 --- a/src/toolbar.c +++ b/src/toolbar.c @@ -1737,6 +1737,7 @@ static void toolbar_buttons_cb(GtkWidget *widget, #ifndef GENERIC_UMPC #define TOOLBAR_ITEM(item,icon,text,tooltip) { \ item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \ + gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \ @@ -1760,7 +1761,9 @@ static void toolbar_buttons_cb(GtkWidget *widget, gchild = gtk_container_get_children( \ GTK_CONTAINER(child)); \ btn = (GtkWidget *)gchild->data; \ + gtk_widget_set_can_focus(btn, FALSE); \ arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \ + gtk_widget_set_can_focus(arr, FALSE); \ g_list_free(gchild); \ gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \ gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \ @@ -1769,6 +1772,7 @@ static void toolbar_buttons_cb(GtkWidget *widget, #else #define TOOLBAR_ITEM(item,icon,text,tooltip) { \ item = GTK_WIDGET(gtk_tool_button_new(icon, text)); \ + gtk_widget_set_can_focus(gtk_bin_get_child(GTK_BIN(item)), FALSE); \ gtk_tool_item_set_homogeneous(GTK_TOOL_ITEM(item), FALSE); \ gtk_tool_item_set_is_important(GTK_TOOL_ITEM(item), TRUE); \ g_signal_connect (G_OBJECT(item), "clicked", G_CALLBACK(toolbar_buttons_cb), toolbar_item); \ @@ -1787,7 +1791,9 @@ static void toolbar_buttons_cb(GtkWidget *widget, gchild = gtk_container_get_children( \ GTK_CONTAINER(child)); \ btn = (GtkWidget *)gchild->data; \ + gtk_widget_set_can_focus(btn, FALSE); \ arr = (GtkWidget *)(gchild->next?gchild->next->data:NULL); \ + gtk_widget_set_can_focus(arr, FALSE); \ g_list_free(gchild); \ gchild = gtk_container_get_children(GTK_CONTAINER(arr)); \ gtk_widget_set_size_request(GTK_WIDGET(gchild->data), 9, -1); \ -- 2.25.1