Philipp Hörist pushed to branch master at gajim / gajim
Commits:
-
2013e4d2
by Philipp Hörist at 2019-08-03T11:41:57Z
-
32b7b9db
by Philipp Hörist at 2019-08-03T11:45:28Z
-
40b0b524
by Philipp Hörist at 2019-08-03T13:48:51Z
3 changed files:
Changes:
| ... | ... | @@ -58,7 +58,7 @@ |
| 58 | 58 |
<object class="GtkImage">
|
| 59 | 59 |
<property name="visible">True</property>
|
| 60 | 60 |
<property name="can_focus">False</property>
|
| 61 |
- <property name="icon_name">content-loading-symbolic</property>
|
|
| 61 |
+ <property name="icon_name">feather-globe-symbolic</property>
|
|
| 62 | 62 |
</object>
|
| 63 | 63 |
</child>
|
| 64 | 64 |
</object>
|
| ... | ... | @@ -315,6 +315,7 @@ |
| 315 | 315 |
<property name="headers_visible">False</property>
|
| 316 | 316 |
<property name="enable_search">False</property>
|
| 317 | 317 |
<property name="show_expanders">False</property>
|
| 318 |
+ <signal name="row-activated" handler="_on_select_clicked" swapped="no"/>
|
|
| 318 | 319 |
<child internal-child="selection">
|
| 319 | 320 |
<object class="GtkTreeSelection"/>
|
| 320 | 321 |
</child>
|
| ... | ... | @@ -241,6 +241,7 @@ button.flat.link { padding: 0; border: 0; } |
| 241 | 241 |
.success-color { color: @success_color; }
|
| 242 | 242 |
.error-color { color: @error_color; }
|
| 243 | 243 |
.warning-color { color: @warning_color; }
|
| 244 |
+.selected-color { color: @theme_selected_bg_color; }
|
|
| 244 | 245 |
|
| 245 | 246 |
/*Encryption*/
|
| 246 | 247 |
.encrypted-color { color: rgb(75, 181, 67) }
|
| ... | ... | @@ -310,7 +310,7 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 310 | 310 |
def _on_back_clicked(self, _button=None):
|
| 311 | 311 |
self._ui.stack.set_visible_child_name('search')
|
| 312 | 312 |
|
| 313 |
- def _on_select_clicked(self, _button=None):
|
|
| 313 |
+ def _on_select_clicked(self, *args):
|
|
| 314 | 314 |
model, iter_ = self._ui.account_view.get_selection().get_selected()
|
| 315 | 315 |
if iter_ is not None:
|
| 316 | 316 |
account = model[iter_][1]
|
| ... | ... | @@ -346,11 +346,14 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 346 | 346 |
def _on_global_search_toggle(self, button):
|
| 347 | 347 |
self._ui.search_entry.set_text('')
|
| 348 | 348 |
self._ui.search_entry.grab_focus()
|
| 349 |
+ image_style_context = button.get_children()[0].get_style_context()
|
|
| 349 | 350 |
if button.get_active():
|
| 351 |
+ image_style_context.add_class('selected-color')
|
|
| 350 | 352 |
self._set_listbox(self._global_search_listbox)
|
| 351 | 353 |
self._remove_new_jid_row()
|
| 352 | 354 |
self._ui.listbox.invalidate_filter()
|
| 353 | 355 |
else:
|
| 356 |
+ image_style_context.remove_class('selected-color')
|
|
| 354 | 357 |
self._set_listbox(self._ui.listbox)
|
| 355 | 358 |
self._global_search_listbox.remove_all()
|
| 356 | 359 |
|
| ... | ... | @@ -541,7 +544,7 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 541 | 544 |
items_per_page=result.max,
|
| 542 | 545 |
after=result.last,
|
| 543 | 546 |
callback=self._on_search_result,
|
| 544 |
- user_data=con)
|
|
| 547 |
+ user_data=(con, False))
|
|
| 545 | 548 |
|
| 546 | 549 |
def _continue_http_search(self, result, con):
|
| 547 | 550 |
con.get_module('Muclumbus').set_http_search(
|
| ... | ... | @@ -549,7 +552,7 @@ class StartChatDialog(Gtk.ApplicationWindow): |
| 549 | 552 |
self._keywords,
|
| 550 | 553 |
after=result.last,
|
| 551 | 554 |
callback=self._on_search_result,
|
| 552 |
- user_data=con)
|
|
| 555 |
+ user_data=(con, True))
|
|
| 553 | 556 |
|
| 554 | 557 |
def _destroy(self, *args):
|
| 555 | 558 |
self._destroyed = True
|