Daniel Brötzmann pushed to branch master at gajim / gajim
Commits:
06ce1f4c by wurstsalat at 2022-02-25T12:47:23+01:00
GroupchatJoin: Fix spinner size
- - - - -
88de7334 by wurstsalat at 2022-02-25T13:08:39+01:00
StartChat: Validate search text
- - - - -
2 changed files:
- gajim/gtk/groupchat_join.py
- gajim/gtk/start_chat.py
Changes:
=====================================
gajim/gtk/groupchat_join.py
=====================================
@@ -196,6 +196,7 @@ def __init__(self) -> None:
self.set_vexpand(True)
self.set_homogeneous(True)
self._spinner = Gtk.Spinner()
+ self._spinner.set_halign(Gtk.Align.CENTER)
self.add(self._spinner)
self.show_all()
=====================================
gajim/gtk/start_chat.py
=====================================
@@ -537,11 +537,24 @@ def _on_global_search_toggle(self, button:
Gtk.ToggleButton) -> None:
self._set_listbox(self._ui.listbox)
self._global_search_listbox.remove_all()
- def _on_search_changed(self, entry: Gtk.SearchEntry) -> None:
+ def _on_search_changed(self, search_entry: Gtk.SearchEntry) -> None:
+ self._show_search_entry_error(False)
+
if self._global_search_active():
return
- search_text = entry.get_text()
+ search_text = search_entry.get_text()
+ if not search_text:
+ self._remove_new_jid_row()
+ return
+
+ try:
+ validate_jid(search_text)
+ except ValueError:
+ self._show_search_entry_error(True)
+ self._remove_new_jid_row()
+ return
+
if '@' in search_text:
self._add_new_jid_row()
self._update_new_jid_rows(search_text)
@@ -549,6 +562,15 @@ def _on_search_changed(self, entry: Gtk.SearchEntry) ->
None:
self._remove_new_jid_row()
self._ui.listbox.invalidate_filter()
+ def _show_search_entry_error(self, state: bool):
+ icon_name = 'dialog-warning-symbolic' if state else None
+ self._ui.search_entry.set_icon_from_icon_name(
+ Gtk.EntryIconPosition.SECONDARY,
+ icon_name)
+ self._ui.search_entry.set_icon_tooltip_text(
+ Gtk.EntryIconPosition.SECONDARY,
+ _('Invalid Address'))
+
def _add_new_jid_row(self) -> None:
if self.new_contact_row_visible:
return
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/38635ea765b5766d33a789909e38b1a5cf7fa2b1...88de73344129085e8e98b622d48840de022d5983
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/compare/38635ea765b5766d33a789909e38b1a5cf7fa2b1...88de73344129085e8e98b622d48840de022d5983
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
