Skip to content
Snippets Groups Projects
Commit de9f68b9 authored by Emmanuel Milou's avatar Emmanuel Milou
Browse files

[#961] Instanciate only once the searchbar icons

parent 8677a269
No related branches found
No related tags found
No related merge requests found
...@@ -23,14 +23,17 @@ ...@@ -23,14 +23,17 @@
#include <searchbar.h> #include <searchbar.h>
#include <calltree.h> #include <calltree.h>
const GdkColor BLACK_COLOR = { 0, 0, 0, 0 };
const GdkColor GRAY_COLOR = { 0, 30000, 30000, 30000 };
GtkWidget * searchbox; GtkWidget * searchbox;
static GtkWidget *menu = NULL; static GtkWidget *menu = NULL;
/**
* Searchbar icons
*/
GdkPixbuf *incoming_pixbuf = NULL;
GdkPixbuf *outgoing_pixbuf = NULL;
GdkPixbuf *missed_pixbuf = NULL;
void searchbar_entry_changed (GtkEntry* entry, gchar* arg1 UNUSED, gpointer data UNUSED) void searchbar_entry_changed (GtkEntry* entry, gchar* arg1 UNUSED, gpointer data UNUSED)
{ {
if (active_calltree == contacts) { if (active_calltree == contacts) {
...@@ -49,8 +52,8 @@ static void search_all (GtkWidget *item, GtkEntry *entry) ...@@ -49,8 +52,8 @@ static void search_all (GtkWidget *item, GtkEntry *entry)
gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND); gtk_entry_set_icon_from_stock (entry, GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
"Search all\n" _("Search all\n"
"Click here to change the search type"); "Click here to change the search type"));
history_search (HistorySearchType); history_search (HistorySearchType);
} }
...@@ -59,11 +62,10 @@ static void search_by_missed (GtkWidget *item, GtkEntry *entry) ...@@ -59,11 +62,10 @@ static void search_by_missed (GtkWidget *item, GtkEntry *entry)
{ {
HistorySearchType = SEARCH_MISSED; HistorySearchType = SEARCH_MISSED;
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/missed.svg", NULL); gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, missed_pixbuf);
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
"Search by missed call\n" _("Search by missed call\n"
"Click here to change the search type"); "Click here to change the search type"));
history_search (HistorySearchType); history_search (HistorySearchType);
} }
...@@ -72,11 +74,10 @@ static void search_by_incoming (GtkWidget *item, GtkEntry *entry) ...@@ -72,11 +74,10 @@ static void search_by_incoming (GtkWidget *item, GtkEntry *entry)
{ {
HistorySearchType = SEARCH_INCOMING; HistorySearchType = SEARCH_INCOMING;
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/incoming.svg", NULL); gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, incoming_pixbuf);
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
"Search by incoming call\n" _("Search by incoming call\n"
"Click here to change the search type"); "Click here to change the search type"));
history_search (HistorySearchType); history_search (HistorySearchType);
} }
...@@ -85,11 +86,10 @@ static void search_by_outgoing (GtkWidget *item, GtkEntry *entry) ...@@ -85,11 +86,10 @@ static void search_by_outgoing (GtkWidget *item, GtkEntry *entry)
{ {
HistorySearchType = SEARCH_OUTGOING; HistorySearchType = SEARCH_OUTGOING;
GdkPixbuf *pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/outgoing.svg", NULL); gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, outgoing_pixbuf);
gtk_entry_set_icon_from_pixbuf (entry, GTK_ENTRY_ICON_PRIMARY, pixbuf);
gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY, gtk_entry_set_icon_tooltip_text (entry, GTK_ENTRY_ICON_PRIMARY,
"Search by outgoing call\n" _("Search by outgoing call\n"
"Click here to change the search type"); "Click here to change the search type"));
history_search (HistorySearchType); history_search (HistorySearchType);
} }
...@@ -153,6 +153,10 @@ GtkWidget* history_searchbar_new (void) ...@@ -153,6 +153,10 @@ GtkWidget* history_searchbar_new (void)
searchbox = gtk_entry_new(); searchbox = gtk_entry_new();
gtk_entry_set_icon_from_stock (GTK_ENTRY (searchbox), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR); gtk_entry_set_icon_from_stock (GTK_ENTRY (searchbox), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
missed_pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/missed.svg", NULL);
incoming_pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/incoming.svg", NULL);
outgoing_pixbuf = gdk_pixbuf_new_from_file (ICONS_DIR "/outgoing.svg", NULL);
// Set the clean insensitive // Set the clean insensitive
text_changed_cb (GTK_ENTRY (searchbox), NULL); text_changed_cb (GTK_ENTRY (searchbox), NULL);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment