Add history search

sflphone-gtk/src/actions.c

@@ -25,6 +25,7 @@
 #include <menus.h>
 #include <statusicon.h>
 #include <calltab.h>
+#include <historyfilter.h>
 
 #include <gtk/gtk.h>
 #include <string.h>
@@ -193,8 +194,7 @@ sflphone_init()
 	int i;
 	current_calls = calltab_init();
 	history = calltab_init();	
-	histfilter = create_filter(history->store);
-	gtk_tree_view_set_model(GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(histfilter));
+	histfilter = create_filter(GTK_TREE_MODEL(history->store));
 	account_list_init ();
         codec_list_init();
 	if(!dbus_connect ()){

sflphone-gtk/src/calltree.h

@@ -29,6 +29,8 @@
   * @brief The GtkTreeView that list calls in the main window.
   */
 
+GtkToolItem * historyButton;
+
 calltab_t* active_calltree;
 /**
  * Create a new widget calltree

sflphone-gtk/src/historyfilter.c

@@ -19,6 +19,7 @@
 
 #include <gtk/gtk.h>
 #include <historyfilter.h>
+#include <calltree.h>
 
 GtkTreeModel*
 create_filter(GtkTreeModel* child)
@@ -26,23 +27,62 @@ create_filter(GtkTreeModel* child)
 	GtkTreeModel* ret = gtk_tree_model_filter_new(child, NULL);
 	gtk_tree_model_filter_set_visible_func(GTK_TREE_MODEL_FILTER(ret), is_visible, NULL, NULL);
 	return GTK_TREE_MODEL(ret);
-}
+} 
 
 gboolean
 is_visible(GtkTreeModel* model, GtkTreeIter* iter, gpointer data)
 {
 	GValue val = {0, };
 	gchar* text;
+	gchar* search = gtk_entry_get_text(GTK_ENTRY(filter_entry));
 	gtk_tree_model_get_value(GTK_TREE_MODEL(model), iter, 1, &val);
 	if(G_VALUE_HOLDS_STRING(&val)){
 		text = (gchar *)g_value_get_string(&val);
-	}
-	if(text != NULL){
-		if(g_regex_match_simple("122", text, 0, 0)){
-			printf("match\n");
-			return FALSE;
-		}else{
-			return TRUE;
-		}
-	}
+ 	}
+	if(text != NULL && g_ascii_strncasecmp(search, "Search", 6) != 0){
+		return g_regex_match_simple(search, text, G_REGEX_CASELESS, 0);
+ 	}
+	return TRUE;
+} 
+
+void
+filter_entry_changed(GtkEntry* entry, gchar* arg1, gpointer data)
+{ 
+	gtk_toggle_tool_button_set_active(GTK_TOGGLE_TOOL_BUTTON(historyButton), TRUE);
+	gtk_tree_model_filter_refilter(GTK_TREE_MODEL_FILTER(histfilter));
+}
+
+void
+clear_filter_entry_if_default(GtkWidget* widget, gpointer user_data)
+{
+	if(g_ascii_strncasecmp(gtk_entry_get_text(GTK_ENTRY(filter_entry)), "Search", 6) == 0)
+		gtk_entry_set_text(GTK_ENTRY(filter_entry), "");
+	
+}
+
+void
+clear_filter_entry(GtkButton* button,
+		gpointer user_data)
+{
+	gtk_entry_set_text(GTK_ENTRY(filter_entry), "");
+}
+
+GtkWidget*
+create_filter_entry()
+{
+	GtkWidget* clear_button = gtk_button_new();
+	GtkWidget* ret = gtk_hbox_new(FALSE, 0);
+	GtkWidget* clear_img = gtk_image_new_from_stock(GTK_STOCK_CLEAR, GTK_ICON_SIZE_SMALL_TOOLBAR);
+
+	gtk_button_set_image(GTK_BUTTON(clear_button), clear_img);
+	g_signal_connect(GTK_BUTTON(clear_button), "clicked", G_CALLBACK(clear_filter_entry), NULL);
+
+	filter_entry = gtk_entry_new();
+	gtk_entry_set_text(GTK_ENTRY(filter_entry), "Search");	
+	g_signal_connect(GTK_ENTRY(filter_entry), "changed", G_CALLBACK(filter_entry_changed), NULL);
+	g_signal_connect(GTK_ENTRY(filter_entry), "grab-focus", G_CALLBACK(clear_filter_entry_if_default), NULL);
+
+	gtk_box_pack_start(GTK_BOX(ret), filter_entry, TRUE, TRUE, 0);
+	gtk_box_pack_start(GTK_BOX(ret), clear_button, FALSE, FALSE, 0);
+	return ret;
 }

sflphone-gtk/src/historyfilter.h

@@ -25,7 +25,10 @@
 
 
 
+GtkWidget * filter_entry;
+
 GtkTreeModel* create_filter(GtkTreeModel* child);
 
 gboolean is_visible(GtkTreeModel* model, GtkTreeIter* iter, gpointer data);
+GtkWidget* create_filter_entry();
 #endif

sflphone-gtk/src/mainwindow.c

@@ -131,8 +131,8 @@ create_main_window ()
     */
   g_signal_connect (G_OBJECT (window), "delete-event",
                     G_CALLBACK (on_delete), NULL);
-  g_signal_connect (G_OBJECT (window), "key-press-event",
-                    G_CALLBACK (on_key_released), NULL);
+  //g_signal_connect (G_OBJECT (window), "key-press-event",
+  //                  G_CALLBACK (on_key_released), NULL);
 
   /* Create an accel group for window's shortcuts */
   accelGroup = gtk_accel_group_new ();
@@ -146,7 +146,9 @@ create_main_window ()
   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
   
   widget = create_toolbar();
+
   gtk_box_pack_start (GTK_BOX (vbox), widget, FALSE /*expand*/, TRUE /*fill*/, 0 /*padding*/);
+  gtk_box_pack_start (GTK_BOX (vbox), create_filter_entry(), FALSE /*expand*/, FALSE /*fill*/,  0 /*padding*/);
   gtk_box_pack_start (GTK_BOX (vbox), current_calls->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
   gtk_box_pack_start (GTK_BOX (vbox), history->tree, TRUE /*expand*/, TRUE /*fill*/,  0 /*padding*/);
   
@@ -179,6 +181,7 @@ create_main_window ()
   gtk_widget_hide(history->tree);
   //gtk_widget_show(current_calls->tree);
   
+  gtk_tree_view_set_model(GTK_TREE_VIEW(history->view), GTK_TREE_MODEL(histfilter));
   // Configuration wizard 
   if (account_list_get_size() == 0)
   {