Ubuntu One Client

Merge lp:~rodrigo-moya/ubuntuone-client/sexy-search-entry into lp:ubuntuone-client

  1. sexy-search-entry
  2. Merge into trunk
Proposed by Rodrigo Moya
Status: Merged
Approved by: Roman Yepishev
Approved revision: 568
Merged at revision: 567
Proposed branch: lp:~rodrigo-moya/ubuntuone-client/sexy-search-entry
Merge into: lp:ubuntuone-client
Diff against target: 41 lines (+24/-1)
1 file modified
nautilus/u1-contacts-picker.c (+24/-1)
To merge this branch: bzr merge lp:~rodrigo-moya/ubuntuone-client/sexy-search-entry
Reviewer Review Type Date Requested Status
Roman Yepishev (community) Approve
Manuel de la Peña (community) Approve
Review via email: mp+29456@code.launchpad.net

Commit message

Use a sexier search entry for the contacts picker

Description of the change

Use a sexier search entry for the contacts picker

To post a comment you must log in.
Revision history for this message
Manuel de la Peña (mandel) wrote :

Looks good to me.

review: Approve
Revision history for this message
Roman Yepishev (rye) wrote :

Compiles and works great after I installed gobject-introspection

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'nautilus/u1-contacts-picker.c'
2--- nautilus/u1-contacts-picker.c 2010-06-02 14:41:49 +0000
3+++ nautilus/u1-contacts-picker.c 2010-07-08 13:36:15 +0000
4@@ -116,6 +116,15 @@
5 }
6
7 static void
8+entry_icon_pressed_cb (GtkEntry *entry, GtkEntryIconPosition icon_pos, GdkEventButton *event, gpointer user_data)
9+{
10+ U1ContactsPicker *picker = U1_CONTACTS_PICKER (user_data);
11+
12+ if (icon_pos == GTK_ENTRY_ICON_SECONDARY)
13+ gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), "");
14+}
15+
16+static void
17 add_contact_cb (GtkButton *button, gpointer user_data)
18 {
19 GtkWidget *dialog;
20@@ -152,7 +161,21 @@
21
22 /* Create the search area */
23 picker->priv->search_entry = gtk_entry_new ();
24- g_signal_connect (G_OBJECT (picker->priv->search_entry), "changed", G_CALLBACK (search_activated_cb), picker);
25+ gtk_entry_set_text (GTK_ENTRY (picker->priv->search_entry), _("Type here to search"));
26+ gtk_entry_set_icon_from_stock (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, GTK_STOCK_FIND);
27+ gtk_entry_set_icon_activatable (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_PRIMARY, FALSE);
28+ gtk_entry_set_icon_tooltip_text (GTK_ENTRY (picker->priv->search_entry),
29+ GTK_ENTRY_ICON_PRIMARY,
30+ _("Type here to search for contacts"));
31+ gtk_entry_set_icon_from_stock (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_SECONDARY, GTK_STOCK_CLEAR);
32+ gtk_entry_set_icon_activatable (GTK_ENTRY (picker->priv->search_entry), GTK_ENTRY_ICON_SECONDARY, TRUE);
33+ gtk_entry_set_icon_tooltip_text (GTK_ENTRY (picker->priv->search_entry),
34+ GTK_ENTRY_ICON_SECONDARY,
35+ _("Click here to clear the search field"));
36+ g_signal_connect (G_OBJECT (picker->priv->search_entry), "icon_press",
37+ G_CALLBACK (entry_icon_pressed_cb), picker);
38+ g_signal_connect (G_OBJECT (picker->priv->search_entry), "changed",
39+ G_CALLBACK (search_activated_cb), picker);
40 gtk_widget_show (picker->priv->search_entry);
41 gtk_table_attach (GTK_TABLE (table), picker->priv->search_entry, 0, 1, 0, 1, GTK_FILL, GTK_FILL, 3, 3);
42

Subscribers

People subscribed via source and target branches