Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: ChatList: Set message_id correctly
by Philipp Hörist (＠lovetox) 26 Sep '22

26 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 337fb835 by wurstsalat at 2022-09-26T16:51:08+02:00 fix: ChatList: Set message_id correctly Fixes #11168 - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -539,8 +539,9 @@ def _on_message_received(self, event: MessageEventT) -> None: row.set_timestamp(event.properties.mam.timestamp) else: row.set_timestamp(event.properties.timestamp) + row.set_stanza_id(event.stanza_id) - row.set_message_id(event.unique_id) + row.set_message_id(event.properties.id) row.set_message_text( event.msgtxt, nickname=nick, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/337fb835b3c82869526822106299d2c0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/337fb835b3c82869526822106299d2c0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch start-chat-message
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed new branch start-chat-message at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/start-chat-message You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new branch chatlist-fix-correction
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed new branch chatlist-fix-correction at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/chatlist-fix-correction You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: Preferences: Improve video preview label markup
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1960941c by wurstsalat at 2022-09-26T12:01:26+02:00 cfix: Preferences: Improve video preview label markup - - - - - 1 changed file: - gajim/gtk/video_preview.py Changes: ===================================== gajim/gtk/video_preview.py ===================================== @@ -118,16 +118,19 @@ def _disable_preview(self) -> None: self._av_pipeline = None def _set_sink_text(self, sink_name: str) -> None: - text = '' + label_markup = '%s' + color = 'black' + label_text = '' if sink_name == 'gtkglsink': - text = _('' - 'OpenGL accelerated') + color = 'green' + label_text = _('OpenGL accelerated') elif sink_name == 'gtksink': - text = _('' - 'Not accelerated') + color = 'orange' + label_text = _('Not accelerated') - self._ui.video_source_label.set_markup(text) + label_markup = label_markup % (color, label_text) + self._ui.video_source_label.set_markup(label_markup) def _set_error_text(self) -> None: self._ui.video_source_label.set_text( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1960941c7080b1c85f53a2c41c5f8cd4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1960941c7080b1c85f53a2c41c5f8cd4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] cfix: MessageInputTextView: Add back 'Paste as Code Block'
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: c10bc06c by wurstsalat at 2022-09-26T11:41:15+02:00 cfix: MessageInputTextView: Add back 'Paste as Code Block' - - - - - 1 changed file: - gajim/gtk/message_input.py Changes: ===================================== gajim/gtk/message_input.py ===================================== @@ -425,7 +425,13 @@ def _on_populate_popup(self, menu.prepend(item) item.connect('activate', self.clear) - paste_item = Gtk.MenuItem.new_with_label(_('Paste as quote')) + paste_code_block_item = Gtk.MenuItem.new_with_label( + _('Paste as Code Block')) + paste_code_block_item.connect( + 'activate', self._paste_clipboard_as_code_block) + menu.append(paste_code_block_item) + + paste_item = Gtk.MenuItem.new_with_label(_('Paste as Quote')) paste_item.connect('activate', self._paste_clipboard_as_quote) menu.append(paste_item) @@ -442,9 +448,20 @@ def insert_as_quote(self, text: str) -> None: self.insert_text(text) self.grab_focus() + def insert_as_code_block(self, text: str) -> None: + self.insert_text(f'```\n{text}\n```') + self.grab_focus() + def _paste_clipboard_as_quote(self, _item: Gtk.MenuItem) -> None: clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) text = clipboard.wait_for_text() if text is None: return self.insert_as_quote(text) + + def _paste_clipboard_as_code_block(self, _item: Gtk.MenuItem) -> None: + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + text = clipboard.wait_for_text() + if text is None: + return + self.insert_as_code_block(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c10bc06c66a175fa92e962164afe55de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c10bc06c66a175fa92e962164afe55de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Ellipsize body text in notifications
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: edc53ee1 by wurstsalat at 2022-09-26T11:31:41+02:00 imprv: Windows: Ellipsize body text in notifications - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -30,8 +30,9 @@ from typing import Optional from typing import Union -import sys import logging +import sys +import textwrap from gi.repository import GLib from gi.repository import Gio @@ -187,7 +188,11 @@ def __init__(self, event: events.Notification, timeout: int) -> None: icon_name = self._get_icon_name(event) self._ui.image.set_from_icon_name(icon_name, Gtk.IconSize.DIALOG) self._ui.event_type_label.set_text(event.title) - self._ui.event_description_label.set_text(event.text) + body = textwrap.fill(event.text, + width=40, + max_lines=3, + placeholder='…') + self._ui.event_description_label.set_text(body) if timeout > 0: self._timeout_id = GLib.timeout_add_seconds(timeout, self.destroy) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/edc53ee1689f81e40933964bf93f030b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/edc53ee1689f81e40933964bf93f030b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Windows: Re-enable accidentally disabled Windows Portable build
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: beee4cbe by wurstsalat at 2022-09-26T10:29:21+02:00 ci: Windows: Re-enable accidentally disabled Windows Portable build - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -321,5 +321,5 @@ function cleanup_install { function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) - #(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) + (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/beee4cbe4ae8ebdb1896463b59872ad0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/beee4cbe4ae8ebdb1896463b59872ad0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ci: Windows: Update shipped OMEMO version
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 2a22d65d by wurstsalat at 2022-09-26T10:26:21+02:00 ci: Windows: Update shipped OMEMO version - - - - - b418a1a8 by wurstsalat at 2022-09-26T10:26:31+02:00 ci: Windows: Remove unnecessary files from installer This saves ~175 MB of disk space and reduces installer size by 42 MB Fixes #11166 - - - - - eb1e5903 by wurstsalat at 2022-09-26T10:26:31+02:00 cfix: Preferences: Use orange color for video acceleration hint - - - - - 3 changed files: - gajim/gtk/video_preview.py - win/README.md - win/_base.sh Changes: ===================================== gajim/gtk/video_preview.py ===================================== @@ -124,7 +124,7 @@ def _set_sink_text(self, sink_name: str) -> None: 'OpenGL accelerated') elif sink_name == 'gtksink': - text = _('' + text = _('' 'Not accelerated') self._ui.video_source_label.set_markup(text) ===================================== win/README.md ===================================== @@ -1,13 +1,12 @@ # Windows Installer -We use [msys2](https://www.msys2.org/) for creating the Windows installer -and development on Windows. +We use [msys2](https://www.msys2.org/) for creating the Windows installer and development on Windows. Please note that Windows 7 support has been dropped. ## Development -Download [msys2](https://www.msys2.org/) (msys2-x86_64-xxx.exe) and follow the install instructions on the [msys2](https://www.msys2.org/) startpage (**Important!**) +Download [msys2](https://www.msys2.org/) (`msys2-x86_64-xxx.exe`) and follow the install instructions on the [msys2](https://www.msys2.org/) startpage (**Important!**) * Fork the master branch on dev.gajim.org * Execute `C:\msys64\msys2_shell.cmd -mingw64` @@ -21,6 +20,7 @@ ## Development ### GtkInspector For Gtk Inspector to work, add the following registry key + ``` HKEY_CURRENT_USER\Software\GSettings\org\gtk\settings\debug DWORD enable-inspector-keybinding = 1 @@ -32,5 +32,4 @@ ## Build Gajim / Create an Installer Follow the steps in the Development section, but instead of `./dev_env.sh` execute `./build.sh i686` or `./build.sh x86_64`. -Both the installer and the portable installer should appear in ``C:\msys64\home\USER\gajim\win\_build_root``. - +Both the installer and the portable installer should appear in `C:\msys64\home\USER\gajim\win\_build_root`. ===================================== win/_base.sh ===================================== @@ -149,7 +149,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install omemo plugin - curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.15.zip + curl -o "${BUILD_ROOT}"/omemo.zip https://ftp.gajim.org/plugins/master/omemo/omemo_2.8.16.zip 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins/omemo "${BUILD_ROOT}"/omemo.zip # Install language dicts @@ -224,6 +224,7 @@ function cleanup_install { rm -Rf "${MINGW_ROOT}"/share/fontconfig rm -Rf "${MINGW_ROOT}"/share/gettext-* rm -Rf "${MINGW_ROOT}"/share/terminfo + rm -Rf "${MINGW_ROOT}"/share/bullet rm -Rf "${MINGW_ROOT}"/share/OGRE rm -Rf "${MINGW_ROOT}"/share/opencv4 @@ -231,6 +232,7 @@ function cleanup_install { -name "*.compiled" -exec rm -f {} \; rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/test + rm -Rf "${MINGW_ROOT}"/lib/"${PYTHON_ID}"/dist-packages/Ogre rm -Rf "${MINGW_ROOT}"/lib/cmake rm -Rf "${MINGW_ROOT}"/lib/gettext rm -Rf "${MINGW_ROOT}"/lib/gtk-3.0 @@ -257,12 +259,11 @@ function cleanup_install { rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstschro.dll rm -f "${MINGW_ROOT}"/lib/gstreamer-1.0/libgstcacasink.dll + rm -f "${MINGW_ROOT}"/bin/libBulletCollision.dll + rm -f "${MINGW_ROOT}"/bin/libBulletDynamics.dll rm -f "${MINGW_ROOT}"/bin/libharfbuzz-icu-0.dll - rm -f "${MINGW_ROOT}"/bin/libopencv_wechat_qrcode455.dll - rm -f "${MINGW_ROOT}"/bin/OgreMain.dll - rm -f "${MINGW_ROOT}"/bin/OgreOverlay.dll - rm -f "${MINGW_ROOT}"/bin/OgreRTShaderSystem.dll - rm -f "${MINGW_ROOT}"/bin/OgreBites.dll + rm -f "${MINGW_ROOT}"/bin/libopencv_* + rm -f "${MINGW_ROOT}"/bin/Ogre* rm -f "${MINGW_ROOT}"/bin/xvidcore.dll rm -f "${MINGW_ROOT}"/lib/"${PYTHON_ID}".*/lib-dynload/_tkinter* @@ -320,5 +321,5 @@ function cleanup_install { function build_installer { (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim.nsi) - (cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) + #(cd "$BUILD_ROOT" && makensis -NOCD -DVERSION="$QL_VERSION_DESC" -DARCH="${MINGW}" "${MISC}"/gajim-portable.nsi) } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/83d90cf2434a5b8d2ab5a6b1152d0d7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/83d90cf2434a5b8d2ab5a6b1152d0d7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Rename actions
by Philipp Hörist (＠lovetox) 25 Sep '22

25 Sep '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 83d90cf2 by Philipp Hörist at 2022-09-25T23:29:30+02:00 refactor: Rename actions Rename action which contain *-tab to *-chat - - - - - 3 changed files: - gajim/data/other/shortcuts.json - gajim/gtk/const.py - gajim/gtk/main.py Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -14,20 +14,20 @@ "win.show-contact-info": ["<Primary>I"], "win.show-emoji-chooser": ["<Primary><Shift>M"], "win.input-clear": ["<Primary>U"], - "win.close-tab": ["<Primary>W"], - "win.switch-next-tab": ["<Primary>Page_Down"], - "win.switch-prev-tab": ["<Primary>Page_Up"], - "win.switch-next-unread-tab": ["<Primary>Tab"], - "win.switch-prev-unread-tab": ["<Primary>ISO_Left_Tab"], - "win.switch-tab-1": ["<Alt>1", "<Alt>KP_1"], - "win.switch-tab-2": ["<Alt>2", "<Alt>KP_2"], - "win.switch-tab-3": ["<Alt>3", "<Alt>KP_3"], - "win.switch-tab-4": ["<Alt>4", "<Alt>KP_4"], - "win.switch-tab-5": ["<Alt>5", "<Alt>KP_5"], - "win.switch-tab-6": ["<Alt>6", "<Alt>KP_6"], - "win.switch-tab-7": ["<Alt>7", "<Alt>KP_7"], - "win.switch-tab-8": ["<Alt>8", "<Alt>KP_8"], - "win.switch-tab-9": ["<Alt>9", "<Alt>KP_9"], + "win.close-chat": ["<Primary>W"], + "win.switch-next-chat": ["<Primary>Page_Down"], + "win.switch-prev-chat": ["<Primary>Page_Up"], + "win.switch-next-unread-chat": ["<Primary>Tab"], + "win.switch-prev-unread-chat": ["<Primary>ISO_Left_Tab"], + "win.switch-chat-1": ["<Alt>1", "<Alt>KP_1"], + "win.switch-chat-2": ["<Alt>2", "<Alt>KP_2"], + "win.switch-chat-3": ["<Alt>3", "<Alt>KP_3"], + "win.switch-chat-4": ["<Alt>4", "<Alt>KP_4"], + "win.switch-chat-5": ["<Alt>5", "<Alt>KP_5"], + "win.switch-chat-6": ["<Alt>6", "<Alt>KP_6"], + "win.switch-chat-7": ["<Alt>7", "<Alt>KP_7"], + "win.switch-chat-8": ["<Alt>8", "<Alt>KP_8"], + "win.switch-chat-9": ["<Alt>9", "<Alt>KP_9"], "win.switch-workspace-1": ["<Primary>1", "<Primary>KP_1"], "win.switch-workspace-2": ["<Primary>2", "<Primary>KP_2"], "win.switch-workspace-3": ["<Primary>3", "<Primary>KP_3"], ===================================== gajim/gtk/const.py ===================================== @@ -219,20 +219,20 @@ def __str__(self): ('change-nickname', None, True), ('change-subject', None, True), ('escape', None, True), - ('close-tab', None, True), - ('switch-next-tab', None, True), - ('switch-prev-tab', None, True), - ('switch-next-unread-tab', None, True), - ('switch-prev-unread-tab', None, True), - ('switch-tab-1', None, True), - ('switch-tab-2', None, True), - ('switch-tab-3', None, True), - ('switch-tab-4', None, True), - ('switch-tab-5', None, True), - ('switch-tab-6', None, True), - ('switch-tab-7', None, True), - ('switch-tab-8', None, True), - ('switch-tab-9', None, True), + ('close-chat', None, True), + ('switch-next-chat', None, True), + ('switch-prev-chat', None, True), + ('switch-next-unread-chat', None, True), + ('switch-prev-unread-chat', None, True), + ('switch-chat-1', None, True), + ('switch-chat-2', None, True), + ('switch-chat-3', None, True), + ('switch-chat-4', None, True), + ('switch-chat-5', None, True), + ('switch-chat-6', None, True), + ('switch-chat-7', None, True), + ('switch-chat-8', None, True), + ('switch-chat-9', None, True), ('switch-workspace-1', None, True), ('switch-workspace-2', None, True), ('switch-workspace-3', None, True), ===================================== gajim/gtk/main.py ===================================== @@ -340,20 +340,20 @@ def _connect_actions(self) -> None: ('change-nickname', self._on_action), ('change-subject', self._on_action), ('escape', self._on_action), - ('close-tab', self._on_action), - ('switch-next-tab', self._on_action), - ('switch-prev-tab', self._on_action), - ('switch-next-unread-tab', self._on_action), - ('switch-prev-unread-tab', self._on_action), - ('switch-tab-1', self._on_action), - ('switch-tab-2', self._on_action), - ('switch-tab-3', self._on_action), - ('switch-tab-4', self._on_action), - ('switch-tab-5', self._on_action), - ('switch-tab-6', self._on_action), - ('switch-tab-7', self._on_action), - ('switch-tab-8', self._on_action), - ('switch-tab-9', self._on_action), + ('close-chat', self._on_action), + ('switch-next-chat', self._on_action), + ('switch-prev-chat', self._on_action), + ('switch-next-unread-chat', self._on_action), + ('switch-prev-unread-chat', self._on_action), + ('switch-chat-1', self._on_action), + ('switch-chat-2', self._on_action), + ('switch-chat-3', self._on_action), + ('switch-chat-4', self._on_action), + ('switch-chat-5', self._on_action), + ('switch-chat-6', self._on_action), + ('switch-chat-7', self._on_action), + ('switch-chat-8', self._on_action), + ('switch-chat-9', self._on_action), ('switch-workspace-1', self._on_action), ('switch-workspace-2', self._on_action), ('switch-workspace-3', self._on_action), @@ -409,24 +409,24 @@ def _on_action(self, control.contact.jid) return None - elif action_name == 'close-tab': + elif action_name == 'close-chat': self._chat_page.remove_chat(control.contact.account, control.contact.jid) return None - if action_name == 'switch-next-tab': + if action_name == 'switch-next-chat': self.select_next_chat(Direction.NEXT) - elif action_name == 'switch-prev-tab': + elif action_name == 'switch-prev-chat': self.select_next_chat(Direction.PREV) - elif action_name == 'switch-next-unread-tab': + elif action_name == 'switch-next-unread-chat': self.select_next_chat(Direction.NEXT, unread_first=True) - elif action_name == 'switch-prev-unread-tab': + elif action_name == 'switch-prev-unread-chat': self.select_next_chat(Direction.PREV, unread_first=True) - elif action_name.startswith('switch-tab-'): + elif action_name.startswith('switch-chat-'): number = int(action_name[-1]) - 1 self.select_chat_number(number) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/83d90cf2434a5b8d2ab5a6b1152d0d7c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/83d90cf2434a5b8d2ab5a6b1152d0d7c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Deleted branch fix-gc-notifications
by Daniel Brötzmann (＠wurstsalat) 25 Sep '22

25 Sep '22

Daniel Brötzmann deleted branch fix-gc-notifications 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