diff options
| author | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-22 19:02:42 +0800 |
|---|---|---|
| committer | Guillaume Desmottes <guillaume.desmottes@collabora.co.uk> | 2011-08-22 19:03:01 +0800 |
| commit | 4c534b01f55b25442d8399db4a610a3e1982daa9 (patch) | |
| tree | 509a90cdda87885d95cb194b2f6fa0d89a364152 | |
| parent | 0e13467ea1c89322c2eab94c230193d5163a4856 (diff) | |
| download | gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar.gz gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar.bz2 gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar.lz gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar.xz gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.tar.zst gsoc2013-empathy-4c534b01f55b25442d8399db4a610a3e1982daa9.zip | |
Move live search to top of Contact list
https://bugzilla.gnome.org/show_bug.cgi?id=656999
| -rw-r--r-- | src/empathy-main-window.c | 5 | ||||
| -rw-r--r-- | src/empathy-main-window.ui | 15 |
2 files changed, 18 insertions, 2 deletions
diff --git a/src/empathy-main-window.c b/src/empathy-main-window.c index 167e338d6..62089b8b2 100644 --- a/src/empathy-main-window.c +++ b/src/empathy-main-window.c @@ -2105,6 +2105,7 @@ empathy_main_window_init (EmpathyMainWindow *window) gchar *filename; GSList *l; GtkTreeModel *model; + GtkWidget *search_vbox; priv = window->priv = G_TYPE_INSTANCE_GET_PRIVATE (window, EMPATHY_TYPE_MAIN_WINDOW, EmpathyMainWindowPriv); @@ -2141,6 +2142,7 @@ empathy_main_window_init (EmpathyMainWindow *window) "no_entry_label", &priv->no_entry_label, "roster_scrolledwindow", &sw, "view_balance_show_in_roster", &priv->view_balance_show_in_roster, + "search_vbox", &search_vbox, NULL); g_free (filename); @@ -2280,8 +2282,9 @@ empathy_main_window_init (EmpathyMainWindow *window) GTK_WIDGET (priv->individual_view)); empathy_individual_view_set_live_search (priv->individual_view, EMPATHY_LIVE_SEARCH (priv->search_bar)); - gtk_box_pack_start (GTK_BOX (priv->main_vbox), priv->search_bar, + gtk_box_pack_start (GTK_BOX (search_vbox), priv->search_bar, FALSE, TRUE, 0); + g_signal_connect_swapped (window, "map", G_CALLBACK (gtk_widget_grab_focus), priv->individual_view); diff --git a/src/empathy-main-window.ui b/src/empathy-main-window.ui index b21a07bac..bab01c10e 100644 --- a/src/empathy-main-window.ui +++ b/src/empathy-main-window.ui @@ -364,6 +364,19 @@ </packing> </child> <child> + <object class="GtkVBox" id="search_vbox"> + <property name="visible">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> + <child> <object class="GtkNotebook" id="notebook"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -395,7 +408,7 @@ </child> </object> <packing> - <property name="position">5</property> + <property name="position">6</property> </packing> </child> </object> |