Commits December 2021

commits@gajim.org

1 participants
197 discussions

[Git][gajim/gajim][master] Sound: Don’t play sound when loop is in progress
by Philipp Hörist (＠lovetox) 21 Dec '21

21 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 84474aae by lovetox at 2021-12-21T10:38:51+01:00 Sound: Don’t play sound when loop is in progress - - - - - 1 changed file: - gajim/common/sound.py Changes: ===================================== gajim/common/sound.py ===================================== @@ -44,14 +44,24 @@ def play(self, path: Path, loop: bool = False) -> None: def stop(self) -> None: raise NotImplementedError + def loop_in_progress(self) -> bool: + raise NotImplementedError + class PlatformWindows(PlaySound): + def __init__(self) -> None: + self._loop_in_progress = False + def play(self, path: Path, loop: bool = False) -> None: + if self._loop_in_progress: + return + flags = (winsound.SND_FILENAME | winsound.SND_ASYNC | winsound.SND_NODEFAULT) if loop: + self._loop_in_progress = True flags = flags | winsound.SND_LOOP try: @@ -64,6 +74,10 @@ def stop(self) -> None: winsound.PlaySound(None, 0) except Exception: log.exception('Sound Playback Error') + self._loop_in_progress = False + + def loop_in_progress(self) -> bool: + return self._loop_in_progress class PlatformMacOS(PlaySound): @@ -76,6 +90,9 @@ def play(self, path: Path, loop: bool = False) -> None: def stop(self) -> None: pass + def loop_in_progress(self) -> bool: + return False + class PlatformUnix(PlaySound): @@ -86,8 +103,10 @@ def play(self, path: Path, loop: bool = False) -> None: if not app.is_installed('GSOUND'): return + if self.loop_in_progress(): + return + attrs = {'media.filename': str(path)} - self._cancellable = Gio.Cancellable() if loop: self._play_loop(attrs) @@ -99,6 +118,7 @@ def play(self, path: Path, loop: bool = False) -> None: self._cancellable = None def _play_loop(self, attrs: dict[str, str]) -> None: + self._cancellable = Gio.Cancellable() try: app.gsound_ctx.play_full(attrs, self._cancellable, @@ -117,6 +137,7 @@ def _on_play_finished(self, except GLib.Error as error: quark = GLib.quark_try_string('g-io-error-quark') if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + self._cancellable = None return log.error('Could not play sound: %s', error.message) @@ -128,6 +149,9 @@ def stop(self) -> None: self._cancellable.cancel() self._cancellable = None + def loop_in_progress(self) -> bool: + return self._cancellable is not None + def _init_platform() -> PlaySound: if sys.platform == 'win32': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84474aae9c1320d0880396261bbb79b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/84474aae9c1320d0880396261bbb79b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add sound module
by Philipp Hörist (＠lovetox) 20 Dec '21

20 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b4e48726 by lovetox at 2021-12-20T23:10:06+01:00 Add sound module - - - - - 2 changed files: - gajim/common/helpers.py - + gajim/common/sound.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -534,31 +534,8 @@ def play_sound_file(path_to_soundfile): if path_to_soundfile is None: return - path_to_soundfile = str(path_to_soundfile) - if sys.platform == 'win32': - import winsound - try: - winsound.PlaySound(path_to_soundfile, - winsound.SND_FILENAME|winsound.SND_ASYNC) - except Exception: - log.exception('Sound Playback Error') - - elif sys.platform == 'darwin': - try: - from AppKit import NSSound - except ImportError: - log.exception('Sound Playback Error') - return - - sound = NSSound.alloc() - sound.initWithContentsOfFile_byReference_(path_to_soundfile, True) - sound.play() - - elif app.is_installed('GSOUND'): - try: - app.gsound_ctx.play_simple({'media.filename' : path_to_soundfile}) - except GLib.Error as error: - log.error('Could not play sound: %s', error.message) + from gajim.common import sound + sound.play(path_to_soundfile) def get_connection_status(account: str) -> str: if not app.account_is_available(account): ===================================== gajim/common/sound.py ===================================== @@ -0,0 +1,147 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# 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 Optional + +import sys +import logging +from pathlib import Path + +from gi.repository import Gio +from gi.repository import GLib + +from gajim.common import app + +if sys.platform == 'win32': + import winsound + +elif sys.platform == 'darwin': + from AppKit import NSSound + + +log = logging.getLogger('gajim.c.sound') + + +class PlaySound: + + def play(self, path: Path, loop: bool = False) -> None: + raise NotImplementedError + + def stop(self) -> None: + raise NotImplementedError + + +class PlatformWindows(PlaySound): + + def play(self, path: Path, loop: bool = False) -> None: + flags = (winsound.SND_FILENAME | + winsound.SND_ASYNC | + winsound.SND_NODEFAULT) + if loop: + flags = flags | winsound.SND_LOOP + + try: + winsound.PlaySound(str(path), flags) + except Exception: + log.exception('Sound Playback Error') + + def stop(self) -> None: + try: + winsound.PlaySound(None, 0) + except Exception: + log.exception('Sound Playback Error') + + +class PlatformMacOS(PlaySound): + + def play(self, path: Path, loop: bool = False) -> None: + sound = NSSound.alloc() + sound.initWithContentsOfFile_byReference_(str(path), True) + sound.play() + + def stop(self) -> None: + pass + + +class PlatformUnix(PlaySound): + + def __init__(self) -> None: + self._cancellable: Optional[Gio.Cancellable] = None + + def play(self, path: Path, loop: bool = False) -> None: + if not app.is_installed('GSOUND'): + return + + attrs = {'media.filename': str(path)} + self._cancellable = Gio.Cancellable() + + if loop: + self._play_loop(attrs) + else: + try: + app.gsound_ctx.play_simple(attrs, self._cancellable) + except GLib.Error as error: + log.error('Could not play sound: %s', error.message) + self._cancellable = None + + def _play_loop(self, attrs: dict[str, str]) -> None: + try: + app.gsound_ctx.play_full(attrs, + self._cancellable, + self._on_play_finished, + attrs) + except GLib.Error as error: + log.error('Could not play sound: %s', error.message) + self._cancellable = None + + def _on_play_finished(self, + _context: Any, + res: Gio.AsyncResult, + user_data: dict[str, str]) -> None: + try: + app.gsound_ctx.play_full_finish(res) + except GLib.Error as error: + quark = GLib.quark_try_string('g-io-error-quark') + if error.matches(quark, Gio.IOErrorEnum.CANCELLED): + return + log.error('Could not play sound: %s', error.message) + + self._play_loop(user_data) + + def stop(self) -> None: + if self._cancellable is None or self._cancellable.is_cancelled(): + return + self._cancellable.cancel() + self._cancellable = None + + +def _init_platform() -> PlaySound: + if sys.platform == 'win32': + return PlatformWindows() + + if sys.platform == 'darwin': + return PlatformMacOS() + + return PlatformUnix() + +_platform_player = _init_platform() + +def play(path: Path, loop: bool = False) -> None: + _platform_player.play(path, loop) + +def stop(): + _platform_player.stop() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4e48726771c5d024af85139859b5bc2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b4e48726771c5d024af85139859b5bc2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ChatList: Process incoming nickname correctly for MUCs
by Daniel Brötzmann (＠wurstsalat) 20 Dec '21

20 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: e298a729 by wurstsalat at 2021-12-20T19:19:39+01:00 ChatList: Process incoming nickname correctly for MUCs - - - - - 1 changed file: - gajim/gtk/chat_list.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -390,7 +390,7 @@ def _on_message_received(self, event): nickname=nick, additional_data=event.additional_data) - self._add_unread(row, event.properties, event.msgtxt) + self._add_unread(row, event) self.invalidate_sort() def _on_message_updated(self, event): @@ -473,16 +473,23 @@ def _on_file_request_received(self, event): _('File'), icon_name='text-x-generic-symbolic') @staticmethod - def _add_unread(row, properties, text): - if properties.is_carbon_message and properties.carbon.is_sent: + def _add_unread(row, event): + if event.properties.is_carbon_message: + if event.properties.carbon.is_sent: + return + + if event.properties.is_from_us(): + # Last message was from us (1:1), reset counter + row.reset_unread() return - if properties.is_from_us(): - # Last message was from us, reset counter + our_nick = get_group_chat_nick(event.account, event.jid) + if event.properties.muc_nickname == our_nick: + # Last message was from us (MUC), reset counter row.reset_unread() return - row.add_unread(text) + row.add_unread(event.msgtxt) def _on_account_changed(self, *args): for row in self.get_children(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e298a729ed9e34de361564c732ce69d1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e298a729ed9e34de361564c732ce69d1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Merge CommonConnection with ConnectionZeroconf
by Philipp Hörist (＠lovetox) 20 Dec '21

