Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][message-replies] 91 commits: cq: Fix typo in annotation
by Daniel Brötzmann (＠wurstsalat) 17 Dec '22

17 Dec '22

Daniel Brötzmann pushed to branch message-replies at gajim / gajim Commits: b69d7b2e by Philipp Hörist at 2022-12-04T19:33:59+01:00 cq: Fix typo in annotation - - - - - 156b23cf by Philipp Hörist at 2022-12-04T19:38:45+01:00 refactor: Raise AssertionError explicitly assert can be optimized out by python, as this is not a assert for helping the type checker it should be raised explicitly. - - - - - 9294172c by Philipp Hörist at 2022-12-04T20:19:38+01:00 refactor: Simplify sorted list insertion Handler lists are very small and are not changed very often - - - - - 5c874f20 by Philipp Hörist at 2022-12-04T20:46:57+01:00 cq: Settings: Mark loop var as not used - - - - - b48e6922 by Philipp Hörist at 2022-12-04T20:56:07+01:00 refactor: Replace lru_cache(maxsize=None) with shorthand - - - - - 16ce9f7e by Philipp Hörist at 2022-12-04T21:39:40+01:00 refactor: Use set literals - - - - - 5265a80c by wurstsalat at 2022-12-04T22:56:12+01:00 refactor: Translations: Use p_() method for translation context - - - - - fd47095e by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary map() usage - - - - - 6c666114 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Remove unnecessary method arguments - - - - - 532e2249 by Philipp Hörist at 2022-12-04T23:54:56+01:00 refactor: Use "not in" for inclusion check - - - - - f256b6ec by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary variable assignment before return - - - - - 90cd87a2 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Simplify import - - - - - c4068f05 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Reorder comparison - - - - - 012daf50 by Philipp Hörist at 2022-12-05T00:00:21+01:00 cq: Add noqa for false positive ruff checks - - - - - 53f96919 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: PluginManager: Simplify setting module attribute - - - - - 90a53769 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Rename AppIndicator import - - - - - d14e1ee9 by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Follow CapWords convention for classes - - - - - b73700ee by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Assistant: Use dict literal - - - - - 93890f8d by Philipp Hörist at 2022-12-05T00:00:21+01:00 refactor: Remove unnecessary method cache This method is not expensive and only called a few times - - - - - 6440fd60 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Update ruff configuration - - - - - 9e9101a7 by Philipp Hörist at 2022-12-05T00:00:21+01:00 ci: Repace pylint/flake8 with ruff - - - - - f681bcee by mjk at 2022-12-07T17:03:40+03:00 feat: Resurrect URI-specific context menus - - - - - dfac89f7 by mjk at 2022-12-07T17:03:40+03:00 refactor: Make URI context menus more data-driven ...and cover missing URITypes, adding "coverage" tests. - - - - - 340e33d0 by mjk at 2022-12-08T11:00:12+00:00 refactor: Simplify the type of URI.data No casts/type assertions needed now. - - - - - e65badc7 by mjk at 2022-12-08T11:00:56+00:00 imprv: Use the unified Start/Join Chat flow for ?join links * Immediately switch to the chat if already open. * Don't "crash" if current account is offline. - - - - - 753e8345 by mjk at 2022-12-08T11:00:56+00:00 refactor: Make xmpp query type handling in open_uri more change-proof - - - - - def536da by mjk at 2022-12-08T11:00:56+00:00 imprv: Restore ability to manually disambiguate JID-like addresses ...by storing them in `href` attributes as internal-use `about:ambiguous-address?a@b.c` URIs. Storing raw `a(a)b.c` in `href` wouldn't make a lot of semantic sense, as that's a relative-path URI with the meaning of "the thing named 'a(a)b.c' in the same directory as the current document". Plus, it would either entail handling these addresses outside `parse_uri()`, or changing its purpose of parsing only absolute URIs. - - - - - 66e748fd by mjk at 2022-12-08T11:00:56+00:00 imprv: Add dedicated context menu for non-specific URI types - - - - - 278ea276 by Philipp Hörist at 2022-12-08T13:11:46+01:00 refactor: Harmonize groupchat-join/open-chat action We want the behavior of groupchat-join, but not only for group chats. This consolidates the code into the open-chat action. - - - - - ca5f6104 by mesonium at 2022-12-08T12:14:05+00:00 feat: Preview: Add audio preview controls and visualization * Remove the delay when starting a playback * Don't scrub during seek when dragging the slider * Don't open audio stream connections before playing * Determine the duration early to prevent missing duration info + Show total duration + Add option to display remaining play time + Add possibility to seek by clicking into the seekbar + Add possibility to seek by scrolling with the mouse wheel + Add fast forward and rewind buttons + Add buttons to change the playback speed + Add automatic restoration of the audio player settings in a session + Add automatic stop of other streams when starting to play + Add a visualization of the RMS peaks - - - - - 84ff274e by mjk at 2022-12-08T22:38:34+00:00 feat: Allow sending files by copy-pasting them from file managers - - - - - 2a595826 by mjk at 2022-12-08T22:55:46+00:00 fix: Preview: Don't treat multi-line message body as previewable URL - - - - - 2b5ab697 by Philipp Hörist at 2022-12-09T00:13:08+01:00 fix: Remember last folder correctly after sending file - - - - - 38ed7621 by Philipp Hörist at 2022-12-09T00:26:52+01:00 cfix: AudioPreview: Use symbolic icons - - - - - 6b9cb548 by wurstsalat at 2022-12-09T22:10:57+01:00 cq: Move remove_invalid_xml_chars method and add test - - - - - 83f23865 by wurstsalat at 2022-12-09T22:25:05+01:00 cq: Tests: Code formatting, simplifications - - - - - e726baf5 by wurstsalat at 2022-12-09T23:06:57+01:00 cq: Assistant: Add overloads for add_default_page - - - - - d409b47b by wurstsalat at 2022-12-09T23:34:18+01:00 cq: Assistant: Add overloads for get_page - - - - - 60cf91b8 by wurstsalat at 2022-12-09T23:36:17+01:00 cq: GUI tests: Code formatting and simplifications - - - - - 9337eeaa by wurstsalat at 2022-12-09T23:51:25+01:00 cq: Generate ui types without linting errors - - - - - a6550805 by wurstsalat at 2022-12-09T23:59:07+01:00 cq: Types: Remove obsolete types - - - - - 73db9f99 by wurstsalat at 2022-12-10T11:24:07+01:00 cq: Plugins: Improve type annotations - - - - - 7ee6b8b9 by wurstsalat at 2022-12-10T11:24:33+01:00 cq: Preferences: Ignore type error - - - - - a9894439 by wurstsalat at 2022-12-10T11:25:05+01:00 cq: Styling: Type annotations - - - - - ba5ef575 by wurstsalat at 2022-12-10T13:12:05+01:00 cq: SynchronizeAccounts: Use better ListStore set method - - - - - 8e7dbb69 by wurstsalat at 2022-12-10T13:12:19+01:00 cq: RosterItemExchange: Use better ListStore set method - - - - - a82b744d by wurstsalat at 2022-12-10T13:15:55+01:00 cq: FileChoosers: Improve type annotations - - - - - 5131ebf8 by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Control: Fix indentation warning - - - - - 7272cc30 by wurstsalat at 2022-12-10T13:15:55+01:00 cq: ComponentSearch: Fix type annotations - - - - - 93e4ed5f by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Assistant: Fix type annotations - - - - - 896be5ed by wurstsalat at 2022-12-10T13:15:55+01:00 cq: Update pyrightconfig - - - - - f187e303 by wurstsalat at 2022-12-10T17:41:38+01:00 cq: Add stubs for css_parser - - - - - 1945cf94 by wurstsalat at 2022-12-10T17:50:41+01:00 cq: Fix ruff errors - - - - - 40243c8e by wurstsalat at 2022-12-11T13:37:25+01:00 cq: Add /mac folder to pyrightconfig - - - - - 17076ced by Philipp Hörist at 2022-12-11T14:13:55+01:00 new: Settings: Allow to create Settings in memory - - - - - 1d2fa904 by Philipp Hörist at 2022-12-11T14:13:55+01:00 new: Settings: Add shutdown() method - - - - - c81ea41b by Grzegorz Szymaszek at 2022-12-11T21:37:16+01:00 cfix: Add missing and remove unneeded execute bits Remove the execute bit from files that most likely should not be executable in a Unix-like environment, like Markdown or Yaml. Set the execute bit on files that most likely should be executable: those having "#!/usr/bin/env ..." or similar solutions. - - - - - 7b64058e by wurstsalat at 2022-12-12T11:05:45+01:00 fix: Fonts: Fix emoji rendering on MacOS - - - - - 37c3cb3a by wurstsalat at 2022-12-12T18:24:13+01:00 imprv: AppPage: Show date for last update check - - - - - eeb456b4 by wurstsalat at 2022-12-12T19:31:06+01:00 imprv: Timestamps: Use date/time format preference in more places Fixes #10948 - - - - - 3742e9da by Philipp Hörist at 2022-12-12T20:25:46+01:00 other: Discover translations correctly - - - - - 1d239b90 by André Apitzsch at 2022-12-12T20:54:05+01:00 cfix: Re-add comments for translators to po files - - - - - ff048ff7 by André Apitzsch at 2022-12-12T20:54:05+01:00 other: Filetransfer: Add hint for translators - - - - - 689e324e by Philipp Hörist at 2022-12-12T21:35:44+01:00 cfix: VCard: Fix typo - - - - - 221097db by Philipp Hörist at 2022-12-13T19:38:09+01:00 fix: Menus: Don’t use GLib variant text format parsing All strings would need to be escaped, not using the text format is less error prone. Fixes #11331 - - - - - 0bdce8ac by Philipp Hörist at 2022-12-13T19:40:15+01:00 other: Scripts: Execute pyright last in pre-push-tests It takes the most time, so execute it last - - - - - e070a951 by Philipp Hörist at 2022-12-13T19:43:42+01:00 cfix: Menus: Remove obsolete string escaping - - - - - 0f3204b4 by Philipp Hörist at 2022-12-13T19:46:56+01:00 cfix: Menus: Don’t quote string value - - - - - dab9bf29 by Philipp Hörist at 2022-12-13T20:00:57+01:00 refactor: Menus: Don’t pass params with action name For consistency sake - - - - - 53bf4e2f by Philipp Hörist at 2022-12-13T20:17:29+01:00 refactor: Menus: Don’t pass action with Gio.MenuItem.new() The action gets feeded to parse_detail_name() which breaks when the action name has "(" in it. - - - - - d1f57886 by Philipp Hörist at 2022-12-13T20:29:56+01:00 refactor: Menus: Port component search menu to GajimMenu - - - - - 75104e75 by Philipp Hörist at 2022-12-13T20:47:11+01:00 refactor: Import MenuList type hints - - - - - fc4a56e2 by Philipp Hörist at 2022-12-13T22:38:08+01:00 cq: Typecheck more modules - - - - - e52f7b78 by wurstsalat at 2022-12-14T19:34:29+01:00 fix: AvatarSelector: Set default crop scale to 1.0 Fixes #11331 - - - - - 16cd4ebd by wurstsalat at 2022-12-14T19:44:56+01:00 imprv: BaseAvatarChooserDialog: Allow all image types Fixes #11328 - - - - - 26752631 by wurstsalat at 2022-12-14T20:13:22+01:00 fix: Notifications: Use correct nickname for /me messages Fixes #11334 - - - - - 2ba73b51 by mjk at 2022-12-15T00:07:16+03:00 cfix: File choosers: Fix type mismatches in accept callback Fixes the regression introduced in 84ff274e345da79e075589d48026ec767729eb8e - - - - - 834d4a31 by mjk at 2022-12-15T00:07:16+03:00 refactor: File choosers: Type-related changes * Simplify accept callback signature * Allow more type checker visibility - - - - - c08a2946 by Philipp Hörist at 2022-12-14T23:32:23+01:00 refactor: Move Singleton into util.classes - - - - - 5651884d by Philipp Hörist at 2022-12-14T23:36:31+01:00 refactor: Move text_helpers into util module - - - - - 6054a21b by Philipp Hörist at 2022-12-14T23:55:19+01:00 ci: Simplify pyright config - - - - - e741c8e3 by Philipp Hörist at 2022-12-15T00:02:45+01:00 cq: Events: Fix type annotation - - - - - f2ef6140 by Philipp Hörist at 2022-12-15T00:03:30+01:00 ci: Update pyright config - - - - - 782cafb2 by mjk at 2022-12-14T23:32:40+00:00 imprv: Highlight the file when opening containing folder - - - - - 2601e782 by Philipp Hörist at 2022-12-17T14:03:37+01:00 refactor: Simplify dict iteration - - - - - e00c67e5 by Philipp Hörist at 2022-12-17T14:03:37+01:00 ci: Update ruff config - - - - - 7416caa3 by Philipp Hörist at 2022-12-17T14:03:37+01:00 chore: Update .gitignore - - - - - 38d8c685 by Philipp Hörist at 2022-12-17T14:03:37+01:00 fix: Add missing PyGObject dependency to setup.cfg - - - - - 91373ccc by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add optional dependencies to setup.py - - - - - 714203b7 by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add script for creating a development environment - Update README.md - - - - - 22690fcc by wurstsalat at 2022-12-17T19:57:45+01:00 feat: Add support for XEP-0461: Message Replies - - - - - 30 changed files: - .chglog/CHANGELOG.tpl.md - .chglog/config.yml - .ci/appveyor_build.py - .ci/deploy.py - − .ci/pylint.sh - .gitignore - .gitlab-ci.yml - README.md - data/gajim.doap - flatpak/update_flatpak_repo.sh - gajim/common/app.py - gajim/common/application.py - gajim/common/client.py - gajim/common/const.py - + gajim/common/dbus/file_manager.py - gajim/common/events.py - gajim/common/ged.py - gajim/common/helpers.py - gajim/common/i18n.py - gajim/common/logging_helpers.py - gajim/common/modules/bookmarks.py - gajim/common/modules/bytestream.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/roster.py - gajim/common/modules/search.py - gajim/common/preview.py - gajim/common/preview_helpers.py - gajim/common/proxy65_manager.py - gajim/common/regex.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a77493e1a91fe4ea1acce8e625f461e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a77493e1a91fe4ea1acce8e625f461e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: refactor: Simplify dict iteration
by Philipp Hörist (＠lovetox) 17 Dec '22

