iiiypuk/hexchat
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Don't use popup when search is not found

Browse Source
This commit is contained in:
TingPing 2013-05-18 17:32:41 -04:00
parent 9d717ffee9
commit c471388021
1 changed files with 17 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

19
src/fe-gtk/search.c
View File

@ -32,6 +32,7 @@
#include "maingui.h" #include "maingui.h"
GtkWidget *searchwin; GtkWidget *searchwin;
GtkWidget *searchentry;
static void static void
search_search (session * sess, const gchar *text) search_search (session * sess, const gchar *text)
@ -64,7 +65,11 @@ search_search (session * sess, const gchar *text)
} }
else if (!last) else if (!last)
{ {
fe_message (_("Search hit end, not found."), FE_MSG_ERROR); gtk_entry_set_icon_from_stock (GTK_ENTRY (searchentry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_DIALOG_ERROR);
}
else
{
gtk_entry_set_icon_from_stock (GTK_ENTRY (searchentry), GTK_ENTRY_ICON_SECONDARY, NULL);
} }
} }
@ -108,6 +113,12 @@ search_entry_cb (GtkWidget * entry, session * sess)
search_search (sess, gtk_entry_get_text (GTK_ENTRY (entry))); search_search (sess, gtk_entry_get_text (GTK_ENTRY (entry)));
} }
static void
search_changed_cb (GtkWidget * entry, gpointer userdata)
{
gtk_entry_set_icon_from_stock (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, NULL);
}
static void static void
search_caseign_cb (GtkToggleButton * but, session * sess) search_caseign_cb (GtkToggleButton * but, session * sess)
{ {
@ -158,8 +169,10 @@ search_open (session * sess)
gtk_container_add (GTK_CONTAINER (vbox), hbox); gtk_container_add (GTK_CONTAINER (vbox), hbox);
gtk_widget_show (hbox); gtk_widget_show (hbox);
entry = gtk_entry_new (); entry = searchentry = gtk_entry_new ();
text = GTK_XTEXT (sess->gui->xtext)->buffer->search_text; text = GTK_XTEXT (sess->gui->xtext)->buffer->search_text;
gtk_entry_set_icon_activatable (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, FALSE);
gtk_entry_set_icon_tooltip_text (GTK_ENTRY (entry), GTK_ENTRY_ICON_SECONDARY, "Search hit end or not found.");
if (text) if (text)
{ {
gtk_entry_set_text (GTK_ENTRY (entry), text); gtk_entry_set_text (GTK_ENTRY (entry), text);
@ -167,6 +180,8 @@ search_open (session * sess)
} }
g_signal_connect (G_OBJECT (entry), "activate", g_signal_connect (G_OBJECT (entry), "activate",
G_CALLBACK (search_entry_cb), sess); G_CALLBACK (search_entry_cb), sess);
g_signal_connect (G_OBJECT (entry), "changed",
G_CALLBACK (search_changed_cb), NULL);
gtk_container_add (GTK_CONTAINER (hbox), entry); gtk_container_add (GTK_CONTAINER (hbox), entry);
gtk_widget_show (entry); gtk_widget_show (entry);
gtk_widget_grab_focus (entry); gtk_widget_grab_focus (entry);