20 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: b23f6158 by lovetox at 2021-12-20T15:28:24+01:00 Merge CommonConnection with ConnectionZeroconf CommonConnection is only used by zeroconf - - - - - 20909933 by lovetox at 2021-12-20T15:36:08+01:00 Move zeroconf events into zeroconf module - - - - - 4 changed files: - gajim/common/client.py - − gajim/common/connection.py - gajim/common/connection_handlers_events.py - gajim/common/zeroconf/connection_zeroconf.py Changes: ===================================== gajim/common/client.py ===================================== @@ -44,8 +44,6 @@ from gajim.common.idle import Monitor from gajim.common.i18n import _ -from gajim.common.connection_handlers_events import MessageSentEvent - from gajim.gui.util import open_window @@ -507,7 +505,7 @@ def _send_message(self, message): message.message_id = self.send_stanza(message.stanza) app.nec.push_incoming_event( - MessageSentEvent(None, jid=message.jid, **vars(message))) + NetworkEvent('message-sent', jid=message.jid, **vars(message))) if message.is_groupchat: return ===================================== gajim/common/connection.py deleted ===================================== @@ -1,195 +0,0 @@ -# Copyright (C) 2003-2005 Vincent Hanquez <tab AT snarc.org> -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005 Alex Mauer <hawke AT hawkesnest.net> -# Stéphan Kochen <stephan AT kochen.nl> -# Copyright (C) 2005-2006 Dimitur Kirov <dkirov AT gmail.com> -# Travis Shirk <travis AT pobox.com> -# Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Junglecow J <junglecow AT gmail.com> -# Stefan Bethge <stefan AT lanpartei.de> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007 Tomasz Melcer <liori AT exroot.org> -# Julien Pivotto <roidelapluie AT gmail.com> -# Copyright (C) 2007-2008 Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Jonathan Schleifer <js-gajim AT webkeks.org> -# -# This file is part of Gajim. -# -# Gajim is free software; you can redistribute it and/or modify -# it under the terms of the GNU General Public License as published -# by the Free Software Foundation; version 3 only. -# -# Gajim is distributed in the hope that it will be useful, -# but WITHOUT ANY WARRANTY; without even the implied warranty of -# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the -# GNU General Public License for more details. -# -# You should have received a copy of the GNU General Public License -# along with Gajim. If not, see <http://www.gnu.org/licenses/>. - -import time -import logging - -from gajim.common import helpers -from gajim.common import app -from gajim.common import idle -from gajim.common import modules -from gajim.common.nec import NetworkEvent -from gajim.common.const import ClientState - - -log = logging.getLogger('gajim.c.connection') - -SERVICE_START_TLS = 'xmpp-client' -SERVICE_DIRECT_TLS = 'xmpps-client' - -class CommonConnection: - """ - Common connection class, can be derived for normal connection or zeroconf - connection - """ - - def __init__(self, name): - self.name = name - self._modules = {} - self.connection = None # xmpppy ClientCommon instance - self.is_zeroconf = False - self.password = None - self.server_resource = helpers.get_resource(self.name) - self.priority = app.get_priority(name, 'offline') - self.time_to_reconnect = None - self._reconnect_timer_source = None - - self._state = ClientState.DISCONNECTED - self._status = 'offline' - self._status_message = '' - - # If handlers have been registered - self.handlers_registered = False - - self.pep = {} - - self.roster_supported = True - - self._stun_servers = [] # STUN servers of our jabber server - - # Tracks the calls of the connect_machine() method - self._connect_machine_calls = 0 - - self.get_config_values_or_default() - - def _set_state(self, state): - log.info('State: %s', state) - self._state = state - - @property - def state(self): - return self._state - - @property - def status(self): - return self._status - - @property - def status_message(self): - return self._status_message - - def _register_new_handlers(self, con): - for handler in modules.get_handlers(self): - if len(handler) == 5: - name, func, typ, ns, priority = handler - con.RegisterHandler(name, func, typ, ns, priority=priority) - else: - con.RegisterHandler(*handler) - self.handlers_registered = True - - def _unregister_new_handlers(self, con): - if not con: - return - for handler in modules.get_handlers(self): - if len(handler) > 4: - handler = handler[:4] - con.UnregisterHandler(*handler) - self.handlers_registered = False - - def get_module(self, name): - return modules.get(self.name, name) - - def reconnect(self): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def quit(self, kill_core): - if kill_core and app.account_is_connected(self.name): - self.disconnect(reconnect=False) - - def new_account(self, name, config, sync=False): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def _on_new_account(self, con=None, con_type=None): - """ - To be implemented by derived classes - """ - raise NotImplementedError - - def _event_dispatcher(self, realm, event, data): - if realm == '': - if event == 'STANZA RECEIVED': - app.nec.push_incoming_event( - NetworkEvent('stanza-received', - conn=self, - stanza_str=str(data))) - elif event == 'DATA SENT': - app.nec.push_incoming_event( - NetworkEvent('stanza-sent', - conn=self, - stanza_str=str(data))) - - def change_status(self, show, msg, auto=False): - if not msg: - msg = '' - - self._status = show - self._status_message = msg - - if self._state.is_disconnected: - if show == 'offline': - return - - self.server_resource = helpers.get_resource(self.name) - self.connect_and_init(show, msg) - return - - if self._state.is_connecting or self._state.is_reconnect_scheduled: - if show == 'offline': - self.disconnect(reconnect=False) - elif self._state.is_reconnect_scheduled: - self.reconnect() - return - - # We are connected - if show == 'offline': - presence = self.get_module('Presence').get_presence( - typ='unavailable', - status=msg, - caps=False) - - self.connection.send(presence, now=True) - self.disconnect(reconnect=False) - return - - idle_time = None - if auto: - if app.is_installed('IDLE') and app.settings.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime( - '%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) - - self._update_status(show, msg, idle_time=idle_time) ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -29,36 +29,6 @@ log = logging.getLogger('gajim.c.connection_handlers_events') -class PresenceReceivedEvent(nec.NetworkIncomingEvent): - - name = 'presence-received' - - -class OurShowEvent(nec.NetworkIncomingEvent): - - name = 'our-show' - - def init(self): - self.reconnect = False - - -class MessageSentEvent(nec.NetworkIncomingEvent): - - name = 'message-sent' - - -class ConnectionLostEvent(nec.NetworkIncomingEvent): - - name = 'connection-lost' - - def generate(self): - app.nec.push_incoming_event(OurShowEvent( - None, - conn=self.conn, - show='offline')) - return True - - class FileRequestReceivedEvent(nec.NetworkIncomingEvent): name = 'file-request-received' ===================================== gajim/common/zeroconf/connection_zeroconf.py ===================================== @@ -37,22 +37,41 @@ from gajim.common import app from gajim.common import modules +from gajim.common import helpers +from gajim.common import idle +from gajim.common import nec from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.const import ClientState -from gajim.common.connection import CommonConnection from gajim.common.zeroconf import client_zeroconf from gajim.common.zeroconf import zeroconf from gajim.common.zeroconf.connection_handlers_zeroconf import ConnectionHandlersZeroconf -from gajim.common.connection_handlers_events import OurShowEvent from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import ConnectionLostEvent -from gajim.common.connection_handlers_events import MessageSentEvent log = logging.getLogger('gajim.c.connection_zeroconf') -class ConnectionZeroconf(CommonConnection, ConnectionHandlersZeroconf): +class OurShowEvent(nec.NetworkIncomingEvent): + + name = 'our-show' + + def init(self): + self.reconnect = False + + +class ConnectionLostEvent(nec.NetworkIncomingEvent): + + name = 'connection-lost' + + def generate(self): + app.nec.push_incoming_event(OurShowEvent( + None, + conn=self.conn, + show='offline')) + return True + + +class ConnectionZeroconf(ConnectionHandlersZeroconf): def __init__(self, name): ConnectionHandlersZeroconf.__init__(self) # system username @@ -64,12 +83,135 @@ def __init__(self, name): self.autoconnect = False self.httpupload = False - CommonConnection.__init__(self, name) + self.name = name + self._modules = {} + self.connection = None # xmpppy ClientCommon instance + self.is_zeroconf = False + self.password = None + self.server_resource = helpers.get_resource(self.name) + self.priority = app.get_priority(name, 'offline') + self.time_to_reconnect = None + self._reconnect_timer_source = None + + self._state = ClientState.DISCONNECTED + self._status = 'offline' + self._status_message = '' + + # If handlers have been registered + self.handlers_registered = False + + self.pep = {} + + self.roster_supported = True + + self._stun_servers = [] # STUN servers of our jabber server + + # Tracks the calls of the connect_machine() method + self._connect_machine_calls = 0 + + self.get_config_values_or_default() + self.is_zeroconf = True # Register all modules modules.register_modules(self) + def _set_state(self, state): + log.info('State: %s', state) + self._state = state + + @property + def state(self): + return self._state + + @property + def status(self): + return self._status + + @property + def status_message(self): + return self._status_message + + def _register_new_handlers(self, con): + for handler in modules.get_handlers(self): + if len(handler) == 5: + name, func, typ, ns, priority = handler + con.RegisterHandler(name, func, typ, ns, priority=priority) + else: + con.RegisterHandler(*handler) + self.handlers_registered = True + + def _unregister_new_handlers(self, con): + if not con: + return + for handler in modules.get_handlers(self): + if len(handler) > 4: + handler = handler[:4] + con.UnregisterHandler(*handler) + self.handlers_registered = False + + def get_module(self, name): + return modules.get(self.name, name) + + def quit(self, kill_core): + if kill_core and app.account_is_connected(self.name): + self.disconnect(reconnect=False) + + def new_account(self, name, config, sync=False): + """ + To be implemented by derived classes + """ + raise NotImplementedError + + def _on_new_account(self, con=None, con_type=None): + """ + To be implemented by derived classes + """ + raise NotImplementedError + + def change_status(self, show, msg, auto=False): + if not msg: + msg = '' + + self._status = show + self._status_message = msg + + if self._state.is_disconnected: + if show == 'offline': + return + + self.server_resource = helpers.get_resource(self.name) + self.connect_and_init(show, msg) + return + + if self._state.is_connecting or self._state.is_reconnect_scheduled: + if show == 'offline': + self.disconnect(reconnect=False) + elif self._state.is_reconnect_scheduled: + self.reconnect() + return + + # We are connected + if show == 'offline': + presence = self.get_module('Presence').get_presence( + typ='unavailable', + status=msg, + caps=False) + + self.connection.send(presence, now=True) + self.disconnect(reconnect=False) + return + + idle_time = None + if auto: + if app.is_installed('IDLE') and app.settings.get('autoaway'): + idle_sec = idle.Monitor.get_idle_sec() + idle_time = time.strftime( + '%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + + self._update_status(show, msg, idle_time=idle_time) + def get_config_values_or_default(self): """ Get name, host, port from config, or create zeroconf account with default @@ -397,7 +539,9 @@ def send_message(self, message): def _send_message(self, message): def on_send_ok(stanza_id): app.nec.push_incoming_event( - MessageSentEvent(None, jid=message.jid, **vars(message))) + NetworkEvent('messasge-sent', + jid=message.jid, + **vars(message))) self.get_module('Message').log_message(message) def on_send_not_ok(reason): @@ -433,8 +577,18 @@ def send_stanza(self, stanza): self.connection.send(stanza) def _event_dispatcher(self, realm, event, data): - CommonConnection._event_dispatcher(self, realm, event, data) if realm == '': + if event == 'STANZA RECEIVED': + app.nec.push_incoming_event( + NetworkEvent('stanza-received', + conn=self, + stanza_str=str(data))) + elif event == 'DATA SENT': + app.nec.push_incoming_event( + NetworkEvent('stanza-sent', + conn=self, + stanza_str=str(data))) + if event == nbxmpp.transports.DATA_ERROR: frm = data[0] error_message = _( View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8beb7ff6f5554a2b2beb5d58af99b5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f8beb7ff6f5554a2b2beb5d58af99b5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Refactor module loading
by Philipp Hörist (＠lovetox) 20 Dec '21

