debian/midori
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Hinted text in bookmarks, history and cookie manager

Browse source 
Fixes: https://bugs.launchpad.net/midori/+bug/1026392
This commit is contained in:
Christian Dywan 2012-07-28 10:43:33 +02:00
parent 92e21d50ad
commit 5bed5082ed
3 changed files with 6 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

16
extensions/cookie-manager/cookie-manager-page.c
View file

@ -1095,7 +1095,6 @@ static void cookie_manager_page_init(CookieManagerPage *self)
GtkWidget *desc_swin; GtkWidget *desc_swin;
GtkWidget *paned; GtkWidget *paned;
GtkWidget *filter_hbox; GtkWidget *filter_hbox;
GtkWidget *filter_label;
GtkWidget *treeview; GtkWidget *treeview;
CookieManagerPagePrivate *priv; CookieManagerPagePrivate *priv;
@ -1131,25 +1130,18 @@ static void cookie_manager_page_init(CookieManagerPage *self)
gtk_container_add(GTK_CONTAINER(tree_swin), treeview); gtk_container_add(GTK_CONTAINER(tree_swin), treeview);
gtk_widget_show(tree_swin); gtk_widget_show(tree_swin);
filter_label = gtk_label_new(_("Filter:"));
gtk_widget_show(filter_label);
priv->filter_entry = gtk_icon_entry_new(); priv->filter_entry = gtk_icon_entry_new();
gtk_widget_set_tooltip_text(priv->filter_entry, gtk_entry_set_placeholder_text (GTK_ENTRY (priv->filter_entry), _("Search Cookies by Name or Domain"));
_("Enter a filter string to show only cookies whose name or domain " gtk_entry_set_icon_from_stock (GTK_ENTRY (priv->filter_entry),
"field match the entered filter")); 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_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_signal_connect(priv->filter_entry, "icon-release",
G_CALLBACK(cm_filter_entry_clear_icon_released_cb), NULL); 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, "changed", G_CALLBACK(cm_filter_entry_changed_cb), self);
g_signal_connect(priv->filter_entry, "activate", 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); 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_box_pack_start(GTK_BOX(filter_hbox), priv->filter_entry, TRUE, TRUE, 3);
gtk_widget_show(filter_hbox); gtk_widget_show(filter_hbox);

1
panels/midori-bookmarks.c
View file

@ -1027,6 +1027,7 @@ midori_bookmarks_init (MidoriBookmarks* bookmarks)
/* Create the filter entry */ /* Create the filter entry */
entry = gtk_icon_entry_new (); 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_set_icon_from_stock (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, GTK_ICON_ENTRY_PRIMARY,
GTK_STOCK_FIND); GTK_STOCK_FIND);

1
panels/midori-history.c
View file

@ -998,6 +998,7 @@ midori_history_init (MidoriHistory* history)
/* Create the filter entry */ /* Create the filter entry */
entry = gtk_icon_entry_new (); 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_set_icon_from_stock (GTK_ICON_ENTRY (entry),
GTK_ICON_ENTRY_PRIMARY, GTK_ICON_ENTRY_PRIMARY,
GTK_STOCK_FIND); GTK_STOCK_FIND);