Commits September 2022

commits@gajim.org

1 participants
141 discussions

[Git][gajim/gajim][start-chat-message] 2 commits: fix: ChatList: Set message_id correctly
by Daniel Brötzmann (＠wurstsalat) 26 Sep '22

26 Sep '22

Daniel Brötzmann pushed to branch start-chat-message at gajim / gajim Commits: 337fb835 by wurstsalat at 2022-09-26T16:51:08+02:00 fix: ChatList: Set message_id correctly Fixes #11168 - - - - - c8bf500d by wurstsalat at 2022-09-26T21:23:11+02:00 imprv: StartChat: Pass message body from XMPP URI Fixes #11140 - - - - - 10 changed files: - gajim/data/other/shortcuts.json - gajim/gtk/application.py - gajim/gtk/chat_list.py - gajim/gtk/chat_page.py - gajim/gtk/chat_stack.py - gajim/gtk/const.py - gajim/gtk/main.py - gajim/gtk/start_chat.py - gajim/gtk/status_icon.py - gajim/gui_interface.py Changes: ===================================== gajim/data/other/shortcuts.json ===================================== @@ -5,7 +5,7 @@ "app.plugins": ["<Primary>E"], "app.xml-console": ["<Primary><Shift>X"], "app.file-transfer": ["<Primary>T"], - "app.start-chat::": ["<Primary>N"], + "app.start-chat(['', ''])": ["<Primary>N"], "app.create-groupchat::": ["<Primary>G"], "win.change-nickname": ["<Primary><Shift>N"], "win.change-subject": ["<Primary><Shift>S"], ===================================== gajim/gtk/application.py ===================================== @@ -305,7 +305,8 @@ def _open_uris(self, uris: list[str]) -> None: 'groupchat-join', GLib.Variant('as', [accounts[0], jid])) else: - self.activate_action('start-chat', GLib.Variant('s', jid)) + self.activate_action( + 'start-chat', GLib.Variant('as', [jid, ''])) elif cmd == 'roster': self.activate_action('add-contact', GLib.Variant('s', jid)) @@ -338,7 +339,7 @@ def _command_line(self, options = command_line.get_options_dict() remote_commands = [ - ('start-chat', GLib.Variant('s', '')), + ('start-chat', GLib.Variant('as', ['', ''])), ('show', None) ] @@ -562,10 +563,11 @@ def _on_quit_action(_action: Gio.SimpleAction, @staticmethod def _on_new_chat_action(_action: Gio.SimpleAction, param: GLib.Variant) -> None: - window = open_window('StartChatDialog') - search_text = param.get_string() - if search_text: - window.set_search_text(search_text) + + jid, initial_message = param.get_strv() + open_window('StartChatDialog', + jid=jid or None, + initial_message=initial_message or None) @staticmethod def _on_profile_action(_action: Gio.SimpleAction, ===================================== gajim/gtk/chat_list.py ===================================== @@ -337,7 +337,7 @@ def _set_placeholder(self) -> None: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) def set_filter(self, name: str) -> None: self._current_filter = name @@ -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, ===================================== gajim/gtk/chat_page.py ===================================== @@ -16,6 +16,7 @@ from typing import Any from typing import Literal +from typing import Optional from typing import TYPE_CHECKING import logging @@ -127,7 +128,7 @@ def get_chat_stack(self) -> ChatStack: @staticmethod def _on_start_chat_clicked(_button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_button_release(paned: Gtk.Paned, event: Gdk.EventButton) -> None: @@ -222,7 +223,8 @@ def add_chat_for_workspace(self, type_: str, pinned: bool = False, position: int = -1, - select: bool = False) -> None: + select: bool = False, + message: Optional[str] = None) -> None: client = app.get_client(account) @@ -247,6 +249,9 @@ def add_chat_for_workspace(self, if select: self._chat_list_stack.select_chat(account, jid) self._chat_list_stack.store_open_chats(workspace_id) + if message is not None: + message_input = self._chat_stack.get_message_input() + message_input.insert_text(message) def load_workspace_chats(self, workspace_id: str) -> None: open_chats = app.settings.get_workspace_setting(workspace_id, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -794,4 +794,4 @@ def __init__(self): self.add(button) def _on_start_chatting(self, _button: Gtk.Button) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) ===================================== gajim/gtk/const.py ===================================== @@ -181,7 +181,7 @@ def __str__(self): ('remove-history', 'a{sv}'), ('shortcuts', None), ('show', None), - ('start-chat', 's'), + ('start-chat', 'as'), ('xml-console', None), ] ===================================== gajim/gtk/main.py ===================================== @@ -712,18 +712,23 @@ def add_chat(self, jid: JID, type_: str, select: bool = False, - workspace: str = 'default') -> None: + workspace: str = 'default', + message: Optional[str] = None + ) -> None: + if workspace == 'current': workspace_id = self.get_active_workspace() if workspace_id is None: workspace_id = self._workspace_side_bar.get_first_workspace() else: workspace_id = self._workspace_side_bar.get_first_workspace() + self._chat_page.add_chat_for_workspace(workspace_id, account, jid, type_, - select=select) + select=select, + message=message) def add_private_chat(self, account: str, ===================================== gajim/gtk/start_chat.py ===================================== @@ -68,7 +68,11 @@ class Search(IntEnum): class StartChatDialog(Gtk.ApplicationWindow): - def __init__(self, jid: Optional[str] = None) -> None: + def __init__(self, + jid: Optional[str] = None, + initial_message: Optional[str] = None + ) -> None: + Gtk.ApplicationWindow.__init__(self) self.set_name('StartChatDialog') self.set_application(app.app) @@ -138,16 +142,17 @@ def __init__(self, jid: Optional[str] = None) -> None: if rows: self._load_contacts(rows) + self._initial_message: dict[str, Optional[str]] = {} if jid is not None: - self.set_search_text(jid) + self._initial_message[jid] = initial_message + + if jid is not None: + self._ui.search_entry.set_text(jid) self.select_first_row() self._ui.connect_signals(self) self.show_all() - def set_search_text(self, text: str) -> None: - self._ui.search_entry.set_text(text) - def remove_row(self, account: str, jid: str) -> None: for row in cast(list[ContactRow], self._ui.listbox.get_children()): if row.account == account and row.jid == jid: @@ -362,12 +367,14 @@ def _start_new_chat(self, row: ContactRow) -> None: self._disco_muc(row.account, jid, request_vcard=row.is_new) else: + initial_message = self._initial_message.get(str(jid)) app.window.add_chat( row.account, jid, 'contact', select=True, - workspace='current') + workspace='current', + message=initial_message) self.ready_to_destroy = True self.destroy() ===================================== gajim/gtk/status_icon.py ===================================== @@ -179,7 +179,7 @@ def _on_account_state(self, @staticmethod def _on_new_chat(_widget: Gtk.MenuItem) -> None: - app.app.activate_action('start-chat', GLib.Variant('s', '')) + app.app.activate_action('start-chat', GLib.Variant('as', ['', ''])) @staticmethod def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: ===================================== gajim/gui_interface.py ===================================== @@ -466,8 +466,8 @@ def start_chat_from_jid(account: str, message_input.insert_text(message) return - # TODO: handle message arg in StartChat - app.app.activate_action('start-chat', GLib.Variant('s', str(jid))) + app.app.activate_action( + 'start-chat', GLib.Variant('as', [str(jid), message or ''])) @staticmethod def create_account(account: str, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ea55cc37ed527559f43cb96d331420f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/ea55cc37ed527559f43cb96d331420f… You're receiving this email because of your account on dev.gajim.org.

1 0

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

26 Sep '22

Daniel Brötzmann deleted branch chatlist-fix-correction at gajim / gajim -- You're receiving this email because of your account on dev.gajim.org.

1 0

[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

← Newer
1
2
3
4
5
6
7
...
15
Older →

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 September 2022