gfgit/claws-mail
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

2006-12-01 [wwp] 2.6.0cvs75

Browse source 
* src/gtk/quicksearch.c
		revert last changes to the quicksearch gtk_combo_box, this needs more
		tuning and testing.
This commit is contained in:
Tristan Chabredier 2006-12-01 11:05:11 +00:00
parent 449d97f542
commit 6e73687437
4 changed files with 38 additions and 33 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
ChangeLog
View file

@ -1,3 +1,9 @@
2006-12-01 [wwp] 2.6.0cvs75
* src/gtk/quicksearch.c
revert last changes to the quicksearch gtk_combo_box, this needs more
tuning and testing.
2006-12-01 [paul] 2.6.0cvs74
* tools/kdeservicemenu/README

1
PATCHSETS
View file

@ -2099,3 +2099,4 @@
( cvs diff -u -r 1.9.2.30 -r 1.9.2.31 src/common/defs.h; cvs diff -u -r 1.204.2.109 -r 1.204.2.110 src/prefs_common.c; cvs diff -u -r 1.103.2.67 -r 1.103.2.68 src/prefs_common.h; cvs diff -u -r 1.3.12.18 -r 1.3.12.19 src/message_search.c; cvs diff -u -r 1.15.2.36 -r 1.15.2.37 src/summary_search.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/combobox.c; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 src/gtk/combobox.h; ) > 2.6.0cvs72.patchset
( cvs diff -u -r 1.1.2.53 -r 1.1.2.54 src/gtk/quicksearch.c; ) > 2.6.0cvs73.patchset
( cvs diff -u -r 1.2.2.8 -r 1.2.2.9 tools/kdeservicemenu/README; cvs diff -u -r 1.1.2.2 -r 1.1.2.3 tools/kdeservicemenu/claws-mail-kdeservicemenu.pl; cvs diff -u -r 1.2.2.4 -r 1.2.2.5 tools/kdeservicemenu/install.sh; cvs diff -u -r 1.1.2.1 -r 1.1.2.2 tools/kdeservicemenu/template_claws-mail-attach-files.desktop; cvs diff -u -r -1.1.2.1 -r -1.1.2.2 tools/kdeservicemenu/template_claws-mail-compress-attach.desktop; ) > 2.6.0cvs74.patchset
( cvs diff -u -r 1.1.2.54 -r 1.1.2.55 src/gtk/quicksearch.c; ) > 2.6.0cvs75.patchset

2
configure.ac
View file

@ -11,7 +11,7 @@ MINOR_VERSION=6
MICRO_VERSION=0
INTERFACE_AGE=0
BINARY_AGE=0
EXTRA_VERSION=74
EXTRA_VERSION=75
EXTRA_RELEASE=
EXTRA_GTK2_VERSION=

62
src/gtk/quicksearch.c
View file

