[Xfce4-commits] <midori:master> Hinted text in bookmarks, history and cookie manager

[Christian Dywan]

Updating branch refs/heads/master
         to 5bed5082ed6cfb66644dd2a60650d842cc8b4f37 (commit)
       from 92e21d50ad7b5b24bc07e425cb20eccb57e05826 (commit)

commit 5bed5082ed6cfb66644dd2a60650d842cc8b4f37
Author: Christian Dywan <christian at twotoasts.de>
Date:   Sat Jul 28 10:43:33 2012 +0200

    Hinted text in bookmarks, history and cookie manager
    
    Fixes: https://bugs.launchpad.net/midori/+bug/1026392

 extensions/cookie-manager/cookie-manager-page.c |   16 ++++------------
 panels/midori-bookmarks.c                       |    1 +
 panels/midori-history.c                         |    1 +
 3 files changed, 6 insertions(+), 12 deletions(-)

diff --git a/extensions/cookie-manager/cookie-manager-page.c b/extensions/cookie-manager/cookie-manager-page.c
index 422b3db..e880593 100644
--- a/extensions/cookie-manager/cookie-manager-page.c
+++ b/extensions/cookie-manager/cookie-manager-page.c
@@ -1095,7 +1095,6 @@ static void cookie_manager_page_init(CookieManagerPage *self)
 	GtkWidget *desc_swin;
 	GtkWidget *paned;
 	GtkWidget *filter_hbox;
-	GtkWidget *filter_label;
 	GtkWidget *treeview;
 	CookieManagerPagePrivate *priv;
 
@@ -1131,25 +1130,18 @@ static void cookie_manager_page_init(CookieManagerPage *self)
 	gtk_container_add(GTK_CONTAINER(tree_swin), treeview);
 	gtk_widget_show(tree_swin);
 
-	filter_label = gtk_label_new(_("Filter:"));
-	gtk_widget_show(filter_label);
-
 	priv->filter_entry = gtk_icon_entry_new();
-	gtk_widget_set_tooltip_text(priv->filter_entry,
-		_("Enter a filter string to show only cookies whose name or domain "
-		  "field match the entered filter"));
+	gtk_entry_set_placeholder_text (GTK_ENTRY (priv->filter_entry), _("Search Cookies by Name or Domain"));
+	gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->filter_entry),
+		GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
+	sokoke_entry_set_clear_button_visible (GTK_ENTRY (priv->filter_entry), TRUE);
 	gtk_widget_show(priv->filter_entry);
-	gtk_icon_entry_set_icon_from_stock(GTK_ICON_ENTRY(priv->filter_entry),
-		GTK_ICON_ENTRY_SECONDARY, GTK_STOCK_CLEAR);
-	gtk_icon_entry_set_icon_highlight(GTK_ICON_ENTRY (priv->filter_entry),
-		GTK_ICON_ENTRY_SECONDARY, TRUE);
 	g_signal_connect(priv->filter_entry, "icon-release",
 		G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL);
 	g_signal_connect(priv->filter_entry, "changed", G_CALLBACK(cm_filter_entry_changed_cb), self);
 	g_signal_connect(priv->filter_entry, "activate", G_CALLBACK(cm_filter_entry_changed_cb), self);
 
 	filter_hbox = gtk_hbox_new(FALSE, 0);
-	gtk_box_pack_start(GTK_BOX(filter_hbox), filter_label, FALSE, FALSE, 3);
 	gtk_box_pack_start(GTK_BOX(filter_hbox), priv->filter_entry, TRUE, TRUE, 3);
 	gtk_widget_show(filter_hbox);
 
diff --git a/panels/midori-bookmarks.c b/panels/midori-bookmarks.c
index 2c9213e..01da746 100644
--- a/panels/midori-bookmarks.c
+++ b/panels/midori-bookmarks.c
@@ -1027,6 +1027,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
 
     /* Create the filter entry */
     entry = gtk_icon_entry_new ();
+    gtk_entry_set_placeholder_text (GTK_ENTRY (entry), _("Search Bookmarks"));
     gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
                                         GTK_ICON_ENTRY_PRIMARY,
                                         GTK_STOCK_FIND);
diff --git a/panels/midori-history.c b/panels/midori-history.c
index d478971..50d09a1 100644
--- a/panels/midori-history.c
+++ b/panels/midori-history.c
@@ -998,6 +998,7 @@ midori_history_init (MidoriHistory* history)
 
     /* Create the filter entry */
     entry = gtk_icon_entry_new ();
+    gtk_entry_set_placeholder_text (GTK_ENTRY (entry), _("Search History"));
     gtk_icon_entry_set_icon_from_stock (GTK_ICON_ENTRY (entry),
                                         GTK_ICON_ENTRY_PRIMARY,
                                         GTK_STOCK_FIND);