20 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 684da26b by lovetox at 2021-12-20T15:17:43+01:00 Refactor module loading - - - - - 8cfbfe98 by lovetox at 2021-12-20T15:17:43+01:00 Nec: Add type annotations - - - - - f8beb7ff by lovetox at 2021-12-20T15:17:43+01:00 Client: Add annotations - - - - - 30 changed files: - gajim/common/client.py - gajim/common/modules/__init__.py - gajim/common/modules/adhoc_commands.py - gajim/common/modules/annotations.py - gajim/common/modules/announce.py - gajim/common/modules/base.py - gajim/common/modules/bits_of_binary.py - gajim/common/modules/blocking.py - gajim/common/modules/bytestream.py - gajim/common/modules/caps.py - gajim/common/modules/carbons.py - gajim/common/modules/chat_markers.py - gajim/common/modules/chatstates.py - gajim/common/modules/delimiter.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/gateway.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/iq.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py - gajim/common/modules/muc.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/presence.py - gajim/common/modules/pubsub.py - gajim/common/modules/receipts.py - gajim/common/modules/register.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eeea21dd563e95880892573063ac2b8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/eeea21dd563e95880892573063ac2b8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: CallWidget: Fix starting calls
by Daniel Brötzmann (＠wurstsalat) 19 Dec '21