17 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2601e782 by Philipp Hörist at 2022-12-17T14:03:37+01:00 refactor: Simplify dict iteration - - - - - e00c67e5 by Philipp Hörist at 2022-12-17T14:03:37+01:00 ci: Update ruff config - - - - - 7416caa3 by Philipp Hörist at 2022-12-17T14:03:37+01:00 chore: Update .gitignore - - - - - 38d8c685 by Philipp Hörist at 2022-12-17T14:03:37+01:00 fix: Add missing PyGObject dependency to setup.cfg - - - - - 91373ccc by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add optional dependencies to setup.py - - - - - 714203b7 by Philipp Hörist at 2022-12-17T14:03:37+01:00 new: Add script for creating a development environment - Update README.md - - - - - 8 changed files: - .gitignore - README.md - gajim/common/modules/search.py - gajim/gtk/chat_action_processor.py - gajim/plugins/gajimplugin.py - pyproject.toml - + scripts/dev_env.sh - setup.cfg Changes: ===================================== .gitignore ===================================== @@ -25,6 +25,8 @@ build/ dist/ gajim.egg-info/ win/_build_root +venv/ +.venv/ # IDE files ===================================== README.md ===================================== @@ -40,7 +40,7 @@ #### For Video and Audio Calls - [gst-plugins-ugly](https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly) - [gst-libav](https://gitlab.freedesktop.org/gstreamer/gst-libav) -### Compile-time Requirements +### Install Requirements - [setuptools](https://pypi.org/project/setuptools/) - [gettext](https://savannah.gnu.org/projects/gettext/) @@ -79,10 +79,15 @@ #### Mac #### Developing -For developing you don't have to install Gajim. +To create a virutalenv you can execute -After installing all dependencies execute + ./scripts/dev_env.sh +Be sure all install requirements are available. + +Afterwards activate the vitual environment with + + source .venv/bin/activate ./launch.py #### Windows ===================================== gajim/common/modules/search.py ===================================== @@ -80,7 +80,7 @@ def send_search_form(self, if is_form: item.addChild(node=form) else: - for i in form.keys(): + for i in form: item.setTagData(i, form[i]) self._con.connection.SendAndCallForResponse(iq, self._received_result) ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -240,7 +240,7 @@ def _update_emoji_menu(self, emoji_data = get_emoji_data() for keyword, entries in emoji_data.items(): - for short_name in entries.keys(): + for short_name in entries: if not keyword.startswith(action_text): continue emoji = entries[short_name] ===================================== gajim/plugins/gajimplugin.py ===================================== @@ -146,7 +146,7 @@ def __contains__(self, key: str) -> bool: return key in self.data def __iter__(self): - for key in self.data.keys(): + for key in self.data: yield key def keys(self): ===================================== pyproject.toml ===================================== @@ -88,6 +88,7 @@ line-length = 80 select = [ "A", # flake8-builtins # "ANN", # flake8-annotations + # "ARG", # flake8-unused-arguments "B", # flake8-bugbear "BLE", # flake8-blind-except "C", # flake8-comprehensions @@ -98,8 +99,10 @@ select = [ "F", # pyflakes # "FBT", # flake8-boolean-trap # "I", # flake8-tidy-imports, isort + "ICN", # flake8-import-conventions "N", # pep8-naming - "PGH", # pylint + # "PDV", # pandas-vet + "PGH", # pygrep-hooks "PLC", # pylint "PLE", # pylint "PLR", # pylint @@ -108,7 +111,9 @@ select = [ "RUF", # Ruff-specific rules # "RET", # flake8-return "S", # flake8-bandit + "SIM", # flake8-simplify # "T", # flake8-debugger, flake8-print + # "TID", # flake8-tidy-imports "UP", # pyupgrade "W", # pycodestyle "YTT", # flake8-2020 ===================================== scripts/dev_env.sh ===================================== @@ -0,0 +1,8 @@ +echo -e "\e[32mCreate virtualenv\e[0m" +python -m venv .venv +source .venv/bin/activate +echo -e "\e[32mInstall dependencies into virtualenv\e[0m" +pip install -e .[dev] +deactivate +echo -e "\e[32mFinshed\e[0m" +echo -e "\e[34mUse 'source .venv/bin/activate' to activate the virtualenv\e[0m" ===================================== setup.cfg ===================================== @@ -22,6 +22,13 @@ install_requires = precis-i18n>=1.0.0 cryptography>=3.4.8 pycairo>=1.16.0 + PyGObject>=3.42.0 + +[options.extras_require] +dev = + ruff + codespell + nbxmpp @ git+https://dev.gajim.org/gajim/python-nbxmpp.git [options.package_data] gajim = View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/782cafb2720bd740303d9df644a8c50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/782cafb2720bd740303d9df644a8c50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Highlight the file when opening containing folder
by Philipp Hörist (＠lovetox) 14 Dec '22

