Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ci: Fix SSH deploy
by Philipp Hörist (＠lovetox) 20 Sep '22

20 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 861c00f6 by Philipp Hörist at 2022-09-20T20:22:56+02:00 ci: Fix SSH deploy - - - - - 2 changed files: - .ci/prepare_git.sh - .gitlab-ci.yml Changes: ===================================== .ci/prepare_git.sh ===================================== @@ -1,7 +1,7 @@ #!/bin/bash -eval $(ssh-agent -s) echo "$2" | tr -d '\r' | ssh-add - > /dev/null +ssh-add -l mkdir -p ~/.ssh chmod 700 ~/.ssh ssh-keyscan "$1" >> ~/.ssh/known_hosts ===================================== .gitlab-ci.yml ===================================== @@ -130,6 +130,7 @@ deploy-flatpak: rules: - if: '$CI_COMMIT_TAG' before_script: + - eval $(ssh-agent -s) - .ci/prepare_git.sh github.com "${FLATHUB_DEPLOY_KEY}" script: - git clone git@github.com:flathub/org.gajim.Gajim.git @@ -148,6 +149,7 @@ publish-release: rules: - if: '$CI_COMMIT_TAG' before_script: + - eval $(ssh-agent -s) - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}" script: - git clone git@dev.gajim.org:gajim/website.git View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/861c00f691f8e2e6b6e48ded5bdf0320… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/861c00f691f8e2e6b6e48ded5bdf0320… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.5.1
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed new tag 1.5.1 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.5.1 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] release: 1.5.1
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: d1dbcc3a by Philipp Hörist at 2022-09-19T23:30:23+02:00 release: 1.5.1 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,4 +1,10 @@ -Gajim 1.5.0 (18 Sep 2022) +Gajim 1.5.1 (19 Sep 2022) + + Bug Fixes + + * ChatBanner: Format markup string correctly + +Gajim 1.5.0 (19 Sep 2022) CVE-2022-39835 ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.5.1" date="2022-09-19" /> <release version="1.5.0" date="2022-09-19" /> <release version="1.4.7" date="2022-07-24" /> <release version="1.4.6" date="2022-07-07" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -317,7 +317,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.5.0 + tag: 1.5.1 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.5.0' +__version__ = '1.5.1' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1dbcc3af665a0ed922292436b5f911d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d1dbcc3af665a0ed922292436b5f911d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Pass key with quotes
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 831fd278 by Philipp Hörist at 2022-09-19T23:28:13+02:00 ci: Pass key with quotes - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -130,7 +130,7 @@ deploy-flatpak: rules: - if: '$CI_COMMIT_TAG' before_script: - - .ci/prepare_git.sh github.com ${FLATHUB_DEPLOY_KEY} + - .ci/prepare_git.sh github.com "${FLATHUB_DEPLOY_KEY}" script: - git clone git@github.com:flathub/org.gajim.Gajim.git - cd org.gajim.Gajim @@ -148,7 +148,7 @@ publish-release: rules: - if: '$CI_COMMIT_TAG' before_script: - - .ci/prepare_git.sh dev.gajim.org ${WEBSITE_DEPLOY_KEY} + - .ci/prepare_git.sh dev.gajim.org "${WEBSITE_DEPLOY_KEY}" script: - git clone git@dev.gajim.org:gajim/website.git - cd website View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/831fd2780fa9df691d6f9ea970bd5e77… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/831fd2780fa9df691d6f9ea970bd5e77… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ChatBanner: Format markup string correctly
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7cdde19a by Philipp Hörist at 2022-09-19T22:58:45+02:00 fix: ChatBanner: Format markup string correctly - - - - - 1 changed file: - gajim/gtk/chat_banner.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -294,8 +294,9 @@ def _update_name_label(self) -> None: label_text = f'{GLib.markup_escape_text(name)}' if chatstate: - label_markup = ' %s' - label_text += label_markup % GLib.markup_escape_text(chatstate) + escaped_chatstate = GLib.markup_escape_text(chatstate) + label_markup = ' {}' + label_text += label_markup.format(escaped_chatstate) self._ui.name_label.set_markup(label_text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cdde19ace1edf7165c8669780991ed8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7cdde19ace1edf7165c8669780991ed8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Flatpak: Update nbxmpp dependency
by André (＠andre) 19 Sep '22

19 Sep '22

André pushed to branch master at gajim / gajim Commits: a376dde2 by André Apitzsch at 2022-09-19T21:21:01+02:00 chore: Flatpak: Update nbxmpp dependency - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -302,11 +302,11 @@ modules: - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.2.1-py3-none-any.whl + - pip3 install nbxmpp-3.2.2-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.1-py3-none-… - sha256: 40e3f012b6ee0027df40d31b1fa925285366af7fb0d9aa2d6dfb11b5260adea6 + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.2.2-py3-none-… + sha256: 5e519aa1a87d5ffac1acdc7ad4863847755acbed27ba678152a98f98bddc9011 - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a376dde24f2d843bb929eb8b3e5b7a0b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a376dde24f2d843bb929eb8b3e5b7a0b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag 1.5.0
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed new tag 1.5.0 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/1.5.0 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] release: 1.5.0
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: be4b85f8 by Philipp Hörist at 2022-09-19T21:05:10+02:00 release: 1.5.0 - - - - - 4 changed files: - ChangeLog - data/org.gajim.Gajim.appdata.xml.in - flatpak/org.gajim.Gajim.yaml - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,109 @@ +Gajim 1.5.0 (18 Sep 2022) + + CVE-2022-39835 + + This release fixes a vulnerability which allowed attackers to craft a XML + stanza in a way, so Gajim would accept it as message correction for messages + not originating from the attacker. + + New + + * Add drag and drop support for pinned chats + * Workspaces: Add shortcuts for switching + * Refactor ChatWidgets so they are only created once (#10987, #11038, #10973, #10119, #11052, #10945) + + Improvements + + * Preview: Improve mime type detection (#11150) + * SearchView: Add hint for search filters (#11136) + * Preview: Show left click action tooltip on icon (#11138) + * ACE: Highlight non-default values (#11120) + * XMLConsole: Use SourceView for XML input (#11121) + * Migration: Make archive migation more resilient + * Workspaces: Move chats when removing workspace (#11098) + * ChatList: Always show when switching workspace (#11108) + * MessageActionsBox: Disable encryption button if MUC is public (#10959) + * Increase contrast for message row meta elements + * StatusIcon: Use new icon for pending events + * WorkspaceSidebar: Allow removing workspace from context menu + * AccountPage: Add button for Ad-Hoc commands + * Don’t try to query avatars in MUCs which don’t allow it (#10937) + * Don’t disco MUC participants on presence + * Chatstate: Don’t make too many assumptions + * Windows: Increase default font size + * CSS: Use relative sizes for fonts + * ChatControl: Show error if encryption plugin is missing + * Store and restore running HTTP File Transfer uploads + * Add button for toggling chat list (#11035) + * ContactInfo/GroupchatDetails: Toggle icon when editing name + + Change + + * Raise nbxmpp version + * Raise PyGObject version (#11132) + * Add requirement for min sqlite version + * ChatBanner: Add button for managing voice requests + * Remove IPython support + * Rework ChatCommands + * Shortcuts: Use Ctrl+F for opening the search bar (#11073) + * Remove clear-chat action (Ctrl+L) + * Raise required nbxmpp version to 3.2.2 + + Performance + + * Use Task Queue to request avatars on MUC join + + Bug Fixes + + * GroupchatState: Hide when we are offline + * Corrections: Don’t correct message if text has not changed (#11146) + * Make plugin usable check work on all unix/linux systems (#11134) + * MUC: Don’t ignore MUC invites when ignore_unknown_contacts is set (#11107) + * Make shortcuts more discoverable (#11122, #11127) + * Better validate message corrections + * MUC: Improve automatically adding members on invite + * Preview: Sanitize filename from disallowed chars (#11105#10752) + * Chatstates: Don’t sent chatstate delayed to ourself + * Don’t reset setting when closing single chat + * Preview: Don’t fail if thumb file already exists (#11091) + * MessageInputTextView: Account for having multiple blocks when applying style (#11015) + * ActionMenu: Correctly execute text actions if text contains underscore + * InfoMessage: Don’t escape text + * MUC: Send password and reason correctly on invite + * Preview: Reset received size before cancelling or downloading + * BlockingList: Don’t fail with placeholder address (#11084) + * ChatList: Update status for private chats correctly + * ChatList: Update avatar for all chats correctly + * GroupChat: Handle nickname changes correctly + * Roster: Add missing contact-info action + * Make switch-next-unread-tab action work + * ChatBanner: Use correct scaling for chatstates + * FileTransferRow: Don’t cancel transfer when switching chat + * ChatBanner: Don’t show phone icon for group chats + * Don’t handle message-sent even for groupchats + * ChatBanner: Display account badge again + * Make nick completion test pass + * Preview: Store last_save_dir with Save As + * Preview: Make sure the widget is not being destroyed while updating (#10920) + * Fix handling of URLs without scheme (#11059) + * GroupchatState: Call correct page for not-joined + * ChatControl: Don’t assume messages always have a resource (#11042) + + Notes + + * ChatCommands have been reworked. Only following commands are now available + + - status + - invite + - ban + - affiliate + - kick + - role + + * Ctrl+H for opening the search bar has been removed, please use the + commonly used Ctrl+F (find). The shortcut for starting a file transfer + has been dropped. + Gajim 1.4.7 (24 Jul 2022) Improvements ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -74,6 +74,7 @@ <control>pointing</control> </recommends> <releases> + <release version="1.5.0" date="2022-09-19" /> <release version="1.4.7" date="2022-07-24" /> <release version="1.4.6" date="2022-07-07" /> <release version="1.4.5" date="2022-06-21" /> ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -317,7 +317,7 @@ modules: sources: - type: git url: https://dev.gajim.org/gajim/gajim.git - tag: 1.4.7 + tag: 1.5.0 - type: file path: app-overrides.json post-install: ===================================== gajim/__init__.py ===================================== @@ -1,7 +1,7 @@ import sys from pathlib import Path -__version__ = '1.4.7' +__version__ = '1.5.0' IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/be4b85f83cc230f0cb1fc244ab008a76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/be4b85f83cc230f0cb1fc244ab008a76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update translations
by Philipp Hörist (＠lovetox) 19 Sep '22

19 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1595e367 by Weblate at 2022-09-19T20:39:18+02:00 chore: Update translations - - - - - 10 changed files: - po/be.po - po/be(a)latin.po - po/bg.po - po/br.po - po/ca.po - po/cs.po - po/da.po - po/de.po - po/el.po - po/en_GB.po The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1595e3672a7b3421b0ef30d5bb8bb0bd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1595e3672a7b3421b0ef30d5bb8bb0bd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cq: DataFormWidget: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 19 Sep '22

19 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6d6b7772 by wurstsalat at 2022-09-19T14:51:32+02:00 cq: DataFormWidget: Add type annotations - - - - - 2 changed files: - gajim/gtk/change_password.py - gajim/gtk/dataform.py Changes: ===================================== gajim/gtk/change_password.py ===================================== @@ -227,7 +227,9 @@ def set_form(self, form: SimpleDataForm) -> None: def get_submit_form(self) -> SimpleDataForm: assert self._current_form is not None - return self._current_form.get_submit_form() + form = self._current_form.get_submit_form() + assert isinstance(form, SimpleDataForm) + return form def get_visible_buttons(self) -> list[str]: return ['apply'] ===================================== gajim/gtk/dataform.py ===================================== @@ -12,12 +12,26 @@ # 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 Any +from typing import Callable +from typing import cast +from typing import Optional +from typing import Union + from gi.repository import Gtk from gi.repository import GLib from gi.repository import GObject from gi.repository import Pango from nbxmpp.modules.dataforms import extend_form +from nbxmpp.modules.dataforms import DataField +from nbxmpp.modules.dataforms import MultipleDataForm +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.modules.dataforms import Uri +from nbxmpp.protocol import InvalidJid +from nbxmpp.simplexml import Node from gajim.common import app from gajim.common.i18n import _ @@ -44,7 +58,11 @@ class DataFormWidget(Gtk.ScrolledWindow): __gsignals__ = {'is-valid': (GObject.SignalFlags.RUN_LAST, None, (bool,))} - def __init__(self, form_node, options=None): + def __init__(self, + form_node: Union[SimpleDataForm, MultipleDataForm], + options: Optional[dict[str, Any]] = None + ) -> None: + Gtk.ScrolledWindow.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -64,33 +82,33 @@ def __init__(self, form_node, options=None): self.add(self._form_grid) @property - def title(self): + def title(self) -> Optional[str]: return self._form_grid.title @property - def instructions(self): + def instructions(self) -> Optional[str]: return self._form_grid.instructions - def validate(self): + def validate(self) -> None: return self._form_grid.validate(True) - def get_form(self): + def get_form(self) -> Union[SimpleDataForm, MultipleDataForm]: return self._form_node - def get_submit_form(self): + def get_submit_form(self) -> Union[SimpleDataForm, MultipleDataForm]: self._form_node.type_ = 'submit' return self._form_node - def get_form_hash(self): + def get_form_hash(self) -> int: return hash(str(self._form_node)) - def was_modified(self): + def was_modified(self) -> bool: return self._original_form_hash != self.get_form_hash() - def reset_form_hash(self): + def reset_form_hash(self) -> None: self._original_form_hash = self.get_form_hash() - def focus_first_entry(self): + def focus_first_entry(self) -> None: for row in range(0, self._form_grid.row_count): widget = self._form_grid.get_child_at(1, row) if isinstance(widget, Gtk.Entry): @@ -99,21 +117,30 @@ def focus_first_entry(self): class FormGrid(Gtk.Grid): - def __init__(self, form_node, options): + def __init__(self, + form_node: Union[SimpleDataForm, MultipleDataForm], + options: dict[str, Any] + ) -> None: + Gtk.Grid.__init__(self) self.set_column_spacing(12) self.set_row_spacing(12) self.set_halign(Gtk.Align.CENTER) self.row_count = 0 - self.rows = [] + + self.rows: list[Union[SizeAdjustment, + Title, + Instructions, + Field, + ImageMediaField]] = [] form_width = options.get('form-width', 435) self.set_size_request(form_width, -1) self._data_form = form_node - self.title = None - self.instructions = None + self.title: Optional[str] = None + self.instructions: Optional[str] = None self._fields = { 'boolean': BooleanField, @@ -139,13 +166,23 @@ def __init__(self, form_node, options): self._analyse_fields(form_node, options) self._parse_form(form_node, options) - def _add_row(self, field): + def _add_row(self, + field: Union[SizeAdjustment, + Title, + Instructions, + Field, + ImageMediaField] + ) -> None: + field.add(self, self.row_count) self.row_count += 1 self.rows.append(field) @staticmethod - def _analyse_fields(form_node, options): + def _analyse_fields(form_node: Union[SimpleDataForm, MultipleDataForm], + options: dict[str, Any] + ) -> None: + if 'right-align' in options: # Don’t overwrite option return @@ -162,7 +199,11 @@ def _analyse_fields(form_node, options): options['right-align'] = max(label_lengths) < 30 - def _parse_form(self, form_node, options): + def _parse_form(self, + form_node: Union[SimpleDataForm, MultipleDataForm], + options: dict[str, Any] + ) -> None: + for field in form_node.iter_fields(): if field.type_ == 'hidden': continue @@ -179,7 +220,11 @@ def _parse_form(self, form_node, options): widget = self._fields[field.type_] self._add_row(widget(field, self, options)) - def _add_media_field(self, field, options): + def _add_media_field(self, + field: DataField, + options: dict[str, Any] + ) -> bool: + if field.type_ not in ('text-single', 'text-private', 'text-multi'): return False @@ -194,13 +239,15 @@ def _add_media_field(self, field, options): return True return False - def validate(self, is_valid): - value = self._data_form.is_valid() if is_valid else False - self.get_parent().get_parent().emit('is-valid', value) + def validate(self, is_valid: bool) -> None: + value: bool = self._data_form.is_valid() if is_valid else False + viewport = cast(Gtk.Viewport, self.get_parent()) + dataform_widget = cast(DataFormWidget, viewport.get_parent()) + dataform_widget.emit('is-valid', value) class SizeAdjustment: - def __init__(self, options): + def __init__(self, options: dict[str, Any]) -> None: self._left_box = Gtk.Box() self._right_box = Gtk.Box() @@ -208,7 +255,7 @@ def __init__(self, options): self._left_box.set_size_request(left_width, -1) self._right_box.set_hexpand(True) - def add(self, form_grid, row_number): + def add(self, form_grid: FormGrid, row_number: int) -> None: form_grid.attach(self._left_box, 0, row_number, 1, 1) form_grid.attach_next_to(self._right_box, self._left_box, @@ -216,35 +263,40 @@ def add(self, form_grid, row_number): class Title: - def __init__(self, title): + def __init__(self, title: str) -> None: self._label = Gtk.Label(label=title) self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_justify(Gtk.Justification.CENTER) self._label.get_style_context().add_class('data-form-title') - def add(self, form_grid, row_number): + def add(self, form_grid: FormGrid, row_number: int) -> None: form_grid.attach(self._label, 0, row_number, 2, 1) class Instructions: - def __init__(self, instructions): + def __init__(self, instructions: str) -> None: self._label = Gtk.Label() self._label.set_markup(make_href_markup(instructions)) self._label.set_line_wrap(True) self._label.set_line_wrap_mode(Pango.WrapMode.WORD) self._label.set_justify(Gtk.Justification.CENTER) - def add(self, form_grid, row_number): + def add(self, form_grid: FormGrid, row_number: int) -> None: form_grid.attach(self._label, 0, row_number, 2, 1) class Field: - def __init__(self, field, form_grid, options): - self._widget = None + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + + self._widget: Optional[Gtk.Widget] = None self._field = field self._form_grid = form_grid - self._validate_source_id = None + self._validate_source_id: Optional[int] = None self._read_only = options.get('read-only', False) self._label = Gtk.Label(label=field.label) @@ -266,10 +318,15 @@ def __init__(self, field, form_grid, options): self._warning_box.add(self._warning_image) @property - def read_only(self): + def read_only(self) -> bool: return self._read_only - def add(self, form_grid, row_number): + def add(self, + form_grid: FormGrid, + row_number: int + ) -> None: + + assert self._widget is not None form_grid.attach(self._label, 0, row_number, 1, 1) form_grid.attach_next_to(self._widget, self._label, @@ -287,7 +344,11 @@ def add(self, form_grid, row_number): is_valid, error = self._field.is_valid() self._set_warning(is_valid, error) - def _set_warning(self, is_valid, error): + def _set_warning(self, + is_valid: bool, + error: Union[str, InvalidJid] + ) -> None: + if not self._field.required and not is_valid and not error: # If its not valid and no error is given, its the initial call # to show all icons on required fields. @@ -304,12 +365,12 @@ def _set_warning(self, is_valid, error): self._warning_image.set_tooltip_text(str(error)) self._warning_image.set_visible(not is_valid) - def _validate(self): + def _validate(self) -> None: self._form_grid.validate(False) if self._validate_source_id is not None: GLib.source_remove(self._validate_source_id) - def _start_validation(): + def _start_validation() -> None: is_valid, error = self._field.is_valid() self._set_warning(is_valid, error) self._form_grid.validate(is_valid) @@ -319,7 +380,12 @@ def _start_validation(): class BooleanField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) if self.read_only: @@ -332,13 +398,19 @@ def __init__(self, field, form_grid, options): self._widget.connect('toggled', self._toggled) self._widget.set_valign(Gtk.Align.CENTER) - def _toggled(self, _widget): + def _toggled(self, _widget: Gtk.CheckButton) -> None: + assert isinstance(self._widget, Gtk.CheckButton) self._field.value = self._widget.get_active() self._validate() class FixedField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) self._label.set_markup(make_href_markup(field.value)) @@ -350,7 +422,7 @@ def __init__(self, field, form_grid, options): else: self._label.set_xalign(0.5) - def add(self, form_grid, row_number): + def add(self, form_grid: FormGrid, row_number: int) -> None: if len(self._field.value) < 40: form_grid.attach(self._label, 0, row_number, 1, 1) else: @@ -358,7 +430,12 @@ def add(self, form_grid, row_number): class ListSingleField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) self._widget = MaxWidthComboBoxText() @@ -371,13 +448,18 @@ def __init__(self, field, form_grid, options): self._widget.set_active_id(field.value) self._widget.connect('changed', self._changed) - def _changed(self, widget): + def _changed(self, widget: MaxWidthComboBoxText) -> None: self._field.value = widget.get_active_id() self._validate() class ListMultiField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) @@ -390,12 +472,16 @@ def __init__(self, field, form_grid, options): self._widget.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) self._widget.add(self._treeview) - def validate(self): + def validate(self) -> None: self._validate() class ListMutliTreeView(Gtk.TreeView): - def __init__(self, field, multi_field): + def __init__(self, + field: DataField, + multi_field: ListMultiField + ) -> None: + Gtk.TreeView.__init__(self) self._field = field @@ -436,16 +522,22 @@ def __init__(self, field, multi_field): self.set_model(self._store) - def _toggled(self, _renderer, path): + def _toggled(self, + _renderer: Gtk.CellRendererToggle, + path: str + ) -> None: + iter_ = self._store.get_iter(path) current_value = self._store[iter_][3] self._store.set_value(iter_, 3, not current_value) self._set_values() self._multi_field.validate() - def _set_values(self): - values = [] - for row in self.get_model(): + def _set_values(self) -> None: + values: list[str] = [] + model = self.get_model() + assert model is not None + for row in model: if not row[3]: continue values.append(row[2]) @@ -453,7 +545,12 @@ def _set_values(self): class JidMultiField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) @@ -483,29 +580,39 @@ def __init__(self, field, form_grid, options): self._widget.pack_start(self._scrolled_window, True, True, 0) self._widget.pack_end(self._toolbar, False, False, 0) - def _add_clicked(self, _widget): - self._treeview.get_model().append(['']) + def _add_clicked(self, _widget: Gtk.ToolButton) -> None: + model = self._treeview.get_model() + assert isinstance(model, Gtk.ListStore) + model.append(['']) - def _remove_clicked(self, _widget): + def _remove_clicked(self, _widget: Gtk.ToolButton) -> None: mod, paths = self._treeview.get_selection().get_selected_rows() for path in paths: iter_ = mod.get_iter(path) - self._treeview.get_model().remove(iter_) - - jids = [] - for row in self._treeview.get_model(): + model = self._treeview.get_model() + assert isinstance(model, Gtk.ListStore) + model.remove(iter_) + + jids: list[str] = [] + model = self._treeview.get_model() + assert model is not None + for row in model: if not row[0]: continue jids.append(row[0]) self._field.values = jids self._validate() - def validate(self): + def validate(self) -> None: self._validate() class JidMutliTreeView(Gtk.TreeView): - def __init__(self, field, multi_field): + def __init__(self, + field: DataField, + multi_field: JidMultiField + ) -> None: + Gtk.TreeView.__init__(self) self._field = field @@ -529,14 +636,19 @@ def __init__(self, field, multi_field): self.set_model(self._store) - def _jid_edited(self, _renderer, path, new_text): + def _jid_edited(self, + _renderer: Gtk.CellRendererText, + path: str, + new_text: str + ) -> None: + iter_ = self._store.get_iter(path) self._store.set_value(iter_, 0, new_text) self._set_values() self._multi_field.validate() - def _set_values(self): - jids = [] + def _set_values(self) -> None: + jids: list[str] = [] for row in self._store: if not row[0]: continue @@ -545,7 +657,12 @@ def _set_values(self): class TextSingleField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) if self.read_only: @@ -560,25 +677,42 @@ def __init__(self, field, form_grid, options): self._widget.set_activates_default(True) self._widget.set_valign(Gtk.Align.CENTER) - def _changed(self, _widget): + def _changed(self, _widget: Gtk.Entry) -> None: + assert isinstance(self._widget, Gtk.Entry) self._field.value = self._widget.get_text() self._validate() class TextPrivateField(TextSingleField): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + TextSingleField.__init__(self, field, form_grid, options) + assert isinstance(self._widget, Gtk.Entry) self._widget.set_input_purpose(Gtk.InputPurpose.PASSWORD) self._widget.set_visibility(False) class JidSingleField(TextSingleField): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + TextSingleField.__init__(self, field, form_grid, options) class TextMultiField(Field): - def __init__(self, field, form_grid, options): + def __init__(self, + field: DataField, + form_grid: FormGrid, + options: dict[str, Any] + ) -> None: + Field.__init__(self, field, form_grid, options) self._label.set_valign(Gtk.Align.START) @@ -602,13 +736,18 @@ def __init__(self, field, form_grid, options): self._widget.add(self._textview) - def _changed(self, widget): + def _changed(self, widget: Gtk.TextBuffer) -> None: self._field.value = widget.get_text(*widget.get_bounds(), False) self._validate() class ImageMediaField(): - def __init__(self, uri, form_grid, _options): + def __init__(self, + uri: Uri, + form_grid: FormGrid, + _options: dict[str, Any] + ) -> None: + self._uri = uri self._form_grid = form_grid @@ -623,12 +762,12 @@ def __init__(self, uri, form_grid, _options): self._image.set_halign(Gtk.Align.CENTER) self._image.get_style_context().add_class('preview-image') - def add(self, form_grid, row_number): + def add(self, form_grid: FormGrid, row_number: int) -> None: form_grid.attach(self._image, 1, row_number, 1, 1) class FakeDataFormWidget(Gtk.ScrolledWindow): - def __init__(self, fields): + def __init__(self, fields: dict[str, str]) -> None: Gtk.ScrolledWindow.__init__(self) self.set_hexpand(True) self.set_vexpand(True) @@ -641,7 +780,7 @@ def __init__(self, fields): self._grid.set_halign(Gtk.Align.CENTER) self._fields = fields - self._entries = {} + self._entries: dict[str, Gtk.Entry] = {} self._row_count = 0 instructions = fields.pop('instructions', None) @@ -667,7 +806,7 @@ def __init__(self, fields): self.add(self._grid) self.show_all() - def _add_fields(self): + def _add_fields(self) -> None: for name, value in self._fields.items(): if name in ('key', 'x', 'registered'): continue @@ -687,15 +826,22 @@ def _add_fields(self): self._grid.attach_next_to(entry, label, Gtk.PositionType.RIGHT, 1, 1) - def get_submit_form(self): - fields = {} + def get_submit_form(self) -> dict[str, str]: + fields: dict[str, str] = {} for name, entry in self._entries.items(): fields[name] = entry.get_text() return fields class DataFormDialog(Gtk.Dialog): - def __init__(self, title, transient_for, form, node, submit_callback): + def __init__(self, + title: str, + transient_for: Gtk.Window, + form: SimpleDataForm, + node: Node, + submit_callback: Callable[..., Any] + ) -> None: + Gtk.Dialog.__init__(self, title=title, transient_for=transient_for, @@ -718,7 +864,11 @@ def __init__(self, title, transient_for, form, node, submit_callback): self.connect('response', self._on_response) self.show_all() - def _on_response(self, _dialog, response): + def _on_response(self, + _dialog: Gtk.Window, + response: Gtk.ResponseType + ) -> None: + if response == Gtk.ResponseType.OK: self._submit_callback(self._form.get_submit_form(), self._node) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6d6b7772b8e8110bf8d915da65cd59ae… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6d6b7772b8e8110bf8d915da65cd59ae… 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