19 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: af77bd25 by wurstsalat at 2021-12-20T00:06:57+01:00 CallWidget: Fix starting calls - - - - - eeea21dd by wurstsalat at 2021-12-20T00:19:10+01:00 CallWidget: Don’t use deprecated button signals - - - - - 2 changed files: - gajim/data/gui/call_widget.ui - gajim/gtk/call_widget.py Changes: ===================================== gajim/data/gui/call_widget.ui ===================================== @@ -28,8 +28,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -52,8 +52,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -74,8 +74,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -96,8 +96,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -118,8 +118,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -140,8 +140,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -162,8 +162,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -184,8 +184,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -206,8 +206,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -228,8 +228,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -250,8 +250,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> @@ -272,8 +272,8 @@ <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> - <signal name="pressed" handler="_on_num_button_press" swapped="no"/> - <signal name="released" handler="_on_num_button_release" swapped="no"/> + <signal name="button-press-event" handler="_on_num_button_press" swapped="no"/> + <signal name="button-release-event" handler="_on_num_button_release" swapped="no"/> <child> <object class="GtkLabel"> <property name="visible">True</property> ===================================== gajim/gtk/call_widget.py ===================================== @@ -22,6 +22,7 @@ import time from gi.repository import GObject +from gi.repository import Gdk from gi.repository import Gtk from nbxmpp.namespaces import Namespace @@ -68,7 +69,7 @@ def __init__(self, account: str, contact: types.BareContact) -> None: # having to show a new call row self._incoming_video_event = None - self._jingle: dict[str, JingleObject] = { + self._jingle: dict(str, JingleObject) = { 'audio': JingleObject( JingleState.NULL, self._update_audio), @@ -133,10 +134,16 @@ def _on_video(self, _button: Gtk.Button) -> None: self._on_jingle_button_toggled(['video']) def _on_jingle_button_toggled(self, jingle_types: List[str]) -> None: + call_resources = self._get_call_resources() + if not call_resources: + return + + # TODO: Resource priority + full_jid = call_resources[0].jid + if all(item in jingle_types for item in ['audio', 'video']): # Both 'audio' and 'video' in jingle_types - sid = self._client.get_module('Jingle').start_audio_video( - self._contact.jid) + sid = self._client.get_module('Jingle').start_audio_video(full_jid) self._set_jingle_state('audio', JingleState.CONNECTING, sid) self._set_jingle_state('video', JingleState.CONNECTING, sid) self._store_outgoing_call(sid) @@ -146,8 +153,7 @@ def _on_jingle_button_toggled(self, jingle_types: List[str]) -> None: if self._jingle['audio'].state != JingleState.NULL: self._close_jingle_content('audio') else: - sid = self._client.get_module('Jingle').start_audio( - self._contact.jid) + sid = self._client.get_module('Jingle').start_audio(full_jid) self._set_jingle_state('audio', JingleState.CONNECTING, sid) self._store_outgoing_call(sid) @@ -155,8 +161,7 @@ def _on_jingle_button_toggled(self, jingle_types: List[str]) -> None: if self._jingle['video'].state != JingleState.NULL: self._close_jingle_content('video') else: - sid = self._client.get_module('Jingle').start_video( - self._contact.jid) + sid = self._client.get_module('Jingle').start_video(full_jid) self._set_jingle_state('video', JingleState.CONNECTING, sid) self._store_outgoing_call(sid) @@ -170,12 +175,18 @@ def _store_outgoing_call(self, sid: str) -> None: KindConstant.CALL_OUTGOING, additional_data=additional_data) - def _on_num_button_press(self, button: Gtk.Button) -> None: + def _on_num_button_press(self, + button: Gtk.Button, + _event: Gdk.EventButton + ) -> None: button_id = Gtk.Buildable.get_name(button) key = button_id.split('_')[1] self._get_audio_content().start_dtmf(key) - def _on_num_button_release(self, _button: Gtk.Button) -> None: + def _on_num_button_release(self, + _button: Gtk.Button, + _event: Gdk.EventButton + ) -> None: self._get_audio_content().stop_dtmf() def _on_mic_volume_changed(self, @@ -539,6 +550,12 @@ def _get_audio_content(self) -> Optional[JingleAudio]: self._contact.jid, self._jingle['audio'].sid) return session.get_content('audio') + def _get_call_resources(self) -> List[types.ResourceContact]: + resource_list = [] + for resource_contact in self._contact.iter_resources(): + if resource_contact.supports(Namespace.JINGLE_RTP): + resource_list.append(resource_contact) + return resource_list class JingleObject: __slots__ = ('sid', 'state', 'available', 'update') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1d16269e71f692dbe9ecb7670238e4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1d16269e71f692dbe9ecb7670238e4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Script: Add base class for ui types
by Philipp Hörist (＠lovetox) 19 Dec '21