14 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 782cafb2 by mjk at 2022-12-14T23:32:40+00:00 imprv: Highlight the file when opening containing folder - - - - - 7 changed files: - gajim/common/application.py - + gajim/common/dbus/file_manager.py - gajim/common/helpers.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/filetransfer.py - gajim/gtk/main.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/application.py ===================================== @@ -40,6 +40,7 @@ from gajim.common import passwords from gajim.common.commands import ChatCommands from gajim.common.dbus import logind +from gajim.common.dbus import file_manager from gajim.common.events import AccountDisabled from gajim.common.events import AccountDisconnected from gajim.common.events import AccountEnabled @@ -114,6 +115,8 @@ def _init_core(self) -> None: else: logind.enable() + file_manager.init() + for account in app.settings.get_active_accounts(): app.connections[account] = Client(account) app.to_be_removed[account] = [] ===================================== gajim/common/dbus/file_manager.py ===================================== @@ -0,0 +1,90 @@ +# 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 typing import Optional + +import logging + +from gi.repository import Gio +from gi.repository import GLib + +from gajim.common.util.classes import Singleton + +log = logging.getLogger('gajim.c.dbus.file_manager') + + +class DBusFileManager(metaclass=Singleton): + ''' + (Partial) implementation of a client for + https://freedesktop.org/wiki/Specifications/file-manager-interface/ + ''' + + def __init__(self) -> None: + self._proxy: Optional[Gio.DBusProxy] + Gio.DBusProxy.new_for_bus( + Gio.BusType.SESSION, + Gio.DBusProxyFlags.DO_NOT_AUTO_START_AT_CONSTRUCTION, + None, + 'org.freedesktop.FileManager1', + '/org/freedesktop/FileManager1', + 'org.freedesktop.FileManager1', + None, + self._on_proxy_ready, + ) + + def _on_proxy_ready(self, _: None, res: Gio.AsyncResult) -> None: + try: + self._proxy = Gio.DBusProxy.new_finish(res) + except GLib.Error as err: + log.warning('Couldn’t construct dbus proxy: %s', err.message) + + def is_available(self) -> bool: + return self._proxy is not None + + def show_items_sync(self, + uris: list[str], + startup_id: str = '', + timeout_ms: int = 500, + ) -> bool: + ''' + Opens parent folder(s), selecting/highlighting the specified + files/folders. E.g., for ['file:/home/user/Downloads/xyzzy.foo', + 'file:/home/user/Downloads/Quuxes'], opens ~/Downloads with + xyzzy.foo and Quuxes items selected. + + Returns True on success. + + Fails if called too early after construction; check `is_available()`. + ''' + + if self._proxy is None: + log.debug('ShowItems: no dbus proxy') + return False + + try: + self._proxy.call_sync( + 'ShowItems', + GLib.Variant('(ass)', (uris, startup_id)), + Gio.DBusCallFlags.NONE, + timeout_ms, + None, + ) + return True + except GLib.Error as err: + log.warning('ShowItems failed: %s', err.message) + return False + + +def init() -> None: + DBusFileManager() ===================================== gajim/common/helpers.py ===================================== @@ -100,6 +100,7 @@ from gajim.common.const import SHOW_LIST from gajim.common.const import CONSONANTS from gajim.common.const import VOWELS +from gajim.common.dbus.file_manager import DBusFileManager from gajim.common.structs import URI from gajim.common import types if TYPE_CHECKING: @@ -1102,6 +1103,16 @@ def open_file(path: Path) -> None: open_file_uri(path.as_uri()) +def open_directory(path: Path) -> None: + return open_file(path) + + +def show_in_folder(path: Path) -> None: + if not DBusFileManager().show_items_sync([path.as_uri()]): + # Fall back to just opening the containing folder + open_directory(path.parent) + + def filesystem_path_from_uri(uri: str) -> Optional[Path]: puri = parse_uri(uri) if puri.type != URIType.FILE: ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.file_props import FileProp from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file +from gajim.common.helpers import show_in_folder from gajim.common.i18n import _ from gajim.common.modules.contacts import BareContact from gajim.common.storage.archive import ConversationRow @@ -352,9 +353,7 @@ def _on_open_file(self, _button: Gtk.Button) -> None: def _on_open_folder(self, _button: Gtk.Button) -> None: assert self._file_props is not None assert self._file_props.file_name is not None - - folder = Path(self._file_props.file_name).parent - open_file(folder) + show_in_folder(Path(self._file_props.file_name)) def _on_bad_hash_retry(self, _button: Gtk.Button) -> None: app.interface.instances['file_transfers'].show_hash_error( ===================================== gajim/gtk/filetransfer.py ===================================== @@ -47,9 +47,9 @@ from gajim.common.i18n import _ from gajim.common.file_props import FilesProp from gajim.common.file_props import FileProp -from gajim.common.helpers import open_file from gajim.common.helpers import file_is_locked from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import show_in_folder from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.bytestream import is_transfer_paused from gajim.common.modules.bytestream import is_transfer_stopped @@ -1026,8 +1026,7 @@ def _on_open_folder_menuitem_activate(self, widget): if not file_props.file_name: return - folder = Path(file_props.file_name).parent - open_file(folder) + show_in_folder(Path(file_props.file_name)) def _on_cancel_menuitem_activate(self, widget): self._on_cancel_button_clicked(widget) ===================================== gajim/gtk/main.py ===================================== @@ -43,6 +43,7 @@ from gajim.common.helpers import open_file from gajim.common.helpers import open_uri from gajim.common.helpers import play_sound +from gajim.common.helpers import show_in_folder from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.contacts import GroupchatContact from gajim.plugins.pluginmanager import PluginManifest @@ -565,7 +566,7 @@ def _on_ok(paths: list[str]) -> None: return assert preview.orig_path is not None - open_file(preview.orig_path.parent) + show_in_folder(preview.orig_path) elif action_name == 'preview-copy-link': display = Gdk.Display.get_default() ===================================== gajim/gtk/preferences.py ===================================== @@ -28,7 +28,7 @@ from gajim.common import configpaths from gajim.common.const import THRESHOLD_OPTIONS from gajim.common.i18n import _ -from gajim.common.helpers import open_file +from gajim.common.helpers import open_directory from gajim.common.multimedia_helpers import AudioInputManager from gajim.common.multimedia_helpers import AudioOutputManager from gajim.common.multimedia_helpers import VideoInputManager @@ -978,7 +978,7 @@ def _on_debug_logging(value: bool, *args: Any) -> None: @staticmethod def _on_open_debug_logs(*args: Any) -> None: - open_file(configpaths.get('DEBUG')) + open_directory(configpaths.get('DEBUG')) @staticmethod def _on_advanced_config_editor(*args: Any) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782cafb2720bd740303d9df644a8c506… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782cafb2720bd740303d9df644a8c506… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cq: Events: Fix type annotation
by Philipp Hörist (＠lovetox) 14 Dec '22

