Commits March 2022

commits@gajim.org

1 participants
91 discussions

[Git][gajim/gajim][master] StartChat: Improve performance
by Philipp Hörist (＠lovetox) 06 Mar '22

06 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c09bba5 by lovetox at 2022-03-06T14:02:12+01:00 StartChat: Improve performance - Load contacts before calling show_all() - Remove incremental load - - - - - 1 changed file: - gajim/gtk/start_chat.py Changes: ===================================== gajim/gtk/start_chat.py ===================================== @@ -16,7 +16,6 @@ from typing import cast from typing import Any -from typing import Generator from typing import Optional from typing import Union @@ -84,7 +83,6 @@ def __init__(self) -> None: self._destroyed = False self._search_stopped = False self._redirected = False - self._source_id: Optional[int] = None self._ui = get_builder('start_chat_dialog.ui') self.add(self._ui.stack) @@ -136,13 +134,13 @@ def __init__(self) -> None: self.connect('key-press-event', self._on_key_press) self.connect('destroy', self._on_destroy) + if rows: + self._load_contacts(rows) + self.select_first_row() self._ui.connect_signals(self) self.show_all() - if rows: - self._load_contacts(rows) - def set_search_text(self, text: str) -> None: self._ui.search_entry.set_text(text) @@ -195,19 +193,10 @@ def _add_groupchats(self, rows: list[ContactRow]) -> None: groupchat=True)) def _load_contacts(self, rows: list[ContactRow]) -> None: - generator = self._incremental_add(rows) - self._source_id = GLib.idle_add(lambda: next(generator, False), - priority=GLib.PRIORITY_LOW) - - def _incremental_add(self, - rows: list[ContactRow] - ) -> Generator[bool, None, None]: for row in rows: self._ui.listbox.add(row) - yield True self._ui.listbox.set_sort_func(self._sort_func, None) - self._source_id = None def _on_page_changed(self, stack: Gtk.Stack, _param: Any) -> None: if stack.get_visible_child_name() == 'account': @@ -760,8 +749,6 @@ def _process_search_result(self, def _on_destroy(self, *args: Any) -> None: self._ui.listbox.set_filter_func(None) self._ui.listbox.destroy() - if self._source_id is not None: - GLib.source_remove(self._source_id) self._destroyed = True app.cancel_tasks(self) app.check_finalize(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c09bba5b4b89b049a250d5be320ba2b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c09bba5b4b89b049a250d5be320ba2b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Styling: Remove superfluous empty line after preformatted text
by Philipp Hörist (＠lovetox) 06 Mar '22

06 Mar '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 90f380d1 by André Apitzsch at 2022-03-06T13:06:55+01:00 Styling: Remove superfluous empty line after preformatted text The text block might contain a newline after the closing ```. Remove it, so that `text.partition('\n')[2][:-4]` returns the expected substring. Fixes #10787. - - - - - 1 changed file: - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -82,6 +82,7 @@ def add_content(self, block: PreBlock): @staticmethod def _prepare_code(text: str) -> Tuple[str, Optional[str]]: + text = text.strip() code_start = text.partition('\n')[0] lang = None if len(code_start) > 3: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/90f380d13e1c2fcd5df8e73571082893… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/90f380d13e1c2fcd5df8e73571082893… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 4 commits: Remove unused test helpers
by Philipp Hörist (＠lovetox) 05 Mar '22

05 Mar '22

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: 49553cc4 by lovetox at 2022-03-05T08:47:28+01:00 Remove unused test helpers - - - - - e83c82d5 by lovetox at 2022-03-05T08:48:21+01:00 Move test to broken - - - - - 07ab6b91 by lovetox at 2022-03-05T08:48:54+01:00 Move nick completion test to no_gui folder - - - - - 84c317ca by lovetox at 2022-03-05T08:50:30+01:00 Make sure correct gi libs are loaded - - - - - 10 changed files: - test/unit/test_gui_interface.py → test/broken/test_gui_interface.py - − test/lib/__init__.py - − test/lib/data.py - − test/lib/gajim_mocks.py - − test/lib/mock.py - − test/lib/notify.py - test/no_gui/__init__.py - test/no_gui/unit/test_nick_completion.py → test/no_gui/test_nick_completion.py - − test/no_gui/unit/__init__.py - − test/unit/__init__.py Changes: ===================================== test/unit/test_gui_interface.py → test/broken/test_gui_interface.py ===================================== ===================================== test/lib/__init__.py deleted ===================================== @@ -1,46 +0,0 @@ -import os - -from tempfile import gettempdir - -# a temporary version of ~/.gajim for testing -configdir = os.path.join(gettempdir(), 'gajim') -os.makedirs(configdir, exist_ok=True) - -# plugins config dir -pluginsconfigdir = configdir + '/pluginsconfig' -# theme config directory -themedir = configdir + '/theme' - -# define _ for i18n -import builtins -builtins._ = lambda x: x - -from gajim.common.contacts import LegacyContactsAPI - -def setup_env(use_x=True): - # wipe config directory - if os.path.isdir(configdir): - import shutil - shutil.rmtree(configdir) - - os.mkdir(configdir) - os.mkdir(pluginsconfigdir) - os.mkdir(themedir) - - from gajim.common import configpaths - configpaths.set_config_root(configdir) - configpaths.init() - - # for some reason gajim.common.app needs to be imported before xmpppy? - from gajim.common import app - - import logging - logging.basicConfig() - - app.use_x = use_x - app.contacts = LegacyContactsAPI() - app.connections = {} - - if use_x: - from gajim.application import GajimApplication - app.app = GajimApplication() ===================================== test/lib/data.py deleted ===================================== @@ -1,77 +0,0 @@ -# -*- coding: utf-8 -*- -account1 = 'acc1' -account2 = 'Cool"chârßéµö' -account3 = 'dingdong.org' - -contacts = {} -contacts[account1] = { - 'myjid@'+account1: { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default1(a)gajim.org': { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default2(a)gajim.org': { - 'ask': None, 'groups': ['GroupA',], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'Cool"chârßéµö(a)gajim.org': { - 'ask': None, 'groups': ['<Cool"chârßéµö', 'GroupB'], - 'name': None, 'resources': {}, 'subscription': 'both'}, - 'samejid(a)gajim.org': { - 'ask': None, 'groups': ['GroupA',], 'name': None, 'resources': {}, - 'subscription': 'both'} -} -contacts[account2] = { - 'myjid@'+account2: { - 'ask': None, 'groups': [], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'default3(a)gajim.org': { - 'ask': None, 'groups': ['GroupC',], 'name': None, 'resources': {}, - 'subscription': 'both'}, - 'asksubfrom(a)gajim.org': { - 'ask': 'subscribe', 'groups': ['GroupA',], 'name': None, - 'resources': {}, 'subscription': 'from'}, - 'subto(a)gajim.org': { - 'ask': None, 'groups': ['GroupB'], 'name': None, 'resources': {}, - 'subscription': 'to'}, - 'samejid(a)gajim.org': { - 'ask': None, 'groups': ['GroupA', 'GroupB'], 'name': None, - 'resources': {}, 'subscription': 'both'} -} -contacts[account3] = { - #'guypsych0\\40h.com(a)msn.dingdong.org': { - # 'ask': None, 'groups': [], 'name': None, 'resources': {}, - # 'subscription': 'both'}, - 'guypsych0%h.com(a)msn.delx.cjb.net': { - 'ask': 'subscribe', 'groups': [], 'name': None, - 'resources': {}, 'subscription': 'from'}, - #'guypsych0%h.com(a)msn.jabber.wiretrip.org': { - # 'ask': None, 'groups': [], 'name': None, 'resources': {}, - # 'subscription': 'to'}, - #'guypsycho\\40g.com(a)gtalk.dingdong.org': { - # 'ask': None, 'groups': [], 'name': None, - # 'resources': {}, 'subscription': 'both'} -} - -# We have contacts that are not in roster but only specified in the metadata -metacontact_data = [ - [{'account': account3, - 'jid': 'guypsych0\\40h.com(a)msn.dingdong.org', - 'order': 0}, - {'account': account3, - 'jid': 'guypsych0%h.com(a)msn.delx.cjb.net', - 'order': 0}, - {'account': account3, - 'jid': 'guypsych0%h.com(a)msn.jabber.wiretrip.org', - 'order': 0}, - {'account': account3, - 'jid': 'guypsycho\\40g.com(a)gtalk.dingdong.org', - 'order': 0}], - - [{'account': account1, - 'jid': 'samejid(a)gajim.org', - 'order': 0}, - {'account': account2, - 'jid': 'samejid(a)gajim.org', - 'order': 0}] - ] ===================================== test/lib/gajim_mocks.py deleted ===================================== @@ -1,139 +0,0 @@ -''' -Module with dummy classes for Gajim specific unit testing -''' - -from .mock import Mock -from gajim.common import app -from gajim.common import ged - -from gajim.common.connection_handlers import ConnectionHandlers - -class MockConnection(Mock, ConnectionHandlers): - def __init__(self, account, *args): - Mock.__init__(self, *args) - - self.connection = Mock() - - self.name = account - - ConnectionHandlers.__init__(self) - - self.connected = 2 - self.pep = {} - self.sessions = {} - self.server_resource = 'Gajim' - - app.interface.instances[account] = {'infos': {}, 'disco': {}, - 'gc_config': {}, 'search': {}, 'sub_request': {}} - app.interface.minimized_controls[account] = {} - app.contacts.add_account(account) - app.groups[account] = {} - app.gc_connected[account] = {} - app.automatic_rooms[account] = {} - app.newly_added[account] = [] - app.to_be_removed[account] = [] - app.nicks[account] = app.settings.get_account_setting(account, 'name') - app.block_signed_in_notifications[account] = True - app.last_message_time[account] = {} - - app.connections[account] = self - -class MockWindow(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - self.window = Mock() - self._controls = {} - - def get_control(self, jid, account): - try: - return self._controls[account][jid] - except KeyError: - return None - - def has_control(self, jid, acct): - return self.get_control(jid, acct) is not None - - def new_tab(self, ctrl): - account = ctrl.account - jid = ctrl.jid - - if account not in self._controls: - self._controls[account] = {} - - if jid not in self._controls[account]: - self._controls[account][jid] = {} - - self._controls[account][jid] = ctrl - - def __nonzero__(self): - return True - -class MockChatControl(Mock): - def __init__(self, jid, account, *args): - Mock.__init__(self, *args) - - self.jid = jid - self.account = account - - self.parent_win = MockWindow({'get_active_control': self}) - self.session = None - - def set_session(self, sess): - self.session = sess - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other - - -class MockInterface(Mock): - def __init__(self, *args): - Mock.__init__(self, *args) - app.interface = self - self.msg_win_mgr = Mock() - self.roster = Mock() - app.ged = ged.GlobalEventsDispatcher() - from gajim import plugins - app.plugin_manager = plugins.PluginManager() - - self.instances = {} - self.minimized_controls = {} - - -class MockLogger(Mock): - def __init__(self): - Mock.__init__(self, {'insert_into_logs': None, - 'get_transports_type': {}}) - self.cur = Mock() - - -class MockContact(Mock): - def __nonzero__(self): - return True - - -import random - -class MockSession(Mock): - def __init__(self, conn, jid, thread_id, type_): - Mock.__init__(self) - - self.conn = conn - self.jid = jid - self.type_ = type_ - self.thread_id = thread_id - self.resource = '' - - if not self.thread_id: - self.thread_id = '%0x' % random.randint(0, 10000) - - def __repr__(self): - return '<MockSession %s>' % self.thread_id - - def __nonzero__(self): - return True - - def __eq__(self, other): - return self is other ===================================== test/lib/mock.py deleted ===================================== @@ -1,466 +0,0 @@ -# -# (c) Dave Kirby 2001 - 2005 -# mock(a)thedeveloperscoach.com -# -# Original call interceptor and call assertion code by Phil Dawes (pdawes(a)users.sourceforge.net) -# Call interceptor code enhanced by Bruce Cropley (cropleyb(a)yahoo.com.au) -# -# This Python module and associated files are released under the FreeBSD -# license. Essentially, you can do what you like with it except pretend you wrote -# it yourself. -# -# -# Copyright (c) 2005, Dave Kirby -# Copyright (c) 2009, Yann Leboulanger -# -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions are met: -# -# * Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# -# * Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# -# * Neither the name of this library nor the names of its -# contributors may be used to endorse or promote products derived from -# this software without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" AND -# ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED -# WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE -# DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE LIABLE FOR -# ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES -# (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES; -# LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) HOWEVER CAUSED AND ON -# ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT -# (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF THIS -# SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. -# -# mock(a)thedeveloperscoach.com - - -""" -Mock object library for Python. Mock objects can be used when unit testing -to remove a dependency on another production class. They are typically used -when the dependency would either pull in lots of other classes, or -significantly slow down the execution of the test. -They are also used to create exceptional conditions that cannot otherwise -be easily triggered in the class under test. -""" - -__version__ = "0.1.0" - -# Added in Python 2.1 -import inspect -import re - -class MockInterfaceError(Exception): - pass - -class Mock(object): - """ - The Mock class emulates any other class for testing purposes. - All method calls are stored for later examination. - """ - - def __init__(self, returnValues=None, realClass=None): - """ - The Mock class constructor takes a dictionary of method names and - the values they return. Methods that are not in the returnValues - dictionary will return None. - You may also supply a class whose interface is being mocked. - All calls will be checked to see if they appear in the original - interface. Any calls to methods not appearing in the real class - will raise a MockInterfaceError. Any calls that would fail due to - non-matching parameter lists will also raise a MockInterfaceError. - Both of these help to prevent the Mock class getting out of sync - with the class it is Mocking. - """ - self.mockCalledMethods = {} - self.mockAllCalledMethods = [] - self.mockReturnValues = returnValues or {} - self.mockExpectations = {} - self.realClass = realClass - self.realClassMethods = None - if realClass: - self.realClassMethods = dict(inspect.getmembers(realClass, inspect.isroutine)) - for retMethod in self.mockReturnValues.keys(): - if retMethod not in self.realClassMethods: - raise MockInterfaceError("Return value supplied for method '%s' that was not in the original class" % retMethod) - self._setupSubclassMethodInterceptors() - - def _setupSubclassMethodInterceptors(self): - methods = inspect.getmembers(self.realClass, inspect.isroutine) - baseMethods = dict(inspect.getmembers(Mock, inspect.ismethod)) - for m in methods: - name = m[0] - # Don't record calls to methods of Mock base class. - if not name in baseMethods: - self.__dict__[name] = MockCallable(name, self, handcrafted=True) - - def get_module(self, name): - return Mock() - - def __getattr__(self, name): - return MockCallable(name, self) - - def mockAddReturnValues(self, **methodReturnValues ): - self.mockReturnValues.update(methodReturnValues) - - def mockSetExpectation(self, name, testFn, after=0, until=0): - self.mockExpectations.setdefault(name, []).append((testFn, after, until)) - - def _checkInterfaceCall(self, name, callParams, callKwParams): - """ - Check that a call to a method of the given name to the original - class with the given parameters would not fail. If it would fail, - raise a MockInterfaceError. - Based on the Python 2.3.3 Reference Manual section 5.3.4: Calls. - """ - if self.realClassMethods is None: - return - if name not in self.realClassMethods: - return - - func = self.realClassMethods[name] - try: - args, varargs, varkw, defaults = inspect.getargspec(func) - except TypeError: - # func is not a Python function. It is probably a builtin, - # such as __repr__ or __coerce__. TODO: Checking? - # For now assume params are OK. - return - - # callParams doesn't include self; args does include self. - numPosCallParams = 1 + len(callParams) - - if numPosCallParams > len(args) and not varargs: - raise MockInterfaceError("Original %s() takes at most %s arguments (%s given)" % - (name, len(args), numPosCallParams)) - - # Get the number of positional arguments that appear in the call, - # also check for duplicate parameters and unknown parameters - numPosSeen = _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw) - - lenArgsNoDefaults = len(args) - len(defaults or []) - if numPosSeen < lenArgsNoDefaults: - raise MockInterfaceError("Original %s() takes at least %s arguments (%s given)" % (name, lenArgsNoDefaults, numPosSeen)) - - def mockGetAllCalls(self): - """ - Return a list of MockCall objects, - representing all the methods in the order they were called. - """ - return self.mockAllCalledMethods - getAllCalls = mockGetAllCalls # deprecated - kept for backward compatibility - - def mockGetNamedCalls(self, methodName): - """ - Return a list of MockCall objects, - representing all the calls to the named method in the order they were called. - """ - return self.mockCalledMethods.get(methodName, []) - getNamedCalls = mockGetNamedCalls # deprecated - kept for backward compatibility - - def mockCheckCall(self, index, name, *args, **kwargs): - '''test that the index-th call had the specified name and parameters''' - call = self.mockAllCalledMethods[index] - assert name == call.getName(), "%r != %r" % (name, call.getName()) - call.checkArgs(*args, **kwargs) - - -def _getNumPosSeenAndCheck(numPosCallParams, callKwParams, args, varkw): - """ - Positional arguments can appear as call parameters either named as - a named (keyword) parameter, or just as a value to be matched by - position. Count the positional arguments that are given by either - keyword or position, and check for duplicate specifications. - Also check for arguments specified by keyword that do not appear - in the method's parameter list. - """ - posSeen = {} - for arg in args[:numPosCallParams]: - posSeen[arg] = True - for kwp in callKwParams: - if kwp in posSeen: - raise MockInterfaceError("%s appears as both a positional and named parameter." % kwp) - if kwp in args: - posSeen[kwp] = True - elif not varkw: - raise MockInterfaceError("Original method does not have a parameter '%s'" % kwp) - return len(posSeen) - -class MockCall: - """ - MockCall records the name and parameters of a call to an instance - of a Mock class. Instances of MockCall are created by the Mock class, - but can be inspected later as part of the test. - """ - def __init__(self, name, params, kwparams ): - self.name = name - self.params = params - self.kwparams = kwparams - - def checkArgs(self, *args, **kwargs): - assert args == self.params, "%r != %r" % (args, self.params) - assert kwargs == self.kwparams, "%r != %r" % (kwargs, self.kwparams) - - def getParam( self, n ): - if isinstance(n, int): - return self.params[n] - elif isinstance(n, str): - return self.kwparams[n] - else: - raise IndexError('illegal index type for getParam') - - def getNumParams(self): - return len(self.params) - - def getNumKwParams(self): - return len(self.kwparams) - - def getName(self): - return self.name - - #pretty-print the method call - def __str__(self): - s = self.name + "(" - sep = '' - for p in self.params: - s = s + sep + repr(p) - sep = ', ' - items = sorted(self.kwparams.items()) - for k, v in items: - s = s + sep + k + '=' + repr(v) - sep = ', ' - s = s + ')' - return s - def __repr__(self): - return self.__str__() - -class MockCallable: - """ - Intercepts the call and records it, then delegates to either the mock's - dictionary of mock return values that was passed in to the constructor, - or a handcrafted method of a Mock subclass. - """ - def __init__(self, name, mock, handcrafted=False): - self.name = name - self.mock = mock - self.handcrafted = handcrafted - - def __call__(self, *params, **kwparams): - self.mock._checkInterfaceCall(self.name, params, kwparams) - thisCall = self.recordCall(params, kwparams) - self.checkExpectations(thisCall, params, kwparams) - return self.makeCall(params, kwparams) - - def recordCall(self, params, kwparams): - """ - Record the MockCall in an ordered list of all calls, and an ordered - list of calls for that method name. - """ - thisCall = MockCall(self.name, params, kwparams) - calls = self.mock.mockCalledMethods.setdefault(self.name, []) - calls.append(thisCall) - self.mock.mockAllCalledMethods.append(thisCall) - return thisCall - - def makeCall(self, params, kwparams): - if self.handcrafted: - allPosParams = (self.mock,) + params - func = _findFunc(self.mock.realClass, self.name) - if not func: - raise NotImplementedError - return func(*allPosParams, **kwparams) - else: - returnVal = self.mock.mockReturnValues.get(self.name) - if isinstance(returnVal, ReturnValuesBase): - returnVal = returnVal.next() - return returnVal - - def checkExpectations(self, thisCall, params, kwparams): - if self.name in self.mock.mockExpectations: - callsMade = len(self.mock.mockCalledMethods[self.name]) - for (expectation, after, until) in self.mock.mockExpectations[self.name]: - if callsMade > after and (until==0 or callsMade < until): - assert expectation(self.mock, thisCall, len(self.mock.mockAllCalledMethods)-1), 'Expectation failed: '+str(thisCall) - - -def _findFunc(cl, name): - """ Depth first search for a method with a given name. """ - if name in cl.__dict__: - return cl.__dict__[name] - for base in cl.__bases__: - func = _findFunc(base, name) - if func: - return func - return None - - - -class ReturnValuesBase: - def next(self): - try: - return self.iter.next() - except StopIteration: - raise AssertionError("No more return values") - def __iter__(self): - return self - -class ReturnValues(ReturnValuesBase): - def __init__(self, *values): - self.iter = iter(values) - - -class ReturnIterator(ReturnValuesBase): - def __init__(self, iterator): - self.iter = iter(iterator) - - -def expectParams(*params, **keywords): - '''check that the callObj is called with specified params and keywords - ''' - def fn(mockObj, callObj, idx): - return callObj.params == params and callObj.kwparams == keywords - return fn - - -def expectAfter(*methods): - '''check that the function is only called after all the functions in 'methods' - ''' - def fn(mockObj, callObj, idx): - calledMethods = [method.getName() for method in mockObj.mockGetAllCalls()] - #skip last entry, since that is the current call - calledMethods = calledMethods[:-1] - for method in methods: - if method not in calledMethods: - return False - return True - return fn - -def expectException(exception, *args, **kwargs): - ''' raise an exception when the method is called - ''' - def fn(mockObj, callObj, idx): - raise exception(*args, **kwargs) - return fn - - -def expectParam(paramIdx, cond): - '''check that the callObj is called with parameter specified by paramIdx (a position index or keyword) - fulfills the condition specified by cond. - cond is a function that takes a single argument, the value to test. - ''' - def fn(mockObj, callObj, idx): - param = callObj.getParam(paramIdx) - return cond(param) - return fn - -def EQ(value): - def testFn(param): - return param == value - return testFn - -def NE(value): - def testFn(param): - return param != value - return testFn - -def GT(value): - def testFn(param): - return param > value - return testFn - -def LT(value): - def testFn(param): - return param < value - return testFn - -def GE(value): - def testFn(param): - return param >= value - return testFn - -def LE(value): - def testFn(param): - return param <= value - return testFn - -def AND(*condlist): - def testFn(param): - for cond in condlist: - if not cond(param): - return False - return True - return testFn - -def OR(*condlist): - def testFn(param): - for cond in condlist: - if cond(param): - return True - return False - return testFn - -def NOT(cond): - def testFn(param): - return not cond(param) - return testFn - -def MATCHES(regex, *args, **kwargs): - compiled_regex = re.compile(regex, *args, **kwargs) - def testFn(param): - return compiled_regex.match(param) is not None - return testFn - -def SEQ(*sequence): - iterator = iter(sequence) - def testFn(param): - try: - cond = iterator.next() - except StopIteration: - raise AssertionError('SEQ exhausted') - return cond(param) - return testFn - -def IS(instance): - def testFn(param): - return param is instance - return testFn - -def ISINSTANCE(class_): - def testFn(param): - return isinstance(param, class_) - return testFn - -def ISSUBCLASS(class_): - def testFn(param): - return issubclass(param, class_) - return testFn - -def CONTAINS(val): - def testFn(param): - return val in param - return testFn - -def IN(container): - def testFn(param): - return param in container - return testFn - -def HASATTR(attr): - def testFn(param): - return hasattr(param, attr) - return testFn - -def HASMETHOD(method): - def testFn(param): - return hasattr(param, method) and callable(getattr(param, method)) - return testFn - -CALLABLE = callable ===================================== test/lib/notify.py deleted ===================================== @@ -1,28 +0,0 @@ -# mock notify module - -from gajim.common import app -from gajim.common import ged - -notifications = [] - -class Notification: - def _nec_notification(self, obj): - global notifications - notifications.append(obj) - - def clean(self): - global notifications - notifications = [] - app.ged.remove_event_handler('notification', ged.GUI2, - self._nec_notification) - - def __init__(self): - app.ged.register_event_handler('notification', ged.GUI2, - self._nec_notification) - - -def notify(event, jid, account, parameters, advanced_notif_num = None): - notifications.append((event, jid, account, parameters, advanced_notif_num)) - -def get_advanced_notification(event, account, contact): - return None ===================================== test/no_gui/__init__.py ===================================== @@ -0,0 +1,11 @@ +import gi + +def require_versions(): + gi.require_versions({'Gdk': '3.0', + 'GLib': '2.0', + 'Gio': '2.0', + 'Gtk': '3.0', + 'GObject': '2.0', + 'Pango': '1.0'}) + +require_versions() ===================================== test/no_gui/unit/test_nick_completion.py → test/no_gui/test_nick_completion.py ===================================== ===================================== test/no_gui/unit/__init__.py deleted ===================================== @@ -1,5 +0,0 @@ -''' - -This package just contains plain unit tests - -''' ===================================== test/unit/__init__.py deleted ===================================== @@ -1,5 +0,0 @@ -''' - -This package just contains plain unit tests - -''' View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e98cf3367c962c8de4345e27ff09e68… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e98cf3367c962c8de4345e27ff09e68… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ChatList: Typing
by Daniel Brötzmann (＠wurstsalat) 04 Mar '22

04 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: a1cf0992 by wurstsalat at 2022-03-04T23:49:59+01:00 ChatList: Typing - - - - - f587c239 by wurstsalat at 2022-03-04T23:51:01+01:00 Update pyrightconfig - - - - - 3 changed files: - gajim/common/types.py - gajim/gtk/chat_list.py - pyrightconfig.json Changes: ===================================== gajim/common/types.py ===================================== @@ -77,4 +77,5 @@ ObservableCbDict = dict[str, list[weakref.WeakMethod[AnyCallableT]]] ChatContactT = Union['BareContact', 'GroupchatContact', 'GroupchatParticipant'] +OneOnOneContactT = Union['BareContact', 'GroupchatParticipant'] GroupchatContactT = Union['GroupchatContact'] ===================================== gajim/gtk/chat_list.py ===================================== @@ -47,6 +47,7 @@ from gajim.common.preview_helpers import filename_from_uri from gajim.common.preview_helpers import guess_simple_file_type from gajim.common.types import ChatContactT +from gajim.common.types import OneOnOneContactT from .menus import get_chat_list_row_menu from .builder import get_builder @@ -772,7 +773,7 @@ def update_account_identifier(self) -> None: self._ui.account_identifier.set_visible(show) def _on_chatstate_update(self, - contact: ChatContactT, + contact: OneOnOneContactT, _signal_name: str ) -> None: if contact.chatstate is None: ===================================== pyrightconfig.json ===================================== @@ -37,6 +37,7 @@ "gajim/gtk/change_password.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", + "gajim/gtk/chat_list.py", "gajim/gtk/chat_page.py", "gajim/gtk/chat_stack.py", "gajim/gtk/const.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/392d4a982fe65861416cf018f166cb4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/392d4a982fe65861416cf018f166cb4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 8 commits: Menus: Typing
by Daniel Brötzmann (＠wurstsalat) 04 Mar '22

04 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 1b365095 by wurstsalat at 2022-03-04T22:35:37+01:00 Menus: Typing - - - - - e2043400 by wurstsalat at 2022-03-04T22:45:20+01:00 Roster: Linting - - - - - fc39aba7 by wurstsalat at 2022-03-04T22:59:36+01:00 Settings values: Typing, add license header - - - - - c53810f9 by wurstsalat at 2022-03-04T23:14:44+01:00 PEPConfig: Typing - - - - - c2bc4131 by wurstsalat at 2022-03-04T23:20:44+01:00 GroupchatJoin: Typing - - - - - ee7493b3 by wurstsalat at 2022-03-04T23:30:23+01:00 Dialogs: Typing - - - - - d3ff7e4c by wurstsalat at 2022-03-04T23:34:46+01:00 ChangePassword: Typing - - - - - 392d4a98 by wurstsalat at 2022-03-04T23:41:07+01:00 Update pyrightconfig - - - - - 8 changed files: - gajim/common/setting_values.py - gajim/gtk/change_password.py - gajim/gtk/dialogs.py - gajim/gtk/groupchat_join.py - gajim/gtk/menus.py - gajim/gtk/pep_config.py - gajim/gtk/roster.py - pyrightconfig.json Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -1,3 +1,16 @@ +# 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 typing import Literal from typing import TypedDict @@ -504,7 +517,9 @@ class WorkspaceSettings(TypedDict): } -INITAL_WORKSPACE = {str(uuid.uuid4()): {}} +INITAL_WORKSPACE: dict[str, dict[str, WorkspaceSettings]] = { + str(uuid.uuid4()): {} +} PLUGIN_SETTINGS = { ===================================== gajim/gtk/change_password.py ===================================== @@ -100,7 +100,8 @@ def _on_change_password(self, task: Task) -> None: task.finish() except ChangePasswordStanzaError as error: next_stage_page = cast(NextStage, self.get_page('next_stage')) - next_stage_page.set_form(error.get_form()) + form = cast(SimpleDataForm, error.get_form()) + next_stage_page.set_form(form) self.show_page('next_stage', Gtk.StackTransitionType.SLIDE_LEFT) except StanzaError as error: ===================================== gajim/gtk/dialogs.py ===================================== @@ -272,8 +272,8 @@ def _on_response(self, ) -> None: if response == Gtk.ResponseType.DELETE_EVENT: # Look if DELETE_EVENT is mapped to another response - response = self._buttons.get(response, None) - if response is None: + button = self._buttons.get(response, None) + if button is None: # If DELETE_EVENT was not mapped we assume CANCEL response = Gtk.ResponseType.CANCEL ===================================== gajim/gtk/groupchat_join.py ===================================== @@ -136,7 +136,8 @@ def _show_error_page(self, text: str) -> None: self._stack.set_visible_child_name('error') def _set_error(self, error: StanzaError) -> None: - text = MUC_DISCO_ERRORS.get(error.condition, to_user_string(error)) + text = MUC_DISCO_ERRORS.get( + error.condition or '', to_user_string(error)) if error.condition == 'gone': reason = error.get_text(get_rfc5646_lang()) if reason: ===================================== gajim/gtk/menus.py ===================================== @@ -16,9 +16,10 @@ from __future__ import annotations -from typing import Union from typing import Any +from typing import cast from typing import Optional +from typing import Union from urllib.parse import quote @@ -288,7 +289,7 @@ def get_conv_action_context_menu(account: str, item.set_action_target_value(value) submenu.append(item) - for item in submenu: + for item in cast(list[Gtk.MenuItem], submenu): item.set_action_name('app.open-link') return action_menu_item ===================================== gajim/gtk/pep_config.py ===================================== @@ -18,6 +18,8 @@ from gi.repository import Gtk from nbxmpp.errors import StanzaError +from nbxmpp.modules.dataforms import SimpleDataForm +from nbxmpp.simplexml import Node from nbxmpp.task import Task from gajim.common import app @@ -148,7 +150,10 @@ def _on_configure_button_clicked(self, _button: Gtk.Button) -> None: node, callback=self._nec_pep_config_received) - def _on_config_submit(self, form, node): + def _on_config_submit(self, + form: SimpleDataForm, + node: Node + ) -> None: self._client.get_module('PubSub').set_node_configuration(node, form) def _nec_pep_config_received(self, task: Task) -> None: ===================================== gajim/gtk/roster.py ===================================== @@ -85,7 +85,8 @@ def __init__(self, account: str) -> None: self._ui.roster_treeview.set_model(None) self.add(self._ui.roster_treeview) - self._contact_refs: dict[JID, list[Gtk.TreeRowReference]] = defaultdict(list) + self._contact_refs: dict[ + JID, list[Gtk.TreeRowReference]] = defaultdict(list) self._group_refs: dict[str, Gtk.TreeRowReference] = {} self._store = self._ui.contact_store ===================================== pyrightconfig.json ===================================== @@ -19,20 +19,22 @@ "gajim/common/modules/chat_markers.py", "gajim/common/passwords.py", "gajim/common/regex.py", + "gajim/common/setting_values.py", "gajim/common/sound.py", "gajim/common/storage/", "gajim/gtk/about.py", "gajim/gtk/account_page.py", "gajim/gtk/account_side_bar.py", - "gajim/gtk/apply_button_box.py", "gajim/gtk/app_page.py", "gajim/gtk/app_side_bar.py", "gajim/gtk/application.py", - "gajim/gtk/certificate_dialog.py", + "gajim/gtk/apply_button_box.py", "gajim/gtk/blocking.py", "gajim/gtk/bookmarks.py", "gajim/gtk/builder.py", "gajim/gtk/call_widget.py", + "gajim/gtk/certificate_dialog.py", + "gajim/gtk/change_password.py", "gajim/gtk/chat_filter.py", "gajim/gtk/chat_list_stack.py", "gajim/gtk/chat_page.py", @@ -40,7 +42,9 @@ "gajim/gtk/const.py", "gajim/gtk/contact_info.py", "gajim/gtk/contacts_flowbox.py", + "gajim/gtk/contact_settings.py", "gajim/gtk/conversation", + "gajim/gtk/dialogs.py", "gajim/gtk/features.py", "gajim/gtk/file_transfer_send.py", "gajim/gtk/groupchat_affiliation.py", @@ -52,18 +56,21 @@ "gajim/gtk/groupchat_outcasts.py", "gajim/gtk/groupchat_settings.py", "gajim/gtk/groupchat_state.py", - "gajim/gtk/main.py", "gajim/gtk/main_stack.py", + "gajim/gtk/main.py", "gajim/gtk/mam_preferences.py", "gajim/gtk/manage_sounds.py", + "gajim/gtk/menus.py", "gajim/gtk/message_input.py", - "gajim/gtk/notification.py", "gajim/gtk/notification_manager.py", + "gajim/gtk/notification.py", "gajim/gtk/password_dialog.py", + "gajim/gtk/pep_config.py", "gajim/gtk/preview_audio.py", "gajim/gtk/proxies.py", "gajim/gtk/remove_account.py", "gajim/gtk/resource_selector.py", + "gajim/gtk/roster.py", "gajim/gtk/search_view.py", "gajim/gtk/sidebar_switcher.py", "gajim/gtk/ssl_error_dialog.py", View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cac5454133538a16d6616cb6238c008… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cac5454133538a16d6616cb6238c008… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: GroupchatDetails: Add Remove History button
by Daniel Brötzmann (＠wurstsalat) 04 Mar '22

04 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 9b311c2d by wurstsalat at 2022-03-04T22:15:46+01:00 GroupchatDetails: Add Remove History button - - - - - cac54541 by wurstsalat at 2022-03-04T22:15:46+01:00 Chat menus: Remove obsolete entries - - - - - 2 changed files: - gajim/gtk/groupchat_details.py - gajim/gtk/menus.py Changes: ===================================== gajim/gtk/groupchat_details.py ===================================== @@ -35,6 +35,7 @@ from .groupchat_manage import GroupchatManage from .groupchat_settings import GroupChatSettings from .sidebar_switcher import SideBarSwitcher +from .structs import RemoveHistoryActionParams class GroupchatDetails(Gtk.ApplicationWindow): @@ -146,13 +147,28 @@ def _add_groupchat_info(self) -> None: self._ui.info_box.add(self._groupchat_info) def _add_groupchat_settings(self) -> None: + main_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=24) + + settings_box = GroupChatSettings(self.account, self._contact.jid) + main_box.add(settings_box) + + remove_history_button = Gtk.Button(label=_('Remove History…')) + remove_history_button.set_halign(Gtk.Align.START) + remove_history_button.get_style_context().add_class( + 'destructive-action') + params = RemoveHistoryActionParams( + account=self.account, jid=self._contact.jid) + remove_history_button.set_action_name('app.remove-history') + remove_history_button.set_action_target_value( + params.to_variant()) + main_box.add(remove_history_button) + scrolled_window = Gtk.ScrolledWindow() scrolled_window.set_vexpand(True) scrolled_window.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + scrolled_window.add(main_box) - settings_box = GroupChatSettings(self.account, self._contact.jid) - scrolled_window.add(settings_box) self._ui.settings_box.add(scrolled_window) def _add_affiliations(self) -> None: ===================================== gajim/gtk/menus.py ===================================== @@ -16,7 +16,6 @@ from __future__ import annotations -from typing import List from typing import Union from typing import Any from typing import Optional @@ -76,15 +75,12 @@ def get_singlechat_menu(control_id: str, singlechat_menu: list[tuple[str, Any]] = [ ('win.information-', _('Details')), - ('win.send-marker-', _('Send Read Markers')), - (_('Send Chatstate'), ['chatstate']), ('win.block-contact-', _('Block Contact…')), (_('Send File'), [ ('win.send-file-httpupload-', _('Upload File…')), ('win.send-file-jingle-', _('Send File Directly…')) ]), ('win.start-call-', _('Start Call…')), - ('app.remove-history', _('Remove History…')), ('win.search-history', _('Search…')) ] @@ -94,28 +90,11 @@ def get_singlechat_menu(control_id: str, singlechat_menu.append( ('win.add-to-roster-', _('Add to Contact List…'))) - def build_chatstate_menu() -> Gio.Menu: - menu = Gio.Menu() - entries = [ - (_('Disabled'), 'disabled'), - (_('Composing Only'), 'composing_only'), - (_('All Chat States'), 'all') - ] - - for entry in entries: - label, setting = entry - action = f'win.send-chatstate-{control_id}::{setting}' - menu.append(label, action) - return menu - def build_menu(preset: list[tuple[str, Any]]): menu = Gio.Menu() for item in preset: if isinstance(item[1], str): action_name, label = item - if action_name == 'win.send-marker-' and type_.is_privatechat: - continue - if action_name == 'win.search-history': menuitem = Gio.MenuItem.new(label, action_name) menuitem.set_action_and_target_value(action_name, None) @@ -136,10 +115,7 @@ def build_menu(preset: list[tuple[str, Any]]): menu.append(label, action_name + control_id) else: label, sub_menu = item - if 'chatstate' in sub_menu: - submenu = build_chatstate_menu() - else: - submenu = build_menu(sub_menu) + submenu = build_menu(sub_menu) menu.append_submenu(label, submenu) return menu @@ -150,15 +126,11 @@ def build_menu(preset: list[tuple[str, Any]]): def get_groupchat_menu(control_id: str, account: str, jid: JID) -> Gio.Menu: - - params = RemoveHistoryActionParams(account=account, jid=jid) - menulist: MenuItemListT = [ (_('Details'), f'win.groupchat-details-{control_id}', None), (_('Change Nickname…'), f'win.change-nickname-{control_id}', None), (_('Request Voice'), f'win.request-voice-{control_id}', None), (_('Execute Command…'), f'win.execute-command-{control_id}', '""'), - (_('Remove History…'), 'app.remove-history', params), (_('Search…'), 'win.search-history', None) ] @@ -454,7 +426,7 @@ def get_chat_list_row_menu(workspace_id: str, toggle_label = _('Unpin Chat') if pinned else _('Pin Chat') - menu_items: List[Any] = [ + menu_items: list[Any] = [ ('toggle-chat-pinned', toggle_label), ] View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0dbbf715fc2196cff67cd55fc2bd39b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/0dbbf715fc2196cff67cd55fc2bd39b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix highlighting of email addresses
by Daniel Brötzmann (＠wurstsalat) 04 Mar '22

04 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 0dbbf715 by André Apitzsch at 2022-03-04T22:07:10+01:00 Fix highlighting of email addresses Fixes #10788. - - - - - 2 changed files: - gajim/common/styling.py - test/no_gui/test_styling.py Changes: ===================================== gajim/common/styling.py ===================================== @@ -46,7 +46,7 @@ URI_RX = r'((?P<protocol>[\w-]+://?|www[.])[\S()<>]+?(?=[,]?(\s|\Z)+))' URI_RX = re.compile(URI_RX) -ADDRESS_RX = r'(\b(?P<protocol>(xmpp|mailto)+:)?[\w-]*@(.*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' +ADDRESS_RX = r'(\b(?P<protocol>(xmpp|mailto):)?[\w-]*@(\w*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' ADDRESS_RX = re.compile(ADDRESS_RX) EMOJI_RX = emoji_data.get_regex() ===================================== test/no_gui/test_styling.py ===================================== @@ -325,6 +325,14 @@ EMAILS = [ 'asd(a)asd.at', 'asd(a)asd.asd.at', + 'mailto:foo@bar.com.uk', +] + +EMAILS_WITH_TEXT = [ + ('write to my email mailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', + ['mailto:foo@bar.com.uk', 'mailto:bar@foo.com']), + ('write to my email mailtomailto:foo@bar.com.uk (but not to mailto:bar@foo.com)', + ['foo(a)bar.com.uk', 'mailto:bar@foo.com']), ] @@ -360,6 +368,13 @@ def test_emails(self): end = match.end() self.assertTrue(email[start:end] == email) + def test_emails_with_text(self): + for text, result in EMAILS_WITH_TEXT: + match = ADDRESS_RX.findall(text) + self.assertIsNotNone(match) + for i, res in enumerate(result): + self.assertTrue(match[i][0] == res) + def test_url_with_text(self): for text, result in URL_WITH_TEXT: match = URI_RX.search(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0dbbf715fc2196cff67cd55fc2bd39b9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/0dbbf715fc2196cff67cd55fc2bd39b9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: ContactInfo: Add ContactSettings
by Daniel Brötzmann (＠wurstsalat) 04 Mar '22

04 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: eeacc0c8 by wurstsalat at 2022-03-04T20:11:43+01:00 ContactInfo: Add ContactSettings - - - - - 88709300 by wurstsalat at 2022-03-04T20:59:07+01:00 ContactInfo: Add Remove History button - - - - - 4 changed files: - gajim/data/gui/contact_info.ui - gajim/gtk/builder.pyi - gajim/gtk/contact_info.py - + gajim/gtk/contact_settings.py Changes: ===================================== gajim/data/gui/contact_info.ui ===================================== @@ -417,78 +417,35 @@ </packing> </child> <child> - <object class="GtkBox" id="settings_box"> + <object class="GtkScrolledWindow" id="settings_scrolled"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">18</property> + <property name="can-focus">True</property> + <property name="hscrollbar-policy">never</property> <child> - <object class="GtkListBox" id="subscription_listbox"> - <property name="width-request">400</property> + <object class="GtkViewport"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">center</property> - <property name="selection-mode">none</property> - <child> - <object class="GtkListBoxRow"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activatable">False</property> - <property name="selectable">False</property> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Share my online status</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="from_subscription_switch"> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="halign">end</property> - <property name="valign">center</property> - <signal name="state-set" handler="_on_from_subscription_switch_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack-type">end</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - </child> <child> - <object class="GtkListBoxRow"> + <object class="GtkBox" id="settings_box"> <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="activatable">False</property> - <property name="selectable">False</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">24</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="margin-end">24</property> - <property name="label" translatable="yes">I can see contact's online status</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Status</property> + <style> + <class name="bold"/> + </style> </object> <packing> <property name="expand">False</property> @@ -497,54 +454,28 @@ </packing> </child> <child> - <object class="GtkBox"> + <object class="GtkListBox" id="subscription_listbox"> + <property name="width-request">400</property> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="spacing">12</property> + <property name="no-show-all">True</property> + <property name="selection-mode">none</property> <child> - <object class="GtkStack" id="to_subscription_stack"> + <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="no-show-all">True</property> - <property name="halign">end</property> - <property name="valign">center</property> - <property name="transition-type">crossfade</property> + <property name="can-focus">True</property> + <property name="activatable">False</property> + <property name="selectable">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="halign">end</property> - <property name="spacing">12</property> <child> - <object class="GtkStack" id="request_stack"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="transition-type">crossfade</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">You cannot see this contact's online status</property> - <property name="halign">center</property> - <property name="icon-name">window-close-symbolic</property> - </object> - <packing> - <property name="name">cross</property> - </packing> - </child> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">You requested to see this contact's online status</property> - <property name="icon-name">document-open-recent-symbolic</property> - </object> - <packing> - <property name="name">requested</property> - <property name="position">1</property> - </packing> - </child> + <property name="halign">end</property> + <property name="label" translatable="yes">Share my online status</property> </object> <packing> <property name="expand">False</property> @@ -553,73 +484,232 @@ </packing> </child> <child> - <object class="GtkButton" id="to_subscription_button"> - <property name="label" translatable="yes">_Request</property> + <object class="GtkSwitch" id="from_subscription_switch"> <property name="visible">True</property> <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="no-show-all">True</property> - <property name="tooltip-text" translatable="yes">Request to see this contact's online status</property> + <property name="halign">end</property> <property name="valign">center</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_to_subscription_button_clicked" swapped="no"/> + <signal name="state-set" handler="_on_from_subscription_switch_toggled" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> </object> - <packing> - <property name="name">request</property> - </packing> </child> + </object> + </child> + <child> + <object class="GtkListBoxRow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="activatable">False</property> + <property name="selectable">False</property> <child> - <object class="GtkImage"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="tooltip-text" translatable="yes">You can see the contact's online status</property> - <property name="halign">end</property> - <property name="icon-name">object-select-symbolic</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="margin-end">24</property> + <property name="label" translatable="yes">I can see contact's online status</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="spacing">12</property> + <child> + <object class="GtkStack" id="to_subscription_stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="transition-type">crossfade</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="spacing">12</property> + <child> + <object class="GtkStack" id="request_stack"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="transition-type">crossfade</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">You cannot see this contact's online status</property> + <property name="halign">center</property> + <property name="icon-name">window-close-symbolic</property> + </object> + <packing> + <property name="name">cross</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">You requested to see this contact's online status</property> + <property name="icon-name">document-open-recent-symbolic</property> + </object> + <packing> + <property name="name">requested</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="to_subscription_button"> + <property name="label" translatable="yes">_Request</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="no-show-all">True</property> + <property name="tooltip-text" translatable="yes">Request to see this contact's online status</property> + <property name="valign">center</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_to_subscription_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">request</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="tooltip-text" translatable="yes">You can see the contact's online status</property> + <property name="halign">end</property> + <property name="icon-name">object-select-symbolic</property> + </object> + <packing> + <property name="name">checkmark</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> </object> - <packing> - <property name="name">checkmark</property> - <property name="position">1</property> - </packing> </child> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> + <style> + <class name="settings"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> </child> + <child> + <object class="GtkBox" id="contact_settings_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Privacy</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton" id="remove_history_button"> + <property name="label" translatable="yes">Remove History…</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">start</property> + <style> + <class name="destructive-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <style> + <class name="padding-18"/> + </style> </object> </child> - <style> - <class name="settings"/> - </style> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> - <style> - <class name="padding-18"/> - </style> </object> <packing> <property name="name">settings</property> ===================================== gajim/gtk/builder.pyi ===================================== @@ -282,12 +282,15 @@ class ContactInfoBuilder(Builder): group_chat_grid: Gtk.Grid role_label: Gtk.Label affiliation_label: Gtk.Label + settings_scrolled: Gtk.ScrolledWindow settings_box: Gtk.Box subscription_listbox: Gtk.ListBox from_subscription_switch: Gtk.Switch to_subscription_stack: Gtk.Stack request_stack: Gtk.Stack to_subscription_button: Gtk.Button + contact_settings_box: Gtk.Box + remove_history_button: Gtk.Button groups_page_box: Gtk.Box groups_treeview: Gtk.TreeView tree_selection: Gtk.TreeSelection ===================================== gajim/gtk/contact_info.py ===================================== @@ -21,10 +21,11 @@ import logging from enum import IntEnum -from gi.repository import Gtk + from gi.repository import Gdk from gi.repository import GdkPixbuf from gi.repository import GObject +from gi.repository import Gtk from nbxmpp.task import Task from nbxmpp.errors import StanzaError @@ -45,12 +46,14 @@ from gajim.common.modules.contacts import ResourceContact from gajim.common.modules.contacts import GroupchatParticipant +from .contact_settings import ContactSettings from .dialogs import ConfirmationDialog from .dialogs import DialogButton from .sidebar_switcher import SideBarSwitcher from .builder import get_builder from .util import connect_destroy from .vcard_grid import VCardGrid +from .structs import RemoveHistoryActionParams log = logging.getLogger('gajim.gui.contact_info') @@ -210,6 +213,14 @@ def _fill_settings_page(self, contact: BareContact) -> None: self._ui.request_stack.set_visible_child_name('cross') self._switcher.set_row_visible('settings', True) + contact_settings = ContactSettings(self.account, contact.jid) + self._ui.contact_settings_box.add(contact_settings) + + params = RemoveHistoryActionParams( + account=self.account, jid=self.contact.jid) + self._ui.remove_history_button.set_action_name('app.remove-history') + self._ui.remove_history_button.set_action_target_value( + params.to_variant()) def _fill_groups_page(self, contact: BareContact) -> None: if not contact.is_in_roster: ===================================== gajim/gtk/contact_settings.py ===================================== @@ -0,0 +1,58 @@ +# 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 gi.repository import Gtk + +from nbxmpp.protocol import JID + +from gajim.common.i18n import _ + +from .const import Setting +from .const import SettingKind +from .const import SettingType +from .settings import SettingsBox + + +class ContactSettings(SettingsBox): + def __init__(self, account: str, jid: JID) -> None: + SettingsBox.__init__(self, account, str(jid)) + + self.get_style_context().add_class('settings-border') + self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_valign(Gtk.Align.START) + self.set_halign(Gtk.Align.CENTER) + + chat_state = { + 'disabled': _('Disabled'), + 'composing_only': _('Composing Only'), + 'all': _('All Chat States') + } + + settings: list[Setting] = [ + Setting(SettingKind.POPOVER, + _('Send Chat State'), + SettingType.CONTACT, + 'send_chatstate', + props={'entries': chat_state}), + + Setting(SettingKind.SWITCH, + _('Send Chat Markers'), + SettingType.CONTACT, + 'send_marker', + desc=_('Let others know if you read up to this point')), + ] + + for setting in settings: + self.add_setting(setting) + self.update_states() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/257991159c4b25a15afc975d3a4c628… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/257991159c4b25a15afc975d3a4c628… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix processing item-not-found Iq with file transfers
by Daniel Brötzmann (＠wurstsalat) 02 Mar '22

02 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 25799115 by wurstsalat at 2022-03-02T23:17:05+01:00 Fix processing item-not-found Iq with file transfers Fixes #10677 - - - - - 1 changed file: - gajim/common/modules/iq.py Changes: ===================================== gajim/common/modules/iq.py ===================================== @@ -60,17 +60,18 @@ def _iq_error_received(self, _con, _stanza, properties): raise nbxmpp.NodeProcessed if properties.error.condition == 'item-not-found': - sid = self._get_sid(properties.id) - file_props = FilesProp.getFileProp(self._account, sid) - if file_props: - app.ged.raise_event( - FileSendError(account=self._account, - jid=str(properties.jid), - file_props=file_props, - error_msg='')) - self._con.get_module('Bytestream').disconnect_transfer( - file_props) - raise nbxmpp.NodeProcessed + if not properties.is_pubsub: + sid = self._get_sid(properties.id) + file_props = FilesProp.getFileProp(self._account, sid) + if file_props: + app.ged.raise_event( + FileSendError(account=self._account, + jid=str(properties.jid), + file_props=file_props, + error_msg='')) + self._con.get_module('Bytestream').disconnect_transfer( + file_props) + raise nbxmpp.NodeProcessed app.ged.raise_event( IqErrorReceived(account=self._account, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/257991159c4b25a15afc975d3a4c6287… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/257991159c4b25a15afc975d3a4c6287… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: ContactInfo: Add explanation for hiding Notes page
by Daniel Brötzmann (＠wurstsalat) 02 Mar '22

02 Mar '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b0b20026 by wurstsalat at 2022-03-02T21:53:34+01:00 ContactInfo: Add explanation for hiding Notes page - - - - - 8bb86ec4 by wurstsalat at 2022-03-02T22:02:02+01:00 Commands: Fix deprecation warning - - - - - 4b6a2433 by wurstsalat at 2022-03-02T22:25:49+01:00 Command System: Fix /leave command Fixes #10762 - - - - - 3 changed files: - gajim/command_system/framework.py - gajim/command_system/implementation/standard.py - gajim/gtk/contact_info.py Changes: ===================================== gajim/command_system/framework.py ===================================== @@ -20,7 +20,8 @@ """ from types import FunctionType -from inspect import getargspec, getdoc +from inspect import getfullargspec +from inspect import getdoc from gajim.command_system.dispatcher import Host from gajim.command_system.dispatcher import Container @@ -221,7 +222,8 @@ def extract_specification(self): Extract handler's arguments specification, as it was defined preserving their order. """ - names, var_args, var_kwargs, defaults = getargspec(self.handler) # pylint: disable=W1505 + names, var_args, var_kwargs, defaults, _, _, _ = getfullargspec( + self.handler) # Behavior of this code need to be checked. Might yield # incorrect results on some rare occasions. ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -334,11 +334,12 @@ def join(self, jid): 'groupchat-join', GLib.Variant('as', [self.account, jid])) - @command('part', 'close', raw=True, empty=True) - @doc(_("Leave the group chat, optionally giving a reason, and close tab or " - "window")) - def leave(self, reason): - self.leave(reason=reason) + @command('part', 'close') + @doc(_("Leave the group chat")) + def leave(self): + # Use idle_add to let command system finish printing + variant = GLib.Variant('as', [self.account, str(self.room_jid)]) + GLib.idle_add(app.window.activate_action, 'remove-chat', variant) @command(raw=True, empty=True) @doc(_(""" ===================================== gajim/gtk/contact_info.py ===================================== @@ -186,6 +186,10 @@ def _fill_note_page(self, contact: BareContact) -> None: self._ui.textview_annotation.get_buffer().set_text(note.data) if app.account_supports_private_storage(self.account): + # Hide the Notes page if private storage is not available, because + # roster notes cannot be stored without. + # Since there is no disco mechanism for private storage, we rely on + # Delimiter as a "proxy" for the availability of private storage. self._switcher.set_row_visible('notes', True) def _fill_settings_page(self, contact: BareContact) -> None: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e551b33ee207321fccc91693fd86806… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e551b33ee207321fccc91693fd86806… You're receiving this email because of your account on dev.gajim.org.

1 0

← Newer
1
2
3
4
5
6
7
8
9
10
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2022