From bfb6a0c5e3b5731daaa4fba4cd139bbeef575fb8 Mon Sep 17 00:00:00 2001 From: Salvatore De Paolis Date: Sun, 11 Jul 2010 01:57:30 +0000 Subject: [PATCH] 2010-07-11 [iwkse] 3.7.6cvs18 * src/gtk/quicksearch.c Add SMALL_LAYOUT to quicksearch_relayout --- ChangeLog | 5 +++++ PATCHSETS | 1 + configure.ac | 2 +- src/gtk/quicksearch.c | 2 +- 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/ChangeLog b/ChangeLog index d42680721..75645a91a 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,8 @@ +2010-07-11 [iwkse] 3.7.6cvs18 + + * src/gtk/quicksearch.c + Add SMALL_LAYOUT to quicksearch_relayout + 2010-07-10 [iwkse] 3.7.6cvs17 * src/mainwindow.h diff --git a/PATCHSETS b/PATCHSETS index 0f860e9a4..7996bbc36 100644 --- a/PATCHSETS +++ b/PATCHSETS @@ -4013,3 +4013,4 @@ ( cvs diff -u -r 1.39.2.57 -r 1.39.2.58 src/mainwindow.h; cvs diff -u -r 1.274.2.311 -r 1.274.2.312 src/mainwindow.c; ) > 3.7.6cvs15.patchset ( cvs diff -u -r 1.274.2.312 -r 1.274.2.313 src/mainwindow.c; cvs diff -u -r 1.1.2.93 -r 1.1.2.94 src/gtk/quicksearch.c; ) > 3.7.6cvs16.patchset ( cvs diff -u -r 1.39.2.58 -r 1.39.2.59 src/mainwindow.h; ) > 3.7.6cvs17.patchset +( cvs diff -u -r 1.1.2.94 -r 1.1.2.95 src/gtk/quicksearch.c; ) > 3.7.6cvs18.patchset diff --git a/configure.ac b/configure.ac index c4fd02e35..85c10afc1 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=17 +EXTRA_VERSION=18 EXTRA_RELEASE= EXTRA_GTK2_VERSION= diff --git a/src/gtk/quicksearch.c b/src/gtk/quicksearch.c index f68408f16..513d0a2c8 100644 --- a/src/gtk/quicksearch.c +++ b/src/gtk/quicksearch.c @@ -718,7 +718,6 @@ QuickSearch *quicksearch_new() gtk_widget_show(search_string_entry); search_hbox = gtk_hbox_new(FALSE, 5); - clear_search = gtk_button_new_from_stock(GTK_STOCK_CLEAR); gtk_box_pack_start(GTK_BOX(search_hbox), clear_search, FALSE, FALSE, 0); @@ -802,6 +801,7 @@ void quicksearch_relayout(QuickSearch *quicksearch) quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, _("_Edit")); quicksearch_set_button(GTK_BUTTON(quicksearch->clear_search), GTK_STOCK_CLEAR, _("_Clear")); break; + case SMALL_LAYOUT: case VERTICAL_LAYOUT: quicksearch_set_button(GTK_BUTTON(quicksearch->search_description), GTK_STOCK_INFO, ""); quicksearch_set_button(GTK_BUTTON(quicksearch->search_condition_expression), GTK_STOCK_EDIT, ""); -- 2.25.1