Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] fix: Flatpak: Fix display of tray icon using libappindicator
by Philipp Hörist (＠lovetox) 07 Jul '22

07 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8f032517 by André Apitzsch at 2022-07-07T18:46:32+02:00 fix: Flatpak: Fix display of tray icon using libappindicator Appindicator cannot access custom icons in flatpak. That's why the status is limited to * online state (gajim icon) and * new message state Fixes: #10869 - - - - - 3 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml - gajim/gtk/status_icon.py Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -26,6 +26,8 @@ finish-args: - --talk-name=org.kde.kwalletd5 # Notifications - --talk-name=org.freedesktop.Notifications + # tray/status icon + - --talk-name=org.kde.StatusNotifierWatcher # GnuPG - --filesystem=~/.gnupg # camera access ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -19,6 +19,8 @@ finish-args: - --talk-name=org.kde.kwalletd5 # Notifications - --talk-name=org.freedesktop.Notifications + # tray/status icon + - --talk-name=org.kde.StatusNotifierWatcher # GnuPG - --filesystem=~/.gnupg # camera access ===================================== gajim/gtk/status_icon.py ===================================== @@ -298,7 +298,7 @@ def __init__(self) -> None: self._status_icon = appindicator.Indicator.new( 'Gajim', - 'dcraven-online', + 'org.gajim.Gajim', appindicator.IndicatorCategory.COMMUNICATIONS) self._status_icon.set_icon_theme_path(str(configpaths.get('ICONS'))) self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) @@ -320,6 +320,9 @@ def update_state(self, init: bool = False) -> None: self._status_icon.set_icon_full(icon_name, _('Pending Event')) return + if app.is_flatpak(): + return + show = get_global_show() icon_name = get_icon_name(show) self._status_icon.set_icon_full(icon_name, show) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f0325177c33a37906df234b1023c234… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f0325177c33a37906df234b1023c234… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] chore: Update Release template
by Philipp Hörist (＠lovetox) 06 Jul '22

06 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 08a2139f by lovetox at 2022-07-06T22:50:00+02:00 chore: Update Release template - - - - - 1 changed file: - .gitlab/issue_templates/Release.md Changes: ===================================== .gitlab/issue_templates/Release.md ===================================== @@ -7,7 +7,6 @@ ## Build ## Update * [ ] Website: Write announcement post with changelog -* [ ] Website: Update Download section on gajim.org (set [current version and update installer links](https://dev.gajim.org/gajim/website/blob/master/themes/beautifulhugo…) * [ ] Website: Update screenshots * [ ] Website: Merge website translations from Weblate * [ ] MUC: Update MUC subject on gajim(a)conference.gajim.org View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08a2139f0ec27d14671d399daf359932… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/08a2139f0ec27d14671d399daf359932… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: Remote: Console scripts need a method as entry point
by Philipp Hörist (＠lovetox) 06 Jul '22

06 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 241f920a by lovetox at 2022-07-06T19:53:27+02:00 fix: Remote: Console scripts need a method as entry point Fixes: #11034 - - - - - 1 changed file: - gajim/gajim_remote.py Changes: ===================================== gajim/gajim_remote.py ===================================== @@ -136,7 +136,7 @@ def create_arg_parser() -> argparse.ArgumentParser: return parser -if __name__ == '__main__': +def main() -> None: args = create_arg_parser().parse_args() try: result = call_method(args) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/241f920ae33ad957ecb6044f86f7ea02… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/241f920ae33ad957ecb6044f86f7ea02… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Remove side effects of password module
by Philipp Hörist (＠lovetox) 05 Jul '22

