Daniel Brötzmann pushed to branch gtk4 at gajim / gajim
Commits:
584c7380 by wurstsalat at 2024-10-20T23:00:25+02:00
refactor: RosterItemExchange: Initial fixes
- - - - -
2 changed files:
- gajim/data/gui/roster_item_exchange.ui
- gajim/gtk/roster_item_exchange.py
Changes:
=====================================
gajim/data/gui/roster_item_exchange.ui
=====================================
@@ -103,7 +103,6 @@
<property name="focusable">1</property>
<property name="receives_default">1</property>
<property name="use_underline">1</property>
- <signal name="clicked" handler="_on_cancel_button_clicked"
swapped="no"/>
</object>
<packing>
<property name="expand">False</property>
@@ -116,7 +115,6 @@
<property name="label" translatable="1">OK</property>
<property name="focusable">1</property>
<property name="receives_default">1</property>
- <signal name="clicked" handler="_on_accept_button_clicked"
swapped="no"/>
<style>
<class name="suggested-action"/>
</style>
=====================================
gajim/gtk/roster_item_exchange.py
=====================================
@@ -43,9 +43,12 @@ def __init__(
self._exchange_list = exchange_list
self._jid_from = jid_from
- self._ui = get_builder('roster_item_exchange.ui', self)
+ self._ui = get_builder('roster_item_exchange.ui')
self.set_child(self._ui.roster_item_exchange)
+ self._connect(self._ui.cancel_button, 'clicked',
self._on_cancel_button_clicked)
+ self._connect(self._ui.accept_button, 'clicked',
self._on_accept_button_clicked)
+
# Set label depending on action
contact = self._client.get_module('Contacts').get_contact(jid_from)
assert isinstance(
@@ -80,7 +83,7 @@ def __init__(
# Columns
renderer1 = Gtk.CellRendererToggle()
renderer1.set_property('activatable', True)
- renderer1.connect('toggled', self._on_toggled)
+ self._connect(renderer1, 'toggled', self._on_toggled)
title = ''
if self._action == 'add':
title = _('Add')
@@ -112,6 +115,9 @@ def __init__(
elif action == 'delete':
self._delete()
+ def _cleanup(self) -> None:
+ pass
+
def _on_toggled(self, cell: Gtk.CellRendererToggle, path: str) -> None:
model = self._ui.items_list_treeview.get_model()
assert isinstance(model, Gtk.ListStore)
@@ -125,7 +131,6 @@ def _add(self) -> None:
name = self._exchange_list[jid][0]
groups = ', '.join(self._exchange_list[jid][1])
if not contact.is_in_roster:
- self.show_all()
assert isinstance(self._model, Gtk.ListStore)
iter_ = self._model.append()
self._model.set(iter_,
@@ -150,7 +155,6 @@ def _modify(self) -> None:
if group not in contact.groups:
is_right = False
if not is_right and contact.is_in_roster:
- self.show_all()
assert isinstance(self._model, Gtk.ListStore)
iter_ = self._model.append()
self._model.set(iter_,
@@ -168,7 +172,6 @@ def _delete(self) -> None:
name = self._exchange_list[jid][0]
groups = ', '.join(self._exchange_list[jid][1])
if contact.is_in_roster:
- self.show_all()
assert isinstance(self._model, Gtk.ListStore)
iter_ = self._model.append()
self._model.set(iter_,
@@ -250,7 +253,7 @@ def _on_accept_button_clicked(self, _button: Gtk.Button) ->
None:
'Removed %(count)s contacts',
count) % {'count': count}
)
- self.destroy()
+ self.close()
def _on_cancel_button_clicked(self, _button: Gtk.Button) -> None:
- self.destroy()
+ self.close()
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/584c7380434cf9360bdbddd09e1979fcba5100c0
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/584c7380434cf9360bdbddd09e1979fcba5100c0
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list -- [email protected]
To unsubscribe send an email to [email protected]
