Commits May 2022

commits@gajim.org

1 participants
193 discussions

[Git][gajim/gajim][master] chore: AccountWizard: Add type annotations
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: f18820a1 by wurstsalat at 2022-05-31T23:44:45+02:00 chore: AccountWizard: Add type annotations - - - - - 1 changed file: - gajim/gtk/account_wizard.py Changes: ===================================== gajim/gtk/account_wizard.py ===================================== @@ -12,10 +12,13 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from __future__ import annotations + from typing import Any -from typing import List +from typing import cast +from typing import Literal from typing import Optional -from typing import Tuple +from typing import overload from typing import Union import logging @@ -41,7 +44,8 @@ from gajim.common import app from gajim.common import configpaths from gajim.common import helpers -from gajim.common.events import StanzaReceived, StanzaSent +from gajim.common.events import StanzaReceived +from gajim.common.events import StanzaSent from gajim.common.helpers import open_uri from gajim.common.helpers import validate_jid from gajim.common.helpers import get_proxy @@ -49,10 +53,12 @@ from gajim.common.const import SASL_ERRORS from gajim.common.const import GIO_TLS_ERRORS +from .accounts import AccountsWindow from .assistant import Assistant +from .assistant import ErrorPage from .assistant import Page +from .assistant import ProgressPage from .assistant import SuccessPage -from .assistant import ErrorPage from .dataform import DataFormWidget from .builder import get_builder from .util import open_window @@ -86,7 +92,7 @@ def __init__(self) -> None: 'error': Error(), }) - self._progress = self.add_default_page('progress') + self.add_default_page('progress') self.get_page('login').connect('clicked', self._on_button_clicked) self.connect('button-clicked', self._on_assistant_button_clicked) @@ -100,7 +106,31 @@ def __init__(self) -> None: self._client: Optional[Client] = None self._method: str = 'login' - def get_currenct_method(self) -> str: + @overload + def get_page(self, name: Literal['login']) -> Login: ... + @overload + def get_page(self, name: Literal['signup']) -> Signup: ... + @overload + def get_page(self, name: Literal['advanced']) -> AdvancedSettings: ... + @overload + def get_page(self, + name: Literal['security-warning'] + ) -> SecurityWarning: ... + @overload + def get_page(self, name: Literal['form']) -> Form: ... + @overload + def get_page(self, name: Literal['redirect']) -> Redirect: ... + @overload + def get_page(self, name: Literal['success']) -> Success: ... + @overload + def get_page(self, name: Literal['error']) -> Error: ... + @overload + def get_page(self, name: Literal['progress']) -> ProgressPage: ... + + def get_page(self, name: str) -> Page: + return self._pages[name] + + def get_current_method(self) -> str: return self._method def _on_button_clicked(self, _page: Gtk.Widget, button_name: str) -> None: @@ -126,8 +156,9 @@ def _on_assistant_button_clicked(self, elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: - app.cert_store.add_certificate( - self.get_page('security-warning').cert) + cert = self.get_page('security-warning').cert + assert cert is not None + app.cert_store.add_certificate(cert) self._test_credentials(ignore_all_errors=True) elif button_name == 'signup': @@ -150,8 +181,9 @@ def _on_assistant_button_clicked(self, elif page == 'security-warning': if self.get_page('security-warning').trust_certificate: - app.cert_store.add_certificate( - self.get_page('security-warning').cert) + cert = self.get_page('security-warning').cert + assert cert is not None + app.cert_store.add_certificate(cert) if self.get_page('signup').is_anonymous(): self._test_anonymous_server(ignore_all_errors=True) @@ -210,7 +242,7 @@ def update_proxy_list(self) -> None: def _get_base_client(self, domain: str, - username: str, + username: Optional[str], mode: Mode, advanced: bool, ignore_all_errors: bool @@ -413,8 +445,8 @@ def _show_error_page(self, title: str, heading: str, text: str) -> None: self.show_page('error', Gtk.StackTransitionType.SLIDE_LEFT) def _show_progress_page(self, title: str, text: str) -> None: - self._progress.set_title(title) - self._progress.set_text(text) + self.get_page('progress').set_title(title) + self.get_page('progress').set_text(text) self.show_page('progress', Gtk.StackTransitionType.SLIDE_LEFT) @staticmethod @@ -587,7 +619,7 @@ def _update_completion(self, entry: Gtk.Entry) -> None: return text = text.split('@', 1)[0] - model = entry.get_completion().get_model() + model = cast(Gtk.ListStore, entry.get_completion().get_model()) model.clear() for server in self._servers: @@ -626,12 +658,12 @@ def _validate_jid(self, address: str) -> bool: def _set_complete(self, *args: Any) -> None: address = self._validate_jid(self._ui.log_in_address_entry.get_text()) password = self._ui.log_in_password_entry.get_text() - self._ui.log_in_button.set_sensitive(address and password) + self._ui.log_in_button.set_sensitive(bool(address and password)) def is_advanced(self) -> bool: return self._ui.login_advanced_checkbutton.get_active() - def get_credentials(self) -> Tuple[str, str]: + def get_credentials(self) -> tuple[str, str]: data = (self._ui.log_in_address_entry.get_text(), self._ui.log_in_password_entry.get_text()) return data @@ -713,7 +745,7 @@ def _on_activate_link(_label: Gtk.Label, uri: str) -> int: open_uri(uri) return Gdk.EVENT_STOP - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'signup'] def get_default_button(self) -> str: @@ -753,7 +785,7 @@ def get_proxy(self) -> str: active = self._ui.proxies_combobox.get_active() return self._ui.proxies_combobox.get_model()[active][0] - def get_custom_host(self) -> Optional[Tuple[str, + def get_custom_host(self) -> Optional[tuple[str, ConnectionProtocol, ConnectionType]]: host = self._ui.custom_host_entry.get_text() @@ -841,11 +873,13 @@ def _set_complete(self, *args: Any) -> None: self.update_page_complete() - def get_visible_buttons(self) -> List[str]: - return ['back', self.get_toplevel().get_currenct_method()] + def get_visible_buttons(self) -> list[str]: + return [ + 'back', + cast(AccountWizard, self.get_toplevel()).get_current_method()] def get_default_button(self) -> str: - return self.get_toplevel().get_currenct_method() + return cast(AccountWizard, self.get_toplevel()).get_current_method() class SecurityWarning(Page): @@ -867,7 +901,7 @@ def cert(self) -> Optional[Gio.TlsCertificate]: def set_warning(self, domain: str, cert: Gio.TlsCertificate, - errors: List[Gio.TlsCertificateFlags] + errors: list[Gio.TlsCertificateFlags] ) -> None: # Clear list self._cert = cert @@ -903,8 +937,10 @@ def _on_view_cert(self, _button: Gtk.Button) -> None: def trust_certificate(self) -> bool: return self._ui.trust_cert_checkbutton.get_active() - def get_visible_buttons(self) -> List[str]: - return ['back', self.get_toplevel().get_currenct_method()] + def get_visible_buttons(self) -> list[str]: + return [ + 'back', + cast(AccountWizard, self.get_toplevel()).get_current_method()] def get_default_button(self) -> str: return 'back' @@ -947,7 +983,7 @@ def add_form(self, form: Any) -> None: self.pack_start(self._current_form, True, True, 0) self._current_form.show_all() - def get_credentials(self) -> Tuple[str, str]: + def get_credentials(self) -> tuple[str, str]: return (self._current_form.get_form()['username'].value, self._current_form.get_form()['password'].value) @@ -965,7 +1001,7 @@ def remove_form(self) -> None: def focus(self) -> None: self._current_form.focus_first_entry() - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back', 'signup'] def get_default_button(self) -> str: @@ -990,9 +1026,10 @@ def set_redirect(self, link: str, instructions: str) -> None: self._link = link def _on_link_button(self, _button:Gtk.Button) -> None: + assert self._link is not None open_uri(self._link) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] @@ -1059,11 +1096,11 @@ def _save_config(self) -> None: app.settings.set_account_setting( self._account, 'account_label', self._label) app.css_config.refresh() - window = get_app_window('AccountsWindow') + window = cast(AccountsWindow, get_app_window('AccountsWindow')) if window is not None: window.update_account_label(self._account) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['connect'] @@ -1072,5 +1109,5 @@ def __init__(self) -> None: ErrorPage.__init__(self) self.set_heading(_('An error occurred during account creation')) - def get_visible_buttons(self) -> List[str]: + def get_visible_buttons(self) -> list[str]: return ['back'] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f18820a12f46335f61702cdc0774434d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f18820a12f46335f61702cdc0774434d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] other: Flatpak: Update dependencies
by André (＠andre) 31 May '22

31 May '22

André pushed to branch master at gajim / gajim Commits: abde1e9e by André Apitzsch at 2022-05-31T21:43:53+02:00 other: Flatpak: Update dependencies - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -60,11 +60,11 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install pyparsing-3.0.8-py3-none-any.whl + - pip3 install pyparsing-3.0.9-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.8-py3… - sha256: ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06 + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.9-py3… + sha256: 5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - name: python3-packaging buildsystem: simple @@ -182,24 +182,24 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.3-py3-none-any.whl + - pip3 install importlib_metadata-4.11.4-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.0-py3-none-any.whl + - pip3 install keyring-23.5.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… - sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… + sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e - name: python3-css-parser buildsystem: simple @@ -271,8 +271,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.0.tar.gz - sha256: f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz + sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 # sentry-sdk dependency - name: python3-urllib3 @@ -287,20 +287,20 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2021.10.8-py2.py3-none-any.whl + - pip3 install certifi-2022.5.18.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8… - sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… + sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.11-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: c17179183cac614e900cbd048dab03f49a48e2820182ec686c25e7ce46f8548f + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… + sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 - name: python3-nbxmpp buildsystem: simple ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -53,11 +53,11 @@ modules: - name: python3-pyparsing buildsystem: simple build-commands: - - pip3 install pyparsing-3.0.8-py3-none-any.whl + - pip3 install pyparsing-3.0.9-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.8-py3… - sha256: ef7b523f6356f763771559412c0d7134753f037822dad1b16945b7b846f7ad06 + url: https://files.pythonhosted.org/packages/py3/p/pyparsing/pyparsing-3.0.9-py3… + sha256: 5026bae9a10eeaefb61dab2f09052b9f4307d44aee4eda64b309723d8d206bbc - name: python3-packaging buildsystem: simple @@ -175,24 +175,24 @@ modules: - name: python3-importlib-metadata buildsystem: simple build-commands: - - pip3 install importlib_metadata-4.11.3-py3-none-any.whl + - pip3 install importlib_metadata-4.11.4-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… - sha256: 1208431ca90a8cca1a6b8af391bb53c1a2db74e5d1cef6ddced95d4b2062edc6 + url: https://files.pythonhosted.org/packages/py3/i/importlib_metadata/importlib_… + sha256: c58c8eb8a762858f49e18436ff552e83914778e50e9d2f1660535ffb364552ec - name: python3-keyring buildsystem: simple build-commands: - - pip3 install keyring-23.5.0-py3-none-any.whl + - pip3 install keyring-23.5.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.0-py3-no… - sha256: b0d28928ac3ec8e42ef4cc227822647a19f1d544f21f96457965dc01cf555261 + url: https://files.pythonhosted.org/packages/py3/k/keyring/keyring-23.5.1-py3-no… + sha256: 9ef58314bcc823f426b49ec787539a2d73571b37de4cd498f839803b01acff1e - name: python3-css-parser buildsystem: simple @@ -264,8 +264,8 @@ modules: - pip3 install . sources: - type: archive - url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.0.tar.gz - sha256: f401ed2bbb155e1ade150ccc63db1a4f6c1909d3d378f7d1235a44e90d75fb97 + url: https://files.pythonhosted.org/packages/source/p/pillow/Pillow-9.1.1.tar.gz + sha256: 7502539939b53d7565f3d11d87c78e7ec900d3c72945d4ee0e2f250d598309a0 # sentry-sdk dependency - name: python3-urllib3 @@ -280,29 +280,29 @@ modules: - name: python3-certifi buildsystem: simple build-commands: - - pip3 install certifi-2021.10.8-py2.py3-none-any.whl + - pip3 install certifi-2022.5.18.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/c/certifi/certifi-2021.10.8… - sha256: d62a0163eb4c2344ac042ab2bdf75399a71a2d8c7d47eac2e2ee91b9d6339569 + url: https://files.pythonhosted.org/packages/py3/c/certifi/certifi-2022.5.18.1-p… + sha256: f1d53542ee8cbedbe2118b5686372fb33c297fcd6379b050cca0ef13a597382a - name: python3-sentry-sdk buildsystem: simple build-commands: - - pip3 install sentry_sdk-1.5.11-py2.py3-none-any.whl + - pip3 install sentry_sdk-1.5.12-py2.py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… - sha256: c17179183cac614e900cbd048dab03f49a48e2820182ec686c25e7ce46f8548f + url: https://files.pythonhosted.org/packages/py2.py3/s/sentry_sdk/sentry_sdk-1.5… + sha256: 778b53f0a6c83b1ee43d3b7886318ba86d975e686cb2c7906ccc35b334360be1 - name: python3-nbxmpp buildsystem: simple build-commands: - - pip3 install nbxmpp-3.0.2-py3-none-any.whl + - pip3 install nbxmpp-3.1.0-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.0.2-py3-none-… - sha256: 713487fa86fb0598dd3536f9ee5edd04a9712b05b784e16ef3bef6ae7301183b + url: https://files.pythonhosted.org/packages/py3/n/nbxmpp/nbxmpp-3.1.0-py3-none-… + sha256: 0020c12f3900ba9ef9de570c1ed3e83cbcab33cd163580bbe0a6708a6f91b5ec - name: gajim buildsystem: simple View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abde1e9e2de10bf24aa388c68d182e8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/abde1e9e2de10bf24aa388c68d182e8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: fix: WorkspaceDialog: Disable Remove button for last workspace
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1e8c130a by wurstsalat at 2022-05-31T20:10:34+02:00 fix: WorkspaceDialog: Disable Remove button for last workspace - - - - - 0eabdb01 by wurstsalat at 2022-05-31T20:10:34+02:00 imprv: Workspaces: Add Move to new workspace functionality This allows moving chats to a new workspace by either selecting the 'move to' menu item or by dropping them on the 'new workspace' icon in the sidebar - - - - - 780e6fe3 by wurstsalat at 2022-05-31T20:12:14+02:00 chore: Add HistorySyncAssistant to pyrightconfig - - - - - 6 changed files: - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/workspace_dialog.py - gajim/gtk/workspace_side_bar.py - pyrightconfig.json Changes: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -90,6 +90,7 @@ def _add_actions(self) -> None: actions = [ ('toggle-chat-pinned', 'a{sv}', self._toggle_chat_pinned), ('move-chat-to-workspace', 'a{sv}', self._move_chat_to_workspace), + ('move-chat-to-new-workspace', 'a{sv}', self._move_chat_to_new_workspace), ('mark-as-read', 'a{sv}', self._mark_as_read), ] @@ -230,6 +231,13 @@ def _move_chat_to_workspace(self, self.store_open_chats(current_chatlist.workspace_id) self.store_open_chats(params.workspace_id) + @structs.actionmethod + def _move_chat_to_new_workspace(self, + _action: Gio.SimpleAction, + params: structs.AccountJidParam + ) -> None: + app.window.move_chat_to_new_workspace(params.account, params.jid) + @structs.actionmethod def _mark_as_read(self, _action: Gio.SimpleAction, ===================================== gajim/gtk/main.py ===================================== @@ -15,8 +15,9 @@ from __future__ import annotations from typing import Any -from typing import Optional +from typing import cast from typing import Generator +from typing import Optional import logging import os @@ -530,6 +531,24 @@ def get_chat_list(self, workspace_id: str) -> ChatList: chat_list_stack = self._chat_page.get_chat_list_stack() return chat_list_stack.get_chatlist(workspace_id) + def move_chat_to_new_workspace(self, + account: str, + jid: JID + ) -> None: + chat_list_stack = self._chat_page.get_chat_list_stack() + current_chatlist = cast(ChatList, chat_list_stack.get_visible_child()) + type_ = current_chatlist.get_chat_type(account, jid) + if type_ is None: + return + current_chatlist.remove_chat(account, jid) + + workspace_id = app.settings.add_workspace(_('My Workspace')) + app.window.add_workspace(workspace_id) + new_chatlist = self.get_chat_list(workspace_id) + new_chatlist.add_chat(account, jid, type_) + chat_list_stack.store_open_chats(current_chatlist.workspace_id) + chat_list_stack.store_open_chats(workspace_id) + def _add_group_chat(self, _action: Gio.SimpleAction, param: GLib.Variant) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -428,12 +428,16 @@ def get_chat_list_row_menu(workspace_id: str, toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') menu.add_item(toggle_label, 'win.toggle-chat-pinned', params) + submenu = menu.add_submenu(_('Move Chat')) workspaces = app.settings.get_workspaces() if len(workspaces) > 1: - submenu = menu.add_submenu(_('Move Chat')) for name, params in get_workspace_params(workspace_id, account, jid): submenu.add_item(name, 'win.move-chat-to-workspace', params) + params = AccountJidParam(account=account, jid=jid) + submenu.add_item( + _('New Workspace'), 'win.move-chat-to-new-workspace', params) + if can_add_to_roster(contact): params = AccountJidParam(account=account, jid=jid) menu.add_item(_('Add to Contact List…'), 'win.add-to-roster', params) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -56,7 +56,8 @@ def __init__(self, workspace_id: Optional[str] = None) -> None: color: Optional[str] = None self._avatar_sha: Optional[str] = None - if workspace_id is None: + workspaces = app.settings.get_workspaces() + if workspace_id is None or len(workspaces) == 1: self._ui.remove_workspace_button.set_sensitive(False) else: name = app.settings.get_workspace_setting( ===================================== gajim/gtk/workspace_side_bar.py ===================================== @@ -149,13 +149,16 @@ def _process_workspace_drop(self, workspace_id: str) -> None: def _process_chat_list_drop(self, identifier: str, y_coord: int) -> None: account, jid = identifier.split() + jid = JID.from_string(jid) workspace_row = cast(Workspace, self.get_row_at_y(y_coord)) if workspace_row.workspace_id == 'add': + app.window.move_chat_to_new_workspace( + account, jid) return params = ChatListEntryParam(workspace_id=workspace_row.workspace_id, account=account, - jid=JID.from_string(jid)) + jid=jid) app.window.activate_action('move-chat-to-workspace', params.to_variant()) ===================================== pyrightconfig.json ===================================== @@ -82,6 +82,7 @@ "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", "gajim/gtk/history_export.py", + "gajim/gtk/history_sync.py", "gajim/gtk/main_stack.py", "gajim/gtk/main.py", "gajim/gtk/mam_preferences.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e2ef26a4fe71d8f21207e4603c20e50… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e2ef26a4fe71d8f21207e4603c20e50… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update runtime requirements
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: e2ef26a4 by lovetox at 2022-05-31T19:14:55+02:00 chore: Update runtime requirements - - - - - 2 changed files: - README.md - debian/control Changes: ===================================== README.md ===================================== @@ -5,8 +5,6 @@ ### Runtime Requirements - python3.9 or higher - python3-gi - python3-gi-cairo -- gir1.2-gtk-3.0 (>=3.22) -- gir1.2-gtksource-4 - python3-nbxmpp (>=2.99.0) - python3-openssl (>=16.2) - python3-css-parser @@ -14,9 +12,15 @@ ### Runtime Requirements - python3-precis-i18n - python3-packaging - python3-setuptools -- gir1.2-soup-2.4 -- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls +- Gtk3 (>=3.22) - GLib (>=2.60.0) +- gir1.2-gtksource-4 +- gir1.2-soup-2.4 +- gir1.2-gstreamer-1.0 +- gir1.2-gst-plugins-base-1.0 +- gstreamer1.0-plugins-ugly +- gstreamer1.0-libav +- gstreamer1.0-gtk3 ### Optional Runtime Requirements @@ -29,6 +33,7 @@ ### Optional Runtime Requirements - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location - gir1.2-gsound-1.0 for sound on Linux +- gir1.2-farstream-0.2 for video calls ### Compile-time Requirements ===================================== debian/control ===================================== @@ -26,8 +26,6 @@ Depends: ${misc:Depends}, ${python3:Depends}, desktop-file-utils, - gir1.2-gtk-3.0 (>= 3.22.27~), - gir1.2-gtksource-4, python3 (>= 3.9), python3-css-parser (>= 1.0.2), python3-gi (>= 3.32.0), @@ -40,6 +38,13 @@ Depends: python3-packaging, python3-setuptools, python3-css-parser, + gir1.2-gtk-3.0 (>= 3.22.27~), + gir1.2-gtksource-4, + gir1.2-gstreamer-1.0 + gir1.2-gst-plugins-base-1.0 + gstreamer1.0-plugins-ugly + gstreamer1.0-libav + gstreamer1.0-gtk3 Recommends: aspell-en | aspell-dictionary, ca-certificates, @@ -48,11 +53,8 @@ Recommends: gir1.2-farstream-0.2, gir1.2-gsound-1.0, gir1.2-gspell-1, - gir1.2-gst-plugins-base-1.0, - gir1.2-gstreamer-1.0, gir1.2-gupnpigd-1.0, gir1.2-secret-1, - gstreamer1.0-plugins-ugly, notification-daemon, pulseaudio-utils | alsa-utils | sox | oss4-base, python3-dbus (>=0.81), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2ef26a4fe71d8f21207e4603c20e509… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e2ef26a4fe71d8f21207e4603c20e509… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ci: Update debian package description
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 450dafb6 by lovetox at 2022-05-31T18:32:18+02:00 ci: Update debian package description - - - - - 2d2c8c3a by lovetox at 2022-05-31T18:32:18+02:00 chore: Update appdata.xml - - - - - 2 changed files: - data/org.gajim.Gajim.appdata.xml.in - debian/control Changes: ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -22,13 +22,12 @@ <li>Chat securely with End-to-End encryption via OMEMO or OpenPGP</li> <li>Use your favorite emoticons, set your own profile picture</li> <li>Keep and manage all your chat history</li> - <li>Organize your chats with tabs</li> + <li>Organize your chats with workspaces</li> <li>Automatic spell-checking for your messages</li> <li>Connect to other Messengers via Transports (Facebook, IRC, ...)</li> <li>Lookup things on Wikipedia, dictionaries or other search engines directly from the chat window</li> - <li>Set your activity, tune, and mood to show your friends how you are feeling</li> + <li>Set your activity or tune to show your friends how you are feeling</li> <li>Support for multiple accounts</li> - <li>Group multiple contacts from one friend to a single Meta-Contact</li> <li>XML console to see what's happening on the protocol layer</li> <li>Support for service discovery including nodes and search for users</li> <li>Even more features via plugins</li> ===================================== debian/control ===================================== @@ -61,7 +61,7 @@ Recommends: python3-sentry-sdk, Suggests: libxss1, -Description: GTK+-based Jabber client - Gajim is a Jabber client. It has a tabbed user interface with normal chats, - group chats, and has many features such as, TLS, GPG, SSL, multiple accounts, - avatars, file transfers, audio/video call, D-Bus and Metacontacts. +Description: Fully-featured XMPP chat client + Gajim aims to be an easy to use and fully-featured XMPP client. + Just chat with your friends or family, easily share pictures and + thoughts or discuss the news with your groups. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0119451de10d67708395cf68ecc7a78… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0119451de10d67708395cf68ecc7a78… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: ChatList: Add middle mouse click for closing a chat
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0119451d by wurstsalat at 2022-05-31T17:26:44+02:00 imprv: ChatList: Add middle mouse click for closing a chat - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -692,6 +692,10 @@ def _on_button_press(self, ) -> None: if event.button == 3: # right click self._popup_menu(event) + elif event.button == 2: # middle click + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, str(self.jid)])) def _popup_menu(self, event: Gdk.EventButton): menu = get_chat_list_row_menu( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0119451de10d67708395cf68ecc7a783… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0119451de10d67708395cf68ecc7a783… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: chore: Remove obsolete AUTHORS file
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4fb2678d by lovetox at 2022-05-31T17:02:58+02:00 chore: Remove obsolete AUTHORS file - - - - - eb284a17 by lovetox at 2022-05-31T17:02:58+02:00 chore: Upate MANIFEST.in Include whole test directory. Test are only found if there is a __init__.py - - - - - 2 changed files: - − AUTHORS - MANIFEST.in Changes: ===================================== AUTHORS deleted ===================================== ===================================== MANIFEST.in ===================================== @@ -1,3 +1,3 @@ recursive-include po * recursive-include data *.1 *.in -recursive-include test test_*.py +recursive-include test * View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05184e4292fb6b027f33bbe14ea59fc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/05184e4292fb6b027f33bbe14ea59fc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Windows: Enable native emoji chooser
by Daniel Brötzmann (＠wurstsalat) 31 May '22

31 May '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 05184e42 by wurstsalat at 2022-05-31T16:23:47+02:00 imprv: Windows: Enable native emoji chooser - - - - - 5 changed files: - gajim/gtk/application.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/plain_widget.py - gajim/gtk/message_input.py - gajim/gtk/preferences.py Changes: ===================================== gajim/gtk/application.py ===================================== @@ -232,7 +232,9 @@ def _startup(self, _application: GajimApplication) -> None: idle.Monitor.set_interval(app.settings.get('autoawaytime') * 60, app.settings.get('autoxatime') * 60) - if sys.platform in ('win32', 'darwin'): + if sys.platform == 'darwin': + # TODO: Remove if colored emoji rendering works well on + # Windows and MacOS from gajim.gui.emoji_chooser import emoji_chooser emoji_chooser.load() ===================================== gajim/gtk/controls/base.py ===================================== @@ -491,7 +491,9 @@ def delegate_action(self, action: str) -> int: return Gdk.EVENT_STOP if action == 'show-emoji-chooser': - if sys.platform in ('win32', 'darwin'): + if sys.platform == 'darwin': + # TODO: Remove if colored emoji rendering works well on + # Windows and MacOS self.xml.emoticons_button.get_popover().show() return Gdk.EVENT_STOP self.msg_textview.emit('insert-emoji') @@ -1297,7 +1299,9 @@ def set_emoticon_popover(self) -> None: if not app.settings.get('emoticons_theme'): return - if sys.platform in ('win32', 'darwin'): + if sys.platform == 'darwin': + # TODO: Remove if colored emoji rendering works well on + # Windows and MacOS emoji_chooser.text_widget = self.msg_textview self.xml.emoticons_button.set_popover(emoji_chooser) return ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -17,6 +17,7 @@ from typing import Any import logging +import sys from gi.repository import Gtk from gi.repository import Pango @@ -52,15 +53,17 @@ def __init__(self, account: str, selectable: bool) -> None: self._account = account - # We use a Gtk.Textview on Windows and MacOS, since there is no support - # for rendering color fonts (Emojis) on Windows/MacOS yet, see: - # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244 + # We use a Gtk.Textview on MacOS, since there is no support + # for rendering color fonts (Emojis) on MacOS yet, see: + # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/289 # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/9 - # if app.settings.get('dev_use_message_label'): - # self._text_widget = MessageLabel(self._account, selectable) - # else: - # self._text_widget = MessageTextview(self._account) - self._text_widget = MessageLabel(self._account, selectable) + if sys.platform == 'darwin': + if app.settings.get('dev_use_message_label'): + self._text_widget = MessageLabel(self._account, selectable) + else: + self._text_widget = MessageTextview(self._account) + else: + self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) def add_content(self, block: PlainBlock) -> None: ===================================== gajim/gtk/message_input.py ===================================== @@ -19,6 +19,8 @@ from typing import Any +import sys + from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -222,6 +224,10 @@ def apply_formatting(self, formatting: str) -> None: buf.get_iter_at_offset(end_offset + 2)) def replace_emojis(self) -> None: + if sys.platform != 'darwin': + # TODO: Remove if colored emoji rendering works well on MacOS + return + theme = app.settings.get('emoticons_theme') if not theme or theme == 'font': return ===================================== gajim/gtk/preferences.py ===================================== @@ -116,7 +116,9 @@ def __init__(self) -> None: self._ui.connect_signals(self) self.show_all() - if sys.platform not in ('win32', 'darwin'): + if sys.platform != 'darwin': + # TODO: Remove if colored emoji rendering works well on + # Windows and MacOS self._ui.emoji.hide() def get_ui(self): @@ -701,7 +703,9 @@ def _on_dark_theme(value: str, *args: Any) -> None: class Emoji(PreferenceBox): def __init__(self, *args: Any) -> None: - if sys.platform not in ('win32', 'darwin'): + if sys.platform != 'darwin': + # TODO: Remove if colored emoji rendering works well on + # Windows and MacOS PreferenceBox.__init__(self, []) return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05184e4292fb6b027f33bbe14ea59fcc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/05184e4292fb6b027f33bbe14ea59fcc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Fix pyright version
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: f2bf00f5 by lovetox at 2022-05-31T15:45:59+02:00 ci: Fix pyright version 1.1.250 is not usable because of a bug - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -27,7 +27,7 @@ test-pyright: script: - pip3 install git+https://dev.gajim.org/gajim/python-nbxmpp.git - pip3 install git+https://github.com/pygobject/pygobject-stubs.git - - npm install pyright + - npm install pyright(a)1.1.249 - python3 .ci/link-gtk.py - $(npm bin)/pyright --version - $(npm bin)/pyright View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2bf00f5fd9562aed1cbffc12dec840a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f2bf00f5fd9562aed1cbffc12dec840a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] imprv: Use MessageLabel on all platforms
by Philipp Hörist (＠lovetox) 31 May '22

31 May '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 776404c7 by lovetox at 2022-05-31T15:30:01+02:00 imprv: Use MessageLabel on all platforms - - - - - 1 changed file: - gajim/gtk/conversation/plain_widget.py Changes: ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -56,10 +56,11 @@ def __init__(self, account: str, selectable: bool) -> None: # for rendering color fonts (Emojis) on Windows/MacOS yet, see: # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/244 # https://gitlab.freedesktop.org/cairo/cairo/-/merge_requests/9 - if app.settings.get('dev_use_message_label'): - self._text_widget = MessageLabel(self._account, selectable) - else: - self._text_widget = MessageTextview(self._account) + # if app.settings.get('dev_use_message_label'): + # self._text_widget = MessageLabel(self._account, selectable) + # else: + # self._text_widget = MessageTextview(self._account) + self._text_widget = MessageLabel(self._account, selectable) self.add(self._text_widget) def add_content(self, block: PlainBlock) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/776404c7d2da3c5aaa7224543a86843f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/776404c7d2da3c5aaa7224543a86843f… 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 May 2022