05 Jul '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: cb89f598 by lovetox at 2022-07-05T21:37:01+02:00 refactor: Remove side effects of password module Fixes: #11032 - - - - - 5 changed files: - gajim/common/application.py - gajim/common/passwords.py - gajim/gtk/accounts.py - gajim/gtk/features.py - gajim/gtk/password_dialog.py Changes: ===================================== gajim/common/application.py ===================================== @@ -36,6 +36,7 @@ from gajim.common import ged from gajim.common import configpaths from gajim.common import logging_helpers +from gajim.common import passwords from gajim.common.dbus import logind from gajim.common.events import AccountDisonnected from gajim.common.events import AllowGajimUpdateCheck @@ -61,6 +62,8 @@ def _init_core(self) -> None: app.detect_dependencies() configpaths.create_paths() + passwords.init() + app.settings = Settings() app.settings.init() ===================================== gajim/common/passwords.py ===================================== @@ -23,6 +23,7 @@ from __future__ import annotations from typing import Optional +from typing import cast import logging @@ -31,21 +32,34 @@ from gajim.common import app __all__ = [ + 'init', + 'is_keyring_available', 'get_password', 'save_password', 'delete_password' ] -log = logging.getLogger('gajim.password') +log = logging.getLogger('gajim.c.passwords') -backends = keyring.backend.get_all_keyring() -for backend in backends: - log.info('Found keyring backend: %s', backend) -keyring_backend = keyring.get_keyring() -log.info('Select %s backend', keyring_backend) +class Interface: + def __init__(self): + self.backend = cast(keyring.backend.KeyringBackend, None) + self._is_keyring_available = False -KEYRING_AVAILABLE = keyring.core.recommended(keyring_backend) + @property + def is_keyring_available(self): + return self._is_keyring_available + + def init(self) -> None: + backends = keyring.backend.get_all_keyring() + for backend in backends: + log.info('Found keyring backend: %s', backend) + + self.backend = keyring.get_keyring() + log.info('Select %s backend', self.backend) + + self._is_keyring_available = keyring.core.recommended(self.backend) class SecretPasswordStorage: @@ -55,13 +69,13 @@ class SecretPasswordStorage: @staticmethod def save_password(account_name: str, password: str) -> bool: - if not KEYRING_AVAILABLE: + if not is_keyring_available(): log.warning('No recommended keyring backend available.' 'Passwords cannot be stored.') return True try: log.info('Save password to keyring') - keyring_backend.set_password('gajim', account_name, password) + _interface.backend.set_password('gajim', account_name, password) return True except Exception: log.exception('Save password failed') @@ -69,25 +83,28 @@ def save_password(account_name: str, password: str) -> bool: @staticmethod def get_password(account_name: str) -> Optional[str]: - log.info('Request password from keyring') - if not KEYRING_AVAILABLE: + if not is_keyring_available(): return + + log.info('Request password from keyring') + try: # For security reasons remove clear-text password ConfigPasswordStorage.delete_password(account_name) - return keyring_backend.get_password('gajim', account_name) + return _interface.backend.get_password('gajim', account_name) except Exception: log.exception('Request password failed') return @staticmethod def delete_password(account_name: str) -> None: - log.info('Remove password from keyring') - if not KEYRING_AVAILABLE: + if not is_keyring_available(): return + log.info('Remove password from keyring') + try: - return keyring_backend.delete_password('gajim', account_name) + return _interface.backend.delete_password('gajim', account_name) except keyring.errors.PasswordDeleteError as error: log.warning('Removing password failed: %s', error) except Exception: @@ -113,6 +130,14 @@ def delete_password(account_name: str) -> None: app.settings.set_account_setting(account_name, 'password', '') +def init() -> None: + _interface.init() + + +def is_keyring_available() -> bool: + return _interface.is_keyring_available + + def get_password(account_name: str) -> Optional[str]: if app.settings.get('use_keyring'): return SecretPasswordStorage.get_password(account_name) @@ -138,3 +163,6 @@ def delete_password(account_name: str) -> None: if app.settings.get('use_keyring'): return SecretPasswordStorage.delete_password(account_name) return ConfigPasswordStorage.delete_password(account_name) + + +_interface = Interface() ===================================== gajim/gtk/accounts.py ===================================== @@ -1084,7 +1084,7 @@ def __init__(self, account: str, parent: Gtk.Window) -> None: SettingType.ACCOUNT_CONFIG, 'savepass', enabled_func=(lambda: not app.settings.get('use_keyring') or - passwords.KEYRING_AVAILABLE)), + passwords.is_keyring_available())), Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), ===================================== gajim/gtk/features.py ===================================== @@ -29,6 +29,7 @@ from gi.repository import Gdk from gajim.common import app +from gajim.common import passwords from gajim.common.i18n import _ @@ -125,7 +126,7 @@ def _get_features(self) -> list[Feature]: _('No additional requirements'), notification_sounds_enabled), Feature(_('Secure Password Storage'), - self._some_keyring_available(), + passwords.is_keyring_available(), _('Enables Gajim to store Passwords securely instead of ' 'storing them in plaintext'), _('Requires: gnome-keyring or kwallet'), @@ -148,11 +149,6 @@ def _get_features(self) -> list[Feature]: None) ] - @staticmethod - def _some_keyring_available() -> bool: - from gajim.common import passwords - return passwords.KEYRING_AVAILABLE - @staticmethod def _idle_available() -> bool: from gajim.common import idle ===================================== gajim/gtk/password_dialog.py ===================================== @@ -18,10 +18,9 @@ from gi.repository import Gdk from gajim.common import app +from gajim.common import passwords from gajim.common.events import PasswordRequired from gajim.common.i18n import _ -from gajim.common.passwords import save_password -from gajim.common.passwords import KEYRING_AVAILABLE from .builder import get_builder @@ -69,9 +68,12 @@ def _process_event(self) -> None: 'jid': own_jid, 'account': account_name}) self._ui.save_pass_checkbutton.show() + + is_keyring_available = passwords.is_keyring_available() self._ui.save_pass_checkbutton.set_sensitive( - not app.settings.get('use_keyring') or KEYRING_AVAILABLE) - if not KEYRING_AVAILABLE: + not app.settings.get('use_keyring') or + is_keyring_available) + if not is_keyring_available: self._ui.keyring_hint.show() def _on_ok(self, _button: Gtk.Button) -> None: @@ -81,7 +83,7 @@ def _on_ok(self, _button: Gtk.Button) -> None: self.account, 'savepass', self._ui.save_pass_checkbutton.get_active()) - save_password(self.account, password) + passwords.save_password(self.account, password) self._event.on_password(password) self.destroy() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb89f598e4cfc68a17e4de5f86d66de0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cb89f598e4cfc68a17e4de5f86d66de0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Fix SecurityLabelSelector
by Daniel Brötzmann (＠wurstsalat) 04 Jul '22

