Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] ci: Windows: Update dev env script
by Philipp Hörist (＠lovetox) 09 Apr '23

09 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 24548c14 by Philipp Hörist at 2023-04-09T19:44:52+02:00 ci: Windows: Update dev env script - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -5,30 +5,47 @@ set -e function main { pacman --noconfirm -S --needed \ git \ + p7zip \ + wget \ + intltool \ + ${MINGW_PACKAGE_PREFIX}-nsis \ + ${MINGW_PACKAGE_PREFIX}-toolchain \ ${MINGW_PACKAGE_PREFIX}-python \ - ${MINGW_PACKAGE_PREFIX}-python-gobject \ ${MINGW_PACKAGE_PREFIX}-python-pip \ - ${MINGW_PACKAGE_PREFIX}-toolchain \ - ${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme \ - ${MINGW_PACKAGE_PREFIX}-gtk3 \ - ${MINGW_PACKAGE_PREFIX}-gtksourceview4 \ - ${MINGW_PACKAGE_PREFIX}-python-setuptools-scm \ - ${MINGW_PACKAGE_PREFIX}-python-cryptography \ + ${MINGW_PACKAGE_PREFIX}-python-gobject \ ${MINGW_PACKAGE_PREFIX}-python-certifi \ + ${MINGW_PACKAGE_PREFIX}-python-cryptography \ + ${MINGW_PACKAGE_PREFIX}-python-gssapi \ + ${MINGW_PACKAGE_PREFIX}-python-idna \ + ${MINGW_PACKAGE_PREFIX}-python-keyring \ + ${MINGW_PACKAGE_PREFIX}-python-packaging \ ${MINGW_PACKAGE_PREFIX}-python-pillow \ - ${MINGW_PACKAGE_PREFIX}-python-six \ + ${MINGW_PACKAGE_PREFIX}-python-protobuf \ ${MINGW_PACKAGE_PREFIX}-python-pygments \ - ${MINGW_PACKAGE_PREFIX}-libwebp \ - ${MINGW_PACKAGE_PREFIX}-goocanvas \ + ${MINGW_PACKAGE_PREFIX}-python-setuptools \ + ${MINGW_PACKAGE_PREFIX}-python-setuptools-scm \ + ${MINGW_PACKAGE_PREFIX}-python-six \ + ${MINGW_PACKAGE_PREFIX}-gtk3 \ + ${MINGW_PACKAGE_PREFIX}-gtksourceview4 \ + ${MINGW_PACKAGE_PREFIX}-gstreamer \ + ${MINGW_PACKAGE_PREFIX}-gst-plugins-base \ + ${MINGW_PACKAGE_PREFIX}-gst-plugins-good \ + ${MINGW_PACKAGE_PREFIX}-gst-libav \ + ${MINGW_PACKAGE_PREFIX}-gst-python \ + ${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme \ + ${MINGW_PACKAGE_PREFIX}-farstream \ ${MINGW_PACKAGE_PREFIX}-gspell \ ${MINGW_PACKAGE_PREFIX}-hunspell \ + ${MINGW_PACKAGE_PREFIX}-libheif \ + ${MINGW_PACKAGE_PREFIX}-libnice \ ${MINGW_PACKAGE_PREFIX}-libsoup3 \ + ${MINGW_PACKAGE_PREFIX}-libwebp \ + ${MINGW_PACKAGE_PREFIX}-sqlite3 PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git python-axolotl python-gnupg -keyring css_parser qrcode " View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24548c14e87e5044eebaf0092ab27ef1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/24548c14e87e5044eebaf0092ab27ef1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 48 commits: other: Windows: Use MINGW_PACKAGE_PREFIX for dev env
by Philipp Hörist (＠lovetox) 09 Apr '23

09 Apr '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 9ab3d5d3 by Michel Le Bihan at 2023-04-09T10:08:17+00:00 other: Windows: Use MINGW_PACKAGE_PREFIX for dev env - - - - - 5ec32555 by Philipp Hörist at 2023-04-09T13:04:15+02:00 ci: Windows: Update dependencies - - - - - 7980ed6c by Philipp Hörist at 2023-04-09T13:12:41+02:00 ci: Windows: Remove support for mingw32 in build script - - - - - da74a31d by lovetox at 2023-04-09T13:13:06+02:00 Omemo Start - - - - - 57d48ac4 by wurstsalat at 2023-04-09T13:13:06+02:00 cq: OMEMO: Add type annotations - - - - - 54d5fbc2 by wurstsalat at 2023-04-09T13:13:06+02:00 cq: OMEMO: Fix linting errors - - - - - b94ebcd5 by wurstsalat at 2023-04-09T13:13:06+02:00 cq: Add type stubs for python-qrcode - - - - - 87c4bab3 by wurstsalat at 2023-04-09T13:13:06+02:00 chore: Adapt dependencies for OMEMO - - - - - b4cce0a5 by wurstsalat at 2023-04-09T13:13:06+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - a89ee26d by wurstsalat at 2023-04-09T13:13:06+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - cd6c9a0d by wurstsalat at 2023-04-09T13:13:06+02:00 new: Add OMEMOTrustManager - - - - - 3b90d823 by wurstsalat at 2023-04-09T13:13:06+02:00 new: OMEMO: Add file encryption - - - - - 631aa631 by Philipp Hörist at 2023-04-09T13:13:06+02:00 chore: Update dependencies - - - - - 23d4e1b7 by Philipp Hörist at 2023-04-09T13:13:06+02:00 new: Block omemo plugin - - - - - 7e8346e3 by wurstsalat at 2023-04-09T13:13:06+02:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 670824f9 by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Move omemo storage to storage module - - - - - 030534a3 by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Move omemo code into common - - - - - 96249116 by Philipp Hörist at 2023-04-09T13:13:06+02:00 cq: Fix linter errors - - - - - 3452505b by wurstsalat at 2023-04-09T13:13:06+02:00 new: OMEMO: Add handling of MucAdded signal - - - - - 518a863a by wurstsalat at 2023-04-09T13:13:06+02:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 1c882080 by Philipp Hörist at 2023-04-09T13:13:06+02:00 fix: check preconditions - - - - - 9b90528c by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Rename methods - - - - - 024b06ee by Philipp Hörist at 2023-04-09T13:13:06+02:00 cq: Remove blank line - - - - - 2cdf0393 by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Remove unused code - - - - - 3f4d98e6 by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Use send_stanza method - - - - - 6d538e1d by Philipp Hörist at 2023-04-09T13:13:06+02:00 refactor: Remove devices module - - - - - 8f53af84 by Philipp Hörist at 2023-04-09T13:13:06+02:00 cq: Remove unused imports - - - - - e85e41bd by Philipp Hörist at 2023-04-09T13:13:07+02:00 refactor: Switch to new library - - - - - 0a0b9c4a by Philipp Hörist at 2023-04-09T13:13:07+02:00 cq: Fix storage annotations - - - - - aaa8f4e0 by Philipp Hörist at 2023-04-09T13:13:07+02:00 fix: Fix import - - - - - 92f7a2d6 by wurstsalat at 2023-04-09T13:13:07+02:00 Fix typo in flatpak files - - - - - 7e7905c8 by wurstsalat at 2023-04-09T13:13:07+02:00 Enable users to copy their fingerprints - - - - - 42135a36 by wurstsalat at 2023-04-09T13:13:07+02:00 Fix HTTPUpload method call - - - - - 5748bc7c by wurstsalat at 2023-04-09T13:13:07+02:00 OMEMOTrustManager: Fix leaks - - - - - 98f2e653 by wurstsalat at 2023-04-09T13:13:07+02:00 Run isort - - - - - 159acd11 by wurstsalat at 2023-04-09T13:13:07+02:00 cq: Fix linting errors - - - - - 207c8abf by wurstsalat at 2023-04-09T13:13:07+02:00 cfix: Fix _on_clear_devices_clicked - - - - - 409849b3 by Philipp Hörist at 2023-04-09T13:13:07+02:00 ci: Install omemo-dr - - - - - f2d7309f by Philipp Hörist at 2023-04-09T13:13:07+02:00 fix: Fix devicelist - - - - - 9b75dbc4 by Philipp Hörist at 2023-04-09T13:13:07+02:00 ci: Silence some pyright errors - - - - - 33dea29e by Philipp Hörist at 2023-04-09T13:13:07+02:00 cq: Fix some ruff errors - - - - - 3266f316 by Philipp Hörist at 2023-04-09T13:14:42+02:00 new: Replace python-axolotl with omemo-dr - - - - - 9026709b by wurstsalat at 2023-04-09T13:14:43+02:00 cfix: Use new wiki page - - - - - 667b2c71 by wurstsalat at 2023-04-09T13:14:43+02:00 cfix: Fire encryption_state extension point only for plugins - - - - - d8d13694 by Philipp Hörist at 2023-04-09T13:14:43+02:00 fix: Fix flatpak manifest - - - - - 303ef7fc by Philipp Hörist at 2023-04-09T13:14:43+02:00 ci: Debian: Add omemo-dr as dependency - - - - - 71f2ea36 by André at 2023-04-09T13:14:43+02:00 fix: Flatpak: Fix building omemo-dr - - - - - 3937106d by Philipp Hörist at 2023-04-09T13:14:43+02:00 fix: Flatpak: Use omemo-dr from git for Devel - - - - - 30 changed files: - .gitlab-ci.yml - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/setting_values.py - + gajim/common/storage/omemo.py - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/accounts.py - gajim/gtk/builder.pyi - gajim/gtk/chat_stack.py - gajim/gtk/contact_info.py - gajim/gtk/control.py - + gajim/gtk/conversation/rows/encryption_info.py - gajim/gtk/conversation/view.py - gajim/gtk/groupchat_details.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/91947a54c62939ef02e282e341e2270… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/91947a54c62939ef02e282e341e2270… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Windows: Update dependencies
by Philipp Hörist (＠lovetox) 09 Apr '23

09 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ec32555 by Philipp Hörist at 2023-04-09T13:04:15+02:00 ci: Windows: Update dependencies - - - - - 7980ed6c by Philipp Hörist at 2023-04-09T13:12:41+02:00 ci: Windows: Remove support for mingw32 in build script - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -10,26 +10,20 @@ set -e DIR="$( cd "$( dirname "$0" )" && pwd )" cd "${DIR}" -# CONFIG START MAJOR_PY_VERSION="3" MINOR_PY_VERSION="10" PYTHON_VERSION="${MAJOR_PY_VERSION}.${MINOR_PY_VERSION}" BUILD_VERSION="0" -# CONFIG END - MISC="${DIR}"/misc PYTHON_ID="python${MAJOR_PY_VERSION}" -MINGW="mingw32" +MINGW="mingw64" QL_VERSION="0.0.0" QL_VERSION_DESC="UNKNOWN" function set_arch { ARCH="$1" - if [ "$1" == "x86_64" ]; then - MINGW="mingw64" - fi } function set_build_root { @@ -76,39 +70,40 @@ function create_root { } function install_deps { - build_pacman --noconfirm -S mingw-w64-"${ARCH}"-python \ + build_pacman --noconfirm -S \ + mingw-w64-"${ARCH}"-python \ + mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-python-gobject \ + mingw-w64-"${ARCH}"-python-certifi \ + mingw-w64-"${ARCH}"-python-cryptography \ + mingw-w64-"${ARCH}"-python-gssapi \ + mingw-w64-"${ARCH}"-python-idna \ + mingw-w64-"${ARCH}"-python-keyring \ + mingw-w64-"${ARCH}"-python-packaging \ + mingw-w64-"${ARCH}"-python-pillow \ + mingw-w64-"${ARCH}"-python-pygments \ + mingw-w64-"${ARCH}"-python-setuptools \ + mingw-w64-"${ARCH}"-python-setuptools-scm \ + mingw-w64-"${ARCH}"-python-six \ + mingw-w64-"${ARCH}"-gtk3 \ mingw-w64-"${ARCH}"-gtksourceview4 \ mingw-w64-"${ARCH}"-gstreamer \ mingw-w64-"${ARCH}"-gst-plugins-base \ mingw-w64-"${ARCH}"-gst-plugins-good \ mingw-w64-"${ARCH}"-gst-libav \ mingw-w64-"${ARCH}"-gst-python \ - mingw-w64-"${ARCH}"-farstream \ - mingw-w64-"${ARCH}"-libnice \ - mingw-w64-"${ARCH}"-python-pip \ mingw-w64-"${ARCH}"-adwaita-icon-theme \ - mingw-w64-"${ARCH}"-libwebp \ - mingw-w64-"${ARCH}"-libheif \ - mingw-w64-"${ARCH}"-sqlite3 \ - mingw-w64-"${ARCH}"-goocanvas \ + mingw-w64-"${ARCH}"-farstream \ mingw-w64-"${ARCH}"-gspell \ mingw-w64-"${ARCH}"-hunspell \ + mingw-w64-"${ARCH}"-libheif \ + mingw-w64-"${ARCH}"-libnice \ mingw-w64-"${ARCH}"-libsoup3 \ - mingw-w64-"${ARCH}"-python-setuptools \ - mingw-w64-"${ARCH}"-python-pillow \ - mingw-w64-"${ARCH}"-python-setuptools-scm \ - mingw-w64-"${ARCH}"-python-cryptography \ - mingw-w64-"${ARCH}"-python-certifi \ - mingw-w64-"${ARCH}"-python-six \ - mingw-w64-"${ARCH}"-python-pygments \ - mingw-w64-"${ARCH}"-python-gssapi - - build_pip install precis-i18n + mingw-w64-"${ARCH}"-libwebp \ + mingw-w64-"${ARCH}"-sqlite3 PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git -keyring python-gnupg python-axolotl qrcode @@ -116,6 +111,7 @@ css_parser sentry-sdk " + build_pip install precis-i18n build_pip install $(echo "$PIP_REQUIREMENTS" | tr ["\\n"] [" "]) # remove the large png icons, they should be used rarely and svg works fine View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ab3d5d3afcb39b467e8dd6fdaf4667… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/9ab3d5d3afcb39b467e8dd6fdaf4667… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Windows: Use MINGW_PACKAGE_PREFIX for dev env
by Philipp Hörist (＠lovetox) 09 Apr '23

09 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 9ab3d5d3 by Michel Le Bihan at 2023-04-09T10:08:17+00:00 other: Windows: Use MINGW_PACKAGE_PREFIX for dev env - - - - - 1 changed file: - win/dev_env.sh Changes: ===================================== win/dev_env.sh ===================================== @@ -5,24 +5,24 @@ set -e function main { pacman --noconfirm -S --needed \ git \ - mingw-w64-x86_64-python \ - mingw-w64-x86_64-python-gobject \ - mingw-w64-x86_64-python-pip \ - mingw-w64-x86_64-toolchain \ - mingw-w64-x86_64-adwaita-icon-theme \ - mingw-w64-x86_64-gtk3 \ - mingw-w64-x86_64-gtksourceview4 \ - mingw-w64-x86_64-python-setuptools-scm \ - mingw-w64-x86_64-python-cryptography \ - mingw-w64-x86_64-python-certifi \ - mingw-w64-x86_64-python-pillow \ - mingw-w64-x86_64-python-six \ - mingw-w64-x86_64-python-pygments \ - mingw-w64-x86_64-libwebp \ - mingw-w64-x86_64-goocanvas \ - mingw-w64-x86_64-gspell \ - mingw-w64-x86_64-hunspell \ - mingw-w64-x86_64-libsoup3 \ + ${MINGW_PACKAGE_PREFIX}-python \ + ${MINGW_PACKAGE_PREFIX}-python-gobject \ + ${MINGW_PACKAGE_PREFIX}-python-pip \ + ${MINGW_PACKAGE_PREFIX}-toolchain \ + ${MINGW_PACKAGE_PREFIX}-adwaita-icon-theme \ + ${MINGW_PACKAGE_PREFIX}-gtk3 \ + ${MINGW_PACKAGE_PREFIX}-gtksourceview4 \ + ${MINGW_PACKAGE_PREFIX}-python-setuptools-scm \ + ${MINGW_PACKAGE_PREFIX}-python-cryptography \ + ${MINGW_PACKAGE_PREFIX}-python-certifi \ + ${MINGW_PACKAGE_PREFIX}-python-pillow \ + ${MINGW_PACKAGE_PREFIX}-python-six \ + ${MINGW_PACKAGE_PREFIX}-python-pygments \ + ${MINGW_PACKAGE_PREFIX}-libwebp \ + ${MINGW_PACKAGE_PREFIX}-goocanvas \ + ${MINGW_PACKAGE_PREFIX}-gspell \ + ${MINGW_PACKAGE_PREFIX}-hunspell \ + ${MINGW_PACKAGE_PREFIX}-libsoup3 \ PIP_REQUIREMENTS="\ git+https://dev.gajim.org/gajim/python-nbxmpp.git View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ab3d5d3afcb39b467e8dd6fdaf46671… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9ab3d5d3afcb39b467e8dd6fdaf46671… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] 47 commits: feat: Redesign Group Chat actions
by Philipp Hörist (＠lovetox) 08 Apr '23

08 Apr '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: f5f12102 by Daniel Brötzmann at 2023-04-08T07:57:18+00:00 feat: Redesign Group Chat actions - Move chat menu into banner - Give some actions their own buttons - Make Group Chat Roster resizable - Add participant search to Group Chat Roster Fixes #10362 - - - - - 11aedfb6 by André Apitzsch at 2023-04-08T12:11:26+02:00 other: Cover more modules with update_flatpak_manifest Also compare the python version when updating modules, to support updating packages that provide several *.whl files, like protobuf. - - - - - 12b32d6d by lovetox at 2023-04-08T20:50:46+02:00 Omemo Start - - - - - 70d9fb11 by wurstsalat at 2023-04-08T20:50:46+02:00 cq: OMEMO: Add type annotations - - - - - afbfd561 by wurstsalat at 2023-04-08T20:50:46+02:00 cq: OMEMO: Fix linting errors - - - - - 9da7835b by wurstsalat at 2023-04-08T20:50:46+02:00 cq: Add type stubs for python-qrcode - - - - - f389d600 by wurstsalat at 2023-04-08T20:50:46+02:00 chore: Adapt dependencies for OMEMO - - - - - 4ffad4f9 by wurstsalat at 2023-04-08T20:50:46+02:00 chore: OMEMO: Remove unused methods 'activate' has a replacement in the 'signled-in' event - - - - - cd71ee05 by wurstsalat at 2023-04-08T20:50:46+02:00 new: Add OMEMO_TEMP_DL to caps - - - - - 57fbfd03 by wurstsalat at 2023-04-08T20:50:46+02:00 new: Add OMEMOTrustManager - - - - - d23f168a by wurstsalat at 2023-04-08T20:50:46+02:00 new: OMEMO: Add file encryption - - - - - 6c6f977c by Philipp Hörist at 2023-04-08T20:50:46+02:00 chore: Update dependencies - - - - - 303aa9ba by Philipp Hörist at 2023-04-08T20:50:46+02:00 new: Block omemo plugin - - - - - 67adab51 by wurstsalat at 2023-04-08T20:50:46+02:00 chore: OMEMO: Remove obsolete qrcode version check - - - - - 695dd18e by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Move omemo storage to storage module - - - - - bd1bbfff by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Move omemo code into common - - - - - 56bfddc7 by Philipp Hörist at 2023-04-08T20:50:46+02:00 cq: Fix linter errors - - - - - 3061586e by wurstsalat at 2023-04-08T20:50:46+02:00 new: OMEMO: Add handling of MucAdded signal - - - - - 28785735 by wurstsalat at 2023-04-08T20:50:46+02:00 new: OMEMO: Add EncryptionAnnouncementRow - - - - - 7a50bfd0 by Philipp Hörist at 2023-04-08T20:50:46+02:00 fix: check preconditions - - - - - ea3ec62e by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Rename methods - - - - - 551c2dea by Philipp Hörist at 2023-04-08T20:50:46+02:00 cq: Remove blank line - - - - - 03e7baf9 by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Remove unused code - - - - - 48de92b1 by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Use send_stanza method - - - - - 8256c9ef by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Remove devices module - - - - - b08621b7 by Philipp Hörist at 2023-04-08T20:50:46+02:00 cq: Remove unused imports - - - - - 4c772dcb by Philipp Hörist at 2023-04-08T20:50:46+02:00 refactor: Switch to new library - - - - - 5efc6201 by Philipp Hörist at 2023-04-08T20:50:46+02:00 cq: Fix storage annotations - - - - - 6334c4df by Philipp Hörist at 2023-04-08T20:50:46+02:00 fix: Fix import - - - - - be7d5133 by wurstsalat at 2023-04-08T20:50:46+02:00 Fix typo in flatpak files - - - - - f1db2151 by wurstsalat at 2023-04-08T20:50:46+02:00 Enable users to copy their fingerprints - - - - - fb00d5e3 by wurstsalat at 2023-04-08T20:50:46+02:00 Fix HTTPUpload method call - - - - - a2f839e3 by wurstsalat at 2023-04-08T20:50:46+02:00 OMEMOTrustManager: Fix leaks - - - - - b7816941 by wurstsalat at 2023-04-08T20:50:46+02:00 Run isort - - - - - 4076b4c8 by wurstsalat at 2023-04-08T20:50:46+02:00 cq: Fix linting errors - - - - - 52f56f3f by wurstsalat at 2023-04-08T20:50:46+02:00 cfix: Fix _on_clear_devices_clicked - - - - - d7cd4494 by Philipp Hörist at 2023-04-08T20:50:46+02:00 ci: Install omemo-dr - - - - - 8cd25f86 by Philipp Hörist at 2023-04-08T20:50:46+02:00 fix: Fix devicelist - - - - - dc3893b4 by Philipp Hörist at 2023-04-08T20:50:46+02:00 ci: Silence some pyright errors - - - - - 81b9ceba by Philipp Hörist at 2023-04-08T20:50:46+02:00 cq: Fix some ruff errors - - - - - 7159df91 by Philipp Hörist at 2023-04-08T20:50:46+02:00 new: Replace python-axolotl with omemo-dr - - - - - 76a58790 by wurstsalat at 2023-04-08T20:50:46+02:00 cfix: Use new wiki page - - - - - 0c1c9a4e by wurstsalat at 2023-04-08T20:50:46+02:00 cfix: Fire encryption_state extension point only for plugins - - - - - 12d5bc95 by Philipp Hörist at 2023-04-08T20:50:46+02:00 fix: Fix flatpak manifest - - - - - 93a9666a by Philipp Hörist at 2023-04-08T20:50:46+02:00 ci: Debian: Add omemo-dr as dependency - - - - - fef39ed3 by André at 2023-04-08T20:50:46+02:00 fix: Flatpak: Fix building omemo-dr - - - - - 91947a54 by Philipp Hörist at 2023-04-08T20:50:46+02:00 fix: Flatpak: Use omemo-dr from git for Devel - - - - - 26 changed files: - .gitlab-ci.yml - README.md - debian/control - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/common/client.py - gajim/common/const.py - gajim/common/events.py - gajim/common/modules/httpupload.py - + gajim/common/modules/omemo.py - gajim/common/modules/util.py - + gajim/common/omemo/__init__.py - + gajim/common/omemo/aes.py - + gajim/common/omemo/state.py - + gajim/common/omemo/util.py - gajim/common/setting_values.py - + gajim/common/storage/omemo.py - gajim/data/gui/chat_banner.ui - gajim/data/gui/chat_control.ui - gajim/data/gui/contact_info.ui - gajim/data/gui/groupchat_details.ui - gajim/data/gui/groupchat_roster.ui - gajim/data/gui/message_actions_box.ui - + gajim/data/gui/omemo_trust_manager.ui - + gajim/data/icons/hicolor/scalable/categories/qr-code-scan-symbolic.svg - gajim/data/style/gajim.css The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/50c0897f15273572f0e8e3cbb85548b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/50c0897f15273572f0e8e3cbb85548b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: Flatpak: Use omemo-dr from git for Devel
by Philipp Hörist (＠lovetox) 08 Apr '23

08 Apr '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: 50c0897f by Philipp Hörist at 2023-04-08T20:50:36+02:00 fix: Flatpak: Use omemo-dr from git for Devel - - - - - 1 changed file: - flatpak/org.gajim.Gajim.Devel.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -343,9 +343,8 @@ modules: build-commands: - pip3 install --no-build-isolation . sources: - - type: archive - url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… - sha256: 79f9b166b350b3baced2bb0a998a3f8a3cf8756b5b5714d08c5cee5c90e62a8e + - type: git + url: https://dev.gajim.org/gajim/omemo-dr.git - name: python3-qrcode buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50c0897f15273572f0e8e3cbb85548bf… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/50c0897f15273572f0e8e3cbb85548bf… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][omemo_integration] fix: Flatpak: Fix building omemo-dr
by Philipp Hörist (＠lovetox) 08 Apr '23

08 Apr '23

Philipp Hörist pushed to branch omemo_integration at gajim / gajim Commits: b2d94802 by André at 2023-04-08T18:28:19+00:00 fix: Flatpak: Fix building omemo-dr - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -341,7 +341,7 @@ modules: - name: python3-omemo-dr buildsystem: simple build-commands: - - pip3 install . + - pip3 install --no-build-isolation . sources: - type: archive url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -335,7 +335,7 @@ modules: - name: python3-omemo-dr buildsystem: simple build-commands: - - pip3 install . + - pip3 install --no-build-isolation . sources: - type: archive url: https://files.pythonhosted.org/packages/source/o/omemo-dr/omemo-dr-0.99.0.t… View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b2d9480275ac10cb8ee14bf5aa7f3891… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b2d9480275ac10cb8ee14bf5aa7f3891… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Cover more modules with update_flatpak_manifest
by Philipp Hörist (＠lovetox) 08 Apr '23

08 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: 11aedfb6 by André Apitzsch at 2023-04-08T12:11:26+02:00 other: Cover more modules with update_flatpak_manifest Also compare the python version when updating modules, to support updating packages that provide several *.whl files, like protobuf. - - - - - 1 changed file: - scripts/update_flatpak_manifest.py Changes: ===================================== scripts/update_flatpak_manifest.py ===================================== @@ -24,17 +24,21 @@ def get_package_type(module: ruamel.yaml.comments.CommentedMap) -> str: return 'sdist' def get_current_version(module: ruamel.yaml.comments.CommentedMap - ) -> Optional[str]: + ) -> tuple[Optional[str], Optional[str]]: name = module['name'].replace('python3-','') url = module['sources'][0]['url'] if url.endswith('.git'): - return None + return None, None file_name = url.split('/')[-1] file_name = file_name.replace(name, '') - return file_name.split('-')[1].replace('.tar.gz', '') + parts = file_name.split('-') + pkg_version = parts[1].replace('.tar.gz', '') + py_version = parts[2] if '.tar.gz' not in parts[1] else None + return pkg_version, py_version def get_latest_version(package_name: str, - package_type: str + package_type: str, + py_version: Optional[str] ) -> tuple[str, Optional[str]]: with urlopen(f'{PYPI_INDEX}/{package_name}/json') as f: data = f.read() @@ -42,10 +46,13 @@ def get_latest_version(package_name: str, version = d['info']['version'] sha = None for entry in d['releases'][version]: - if entry['packagetype'] == package_type: - if sha is not None: - return version, None - sha = entry['digests']['sha256'] + if entry['packagetype'] != package_type: + continue + if py_version is not None and entry['python_version'] != py_version: + continue + if sha is not None: + return version, None + sha = entry['digests']['sha256'] return version, sha def update_module(module: ruamel.yaml.comments.CommentedMap) -> None: @@ -54,12 +61,12 @@ def update_module(module: ruamel.yaml.comments.CommentedMap) -> None: return package_type = get_package_type(module) - current_version = get_current_version(module) + current_version, py_version = get_current_version(module) if current_version is None: return name = module['name'].replace('python3-','') - latest_version, sha = get_latest_version(name, package_type) + latest_version, sha = get_latest_version(name, package_type, py_version) if current_version == latest_version: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11aedfb650af4e3be9e934658b9b12f8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/11aedfb650af4e3be9e934658b9b12f8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] feat: Redesign Group Chat actions
by Philipp Hörist (＠lovetox) 08 Apr '23

08 Apr '23

Philipp Hörist pushed to branch master at gajim / gajim Commits: f5f12102 by Daniel Brötzmann at 2023-04-08T07:57:18+00:00 feat: Redesign Group Chat actions - Move chat menu into banner - Give some actions their own buttons - Make Group Chat Roster resizable - Add participant search to Group Chat Roster Fixes #10362 - - - - - 12 changed files: - gajim/common/setting_values.py - gajim/data/gui/chat_banner.ui - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_roster.ui - gajim/data/gui/message_actions_box.ui - gajim/data/style/gajim.css - gajim/gtk/builder.pyi - gajim/gtk/chat_banner.py - gajim/gtk/control.py - gajim/gtk/groupchat_roster.py - gajim/gtk/menus.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -208,7 +208,7 @@ class _ACCOUNTDEFAULT: 'gc_sync_threshold_private_default': 0, 'gc_sync_threshold_public_default': 1, 'global_proxy': '', - 'groupchat_roster_width': 210, + 'groupchat_roster_width': 250, 'hide_groupchat_occupants_list': False, 'ignore_incoming_attention': False, 'is_window_visible': True, ===================================== gajim/data/gui/chat_banner.ui ===================================== @@ -2,6 +2,70 @@  <interface> <requires lib="gtk+" version="3.24"/> + <object class="GtkPopover" id="share_popover"> + <property name="can-focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel" id="jid_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="wrap-mode">word-char</property> + <property name="max-width-chars">30</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Copy to clipboard</property> + <property name="valign">center</property> + <signal name="clicked" handler="_on_copy_jid_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> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <style> + <class name="padding-12"/> + </style> + </object> + </child> + </object> <object class="GtkBox" id="banner_box"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -23,51 +87,39 @@ <property name="can-focus">False</property> <property name="spacing">12</property> <child> - <object class="GtkBox"> + <object class="GtkSeparator"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="margin-bottom">12</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="chat_menu_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> <property name="valign">center</property> - <property name="orientation">vertical</property> - <property name="spacing">3</property> + <property name="margin-end">6</property> <child> - <object class="GtkLabel" id="name_label"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="selectable">True</property> - <property name="halign">start</property> - <property name="hexpand">True</property> - <property name="ellipsize">end</property> - <property name="single-line-mode">True</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkImage" id="phone_image"> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">The last message was written on a mobile client</property> - <property name="halign">start</property> - <property name="margin-end">4</property> - <property name="icon-name">phone-apple-iphone-symbolic</property> + <property name="icon-name">view-more-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">0</property> </packing> </child> @@ -78,7 +130,6 @@ <property name="no-show-all">True</property> <property name="tooltip-text" translatable="yes">Toggle participants list</property> <property name="valign">center</property> - <property name="relief">none</property> <signal name="clicked" handler="_on_toggle_roster_clicked" swapped="no"/> <child> <object class="GtkBox"> @@ -109,20 +160,163 @@ <property name="position">1</property> </packing> </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="contact_info_button"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Contact Details and Settings</property> + <property name="valign">center</property> + <property name="action-name">win.show-contact-info</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">user-info-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Search…</property> + <property name="valign">center</property> + <property name="action-name">win.search-history</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">system-search-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="share_menu_button"> + <property name="visible">True</property> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="focus-on-click">False</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Share Contact…</property> + <property name="valign">center</property> + <property name="popover">share_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">emblem-shared-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <child> + <object class="GtkLabel" id="name_label"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="halign">start</property> + <property name="hexpand">True</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="xalign">0</property> <style> - <class name="dim-label"/> + <class name="large-header"/> </style> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage" id="phone_image"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">The last message was written on a mobile client</property> + <property name="halign">start</property> + <property name="margin-end">4</property> + <property name="icon-name">phone-apple-iphone-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="description_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> </child> - <style> - <class name="flat"/> - </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> + <property name="position">6</property> </packing> </child> <child> @@ -141,7 +335,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">1</property> + <property name="position">6</property> </packing> </child> <child> @@ -192,7 +386,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">3</property> + <property name="position">7</property> </packing> </child> </object> ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -1,13 +1,13 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="control_box"> <property name="can-focus">True</property> <child> - <object class="GtkBox" id="conv_view_box"> + <object class="GtkPaned" id="conv_view_paned"> + <property name="visible">True</property> <property name="can-focus">True</property> - <property name="spacing">3</property> <child> <object class="GtkOverlay" id="conv_view_overlay"> <property name="visible">True</property> @@ -18,16 +18,18 @@ </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="resize">True</property> + <property name="shrink">True</property> </packing> </child> + <child> + <placeholder/> + </child> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> </object> ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -2,74 +2,169 @@  <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkTreeStore" id="participant_store"> - <columns> -  - <column type="CairoGObjectSurface"/> -  - <column type="gchararray"/> -  - <column type="gboolean"/> -  - <column type="gchararray"/> - </columns> - </object> - <object class="GtkScrolledWindow" id="scrolled"> + <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="hscrollbar-policy">never</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkTreeView" id="roster_treeview"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="headers-visible">False</property> - <property name="expander-column">expander</property> - <property name="search-column">1</property> - <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> - <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> - <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> - <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> - <child internal-child="selection"> - <object class="GtkTreeSelection"/> + <property name="can-focus">False</property> + <property name="margin-start">6</property> + <property name="margin-end">6</property> + <property name="margin-top">12</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="halign">center</property> + <property name="action-name">win.muc-invite</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">contact-new-symbolic</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">Invite to this chat</property> + <property name="label" translatable="yes">Invite to this chat</property> + <property name="ellipsize">end</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> <child> - <object class="GtkTreeViewColumn" id="contact_column"> - <property name="sizing">fixed</property> - <property name="fixed-width">210</property> - <property name="title">avatar</property> - <property name="expand">True</property> + <object class="GtkSearchEntry" id="search_entry"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search Participants…</property> + <signal name="changed" handler="_on_search_changed" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <object class="GtkScrolledWindow" id="scrolled"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> + <child> + <object class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="headers-visible">False</property> + <property name="expander-column">expander</property> + <property name="enable-search">False</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="query-tooltip" handler="_query_tooltip" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> <child> - <object class="GtkCellRendererPixbuf" id="avatar_renderer"> - <property name="width">40</property> - <property name="ypad">3</property> - <property name="xalign">0</property> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed-width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="ypad">3</property> + <property name="xalign">0</property> + </object> + <attributes> + <attribute name="visible">2</attribute> + <attribute name="surface">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> + </child> </object> - <attributes> - <attribute name="visible">2</attribute> - <attribute name="surface">0</attribute> - </attributes> </child> <child> - <object class="GtkCellRendererText" id="text_renderer"> - <property name="ellipsize">end</property> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> </object> - <attributes> - <attribute name="markup">1</attribute> - </attributes> </child> </object> </child> - <child> - <object class="GtkTreeViewColumn" id="expander"> - <property name="visible">False</property> - <property name="sizing">fixed</property> - <property name="title">expander</property> - </object> - </child> </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> <style> <class name="groupchat-roster"/> </style> </object> + <object class="GtkTreeStore" id="participant_store"> + <columns> +  + <column type="CairoGObjectSurface"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gchararray"/> + </columns> + </object> </interface> ===================================== gajim/data/gui/message_actions_box.ui ===================================== @@ -9,55 +9,7 @@ <property name="hexpand">True</property> <property name="spacing">2</property> <child> - <object class="GtkButton" id="quick_invite_button"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="tooltip-text" translatable="yes">Invite Contacts…</property> - <property name="action-name">win.invite</property> - <property name="relief">none</property> - <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> - <style> - <class name="message-actions-box-button"/> - <class name="flat"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="icon-name">open-menu-symbolic</property> - </object> - </child> - <style> - <class name="message-actions-box-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> <child> <object class="GtkButton" id="encryption_details_button"> @@ -216,20 +168,17 @@ <property name="position">7</property> </packing> </child> - <child> - <placeholder/> - </child> <child> <object class="GtkScrolledWindow" id="input_scrolled"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="margin-start">3</property> <property name="margin-end">3</property> + <property name="hscrollbar-policy">external</property> <property name="shadow-type">in</property> <property name="overlay-scrolling">False</property> <property name="max-content-height">100</property> <property name="propagate-natural-height">True</property> - <property name="hscrollbar-policy">GTK_POLICY_EXTERNAL</property> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -968,11 +968,8 @@ .start-chat-row:not(.activatable) label { color: @insensitive_fg_color; } .start-chat-row:focus { outline: none; } /* GroupChatRoster */ -.groupchat-roster { - border-left: 1px solid; - border-color: @borders; -} .groupchat-roster treeview { padding-left: 4px; } +.groupchat-roster { padding: 0 18px 0 18px; } /* GroupchatConfig */ #GroupchatConfig stack { border-bottom: 1px solid; border-color: @borders;} ===================================== gajim/gtk/builder.pyi ===================================== @@ -186,12 +186,18 @@ class CertificateBuilder(Builder): class ChatBannerBuilder(Builder): + share_popover: Gtk.Popover + jid_label: Gtk.Label banner_box: Gtk.Box avatar_image: Gtk.Image - name_label: Gtk.Label - phone_image: Gtk.Image + chat_menu_button: Gtk.MenuButton toggle_roster_button: Gtk.Button toggle_roster_image: Gtk.Image + contact_info_button: Gtk.Button + share_menu_button: Gtk.MenuButton + name_label: Gtk.Label + phone_image: Gtk.Image + description_label: Gtk.Label additional_items_box: Gtk.Box visitor_box: Gtk.Box visitor_menu_button: Gtk.MenuButton @@ -200,7 +206,7 @@ class ChatBannerBuilder(Builder): class ChatControlBuilder(Builder): control_box: Gtk.Box - conv_view_box: Gtk.Box + conv_view_paned: Gtk.Paned conv_view_overlay: Gtk.Overlay @@ -485,13 +491,15 @@ class GroupchatOutcastBuilder(Builder): class GroupchatRosterBuilder(Builder): - participant_store: Gtk.TreeStore + box: Gtk.Box + search_entry: Gtk.SearchEntry scrolled: Gtk.ScrolledWindow roster_treeview: Gtk.TreeView contact_column: Gtk.TreeViewColumn avatar_renderer: Gtk.CellRendererPixbuf text_renderer: Gtk.CellRendererText expander: Gtk.TreeViewColumn + participant_store: Gtk.TreeStore class GroupchatRosterTooltipBuilder(Builder): @@ -572,8 +580,6 @@ class ManageSoundsBuilder(Builder): class MessageActionsBoxBuilder(Builder): box: Gtk.Box - quick_invite_button: Gtk.Button - settings_menu: Gtk.MenuButton encryption_details_button: Gtk.Button encryption_details_image: Gtk.Image encryption_menu_button: Gtk.MenuButton ===================================== gajim/gtk/chat_banner.py ===================================== @@ -18,6 +18,7 @@ from typing import Optional import cairo +from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk @@ -38,6 +39,10 @@ from gajim.gtk.builder import get_builder from gajim.gtk.groupchat_voice_requests_button import VoiceRequestsButton +from gajim.gtk.menus import get_groupchat_menu +from gajim.gtk.menus import get_private_chat_menu +from gajim.gtk.menus import get_self_contact_menu +from gajim.gtk.menus import get_singlechat_menu from gajim.gtk.util import AccountBadge @@ -93,12 +98,15 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self._voice_requests_button.switch_contact(self._contact) + self._set_chat_menu(contact) self._update_phone_image() self._update_roster_button() self._update_avatar() self._update_visitor_button() self._update_name_label() + self._update_description_label() self._update_account_badge() + self._update_share_box() def _connect_signals(self) -> None: assert self._contact is not None @@ -212,6 +220,7 @@ def _on_muc_disco_update(self, event: MucDiscoUpdate) -> None: return self._update_name_label() + self._update_description_label() def _on_account_changed(self, event: AccountEnabled) -> None: self._update_account_badge() @@ -232,6 +241,17 @@ def _on_message_received(self, event: MessageReceived) -> None: self._update_phone_image() + def _set_chat_menu(self, contact: types.ChatContactT) -> None: + if isinstance(contact, GroupchatContact): + menu = get_groupchat_menu(contact) + elif isinstance(contact, GroupchatParticipant): + menu = get_private_chat_menu(contact) + elif contact.is_self: + menu = get_self_contact_menu(contact) + else: + menu = get_singlechat_menu(contact) + self._ui.chat_menu_button.set_menu_model(menu) + def _update_phone_image(self) -> None: self._ui.phone_image.set_visible( self._contact in self._last_message_from_phone) @@ -283,6 +303,17 @@ def _update_name_label(self) -> None: self._ui.name_label.set_tooltip_text(tooltip_text) + def _update_description_label(self) -> None: + assert self._contact is not None + text = '' + if self._contact.is_groupchat: + disco_info = app.storage.cache.get_last_disco_info( + self._contact.jid) + if disco_info is not None: + text = disco_info.muc_description or '' + self._ui.description_label.set_text(text) + self._ui.description_label.set_visible(bool(text)) + def _update_account_badge(self) -> None: if self._contact is None: self._account_badge.set_visible(False) @@ -294,6 +325,20 @@ def _update_account_badge(self) -> None: self._account_badge.set_visible(visible) + def _update_share_box(self) -> None: + assert self._contact is not None + self._ui.share_menu_button.set_sensitive(True) + self._ui.jid_label.set_text(str(self._contact.jid)) + + def _on_copy_jid_clicked(self, _button: Gtk.Button) -> None: + assert self._contact is not None + text = f'xmpp:{self._contact.jid}' + if self._contact.is_groupchat: + text = f'{text}?join' + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(text, -1) + self._ui.share_popover.popdown() + def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._ui.visitor_popover.popdown() app.window.activate_action('muc-request-voice', None) ===================================== gajim/gtk/control.py ===================================== @@ -90,8 +90,7 @@ def __init__(self) -> None: self._ui.conv_view_overlay.add_overlay(self._jump_to_end_button) self._roster = GroupchatRoster() - - self._ui.conv_view_box.add(self._roster) + self._ui.conv_view_paned.pack2(self._roster, False, False) # Used with encryption plugins self.sendmessage = False ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -84,7 +84,7 @@ def __init__(self) -> None: self._tooltip = GCTooltip() self._ui = get_builder('groupchat_roster.ui') - self.add(self._ui.scrolled) + self.add(self._ui.box) self._contact_refs: dict[str, Gtk.TreeRowReference] = {} self._group_refs: dict[str, Gtk.TreeRowReference] = {} @@ -93,7 +93,10 @@ def __init__(self) -> None: self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) self._roster = self._ui.roster_treeview - self._roster.set_search_equal_func(self._search_func) + + self._filter_string = '' + self._modelfilter = self._store.filter_new() + self._modelfilter.set_visible_func(self._visible_func) self._roster.set_has_tooltip(True) self._ui.contact_column.set_fixed_width( @@ -201,14 +204,24 @@ def _query_tooltip(self, tooltip.set_custom(widget) return value - @staticmethod - def _search_func(model: Gtk.TreeModel, - _column: int, - search_text: str, - iter_: Gtk.TreeIter - ) -> bool: + def _on_search_changed(self, widget: Gtk.SearchEntry) -> None: + self._filter_string = widget.get_text().lower() + self._modelfilter.refilter() + self._roster.expand_all() + + def _visible_func(self, + model: Gtk.TreeModelFilter, + iter_: Gtk.TreeIter, + *_data: Any + ) -> bool: - return search_text.lower() not in model[iter_][1].lower() + if not self._filter_string: + return True + + if not model[iter_][Column.IS_CONTACT]: + return True + + return self._filter_string in model[iter_][Column.TEXT].lower() def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: try: @@ -512,7 +525,9 @@ def _load_roster(self) -> None: self._add_contact(participant) self.enable_sort(True) - self._roster.set_model(self._store) + self._roster.set_model(self._modelfilter) + + self._ui.search_entry.set_text('') self._roster.expand_all() def _unload_roster(self) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -75,7 +75,6 @@ def get_self_contact_menu(contact: types.BareContact) -> GajimMenu: params = RemoveHistoryActionParams(account=account, jid=jid) menu.add_item(_('Remove History…'), 'app.remove-history', params) - menu.add_item(_('Search…'), 'win.search-history', None) return menu @@ -83,7 +82,6 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: account = contact.account menu = GajimMenu() - menu.add_item(_('Details'), 'win.show-contact-info') menu.add_item(_('Block Contact…'), f'app.{account}-block-contact', str(contact.jid)) @@ -94,8 +92,6 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: menu.add_item(_('Start Voice Call…'), 'win.start-voice-call') menu.add_item(_('Start Video Call…'), 'win.start-video-call') - menu.add_item(_('Search…'), 'win.search-history', None) - if can_add_to_roster(contact): params = AccountJidParam(account=account, jid=contact.jid) menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) @@ -108,9 +104,7 @@ def get_private_chat_menu(contact: types.GroupchatParticipant) -> GajimMenu: value = GLib.Variant('as', ['']) - menu.add_item(_('Details'), 'win.show-contact-info') menu.add_item(_('Upload File…'), 'win.send-file-httpupload', value) - menu.add_item(_('Search…'), 'win.search-history') if can_add_to_roster(contact): params = AccountJidParam(account=contact.account, jid=contact.jid) @@ -131,11 +125,9 @@ def get_send_file_submenu() -> GajimMenu: def get_groupchat_menu(contact: GroupchatContact) -> GajimMenu: menuitems: MenuItemListT = [ - (_('Details'), 'win.show-contact-info', None), (_('Change Nickname…'), 'win.muc-change-nickname', None), (_('Request Voice'), 'win.muc-request-voice', None), (_('Execute Command…'), 'win.muc-execute-command', ''), - (_('Search…'), 'win.search-history', None) ] return GajimMenu.from_list(menuitems) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -44,10 +44,6 @@ from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.menus import get_encryption_menu from gajim.gtk.menus import get_format_menu -from gajim.gtk.menus import get_groupchat_menu -from gajim.gtk.menus import get_private_chat_menu -from gajim.gtk.menus import get_self_contact_menu -from gajim.gtk.menus import get_singlechat_menu from gajim.gtk.message_input import MessageInputTextView from gajim.gtk.security_label_selector import SecurityLabelSelector @@ -93,8 +89,6 @@ def __init__(self) -> None: self._ui.formattings_button.set_menu_model(get_format_menu()) self._ui.encryption_menu_button.set_menu_model(get_encryption_menu()) - self._ui.quick_invite_button.set_action_name('win.muc-invite') - self.show_all() self._ui.connect_signals(self) @@ -181,23 +175,17 @@ def switch_contact(self, contact: ChatContactT) -> None: self._contact = contact if isinstance(self._contact, GroupchatContact): - self._ui.quick_invite_button.show() self._contact.multi_connect({ 'state-changed': self._on_muc_state_changed, 'user-role-changed': self._on_muc_state_changed, }) elif isinstance(self._contact, GroupchatParticipant): - self._ui.quick_invite_button.hide() self._contact.multi_connect({ 'user-joined': self._on_user_state_changed, 'user-left': self._on_user_state_changed, 'room-joined': self._on_user_state_changed, 'room-left': self._on_user_state_changed, }) - else: - self._ui.quick_invite_button.hide() - - self._set_settings_menu(contact) self._update_encryption_button() self._update_encryption_details_button() @@ -374,17 +362,6 @@ def _on_encryption_details_clicked(self, _button: Gtk.Button) -> None: app.plugin_manager.extension_point( f'encryption_dialog{encryption}', app.window.get_control()) - def _set_settings_menu(self, contact: ChatContactT) -> None: - if isinstance(contact, GroupchatContact): - menu = get_groupchat_menu(contact) - elif isinstance(contact, GroupchatParticipant): - menu = get_private_chat_menu(contact) - elif contact.is_self: - menu = get_self_contact_menu(contact) - else: - menu = get_singlechat_menu(contact) - self._ui.settings_menu.set_menu_model(menu) - def _on_format(self, name: str) -> None: name = name.removeprefix('input-') self.msg_textview.apply_formatting(name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5f12102e71ae0a0158155fb3bdec161… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f5f12102e71ae0a0158155fb3bdec161… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch new-chat-menu
by Daniel Brötzmann (＠wurstsalat) 08 Apr '23

08 Apr '23

Daniel Brötzmann deleted branch new-chat-menu at gajim / gajim -- 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