19 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: ff8bcc5e by lovetox at 2021-12-19T15:39:25+01:00 Script: Add base class for ui types - - - - - a1d16269 by lovetox at 2021-12-19T15:43:15+01:00 CallWidget: Simplify code for dtmf buttons - Define handlers in xml - - - - - 5 changed files: - gajim/common/jingle_rtp.py - gajim/data/gui/call_widget.ui - gajim/gtk/builder.pyi - gajim/gtk/call_widget.py - scripts/dev/generate_ui_types.py Changes: ===================================== gajim/common/jingle_rtp.py ===================================== @@ -165,12 +165,13 @@ def _next_dtmf(self, events): else: self._dtmf_running = False - def start_dtmf(self, event): - if event in ('*', '#'): - event = {'*': Farstream.DTMFEvent.STAR, - '#': Farstream.DTMFEvent.POUND}[event] + def start_dtmf(self, key): + if key == 'star': + event = Farstream.DTMFEvent.STAR + elif key == 'pound': + event = Farstream.DTMFEvent.POUND else: - event = int(event) + event = int(key) self.p2psession.start_telephony_event(event, 2) def stop_dtmf(self): ===================================== gajim/data/gui/call_widget.ui ===================================== @@ -23,13 +23,15 @@ <property name="can-focus">False</property> <property name="border-width">6</property> <child> - <object class="GtkButton" id="1_button"> + <object class="GtkButton" id="button_1"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label1"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="halign">center</property> @@ -45,13 +47,15 @@ </packing> </child> <child> - <object class="GtkButton" id="2_button"> + <object class="GtkButton" id="button_2"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label2"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">2 abc</property> @@ -65,13 +69,15 @@ </packing> </child> <child> - <object class="GtkButton" id="3_button"> + <object class="GtkButton" id="button_3"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label3"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">3 def</property> @@ -85,13 +91,15 @@ </packing> </child> <child> - <object class="GtkButton" id="4_button"> + <object class="GtkButton" id="button_4"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label4"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">4 ghi</property> @@ -105,13 +113,15 @@ </packing> </child> <child> - <object class="GtkButton" id="5_button"> + <object class="GtkButton" id="button_5"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label5"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">5 jkl</property> @@ -125,13 +135,15 @@ </packing> </child> <child> - <object class="GtkButton" id="6_button"> + <object class="GtkButton" id="button_6"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label6"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">6 mno</property> @@ -145,13 +157,15 @@ </packing> </child> <child> - <object class="GtkButton" id="7_button"> + <object class="GtkButton" id="button_7"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label7"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">7 pqrs</property> @@ -165,13 +179,15 @@ </packing> </child> <child> - <object class="GtkButton" id="8_button"> + <object class="GtkButton" id="button_8"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label8"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">8 tuv</property> @@ -185,13 +201,15 @@ </packing> </child> <child> - <object class="GtkButton" id="9_button"> + <object class="GtkButton" id="button_9"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label9"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">9 wxyz</property> @@ -205,13 +223,15 @@ </packing> </child> <child> - <object class="GtkButton" id="*_button"> + <object class="GtkButton" id="button_star"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label10"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">*</property> @@ -225,13 +245,15 @@ </packing> </child> <child> - <object class="GtkButton" id="0_button"> + <object class="GtkButton" id="button_0"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label11"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">0</property> @@ -245,13 +267,15 @@ </packing> </child> <child> - <object class="GtkButton" id="#_button"> + <object class="GtkButton" id="button_pound"> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> <property name="relief">none</property> + <signal name="pressed" handler="_on_num_button_press" swapped="no"/> + <signal name="released" handler="_on_num_button_release" swapped="no"/> <child> - <object class="GtkLabel" id="label12"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="label" translatable="yes">#</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -274,30 +274,18 @@ class CallWidgetBuilder(Builder): adjustment2: Gtk.Adjustment dtmf_popover: Gtk.Popover grid1: Gtk.Grid - 1_button: Gtk.Button - label1: Gtk.Label - 2_button: Gtk.Button - label2: Gtk.Label - 3_button: Gtk.Button - label3: Gtk.Label - 4_button: Gtk.Button - label4: Gtk.Label - 5_button: Gtk.Button - label5: Gtk.Label - 6_button: Gtk.Button - label6: Gtk.Label - 7_button: Gtk.Button - label7: Gtk.Label - 8_button: Gtk.Button - label8: Gtk.Label - 9_button: Gtk.Button - label9: Gtk.Label - *_button: Gtk.Button - label10: Gtk.Label - 0_button: Gtk.Button - label11: Gtk.Label - #_button: Gtk.Button - label12: Gtk.Label + button_1: Gtk.Button + button_2: Gtk.Button + button_3: Gtk.Button + button_4: Gtk.Button + button_5: Gtk.Button + button_6: Gtk.Button + button_7: Gtk.Button + button_8: Gtk.Button + button_9: Gtk.Button + button_star: Gtk.Button + button_0: Gtk.Button + button_pound: Gtk.Button av_box: Gtk.Box video_box: Gtk.Box outgoing_viewport: Gtk.Viewport ===================================== gajim/gtk/call_widget.py ===================================== @@ -13,6 +13,7 @@ # 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 Optional @@ -21,7 +22,6 @@ import time from gi.repository import GObject -from gi.repository import Gdk from gi.repository import Gtk from nbxmpp.namespaces import Namespace @@ -68,7 +68,7 @@ def __init__(self, account: str, contact: types.BareContact) -> None: # having to show a new call row self._incoming_video_event = None - self._jingle: dict(str, JingleObject) = { + self._jingle: dict[str, JingleObject] = { 'audio': JingleObject( JingleState.NULL, self._update_audio), @@ -83,14 +83,6 @@ def __init__(self, account: str, contact: types.BareContact) -> None: self.add(self._ui.av_box) self.connect('destroy', self._on_destroy) - dtmf: list(str) = [ - '1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'] - for key in dtmf: - button = self._ui.get_object(key + '_button') - button.connect( - 'button-press-event', self._on_num_button_press, key) - button.connect('button-release-event', self._on_num_button_release) - self._ui.connect_signals(self) def _on_destroy(self, *args: Any) -> None: @@ -178,17 +170,12 @@ def _store_outgoing_call(self, sid: str) -> None: KindConstant.CALL_OUTGOING, additional_data=additional_data) - def _on_num_button_press(self, - _button: Gtk.Button, - _event: Gdk.EventButton, - num: int - ) -> None: - self._get_audio_content().start_dtmf(num) + def _on_num_button_press(self, button: Gtk.Button) -> None: + button_id = Gtk.Buildable.get_name(button) + key = button_id.split('_')[1] + self._get_audio_content().start_dtmf(key) - def _on_num_button_release(self, - _button: Gtk.Button, - _event: Gdk.EventButton - ) -> None: + def _on_num_button_release(self, _button: Gtk.Button) -> None: self._get_audio_content().stop_dtmf() def _on_mic_volume_changed(self, ===================================== scripts/dev/generate_ui_types.py ===================================== @@ -33,7 +33,7 @@ from gi.repository import GtkSource -class Builder: ... +class Builder(Gtk.Builder): ... ''' CLASS_DEF = '\nclass %s(Builder):' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8bf3bfb135812bd9750f466c377a3f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8bf3bfb135812bd9750f466c377a3f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: SearchView: Fix annotation
by Philipp Hörist (＠lovetox) 19 Dec '21