@ -29,7 +29,6 @@
#include <gdk/gdkkeysyms.h>
#include "utils.h"
#include "combobox.h"
#include "menu.h"
#include "prefs_common.h"
#include "description_window.h"
@ -79,7 +78,7 @@ gboolean quicksearch_is_fast(QuickSearch *quicksearch)
static void prepare_matcher(QuickSearch *quicksearch)
{
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
if (search_string == NULL || search_string[0] == '\0') {
quicksearch_set_active(quicksearch, FALSE);
@ -160,15 +159,14 @@ gboolean quicksearch_has_focus(QuickSearch *quicksearch)
static void searchbar_run(QuickSearch *quicksearch, gboolean run_only_if_fast)
{
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
/* add to history */
if (!quicksearch->in_typing && search_string && strlen(search_string) != 0) {
combobox_unset_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry));
prefs_common.summary_quicksearch_history =
add_history(prefs_common.summary_quicksearch_history,
search_string);
combobox_set_popdown_strings(GTK_COMBO_BOX(quicksearch->search_string_entry),
gtk_combo_set_popdown_strings(GTK_COMBO(quicksearch->search_string_entry),
prefs_common.summary_quicksearch_history);
}
@ -205,8 +203,6 @@ static gboolean searchbar_changed_cb(GtkWidget *widget, QuickSearch *qs)
searchbar_changed_timeout, qs);
}
gtk_widget_grab_focus(qs->search_string_entry);
return FALSE;
}
@ -219,7 +215,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
quicksearch->in_typing = FALSE;
str = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
str = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
g_return_val_if_fail(str != NULL, TRUE);
/* If the string entry is empty -> hide quicksearch bar. If not -> empty it */
@ -228,7 +224,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
} else {
quicksearch_set(quicksearch, prefs_common.summary_quicksearch_type, "");
gtk_widget_grab_focus(
GTK_WIDGET(GTK_BIN(quicksearch->search_string_entry)->child));
GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
}
return TRUE;
@ -249,7 +245,7 @@ static gboolean searchbar_pressed(GtkWidget *widget, GdkEventKey *event,
static gboolean searchtype_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
prefs_common.summary_quicksearch_type = GPOINTER_TO_INT(g_object_get_data(
G_OBJECT(GTK_MENU_ITEM(gtk_menu_get_active(
@ -275,7 +271,7 @@ static gboolean searchtype_recursive_changed(GtkMenuItem *widget, gpointer data)
{
QuickSearch *quicksearch = (QuickSearch *)data;
gboolean checked = gtk_check_menu_item_get_active(GTK_CHECK_MENU_ITEM(widget));
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child));
const gchar *search_string = gtk_entry_get_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry));
prefs_common.summary_quicksearch_recurse = checked;
@ -435,11 +431,11 @@ static gboolean search_condition_expr(GtkMenuItem *widget, gpointer data)
mainwindow_get_mainwindow()->summaryview->quicksearch != NULL,
FALSE);
/* re-use the current quicksearch value if it's a condition expression,
/* re-use it the current quicksearch value if it's a condition expression,
otherwise ignore it silently */
cond_str = gtk_entry_get_text(
GTK_ENTRY(GTK_BIN(mainwindow_get_mainwindow()->summaryview->quicksearch->
search_string_entry)->child));
GTK_ENTRY(GTK_COMBO(mainwindow_get_mainwindow()->summaryview->quicksearch->
search_string_entry)->entry));
if (*cond_str != '\0') {
matchers = matcher_parser_get_cond((gchar*)cond_str, NULL);
}
@ -532,12 +528,14 @@ QuickSearch *quicksearch_new()
gtk_widget_show(search_type);
search_string_entry = gtk_combo_box_entry_new_text ();
gtk_combo_box_set_active(GTK_COMBO_BOX(search_string_entry), -1);
if (prefs_common.summary_quicksearch_history)
combobox_set_popdown_strings(GTK_COMBO_BOX(search_string_entry),
prefs_common.summary_quicksearch_history);
search_string_entry = gtk_combo_new();
gtk_box_pack_start(GTK_BOX(hbox_search), search_string_entry, FALSE, FALSE, 2);
gtk_combo_set_value_in_list(GTK_COMBO(search_string_entry), FALSE, TRUE);
gtk_combo_set_case_sensitive(GTK_COMBO(search_string_entry), TRUE);
if (prefs_common.summary_quicksearch_history)
gtk_combo_set_popdown_strings(GTK_COMBO(search_string_entry),
prefs_common.summary_quicksearch_history);
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(search_string_entry)->entry), "");
gtk_widget_show(search_string_entry);
search_hbox = gtk_hbox_new(FALSE, 5);
@ -583,21 +581,21 @@ QuickSearch *quicksearch_new()
gtk_box_pack_start(GTK_BOX(hbox_search), search_hbox, FALSE, FALSE, 2);
gtk_widget_show(search_hbox);
g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
"key_press_event",
G_CALLBACK(searchbar_pressed),
quicksearch);
g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
"changed",
G_CALLBACK(searchbar_changed_cb),
quicksearch);
g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
"focus_in_event",
G_CALLBACK(searchbar_focus_evt_in),
quicksearch);
g_signal_connect(G_OBJECT(GTK_BIN(search_string_entry)->child),
g_signal_connect(G_OBJECT(GTK_COMBO(search_string_entry)->entry),
"focus_out_event",
G_CALLBACK(searchbar_focus_evt_out),
quicksearch);
@ -631,7 +629,7 @@ void quicksearch_show(QuickSearch *quicksearch)
gtk_widget_show(quicksearch->hbox_search);
update_extended_buttons(quicksearch);
gtk_widget_grab_focus(
GTK_WIDGET(GTK_BIN(quicksearch->search_string_entry)->child));
GTK_WIDGET(GTK_COMBO(quicksearch->search_string_entry)->entry));
}
void quicksearch_hide(QuickSearch *quicksearch)
@ -647,11 +645,11 @@ void quicksearch_set(QuickSearch *quicksearch, QuickSearchType type,
gtk_option_menu_set_history(GTK_OPTION_MENU(quicksearch->search_type_opt),
type);
g_signal_handlers_block_by_func(G_OBJECT(GTK_BIN(quicksearch->search_string_entry)->child),
g_signal_handlers_block_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
G_CALLBACK(searchbar_changed_cb), quicksearch);
gtk_entry_set_text(GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child),
gtk_entry_set_text(GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry),
matchstring);
g_signal_handlers_unblock_by_func(G_OBJECT(GTK_BIN(quicksearch->search_string_entry)->child),
g_signal_handlers_unblock_by_func(G_OBJECT(GTK_COMBO(quicksearch->search_string_entry)->entry),
G_CALLBACK(searchbar_changed_cb), quicksearch);
prefs_common.summary_quicksearch_type = type;
@ -702,20 +700,20 @@ static void quicksearch_set_active(QuickSearch *quicksearch, gboolean active)
gtk_widget_set_sensitive(quicksearch->clear_search, TRUE);
if (colors_initialised) {
gtk_widget_modify_base(
GTK_BIN(quicksearch->search_string_entry)->child,
GTK_COMBO(quicksearch->search_string_entry)->entry,
GTK_STATE_NORMAL, error ? &red : &yellow);
gtk_widget_modify_text(
GTK_BIN(quicksearch->search_string_entry)->child,
GTK_COMBO(quicksearch->search_string_entry)->entry,
GTK_STATE_NORMAL, &black);
}
} else {
gtk_widget_set_sensitive(quicksearch->clear_search, FALSE);
if (colors_initialised) {
gtk_widget_modify_base(
GTK_BIN(quicksearch->search_string_entry)->child,
GTK_COMBO(quicksearch->search_string_entry)->entry,
GTK_STATE_NORMAL, NULL);
gtk_widget_modify_text(
GTK_BIN(quicksearch->search_string_entry)->child,
GTK_COMBO(quicksearch->search_string_entry)->entry,
GTK_STATE_NORMAL, NULL);
}
}
@ -965,7 +963,7 @@ gboolean quicksearch_is_running(QuickSearch *quicksearch)
void quicksearch_pass_key(QuickSearch *quicksearch, guint val, GdkModifierType mod)
{
GtkEntry *entry = GTK_ENTRY(GTK_BIN(quicksearch->search_string_entry)->child);
GtkEntry *entry = GTK_ENTRY(GTK_COMBO(quicksearch->search_string_entry)->entry);
glong curpos = gtk_editable_get_position(GTK_EDITABLE(entry));
guint32 c;
char *str = g_strdup(gtk_entry_get_text(entry));