Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ServerInfo: Add Certificate tab
by Daniel Brötzmann (＠wurstsalat) 26 Jan '22

26 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 264735fb by wurstsalat at 2022-01-26T19:01:13+01:00 ServerInfo: Add Certificate tab - - - - - 3 changed files: - gajim/data/gui/server_info.ui - gajim/gtk/builder.pyi - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/server_info.ui ===================================== @@ -6,7 +6,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <child> -  +  <object class="GtkGrid" id="server"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -135,21 +135,6 @@ <property name="width">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> @@ -161,12 +146,9 @@ <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> </object> - <packing> - <property name="tab-fill">False</property> - </packing> </child> <child> -  +  <object class="GtkGrid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -214,23 +196,6 @@ <property name="top-attach">5</property> </packing> </child> - <child> - <object class="GtkButton" id="cert_button"> - <property name="label" translatable="yes">View _Certificate</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="halign">center</property> - <property name="margin-top">12</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">8</property> - <property name="width">2</property> - </packing> - </child> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -382,39 +347,6 @@ <property name="top-attach">3</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> - <child> - <placeholder/> - </child> <style> <class name="margin-18"/> </style> @@ -431,7 +363,42 @@ </object> <packing> <property name="position">1</property> - <property name="tab-fill">False</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <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">12</property> + <child> + <object class="GtkScrolledWindow" id="cert_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="position">2</property> + </packing> + </child> + <child type="tab"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Certificate</property> + </object> + <packing> + <property name="position">2</property> </packing> </child> <child> @@ -492,7 +459,7 @@ </child> </object> <packing> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> <child type="tab"> @@ -502,8 +469,7 @@ <property name="label" translatable="yes">Features</property> </object> <packing> - <property name="position">2</property> - <property name="tab-fill">False</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -818,6 +818,7 @@ class ServerInfoBuilder(Builder): dns: Gtk.Label ip_port: Gtk.Label websocket: Gtk.Label + cert_scrolled: Gtk.ScrolledWindow features: Gtk.Box features_listbox: Gtk.ListBox clipboard_button: Gtk.Button ===================================== gajim/gtk/server_info.py ===================================== @@ -40,8 +40,8 @@ from gajim.common.i18n import _ from .builder import get_builder +from .certificate_dialog import CertificateBox from .util import EventHelper -from .util import open_window log = logging.getLogger('gajim.gui.server_info') @@ -99,6 +99,9 @@ def __init__(self, account: str) -> None: self._cert = self._client.certificate self._add_connection_info() + cert_box = CertificateBox(account, self._cert) + self._ui.cert_scrolled.add(cert_box) + for feature in self._get_features(): self._add_feature(feature) self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -128,8 +131,6 @@ def _add_connection_info(self) -> None: self._ui.proxy_type.set_text(proxy.type) self._ui.proxy_host.set_text(proxy.host) - self._ui.cert_button.set_sensitive(self._cert) - self._ui.domain.set_text(address.domain) visible = address.service is not None @@ -147,12 +148,6 @@ def _add_connection_info(self) -> None: self._ui.websocket.set_visible(visible) self._ui.websocket.set_text(address.uri or '') - def _on_cert_button_clicked(self, _button: Gtk.Button) -> None: - open_window('CertificateDialog', - account=self.account, - transient_for=self, - cert=self._cert) - def _add_contact_addresses(self, dataforms: list[SimpleDataForm]) -> None: fields = { 'admin-addresses': _('Admin'), @@ -342,6 +337,7 @@ def __init__(self, feature: Feature) -> None: self._icon = Gtk.Image() self._feature_label = Gtk.Label() + self._feature_label.set_halign(Gtk.Align.START) self._additional_label = Gtk.Label() self._additional_label.set_halign(Gtk.Align.START) self._additional_label.set_no_show_all(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/264735fbbff25ae499f517b67e7bc34a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/264735fbbff25ae499f517b67e7bc34a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] CertificateDialog: Factor Box out into own widget
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11a91bc3 by lovetox at 2022-01-26T00:48:36+01:00 CertificateDialog: Factor Box out into own widget This allows us to add it to other Dialogs - - - - - 4 changed files: - gajim/data/gui/certificate_dialog.ui → gajim/data/gui/certificate.ui - gajim/gtk/builder.pyi - gajim/gtk/certificate_dialog.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/certificate_dialog.ui → gajim/data/gui/certificate.ui ===================================== ===================================== gajim/gtk/builder.pyi ===================================== @@ -175,7 +175,7 @@ class CallWidgetBuilder(Builder): av_cam_image: Gtk.Image -class CertificateDialogBuilder(Builder): +class CertificateBuilder(Builder): certificate_box: Gtk.Box label_cert_for_account: Gtk.Label data_it_common_name: Gtk.Label @@ -981,7 +981,7 @@ def get_builder(file_name: Literal['bookmarks.ui'], widgets: list[str] = ...) -> @overload def get_builder(file_name: Literal['call_widget.ui'], widgets: list[str] = ...) -> CallWidgetBuilder: ... @overload -def get_builder(file_name: Literal['certificate_dialog.ui'], widgets: list[str] = ...) -> CertificateDialogBuilder: ... +def get_builder(file_name: Literal['certificate.ui'], widgets: list[str] = ...) -> CertificateBuilder: ... @overload def get_builder(file_name: Literal['chat_control.ui'], widgets: list[str] = ...) -> ChatControlBuilder: ... @overload ===================================== gajim/gtk/certificate_dialog.py ===================================== @@ -31,28 +31,41 @@ def __init__(self, account: str, cert: Gio.TlsCertificate ) -> None: + Gtk.ApplicationWindow.__init__(self) self.account = account self.set_name('CertificateDialog') self.set_application(app.app) self.set_show_menubar(False) - self.set_resizable(False) + self.set_resizable(True) self.set_position(Gtk.WindowPosition.CENTER) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.set_title(_('Certificate')) - self._ui = get_builder('certificate_dialog.ui') - self.add(self._ui.certificate_box) + self.add(CertificateBox(account, cert)) self.connect('key-press-event', self._on_key_press) - self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + self.set_transient_for(transient_for) + self.show_all() + + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + +class CertificateBox(Gtk.Box): + def __init__(self, account: str, cert: Gio.TlsCertificate) -> None: + Gtk.Box.__init__(self) + + self._ui = get_builder('certificate.ui') certificate = convert_gio_to_openssl_cert(cert) - # Get data for labels and copy button + issuer = certificate.get_issuer() subject = certificate.get_subject() - self._headline = _('Certificate for \n%s') % self.account + self._headline = _('Certificate for \n%s') % account self._it_common_name = subject.commonName or '' self._it_organization = subject.organizationName or '' self._it_org_unit = subject.organizationalUnitName or '' @@ -64,19 +77,28 @@ def __init__(self, self._ib_common_name = issuer.commonName or '' self._ib_organization = issuer.organizationName or '' self._ib_org_unit = issuer.organizationalUnitName or '' - issued = datetime.strptime(certificate.get_notBefore().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._issued = issued.strftime('%c %Z') - expires = datetime.strptime(certificate.get_notAfter().decode('ascii'), - '%Y%m%d%H%M%SZ') - self._expires = expires.strftime('%c %Z') - sha1 = certificate.digest('sha1').decode('utf-8') + + before = certificate.get_notBefore() + if before is None: + self._issued = '' + else: + issued = datetime.strptime(before.decode('ascii'), '%Y%m%d%H%M%SZ') + self._issued = issued.strftime('%c %Z') + + after = certificate.get_notAfter() + if after is None: + self._expires = '' + else: + expires = datetime.strptime(after.decode('ascii'), '%Y%m%d%H%M%SZ') + self._expires = expires.strftime('%c %Z') + + sha1 = certificate.digest('sha1').decode('utf-8') # type: ignore self._sha1 = '%s\n%s' % (sha1[:29], sha1[30:]) - sha256 = certificate.digest('sha256').decode('utf-8') + + sha256 = certificate.digest('sha256').decode('utf-8') # type: ignore self._sha256 = '%s\n%s\n%s\n%s' % ( sha256[:23], sha256[24:47], sha256[48:71], sha256[72:]) - # Set labels self._ui.label_cert_for_account.set_text(self._headline) self._ui.data_it_common_name.set_text(self._it_common_name) self._ui.data_it_organization.set_text(self._it_organization) @@ -90,13 +112,9 @@ def __init__(self, self._ui.data_sha1.set_text(self._sha1) self._ui.data_sha256.set_text(self._sha256) - self.set_transient_for(transient_for) - self._ui.connect_signals(self) - self.show_all() + self.add(self._ui.certificate_box) - def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: - if event.keyval == Gdk.KEY_Escape: - self.destroy() + self._ui.connect_signals(self) def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: clipboard_text = \ @@ -117,4 +135,6 @@ def _on_copy_cert_info_button_clicked(self, _widget: Gtk.Button) -> None: self._sha1 + '\n' + \ _('SHA-256:') + '\n' + \ self._sha256 + '\n' - self._clipboard.set_text(clipboard_text, -1) + + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(clipboard_text, -1) ===================================== pyrightconfig.json ===================================== @@ -27,6 +27,7 @@ "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", + "gajim/gtk/certificate_dialog.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a91bc31cb7c7d17f796bc77a815403… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11a91bc31cb7c7d17f796bc77a815403… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatJoin: Set default size
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 75e0aa37 by lovetox at 2022-01-25T23:18:10+01:00 GroupchatJoin: Set default size - - - - - 1 changed file: - gajim/gtk/groupchat_join.py Changes: ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -47,6 +47,7 @@ def __init__(self, account: str, jid: str) -> None: self.set_show_menubar(False) self.set_title(_('Join Group Chat')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_default_size(500, 550) self._destroyed = False self.account = account View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75e0aa37313c0d961f0c768415dcf495… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/75e0aa37313c0d961f0c768415dcf495… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ServerInfo: Simplify code
by Daniel Brötzmann (＠wurstsalat) 25 Jan '22

25 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b9b0dff6 by wurstsalat at 2022-01-25T23:09:41+01:00 ServerInfo: Simplify code - - - - - bdaf009f by wurstsalat at 2022-01-25T23:09:41+01:00 GroupchatDetails: Add page icon for affiliation - - - - - 4 changed files: - gajim/data/gui/groupchat_details.ui - gajim/data/gui/server_info.ui - gajim/gtk/builder.pyi - gajim/gtk/server_info.py Changes: ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -143,6 +143,7 @@ <packing> <property name="name">affiliations</property> <property name="title" translatable="yes">Affiliations</property> + <property name="icon-name">system-users-symbolic</property> <property name="position">2</property> </packing> </child> ===================================== gajim/data/gui/server_info.ui ===================================== @@ -1,21 +1,22 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.22"/> <object class="GtkNotebook" id="server_info_notebook"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <child> +  <object class="GtkGrid" id="server"> <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"> <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">Hostname</property> <style> @@ -23,29 +24,29 @@ </style> </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> </packing> </child> <child> <object class="GtkLabel" id="server_hostname"> <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="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel"> <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">Server Software</property> <style> @@ -53,29 +54,29 @@ </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> </packing> </child> <child> <object class="GtkLabel" id="server_software"> <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="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel"> <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">Server Uptime</property> <style> @@ -83,57 +84,72 @@ </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="server_uptime"> <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="single_line_mode">True</property> + <property name="single-line-mode">True</property> </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> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> <property name="label" translatable="yes">Contact Addresses</property> <style> <class name="bold16"/> </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> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel" id="no_addresses_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="label" translatable="yes">No contact addresses published for this server.</property> <property name="wrap">True</property> - <property name="max_width_chars">50</property> + <property name="max-width-chars">50</property> <style> <class name="dim-label"/> </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> <property name="width">2</property> </packing> </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> <style> <class name="margin-18"/> </style> @@ -142,37 +158,38 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Server</property> </object> <packing> - <property name="tab_fill">False</property> + <property name="tab-fill">False</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> - <property name="column_homogeneous">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> + <property name="column-homogeneous">True</property> <child> <object class="GtkLabel" id="connection_type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="single_line_mode">True</property> + <property name="single-line-mode">True</property> <property name="xalign">0</property> </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"> <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">Proxy Type</property> <style> @@ -180,44 +197,44 @@ </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="proxy_type"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">No proxy used</property> <property name="xalign">0</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="GtkButton" id="cert_button"> <property name="label" translatable="yes">View _Certificate</property> <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> <property name="halign">center</property> - <property name="margin_top">12</property> - <property name="use_underline">True</property> + <property name="margin-top">12</property> + <property name="use-underline">True</property> <signal name="clicked" handler="_on_cert_button_clicked" swapped="no"/> </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> <property name="width">2</property> </packing> </child> <child> <object class="GtkLabel"> <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">Proxy Host</property> <style> @@ -225,27 +242,27 @@ </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="proxy_host"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label">-</property> <property name="xalign">0</property> </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="GtkLabel"> <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">Type</property> <style> @@ -253,14 +270,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="domain_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">Domain</property> <style> @@ -268,14 +285,14 @@ </style> </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> </packing> </child> <child> <object class="GtkLabel" id="dns_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="label">DNS</property> <style> @@ -283,14 +300,14 @@ </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> </packing> </child> <child> <object class="GtkLabel" id="ip_port_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="label">IP / Port</property> <style> @@ -298,14 +315,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="websocket_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="label">WebSocket URL</property> <style> @@ -313,56 +330,56 @@ </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="domain"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel" id="dns"> - <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="xalign">0</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkLabel" id="ip_port"> - <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="xalign">0</property> </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> <object class="GtkLabel" id="websocket"> - <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="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> @@ -371,6 +388,33 @@ <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> <style> <class name="margin-18"/> </style> @@ -382,29 +426,40 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Connection</property> </object> <packing> <property name="position">1</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> <child> <object class="GtkBox" id="features"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> + <property name="can-focus">False</property> + <property name="border-width">18</property> <property name="orientation">vertical</property> <property name="spacing">12</property> <child> - <object class="GtkScrolledWindow" id="features_scrolled"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <property name="max_content_height">500</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <property name="max-content-height">500</property> <child> - <placeholder/> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="features_listbox"> + <property name="name">ServerInfo</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + </object> + </child> + </object> </child> </object> <packing> @@ -416,16 +471,16 @@ <child> <object class="GtkButton" id="clipboard_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Copy info to clipboard</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Copy info to clipboard</property> <property name="halign">end</property> <signal name="clicked" handler="_on_clipboard_button_clicked" 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> </object> @@ -443,12 +498,12 @@ <child type="tab"> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="label" translatable="yes">Features</property> </object> <packing> <property name="position">2</property> - <property name="tab_fill">False</property> + <property name="tab-fill">False</property> </packing> </child> </object> ===================================== gajim/gtk/builder.pyi ===================================== @@ -819,7 +819,7 @@ class ServerInfoBuilder(Builder): ip_port: Gtk.Label websocket: Gtk.Label features: Gtk.Box - features_scrolled: Gtk.ScrolledWindow + features_listbox: Gtk.ListBox clipboard_button: Gtk.Button ===================================== gajim/gtk/server_info.py ===================================== @@ -12,19 +12,30 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import cast +from typing import Any +from typing import NamedTuple +from typing import Optional + import logging -from collections import namedtuple from datetime import timedelta -from nbxmpp.errors import StanzaError -from nbxmpp.errors import MalformedStanzaError -from nbxmpp.namespaces import Namespace +from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import Pango +from nbxmpp.errors import StanzaError +from nbxmpp.errors import MalformedStanzaError +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.namespaces import Namespace +from nbxmpp.structs import LastActivityData +from nbxmpp.structs import SoftwareVersionResult +from nbxmpp.task import Task + from gajim.common import app from gajim.common import ged +from gajim.common.events import ServerDiscoReceived from gajim.common.helpers import open_uri from gajim.common.i18n import _ @@ -35,25 +46,37 @@ log = logging.getLogger('gajim.gui.server_info') +class Feature(NamedTuple): + name: str + available: bool + additional: Optional[str] = None + + class ServerInfo(Gtk.ApplicationWindow, EventHelper): - def __init__(self, account): + def __init__(self, account: str) -> None: Gtk.ApplicationWindow.__init__(self) EventHelper.__init__(self) self.set_name('ServerInfo') self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) - self.set_default_size(400, 600) + self.set_default_size(500, 600) self.set_show_menubar(False) self.set_title(_('Server Info')) self.set_type_hint(Gdk.WindowTypeHint.DIALOG) self.account = account + self._client = app.get_client(account) self._destroyed = False + if app.settings.get('use_kib_mib'): + self._units = GLib.FormatSizeFlags.IEC_UNITS + else: + self._units = GLib.FormatSizeFlags.DEFAULT + self._ui = get_builder('server_info.ui') self.add(self._ui.server_info_notebook) - self.connect('destroy', self.on_destroy) + self.connect('destroy', self._on_destroy) self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) @@ -61,39 +84,37 @@ def __init__(self, account): ('server-disco-received', ged.GUI1, self._server_disco_received), ]) - self.version = '' - self.hostname = app.get_hostname_from_account(account) - self._ui.server_hostname.set_text(self.hostname) - con = app.connections[account] - con.get_module('SoftwareVersion').request_software_version( - self.hostname, callback=self._software_version_received) + self._version = '' + self._hostname = app.get_hostname_from_account(account) + self._ui.server_hostname.set_text(self._hostname) + self._client.get_module('SoftwareVersion').request_software_version( + self._hostname, callback=self._software_version_received) - con.get_module('LastActivity').request_last_activity( - self.hostname, callback=self._on_last_activity) + self._client.get_module('LastActivity').request_last_activity( + self._hostname, callback=self._on_last_activity) - server_info = con.get_module('Discovery').server_info + server_info = self._client.get_module('Discovery').server_info self._add_contact_addresses(server_info.dataforms) - self.cert = con.certificate + self._cert = self._client.certificate self._add_connection_info() - self.feature_listbox = Gtk.ListBox() - self.feature_listbox.set_name('ServerInfo') - self.feature_listbox.set_selection_mode(Gtk.SelectionMode.NONE) - self._ui.features_scrolled.add(self.feature_listbox) - for feature in self.get_features(): - self.add_feature(feature) - self.clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + for feature in self._get_features(): + self._add_feature(feature) + self._clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) self.show_all() - def _on_key_press(self, _widget, event): + def _on_destroy(self, *args: Any) -> None: + self._destroyed = True + + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _add_connection_info(self): + def _add_connection_info(self) -> None: # Connection type - nbxmpp_client = app.connections[self.account].connection + nbxmpp_client = self._client.connection address = nbxmpp_client.current_address self._ui.connection_type.set_text(address.type.value) @@ -107,7 +128,7 @@ def _add_connection_info(self): self._ui.proxy_type.set_text(proxy.type) self._ui.proxy_host.set_text(proxy.host) - self._ui.cert_button.set_sensitive(self.cert) + self._ui.cert_button.set_sensitive(self._cert) self._ui.domain.set_text(address.domain) @@ -126,13 +147,13 @@ def _add_connection_info(self): self._ui.websocket.set_visible(visible) self._ui.websocket.set_text(address.uri or '') - def _on_cert_button_clicked(self, _button): + def _on_cert_button_clicked(self, _button: Gtk.Button) -> None: open_window('CertificateDialog', account=self.account, transient_for=self, - cert=self.cert) + cert=self._cert) - def _add_contact_addresses(self, dataforms): + def _add_contact_addresses(self, dataforms: list[SimpleDataForm]) -> None: fields = { 'admin-addresses': _('Admin'), 'status-addresses': _('Status'), @@ -159,8 +180,10 @@ def _add_contact_addresses(self, dataforms): row_count += 1 @staticmethod - def _get_addresses(fields, dataforms): - addresses = {} + def _get_addresses(fields: dict[str, str], + dataforms: list[SimpleDataForm] + ) -> Optional[dict[str, list[str]]]: + addresses: dict[str, list[str]] = {} for form in dataforms: field = form.vars.get('FORM_TYPE') if field.value != 'http://jabber.org/network/serverinfo': @@ -182,16 +205,19 @@ def _get_addresses(fields, dataforms): return None @staticmethod - def _get_address_type_label(text): + def _get_address_type_label(text: str) -> Gtk.Label: label = Gtk.Label(label=text) label.set_halign(Gtk.Align.END) label.set_valign(Gtk.Align.START) label.get_style_context().add_class('dim-label') return label - def _get_address_label(self, address, last=False): + def _get_address_label(self, + address: str, + last: bool = False + ) -> Gtk.Label: label = Gtk.Label() - label.set_markup('<a href="%s">%s</a>' % (address, address)) + label.set_markup(f'<a href="{address}">{address}</a>') label.set_ellipsize(Pango.EllipsizeMode.END) label.set_xalign(0) label.set_halign(Gtk.Align.START) @@ -201,13 +227,13 @@ def _get_address_label(self, address, last=False): label.set_margin_bottom(6) return label - def _on_activate_link(self, label, *args): + def _on_activate_link(self, label: Gtk.Label, *args: Any) -> int: open_uri(label.get_text(), account=self.account) return Gdk.EVENT_STOP - def _on_last_activity(self, task): + def _on_last_activity(self, task: Task) -> None: try: - result = task.finish() + result = cast(LastActivityData, task.finish()) except (StanzaError, MalformedStanzaError) as error: log.warning(error) return @@ -217,141 +243,137 @@ def _on_last_activity(self, task): if result.seconds >= 3600: hours = delta.seconds // 3600 uptime = _('%(days)s days, %(hours)s hours') % { - 'days': delta.days, 'hours': hours} + 'days': delta.days, + 'hours': hours} self._ui.server_uptime.set_text(uptime) - def _software_version_received(self, task): + def _software_version_received(self, task: Task) -> None: try: - result = task.finish() + result = cast(SoftwareVersionResult, task.finish()) except StanzaError: - self.version = _('Unknown') + self._version = _('Unknown') else: - self.version = '%s %s' % (result.name, result.version) + self._version = f'{result.name} {result.version}' - self._ui.server_software.set_text(self.version) + self._ui.server_software.set_text(self._version) - @staticmethod - def update(func, listbox): - for index, item in enumerate(func()): - row = listbox.get_row_at_index(index) - row.get_child().update(item) - row.set_tooltip_text(row.get_child().tooltip) - - def _server_disco_received(self, _event): - self.update(self.get_features, self.feature_listbox) + def _server_disco_received(self, _event: ServerDiscoReceived) -> None: + features = self._get_features() + for index, item in enumerate(features): + row = cast( + FeatureItem, self._ui.features_listbox.get_row_at_index(index)) + row.update(item) - def add_feature(self, feature): + def _add_feature(self, feature: Feature) -> None: item = FeatureItem(feature) - self.feature_listbox.add(item) - item.get_parent().set_tooltip_text(item.tooltip or '') - - def get_features(self): - con = app.connections[self.account] - Feature = namedtuple('Feature', - ['name', 'available', 'tooltip', 'enabled']) - Feature.__new__.__defaults__ = (None, None) # type: ignore - - # HTTP File Upload - http_upload_info = con.get_module('HTTPUpload').httpupload_namespace - if con.get_module('HTTPUpload').available: - max_file_size = con.get_module('HTTPUpload').max_file_size - if max_file_size is not None: - max_file_size = max_file_size / (1024 * 1024) - http_upload_info = http_upload_info + ' (max. %s MiB)' % \ - max_file_size + self._ui.features_listbox.add(item) + + def _get_features(self) -> list[Feature]: + http_upload_module = self._client.get_module('HTTPUpload') + http_upload_info = http_upload_module.httpupload_namespace + if http_upload_module.available: + max_size = http_upload_module.max_file_size + if max_size is not None: + max_size = GLib.format_size_full(max_size, self._units) + http_upload_info = f'{http_upload_info} (max. {max_size})' return [ Feature('XEP-0045: Multi-User Chat', - con.get_module('MUC').supported), + self._client.get_module('MUC').supported), Feature('XEP-0054: vcard-temp', - con.get_module('VCardTemp').supported), + self._client.get_module('VCardTemp').supported), Feature('XEP-0077: In-Band Registration', - con.get_module('Register').supported), + self._client.get_module('Register').supported), Feature('XEP-0163: Personal Eventing Protocol', - con.get_module('PEP').supported), + self._client.get_module('PEP').supported), Feature('XEP-0163: #publish-options', - con.get_module('PubSub').publish_options), + self._client.get_module('PubSub').publish_options), Feature('XEP-0191: Blocking Command', - con.get_module('Blocking').supported, + self._client.get_module('Blocking').supported, Namespace.BLOCKING), Feature('XEP-0198: Stream Management', - con.features.has_sm, Namespace.STREAM_MGMT), + self._client.features.has_sm, + Namespace.STREAM_MGMT), Feature('XEP-0258: Security Labels in XMPP', - con.get_module('SecLabels').supported, + self._client.get_module('SecLabels').supported, Namespace.SECLABEL), Feature('XEP-0280: Message Carbons', - con.get_module('Carbons').supported, + self._client.get_module('Carbons').supported, Namespace.CARBONS), Feature('XEP-0313: Message Archive Management', - con.get_module('MAM').available), + self._client.get_module('MAM').available), Feature('XEP-0363: HTTP File Upload', - con.get_module('HTTPUpload').available, + self._client.get_module('HTTPUpload').available, http_upload_info), Feature('XEP-0398: Avatar Conversion', - con.get_module('VCardAvatars').avatar_conversion_available), + self._client.get_module('VCardAvatars').avatar_conversion_available), Feature('XEP-0411: Bookmarks Conversion', - con.get_module('Bookmarks').conversion), + self._client.get_module('Bookmarks').conversion), Feature('XEP-0402: Bookmarks Compat', - con.get_module('Bookmarks').compat), + self._client.get_module('Bookmarks').compat), Feature('XEP-0402: Bookmarks Compat PEP', - con.get_module('Bookmarks').compat_pep) + self._client.get_module('Bookmarks').compat_pep) ] - def _on_clipboard_button_clicked(self, _widget): - server_software = 'Server Software: %s\n' % self.version + def _on_clipboard_button_clicked(self, _widget: Gtk.Button) -> None: + server_software = _('Server Software: %s\n') % self._version server_features = '' - for feature in self.get_features(): + for feature in self._get_features(): if feature.available: - available = 'Yes' - else: - available = 'No' - if feature.tooltip is not None: - tooltip = '(%s)' % feature.tooltip + available = _('Available') else: - tooltip = '' - server_features += '%s: %s %s\n' % ( - feature.name, available, tooltip) + available = _('Not available') + additional = '' + if feature.additional is not None: + additional = f'({feature.additional})' + server_features += f'{feature.name}: {available} {additional}\n' clipboard_text = server_software + server_features - self.clipboard.set_text(clipboard_text, -1) + self._clipboard.set_text(clipboard_text, -1) - def on_destroy(self, *args): - self._destroyed = True +class FeatureItem(Gtk.ListBoxRow): + def __init__(self, feature: Feature) -> None: + Gtk.ListBoxRow.__init__(self) + self._feature = feature + + grid = Gtk.Grid(row_spacing=3, column_spacing=12) + + self._icon = Gtk.Image() + self._feature_label = Gtk.Label() + self._additional_label = Gtk.Label() + self._additional_label.set_halign(Gtk.Align.START) + self._additional_label.set_no_show_all(True) + self._additional_label.get_style_context().add_class('dim-label') + + grid.attach(self._icon, 0, 0, 1, 1) + grid.attach(self._feature_label, 1, 0, 1, 1) + grid.attach(self._additional_label, 1, 1, 1, 1) + + self._set_feature() + + self.add(grid) + self.show_all() + + def _set_feature(self) -> None: + self._feature_label.set_text(self._feature.name) + if self._feature.additional is not None: + self._additional_label.set_text(self._feature.additional) + self._additional_label.show() + + self._icon.get_style_context().remove_class('error-color') + self._icon.get_style_context().remove_class('success-color') -class FeatureItem(Gtk.Grid): - def __init__(self, feature): - super().__init__() - self.tooltip = feature.tooltip - self.set_column_spacing(6) - - self.icon = Gtk.Image() - self.feature_label = Gtk.Label(label=feature.name) - self.set_feature(feature.available, feature.enabled) - - self.add(self.icon) - self.add(self.feature_label) - - def set_feature(self, available, enabled): - self.icon.get_style_context().remove_class('error-color') - self.icon.get_style_context().remove_class('warning-color') - self.icon.get_style_context().remove_class('success-color') - - if not available: - self.icon.set_from_icon_name('window-close-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('error-color') - elif enabled is False: - self.icon.set_from_icon_name('dialog-warning-symbolic', - Gtk.IconSize.MENU) - self.tooltip += _('\nDisabled in preferences') - self.icon.get_style_context().add_class('warning-color') + if self._feature.available: + self._icon.set_from_icon_name( + 'emblem-ok-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('success-color') else: - self.icon.set_from_icon_name('emblem-ok-symbolic', - Gtk.IconSize.MENU) - self.icon.get_style_context().add_class('success-color') + self._icon.set_from_icon_name( + 'window-close-symbolic', Gtk.IconSize.MENU) + self._icon.get_style_context().add_class('error-color') - def update(self, feature): - self.tooltip = feature.tooltip - self.set_feature(feature.available, feature.enabled) + def update(self, feature: Feature) -> None: + self._feature = feature + self._set_feature() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45585811f2f1eaf77bd5f0794638708… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45585811f2f1eaf77bd5f0794638708… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Notifications: Add code comment
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 12c20823 by lovetox at 2022-01-25T22:59:16+01:00 Notifications: Add code comment - - - - - 45585811 by lovetox at 2022-01-25T23:06:14+01:00 PlainWidget: Use open_uri() to open links - - - - - 2 changed files: - gajim/gtk/conversation/plain_widget.py - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -86,6 +86,7 @@ def __init__(self, account: str, selectable: bool) -> None: self.get_style_context().add_class('gajim-conversation-text') self.connect('populate-popup', self._on_populate_popup) + self.connect('activate-link', self._on_activate_link) def _on_populate_popup(self, label: Gtk.Label, menu: Gtk.Menu) -> None: selected, start, end = label.get_selection_bounds() @@ -118,6 +119,10 @@ def add_action_phrase(self, text: str) -> None: def update_text_tags(self) -> None: pass + def _on_activate_link(self, _label: Gtk.Label, uri: str) -> int: + open_uri(uri, self._account) + return Gdk.EVENT_STOP + class MessageTextview(Gtk.TextView): def __init__(self, account: str) -> None: ===================================== gajim/gtk/notification.py ===================================== @@ -253,6 +253,11 @@ def __init__(self): def _detect_dbus_caps(self) -> None: if app.is_flatpak() or app.desktop_env == 'gnome': + # Gnome Desktop does not use org.freedesktop.Notifications. + # It has its own API at org.gtk.Notifications, which is not an + # implementation of the freedesktop spec. There is no documentation + # on what it currently supports, we can assume at least what the + # GLib.Notification API offers (icons, actions). self._caps = ['actions'] self._dbus_available = True return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58aaa25098197c1fcdac80ec523685b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58aaa25098197c1fcdac80ec523685b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Notifications: Escape markup in body only if body-markup is supported
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 58aaa250 by lovetox at 2022-01-25T22:24:13+01:00 Notifications: Escape markup in body only if body-markup is supported - Gnome does not support body-markup - Title should not be escaped - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -247,11 +247,13 @@ class Linux(NotificationBackend): def __init__(self): NotificationBackend.__init__(self) self._dbus_available: bool = False - self._daemon_capabilities = ['actions'] + self._caps: list[str] = [] self._detect_dbus_caps() + log.info('Detected notification capabilities: %s', self._caps) def _detect_dbus_caps(self) -> None: - if app.is_flatpak(): + if app.is_flatpak() or app.desktop_env == 'gnome': + self._caps = ['actions'] self._dbus_available = True return @@ -259,7 +261,7 @@ def on_proxy_ready(_source: Gio.DBusProxy, res: Gio.AsyncResult) -> None: try: proxy = Gio.DBusProxy.new_finish(res) - self._daemon_capabilities = proxy.GetCapabilities() # type: ignore + self._caps = proxy.GetCapabilities() # type: ignore except GLib.Error as error: log.warning('Notifications D-Bus not available: %s', error) else: @@ -282,8 +284,13 @@ def _send(self, event: events.Notification) -> None: notification = Gio.Notification() if event.title is not None: - notification.set_title(GLib.markup_escape_text(event.title)) - notification.set_body(GLib.markup_escape_text(event.text)) + notification.set_title(event.title) + + text = event.text + if 'body-markup' in self._caps: + text = GLib.markup_escape_text(event.text) + + notification.set_body(text) notification.set_priority(Gio.NotificationPriority.NORMAL) icon = self._make_icon(event) @@ -302,7 +309,7 @@ def _add_actions(self, if event.type not in self._action_types: return - if 'actions' not in self._daemon_capabilities: + if 'actions' not in self._caps: return jid = '' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58aaa25098197c1fcdac80ec523685b4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/58aaa25098197c1fcdac80ec523685b4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] Backport jingle-initiator, fixes jingle file transfer from Conversations
by Philipp Hörist (＠lovetox) 25 Jan '22

25 Jan '22

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: e98cf336 by ValdikSS at 2021-12-15T03:13:02+03:00 Backport jingle-initiator, fixes jingle file transfer from Conversations Conversations XMPP client does not include initiator attribute in Jingle connection stanza, while Gajim 1.3 expects it and fails to accept the file or even show the file transfer dialog without it. - - - - - 1 changed file: - gajim/common/jingle_session.py Changes: ===================================== gajim/common/jingle_session.py ===================================== @@ -516,7 +516,17 @@ def __on_session_initiate(self, stanza, jingle, error, action): """ if self.state != JingleStates.ENDED: raise OutOfOrder - self.initiator = jingle['initiator'] + + # In "session-initiate", the <jingle/> element SHOULD possess an + # 'initiator' attribute. If it differs from the JID 'from', jingle + # 'initiator' SHOULD be ignored. + if jingle['initiator'] is None: + self.initiator = str(stanza['from']) + elif str(jingle['initiator']) != str(stanza['from']): + self.initiator = str(stanza['from']) + else: + self.initiator = str(jingle['initiator']) + self.responder = self.ourjid self.peerjid = self.initiator self.accepted = False # user did not accept this session yet View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e98cf3367c962c8de4345e27ff09e68f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e98cf3367c962c8de4345e27ff09e68f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] SingleMessageWindow: Typing
by Daniel Brötzmann (＠wurstsalat) 24 Jan '22

24 Jan '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 7d650458 by wurstsalat at 2022-01-24T23:45:29+01:00 SingleMessageWindow: Typing - - - - - 1 changed file: - gajim/gtk/single_message.py Changes: ===================================== gajim/gtk/single_message.py ===================================== @@ -12,9 +12,14 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any +from typing import Optional + from gi.repository import Gdk from gi.repository import Gtk +from nbxmpp.protocol import JID + from gajim.common import app from gajim.common.helpers import get_contact_dict_for_account from gajim.common.helpers import validate_jid @@ -31,7 +36,10 @@ class SingleMessageWindow(Gtk.ApplicationWindow): - def __init__(self, account, recipients=None): + def __init__(self, + account: str, + recipients: Optional[str] = None + ) -> None: Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) @@ -54,10 +62,7 @@ def __init__(self, account, recipients=None): self._message_buffer = self._ui.message_textview.get_buffer() self._message_buffer.connect('changed', self._update_char_counter) - if isinstance(recipients, list): - jids = ', '.join([contact.jid for contact in recipients]) - self._ui.recipients_entry.set_text(jids) - elif recipients is not None: + if recipients is not None: self._ui.recipients_entry.set_text(recipients) if (app.settings.get('use_speller') and @@ -85,28 +90,28 @@ def __init__(self, account, recipients=None): if self._recipients is not None: self._ui.message_textview.grab_focus() - self.connect('key-press-event', self._on_key_press_event) + self.connect('key-press-event', self._on_key_press) self._ui.connect_signals(self) self.show_all() - def _on_key_press_event(self, _widget, event): + def _on_key_press(self, _widget: Gtk.Widget, event: Gdk.EventKey) -> None: if event.keyval == Gdk.KEY_Escape: self.destroy() - def _on_changed(self, *args): + def _on_changed(self, *args: Any) -> None: recipients = self._ui.recipients_entry.get_text() begin, end = self._message_buffer.get_bounds() message = self._message_buffer.get_text(begin, end, True) - self._ui.send_button.set_sensitive(recipients and message) + self._ui.send_button.set_sensitive(bool(recipients and message)) - def _update_char_counter(self, _widget): + def _update_char_counter(self, _widget: Gtk.TextView) -> None: characters_no = self._message_buffer.get_char_count() self._ui.count_chars_label.set_text( _('Characters typed: %s') % str(characters_no)) self._on_changed() - def _on_send_clicked(self, _widget): + def _on_send_clicked(self, _widget: Gtk.Button) -> None: if not app.account_is_available(self.account): ErrorDialog(_('Not Connected'), _('Please make sure you are connected with "%s".') % @@ -118,7 +123,7 @@ def _on_send_clicked(self, _widget): begin, end = self._message_buffer.get_bounds() message = self._message_buffer.get_text(begin, end, True) - recipient_list = [] + recipient_list: list[JID] = [] for jid in jids.split(','): try: jid = validate_jid(jid.strip()) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d650458cce3ecb1ed918515caee6c30… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7d650458cce3ecb1ed918515caee6c30… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] 2 commits: Errors: Add type annotations
by Philipp Hörist (＠lovetox) 24 Jan '22

24 Jan '22

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 5a804eaf by lovetox at 2022-01-24T23:33:06+01:00 Errors: Add type annotations - - - - - b3010f91 by lovetox at 2022-01-24T23:33:30+01:00 Add type annotations - - - - - 3 changed files: - nbxmpp/errors.py - nbxmpp/protocol.py - nbxmpp/task.py Changes: ===================================== nbxmpp/errors.py ===================================== @@ -15,9 +15,13 @@ # You should have received a copy of the GNU General Public License # along with this program; If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + import logging +from typing import Optional from nbxmpp.namespaces import Namespace +from nbxmpp.protocol import Protocol def is_error(error): @@ -25,14 +29,14 @@ def is_error(error): class BaseError(Exception): - def __init__(self, is_fatal=False): + def __init__(self, is_fatal: bool = False) -> None: self.is_fatal = is_fatal self.text = '' - def __str__(self): + def __str__(self) -> str: return self.text - def get_text(self, pref_lang=None): + def get_text(self, pref_lang: Optional[str] = None) -> str: return self.text @@ -41,18 +45,18 @@ class StanzaError(BaseError): log_level = logging.INFO app_namespace = None - def __init__(self, stanza): + def __init__(self, stanza: Protocol): BaseError.__init__(self) self.stanza = stanza self._stanza_name = stanza.getName() self._error_node = stanza.getTag('error') - self.condition = stanza.getError() + self.condition: Optional[str] = stanza.getError() self.condition_data = self._error_node.getTagData(self.condition) self.app_condition = self._get_app_condition() self.type = stanza.getErrorType() self.jid = stanza.getFrom() self.id = stanza.getID() - self._text = {} + self._text: dict[str, str] = {} text_elements = self._error_node.getTags('text', namespace=Namespace.STANZAS) @@ -61,7 +65,7 @@ class StanzaError(BaseError): text = element.getData() self._text[lang] = text - def _get_app_condition(self): + def _get_app_condition(self) -> Optional[str]: if self.app_namespace is None: return None @@ -70,7 +74,7 @@ class StanzaError(BaseError): return node.getName() return None - def get_text(self, pref_lang=None): + def get_text(self, pref_lang: Optional[str] = None) -> str: if pref_lang is not None: text = self._text.get(pref_lang) if text is not None: @@ -87,10 +91,10 @@ class StanzaError(BaseError): return self._text.popitem()[1] return '' - def set_text(self, lang, text): + def set_text(self, lang: str, text: str) -> None: self._text[lang] = text - def __str__(self): + def __str__(self) -> str: condition = self.condition if self.app_condition is not None: condition = '%s (%s)' % (self.condition, self.app_condition) ===================================== nbxmpp/protocol.py ===================================== @@ -936,7 +936,7 @@ class Protocol(Node): """ self.setAttr('id', val) - def getError(self): + def getError(self) -> Optional[str]: """ Return the error-condition (if present) or the textual description of the error (otherwise) ===================================== nbxmpp/task.py ===================================== @@ -267,7 +267,7 @@ class Task: return self._error return self._result - def finish(self): + def finish(self) -> Any: if self._error is not None: raise self._error # pylint: disable=raising-bad-type return self._result View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/f79f9df663b7661b602e462… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/-/compare/f79f9df663b7661b602e462… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupchatDetails: Add GroupchatAffiliation Page
by Philipp Hörist (＠lovetox) 24 Jan '22

24 Jan '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e66bfcea by lovetox at 2022-01-24T23:23:01+01:00 GroupchatDetails: Add GroupchatAffiliation Page - - - - - 7 changed files: - + gajim/data/gui/groupchat_affiliation.ui - gajim/data/gui/groupchat_details.ui - gajim/gtk/builder.pyi - gajim/gtk/dialogs.py - + gajim/gtk/groupchat_affiliation.py - gajim/gtk/groupchat_details.py - pyrightconfig.json Changes: ===================================== gajim/data/gui/groupchat_affiliation.ui ===================================== @@ -0,0 +1,280 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkListStore" id="affiliation_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gboolean"/> + </columns> + </object> + <object class="GtkListStore" id="combo_store"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + <data> + <row> + <col id="0" translatable="yes">Owner</col> + <col id="1">owner</col> + </row> + <row> + <col id="0" translatable="yes">Admin</col> + <col id="1">admin</col> + </row> + <row> + <col id="0" translatable="yes">Member</col> + <col id="1">member</col> + </row> + </data> + </object> + <object class="GtkBox" id="main_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkScrolledWindow" id="affiliation_scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <property name="hscrollbar-policy">never</property> + <property name="shadow-type">in</property> + <child> + <object class="GtkTreeView" id="affiliation_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="model">affiliation_store</property> + <property name="search-column">0</property> + <property name="show-expanders">False</property> + <property name="enable-grid-lines">horizontal</property> + <child internal-child="selection"> + <object class="GtkTreeSelection"> + <signal name="changed" handler="_on_selection_changed" swapped="no"/> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">fixed</property> + <property name="min-width">150</property> + <property name="title">XMPP Address</property> + <property name="expand">True</property> + <property name="clickable">True</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">0</property> + <child> + <object class="GtkCellRendererText"> + <property name="ellipsize">end</property> + <property name="placeholder-text">user(a)example.org</property> + <signal name="edited" handler="_on_jid_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">5</attribute> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="reserved_name_column"> + <property name="resizable">True</property> + <property name="sizing">fixed</property> + <property name="title" translatable="yes">Reserved Name</property> + <property name="clickable">True</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">1</property> + <child> + <object class="GtkCellRendererText"> + <property name="placeholder-text">Name</property> + <signal name="edited" handler="_on_nick_edited" swapped="no"/> + </object> + <attributes> + <attribute name="editable">4</attribute> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="sizing">fixed</property> + <property name="min-width">120</property> + <property name="title" translatable="yes">Affiliation</property> + <property name="clickable">True</property> + <property name="sort-indicator">True</property> + <property name="sort-column-id">3</property> + <child> + <object class="GtkCellRendererCombo"> + <property name="has-entry">False</property> + <property name="model">combo_store</property> + <property name="text-column">0</property> + <signal name="changed" handler="_on_affiliation_changed" swapped="no"/> + </object> + <attributes> + <attribute name="editable">4</attribute> + <attribute name="text">3</attribute> + </attributes> + </child> + </object> + </child> + </object> + </child> + <style> + <class name="margin-12"/> + </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="button_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkBox" id="add_remove_button_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + <property name="vexpand">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="add_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">Only Admins and Owners can modify the affiliation</property> + <property name="halign">start</property> + <signal name="clicked" handler="_on_add" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-add-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_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">Only Admins and Owners can modify the affiliation</property> + <signal name="clicked" handler="_on_remove" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">list-remove-symbolic</property> + </object> + </child> + </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">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="status_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="stock">gtk-missing-image</property> + <property name="icon_size">1</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSpinner" id="spinner"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="apply_button"> + <property name="label">_Apply</property> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_apply" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="margin-12"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/data/gui/groupchat_details.ui ===================================== @@ -128,6 +128,24 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="affiliation_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + <style> + <class name="padding-18"/> + </style> + </object> + <packing> + <property name="name">affiliations</property> + <property name="title" translatable="yes">Affiliations</property> + <property name="position">2</property> + </packing> + </child> <style> <class name="stack-border"/> </style> ===================================== gajim/gtk/builder.pyi ===================================== @@ -366,6 +366,22 @@ class FiletransfersBuilder(Builder): file_transfers_window_atkobject: Atk.Object +class GroupchatAffiliationBuilder(Builder): + affiliation_store: Gtk.ListStore + combo_store: Gtk.ListStore + main_box: Gtk.Box + affiliation_scrolled: Gtk.ScrolledWindow + affiliation_treeview: Gtk.TreeView + reserved_name_column: Gtk.TreeViewColumn + button_box: Gtk.Box + add_remove_button_box: Gtk.Box + add_button: Gtk.Button + remove_button: Gtk.Button + status_image: Gtk.Image + spinner: Gtk.Spinner + apply_button: Gtk.Button + + class GroupchatConfigBuilder(Builder): affiliation_store: Gtk.ListStore combo_store: Gtk.ListStore @@ -446,8 +462,6 @@ class GroupchatControlBuilder(Builder): destroy_button: Gtk.Button destroy_alternate_entry: Gtk.Entry destroy_reason_entry: Gtk.Entry - name_entry: Gtk.Entry - rename_button: Gtk.Button invite_grid: Gtk.Grid invite_button: Gtk.Button avatar_button_image: Gtk.Image @@ -484,6 +498,7 @@ class GroupchatDetailsBuilder(Builder): main_stack: Gtk.Stack info_box: Gtk.Box settings_box: Gtk.Box + affiliation_box: Gtk.Box class GroupchatInfoScrolledBuilder(Builder): @@ -988,6 +1003,8 @@ def get_builder(file_name: Literal['file_transfer_send.ui'], widgets: list[str] @overload def get_builder(file_name: Literal['filetransfers.ui'], widgets: list[str] = ...) -> FiletransfersBuilder: ... @overload +def get_builder(file_name: Literal['groupchat_affiliation.ui'], widgets: list[str] = ...) -> GroupchatAffiliationBuilder: ... +@overload def get_builder(file_name: Literal['groupchat_config.ui'], widgets: list[str] = ...) -> GroupchatConfigBuilder: ... @overload def get_builder(file_name: Literal['groupchat_control.ui'], widgets: list[str] = ...) -> GroupchatControlBuilder: ... ===================================== gajim/gtk/dialogs.py ===================================== @@ -204,8 +204,8 @@ class ErrorDialog(HigDialog): """ def __init__(self, - pritext, - sectext='', + pritext: str, + sectext: str = '', on_response_ok=None, on_response_cancel=None, transient_for=None): ===================================== gajim/gtk/groupchat_affiliation.py ===================================== @@ -0,0 +1,345 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from __future__ import annotations + +from typing import NamedTuple +from typing import Optional +from typing import cast + +import logging +from enum import IntEnum + +from gi.repository import Gtk +from nbxmpp.errors import StanzaError +from nbxmpp.structs import AffiliationResult +from nbxmpp.task import Task + +from gajim.common.client import Client +from gajim.common.i18n import _ +from gajim.common.modules.contacts import GroupchatContact + +from gajim.gui.builder import get_builder +from gajim.gui.dialogs import ErrorDialog + + +log = logging.getLogger('gajim.gui.groupchat_affiliation') + + +class AffiliationRow(NamedTuple): + jid: str + nick: Optional[str] + affiliation: str + + +class Column(IntEnum): + JID = 0 + NICK = 1 + AFFILIATION = 2 + AFFILIATION_TEXT = 3 + + +class GroupchatAffiliation(Gtk.Box): + def __init__(self, client: Client, contact: GroupchatContact) -> None: + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + + self._client = client + self._contact = contact + self._current_rows: set[AffiliationRow] = set() + + self_contact = contact.get_self() + assert self_contact is not None + self._own_affiliation = self_contact.affiliation.value + + self._ui = get_builder('groupchat_affiliation.ui') + + self._treeview = self._ui.affiliation_treeview + self._store = self._ui.affiliation_store + + self.add(self._ui.main_box) + + if self._own_affiliation in ('admin', 'owner'): + self._ui.add_button.set_sensitive(True) + self._ui.add_button.set_tooltip_text('') + + self._ui.connect_signals(self) + + for affiliation in ('owner', 'admin', 'member'): + self._client.get_module('MUC').get_affiliation( + self._contact.jid, + affiliation, + callback=self._on_affiliations_received, + user_data=affiliation) + + def _on_apply(self, _button: Gtk.Button) -> None: + self._begin_progress() + self._set_affiliations() + + def _begin_progress(self) -> None: + self._ui.spinner.show() + self._ui.spinner.start() + self._ui.apply_button.set_sensitive(False) + self._ui.affiliation_scrolled.set_sensitive(False) + self._ui.add_remove_button_box.set_sensitive(False) + + def _end_progress(self, result: str) -> None: + self._ui.spinner.stop() + self._ui.spinner.hide() + self._ui.apply_button.set_sensitive(result == 'error') + self._ui.affiliation_scrolled.set_sensitive(True) + self._ui.add_remove_button_box.set_sensitive(True) + + def _on_add(self, _button: Gtk.Button) -> None: + affiliation_edit, jid_edit = self._allowed_to_edit('member') + + iter_ = self._store.append([None, + None, + 'member', + _('Member'), + affiliation_edit, + jid_edit]) + + path = self._store.get_path(iter_) + self._treeview.scroll_to_cell(path, None, False, 0, 0) + self._treeview.get_selection().unselect_all() + self._treeview.get_selection().select_path(path) + + self._update_apply_button_state() + + def _on_remove(self, _button: Gtk.Button) -> None: + _model, paths = self._treeview.get_selection().get_selected_rows() + + owner_count = len([row for row in self._store + if row[Column.AFFILIATION] == 'owner']) + references: list[Gtk.TreeRowReference] = [] + for path in paths: + if self._store[path][Column.AFFILIATION] == 'owner': + if owner_count < 2: + # There must be at least one owner + ErrorDialog(_('Error'), + _('A Group Chat needs at least one Owner')) + return + owner_count -= 1 + references.append(Gtk.TreeRowReference.new(self._store, path)) + + for ref in references: + path = ref.get_path() + assert path is not None + iter_ = self._store.get_iter(path) + self._store.remove(iter_) + + self._update_apply_button_state() + + def _on_jid_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str) -> None: + + old_text = self._store[path][Column.JID] + if new_text == old_text: + return + + if self._jid_exists(new_text): + self._raise_error() + return + + self._store[path][Column.JID] = new_text + self._update_apply_button_state() + + def _on_nick_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str) -> None: + self._store[path][Column.NICK] = new_text or None + self._update_apply_button_state() + + def _on_affiliation_changed(self, + cell_renderer_combo: Gtk.CellRendererCombo, + path_string: str, + new_iter: Gtk.TreeIter) -> None: + + combo_store = cell_renderer_combo.get_property('model') + affiliation_text = combo_store.get_value(new_iter, 0) + affiliation = combo_store.get_value(new_iter, 1) + + self._store[path_string][Column.AFFILIATION] = affiliation + self._store[path_string][Column.AFFILIATION_TEXT] = affiliation_text + self._update_apply_button_state() + + def _on_selection_changed(self, tree_selection: Gtk.TreeSelection) -> None: + sensitive = bool(tree_selection.count_selected_rows()) + selected_affiliations = self._get_selected_affiliations(tree_selection) + self._set_remove_button_state(sensitive, selected_affiliations) + + def _jid_exists(self, jid: str) -> bool: + for row in self._store: + if row[Column.JID] == jid: + return True + return False + + @staticmethod + def _get_selected_affiliations(tree_selection: Gtk.TreeSelection + ) -> set[str]: + model, paths = tree_selection.get_selected_rows() + selected_affiliations: set[str] = set() + for path in paths: + selected_affiliations.add(model[path][Column.AFFILIATION]) + return selected_affiliations + + def _set_remove_button_state(self, + sensitive: bool, + selected_affiliations: set[str]) -> None: + + if self._own_affiliation not in ('admin', 'owner'): + self._ui.remove_button.set_sensitive(False) + return + + self._ui.remove_button.set_tooltip_text('') + + if not sensitive: + self._ui.remove_button.set_sensitive(False) + return + + if self._own_affiliation == 'owner': + self._ui.remove_button.set_sensitive(True) + return + + if set(['owner', 'admin']).intersection(selected_affiliations): + self._ui.remove_button.set_sensitive(False) + self._ui.remove_button.set_tooltip_text( + _('You are not allowed to modify the affiliation ' + 'of Admins and Owners')) + return + + self._ui.remove_button.set_sensitive(True) + + def _update_apply_button_state(self): + if self._own_affiliation not in ('admin', 'owner'): + return + new_rows = self._get_new_rows() + self._ui.apply_button.set_sensitive(new_rows != self._current_rows) + self._ui.status_image.hide() + + def _allowed_to_edit(self, affiliation: str) -> tuple[bool, bool]: + if self._own_affiliation == 'owner': + return True, True + + if self._own_affiliation == 'admin': + if affiliation in ('admin', 'owner'): + return False, False + return False, True + return False, False + + def _get_new_rows(self) -> set[AffiliationRow]: + rows: set[AffiliationRow] = set() + + for row in self._store: + if not row[Column.JID]: + continue + + rows.add(AffiliationRow(jid=row[Column.JID], + nick=row[Column.NICK], + affiliation=row[Column.AFFILIATION])) + return rows + + def _get_diff(self) -> list[AffiliationRow]: + + new_rows = self._get_new_rows() + + before = {row.jid for row in self._current_rows} + after = {row.jid for row in new_rows} + + removed = before - after + removed_rows = [row for row in self._current_rows if row.jid in removed] + removed_rows = [row._replace(affiliation='none') + for row in removed_rows] + + added = after - before + added_rows = [row for row in new_rows if row.jid in added] + + same = after - removed - added + same_rows = {row for row in new_rows if row.jid in same} + modified_rows = list(same_rows - self._current_rows) + + return removed_rows + added_rows + modified_rows + + def _set_affiliations(self) -> None: + diff_rows = self._get_diff() + + affiliations = {} + for row in diff_rows: + affiliations[row.jid] = {'affiliation': row.affiliation} + if row.nick: + affiliations[row.jid]['nick'] = row.nick + + self._client.get_module('MUC').set_affiliation( + self._contact.jid, + affiliations, + callback=self._on_affiliation_finished) + + def _on_affiliation_finished(self, task: Task) -> None: + try: + task.finish() + except StanzaError as error: + log.info('Error while setting affiliations: %s', error) + self._end_progress('error') + self._set_status_image('error', tooltip_text=str(error)) + return + + self._current_rows = self._get_new_rows() + self._set_status_image('success') + self._end_progress('success') + + def _on_affiliations_received(self, task: Task) -> None: + affiliation = task.get_user_data() + try: + result = cast(AffiliationResult, task.finish()) + except StanzaError as error: + log.info('Error while requesting %s affiliations: %s', + affiliation, error.condition) + return + + for jid, attrs in result.users.items(): + affiliation_edit, jid_edit = self._allowed_to_edit(affiliation) + nick = attrs.get('nick') + + jid = str(jid) + self._store.append([jid, + nick, + affiliation, + _(affiliation.capitalize()), + affiliation_edit, + jid_edit]) + + self._current_rows.add(AffiliationRow(jid=jid, + nick=nick, + affiliation=affiliation)) + + def _set_status_image(self, state: str, tooltip_text: str = '') -> None: + icon_name = 'feather-check-symbolic' + css_class = 'success-color' + + if state == 'error': + icon_name = 'dialog-warning-symbolic' + css_class = 'warning-color' + + self._ui.status_image.set_from_icon_name(icon_name, Gtk.IconSize.MENU) + self._ui.status_image.get_style_context().add_class(css_class) + self._ui.status_image.set_tooltip_text(tooltip_text) + self._ui.status_image.show() + + @staticmethod + def _raise_error() -> None: + ErrorDialog(_('Error'), + _('An entry with this XMPP Address already exists')) ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -24,6 +24,7 @@ from gajim.common.const import AvatarSize from gajim.common.i18n import _ from gajim.common.modules.contacts import GroupchatContact +from gajim.gtk.groupchat_affiliation import GroupchatAffiliation from .builder import get_builder from .groupchat_info import GroupChatInfoScrolled @@ -53,7 +54,7 @@ def __init__(self, self._ui.connect_signals(self) self._switcher = SideBarSwitcher() - self._switcher.set_stack(self._ui.main_stack, rows_visible=False) + self._switcher.set_stack(self._ui.main_stack) self._ui.main_grid.attach(self._switcher, 0, 0, 1, 1) self._ui.main_stack.connect('notify::visible-child-name', self._on_stack_child_changed) @@ -61,6 +62,7 @@ def __init__(self, self._add_groupchat_info() self._add_groupchat_settings() + self._add_affiliations() self._load_avatar() self._ui.name_entry.set_text(contact.name) @@ -103,7 +105,6 @@ def _add_groupchat_info(self) -> None: groupchat_info.set_from_disco_info(disco_info) groupchat_info.set_subject(self._contact.subject) self._ui.info_box.add(groupchat_info) - self._switcher.set_row_visible('information', True) def _add_groupchat_settings(self) -> None: scrolled_window = Gtk.ScrolledWindow() @@ -114,7 +115,10 @@ def _add_groupchat_settings(self) -> None: settings_box = GroupChatSettings(self.account, self._contact.jid) scrolled_window.add(settings_box) self._ui.settings_box.add(scrolled_window) - self._switcher.set_row_visible('settings', True) + + def _add_affiliations(self) -> None: + affiliations = GroupchatAffiliation(self._client, self._contact) + self._ui.affiliation_box.add(affiliations) def _on_key_press(self, _widget: GroupchatDetails, ===================================== pyrightconfig.json ===================================== @@ -40,6 +40,7 @@ "gajim/gtk/conversation", "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", + "gajim/gtk/groupchat_affiliation.py", "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e66bfcea9c562e1c2447df2a28b56af8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e66bfcea9c562e1c2447df2a28b56af8… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits