Philipp Hörist pushed to branch master at gajim / gajim

Commits: 2013e4d2 by Philipp Hörist at 2019-08-03T11:41:57Z StartChat: Use better icon for muclumbus search

- - - - - 32b7b9db by Philipp Hörist at 2019-08-03T11:45:28Z StartChat: Select account on double click

- - - - - 40b0b524 by Philipp Hörist at 2019-08-03T13:48:51Z StartChat: Fix multi page results when searching global

- - - - -

3 changed files:

- gajim/data/gui/start_chat_dialog.ui - gajim/data/style/gajim.css - gajim/gtk/start_chat.py

Changes:

===================================== gajim/data/gui/start_chat_dialog.ui ===================================== @@ -58,7 +58,7 @@ <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="icon_name">content-loading-symbolic</property> + <property name="icon_name">feather-globe-symbolic</property> </object> </child> </object> @@ -315,6 +315,7 @@ <property name="headers_visible">False</property> <property name="enable_search">False</property> <property name="show_expanders">False</property> + <signal name="row-activated" handler="_on_select_clicked" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child>

===================================== gajim/data/style/gajim.css ===================================== @@ -241,6 +241,7 @@ button.flat.link { padding: 0; border: 0; } .success-color { color: @success_color; } .error-color { color: @error_color; } .warning-color { color: @warning_color; } +.selected-color { color: @theme_selected_bg_color; }

/*Encryption*/ .encrypted-color { color: rgb(75, 181, 67) }

===================================== gajim/gtk/start_chat.py ===================================== @@ -310,7 +310,7 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_back_clicked(self, _button=None): self._ui.stack.set_visible_child_name('search')

- def _on_select_clicked(self, _button=None): + def _on_select_clicked(self, *args): model, iter_ = self._ui.account_view.get_selection().get_selected() if iter_ is not None: account = model[iter_][1] @@ -346,11 +346,14 @@ class StartChatDialog(Gtk.ApplicationWindow): def _on_global_search_toggle(self, button): self._ui.search_entry.set_text('') self._ui.search_entry.grab_focus() + image_style_context = button.get_children()[0].get_style_context() if button.get_active(): + image_style_context.add_class('selected-color') self._set_listbox(self._global_search_listbox) self._remove_new_jid_row() self._ui.listbox.invalidate_filter() else: + image_style_context.remove_class('selected-color') self._set_listbox(self._ui.listbox) self._global_search_listbox.remove_all()

@@ -541,7 +544,7 @@ class StartChatDialog(Gtk.ApplicationWindow): items_per_page=result.max, after=result.last, callback=self._on_search_result, - user_data=con) + user_data=(con, False))

def _continue_http_search(self, result, con): con.get_module('Muclumbus').set_http_search( @@ -549,7 +552,7 @@ class StartChatDialog(Gtk.ApplicationWindow): self._keywords, after=result.last, callback=self._on_search_result, - user_data=con) + user_data=(con, True))

def _destroy(self, *args): self._destroyed = True

View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6a11667681b40f09eedecbe0cff3b5c913...