Commits September 2021

commits@gajim.org

1 participants
49 discussions

[Git][gajim/python-nbxmpp][master] AdHoc: Make parsing actions more robust
by Philipp Hörist (＠lovetox) 11 Sep '21

11 Sep '21

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7373fe86 by lovetox at 2021-09-11T13:25:53+02:00 AdHoc: Make parsing actions more robust - Ignore unknown actions instead of failing - Don’t fail on duplicated actions - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -151,27 +151,14 @@ def _parse_notes(command): def _parse_actions(command): if command.getAttr('status') != 'executing': - return [], None + return set(), None actions_node = command.getTag('actions') if actions_node is None: # If there is no <actions/> element, # the user-agent can use a single-stage dialog or view. # The action "execute" is equivalent to the action "complete". - return [AdHocAction.CANCEL, AdHocAction.COMPLETE], AdHocAction.COMPLETE - - actions = [] - for action in actions_node.getChildren(): - name = action.getName() - if name not in ('prev', 'next', 'complete'): - raise ValueError('invalid action name: %s' % name) - actions.append(AdHocAction(name)) - - if not actions: - raise ValueError('actions element without actions') - - # The action "cancel" is always allowed. - actions.append(AdHocAction.CANCEL) + return {AdHocAction.CANCEL, AdHocAction.COMPLETE}, AdHocAction.COMPLETE default = actions_node.getAttr('execute') if default is None: @@ -183,13 +170,31 @@ def _parse_actions(command): default = AdHocAction(default) + # We use a set because it cannot contain duplicates + actions = set() + for action in actions_node.getChildren(): + name = action.getName() + if name == 'execute': + actions.add(default) + + if name in ('prev', 'next', 'complete'): + actions.add(AdHocAction(name)) + + if not actions: + raise ValueError('actions element without actions') + + # The action "cancel" is always allowed. + actions.add(AdHocAction.CANCEL) + # A form which has an <actions/> element and an "execute" attribute # which evaluates (taking the default into account if absent) to an # action which is not allowed is therefore invalid. if default not in actions: # Some implementations don’t respect this rule. # Take the first action so we don’t fail here. - default = actions[0] + for act in actions: + default = act + break return actions, default View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7373fe86752471d8ed25b0d0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/7373fe86752471d8ed25b0d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Improve gateway name/type handling
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fa4ecf3d by wurstsalat at 2021-09-11T13:13:30+02:00 AddContact: Improve gateway name/type handling - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -392,22 +392,31 @@ def prepare(self, account, result): icon_name = 'gajim-agent-irc' self._ui.gateway_image.set_from_icon_name( icon_name, Gtk.IconSize.DIALOG) - self._ui.gateway_label.set_text(_('%(name)s (%(type)s)') % { - 'name': result.gateway_name, - 'type': result.gateway_type.upper()}) + gateway_name = result.gateway_name or self._result.jid + if not result.gateway_type: + self._ui.gateway_label.set_text(gateway_name) + else: + self._ui.gateway_label.set_text( + f'{gateway_name} ({result.gateway_type.upper()})') else: + identity_name = '' + identity_type = '' for identity in result.identities: - identity_name = identity.name - identity_type = identity.type if identity.type == 'sms': icon_name = 'gajim-agent-sms' + identity_name = identity.name or self._result.jid + identity_type = identity.type if identity.type == 'irc': icon_name = 'gajim-agent-irc' + identity_name = identity.name or self._result.jid + identity_type = identity.type self._ui.gateway_image.set_from_icon_name( icon_name, Gtk.IconSize.DIALOG) - self._ui.gateway_label.set_text(_('%(name)s (%(type)s)') % { - 'name': identity_name, - 'type': identity_type.upper()}) + if not identity_type: + self._ui.gateway_label.set_text(identity_name) + else: + self._ui.gateway_label.set_text( + f'{identity_name} ({identity_type.upper()})') if result.supports(Namespace.REGISTER): self._ui.register_button.set_sensitive(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa4ecf3d451514d58b9c0107778c34d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/fa4ecf3d451514d58b9c0107778c34d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Consider other services
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c44cfda5 by wurstsalat at 2021-09-11T12:41:55+02:00 AddContact: Consider other services - - - - - 2 changed files: - gajim/data/gui/add_contact.ui - gajim/gtk/add_contact.py Changes: ===================================== gajim/data/gui/add_contact.ui ===================================== @@ -289,6 +289,8 @@ <property name="visible">True</property> <property name="can-focus">False</property> <property name="wrap">True</property> + <property name="max-width-chars">50</property> + <property name="xalign">0</property> <style> <class name="bold16"/> </style> @@ -326,8 +328,8 @@ </packing> </child> <child> - <object class="GtkButton" id="command_button"> - <property name="label" translatable="yes">Command</property> + <object class="GtkButton" id="commands_button"> + <property name="label" translatable="yes">Show Commands</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> ===================================== gajim/gtk/add_contact.py ===================================== @@ -149,7 +149,17 @@ def _process_info(self, account, result): if result.is_muc: for identity in result.identities: + if identity.type == 'text' and result.jid.is_domain: + # It's a group chat component advertising + # category 'conference' + self.get_page('error').set_text( + _('This address does not seem to offer any gateway ' + 'service.')) + self.show_page('error') + return + if identity.type == 'irc' and result.jid.is_domain: + # It's an IRC gateway advertising category 'conference' self.get_page('gateway').prepare(account, result) self.show_page( 'gateway', Gtk.StackTransitionType.SLIDE_LEFT) @@ -167,6 +177,11 @@ def _process_info(self, account, result): if result.has_category('client'): self.get_page('contact').prepare(account, result) self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) + return + + self.get_page('error').set_text( + _('This address does not seem to offer any gateway service.')) + self.show_page('error') class Address(Page): @@ -355,7 +370,7 @@ def __init__(self): self.add(self._ui.gateway_box) self._ui.register_button.connect('clicked', self._on_register_clicked) - self._ui.command_button.connect('clicked', self._on_command_clicked) + self._ui.commands_button.connect('clicked', self._on_command_clicked) self.show_all() @@ -403,11 +418,11 @@ def prepare(self, account, result): _('This gateway does not support direct registering.')) if result.supports(Namespace.COMMANDS): - self._ui.command_button.set_sensitive(True) - self._ui.command_button.set_tooltip_text('') + self._ui.commands_button.set_sensitive(True) + self._ui.commands_button.set_tooltip_text('') else: - self._ui.command_button.set_sensitive(False) - self._ui.command_button.set_tooltip_text( + self._ui.commands_button.set_sensitive(False) + self._ui.commands_button.set_tooltip_text( _('This gateway does not support Ad-Hoc Commands.')) def _on_register_clicked(self, _button): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c44cfda5eab2332f1570c7629e4844d8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c44cfda5eab2332f1570c7629e4844d8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ServiceRegistration: Add line wrap for error text
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 397b68fc by wurstsalat at 2021-09-11T11:31:07+02:00 ServiceRegistration: Add line wrap for error text - - - - - 1 changed file: - gajim/gtk/service_registration.py Changes: ===================================== gajim/gtk/service_registration.py ===================================== @@ -218,8 +218,9 @@ def __init__(self): icon.get_style_context().add_class('error-color') icon.set_valign(Gtk.Align.END) self._label = Gtk.Label() - self._label.get_style_context().add_class('bold16') self._label.set_valign(Gtk.Align.START) + self._label.set_max_width_chars(50) + self._label.set_line_wrap(True) self.add(icon) self.add(self._label) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/397b68fc7f978066a20f1b310b711f95… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/397b68fc7f978066a20f1b310b711f95… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GroupChatInfoScrolled: Style improvements
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: eac00036 by wurstsalat at 2021-09-11T11:20:58+02:00 GroupChatInfoScrolled: Style improvements - - - - - 6f2ec996 by wurstsalat at 2021-09-11T11:22:38+02:00 AddContact: Improve gateway register/command flow - - - - - 3 changed files: - gajim/data/gui/groupchat_info_scrolled.ui - gajim/gtk/add_contact.py - gajim/gtk/groupchat_info.py Changes: ===================================== gajim/data/gui/groupchat_info_scrolled.ui ===================================== @@ -1,17 +1,18 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> +  <object class="GtkGrid" id="info_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel" id="address_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Address</property> <style> @@ -19,14 +20,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="description_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Description</property> @@ -35,14 +36,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="subject_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Topic</property> @@ -51,14 +52,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> + <property name="left-attach">0</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="author_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Author</property> @@ -67,55 +68,55 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> + <property name="left-attach">0</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="description"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> + <property name="wrap-mode">word-char</property> <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> + <property name="left-attach">1</property> + <property name="top-attach">3</property> </packing> </child> <child> <object class="GtkLabel" id="author"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> + <property name="left-attach">1</property> + <property name="top-attach">5</property> </packing> </child> <child> <object class="GtkLabel" id="users"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> + <property name="left-attach">1</property> + <property name="top-attach">9</property> </packing> </child> <child> <object class="GtkLabel" id="contact_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Contact</property> @@ -124,14 +125,14 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> + <property name="left-attach">0</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="logs_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">end</property> <property name="valign">start</property> <property name="label" translatable="yes">Discussion Logs</property> @@ -140,28 +141,28 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> + <property name="left-attach">0</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkLabel" id="lang"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> + <property name="left-attach">1</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkLinkButton" id="logs"> <property name="label" translatable="yes">button</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> <property name="relief">none</property> @@ -171,48 +172,48 @@ </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> + <property name="left-attach">1</property> + <property name="top-attach">6</property> </packing> </child> <child> <object class="GtkImage" id="users_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Participants</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Participants</property> <property name="halign">end</property> <property name="valign">center</property> - <property name="icon_name">system-users-symbolic</property> + <property name="icon-name">system-users-symbolic</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">9</property> + <property name="left-attach">0</property> + <property name="top-attach">9</property> </packing> </child> <child> <object class="GtkImage" id="lang_image"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Group Chat Language</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Group Chat Language</property> <property name="halign">end</property> <property name="valign">center</property> - <property name="icon_name">preferences-desktop-locale-symbolic</property> + <property name="icon-name">preferences-desktop-locale-symbolic</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> + <property name="left-attach">0</property> + <property name="top-attach">8</property> </packing> </child> <child> <object class="GtkBox" id="contact_box"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> <property name="orientation">vertical</property> @@ -222,72 +223,75 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> + <property name="left-attach">1</property> + <property name="top-attach">7</property> </packing> </child> <child> <object class="GtkLabel" id="subject"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">start</property> <property name="valign">start</property> - <property name="use_markup">True</property> + <property name="use-markup">True</property> <property name="wrap">True</property> - <property name="wrap_mode">word-char</property> + <property name="wrap-mode">word-char</property> <property name="selectable">True</property> <property name="xalign">0</property> <signal name="activate-link" handler="_on_activate_subject_link" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> + <property name="left-attach">1</property> + <property name="top-attach">4</property> </packing> </child> <child> <object class="GtkLabel" id="name"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> <property name="halign">center</property> <property name="valign">start</property> <property name="selectable">True</property> <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="max_width_chars">40</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">40</property> <style> <class name="large-header"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkImage" id="avatar_image"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">12</property> + <property name="can-focus">False</property> + <property name="margin-bottom">12</property> <property name="icon_size">6</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> <property name="width">2</property> </packing> </child> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">12</property> <child> <object class="GtkLabel" id="address"> + <property name="width-request">240</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">False</property> @@ -298,19 +302,22 @@ <child> <object class="GtkButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Copy Address</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Copy Address</property> <property name="halign">start</property> <property name="valign">start</property> <signal name="clicked" handler="_on_copy_address" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-copy-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-copy-symbolic</property> </object> </child> + <style> + <class name="flat"/> + </style> </object> <packing> <property name="expand">False</property> @@ -320,9 +327,39 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> </interface> ===================================== gajim/gtk/add_contact.py ===================================== @@ -16,6 +16,7 @@ from gi.repository import Gtk +from nbxmpp import Namespace from nbxmpp.errors import is_error from gajim.common import app @@ -393,6 +394,22 @@ def prepare(self, account, result): 'name': identity_name, 'type': identity_type.upper()}) + if result.supports(Namespace.REGISTER): + self._ui.register_button.set_sensitive(True) + self._ui.register_button.set_tooltip_text('') + else: + self._ui.register_button.set_sensitive(False) + self._ui.register_button.set_tooltip_text( + _('This gateway does not support direct registering.')) + + if result.supports(Namespace.COMMANDS): + self._ui.command_button.set_sensitive(True) + self._ui.command_button.set_tooltip_text('') + else: + self._ui.command_button.set_sensitive(False) + self._ui.command_button.set_tooltip_text( + _('This gateway does not support Ad-Hoc Commands.')) + def _on_register_clicked(self, _button): ServiceRegistration(self._account, self._result.jid) ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -177,6 +177,7 @@ def set_from_disco_info(self, info): # Set address self._ui.address.set_text(str(info.jid)) + self._ui.address.set_tooltip_text(str(info.jid)) if self._minimal: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/84b7486d8699fb95bd34f9dfc110933… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/84b7486d8699fb95bd34f9dfc110933… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Consider subscription-required
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 84b7486d by wurstsalat at 2021-09-11T02:18:54+02:00 AddContact: Consider subscription-required - - - - - 1 changed file: - gajim/gtk/add_contact.py Changes: ===================================== gajim/gtk/add_contact.py ===================================== @@ -130,7 +130,11 @@ def _process_error(self, account, result): log.debug('Error received: %s', result) self._result = result - if result.condition == 'service-unavailable': + contact_conditions = [ + 'service-unavailable', # Prosody + 'subscription-required' # ejabberd + ] + if result.condition in contact_conditions: # It seems to be a contact self.get_page('contact').prepare(account, result) self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84b7486d8699fb95bd34f9dfc1109335… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84b7486d8699fb95bd34f9dfc1109335… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] AddContact: Use assistant
by Daniel Brötzmann (＠wurstsalat) 11 Sep '21

11 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6b18f004 by wurstsalat at 2021-09-11T02:13:55+02:00 AddContact: Use assistant - - - - - 3 changed files: - + gajim/data/gui/add_contact.ui - − gajim/data/gui/add_new_contact_window.ui - gajim/gtk/add_contact.py Changes: ===================================== gajim/data/gui/add_contact.ui ===================================== @@ -0,0 +1,349 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkBox" id="address_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">12</property> + <property name="label" translatable="yes">Add Contact</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox" id="account_box"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">center</property> + <property name="margin-bottom">12</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Please choose an account</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="model">account_liststore</property> + <property name="id-column">0</property> + <child> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Please enter an XMPP address</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="address_entry"> + <property name="width-request">250</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activates-default">True</property> + <property name="placeholder-text" translatable="yes">XMPP Address…</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + </object> +  + <object class="GtkGrid" id="contact_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">12</property> + <property name="label" translatable="yes">Add Contact</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="width">2</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Publish Status</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="status_switch"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="halign">start</property> + <property name="active">True</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">4</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Group</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="group_combo"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="has-entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can-focus">True</property> + <property name="placeholder-text" translatable="yes">Choose a group…</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Message</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="message_entry"> + <property name="width-request">275</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="placeholder-text" translatable="yes">Say hi to your new contact…</property> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="contact_info_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Show Contact Infos</property> + <property name="halign">center</property> + <property name="margin-bottom">6</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">user-info-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">1</property> + <property name="width">2</property> + </packing> + </child> + </object> + <object class="GtkBox" id="gateway_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">12</property> + <property name="label" translatable="yes">Service Gateway</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="margin-bottom">6</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="gateway_image"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="gateway_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="wrap">True</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton" id="register_button"> + <property name="label" translatable="yes">Register</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="command_button"> + <property name="label" translatable="yes">Command</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/add_new_contact_window.ui deleted ===================================== @@ -1,492 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkListStore" id="account_liststore"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkListStore" id="groups_liststore"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkTextBuffer" id="message_textbuffer"> - <property name="text" translatable="yes">I would like to add you to my contact list.</property> - <signal name="end-user-action" handler="on_message_textbuffer_changed" swapped="no"/> - </object> - <object class="GtkListStore" id="protocol"> - <columns> -  - <column type="gchararray"/> -  - <column type="gchararray"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkListStore" id="protocol_jid"> - <columns> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkBox" id="add_contact_box"> - <property name="width_request">400</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="prompt_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="margin_top">18</property> - <property name="use_markup">True</property> - <property name="justify">center</property> - <property name="wrap">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="uid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_XMPP Address</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="nickname_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Nickname</property> - <property name="use_underline">True</property> - <property name="xalign">0.5</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="group_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Group</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="uid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text">user(a)example.org</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nickname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="group_comboboxentry"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Choose or type new group name</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="margin_bottom">12</property> - <property name="label" translatable="yes">A_ccount</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="protocol_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_Protocol</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">12</property> - <child> - <object class="GtkComboBox" id="protocol_combobox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="model">protocol</property> - <signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererPixbuf"/> - <attributes> - <attribute name="icon-name">1</attribute> - </attributes> - </child> - <child> - <object class="GtkCellRendererText"> - <property name="xpad">5</property> - </object> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="protocol_jid_combobox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="model">protocol_jid</property> - <signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext2"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combobox"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_bottom">12</property> - <property name="model">account_liststore</property> - <property name="entry_text_column">1</property> - <property name="id_column">0</property> - <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">1</attribute> - </attributes> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="show_contact_info_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Query Contact Info</property> - <signal name="clicked" handler="on_show_contact_info_button_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-info-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">18</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="auto_authorize_checkbutton"> - <property name="label" translatable="yes">A_llow contact to view my status</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="margin_top">18</property> - <property name="shadow_type">etched-in</property> - <property name="min_content_height">5</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="top_margin">6</property> - <property name="bottom_margin">6</property> - <property name="buffer">message_textbuffer</property> - </object> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkRevealer" id="save_message_revealer"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="transition_type">crossfade</property> - <child> - <object class="GtkCheckButton" id="save_message_checkbutton"> - <property name="label" translatable="yes">_Save subscription message</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="halign">start</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkBox" id="register_hbox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label224"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">You have to register with this transport -to be able to add a contact from this -protocol. Click on Register button to -proceed.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="register_button"> - <property name="label" translatable="yes">_Register</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_register_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="padding">18</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="connected_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">You must be connected to the transport to be able -to add a contact from this protocol.</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">8</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">18</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="add_button"> - <property name="label" translatable="yes">_Add</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_add_button_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">9</property> - </packing> - </child> - </object> -</interface> ===================================== gajim/gtk/add_contact.py ===================================== @@ -12,490 +12,418 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from gi.repository import Gdk +import logging + from gi.repository import Gtk +from nbxmpp.errors import is_error + from gajim.common import app -from gajim.common import ged -from gajim.common import helpers +from gajim.common.helpers import get_subscription_request_msg +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ +from gajim.common.modules.util import as_task +from .adhoc import AdHocCommand +from .assistant import Assistant +from .assistant import Page +from .assistant import ErrorPage +from .groupchat_info import GroupChatInfoScrolled from .service_registration import ServiceRegistration -from .dialogs import ErrorDialog from .util import get_builder -from .util import EventHelper from .util import open_window +log = logging.getLogger('gajim.gui.add_contact') -class AddContact(Gtk.ApplicationWindow, EventHelper): - uid_labels = {'jabber': _('XMPP Address'), - 'gadu-gadu': _('GG Number'), - 'icq': _('ICQ Number')} +class AddContact(Assistant): + def __init__(self, account=None, jid=None, nick=None): + Assistant.__init__(self) + self.account = account + self._jid = jid + self._nick = nick - def __init__(self, account=None, jid=None, nick=None, group=None): - Gtk.ApplicationWindow.__init__(self) - EventHelper.__init__(self) - self.set_application(app.app) - self.set_type_hint(Gdk.WindowTypeHint.DIALOG) - self.set_position(Gtk.WindowPosition.CENTER) - self.set_show_menubar(False) - self.set_resizable(False) - self.set_title(_('Add Contact')) + self._result = None - self.connect_after('key-press-event', self._on_key_press) + self.add_button('next', _('Next'), complete=True, + css_class='suggested-action') + self.add_button('back', _('Back')) + self.add_button('add', _('Add Contact'), + css_class='suggested-action') + self.add_button('join', _('Join…'), + css_class='suggested-action') - self.account = account - self._group = group - self.adding_jid = False + self.add_pages({ + 'address': Address(account, jid), + 'error': Error(), + 'contact': Contact(), + 'groupchat': GroupChat(), + 'gateway': Gateway(), + }) - if jid is not None: - jid = app.get_jid_without_resource(str(jid)) + progress = self.add_default_page('progress') + progress.set_title(_('Gathering information…')) + progress.set_text(_('Trying to gather information on this address…')) - # fill accounts with active accounts - accounts = app.get_enabled_accounts_with_labels() + self.connect('button-clicked', self._on_button_clicked) - if not accounts: + self.show_all() + + def _on_button_clicked(self, _assistant, button_name): + page = self.get_current_page() + + if button_name == 'next': + self._start_disco() return - if not account: - self.account = accounts[0][0] - - self._ui = get_builder('add_new_contact_window.ui') - self.add(self._ui.add_contact_box) - self._ui.connect_signals(self) - - self.subscription_table = [ - self._ui.uid_label, self._ui.uid_entry, - self._ui.show_contact_info_button, - self._ui.nickname_label, self._ui.nickname_entry, - self._ui.group_label, self._ui.group_comboboxentry - ] - - self._ui.add_button.grab_default() - - self.agents = {'jabber': []} - self.gateway_prompt = {} - # types to which we are not subscribed but account has an agent for it - self.available_types = [] - for acct in accounts: - for j in app.contacts.get_jid_list(acct[0]): - if app.jid_is_transport(j): - type_ = app.get_transport_name_from_jid(j, False) - if not type_: - continue - if type_ in self.agents: - self.agents[type_].append(j) - else: - self.agents[type_] = [j] - self.gateway_prompt[j] = {'desc': None, 'prompt': None} - # Now add the one to which we can register - for acct in accounts: - for type_ in app.connections[acct[0]].available_transports: - if type_ in self.agents: - continue - self.agents[type_] = [] - for jid_ in app.connections[acct[0]].available_transports[type_]: - if jid_ not in self.agents[type_]: - self.agents[type_].append(jid_) - self.gateway_prompt[jid_] = {'desc': None, - 'prompt': None} - self.available_types.append(type_) - - uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ'} - # Jabber as first - liststore = self._ui.protocol_combobox.get_model() - liststore.append(['XMPP', 'xmpp', 'jabber']) - for type_ in self.agents: - if type_ == 'jabber': - continue - if type_ in uf_type: - liststore.append([uf_type[type_], type_ + '-online', type_]) - else: - liststore.append([type_, type_ + '-online', type_]) - - if account: - for service in self.agents[type_]: - con = app.connections[account] - con.get_module('Gateway').request_gateway_prompt(service) - self._ui.protocol_combobox.set_active(0) - self._ui.auto_authorize_checkbutton.show() - - if jid: - self.jid_escaped = True - type_ = app.get_transport_name_from_jid(jid) - if not type_: - type_ = 'jabber' - if type_ == 'jabber': - self._ui.uid_entry.set_text(jid) - transport = None + if button_name == 'back': + self.show_page('address', + Gtk.StackTransitionType.SLIDE_RIGHT) + self.get_page('address').focus() + return + + if button_name == 'add': + client = app.get_client(self.account) + if page == 'contact': + data = self.get_page('contact').get_subscription_data() + client.get_module('Presence').subscribe( + self._result.jid, + msg=data['message'], + groups=data['groups'], + auto_auth=data['auto_auth']) else: - uid, transport = app.get_name_and_server_from_jid(jid) - self._ui.uid_entry.set_text(uid.replace('%', '@', 1)) - - self._ui.show_contact_info_button.set_sensitive(True) - - # set protocol_combobox - model = self._ui.protocol_combobox.get_model() - iter_ = model.get_iter_first() - i = 0 - while iter_: - if model[iter_][2] == type_: - self._ui.protocol_combobox.set_active(i) - break - iter_ = model.iter_next(iter_) - i += 1 - - # set protocol_jid_combobox - self._ui.protocol_jid_combobox.set_active(0) - model = self._ui.protocol_jid_combobox.get_model() - iter_ = model.get_iter_first() - i = 0 - while iter_: - if model[iter_][0] == transport: - self._ui.protocol_jid_combobox.set_active(i) - break - iter_ = model.iter_next(iter_) - i += 1 - if nick: - self._ui.nickname_entry.set_text(nick) - self._ui.nickname_entry.grab_focus() + client.get_module('Presence').subscribe( + self._result.jid, + name=self._result.gateway_name, + auto_auth=True) + app.window.show_account_page(self.account) + self.destroy() + return + + if button_name == 'join': + _, jid = self.get_page('address').get_account_and_jid() + open_window('GroupchatJoin', account=self.account, jid=jid) + self.destroy() + + def _start_disco(self): + self._result = None + self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) + + account, jid = self.get_page('address').get_account_and_jid() + self._disco_info(account, jid) + + @as_task + def _disco_info(self, account, address): + _task = yield + + client = app.get_client(account) + + result = yield client.get_module('Discovery').disco_info(address) + if is_error(result): + self._process_error(account, result) + raise result + + log.info('Disco Info received: %s', address) + self._process_info(account, result) + + def _process_error(self, account, result): + log.debug('Error received: %s', result) + self._result = result + + if result.condition == 'service-unavailable': + # It seems to be a contact + self.get_page('contact').prepare(account, result) + self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) else: - self.jid_escaped = False - self._ui.uid_entry.grab_focus() + self.get_page('error').set_text(result.get_text()) + self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) + + def _process_info(self, account, result): + log.debug('Info received: %s', result) + self._result = result + + if result.is_muc: + for identity in result.identities: + if identity.type == 'irc' and result.jid.is_domain: + self.get_page('gateway').prepare(account, result) + self.show_page( + 'gateway', Gtk.StackTransitionType.SLIDE_LEFT) + return + + self.get_page('groupchat').prepare(account, result) + self.show_page('groupchat', Gtk.StackTransitionType.SLIDE_LEFT) + return + + if result.is_gateway: + self.get_page('gateway').prepare(account, result) + self.show_page('gateway', Gtk.StackTransitionType.SLIDE_LEFT) + return + + if result.has_category('client'): + self.get_page('contact').prepare(account, result) + self.show_page('contact', Gtk.StackTransitionType.SLIDE_LEFT) + + +class Address(Page): + def __init__(self, account, jid): + Page.__init__(self) + self.title = _('Add Contact') + + self._account = account + self._jid = jid - self._update_groups() + self._client = None + self._ui = get_builder('add_contact.ui') + self.add(self._ui.address_box) + + self._ui.account_combo.connect('changed', self._on_account_changed) + self._ui.address_entry.connect('changed', self._set_complete) + + accounts = app.get_enabled_accounts_with_labels() if len(accounts) > 1: - liststore = self._ui.account_combobox.get_model() + liststore = self._ui.account_combo.get_model() for acc in accounts: liststore.append(acc) + self._ui.account_box.show() - self._ui.account_combobox.set_active_id(self.account) - self._ui.account_label.show() - self._ui.account_combobox.show() + if self._account is not None: + self._client = app.get_client(self._account) + self._ui.account_combo.set_active_id(self._account) - if len(self.agents) > 1: - self._ui.protocol_label.show() - self._ui.protocol_combobox.show() + if self._jid is not None: + self._ui.address_entry.set_text(self._jid) - if self.account: - message_buffer = self._ui.message_textview.get_buffer() - msg = helpers.from_one_line(helpers.get_subscription_request_msg( - self.account)) - message_buffer.set_text(msg) + self._set_complete() - self._ui.uid_entry.connect('changed', self.on_uid_entry_changed) self.show_all() - self.register_events([ - ('gateway-prompt-received', ged.GUI1, self._nec_gateway_prompt_received), - ('presence-received', ged.GUI1, self._nec_presence_received), - ]) - - def _update_groups(self): - self._ui.group_comboboxentry.get_model().clear() - index = 0 - client = app.get_client(self.account) - for item in client.get_module('Roster').get_groups(): - self._ui.group_comboboxentry.append_text(item) - if item == self._group: - self._ui.group_comboboxentry.set_active(index) - index += 1 - - def on_uid_entry_changed(self, widget): - is_empty = bool(not self._ui.uid_entry.get_text() == '') - self._ui.show_contact_info_button.set_sensitive(is_empty) - - def on_show_contact_info_button_clicked(self, _widget): - """ - Ask for vCard - """ - jid = self._ui.uid_entry.get_text().strip() - client = app.get_client(self.account) - contact = client.get_module('Contacts').get_contact(jid) - open_window('ContactInfo', account=self.account, contact=contact) - - def on_register_button_clicked(self, widget): - model = self._ui.protocol_jid_combobox.get_model() - row = self._ui.protocol_jid_combobox.get_active() - jid = model[row][0] - ServiceRegistration(self.account, jid) - - def _on_key_press(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - self.destroy() + def get_visible_buttons(self): + return ['next'] - def on_cancel_button_clicked(self, widget): - """ - When Cancel button is clicked - """ - self.destroy() - - def on_message_textbuffer_changed(self, widget): - self._ui.save_message_revealer.show() - self._ui.save_message_revealer.set_reveal_child(True) - - def on_add_button_clicked(self, widget): - """ - When Subscribe button is clicked - """ - jid = self._ui.uid_entry.get_text().strip() - if not jid: - ErrorDialog( - _('%s Missing') % self._ui.uid_label.get_text(), - (_('You must supply the %s of the new contact.') % - self._ui.uid_label.get_text()) - ) - return + def get_default_button(self): + return 'next' - model = self._ui.protocol_combobox.get_model() - row = self._ui.protocol_combobox.get_active_iter() - type_ = model[row][2] - if type_ != 'jabber': - model = self._ui.protocol_jid_combobox.get_model() - row = self._ui.protocol_jid_combobox.get_active() - transport = model[row][0] - if self.account and not self.jid_escaped: - self.adding_jid = (jid, transport, type_) - con = app.connections[self.account] - con.get_module('Gateway').request_gateway_prompt(transport, jid) - else: - jid = jid.replace('@', '%') + '@' + transport - self._add_jid(jid, type_) - else: - self._add_jid(jid, type_) + def get_account_and_jid(self): + return self._account, self._ui.address_entry.get_text() - def _add_jid(self, jid, type_): - # check if jid is conform to RFC and stringprep it - try: - jid = helpers.parse_jid(jid) - except helpers.InvalidFormat as s: - pritext = _('Invalid User ID') - ErrorDialog(pritext, str(s)) - return + def focus(self): + self._ui.address_entry.grab_focus() - # No resource in jid - if jid.find('/') >= 0: - pritext = _('Invalid User ID') - ErrorDialog(pritext, _('The user ID must not contain a resource.')) - return + def _on_account_changed(self, combobox): + account = combobox.get_active_id() + self._account = account + self._set_complete() + + def _show_icon(self, show): + icon = 'dialog-warning-symbolic' if show else None + self._ui.address_entry.set_icon_from_icon_name( + Gtk.EntryIconPosition.SECONDARY, icon) - if jid == app.get_jid_from_account(self.account): - pritext = _('Invalid User ID') - ErrorDialog(pritext, _('You cannot add yourself to your contact list.')) + def _set_complete(self, *args): + if self._account is None: + self.complete = False + self.update_page_complete() return - if not app.account_is_available(self.account): - ErrorDialog( - _('Account Offline'), - _('Your account must be online to add new contacts.') - ) + address = self._ui.address_entry.get_text() + is_self = bool(address == app.get_jid_from_account(self._account)) + if is_self: + self._show_icon(True) + self._ui.address_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, + _('You cannot add yourself to your contact list.')) + self.complete = False + self.update_page_complete() return - nickname = self._ui.nickname_entry.get_text() or '' - # get value of account combobox, if account was not specified - if not self.account: - model = self._ui.account_combobox.get_model() - index = self._ui.account_combobox.get_active() - self.account = model[index][1] - - # Check if jid is already in roster - if jid in app.contacts.get_jid_list(self.account): - c = app.contacts.get_first_contact_from_jid(self.account, jid) - if _('Not in contact list') not in c.groups and c.sub in ('both', 'to'): - ErrorDialog( - _('Contact Already in Contact List'), - _('This contact is already in your contact list.')) + client = app.get_client(self._account) + for contact in client.get_module('Roster').iter_contacts(): + if address == str(contact.jid): + self._show_icon(True) + self._ui.address_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, + _('%s is already in your contact list') % address) + self.complete = False + self.update_page_complete() return - if type_ == 'jabber': - message_buffer = self._ui.message_textview.get_buffer() - start_iter = message_buffer.get_start_iter() - end_iter = message_buffer.get_end_iter() - message = message_buffer.get_text(start_iter, end_iter, True) - if self._ui.save_message_checkbutton.get_active(): - msg = helpers.to_one_line(message) - app.settings.set_account_setting(self.account, - 'subscription_request_msg', - msg) - else: - message = '' - group = self._ui.group_comboboxentry.get_child().get_text() - groups = [] - if group: - groups = [group] - auto_auth = self._ui.auto_authorize_checkbutton.get_active() - - client = app.get_client(self.account) - client.get_module('Presence').subscribe(jid, - message, - nickname, - groups=groups, - auto_auth=auto_auth) - - self.destroy() - - def on_account_combobox_changed(self, widget): - account = widget.get_active_id() - message_buffer = self._ui.message_textview.get_buffer() - message_buffer.set_text(helpers.get_subscription_request_msg(account)) - self.account = account - self._update_groups() + self.complete = self._validate_address(address) + self.update_page_complete() - def on_protocol_jid_combobox_changed(self, widget): - model = widget.get_model() - iter_ = widget.get_active_iter() - if not iter_: - return - jid_ = model[iter_][0] - model = self._ui.protocol_combobox.get_model() - iter_ = self._ui.protocol_combobox.get_active_iter() - type_ = model[iter_][2] - - desc = None - if self.agents[type_] and jid_ in self.gateway_prompt: - desc = self.gateway_prompt[jid_]['desc'] - - if desc: - self._ui.prompt_label.set_markup(desc) - self._ui.prompt_label.show() - else: - self._ui.prompt_label.hide() - - prompt = None - if self.agents[type_] and jid_ in self.gateway_prompt: - prompt = self.gateway_prompt[jid_]['prompt'] - if not prompt: - if type_ in self.uid_labels: - prompt = self.uid_labels[type_] - else: - prompt = _('User ID:') - self._ui.uid_label.set_text(prompt) - - def on_protocol_combobox_changed(self, widget): - model = widget.get_model() - iter_ = widget.get_active_iter() - type_ = model[iter_][2] - model = self._ui.protocol_jid_combobox.get_model() - model.clear() - if self.agents[type_]: - for jid_ in self.agents[type_]: - model.append([jid_]) - self._ui.protocol_jid_combobox.set_active(0) - desc = None - if self.agents[type_]: - jid_ = self.agents[type_][0] - if jid_ in self.gateway_prompt: - desc = self.gateway_prompt[jid_]['desc'] - - if desc: - self._ui.prompt_label.set_markup(desc) - self._ui.prompt_label.show() - else: - self._ui.prompt_label.hide() + def _validate_address(self, address): + if not address: + self._show_icon(False) + return False - if len(self.agents[type_]) > 1: - self._ui.protocol_jid_combobox.show() - else: - self._ui.protocol_jid_combobox.hide() - prompt = None - if self.agents[type_]: - jid_ = self.agents[type_][0] - if jid_ in self.gateway_prompt: - prompt = self.gateway_prompt[jid_]['prompt'] - if not prompt: - if type_ in self.uid_labels: - prompt = self.uid_labels[type_] - else: - prompt = _('User ID:') - self._ui.uid_label.set_text(prompt) + try: + jid = validate_jid(address) + if jid.resource: + raise ValueError + except ValueError: + self._show_icon(True) + self._ui.address_entry.set_icon_tooltip_text( + Gtk.EntryIconPosition.SECONDARY, _('Invalid Address')) + return False + + self._show_icon(False) + return True + + +class Error(ErrorPage): + def __init__(self): + ErrorPage.__init__(self) + self.set_title(_('Add Contact')) + self.set_heading(_('An Error Occurred')) - if type_ == 'jabber': - self._ui.message_scrolledwindow.show() - self._ui.save_message_checkbutton.show() - else: - self._ui.message_scrolledwindow.hide() - self._ui.save_message_checkbutton.hide() - if type_ in self.available_types: - self._ui.register_hbox.show() - self._ui.auto_authorize_checkbutton.hide() - self._ui.connected_label.hide() - self._subscription_table_hide() - self._ui.add_button.set_sensitive(False) + def get_visible_buttons(self): + return ['back'] + + def get_default_button(self): + return 'back' + + +class Contact(Page): + def __init__(self): + Page.__init__(self) + self.title = _('Add Contact') + + self._result = None + self._account = None + self._contact = None + + self._ui = get_builder('add_contact.ui') + self.add(self._ui.contact_grid) + + self._ui.contact_info_button.connect('clicked', self._on_info_clicked) + + self.show_all() + + def get_visible_buttons(self): + if self._contact.is_in_roster: + return ['back'] + return ['back', 'add'] + + def get_default_button(self): + return 'add' + + def prepare(self, account, result): + self._result = result + self._account = account + + client = app.get_client(account) + self._contact = client.get_module('Contacts').get_contact(result.jid) + + self._update_groups(account) + self._ui.message_entry.set_text(get_subscription_request_msg(account)) + self._ui.contact_grid.set_sensitive(True) + + def _update_groups(self, account): + self._ui.group_combo.get_model().clear() + client = app.get_client(account) + for group in client.get_module('Roster').get_groups(): + self._ui.group_combo.append_text(group) + + def _on_info_clicked(self, _button): + open_window( + 'ContactInfo', account=self._account, contact=self._contact) + + def get_subscription_data(self): + group = self._ui.group_combo.get_child().get_text() + groups = [group] if group else [] + return { + 'message': self._ui.message_entry.get_text(), + 'groups': groups, + 'auto_auth': self._ui.status_switch.get_active(), + } + + +class Gateway(Page): + def __init__(self): + Page.__init__(self) + self.title = _('Service Gateway') + + self._account = None + self._result = None + + self._ui = get_builder('add_contact.ui') + self.add(self._ui.gateway_box) + + self._ui.register_button.connect('clicked', self._on_register_clicked) + self._ui.command_button.connect('clicked', self._on_command_clicked) + + self.show_all() + + def get_visible_buttons(self): + return ['back', 'add'] + + def get_default_button(self): + return 'add' + + def prepare(self, account, result): + self._account = account + self._result = result + + icon_name = None + if result.is_gateway: + if result.gateway_type == 'sms': + icon_name = 'gajim-agent-sms' + if result.gateway_type == 'irc': + icon_name = 'gajim-agent-irc' + self._ui.gateway_image.set_from_icon_name( + icon_name, Gtk.IconSize.DIALOG) + self._ui.gateway_label.set_text(_('%(name)s (%(type)s)') % { + 'name': result.gateway_name, + 'type': result.gateway_type.upper()}) else: - self._ui.register_hbox.hide() - if type_ != 'jabber': - model = self._ui.protocol_jid_combobox.get_model() - row = self._ui.protocol_jid_combobox.get_active() - jid = model[row][0] - contact = app.contacts.get_first_contact_from_jid( - self.account, jid) - if contact is None or contact.show in ('offline', 'error'): - self._subscription_table_hide() - self._ui.connected_label.show() - self._ui.add_button.set_sensitive(False) - self._ui.auto_authorize_checkbutton.hide() - return - self._subscription_table_show() - self._ui.auto_authorize_checkbutton.show() - self._ui.connected_label.hide() - self._ui.add_button.set_sensitive(True) - - def transport_signed_in(self, jid): - model = self._ui.protocol_jid_combobox.get_model() - row = self._ui.protocol_jid_combobox.get_active() - _jid = model[row][0] - if _jid == jid: - self._ui.register_hbox.hide() - self._ui.connected_label.hide() - self._subscription_table_show() - self._ui.auto_authorize_checkbutton.show() - self._ui.add_button.set_sensitive(True) - - def transport_signed_out(self, jid): - model = self._ui.protocol_jid_combobox.get_model() - row = self._ui.protocol_jid_combobox.get_active() - _jid = model[row][0] - if _jid == jid: - self._subscription_table_hide() - self._ui.auto_authorize_checkbutton.hide() - self._ui.connected_label.show() - self._ui.add_button.set_sensitive(False) - - def _nec_presence_received(self, obj): - if app.jid_is_transport(obj.jid): - if obj.old_show == 0 and obj.new_show > 1: - self.transport_signed_in(obj.jid) - elif obj.old_show > 1 and obj.new_show == 0: - self.transport_signed_out(obj.jid) - - def _nec_gateway_prompt_received(self, obj): - if self.adding_jid: - jid, transport, type_ = self.adding_jid - if obj.stanza.getError(): - ErrorDialog( - _('Error while adding transport contact'), - _('This error occurred while adding a contact for transport ' - '%(transport)s:\n\n%(error)s') % { - 'transport': transport, - 'error': obj.stanza.getErrorMsg()}) - return - if obj.prompt_jid: - self._add_jid(obj.prompt_jid, type_) - else: - jid = jid.replace('@', '%') + '@' + transport - self._add_jid(jid, type_) - elif obj.jid in self.gateway_prompt: - if obj.desc: - self.gateway_prompt[obj.jid]['desc'] = obj.desc - if obj.prompt: - self.gateway_prompt[obj.jid]['prompt'] = obj.prompt - - def _subscription_table_hide(self): - for widget in self.subscription_table: - widget.hide() - - def _subscription_table_show(self): - for widget in self.subscription_table: - widget.show() + for identity in result.identities: + identity_name = identity.name + identity_type = identity.type + if identity.type == 'sms': + icon_name = 'gajim-agent-sms' + if identity.type == 'irc': + icon_name = 'gajim-agent-irc' + self._ui.gateway_image.set_from_icon_name( + icon_name, Gtk.IconSize.DIALOG) + self._ui.gateway_label.set_text(_('%(name)s (%(type)s)') % { + 'name': identity_name, + 'type': identity_type.upper()}) + + def _on_register_clicked(self, _button): + ServiceRegistration(self._account, self._result.jid) + + def _on_command_clicked(self, _button): + AdHocCommand(self._account, self._result.jid) + + +class GroupChat(Page): + def __init__(self): + Page.__init__(self) + self.title = _('Join Group Chat?') + + self._result = None + + heading = Gtk.Label(label=_('Join Group Chat?')) + heading.get_style_context().add_class('large-header') + heading.set_max_width_chars(30) + heading.set_line_wrap(True) + heading.set_halign(Gtk.Align.CENTER) + heading.set_justify(Gtk.Justification.CENTER) + self.pack_start(heading, False, True, 0) + + self._info_box = GroupChatInfoScrolled(options={'minimal': True}) + self.pack_start(self._info_box, True, True, 0) + + self.show_all() + + def get_visible_buttons(self): + return ['back', 'join'] + + def get_default_button(self): + return 'join' + + def prepare(self, account, result): + self._result = result + + self._info_box.set_account(account) + self._info_box.set_from_disco_info(result) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b18f00423b0212328067af0777053aa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b18f00423b0212328067af0777053aa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatJoin: Fix joining a chat
by Daniel Brötzmann (＠wurstsalat) 10 Sep '21

10 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 572d279f by wurstsalat at 2021-09-11T00:08:34+02:00 GroupchatJoin: Fix joining a chat - - - - - 1 changed file: - gajim/gtk/groupchat_join.py Changes: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import logging + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango @@ -29,6 +31,8 @@ from .groupchat_nick import NickChooser from .util import ensure_not_destroyed +log = logging.getLogger('gajim.gui.groupchat_join') + class GroupchatJoin(Gtk.ApplicationWindow): def __init__(self, account, jid): @@ -86,8 +90,8 @@ def __init__(self, account, jid): self.add(self._main_box) self.show_all() - con = app.connections[self.account] - con.get_module('Discovery').disco_muc( + client = app.get_client(self.account) + client.get_module('Discovery').disco_muc( jid, allow_redirect=True, request_vcard=True, @@ -103,7 +107,7 @@ def _disco_info_received(self, task): try: result = task.finish() except StanzaError as error: - self._log.info('Disco %s failed: %s', error.jid, error.get_text()) + log.info('Disco %s failed: %s', error.jid, error.get_text()) self._set_error(error) return @@ -137,8 +141,9 @@ def _set_error_from_code(self, error_code): def _on_join(self, *args): nickname = self._nick_chooser.get_text() - app.interface.show_or_join_groupchat( - self.account, self.jid, nick=nickname) + + app.interface.show_add_join_groupchat( + self.account, self.jid, nickname=nickname) self.destroy() def _on_destroy(self, *args): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/572d279f51552be25b9c200640b1b027… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/572d279f51552be25b9c200640b1b027… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: XMLConsole: Add Disco Info preset
by Daniel Brötzmann (＠wurstsalat) 10 Sep '21

10 Sep '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 146a12fd by wurstsalat at 2021-09-10T17:40:06+02:00 XMLConsole: Add Disco Info preset - - - - - 6ec7078f by wurstsalat at 2021-09-10T18:05:59+02:00 Discovery: Fix disco_contact - - - - - 1665a2dd by wurstsalat at 2021-09-10T18:36:24+02:00 Transports: Improve detection and avatars - - - - - 10 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/data/gui/xml_console.ui - gajim/gtk/avatar.py - gajim/gtk/chat_list.py - gajim/gtk/contact_info.py - gajim/gtk/groupchat_info.py - gajim/gtk/roster.py - gajim/gtk/tooltips.py - gajim/gtk/xml_console.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -248,11 +248,37 @@ def get_avatar(self, show = self.show if add_show else None + transport_icon = None + if self.is_gateway: + show = None + disco_info = app.storage.cache.get_last_disco_info(self._jid) + if disco_info.gateway_type == 'sms': + transport_icon = 'gajim-agent-sms' + if disco_info.gateway_type == 'irc': + transport_icon = 'gajim-agent-irc' + else: + for resource_contact in self.iter_resources(): + if resource_contact.identity_type == 'sms': + transport_icon = 'gajim-agent-sms' + break + if pixbuf: return app.interface.avatar_storage.get_pixbuf( - self, size, scale, show, default=default, style=style) + self, + size, + scale, + show, + default=default, + transport_icon=transport_icon, + style=style) return app.interface.avatar_storage.get_surface( - self, size, scale, show, default=default, style=style) + self, + size, + scale, + show, + default=default, + transport_icon=transport_icon, + style=style) def update_presence(self, presence_data): for contact in self._resources.values(): @@ -281,14 +307,11 @@ def is_in_roster(self): return item is not None @property - def is_transport(self): + def is_gateway(self): disco_info = app.storage.cache.get_last_disco_info(self._jid) if disco_info is None: return False - for identity in disco_info.identities: - if identity.category == 'gateway': - return True - return False + return disco_info.is_gateway @property def ask(self): @@ -329,6 +352,18 @@ def supports(self, requested_feature): return False return CommonContact.supports(self, requested_feature) + @property + def identity_type(self): + disco_info = app.storage.cache.get_last_disco_info(self._jid) + if disco_info is None: + return None + + for identity in disco_info.identities: + if identity.type is not None: + return identity.type + + return None + @property def is_available(self): return self._presence.available @@ -399,11 +434,19 @@ def avatar_sha(self): return app.storage.cache.get_muc(self._jid, 'avatar') def get_avatar(self, size, scale): + transport_icon = None + disco_info = self.get_disco() + if disco_info is not None: + for identity in disco_info.identities: + if identity.type == 'irc': + transport_icon = 'gajim-agent-irc' + break return app.interface.avatar_storage.get_muc_surface( self._account, self._jid, size, - scale) + scale, + transport_icon=transport_icon) def _on_user_signal(self, contact, signal_name, *args): self.notify(signal_name, contact, *args) ===================================== gajim/common/modules/discovery.py ===================================== @@ -241,19 +241,16 @@ def disco_muc(self, def disco_contact(self, contact): _task = yield - fjid = contact.get_full_jid() - - result = yield self.disco_info(fjid) + result = yield self.disco_info(contact.jid) if is_error(result): raise result - self._log.info('Disco Info received: %s', fjid) + self._log.info('Disco Info received: %s', contact.jid) app.storage.cache.set_last_disco_info(result.jid, result, cache_only=True) - contact = self._con.get_module('Contacts').get_contact(result.jid) contact.notify('caps-update') ===================================== gajim/data/gui/xml_console.ui ===================================== @@ -1,31 +1,31 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkHeaderBar" id="headerbar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="title" translatable="yes">XML Console</property> - <property name="show_close_button">True</property> + <property name="show-close-button">True</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">utilities-terminal-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">utilities-terminal-symbolic</property> </object> </child> <child> <object class="GtkToggleButton" id="search_toggle"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="margin_start">6</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="margin-start">6</property> <signal name="toggled" handler="_on_search_toggled" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-search-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">system-search-symbolic</property> </object> </child> </object> @@ -35,22 +35,22 @@ </child> </object> <object class="GtkPopover" id="popover"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <child> <object class="GtkListBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="selection_mode">none</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> <signal name="row-activated" handler="_on_row_activated" swapped="no"/> <child> <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">Message</property> </object> </child> @@ -59,11 +59,11 @@ <child> <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">Presence</property> </object> </child> @@ -72,16 +72,29 @@ <child> <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label">Iq</property> </object> </child> </object> </child> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label">Disco Info</property> + </object> + </child> + </object> + </child> </object> </child> <style> @@ -90,45 +103,45 @@ </object> <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkPaned" id="paned"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkRevealer" id="search_revealer"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="transition_type">none</property> - <property name="transition_duration">100</property> + <property name="can-focus">False</property> + <property name="transition-type">none</property> + <property name="transition-duration">100</property> <child> <object class="GtkToolbar"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">center</property> - <property name="show_arrow">False</property> + <property name="show-arrow">False</property> <property name="icon_size">2</property> <child> <object class="GtkToolItem"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_end">6</property> + <property name="can-focus">False</property> + <property name="margin-end">6</property> <child> <object class="GtkSearchEntry" id="search_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="primary_icon_name">edit-find-symbolic</property> - <property name="primary_icon_activatable">False</property> - <property name="primary_icon_sensitive">False</property> - <property name="placeholder_text" translatable="yes">Start Search...</property> + <property name="can-focus">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Start Search...</property> <signal name="activate" handler="_on_search_activate" swapped="no"/> </object> </child> @@ -141,9 +154,9 @@ <child> <object class="GtkToolButton" id="search_forward"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> - <property name="icon_name">go-down-symbolic</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="icon-name">go-down-symbolic</property> <signal name="clicked" handler="_on_search_clicked" swapped="no"/> </object> <packing> @@ -154,9 +167,9 @@ <child> <object class="GtkToolButton" id="search_backward"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="use_underline">True</property> - <property name="icon_name">go-up-symbolic</property> + <property name="can-focus">False</property> + <property name="use-underline">True</property> + <property name="icon-name">go-up-symbolic</property> <signal name="clicked" handler="_on_search_clicked" swapped="no"/> </object> <packing> @@ -175,19 +188,19 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolled"> - <property name="height_request">400</property> + <property name="height-request">400</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="textview"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="editable">False</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="top_margin">6</property> - <property name="bottom_margin">6</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> </object> </child> </object> @@ -205,14 +218,14 @@ </child> <child> <object class="GtkScrolledWindow" id="scrolled_input"> - <property name="height_request">150</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="shadow_type">in</property> + <property name="height-request">150</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="input_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> </object> </child> </object> @@ -232,19 +245,19 @@ <object class="GtkActionBar" id="actionbar"> <property name="name">actionbar</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Filter</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Filter</property> <signal name="clicked" handler="_on_filter_options" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">applications-system-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">applications-system-symbolic</property> </object> </child> </object> @@ -255,15 +268,15 @@ <child> <object class="GtkButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Clear</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Clear</property> <signal name="clicked" handler="_on_clear" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">edit-clear-all-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">edit-clear-all-symbolic</property> </object> </child> </object> @@ -274,14 +287,14 @@ <child> <object class="GtkToggleButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="toggled" handler="_on_input" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">document-edit-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">document-edit-symbolic</property> </object> </child> </object> @@ -291,16 +304,16 @@ </child> <child> <object class="GtkButton" id="paste"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> <signal name="clicked" handler="_on_paste_last" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="tooltip_text" translatable="yes">Paste Last Input</property> - <property name="icon_name">insert-text-symbolic</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Paste Last Input</property> + <property name="icon-name">insert-text-symbolic</property> </object> </child> </object> @@ -310,10 +323,10 @@ </child> <child> <object class="GtkMenuButton" id="menubutton"> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Presets</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Presets</property> <property name="popover">popover</property> <child> <placeholder/> @@ -332,14 +345,14 @@ <child> <object class="GtkButton" id="send"> <property name="label" translatable="yes">_Send</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_send" swapped="no"/> </object> <packing> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -347,7 +360,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> ===================================== gajim/gtk/avatar.py ===================================== @@ -31,6 +31,7 @@ from .const import DEFAULT_WORKSPACE_COLOR from .util import load_pixbuf +from .util import load_icon from .util import text_to_color from .util import scale_with_ratio from .util import get_css_show_class @@ -148,6 +149,27 @@ def add_status_to_avatar(surface, show): return context.get_target() +def get_icon_avatar(size, scale, icon_name): + if scale is not None: + size = size * scale + + width = size + height = size + + surface = cairo.ImageSurface(cairo.Format.ARGB32, width, height) + context = cairo.Context(surface) + + pixbuf = load_icon(icon_name, scale=scale, size=size, pixbuf=True) + Gdk.cairo_set_source_pixbuf( + context, + pixbuf, + 0, + 0) + context.paint() + + return context.get_target() + + @lru_cache(maxsize=128) def get_show_circle(show, size, scale): if not isinstance(show, str): @@ -276,8 +298,10 @@ def get_pixbuf(self, scale, show=None, default=False, + transport_icon=None, style='circle'): - surface = self.get_surface(contact, size, scale, show, default, style) + surface = self.get_surface( + contact, size, scale, show, default, transport_icon, style) return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) def get_surface(self, @@ -286,9 +310,18 @@ def get_surface(self, scale, show=None, default=False, + transport_icon=None, style='circle'): jid = contact.jid + + if transport_icon is not None: + surface = get_icon_avatar(size, scale, transport_icon) + if show is not None: + surface = add_status_to_avatar(surface, show) + self._cache[jid][(size, scale, show)] = surface + return surface + if not default: surface = self._cache[jid].get((size, scale, show)) if surface is not None: @@ -318,7 +351,14 @@ def get_muc_surface(self, size, scale, default=False, + transport_icon=None, style='circle'): + + if transport_icon is not None: + surface = get_icon_avatar(size, scale, transport_icon) + self._cache[jid][(size, scale)] = surface + return surface + if not default: surface = self._cache[jid].get((size, scale)) if surface is not None: ===================================== gajim/gtk/chat_list.py ===================================== @@ -372,6 +372,7 @@ def __init__(self, workspace_id, account, jid, type_, pinned): self.contact.connect('presence-update', self._on_presence_update) self.contact.connect('chatstate-update', self._on_chatstate_update) self.contact.connect('nickname-update', self._on_nickname_update) + self.contact.connect('caps-update', self._on_avatar_update) self.contact.connect('avatar-update', self._on_avatar_update) self._timestamp = None ===================================== gajim/gtk/contact_info.py ===================================== @@ -79,7 +79,7 @@ def __init__(self, account, contact, page=None): if contact.is_in_roster: self._ui.edit_name_button.show() self._fill_groups_page() - if contact.is_transport: + if contact.is_gateway: side_bar_switcher.hide_row('settings') side_bar_switcher.hide_row('devices') else: ===================================== gajim/gtk/groupchat_info.py ===================================== @@ -161,9 +161,10 @@ def set_from_disco_info(self, info): self._ui.name.set_visible(True) # Set avatar - surface = app.interface.avatar_storage.get_muc_surface( - self._account, - info.jid, + client = app.get_client(self._account) + contact = client.get_module('Contacts').get_contact( + info.jid, groupchat=True) + surface = contact.get_avatar( AvatarSize.GROUP_INFO, self.get_scale_factor()) self._ui.avatar_image.set_from_surface(surface) ===================================== gajim/gtk/roster.py ===================================== @@ -277,7 +277,7 @@ def _on_block_contact(self, _action, param): def _on_remove_contact(self, _action, param): jid = param.get_string() selected_contact = self._client.get_module('Contacts').get_contact(jid) - if selected_contact.is_transport: + if selected_contact.is_gateway: # Check for transport users in roster and warn about removing the # transport if there are any has_transport_contacts = False @@ -346,7 +346,7 @@ def _on_focus_out(treeview, _param): def _show_contact_menu(self, jid, treeview, event): contact = self._client.get_module('Contacts').get_contact(jid) menu = get_roster_menu( - self._account, jid, transport=contact.is_transport) + self._account, jid, transport=contact.is_gateway) rectangle = Gdk.Rectangle() rectangle.x = event.x @@ -573,9 +573,7 @@ def _draw_contact_row(self, ref, contact): self._store[iter_][Column.TEXT] = name surface = contact.get_avatar( - AvatarSize.ROSTER, - self.get_scale_factor(), - add_show=bool(not contact.is_transport)) + AvatarSize.ROSTER, self.get_scale_factor()) self._store[iter_][Column.AVATAR] = surface def _get_total_user_count(self): ===================================== gajim/gtk/tooltips.py ===================================== @@ -152,10 +152,7 @@ def _populate_grid(self, contact): scale = self._ui.tooltip_grid.get_scale_factor() # Avatar - surface = contact.get_avatar( - AvatarSize.TOOLTIP, - scale, - add_show=bool(not contact.is_transport)) + surface = contact.get_avatar(AvatarSize.TOOLTIP, scale) self._ui.avatar.set_from_surface(surface) self._ui.avatar.show() ===================================== gajim/gtk/xml_console.py ===================================== @@ -154,6 +154,11 @@ def _on_row_activated(self, _listbox, row): '<iq to="" type="" xmlns="jabber:client">\n' '<query xmlns=""></query>\n' '</iq>') + elif text == 'Disco Info': + input_text = ( + '<iq to="" type="get" xmlns="jabber:client">\n' + '<query xmlns="http://jabber.org/protocol/disco#info"></query>\n' + '</iq>') if input_text is not None: buffer_ = self._ui.input_entry.get_buffer() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/819efbefd60cd86afcc807f3dc1e71e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/819efbefd60cd86afcc807f3dc1e71e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][nbxmpp_2.0] Correction: Ignore messages where message id == replace id
by Philipp Hörist (＠lovetox) 08 Sep '21

08 Sep '21

Philipp Hörist pushed to branch nbxmpp_2.0 at gajim / python-nbxmpp Commits: ce819122 by lovetox at 2021-09-08T21:35:16+02:00 Correction: Ignore messages where message id == replace id This can only happen when clients don’t use unique ids or are broken - - - - - 1 changed file: - nbxmpp/modules/correction.py Changes: ===================================== nbxmpp/modules/correction.py ===================================== @@ -44,4 +44,9 @@ class Correction(BaseModule): self._log.warning(stanza) return + if stanza.getID() == id_: + self._log.warning('correcton id == message id') + self._log.warning(stanza) + return + properties.correction = CorrectionData(id_) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce8191222c6602c65b414ec8… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/commit/ce8191222c6602c65b414ec8… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits September 2021