Philipp Hörist pushed to branch master at gajim / gajim
Commits: 3cf19c3c by lovetox at 2020-12-28T22:12:13+01:00 Profile: Restore original VCard when pressing cancel
- - - - -
2 changed files:
- gajim/gtk/profile.py - gajim/gtk/vcard_grid.py
Changes:
===================================== gajim/gtk/profile.py ===================================== @@ -66,6 +66,7 @@ def __init__(self, account, *args):
self._avatar_selector = None self._current_avatar = None + self._current_vcard = None self._avatar_nick_public = None
# False - no change to avatar @@ -75,8 +76,8 @@ def __init__(self, account, *args):
self._ui.nickname_entry.set_text(app.nicks[account])
- self._profile = VCardGrid(self.account) - self._ui.profile_box.add(self._profile) + self._vcard_grid = VCardGrid(self.account) + self._ui.profile_box.add(self._vcard_grid)
self.add(self._ui.profile_stack) self.show_all() @@ -134,13 +135,13 @@ def _on_access_model_received(self, task):
def _on_vcard_received(self, task): try: - vcard = task.finish() + self._current_vcard = task.finish() except StanzaError as error: log.info('Error loading VCard: %s', error) - vcard = VCard() + self._current_vcard = VCard()
self._load_avatar() - self._profile.set_vcard(vcard) + self._vcard_grid.set_vcard(self._current_vcard.copy()) self._ui.profile_stack.set_visible_child_name('profile') self._ui.spinner.stop()
@@ -169,11 +170,11 @@ def _add_actions(self): def _on_action(self, action, _param): name = action.get_name() key = name.split('-')[1] - self._profile.add_new_property(key) + self._vcard_grid.add_new_property(key) GLib.idle_add(scroll_to_end, self._ui.scrolled)
def _on_edit_clicked(self, *args): - self._profile.set_editable(True) + self._vcard_grid.set_editable(True) self._ui.edit_button.hide() self._ui.add_entry_button.set_no_show_all(False) self._ui.add_entry_button.show_all() @@ -185,7 +186,7 @@ def _on_edit_clicked(self, *args): self._ui.privacy_button.show()
def _on_cancel_clicked(self, _widget): - self._profile.set_editable(False) + self._vcard_grid.set_editable(False) self._ui.edit_button.show() self._ui.add_entry_button.hide() self._ui.cancel_button.hide() @@ -196,6 +197,8 @@ def _on_cancel_clicked(self, _widget): self._ui.nickname_entry.set_sensitive(False) self._ui.avatar_image.set_from_surface(self._current_avatar) self._ui.nickname_entry.set_text(app.nicks[self.account]) + self._vcard_grid.clear() + self._vcard_grid.set_vcard(self._current_vcard.copy()) self._new_avatar = False
def _on_save_clicked(self, _widget): @@ -210,11 +213,14 @@ def _on_save_clicked(self, _widget): self._ui.privacy_button.hide() self._ui.nickname_entry.set_sensitive(False)
- self._profile.validate() + self._vcard_grid.validate() + + vcard = self._vcard_grid.get_vcard() + self._current_vcard = vcard.copy()
con = app.connections[self.account] con.get_module('VCard4').set_vcard( - self._profile.get_vcard(), + self._current_vcard, public=self._ui.vcard_access.get_active(), callback=self._on_save_finished)
@@ -302,6 +308,6 @@ def _on_save_finished(self, task): # TODO Handle error return
- self._profile.set_editable(False) + self._vcard_grid.set_editable(False) self._ui.profile_stack.set_visible_child_name('profile') self._ui.spinner.stop()
===================================== gajim/gtk/vcard_grid.py ===================================== @@ -180,7 +180,6 @@ def add_new_property(self, name): kwargs = DEFAULT_KWARGS[name] prop = self._vcard.add_property(name, **kwargs) self.add_property(prop, editable=True) - #GLib.idle_add(scroll_to_end, self.get_parent())
def add_property(self, prop, editable=False): prop_class = self._callbacks.get(prop.name) @@ -198,6 +197,14 @@ def remove_property(self, prop): self._props.remove(prop) self._vcard.remove_property(prop.get_base_property())
+ def clear(self): + self._vcard = None + self._row_count = 0 + for prop in list(self._props): + self.remove_row(prop.row_number) + + self._props = [] +
class DescriptionLabel(Gtk.Label): def __init__(self, value):
View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3cf19c3c7b7691da4d121f94133345504...
-
Philipp Hörist