14 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e741c8e3 by Philipp Hörist at 2022-12-15T00:02:45+01:00 cq: Events: Fix type annotation - - - - - f2ef6140 by Philipp Hörist at 2022-12-15T00:03:30+01:00 ci: Update pyright config - - - - - 2 changed files: - gajim/common/events.py - pyproject.toml Changes: ===================================== gajim/common/events.py ===================================== @@ -616,7 +616,7 @@ class SecCatalogReceived(ApplicationEvent): name: str = field(init=False, default='sec-catalog-received') account: str jid: str - catalog: dict[str, Catalog] + catalog: Catalog @dataclass ===================================== pyproject.toml ===================================== @@ -36,7 +36,6 @@ exclude = [ "gajim/gtk/settings.py", "gajim/gtk/server_info.py", "gajim/gtk/groupchat_info.py", - "gajim/gtk/security_label_selector.py", ] include = [ "launch.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6054a21bb7a80ca79ab7bca0d452893… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6054a21bb7a80ca79ab7bca0d452893… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Simplify pyright config
by Philipp Hörist (＠lovetox) 14 Dec '22

14 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6054a21b by Philipp Hörist at 2022-12-14T23:55:19+01:00 ci: Simplify pyright config - - - - - 1 changed file: - pyproject.toml Changes: ===================================== pyproject.toml ===================================== @@ -21,7 +21,22 @@ reportMissingModuleSource = "none" exclude = [ "**/__pycache__", - ".git" + ".git", + "gajim/gtk/account_wizard.py", + "gajim/gtk/add_contact.py", + "gajim/gtk/adhoc.py", + "gajim/gtk/advanced_config.py", + "gajim/gtk/component_search.py", + "gajim/gtk/dataform.py", + "gajim/gtk/discovery.py", + "gajim/gtk/filetransfer.py", + "gajim/gtk/vcard_grid.py", + "gajim/gtk/types.py", + "gajim/gtk/start_chat.py", + "gajim/gtk/settings.py", + "gajim/gtk/server_info.py", + "gajim/gtk/groupchat_info.py", + "gajim/gtk/security_label_selector.py", ] include = [ "launch.py", @@ -60,102 +75,7 @@ include = [ "gajim/common/util/*", "gajim/gajim.py", "gajim/gajim_remote.py", - "gajim/gtk/about.py", - "gajim/gtk/account_page.py", - "gajim/gtk/account_side_bar.py", - "gajim/gtk/accounts.py", - "gajim/gtk/app_page.py", - "gajim/gtk/app_side_bar.py", - "gajim/gtk/application.py", - "gajim/gtk/apply_button_box.py", - "gajim/gtk/assistant.py", - "gajim/gtk/avatar.py", - "gajim/gtk/avatar_selector.py", - "gajim/gtk/blocking.py", - "gajim/gtk/bookmarks.py", - "gajim/gtk/builder.py", - "gajim/gtk/call_window.py", - "gajim/gtk/certificate_dialog.py", - "gajim/gtk/change_password.py", - "gajim/gtk/chat_action_processor.py", - "gajim/gtk/chat_banner.py", - "gajim/gtk/chat_filter.py", - "gajim/gtk/chat_function_page.py", - "gajim/gtk/chat_list.py", - "gajim/gtk/chat_list_row.py", - "gajim/gtk/chat_list_stack.py", - "gajim/gtk/chat_page.py", - "gajim/gtk/chat_stack.py", - "gajim/gtk/const.py", - "gajim/gtk/contact_info.py", - "gajim/gtk/contact_settings.py", - "gajim/gtk/contacts_flowbox.py", - "gajim/gtk/control.py", - "gajim/gtk/conversation/*", - "gajim/gtk/css_config.py", - "gajim/gtk/dialogs.py", - "gajim/gtk/emoji_data_gtk.py", - "gajim/gtk/exception.py", - "gajim/gtk/features.py", - "gajim/gtk/filechoosers.py", - "gajim/gtk/file_transfer_selector.py", - "gajim/gtk/groupchat_affiliation.py", - "gajim/gtk/groupchat_config.py", - "gajim/gtk/groupchat_creation.py", - "gajim/gtk/groupchat_details.py", - "gajim/gtk/groupchat_invitation.py", - "gajim/gtk/groupchat_inviter.py", - "gajim/gtk/groupchat_join.py", - "gajim/gtk/groupchat_manage.py", - "gajim/gtk/groupchat_nick.py", - "gajim/gtk/groupchat_nick_completion.py", - "gajim/gtk/groupchat_outcasts.py", - "gajim/gtk/groupchat_roster.py", - "gajim/gtk/groupchat_settings.py", - "gajim/gtk/groupchat_state.py", - "gajim/gtk/groupchat_voice_requests_button.py", - "gajim/gtk/gstreamer.py", - "gajim/gtk/history_export.py", - "gajim/gtk/history_sync.py", - "gajim/gtk/main.py", - "gajim/gtk/main_stack.py", - "gajim/gtk/mam_preferences.py", - "gajim/gtk/manage_sounds.py", - "gajim/gtk/menus.py", - "gajim/gtk/message_actions_box.py", - "gajim/gtk/message_input.py", - "gajim/gtk/notification.py", - "gajim/gtk/notification_manager.py", - "gajim/gtk/password_dialog.py", - "gajim/gtk/pep_config.py", - "gajim/gtk/plugins.py", - "gajim/gtk/preferences.py", - "gajim/gtk/preview.py", - "gajim/gtk/preview_audio.py", - "gajim/gtk/preview_audio_analyzer.py", - "gajim/gtk/preview_audio_visualizer.py", - "gajim/gtk/profile.py", - "gajim/gtk/proxies.py", - "gajim/gtk/remove_account.py", - "gajim/gtk/resource_selector.py", - "gajim/gtk/roster.py", - "gajim/gtk/roster_item_exchange.py", - "gajim/gtk/search_view.py", - "gajim/gtk/service_registration.py", - "gajim/gtk/sidebar_switcher.py", - "gajim/gtk/ssl_error_dialog.py", - "gajim/gtk/status_icon.py", - "gajim/gtk/status_message_selector.py", - "gajim/gtk/status_selector.py", - "gajim/gtk/structs.py", - "gajim/gtk/synchronize_accounts.py", - "gajim/gtk/themes.py", - "gajim/gtk/tooltips.py", - "gajim/gtk/util.py", - "gajim/gtk/video_preview.py", - "gajim/gtk/workspace_dialog.py", - "gajim/gtk/workspace_side_bar.py", - "gajim/gtk/xml_console.py", + "gajim/gtk/*", "gajim/plugins/gajimplugin.py", "gajim/plugins/helpers.py", "gajim/plugins/plugins_i18n.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6054a21bb7a80ca79ab7bca0d4528937… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6054a21bb7a80ca79ab7bca0d4528937… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Move Singleton into util.classes
by Philipp Hörist (＠lovetox) 14 Dec '22

14 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: c08a2946 by Philipp Hörist at 2022-12-14T23:32:23+01:00 refactor: Move Singleton into util.classes - - - - - 5651884d by Philipp Hörist at 2022-12-14T23:36:31+01:00 refactor: Move text_helpers into util module - - - - - 14 changed files: - gajim/common/helpers.py - gajim/common/styling.py - + gajim/common/util/__init__.py - + gajim/common/util/classes.py - gajim/common/text_helpers.py → gajim/common/util/text.py - gajim/gtk/avatar.py - gajim/gtk/chat_stack.py - gajim/gtk/menus.py - gajim/gtk/preview_audio.py - gajim/gtk/vcard_grid.py - gajim/plugins/pluginmanager.py - pyproject.toml - test/no_gui/test_styling.py - test/no_gui/test_text_helpers.py → test/no_gui/test_text_util.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -823,17 +823,6 @@ def copy(self) -> AdditionalDataDict: return copy.deepcopy(self) -class Singleton(type): - - _instances: dict[Any, Any] = {} - - def __call__(cls, *args: Any, **kwargs: Any): - if cls not in cls._instances: - cls._instances[cls] = super().__call__( - *args, **kwargs) - return cls._instances[cls] - - def delay_execution(milliseconds): # Delay the first call for `milliseconds` # ignore all other calls while the delay is active ===================================== gajim/common/styling.py ===================================== @@ -30,7 +30,7 @@ from gajim.common.const import URIType from gajim.common.helpers import parse_uri as analyze_uri from gajim.common.helpers import validate_jid -from gajim.common.text_helpers import escape_iri_query +from gajim.common.util.text import escape_iri_query PRE = '`' STRONG = '*' ===================================== gajim/common/util/__init__.py ===================================== ===================================== gajim/common/util/classes.py ===================================== @@ -0,0 +1,29 @@ +# 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 Any + + +class Singleton(type): + + _instances: dict[Any, Any] = {} + + def __call__(cls, *args: Any, **kwargs: Any): + if cls not in cls._instances: + cls._instances[cls] = super().__call__( + *args, **kwargs) + return cls._instances[cls] ===================================== gajim/common/text_helpers.py → gajim/common/util/text.py ===================================== ===================================== gajim/gtk/avatar.py ===================================== @@ -34,10 +34,10 @@ from gajim.common import types from gajim.common import app from gajim.common import configpaths -from gajim.common.helpers import Singleton from gajim.common.helpers import get_groupchat_name from gajim.common.const import AvatarSize from gajim.common.const import StyleAttr +from gajim.common.util.classes import Singleton from .const import DEFAULT_WORKSPACE_COLOR from .util import get_contact_color ===================================== gajim/gtk/chat_stack.py ===================================== @@ -44,7 +44,7 @@ from gajim.common.preview_helpers import split_geo_uri from gajim.common.preview_helpers import format_geo_coords from gajim.common.structs import OutgoingMessage -from gajim.common.text_helpers import remove_invalid_xml_chars +from gajim.common.util.text import remove_invalid_xml_chars from gajim.common.types import ChatContactT from .chat_banner import ChatBanner ===================================== gajim/gtk/menus.py ===================================== @@ -45,7 +45,7 @@ from gajim.common.const import XmppUriQuery from gajim.common.preview import Preview from gajim.common.structs import URI -from gajim.common.text_helpers import escape_iri_path_segment +from gajim.common.util.text import escape_iri_path_segment from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import can_add_to_roster ===================================== gajim/gtk/preview_audio.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import app from gajim.common.i18n import _ -from gajim.common.text_helpers import format_duration +from gajim.common.util.text import format_duration from gajim.common.preview import AudioSampleT from .builder import get_builder ===================================== gajim/gtk/vcard_grid.py ===================================== @@ -30,7 +30,7 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import parse_uri from gajim.common.structs import URI -from gajim.common.text_helpers import escape_iri_path_segment +from gajim.common.util.text import escape_iri_path_segment from gajim.gui.util import gtk_month from gajim.gui.util import python_month ===================================== gajim/plugins/pluginmanager.py ===================================== @@ -42,7 +42,7 @@ from gajim.common.events import PluginRemoved from gajim.common.i18n import _ from gajim.common.exceptions import PluginsystemError -from gajim.common.helpers import Singleton +from gajim.common.util.classes import Singleton from gajim.plugins.plugins_i18n import _ as p_ from gajim.plugins.helpers import GajimPluginActivateException ===================================== pyproject.toml ===================================== @@ -57,7 +57,7 @@ include = [ "gajim/common/storage/*", "gajim/common/styling.py", "gajim/common/task_manager.py", - "gajim/common/text_helpers.py", + "gajim/common/util/*", "gajim/gajim.py", "gajim/gajim_remote.py", "gajim/gtk/about.py", ===================================== test/no_gui/test_styling.py ===================================== @@ -15,7 +15,7 @@ from gajim.common.styling import StrikeSpan from gajim.common.styling import Hyperlink from gajim.common.styling import process_uris -from gajim.common.text_helpers import escape_iri_query +from gajim.common.util.text import escape_iri_query app.settings = MagicMock() ===================================== test/no_gui/test_text_helpers.py → test/no_gui/test_text_util.py ===================================== @@ -1,9 +1,9 @@ import unittest -from gajim.common.text_helpers import escape_iri_path_segment -from gajim.common.text_helpers import jid_to_iri -from gajim.common.text_helpers import format_duration -from gajim.common.text_helpers import remove_invalid_xml_chars +from gajim.common.util.text import escape_iri_path_segment +from gajim.common.util.text import jid_to_iri +from gajim.common.util.text import format_duration +from gajim.common.util.text import remove_invalid_xml_chars class Test(unittest.TestCase): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/834d4a31e59e426ee752503dd83e5f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/834d4a31e59e426ee752503dd83e5f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: cfix: File choosers: Fix type mismatches in accept callback
by Philipp Hörist (＠lovetox) 14 Dec '22

14 Dec '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2ba73b51 by mjk at 2022-12-15T00:07:16+03:00 cfix: File choosers: Fix type mismatches in accept callback Fixes the regression introduced in 84ff274e345da79e075589d48026ec767729eb8e - - - - - 834d4a31 by mjk at 2022-12-15T00:07:16+03:00 refactor: File choosers: Type-related changes * Simplify accept callback signature * Allow more type checker visibility - - - - - 8 changed files: - gajim/gtk/avatar_selector.py - gajim/gtk/file_transfer_selector.py - gajim/gtk/filechoosers.py - gajim/gtk/filetransfer.py - gajim/gtk/groupchat_manage.py - gajim/gtk/main.py - gajim/gtk/plugins.py - gajim/gtk/profile.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -128,11 +128,11 @@ def prepare_crop_area(self, path: str) -> None: self._crop_area.show() def _on_load_clicked(self, _button: Gtk.Button) -> None: - def _on_file_selected(path: str) -> None: - self.prepare_crop_area(path) + def _on_file_selected(paths: list[str]) -> None: + self.prepare_crop_area(paths[0]) AvatarChooserDialog(_on_file_selected, - transient_for=self.get_toplevel(), + transient_for=cast(Gtk.Window, self.get_toplevel()), modal=True) def _on_drag_data_received(self, ===================================== gajim/gtk/file_transfer_selector.py ===================================== @@ -223,7 +223,9 @@ def _on_resource_selection(self, self.emit('changed', state) def _on_choose_files_clicked(self, _button: Gtk.Button) -> None: - FileChooserDialog(self.add_files, + def _on_chosen(paths: list[str]) -> None: + self.add_files([Path(p).as_uri() for p in paths]) + FileChooserDialog(_on_chosen, select_multiple=True, transient_for=app.window, path=app.settings.get('last_send_dir') or None) ===================================== gajim/gtk/filechoosers.py ===================================== @@ -36,6 +36,8 @@ from .const import Filter +AcceptCallbackT = Callable[[list[str]], None] + def _require_native() -> bool: if app.is_flatpak(): @@ -60,11 +62,11 @@ def set_filter(self, filter: Gtk.FileFilter) -> None: # noqa def _on_response(self, dialog: Union[Gtk.FileChooser, Gtk.FileChooserNative], response: Gtk.ResponseType, - accept_cb: Callable[[list[str]], None], + accept_cb: AcceptCallbackT, cancel_cb: Optional[Callable[..., Any]] ) -> None: if response == Gtk.ResponseType.ACCEPT: - accept_cb(dialog.get_uris()) + accept_cb(dialog.get_filenames()) if response in (Gtk.ResponseType.CANCEL, Gtk.ResponseType.DELETE_EVENT): @@ -120,7 +122,7 @@ class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): _action = Gtk.FileChooserAction.OPEN def __init__(self, - accept_cb: Callable[..., Any], + accept_cb: AcceptCallbackT, cancel_cb: Optional[Callable[..., Any]] = None, transient_for: Optional[Gtk.Window] = None, path: Optional[str] = None, @@ -180,7 +182,7 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): _preview_size = (200, 200) def __init__(self, - accept_cb: Callable[[list[str]], None], + accept_cb: AcceptCallbackT, cancel_cb: Optional[Callable[..., Any]] = None, transient_for: Optional[Gtk.Window] = None, path: Optional[str] = None, @@ -232,18 +234,9 @@ class GtkAvatarChooserDialog(BaseAvatarChooserDialog, GtkFileChooserDialog): pass -def FileChooserDialog(*args: Any, - **kwargs: Any - ) -> Union[NativeFileOpenDialog, GtkFileOpenDialog]: - if _require_native(): - return NativeFileOpenDialog(*args, **kwargs) - return GtkFileOpenDialog(*args, **kwargs) - - -def AvatarChooserDialog(*args: Any, - **kwargs: Any - ) -> Union[NativeAvatarChooserDialog, - GtkAvatarChooserDialog]: - if _require_native(): - return NativeAvatarChooserDialog(*args, **kwargs) - return GtkAvatarChooserDialog(*args, **kwargs) +if _require_native(): + FileChooserDialog = NativeFileOpenDialog + AvatarChooserDialog = NativeAvatarChooserDialog +else: + FileChooserDialog = GtkFileOpenDialog + AvatarChooserDialog = GtkAvatarChooserDialog ===================================== gajim/gtk/filetransfer.py ===================================== @@ -467,7 +467,8 @@ def on_file_request_accepted(self, contact: BareContact, file_props: FileProp ) -> None: - def _on_accepted(account, contact, file_props, file_path): + def _on_accepted(account, contact, file_props, file_paths): + file_path = file_paths[0] if os.path.exists(file_path): app.settings.set('last_save_dir', os.path.dirname(file_path)) ===================================== gajim/gtk/groupchat_manage.py ===================================== @@ -11,6 +11,7 @@ # 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 import logging @@ -193,25 +194,25 @@ def _on_avatar_cancel_clicked(self, _button: Gtk.Button) -> None: self._ui.stack.set_visible_child_name('manage') def _on_change_avatar_clicked(self, _button: Gtk.Button) -> None: - def _on_accept(path: str) -> None: - self._avatar_selector.prepare_crop_area(path) + def _on_accept(paths: list[str]) -> None: + self._avatar_selector.prepare_crop_area(paths[0]) self._ui.avatar_update_button.set_sensitive( self._avatar_selector.get_prepared()) self._ui.stack.set_visible_child_name('avatar') self._ui.avatar_update_button.grab_default() AvatarChooserDialog(_on_accept, - transient_for=self.get_toplevel(), + transient_for=cast(Gtk.Window, self.get_toplevel()), modal=True) def _on_avatar_select_file_clicked(self, _button: Gtk.Button) -> None: - def _on_accept(path: str) -> None: - self._avatar_selector.prepare_crop_area(path) + def _on_accept(paths: list[str]) -> None: + self._avatar_selector.prepare_crop_area(paths[0]) self._ui.avatar_update_button.set_sensitive( self._avatar_selector.get_prepared()) AvatarChooserDialog(_on_accept, - transient_for=self.get_toplevel(), + transient_for=cast(Gtk.Window, self.get_toplevel()), modal=True) def _on_upload_avatar_result(self, task: Task) -> None: ===================================== gajim/gtk/main.py ===================================== @@ -525,7 +525,8 @@ def _on_preview_action(self, open_file(preview.orig_path) elif action_name == 'preview-save-as': - def _on_ok(target: str) -> None: + def _on_ok(paths: list[str]) -> None: + target = paths[0] assert preview is not None assert preview.orig_path is not None ===================================== gajim/gtk/plugins.py ===================================== @@ -420,7 +420,8 @@ def _on_yes(): callback=_on_yes)], transient_for=self).show() - def _try_install(zip_filename: str) -> None: + def _try_install(paths: list[str]) -> None: + zip_filename = paths[0] try: plugin = app.plugin_manager.install_from_zip(zip_filename) except PluginsystemError as er_type: ===================================== gajim/gtk/profile.py ===================================== @@ -319,18 +319,19 @@ def _on_remove_avatar(self, _button: Gtk.Button) -> None: self._new_avatar = None def _on_edit_avatar(self, button: Gtk.Button) -> None: - def _on_file_selected(path: str) -> None: + def _on_file_selected(paths: list[str]) -> None: if self._avatar_selector is None: self._avatar_selector = AvatarSelector() self._ui.avatar_selector_box.add(self._avatar_selector) - self._avatar_selector.prepare_crop_area(path) + self._avatar_selector.prepare_crop_area(paths[0]) self._ui.avatar_update_button.set_sensitive( self._avatar_selector.get_prepared()) self._ui.profile_stack.set_visible_child_name('avatar_selector') AvatarChooserDialog(_on_file_selected, - transient_for=button.get_toplevel()) + transient_for=cast(Gtk.Window, + button.get_toplevel())) def _on_cancel_update_avatar(self, _button: Gtk.Button) -> None: self._ui.profile_stack.set_visible_child_name('profile') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/267526313a02d7e74da8bb6065db78d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/267526313a02d7e74da8bb6065db78d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Notifications: Use correct nickname for /me messages
by Daniel Brötzmann (＠wurstsalat) 14 Dec '22

14 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 26752631 by wurstsalat at 2022-12-14T20:13:22+01:00 fix: Notifications: Use correct nickname for /me messages Fixes #11334 - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -443,7 +443,7 @@ def _issue_notification(self, event: events.MessageReceived) -> None: if text.startswith('/me') or text.startswith('/me\n'): name = contact.name if isinstance(contact, GroupchatContact): - name = contact.nickname + name = event.properties.muc_nickname text = f'* {name} {text[3:]}' app.ged.raise_event( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/267526313a02d7e74da8bb6065db78da… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/267526313a02d7e74da8bb6065db78da… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: BaseAvatarChooserDialog: Allow all image types
by Daniel Brötzmann (＠wurstsalat) 14 Dec '22

14 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 16cd4ebd by wurstsalat at 2022-12-14T19:44:56+01:00 imprv: BaseAvatarChooserDialog: Allow all image types Fixes #11328 - - - - - 1 changed file: - gajim/gtk/filechoosers.py Changes: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -110,15 +110,7 @@ class BaseAvatarChooserDialog: _title = _('Choose Avatar…') _preview_size = (100, 100) - - if _require_native(): - _filters = [Filter(_('PNG files'), '*.png', True), - Filter(_('JPEG files'), '*.jp*g', False), - Filter(_('SVG files'), '*.svg', False)] - else: - _filters = [Filter(_('Images'), ['image/png', - 'image/jpeg', - 'image/svg+xml'], True)] + _filters = [Filter(_('Images'), ['image/*'], True)] class NativeFileChooserDialog(Gtk.FileChooserNative, BaseFileChooser): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/16cd4ebdb69903024d54a46ee9e648e8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/16cd4ebdb69903024d54a46ee9e648e8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: AvatarSelector: Set default crop scale to 1.0
by Daniel Brötzmann (＠wurstsalat) 14 Dec '22

14 Dec '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e52f7b78 by wurstsalat at 2022-12-14T19:34:29+01:00 fix: AvatarSelector: Set default crop scale to 1.0 Fixes #11331 - - - - - 1 changed file: - gajim/gtk/avatar_selector.py Changes: ===================================== gajim/gtk/avatar_selector.py ===================================== @@ -217,7 +217,7 @@ def __init__(self) -> None: self._color_shifted_pixbuf: Optional[GdkPixbuf.Pixbuf] = None self._current_cursor: Optional[Gdk.CursorType] = None - self._scale = float(0.0) + self._scale = 1.0 self._image.x = 0 self._image.y = 0 self._image.width = 0 @@ -266,7 +266,7 @@ def set_pixbuf(self, pixbuf: Optional[GdkPixbuf.Pixbuf]) -> None: self._crop.x = int(abs((width - self._crop.width) / 2)) self._crop.y = int(abs((height - self._crop.height) / 2)) - self._scale = 0.0 + self._scale = 1.0 self._image.x = 0 self._image.y = 0 self._image.width = 0 @@ -662,7 +662,7 @@ def _update_pixbufs(self) -> None: self._generate_color_shifted_pixbuf() - if self._scale == 0.0: + if self._scale == 1.0: scale_to_80 = float(min( (self._pixbuf.get_width() * 0.8 / self._base_width), (self._pixbuf.get_height() * 0.8 / self._base_height))) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52f7b782ee33a40917e31501e76cf39… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e52f7b782ee33a40917e31501e76cf39… 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