04 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 9448b3de by wurstsalat at 2022-07-04T23:04:17+02:00 Fix SecurityLabelSelector - - - - - 6 changed files: - gajim/common/events.py - gajim/common/structs.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/message_actions_box.py - gajim/gtk/security_label_selector.py Changes: ===================================== gajim/common/events.py ===================================== @@ -25,6 +25,8 @@ from nbxmpp.protocol import JID from nbxmpp.modules.security_labels import Catalog +from nbxmpp.modules.security_labels import Displaymarking +from nbxmpp.modules.security_labels import SecurityLabel from nbxmpp.structs import HTTPAuthData from nbxmpp.structs import ModerationData from nbxmpp.structs import LocationData @@ -162,7 +164,7 @@ class MessageSent(ApplicationEvent): chatstate: Optional[str] timestamp: float additional_data: AdditionalDataDict - label: Optional[str] + label: Optional[SecurityLabel] correct_id: Optional[str] play_sound: bool @@ -393,7 +395,7 @@ class MessageReceived(ApplicationEvent): session: Any delayed: Optional[float] msg_log_id: int - displaymarking: str + displaymarking: Optional[Displaymarking] @dataclass ===================================== gajim/common/structs.py ===================================== @@ -31,6 +31,7 @@ from nbxmpp.const import Chatstate from nbxmpp.const import PresenceShow from nbxmpp.const import Role +from nbxmpp.modules.security_labels import SecurityLabel from nbxmpp.protocol import JID from nbxmpp.structs import PresenceProperties @@ -92,7 +93,7 @@ def __init__(self, marker: Optional[tuple[str, str]] = None, resource: Optional[str] = None, user_nick: Optional[str] = None, - label: Optional[str] = None, + label: Optional[SecurityLabel] = None, control: Optional[Any] = None, attention: Optional[bool] = None, correct_id: Optional[str] = None, ===================================== gajim/gtk/chat_stack.py ===================================== @@ -273,6 +273,7 @@ def _on_send_message(self) -> None: return contact = self._current_contact + assert contact is not None client = app.get_client(contact.account) message = helpers.remove_invalid_xml_chars(message) @@ -282,8 +283,7 @@ def _on_send_message(self) -> None: # if process_commands and self.process_as_command(message): # return - # TODO - # label = self.get_seclabel() + label = self._message_action_box.get_seclabel() correct_id: Optional[str] = None if control.correcting and control.last_sent_msg: @@ -303,7 +303,7 @@ def _on_send_message(self) -> None: message=message, type_=type_, chatstate=chatstate, - # label=label, + label=label, control=control, correct_id=correct_id) ===================================== gajim/gtk/controls/base.py ===================================== @@ -550,9 +550,6 @@ def drag_data_file_transfer(self, selection: Gtk.SelectionData) -> None: self._start_filetransfer(path) - def get_seclabel(self) -> Optional[str]: - return self._security_label_selector.get_seclabel() - def get_our_nick(self) -> str: return app.nicks[self.account] ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -29,7 +29,9 @@ from gi.repository import Gio from gi.repository import Gtk from gi.repository import GObject + from nbxmpp.const import Chatstate +from nbxmpp.modules.security_labels import SecurityLabel from gajim.common import app from gajim.common import i18n @@ -76,9 +78,8 @@ def __init__(self) -> None: self._ui.send_message_button, 'set_visible') - # self._security_label_selector = SecurityLabelSelector( - # account, self._contact) - # self._ui.box.pack_start(self._security_label_selector, False, True, 0) + self._security_label_selector = SecurityLabelSelector() + self._ui.box.pack_start(self._security_label_selector, False, True, 0) self.msg_textview = MessageInputTextView() self.msg_textview.get_buffer().connect('changed', @@ -113,6 +114,9 @@ def get_current_contact(self) -> ChatContactT: assert self._contact is not None return self._contact + def get_seclabel(self) -> Optional[SecurityLabel]: + return self._security_label_selector.get_seclabel() + def _connect_actions(self) -> None: actions = [ 'input-bold', @@ -169,11 +173,11 @@ def switch_contact(self, contact: ChatContactT) -> None: self._set_spell_checker_language(contact) self._set_chatstate() + self._security_label_selector.switch_contact(contact) + def _set_chatstate(self) -> None: return #TODO if state: - self._security_label_selector.update() - if self.msg_textview.has_text(): self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.PAUSED) ===================================== gajim/gtk/security_label_selector.py ===================================== @@ -19,6 +19,7 @@ from gi.repository import Gtk from gi.repository import Pango +from nbxmpp.modules.security_labels import SecurityLabel from nbxmpp.protocol import JID from gajim.common import app @@ -31,11 +32,11 @@ class SecurityLabelSelector(Gtk.ComboBox): - def __init__(self, account: str, contact: ChatContactT) -> None: + def __init__(self) -> None: Gtk.ComboBox.__init__(self, no_show_all=True) - self._account = account - self._client = app.get_client(account) - self._contact = contact + self._account: Optional[str] = None + self._client: Optional[Client] = None + self._contact: Optional[ChatContactT] = None self.set_valign(Gtk.Align.CENTER) self.set_tooltip_text(_('Select a security label for your message…')) @@ -51,14 +52,25 @@ def __init__(self, account: str, contact: ChatContactT) -> None: app.ged.register_event_handler( 'sec-catalog-received', ged.GUI1, self._sec_labels_received) + self.connect('changed', self._on_changed) + self.connect('destroy', self._on_destroy) + + def switch_contact(self, contact: ChatContactT) -> None: + app.settings.disconnect_signals(self) + if self._client is not None: + self._client.disconnect_all_from_obj(self) + + self._account = contact.account + self._client = app.get_client(contact.account) + self._contact = contact + app.settings.connect_signal( 'enable_security_labels', self._on_setting_changed, account=self._account) self._client.connect_signal( 'state-changed', self._on_client_state_changed) - self.connect('changed', self._on_changed) - self.connect('destroy', self._on_destroy) + self._update() def _on_destroy(self, _widget: SecurityLabelSelector) -> None: app.ged.remove_event_handler('sec-catalog-received', @@ -79,13 +91,14 @@ def _on_changed(self, _combo: Gtk.ComboBox) -> None: def _on_client_state_changed(self, _client: Client, _signal_name: str, - _state: SimpleClientState): - self.update() + _state: SimpleClientState + ) -> None: + self._update() def _on_setting_changed(self, state: bool, _name: str, - account: str, + _account: Optional[str], _jid: Optional[JID] ) -> None: self.set_no_show_all(not state) @@ -93,9 +106,13 @@ def _on_setting_changed(self, self.show_all() else: self.hide() + self._update() def _sec_labels_received(self, event: SecCatalogReceived) -> None: - if event.account != self._account: + if self._account is None or self._account != event.account: + return + + if self._contact is None: return if event.jid != self._contact.jid.bare: @@ -120,11 +137,13 @@ def _sec_labels_received(self, event: SecCatalogReceived) -> None: self.set_no_show_all(False) self.show_all() - def get_seclabel(self) -> Optional[str]: + def get_seclabel(self) -> Optional[SecurityLabel]: index = self.get_active() if index == -1: return None + assert self._contact is not None + assert self._client is not None jid = self._contact.jid.bare catalog = self._client.get_module('SecLabels').get_catalog(jid) if catalog is None: @@ -132,10 +151,13 @@ def get_seclabel(self) -> Optional[str]: labels, label_list = catalog.labels, catalog.get_label_names() label_name = label_list[index] - label = labels[label_name] - return label + return labels[label_name] + + def _update(self) -> None: + assert self._account is not None + assert self._client is not None + assert self._contact is not None - def update(self) -> None: chat_active = app.window.is_chat_active( self._account, self._contact.jid) if chat_active: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9448b3decaae2bb9e4b2253cd8725586… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/9448b3decaae2bb9e4b2253cd8725586… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] 11 commits: refactor: Replace reduce_chars_newlines() with stdlib
by Philipp Hörist (＠lovetox) 04 Jul '22

04 Jul '22

Philipp Hörist pushed to branch newcontrol at gajim / gajim Commits: 74571a31 by lovetox at 2022-07-04T19:24:53+02:00 refactor: Replace reduce_chars_newlines() with stdlib - - - - - a5f77d71 by lovetox at 2022-07-04T19:24:53+02:00 fix: GtkStatusIcon: Always show when Gajim has not toplevel focus - - - - - ee623949 by lovetox at 2022-07-04T19:24:53+02:00 fix: StatusIcon: Don’t lose new message icon on state change Fixes #11013 - - - - - 3228ed27 by wurstsalat at 2022-07-04T19:24:53+02:00 imprv: ChatActionProcessor: Improve detection of emoji shortcode start - - - - - 1a13e06d by wurstsalat at 2022-07-04T19:24:53+02:00 imprv: Roster: Display show value in tooltip Fixes #11010 - - - - - aa24823a by wurstsalat at 2022-07-04T19:24:53+02:00 chore: Update pyrightconfig - - - - - d3349704 by André Apitzsch at 2022-07-04T19:24:53+02:00 fix: CodeWidget: Don't highlight matching brackets Highlighting matching brackets is confusing without a visible cursor. Fixes #11026. - - - - - b8550beb by lovetox at 2022-07-04T19:24:53+02:00 chore: Raise nbxmpp version - - - - - 00878b99 by Peter Shkenev at 2022-07-04T19:24:53+02:00 chore: Use proper dependency names in README - - - - - 17ac9d48 by lovetox at 2022-07-04T19:24:53+02:00 Things2 - - - - - 2e97128a by lovetox at 2022-07-04T19:24:53+02:00 Refactor Actions - - - - - 17 changed files: - README.md - gajim/common/helpers.py - gajim/gajim.py - gajim/gtk/account_page.py - gajim/gtk/application.py - gajim/gtk/chat_action_processor.py - gajim/gtk/const.py - gajim/gtk/conversation/code_widget.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/groupchat_roster.py - gajim/gtk/main.py - gajim/gtk/menus.py - gajim/gtk/notification_manager.py - gajim/gtk/roster.py - gajim/gtk/status_icon.py - gajim/gtk/tooltips.py - pyrightconfig.json Changes: ===================================== README.md ===================================== @@ -2,46 +2,45 @@ # Welcome to Gajim ### Runtime Requirements -- python3.9 or higher -- python3-gi -- python3-gi-cairo -- python3-nbxmpp (>=2.99.0) -- python3-openssl (>=16.2) -- python3-css-parser -- python3-keyring -- python3-precis-i18n -- python3-packaging -- python3-pil -- python3-setuptools -- Gtk3 (>=3.22) -- GLib (>=2.60.0) -- gir1.2-gtksource-4 -- gir1.2-soup-2.4 +- [Python](https://www.python.org/) (>=3.9) +- [PyGObject](https://pypi.org/project/PyGObject/) +- [pycairo](https://pypi.org/project/pycairo/) +- [nbxmpp](https://pypi.org/project/nbxmpp/) (>=3.0.0) +- [pyOpenSSL](https://pypi.org/project/pyOpenSSL/) (>=16.2) +- [css-parser](https://pypi.org/project/css-parser/) +- [keyring](https://pypi.org/project/keyring/) +- [precis_i18n](https://pypi.org/project/precis-i18n/) +- [packaging](https://pypi.org/project/packaging/) +- [Pillow](https://pypi.org/project/Pillow/) +- [setuptools](https://pypi.org/project/setuptools/) +- [Gtk3](https://gitlab.com/gnome/gtk) (>=3.22) +- [GLib](https://gitlab.com/gnome/glib) (>=2.60.0) +- [GtkSourceView](https://gitlab.gnome.org/GNOME/gtksourceview) +- [libsoup](https://gitlab.gnome.org/GNOME/libsoup/) ### Optional Runtime Requirements -- python3-sentry-sdk for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) -- gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc -- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-gupnpigd-1.0 for better NAT traversing -- 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 +- [sentry-sdk](https://pypi.org/project/sentry-sdk/) for Sentry error reporting to dev.gajim.org (users decide whether to send reports or not) +- [gspell](https://gitlab.gnome.org/GNOME/gspell) and hunspell-LANG where lang is your locale eg. en, fr etc +- [libsecret](https://gitlab.gnome.org/GNOME/libsecret/) for GNOME Keyring or KDE support as password storage +- [GUPnP-IGD](https://gitlab.gnome.org/GNOME/gupnp) for better NAT traversing +- [NetworkManager](https://gitlab.freedesktop.org/NetworkManager/NetworkManage… for network lose detection +- [GeoClue](https://gitlab.freedesktop.org/geoclue/geoclue) for sharing your location +- [GSound](https://gitlab.gnome.org/GNOME/gsound) for sound on Linux #### For Video and Audio Calls -- gir1.2-farstream-0.2 for video calls -- gir1.2-gstreamer-1.0 for video and audio calls -- gir1.2-gst-plugins-base-1.0 for video and audio calls -- gstreamer1.0-plugins-ugly for video and audio calls -- gstreamer1.0-libav for video and audio calls -- gstreamer1.0-gtk3 +- [Farstream](https://gitlab.freedesktop.org/farstream/farstream) +- [GStreamer](https://gitlab.freedesktop.org/gstreamer/gstreamer) +- [gst-plugins-base](https://gitlab.freedesktop.org/gstreamer/gst-plugins-base) +- [gst-plugins-ugly](https://gitlab.freedesktop.org/gstreamer/gst-plugins-ugly) +- [gst-libav](https://gitlab.freedesktop.org/gstreamer/gst-libav) ### Compile-time Requirements -- python3-setuptools -- gettext +- [setuptools](https://pypi.org/project/setuptools/) +- [gettext](https://savannah.gnu.org/projects/gettext/) ### Running Tests ===================================== gajim/common/helpers.py ===================================== @@ -385,36 +385,6 @@ def sanitize_filename(filename: str) -> str: return filename -def reduce_chars_newlines(text: str, max_chars: int = 0, - max_lines: int = 0) -> str: - """ - Cut the chars after 'max_chars' on each line and show only the first - 'max_lines' - - If any of the params is not present (None or 0) the action on it is not - performed - """ - def _cut_if_long(string_: str) -> str: - if len(string_) > max_chars: - string_ = string_[:max_chars - 3] + '…' - return string_ - - if max_lines == 0: - lines = text.split('\n') - else: - lines = text.split('\n', max_lines)[:max_lines] - if max_chars > 0: - if lines: - lines = [_cut_if_long(e) for e in lines] - if lines: - reduced_text = '\n'.join(lines) - if reduced_text != text: - reduced_text += '…' - else: - reduced_text = '' - return reduced_text - - def get_contact_dict_for_account(account: str) -> dict[str, types.BareContact]: """ Creates a dict of jid -> contact with all contacts of account ===================================== gajim/gajim.py ===================================== @@ -30,7 +30,7 @@ from gajim.common import i18n -_MIN_NBXMPP_VER = '3.0.0.dev3' +_MIN_NBXMPP_VER = '3.0.0' _MIN_GTK_VER = '3.22.27' _MIN_CAIRO_VER = '1.16.0' _MIN_PYGOBJECT_VER = '3.32.0' ===================================== gajim/gtk/account_page.py ===================================== @@ -75,7 +75,7 @@ def __init__(self, account: str) -> None: roster_menu = Gio.Menu() for action, label in ROSTER_MENU_DICT.items(): - roster_menu.append(label, f'win.{action}-{account}') + roster_menu.append(label, f'win.{action}') self._ui.roster_menu_button.set_menu_model(roster_menu) self._ui.connect_signals(self) ===================================== gajim/gtk/application.py ===================================== @@ -524,6 +524,8 @@ def _on_feature_discovered(self, event: events.FeatureDiscovered) -> None: elif event.feature == Namespace.BLOCKING: action = '%s-blocking' % event.account self.set_action_state(action, True) + action = '%s-block-contact' % event.account + self.set_action_state(action, True) # Action Callbacks ===================================== gajim/gtk/chat_action_processor.py ===================================== @@ -210,7 +210,7 @@ def _check_for_emoji(self, start_iter: Gtk.TextIter) -> bool: start, _end = search colon_offset = start.get_offset() before_colon = self._buf.get_iter_at_offset(colon_offset - 1) - if before_colon.get_char() != ' ': + if before_colon.get_char() not in (' ', '\n'): # We want to show the menu only if text begins with a colon, # or if a colon follows on a space. This avoids showing the # menu within normal sentences containing colons. ===================================== gajim/gtk/const.py ===================================== @@ -212,11 +212,17 @@ def __str__(self): ('set-encryption', 's', 'disabled', False), ('send-chatstate', 's', 'disabled', False), ('send-marker', 'b', False, False), + ('sort-by-show', 'b', 'app-setting:showoffline', True), + ('show-offline', 'b', 'app-setting:sort_by_show_in_roster', True), ] ACCOUNT_ACTIONS = [ ('add-contact', 'as'), + ('block-contact', 's'), + ('remove-contact', 's'), + ('execute-command', 's'), + ('modify-gateway', 's'), ('archive', 's'), ('blocking', 's'), ('bookmarks', 's'), @@ -242,6 +248,9 @@ def __str__(self): ONLINE_ACCOUNT_ACTIONS = { 'add-contact', + 'remove-contact', + 'execute-command', + 'modify-gateway', 'bookmarks', 'import-contacts', 'open-chat', @@ -256,4 +265,5 @@ def __str__(self): FEATURE_ACCOUNT_ACTIONS = { 'archive', 'blocking', + 'block-contact', } ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -100,6 +100,7 @@ def __init__(self) -> None: self.set_top_margin(2) self.set_bottom_margin(2) self.set_monospace(True) + self.get_buffer().set_highlight_matching_brackets(False) self._source_manager = GtkSource.LanguageManager.get_default() self._style_scheme_manager = GtkSource.StyleSchemeManager.get_default() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -18,6 +18,7 @@ from datetime import datetime from datetime import timedelta +import textwrap from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -40,7 +41,6 @@ from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_muc_context from gajim.common.helpers import message_needs_highlight -from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.i18n import Q_ @@ -187,8 +187,10 @@ def __init__(self, if correction_original is not None: self._original_text = correction_original self._message_icons.set_correction_icon_visible(True) - original_text = reduce_chars_newlines( - correction_original, max_chars=150, max_lines=10) + original_text = textwrap.fill(correction_original, + width=150, + max_lines=10, + placeholder='…') self._message_icons.set_correction_tooltip( _('Message corrected. Original message:' '\n%s') % original_text) @@ -425,8 +427,10 @@ def set_correction(self, text: str, nickname: Optional[str]) -> None: self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) - original_text = reduce_chars_newlines( - self._original_text, max_chars=150, max_lines=10) + original_text = textwrap.fill(self._original_text, + width=150, + max_lines=10, + placeholder='…') self._message_icons.set_correction_tooltip( _('Message corrected. Original message:\n%s') % original_text) ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -378,7 +378,6 @@ def _show_contact_menu(self, nick: str, rect: Gdk.Rectangle) -> None: assert self_contact is not None contact = self._group_chat_contact.get_resource(nick) menu = get_groupchat_roster_menu(self._account, - self._control_id, self_contact, contact) ===================================== gajim/gtk/main.py ===================================== @@ -335,6 +335,11 @@ def _add_actions2(self) -> None: self.add_action(act) for action, variant_type, default, enabled in MAIN_WIN_STATEFUL_ACTIONS: + + if isinstance(default, str) and default.startswith('app-setting:'): + setting = default.removeprefix('app-setting:') + default = app.settings.get(setting) + action = Gio.SimpleAction.new_stateful( action, GLib.VariantType(variant_type), ===================================== gajim/gtk/menus.py ===================================== @@ -21,6 +21,7 @@ from typing import Optional from typing import Union +import textwrap from urllib.parse import quote from gi.repository import Gtk @@ -34,7 +35,6 @@ from gajim.common.helpers import is_affiliation_change_allowed from gajim.common.helpers import is_role_change_allowed from gajim.common.helpers import jid_is_blocked -from gajim.common.helpers import reduce_chars_newlines from gajim.common.i18n import _ from gajim.common.i18n import get_short_lang_code from gajim.common.const import URIType @@ -77,7 +77,7 @@ def get_singlechat_menu(contact: types.BareContact) -> GajimMenu: menu = GajimMenu() menu.add_item(_('Details'), 'win.show-contact-info') - menu.add_item(_('Block Contact…'), f'win.block-contact-{account}') + menu.add_item(_('Block Contact…'), f'app.{account}-block-contact') submenu = get_send_file_submenu() menu.append_submenu(_('Send File'), submenu) @@ -207,7 +207,9 @@ def get_encryption_menu() -> GajimMenu: def get_conv_action_context_menu(account: str, selected_text: str ) -> Gtk.MenuItem: - selected_text_short = reduce_chars_newlines(selected_text, 10, 1) + selected_text_short = textwrap.shorten(selected_text, + width=10, + placeholder='…') action_menu_item = Gtk.MenuItem.new_with_mnemonic( _('_Actions for "%s"') % selected_text_short) @@ -356,15 +358,15 @@ def get_roster_menu(account: str, jid: str, gateway: bool = False) -> GajimMenu: value = f'"{jid}"' menuitems: MenuItemListT = [ - (_('Details'), f'win.contact-info-{account}', value), - (_('Execute Command…'), f'win.execute-command-{account}', value), - (block_label, f'win.block-contact-{account}', value), - (_('Remove…'), f'win.remove-contact-{account}', value), + (_('Details'), f'app.{account}-contact-info', value), + (_('Execute Command…'), f'app.{account}-execute-command', value), + (block_label, f'app.{account}-block-contact', value), + (_('Remove…'), f'app.{account}-remove-contact', value), ] if gateway: menuitems.insert( - 1, (_('Modify Gateway…'), f'win.modify-gateway-{account}', value)) + 1, (_('Modify Gateway…'), f'app.{account}-modify-gateway', value)) return GajimMenu.from_list(menuitems) ===================================== gajim/gtk/notification_manager.py ===================================== @@ -378,7 +378,7 @@ def __init__(self, account: str, jid: str) -> None: remove_button.set_valign(Gtk.Align.CENTER) remove_button.set_tooltip_text('Remove from contact list') remove_button.set_action_name( - f'win.remove-contact-{self._account}') + f'win.{self._account}-remove-contact') remove_button.set_action_target_value(GLib.Variant('s', str(self.jid))) self.grid.attach(remove_button, 3, 1, 1, 2) ===================================== gajim/gtk/roster.py ===================================== @@ -116,8 +116,6 @@ def __init__(self, account: str) -> None: self._ui.connect_signals(self) self.register_events([ - ('account-connected', ged.CORE, self._on_account_state), - ('account-disconnected', ged.CORE, self._on_account_state), ('roster-received', ged.CORE, self._on_roster_received), ('theme-update', ged.GUI2, self._on_theme_update), ('roster-push', ged.GUI2, self._on_roster_push), @@ -134,73 +132,36 @@ def __init__(self, account: str) -> None: self._filter_enabled = False self._filter_string = '' - self._add_actions() + self._connect_actions() self._initial_draw() - def _add_actions(self): - actions = [ - ('contact-info', self._on_contact_info), - ('modify-gateway', self._on_modify_gateway), - ('execute-command', self._on_execute_command), - ('block-contact', self._on_block_contact), - ('remove-contact', self._on_remove_contact), + def _connect_actions(self): + app_actions = [ + (f'{self._account}-modify-gateway', self._on_modify_gateway), + (f'{self._account}-execute-command', self._on_execute_command), + (f'{self._account}-block-contact', self._on_block_contact), + (f'{self._account}-remove-contact', self._on_remove_contact), ] - for action in actions: - action_name, func = action - act = Gio.SimpleAction.new( - f'{action_name}-{self._account}', GLib.VariantType.new('s')) - act.connect('activate', func) - app.window.add_action(act) - - action = Gio.SimpleAction.new_stateful( - f'show-offline-{self._account}', - None, - GLib.Variant.new_boolean(app.settings.get('showoffline'))) - action.connect('change-state', self._on_show_offline) - app.window.add_action(action) - - action = Gio.SimpleAction.new_stateful( - f'sort-by-show-{self._account}', - None, - GLib.Variant.new_boolean( - app.settings.get('sort_by_show_in_roster'))) - action.connect('change-state', self._on_sort_by_show) - app.window.add_action(action) - - def update_actions(self): - online = app.account_is_connected(self._account) - blocking_support = self._client.get_module('Blocking').supported - - actions = [('contact-info', online), - ('modify-gateway', online), - ('execute-command', online), - ('block-contact', online and blocking_support), - ('remove-contact', online)] - - for action, enabled in actions: - act = app.window.lookup_action(f'{action}-{self._account}') - assert act is not None - act.set_enabled(enabled) - - def _remove_actions(self): - actions = [ - 'contact-info', - 'modify-gateway', - 'execute-command', - 'block-contact', - 'remove-contact', - 'show-offline', - 'sort-by-show', + + win_actions = [ + ('show-offline', self._on_show_offline), + ('sort-by-show', self._on_sort_by_show), ] - for action in actions: - app.window.remove_action(f'{action}-{self._account}') + + for action in app_actions: + action_name, func = action + action = app.app.lookup_action(action_name) + assert action is not None + action.connect('activate', func) + + for action in win_actions: + action_name, func = action + action = app.window.get_action(action_name) + action.connect('change-state', func) def _get_contact(self, jid: str) -> types.BareContact: return self._client.get_module('Contacts').get_contact(jid) - def _on_account_state(self, _event: ApplicationEvent) -> None: - self.update_actions() - def _on_theme_update(self, _event: ApplicationEvent) -> None: self.redraw() @@ -785,7 +746,6 @@ def process_event(self, event: ApplicationEvent) -> None: return def _on_destroy(self, _roster: Roster) -> None: - self._remove_actions() self._contact_refs.clear() self._group_refs.clear() self._unset_model() ===================================== gajim/gtk/status_icon.py ===================================== @@ -80,8 +80,7 @@ def _can_use_libindicator() -> bool: app.is_installed('AYATANA_APPINDICATOR')) def _on_setting_changed(self, *args: Any) -> None: - count = app.window.get_total_unread_count() - self._backend.update_state(count=count) + self._backend.update_state() def connect_unread_widget(self, widget: Gtk.Widget, signal: str) -> None: widget.connect(signal, self._on_unread_count_changed) @@ -89,8 +88,7 @@ def connect_unread_widget(self, widget: Gtk.Widget, signal: str) -> None: def _on_unread_count_changed(self, *args: Any) -> None: if not app.settings.get('trayicon_notification_on_events'): return - count = app.window.get_total_unread_count() - self._backend.update_state(count=count) + self._backend.update_state() def is_visible(self) -> bool: return self._backend.is_visible() @@ -100,7 +98,7 @@ def shutdown(self) -> None: class NoneBackend: - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: pass def is_visible(self) -> bool: @@ -133,7 +131,7 @@ def __init__(self) -> None: client.connect_signal('state-changed', self._on_client_state_changed) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: raise NotImplementedError def is_visible(self) -> bool: @@ -188,9 +186,6 @@ def _on_sounds_mute(widget: Gtk.CheckMenuItem) -> None: app.settings.set('sounds_on', not widget.get_active()) def _on_toggle_window(self, _widget: Gtk.MenuItem) -> None: - self._on_activate() - - def _on_activate(self, *args: Any) -> None: if app.window.is_minimized(): app.window.unminimize() elif app.window.is_withdrawn(): @@ -223,9 +218,9 @@ def __init__(self) -> None: self._status_icon.connect('popup-menu', self._on_popup_menu) self._status_icon.connect('size-changed', self._on_size_changed) - self.update_state() + self.update_state(init=True) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: if self._shutdown: # Shutdown in progress, don't update icon return @@ -236,7 +231,7 @@ def update_state(self, count: int = 0) -> None: self._status_icon.set_visible(True) - if count > 0: + if not init and app.window.get_total_unread_count(): self._status_icon.set_from_icon_name('mail-message-new') return @@ -258,17 +253,22 @@ def _on_size_changed(self, self.update_state() def _on_popup_menu(self, - _status_icon: Gtk.StatusIcon, + status_icon: Gtk.StatusIcon, button: int, activate_time: int) -> None: - if button == 1: - self._on_activate() - elif button == 2: - self._on_activate() + + if button in (1, 2): + self._on_activate(status_icon) elif button == 3: - self._build_menu(activate_time) + self._build_menu(button, activate_time) + + def _on_activate(self, _status_icon: Gtk.StatusIcon) -> None: + if app.window.has_toplevel_focus(): + app.window.hide() + else: + app.window.show() - def _build_menu(self, event_time: int) -> None: + def _build_menu(self, button: int, event_time: int) -> None: for menu in self._popup_menus: menu.destroy() @@ -289,7 +289,7 @@ def _build_menu(self, event_time: int) -> None: self._ui.systray_context_menu.show_all() self._ui.systray_context_menu.popup( - None, None, None, None, 0, event_time) + None, None, None, None, button, event_time) class AppIndicator(GtkMenuBackend): @@ -306,16 +306,16 @@ def __init__(self) -> None: self._status_icon.set_secondary_activate_target( self._ui.toggle_window_menuitem) - self.update_state() + self.update_state(init=True) - def update_state(self, count: int = 0) -> None: + def update_state(self, init: bool = False) -> None: if not app.settings.get('show_trayicon'): self._status_icon.set_status(appindicator.IndicatorStatus.PASSIVE) return self._status_icon.set_status(appindicator.IndicatorStatus.ACTIVE) - if count > 0: + if not init and app.window.get_total_unread_count(): icon_name = 'mail-message-new' self._status_icon.set_icon_full(icon_name, _('Pending Event')) return ===================================== gajim/gtk/tooltips.py ===================================== @@ -206,6 +206,8 @@ def _add_resources(self, contact: types.BareContact) -> None: show_image.set_halign(Gtk.Align.START) show_image.set_valign(Gtk.Align.CENTER) + show_string = helpers.get_uf_show(resource.show.value) + assert resource.jid.resource is not None resource_string = GLib.markup_escape_text(resource.jid.resource) resource_label = Gtk.Label() @@ -213,7 +215,7 @@ def _add_resources(self, contact: types.BareContact) -> None: resource_label.set_xalign(0) resource_label.set_ellipsize(Pango.EllipsizeMode.END) resource_label.set_max_width_chars(30) - resource_label.set_text(resource_string) + resource_label.set_text(f'{show_string} ({resource_string})') base_box = Gtk.Box(spacing=6) base_box.add(show_image) ===================================== pyrightconfig.json ===================================== @@ -41,6 +41,7 @@ "gajim/common/sound.py", "gajim/common/storage/", "gajim/common/task_manager.py", + "gajim/gtk/conversation", "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", @@ -65,9 +66,8 @@ "gajim/gtk/control_stack.py", "gajim/gtk/const.py", "gajim/gtk/contact_info.py", - "gajim/gtk/contacts_flowbox.py", "gajim/gtk/contact_settings.py", - "gajim/gtk/conversation", + "gajim/gtk/contacts_flowbox.py", "gajim/gtk/dialogs.py", "gajim/gtk/emoji_data_gtk.py", "gajim/gtk/exception.py", @@ -79,11 +79,13 @@ "gajim/gtk/groupchat_details.py", "gajim/gtk/groupchat_invitation.py", "gajim/gtk/groupchat_inviter.py", - "gajim/gtk/groupchat_nick.py", + "gajim/gtk/groupchat_join.py", "gajim/gtk/groupchat_nick_completion.py", + "gajim/gtk/groupchat_nick.py", "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", + "gajim/gtk/gstreamer.py", "gajim/gtk/history_export.py", "gajim/gtk/history_sync.py", "gajim/gtk/main_stack.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c0101fd66eef81dbea65691646778a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/3c0101fd66eef81dbea65691646778a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Add, update, and handler equest-voice action
by Daniel Brötzmann (＠wurstsalat) 04 Jul '22

04 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: 3c0101fd by wurstsalat at 2022-07-04T17:14:15+02:00 Add, update, and handler equest-voice action - - - - - 3 changed files: - gajim/gtk/chat_banner.py - gajim/gtk/chat_stack.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/chat_banner.py ===================================== @@ -17,6 +17,7 @@ from typing import Any from typing import Optional +from gi.repository import Gio from gi.repository import Gtk import cairo @@ -72,6 +73,9 @@ def __init__(self) -> None: 'hide_groupchat_occupants_list', self._set_toggle_roster_button_icon) + action = Gio.SimpleAction.new('request-voice', None) + app.window.add_action(action) + self.show_all() def switch_contact(self, @@ -177,8 +181,7 @@ def _on_user_role_changed(self, user_contact: GroupchatParticipant, properties: PresenceProperties ) -> None: - if properties.is_muc_self_presence: - self._ui.visitor_box.set_visible(user_contact.role.is_visitor) + self._update_content() def _on_user_nickname_changed(self, user_contact: GroupchatParticipant, @@ -269,6 +272,8 @@ def _update_content(self) -> None: self_contact = self._contact.get_self() if self_contact: self._ui.visitor_box.set_visible(self_contact.role.is_visitor) + app.window.get_action('request-voice').set_enabled( + self_contact.role.is_visitor) def _update_account_badge(self) -> None: if self._account_badge is not None: @@ -282,10 +287,7 @@ def _update_account_badge(self) -> None: def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: self._ui.visitor_popover.popdown() - control = app.window.get_active_control() - if control is not None: - app.window.activate_action( - f'request-voice-{control.control_id}', None) + app.window.activate_action('request-voice', None) def _on_toggle_roster_clicked(self, _button: Gtk.Button) -> None: state = app.settings.get('hide_groupchat_occupants_list') ===================================== gajim/gtk/chat_stack.py ===================================== @@ -32,7 +32,7 @@ from gajim.common.modules.contacts import GroupchatContact from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.structs import OutgoingMessage -from gajim.common.types import BareContactT, ChatContactT +from gajim.common.types import ChatContactT from .chat_banner import ChatBanner from .control_stack import ControlStack @@ -103,6 +103,7 @@ def _connect_actions(self) -> None: 'start-video-call', 'start-voice-call', 'send-message', + 'request-voice', ] stateful_actions = [ @@ -120,7 +121,7 @@ def _connect_actions(self) -> None: assert action is not None action.connect('change-state', self._on_stateful_action) - def _update_base_actions(self, contact: ChatContactT): + def _update_base_actions(self, contact: ChatContactT) -> None: client = app.get_client(contact.account) online = app.account_is_connected(contact.account) @@ -166,7 +167,12 @@ def _update_chat_actions(self, contact: BareContact) -> None: sys.platform != 'win32') def _update_group_chat_actions(self, contact: GroupchatContact) -> None: - pass + is_visitor = False + if contact.is_joined: + self_contact = contact.get_self() + assert self_contact + is_visitor = self_contact.role.is_visitor + app.window.get_action('request-voice').set_enabled(is_visitor) def _update_participant_actions(self, contact: GroupchatParticipant) -> None: @@ -180,6 +186,7 @@ def _on_action(self, contact = self._current_contact assert contact is not None account = contact.account + client = app.get_client(account) jid = contact.jid if action_name == 'send-message': @@ -230,6 +237,8 @@ def _on_action(self, open_window('GroupchatDetails', contact=contact) else: app.window.contact_info(account, jid) + elif action_name == 'request-voice': + client.get_module('MUC').request_voice(contact.jid) def _on_stateful_action(self, action: Gio.SimpleAction, ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -216,7 +216,6 @@ def add_actions(self) -> None: actions = [ ('change-nickname-', None, self._on_change_nick), ('destroy-', None, self._on_destroy_room), - ('request-voice-', None, self._on_request_voice), # ('groupchat-details-', None, self._on_details), ('invite-', None, self._on_invite), ('contact-information-', 's', self._on_contact_information), @@ -236,13 +235,7 @@ def add_actions(self) -> None: app.window.add_action(act) def update_actions(self, *args: Any) -> None: - request_voice = False joined = self.contact.is_joined - if joined: - contact = self.contact.get_self() - request_voice = contact.role.is_visitor - - self._get_action('request-voice-').set_enabled(request_voice) # Change Nick self._get_action('change-nickname-').set_enabled( @@ -291,7 +284,6 @@ def remove_actions(self) -> None: 'change-nickname-', 'destroy-', 'configure-', - 'request-voice-', 'groupchat-details-', 'invite-', 'contact-information-', @@ -385,19 +377,6 @@ def _on_destroy_confirm(self, _button: Gtk.Button) -> None: self._client.get_module('MUC').destroy(self.room_jid, reason, jid) self._show_page('groupchat') - def _on_request_voice_clicked(self, _button: Gtk.Button) -> None: - self._request_voice() - self.xml.visitor_popover.popdown() - - def _on_request_voice(self, - _action: Gio.SimpleAction, - _param: Optional[GLib.Variant] - ) -> None: - self._request_voice() - - def _request_voice(self) -> None: - self._client.get_module('MUC').request_voice(self.room_jid) - def _on_execute_command(self, _action: Gio.SimpleAction, param: GLib.Variant View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c0101fd66eef81dbea65691646778a4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/3c0101fd66eef81dbea65691646778a4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][newcontrol] Fix GC roster revealer
by Daniel Brötzmann (＠wurstsalat) 04 Jul '22

04 Jul '22

Daniel Brötzmann pushed to branch newcontrol at gajim / gajim Commits: cf3828e3 by wurstsalat at 2022-07-04T16:07:14+02:00 Fix GC roster revealer - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -124,10 +124,8 @@ def __init__(self, account: str, jid: JID) -> None: show_roster = app.settings.get('hide_groupchat_occupants_list') self.xml.roster_revealer.set_reveal_child(show_roster) - app.settings.bind_signal( - 'hide_groupchat_occupants_list', - self.xml.roster_revealer, - 'set_reveal_child') + app.settings.connect_signal( + 'hide_groupchat_occupants_list', self._show_roster) self.roster.connect('row-activated', self._on_roster_row_activated) self.add_actions() @@ -460,14 +458,12 @@ def _on_change_affiliation(self, self.room_jid, {jid: {'affiliation': affiliation}}) - def _show_roster(self, *args: Any) -> None: - show = not self.xml.roster_revealer.get_reveal_child() + def _show_roster(self, show_roster: bool, *args: Any) -> None: transition = Gtk.RevealerTransitionType.SLIDE_RIGHT - if show: + if show_roster: transition = Gtk.RevealerTransitionType.SLIDE_LEFT self.xml.roster_revealer.set_transition_type(transition) - self.xml.roster_revealer.set_reveal_child(show) - app.settings.set('hide_groupchat_occupants_list', show) + self.xml.roster_revealer.set_reveal_child(show_roster) def _on_roster_row_activated(self, _roster: GroupchatRoster, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf3828e3e1a0611a8696e091b439e6b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cf3828e3e1a0611a8696e091b439e6b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: CodeWidget: Don’t default to python for highlighting
by Daniel Brötzmann (＠wurstsalat) 04 Jul '22

04 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: dbf44701 by wurstsalat at 2022-07-04T12:35:17+02:00 fix: CodeWidget: Don’t default to python for highlighting Fixes #11012 - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -13,7 +13,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from typing import Any -from typing import Tuple from typing import Optional import logging @@ -72,16 +71,16 @@ def _on_copy(self, _button: Gtk.Button) -> None: def add_content(self, block: PreBlock): code, lang = self._prepare_code(block.text) - lang_name = self._textview.set_language(lang) if lang is None: self._lang_label.set_text(_('Code snippet')) else: + lang_name = self._textview.set_language(lang) self._lang_label.set_text(_('Code snippet (%s)') % lang_name) self._textview.print_code(code) @staticmethod - def _prepare_code(text: str) -> Tuple[str, Optional[str]]: + def _prepare_code(text: str) -> tuple[str, Optional[str]]: text = text.strip() code_start = text.partition('\n')[0] lang = None @@ -127,15 +126,10 @@ def _on_style_changed(self, *args: Any) -> None: if style_scheme is not None: self.get_buffer().set_style_scheme(style_scheme) - def set_language(self, language_string: Optional[str]) -> str: - if language_string is None: - language_string = 'python3' - + def set_language(self, language_string: str) -> str: lang = self._source_manager.get_language(language_string) if lang is None: - lang = self._source_manager.get_language('python3') - - assert lang is not None + return _('Unknown language') log.debug('Code snippet lang: %s', lang.get_name()) self.get_buffer().set_language(lang) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbf44701e43dec183422fb97c2bec788… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/dbf44701e43dec183422fb97c2bec788… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: ContactInfo: Preserve groups when changing contact name
by Daniel Brötzmann (＠wurstsalat) 04 Jul '22

04 Jul '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 792a83bf by wurstsalat at 2022-07-04T12:19:18+02:00 fix: ContactInfo: Preserve groups when changing contact name Fixes #11028 - - - - - 1 changed file: - gajim/gtk/contact_info.py Changes: ===================================== gajim/gtk/contact_info.py ===================================== @@ -332,10 +332,15 @@ def _on_edit_name_toggled(self, widget: Gtk.ToggleButton) -> None: self._ui.name_entry.set_sensitive(active) if active: self._ui.name_entry.grab_focus() + else: + name = self._ui.name_entry.get_text() + if name == self.contact.name: + return - name = self._ui.name_entry.get_text() - self._client.get_module('Roster').set_item(self.contact.jid, name) - self._ui.contact_name_label.set_text(name) + assert isinstance(self.contact, BareContact) + self._client.get_module('Roster').set_item( + self.contact.jid, name, self.contact.groups) + self._ui.contact_name_label.set_text(name) def _on_name_entry_activate(self, _widget: Gtk.Entry) -> None: self._ui.edit_name_button.set_active(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/792a83bf37304c0d367246c5b02948ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/792a83bf37304c0d367246c5b02948ff… 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