19 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 642099ca by lovetox at 2021-12-19T14:01:15+01:00 SearchView: Fix annotation - - - - - 8bf3bfb1 by lovetox at 2021-12-19T14:01:15+01:00 ChatPage: Add annotations - - - - - 2 changed files: - gajim/gtk/chat_page.py - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/chat_page.py ===================================== @@ -12,12 +12,15 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Any +from typing import Literal from typing import Optional from typing import Generator import time import logging +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Gio @@ -123,23 +126,24 @@ def get_chat_stack(self) -> ChatStack: return self._chat_stack @staticmethod - def _on_start_chat_clicked(_button): + def _on_start_chat_clicked(_button: Gtk.Button) -> None: app.app.activate_action('start-chat', GLib.Variant('s', '')) @staticmethod - def _on_button_release(paned, event): + def _on_button_release(paned: Gtk.Paned, event: Gdk.EventButton) -> None: if event.window != paned.get_handle_window(): return position = paned.get_position() app.settings.set('chat_handle_position', position) - def _on_filter_revealer_toggled(self, toggle_button): + def _on_filter_revealer_toggled(self, + toggle_button: Gtk.ToggleButton) -> None: active = toggle_button.get_active() self._ui.filter_bar_revealer.set_reveal_child(active) self._chat_filter.reset() @staticmethod - def _on_edit_workspace_clicked(_button): + def _on_edit_workspace_clicked(_button: Gtk.Button) -> None: app.window.activate_action('edit-workspace', GLib.Variant('s', '')) def _reset_chat_idle_time(self, account: str, jid: JID) -> None: @@ -188,11 +192,14 @@ def _on_chat_selected(self, control.set_control_active(True) self._last_control = control - def _on_chat_unselected(self, _chat_list_stack): + def _on_chat_unselected(self, _chat_list_stack: ChatListStack) -> None: self._chat_stack.clear() self._search_view.set_context(None, None) - def _on_search_history(self, _action, _param): + def _on_search_history(self, + _action: Gio.SimpleAction, + _param: Literal[None]) -> None: + control = self.get_active_control() if control is not None: self._search_view.set_context(control.account, control.contact.jid) @@ -200,10 +207,13 @@ def _on_search_history(self, _action, _param): self._search_revealer.set_reveal_child(True) self._search_view.set_focus() - def _on_search_hide(self, *args): + def _on_search_hide(self, *args: Any) -> None: self._search_revealer.set_reveal_child(False) - def _on_chat_list_changed(self, chat_list_stack, *args): + def _on_chat_list_changed(self, + chat_list_stack: ChatListStack, + *args: Any) -> None: + chat_list = chat_list_stack.get_current_chat_list() name = app.settings.get_workspace_setting(chat_list.workspace_id, 'name') @@ -235,8 +245,11 @@ def chat_exists(self, account: str, jid: JID) -> bool: def select_chat(self, account: str, jid: JID) -> None: self._chat_list_stack.select_chat(account, jid) - def chat_exists_for_workspace(self, workspace_id: str, account: str, + def chat_exists_for_workspace(self, + workspace_id: str, + account: str, jid: JID) -> bool: + return self._chat_list_stack.contains_chat( account, jid, workspace_id=workspace_id) @@ -288,7 +301,10 @@ def load_workspace_chats(self, workspace_id: str) -> None: def is_chat_active(self, account: str, jid: JID) -> bool: return self._chat_list_stack.is_chat_active(account, jid) - def _remove_chat(self, _action, param): + def _remove_chat(self, + _action: Gio.SimpleAction, + param: GLib.Variant) -> None: + account, jid = param.unpack() jid = JID.from_string(jid) ===================================== gajim/gtk/search_view.py ===================================== @@ -268,7 +268,7 @@ def _on_row_activated(_listbox: SearchView, row: ResultRow) -> None: def set_focus(self) -> None: self._ui.search_entry.grab_focus() - def set_context(self, account: str, jid: JID) -> None: + def set_context(self, account: Optional[str], jid: Optional[JID]) -> None: self._account = account self._jid = jid self._ui.search_checkbutton.set_active(jid is None) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a0de98cad9826994162e08742c014b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/2a0de98cad9826994162e08742c014b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Util: Typing
by Daniel Brötzmann (＠wurstsalat) 19 Dec '21

19 Dec '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 3ee48358 by wurstsalat at 2021-12-19T13:30:51+01:00 Util: Typing - - - - - deae7b07 by wurstsalat at 2021-12-19T13:30:51+01:00 Gstreamer helper: Typing - - - - - 2a0de98c by wurstsalat at 2021-12-19T13:30:51+01:00 CallWidget: Typing - - - - - 3 changed files: - gajim/gtk/call_widget.py - gajim/gtk/gstreamer.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/call_widget.py ===================================== @@ -12,21 +12,27 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Optional # pylint: disable=unused-import +from __future__ import annotations +from typing import Any +from typing import List +from typing import Optional import logging import time from gi.repository import GObject +from gi.repository import Gdk from gi.repository import Gtk from nbxmpp.namespaces import Namespace from gajim.common import app +from gajim.common import types from gajim.common.const import JingleState from gajim.common.const import KindConstant from gajim.common.helpers import AdditionalDataDict from gajim.common.i18n import _ +from gajim.common.jingle_rtp import JingleAudio from gajim.common.nec import NetworkEvent from .gstreamer import create_gtk_widget @@ -50,7 +56,7 @@ class CallWidget(Gtk.Box): ), } - def __init__(self, account, contact): + def __init__(self, account: str, contact: types.BareContact) -> None: Gtk.Box.__init__(self) self.set_no_show_all(True) @@ -62,7 +68,7 @@ def __init__(self, account, contact): # having to show a new call row self._incoming_video_event = None - self._jingle = { + self._jingle: dict(str, JingleObject) = { 'audio': JingleObject( JingleState.NULL, self._update_audio), @@ -77,20 +83,22 @@ def __init__(self, account, contact): self.add(self._ui.av_box) self.connect('destroy', self._on_destroy) - dtmf = ['1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'] + dtmf: list(str) = [ + '1', '2', '3', '4', '5', '6', '7', '8', '9', '*', '0', '#'] for key in dtmf: button = self._ui.get_object(key + '_button') - button.connect('pressed', self._on_num_button_pressed, key) - button.connect('released', self._on_num_button_released) + button.connect( + 'button-press-event', self._on_num_button_press, key) + button.connect('button-release-event', self._on_num_button_release) self._ui.connect_signals(self) - def _on_destroy(self, *args): + def _on_destroy(self, *args: Any) -> None: for jingle_type in ('audio', 'video'): self._close_jingle_content(jingle_type, shutdown=True) self._jingle.clear() - def detect_av(self): + def detect_av(self) -> None: if (self._contact.supports(Namespace.JINGLE_ICE_UDP) and app.is_installed('FARSTREAM')): self._jingle['audio'].available = self._contact.supports( @@ -104,23 +112,23 @@ def detect_av(self): self._jingle['audio'].available = False self._jingle['video'].available = False - def get_jingle_available(self, content_type): + def get_jingle_available(self, content_type: str) -> bool: return self._jingle[content_type].available - def _on_call_with_mic(self, _button): + def _on_call_with_mic(self, _button: Gtk.Button) -> None: self._on_jingle_button_toggled(['audio']) self._ui.av_start_box.hide() - def _on_call_with_mic_and_cam(self, _button): + def _on_call_with_mic_and_cam(self, _button: Gtk.Button) -> None: self._on_jingle_button_toggled(['audio', 'video']) self._ui.av_start_box.hide() - def _on_answer_video_clicked(self, button): + def _on_answer_video_clicked(self, button: Gtk.Button) -> None: self.accept_call(self._incoming_video_event) self._incoming_video_event = None button.hide() - def _on_end_call_clicked(self, _widget): + def _on_end_call_clicked(self, _button: Gtk.Button) -> None: self._close_jingle_content('audio') self._close_jingle_content('video') self._ui.jingle_audio_state.set_no_show_all(True) @@ -129,10 +137,10 @@ def _on_end_call_clicked(self, _widget): self.hide() self.emit('call-ended') - def _on_video(self, *args): + def _on_video(self, _button: Gtk.Button) -> None: self._on_jingle_button_toggled(['video']) - def _on_jingle_button_toggled(self, jingle_types): + def _on_jingle_button_toggled(self, jingle_types: List[str]) -> None: if all(item in jingle_types for item in ['audio', 'video']): # Both 'audio' and 'video' in jingle_types sid = self._client.get_module('Jingle').start_audio_video( @@ -160,7 +168,7 @@ def _on_jingle_button_toggled(self, jingle_types): self._set_jingle_state('video', JingleState.CONNECTING, sid) self._store_outgoing_call(sid) - def _store_outgoing_call(self, sid): + def _store_outgoing_call(self, sid: str) -> None: additional_data = AdditionalDataDict() additional_data.set_value('gajim', 'sid', sid) app.storage.archive.insert_into_logs( @@ -170,17 +178,30 @@ def _store_outgoing_call(self, sid): KindConstant.CALL_OUTGOING, additional_data=additional_data) - def _on_num_button_pressed(self, _widget, num): + def _on_num_button_press(self, + _button: Gtk.Button, + _event: Gdk.EventButton, + num: int + ) -> None: self._get_audio_content().start_dtmf(num) - def _on_num_button_released(self, _released): + def _on_num_button_release(self, + _button: Gtk.Button, + _event: Gdk.EventButton + ) -> None: self._get_audio_content().stop_dtmf() - def _on_mic_volume_changed(self, _widget, value): + def _on_mic_volume_changed(self, + _button: Gtk.VolumeButton, + value: float + ) -> None: self._get_audio_content().set_mic_volume(value / 100) app.settings.set('audio_input_volume', int(value)) - def _on_output_volume_changed(self, _widget, value): + def _on_output_volume_changed(self, + _button: Gtk.VolumeButton, + value: float + ) -> None: self._get_audio_content().set_out_volume(value / 100) app.settings.set('audio_output_volume', int(value)) @@ -195,7 +216,7 @@ def process_event(self, event): self._on_jingle_error(event) def _on_jingle_request(self, event): - content_types = [] + content_types: list(str) = [] for item in event.contents: content_types.append(item.media) if not any(item in ('audio', 'video') for item in content_types): @@ -273,7 +294,7 @@ def _on_jingle_error(self, event): JingleState.ERROR, reason=event.reason) - def start_call(self): + def start_call(self) -> None: audio_state = self._jingle['audio'].state video_state = self._jingle['video'].state if audio_state == JingleState.NULL and video_state == JingleState.NULL: @@ -307,7 +328,8 @@ def accept_call(self, session): if video is not None: session.approve_content('video') - def decline_call(self, session): + @staticmethod + def decline_call(session): if not session: return @@ -322,7 +344,7 @@ def decline_call(self, session): if video is not None: session.reject_content('video') - def _update_audio(self): + def _update_audio(self) -> None: audio_state = self._jingle['audio'].state video_state = self._jingle['video'].state if self._jingle['video'].available: @@ -381,7 +403,7 @@ def _update_audio(self): if not self._jingle['audio'].sid: self._ui.audio_buttons_box.set_sensitive(False) - def _update_video(self): + def _update_video(self) -> None: audio_state = self._jingle['audio'].state video_state = self._jingle['video'].state @@ -494,7 +516,10 @@ def _set_jingle_state(self, jingle_type: str, state: str, sid: str = None, jingle.sid = new_sid jingle.update() - def _stop_jingle(self, sid=None, reason=None): + def _stop_jingle(self, + sid: Optional[str] = None, + reason: Optional[str] = None + ) -> None: audio_sid = self._jingle['audio'].sid video_sid = self._jingle['video'].sid if audio_sid and sid in (audio_sid, None): @@ -502,8 +527,10 @@ def _stop_jingle(self, sid=None, reason=None): if video_sid and sid in (video_sid, None): self._close_jingle_content('video') - def _close_jingle_content(self, jingle_type: str, - shutdown: Optional[bool] = False) -> None: + def _close_jingle_content(self, + jingle_type: str, + shutdown: Optional[bool] = False + ) -> None: jingle = self._jingle[jingle_type] if not jingle.sid: return @@ -520,7 +547,7 @@ def _close_jingle_content(self, jingle_type: str, jingle.state = JingleState.NULL jingle.update() - def _get_audio_content(self): + def _get_audio_content(self) -> Optional[JingleAudio]: session = self._client.get_module('Jingle').get_jingle_session( self._contact.jid, self._jingle['audio'].sid) return session.get_content('audio') ===================================== gajim/gtk/gstreamer.py ===================================== @@ -12,13 +12,19 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from typing import Optional +from typing import Tuple + +from gi.repository import Gtk try: from gi.repository import Gst except Exception: pass -def create_gtk_widget(): +def create_gtk_widget() -> Tuple[Optional[Gst.Element], + Optional[Gtk.Widget], + Optional[str]]: gtkglsink = Gst.ElementFactory.make('gtkglsink', None) if gtkglsink is not None: glsinkbin = Gst.ElementFactory.make('glsinkbin', None) ===================================== gajim/gtk/util.py ===================================== @@ -28,6 +28,7 @@ from importlib import import_module from functools import wraps from functools import lru_cache +from pathlib import Path try: from PIL import Image @@ -39,7 +40,9 @@ from gi.repository import GLib from gi.repository import Pango from gi.repository import GdkPixbuf +import cairo import nbxmpp +from nbxmpp import JID from nbxmpp.structs import LocationData from gajim.common import app @@ -155,8 +158,13 @@ def icon_exists(name: str) -> bool: return _icon_theme.has_icon(name) -def load_icon(icon_name, widget=None, size=16, pixbuf=False, - scale=None, flags=Gtk.IconLookupFlags.FORCE_SIZE): +def load_icon(icon_name: str, + widget: Optional[Any] = None, + size: int = 16, + pixbuf: bool = False, + scale: Optional[int] = None, + flags: Gtk.IconLookupFlags = Gtk.IconLookupFlags.FORCE_SIZE + ) -> Optional[Union[GdkPixbuf.Pixbuf, cairo.Surface]]: if widget is not None: scale = widget.get_scale_factor() @@ -170,15 +178,16 @@ def load_icon(icon_name, widget=None, size=16, pixbuf=False, icon_name, size, scale, flags) if iconinfo is None: log.info('No icon found for %s', icon_name) - return + return None if pixbuf: return iconinfo.load_icon() return iconinfo.load_surface(None) except GLib.GError as error: log.error('Unable to load icon %s: %s', icon_name, str(error)) + return None -def get_app_icon_list(scale_widget): +def get_app_icon_list(scale_widget: Any) -> List[GdkPixbuf.Pixbuf]: pixbufs = [] for size in (16, 32, 48, 64, 128): pixbuf = load_icon('org.gajim.Gajim', scale_widget, size, pixbuf=True) @@ -194,15 +203,15 @@ def get_icon_name(name: str, name = 'notinroster' if iconset is not None: - return '%s-%s' % (iconset, name) + return f'{iconset}-{name}' if transport is not None: - return '%s-%s' % (transport, name) + return f'{transport}-{name}' iconset = app.settings.get('iconset') if not iconset: iconset = 'dcraven' - return '%s-%s' % (iconset, name) + return f'{iconset}-{name}' def load_user_iconsets() -> None: @@ -517,7 +526,7 @@ def format_fingerprint(fingerprint: str) -> str: return buf.rstrip().upper() -def find_widget(name, container): +def find_widget(name: str, container: Gtk.Widget) -> Optional[Gtk.Widget]: for child in container.get_children(): if Gtk.Buildable.get_name(child) == name: return child @@ -527,7 +536,7 @@ def find_widget(name, container): class MultiLineLabel(Gtk.Label): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: any) -> None: Gtk.Label.__init__(self, *args, **kwargs) self.set_line_wrap(True) self.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) @@ -535,16 +544,16 @@ def __init__(self, *args, **kwargs): class MaxWidthComboBoxText(Gtk.ComboBoxText): - def __init__(self, *args, **kwargs): + def __init__(self, *args: Any, **kwargs: Any) -> None: Gtk.ComboBoxText.__init__(self, *args, **kwargs) - self._max_width = 100 + self._max_width: int = 100 text_renderer = self.get_cells()[0] text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) - def set_max_size(self, size): + def set_max_size(self, size: int) -> None: self._max_width = size - def do_get_preferred_width(self): + def do_get_preferred_width(self) -> Tuple[int, int]: minimum_width, natural_width = Gtk.ComboBoxText.do_get_preferred_width( self) @@ -639,12 +648,16 @@ def scale_pixbuf(pixbuf: GdkPixbuf.Pixbuf, GdkPixbuf.InterpType.BILINEAR) -def scale_pixbuf_from_data(data: bytes, size: int) -> Optional[GdkPixbuf.Pixbuf]: +def scale_pixbuf_from_data(data: bytes, + size: int + ) -> Optional[GdkPixbuf.Pixbuf]: pixbuf = get_pixbuf_from_data(data) return scale_pixbuf(pixbuf, size) -def load_pixbuf(path, size=None): +def load_pixbuf(path: Union[str, Path], + size: Optional[int] = None + ) -> Optional[GdkPixbuf.Pixbuf]: try: if size is None: return GdkPixbuf.Pixbuf.new_from_file(str(path)) @@ -720,7 +733,10 @@ def get_app_windows(account: str) -> List[Gtk.Window]: return windows -def get_app_window(name, account=None, jid=None): +def get_app_window(name: str, + account: Optional[str] = None, + jid: Optional[Union[str, JID]] = None + ) -> Optional[Gtk.Window]: for win in app.app.get_windows(): if type(win).__name__ != name: continue @@ -736,7 +752,7 @@ def get_app_window(name, account=None, jid=None): return None -def open_window(name, **kwargs): +def open_window(name: str, **kwargs: Any) -> Gtk.Window: window = get_app_window(name, kwargs.get('account'), kwargs.get('jid')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/04cb78359c6cdc112cb309a2dab744f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/04cb78359c6cdc112cb309a2dab744f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Update .gitlab-ci.yml
by Philipp Hörist (＠lovetox) 19 Dec '21

19 Dec '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 04cb7835 by lovetox at 2021-12-19T13:28:18+01:00 Update .gitlab-ci.yml - - - - - 1 changed file: - .gitlab-ci.yml Changes: ===================================== .gitlab-ci.yml ===================================== @@ -8,6 +8,7 @@ include: pyright: stage: test script: + - pip3 install -I git+https://dev.gajim.org/gajim/python-nbxmpp.git@$NBXMPP_BRANCH - pip3 install -I git+https://dev.gajim.org/gajim/gi-stubs.git - npm install pyright - python3 -V View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04cb78359c6cdc112cb309a2dab744f4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/04cb78359c6cdc112cb309a2dab744f4… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
...
5
6
7
8
9
10
11
...
20
Older →

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits December 2021