Commits July 2018

commits@gajim.org

1 participants
87 discussions

[Git][gajim/gajim][master] Change nbxmpp event we use for XMLConsole
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3e4cf4a0 by Philipp Hörist at 2018-07-07T18:28:43+02:00 Change nbxmpp event we use for XMLConsole - - - - - 1 changed file: - gajim/common/connection.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -510,12 +510,12 @@ class CommonConnection: def _event_dispatcher(self, realm, event, data): if realm == '': - if event == nbxmpp.transports_nb.DATA_RECEIVED: - app.nec.push_incoming_event(StanzaReceivedEvent(None, - conn=self, stanza_str=data)) - elif event == nbxmpp.transports_nb.DATA_SENT: - app.nec.push_incoming_event(StanzaSentEvent(None, conn=self, - stanza_str=data)) + if event == 'STANZA_RECEIVED': + app.nec.push_incoming_event(StanzaReceivedEvent( + None, conn=self, stanza_str=str(data))) + elif event == 'STANZA_SENT': + app.nec.push_incoming_event(StanzaSentEvent( + None, conn=self, stanza_str=str(data))) def change_status(self, show, msg, auto=False): if not msg: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e4cf4a07d3ba872e2fbaa98cf472649d5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3e4cf4a07d3ba872e2fbaa98cf472649d5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add stanza received/sent event
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d022a925 by Philipp Hörist at 2018-07-07T18:19:36+02:00 Add stanza received/sent event We only had a data received/sent event which was enough for a long time because servers used one tcp packet per stanza. Now servers send multiple stanzas in one tcp packet, data received/sent can contain more than one stanza which makes this new event necessary - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -417,6 +417,9 @@ class XMPPDispatcher(PlugIn): #log.info('dispatch called: stanza = %s, session = %s, direct= %s' # % (stanza, session, direct)) + + self.Event('', 'STANZA_RECEIVED', stanza) + if not session: session = self session.Stream._mini_dom = None @@ -571,6 +574,8 @@ class XMPPDispatcher(PlugIn): if self._owner._registered_name and not stanza.getAttr('from'): stanza.setAttr('from', self._owner._registered_name) + self.Event('', 'STANZA_SENT', stanza) + self._owner.Connection.send(stanza, now) # If no ID then it is a whitespace View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d022a925797716b1d59d7e5113… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d022a925797716b1d59d7e5113… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register all available modules automatically
by Philipp Hörist 07 Jul '18

07 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59428d2f by Philipp Hörist at 2018-07-07T13:52:44+02:00 Register all available modules automatically - - - - - 24 changed files: - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/annotations.py - gajim/common/modules/bookmarks.py - gajim/common/modules/entity_time.py - gajim/common/modules/http_auth.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/pep.py - gajim/common/modules/ping.py - gajim/common/modules/pubsub.py - gajim/common/modules/roster_item_exchange.py - gajim/common/modules/search.py - gajim/common/modules/software_version.py - gajim/common/modules/user_activity.py - gajim/common/modules/user_avatar.py - gajim/common/modules/user_location.py - gajim/common/modules/user_mood.py - gajim/common/modules/user_nickname.py - gajim/common/modules/user_tune.py - gajim/common/modules/vcard_avatars.py - gajim/common/modules/vcard_temp.py Changes: ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -61,29 +61,9 @@ from gajim.common import gpg from gajim.common import passwords from gajim.common import i18n from gajim.common import idle -from gajim.common.helpers import ModuleMock -from gajim.common.modules.entity_time import EntityTime -from gajim.common.modules.software_version import SoftwareVersion -from gajim.common.modules.ping import Ping -from gajim.common.modules.search import Search -from gajim.common.modules.annotations import Annotations -from gajim.common.modules.roster_item_exchange import RosterItemExchange -from gajim.common.modules.last_activity import LastActivity -from gajim.common.modules.http_auth import HTTPAuth -from gajim.common.modules.vcard_temp import VCardTemp -from gajim.common.modules.vcard_avatars import VCardAvatars -from gajim.common.modules.pubsub import PubSub -from gajim.common.modules.bookmarks import Bookmarks -from gajim.common.modules.pep import PEP -from gajim.common.modules.user_avatar import UserAvatar -from gajim.common.modules.user_activity import UserActivity -from gajim.common.modules.user_tune import UserTune -from gajim.common.modules.user_mood import UserMood -from gajim.common.modules.user_location import UserLocation -from gajim.common.modules.user_nickname import UserNickname -from gajim.common.modules.httpupload import HTTPUpload from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact +from gajim.common import modules from gajim.gtkgui_helpers import get_action @@ -182,19 +162,7 @@ class CommonConnection: app.ged.raise_event(event, self.name, data) def get_module(self, name): - try: - return self._modules[name] - except KeyError: - return ModuleMock() - - def get_module_handlers(self): - handlers = [] - for module in self._modules.values(): - handlers += module.handlers - return handlers - - def register_module(self, name, cls, *args, **kwargs): - self._modules[name] = cls(*args, **kwargs) + return modules.get(self.name, name) def reconnect(self): """ @@ -661,26 +629,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.sm = Smacks(self) # Stream Management - self.register_module('EntityTime', EntityTime, self) - self.register_module('SoftwareVersion', SoftwareVersion, self) - self.register_module('Ping', Ping, self) - self.register_module('Search', Search, self) - self.register_module('Annotations', Annotations, self) - self.register_module('RosterItemExchange', RosterItemExchange, self) - self.register_module('LastActivity', LastActivity, self) - self.register_module('HTTPAuth', HTTPAuth, self) - self.register_module('VCardTemp', VCardTemp, self) - self.register_module('VCardAvatars', VCardAvatars, self) - self.register_module('PubSub', PubSub, self) - self.register_module('PEP', PEP, self) - self.register_module('Bookmarks', Bookmarks, self) - self.register_module('UserAvatar', UserAvatar, self) - self.register_module('UserActivity', UserActivity, self) - self.register_module('UserTune', UserTune, self) - self.register_module('UserMood', UserMood, self) - self.register_module('UserLocation', UserLocation, self) - self.register_module('UserNickname', UserNickname, self) - self.register_module('HTTPUpload', HTTPUpload, self) + # Register all modules + modules.register(self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) @@ -700,6 +650,8 @@ class Connection(CommonConnection, ConnectionHandlers): def cleanup(self): ConnectionHandlers.cleanup(self) + modules.unregister(self) + app.ged.remove_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) app.ged.remove_event_handler('agent-info-error-received', ged.CORE, @@ -780,6 +732,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.terminate_sessions() self.remove_all_transfers() self.connection.disconnect() + ConnectionHandlers._unregister_handlers(self) self.connection = None def set_oldst(self): # Set old state ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -37,6 +37,7 @@ from gi.repository import GLib import nbxmpp from gajim.common import caps_cache as capscache +from gajim.common import modules from gajim.common import helpers from gajim.common import app from gajim.common import jingle_xtls @@ -1451,5 +1452,9 @@ ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): con.RegisterHandler('iq', self._BlockingResultCB, 'result', nbxmpp.NS_BLOCKING) - for handler in self.get_module_handlers(): + for handler in modules.get_handlers(self): con.RegisterHandler(*handler) + + def _unregister_handlers(self): + for handler in modules.get_handlers(self): + self.connection.UnregisterHandler(*handler) ===================================== gajim/common/helpers.py ===================================== --- a/gajim/common/helpers.py +++ b/gajim/common/helpers.py @@ -165,13 +165,6 @@ class InvalidFormat(Exception): pass -class ModuleMock: - def __getattr__(self, key): - def _mock(self, *args, **kwargs): - return - return _mock - - def decompose_jid(jidstring): user = None server = None ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -0,0 +1,65 @@ +# 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 logging +from importlib import import_module +from pathlib import Path + +log = logging.getLogger('gajim.c.m') + +imported_modules = [] +_modules = {} + +for file in Path(__file__).parent.iterdir(): + if file.stem == '__init__': + continue + + module = import_module('.%s' % file.stem, package='gajim.common.modules') + if hasattr(module, 'get_instance'): + log.info('Load module: %s', file.stem) + imported_modules.append(module) + + +class ModuleMock: + def __getattr__(self, key): + def _mock(self, *args, **kwargs): + return + return _mock + + +def register(con, *args, **kwargs): + if con in _modules: + return + _modules[con.name] = {} + for module in imported_modules: + instance, name = module.get_instance(con, *args, **kwargs) + _modules[con.name][name] = instance + + +def unregister(con): + del _modules[con.name] + + +def get(account, name): + try: + return _modules[account][name] + except KeyError: + return ModuleMock() + + +def get_handlers(con): + handlers = [] + for module in _modules[con.name].values(): + handlers += module.handlers + return handlers ===================================== gajim/common/modules/annotations.py ===================================== --- a/gajim/common/modules/annotations.py +++ b/gajim/common/modules/annotations.py @@ -90,3 +90,7 @@ class Annotations: log.warning('Storing rosternotes failed: %s', stanza.getError()) return log.info('Storing rosternotes successful') + + +def get_instance(*args, **kwargs): + return Annotations(*args, **kwargs), 'Annotations' ===================================== gajim/common/modules/bookmarks.py ===================================== --- a/gajim/common/modules/bookmarks.py +++ b/gajim/common/modules/bookmarks.py @@ -292,3 +292,7 @@ class Bookmarks: class BookmarksReceivedEvent(NetworkIncomingEvent): name = 'bookmarks-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Bookmarks(*args, **kwargs), 'Bookmarks' ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -162,3 +162,7 @@ class contact_tz(datetime.tzinfo): def dst(self, dt): return ZERO + + +def get_instance(*args, **kwargs): + return EntityTime(*args, **kwargs), 'EntityTime' ===================================== gajim/common/modules/http_auth.py ===================================== --- a/gajim/common/modules/http_auth.py +++ b/gajim/common/modules/http_auth.py @@ -75,3 +75,7 @@ class HTTPAuth: class HttpAuthReceivedEvent(NetworkIncomingEvent): name = 'http-auth-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return HTTPAuth(*args, **kwargs), 'HTTPAuth' ===================================== gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/modules/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -436,3 +436,7 @@ class UploadAbortedException(Exception): class HTTPUploadProgressEvent(NetworkIncomingEvent): name = 'httpupload-progress' base_network_events = [] + + +def get_instance(*args, **kwargs): + return HTTPUpload(*args, **kwargs), 'HTTPUpload' ===================================== gajim/common/modules/last_activity.py ===================================== --- a/gajim/common/modules/last_activity.py +++ b/gajim/common/modules/last_activity.py @@ -50,3 +50,7 @@ class LastActivity: self._con.connection.send(iq) raise nbxmpp.NodeProcessed + + +def get_instance(*args, **kwargs): + return LastActivity(*args, **kwargs), 'LastActivity' ===================================== gajim/common/modules/pep.py ===================================== --- a/gajim/common/modules/pep.py +++ b/gajim/common/modules/pep.py @@ -212,3 +212,7 @@ class AbstractPEPData: class PEPReceivedEvent(NetworkIncomingEvent): name = 'pep-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return PEP(*args, **kwargs), 'PEP' ===================================== gajim/common/modules/ping.py ===================================== --- a/gajim/common/modules/ping.py +++ b/gajim/common/modules/ping.py @@ -120,3 +120,7 @@ class PingReplyEvent(NetworkIncomingEvent): class PingErrorEvent(NetworkIncomingEvent): name = 'ping-error' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Ping(*args, **kwargs), 'Ping' ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -254,3 +254,7 @@ class PubSub: class PubSubConfigReceivedEvent(NetworkIncomingEvent): name = 'pubsub-config-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return PubSub(*args, **kwargs), 'PubSub' ===================================== gajim/common/modules/roster_item_exchange.py ===================================== --- a/gajim/common/modules/roster_item_exchange.py +++ b/gajim/common/modules/roster_item_exchange.py @@ -121,3 +121,7 @@ class RosterItemExchange: class RosterItemExchangeEvent(NetworkIncomingEvent): name = 'roster-item-exchange-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return RosterItemExchange(*args, **kwargs), 'RosterItemExchange' ===================================== gajim/common/modules/search.py ===================================== --- a/gajim/common/modules/search.py +++ b/gajim/common/modules/search.py @@ -112,3 +112,7 @@ class SearchFormReceivedEvent(NetworkIncomingEvent): class SearchResultReceivedEvent(NetworkIncomingEvent): name = 'search-result-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return Search(*args, **kwargs), 'Search' ===================================== gajim/common/modules/software_version.py ===================================== --- a/gajim/common/modules/software_version.py +++ b/gajim/common/modules/software_version.py @@ -104,3 +104,7 @@ class VersionResultReceivedEvent(NetworkIncomingEvent): def generate(self): return True + + +def get_instance(*args, **kwargs): + return SoftwareVersion(*args, **kwargs), 'SoftwareVersion' ===================================== gajim/common/modules/user_activity.py ===================================== --- a/gajim/common/modules/user_activity.py +++ b/gajim/common/modules/user_activity.py @@ -99,3 +99,7 @@ class UserActivity(AbstractPEPModule): i = item.addChild('text') i.addData(message) return item + + +def get_instance(*args, **kwargs): + return UserActivity(*args, **kwargs), 'UserActivity' ===================================== gajim/common/modules/user_avatar.py ===================================== --- a/gajim/common/modules/user_avatar.py +++ b/gajim/common/modules/user_avatar.py @@ -152,3 +152,7 @@ class UserAvatar(AbstractPEPModule): def retract(self): # Not implemented yet return + + +def get_instance(*args, **kwargs): + return UserAvatar(*args, **kwargs), 'UserAvatar' ===================================== gajim/common/modules/user_location.py ===================================== --- a/gajim/common/modules/user_location.py +++ b/gajim/common/modules/user_location.py @@ -83,3 +83,7 @@ class UserLocation(AbstractPEPModule): if data.get(field, False): item.addChild(field, payload=data[field]) return item + + +def get_instance(*args, **kwargs): + return UserLocation(*args, **kwargs), 'UserLocation' ===================================== gajim/common/modules/user_mood.py ===================================== --- a/gajim/common/modules/user_mood.py +++ b/gajim/common/modules/user_mood.py @@ -86,3 +86,7 @@ class UserMood(AbstractPEPModule): if text: item.addChild('text', payload=text) return item + + +def get_instance(*args, **kwargs): + return UserMood(*args, **kwargs), 'UserMood' ===================================== gajim/common/modules/user_nickname.py ===================================== --- a/gajim/common/modules/user_nickname.py +++ b/gajim/common/modules/user_nickname.py @@ -76,3 +76,7 @@ class UserNickname(AbstractPEPModule): else: app.nicks[self._account] = app.config.get_per( 'accounts', self._account, 'name') + + +def get_instance(*args, **kwargs): + return UserNickname(*args, **kwargs), 'UserNickname' ===================================== gajim/common/modules/user_tune.py ===================================== --- a/gajim/common/modules/user_tune.py +++ b/gajim/common/modules/user_tune.py @@ -96,3 +96,7 @@ class UserTune(AbstractPEPModule): if length: item.addChild('length', payload=length) return item + + +def get_instance(*args, **kwargs): + return UserTune(*args, **kwargs), 'UserTune' ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -190,3 +190,7 @@ class VCardAvatars: node.getTo() or own_jid, sha or 'no sha advertised') update.setTagData('photo', sha) return node + + +def get_instance(*args, **kwargs): + return VCardAvatars(*args, **kwargs), 'VCardAvatars' ===================================== gajim/common/modules/vcard_temp.py ===================================== --- a/gajim/common/modules/vcard_temp.py +++ b/gajim/common/modules/vcard_temp.py @@ -306,3 +306,7 @@ class VcardNotPublishedEvent(NetworkIncomingEvent): class VcardReceivedEvent(NetworkIncomingEvent): name = 'vcard-received' base_network_events = [] + + +def get_instance(*args, **kwargs): + return VCardTemp(*args, **kwargs), 'VCardTemp' View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59428d2f2fd3fad2614cd82fe41e94c8c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/59428d2f2fd3fad2614cd82fe41e94c8c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Move httpupload into modules
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4bcdbde2 by Philipp Hörist at 2018-07-07T01:49:50+02:00 Move httpupload into modules - - - - - 09aead3e by Philipp Hörist at 2018-07-07T01:49:50+02:00 Remove unused imports - - - - - 3a3b3224 by Philipp Hörist at 2018-07-07T01:49:50+02:00 Fix requesting pubsub node config Regression from refactoring - - - - - 11 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - gajim/common/httpupload.py → gajim/common/modules/httpupload.py - gajim/common/modules/pubsub.py - gajim/config.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/server_info.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -274,6 +274,7 @@ class ChatControl(ChatControlBase): def update_actions(self): win = self.parent_win.window online = app.account_is_connected(self.account) + con = app.connections[self.account] # Add to roster if not isinstance(self.contact, GC_Contact) \ @@ -297,7 +298,7 @@ class ChatControl(ChatControlBase): httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and app.connections[self.account].httpupload) + online and con.get_module('HTTPUpload').available) # Send file (Jingle) jingle_conditions = ( ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -759,19 +759,19 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # groupchat only supports httpupload on drag and drop if httpupload.get_enabled(): # use httpupload - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session, groupchat=True) else: if httpupload.get_enabled() and jingle.get_enabled(): if ft_pref == 'httpupload': - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session) else: ft = app.interface.instances['file_transfers'] ft.send_file(self.account, contact, path) elif httpupload.get_enabled(): - con.check_file_before_transfer( + con.get_module('HTTPUpload').check_file_before_transfer( path, self.encryption, contact, self.session) elif jingle.get_enabled(): ft = app.interface.instances['file_transfers'] ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -32,14 +32,12 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os import sys import random import socket import operator import string import time -import locale import hmac import hashlib import json @@ -83,6 +81,7 @@ from gajim.common.modules.user_tune import UserTune from gajim.common.modules.user_mood import UserMood from gajim.common.modules.user_location import UserLocation from gajim.common.modules.user_nickname import UserNickname +from gajim.common.modules.httpupload import HTTPUpload from gajim.common.connection_handlers import * from gajim.common.contacts import GC_Contact from gajim.gtkgui_helpers import get_action @@ -681,6 +680,7 @@ class Connection(CommonConnection, ConnectionHandlers): self.register_module('UserMood', UserMood, self) self.register_module('UserLocation', UserLocation, self) self.register_module('UserNickname', UserNickname, self) + self.register_module('HTTPUpload', HTTPUpload, self) app.ged.register_event_handler('privacy-list-received', ged.CORE, self._nec_privacy_list_received) ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -28,14 +28,9 @@ ## along with Gajim. If not, see <http://www.gnu.org/licenses/>. ## -import os -import base64 -import binascii import operator -import hashlib -from time import (altzone, daylight, gmtime, localtime, strftime, - time as time_time, timezone, tzname) +from time import time as time_time from gi.repository import GLib @@ -44,20 +39,16 @@ from gajim.common import caps_cache as capscache from gajim.common import helpers from gajim.common import app -from gajim.common import dataforms from gajim.common import jingle_xtls -from gajim.common import configpaths from gajim.common.caps_cache import muc_caps_cache from gajim.common.commands import ConnectionCommands from gajim.common.protocol.caps import ConnectionCaps from gajim.common.protocol.bytestream import ConnectionSocks5Bytestream from gajim.common.protocol.bytestream import ConnectionIBBytestream from gajim.common.message_archiving import ConnectionArchive313 -from gajim.common.httpupload import ConnectionHTTPUpload from gajim.common.connection_handlers_events import * from gajim.common import ged -from gajim.common import nec from gajim.common.nec import NetworkEvent from gajim.common.const import KindConstant @@ -72,7 +63,6 @@ METACONTACTS_ARRIVED = 'metacontacts_arrived' ROSTER_ARRIVED = 'roster_arrived' DELIMITER_ARRIVED = 'delimiter_arrived' PRIVACY_ARRIVED = 'privacy_arrived' -PEP_CONFIG = 'pep_config' class ConnectionDisco: @@ -754,14 +744,12 @@ class ConnectionHandlersBase: class ConnectionHandlers(ConnectionArchive313, ConnectionSocks5Bytestream, ConnectionDisco, ConnectionCommands, ConnectionCaps, -ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream, -ConnectionHTTPUpload): +ConnectionHandlersBase, ConnectionJingle, ConnectionIBBytestream): def __init__(self): ConnectionArchive313.__init__(self) ConnectionSocks5Bytestream.__init__(self) ConnectionIBBytestream.__init__(self) ConnectionCommands.__init__(self) - ConnectionHTTPUpload.__init__(self) # Handle presences BEFORE caps app.nec.register_incoming_event(PresenceReceivedEvent) @@ -819,7 +807,6 @@ ConnectionHTTPUpload): ConnectionHandlersBase.cleanup(self) ConnectionCaps.cleanup(self) ConnectionArchive313.cleanup(self) - ConnectionHTTPUpload.cleanup(self) app.ged.remove_event_handler('roster-set-received', ged.CORE, self._nec_roster_set_received) app.ged.remove_event_handler('roster-received', ged.CORE, @@ -944,21 +931,6 @@ ConnectionHTTPUpload): # connection process, we don't take the risk self.privacy_rules_supported = False self._continue_connection_request_privacy() - elif self.awaiting_answers[id_][0] == PEP_CONFIG: - del self.awaiting_answers[id_] - if iq_obj.getType() == 'error': - return - if not iq_obj.getTag('pubsub'): - return - conf = iq_obj.getTag('pubsub').getTag('configure') - if not conf: - return - node = conf.getAttr('node') - form_tag = conf.getTag('x', namespace=nbxmpp.NS_DATA) - if form_tag: - form = dataforms.ExtendForm(node=form_tag) - app.nec.push_incoming_event(PEPConfigReceivedEvent(None, - conn=self, node=node, form=form)) def _nec_iq_error_received(self, obj): if obj.conn.name != self.name: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -1822,10 +1822,6 @@ class UpdateRoomAvatarEvent(nec.NetworkIncomingEvent): def generate(self): return True -class PEPConfigReceivedEvent(nec.NetworkIncomingEvent): - name = 'pep-config-received' - base_network_events = [] - class MetacontactsReceivedEvent(nec.NetworkIncomingEvent): name = 'metacontacts-received' base_network_events = [] @@ -2545,17 +2541,3 @@ class BlockingEvent(nec.NetworkIncomingEvent): app.log('blocking').info( 'Blocking Push - unblocked JIDs: %s', self.unblocked_jids) return True - -class HTTPUploadStartEvent(nec.NetworkIncomingEvent): - name = 'httpupload-start' - base_network_events = [] - - def generate(self): - return True - -class HTTPUploadProgressEvent(nec.NetworkIncomingEvent): - name = 'httpupload-progress' - base_network_events = [] - - def generate(self): - return True \ No newline at end of file ===================================== gajim/common/httpupload.py → gajim/common/modules/httpupload.py ===================================== --- a/gajim/common/httpupload.py +++ b/gajim/common/modules/httpupload.py @@ -1,5 +1,3 @@ -# -*- coding: utf-8 -*- -# # This file is part of Gajim. # # Gajim is free software; you can redistribute it and/or modify @@ -14,13 +12,16 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +# XEP-0363: HTTP File Upload + + import os import sys import threading import ssl import urllib from urllib.request import Request, urlopen -from urllib.parse import urlparse, quote +from urllib.parse import urlparse import io import mimetypes import logging @@ -31,26 +32,28 @@ from gi.repository import GLib from gajim.common import app from gajim.common import ged +from gajim.common.nec import NetworkIncomingEvent from gajim.common.connection_handlers_events import InformationEvent -from gajim.common.connection_handlers_events import HTTPUploadProgressEvent from gajim.common.connection_handlers_events import MessageOutgoingEvent from gajim.common.connection_handlers_events import GcMessageOutgoingEvent if sys.platform in ('win32', 'darwin'): import certifi -log = logging.getLogger('gajim.c.httpupload') +log = logging.getLogger('gajim.c.m.httpupload') + NS_HTTPUPLOAD_0 = NS_HTTPUPLOAD + ':0' -class ConnectionHTTPUpload: - """ - Implement HTTP File Upload - (XEP-0363, https://xmpp.org/extensions/xep-0363.html) - """ - def __init__(self): - self.httpupload = False - self.encrypted_upload = False + +class HTTPUpload: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [] + + self.available = False self.component = None self.httpupload_namespace = None self._allowed_headers = ['Authorization', 'Cookie', 'Expires'] @@ -81,7 +84,7 @@ class ConnectionHTTPUpload: def handle_agent_info_received(self, event): account = event.conn.name - if account != self.name: + if account != self._account: return if not app.jid_is_transport(event.jid): @@ -112,14 +115,14 @@ class ConnectionHTTPUpload: log.warning('%s does not provide maximum file size', account) else: log.info('%s has a maximum file size of: %s MiB', - account, self.max_file_size/(1024*1024)) + account, self.max_file_size / (1024 * 1024)) - self.httpupload = True - for ctrl in app.interface.msg_win_mgr.get_controls(acct=self.name): + self.available = True + for ctrl in app.interface.msg_win_mgr.get_controls(acct=self._account): ctrl.update_actions() def handle_outgoing_stanza(self, event): - if event.conn.name != self.name: + if event.conn.name != self._account: return message = event.msg_iq.getTagData('body') if message and message in self.messages: @@ -177,9 +180,9 @@ class ConnectionHTTPUpload: return if encryption is not None: - app.interface.encrypt_file(file, self.request_slot) + app.interface.encrypt_file(file, self._request_slot) else: - self.request_slot(file) + self._request_slot(file) @staticmethod def raise_progress_event(status, file, seen=None, total=None): @@ -191,13 +194,13 @@ class ConnectionHTTPUpload: app.nec.push_incoming_event(InformationEvent( None, dialog_name=dialog_name, args=args)) - def request_slot(self, file): + def _request_slot(self, file): GLib.idle_add(self.raise_progress_event, 'request', file) iq = self._build_request(file) log.info("Sending request for slot") - app.connections[self.name].connection.SendAndCallForResponse( - iq, self.received_slot, {'file': file}) - + self._con.connection.SendAndCallForResponse( + iq, self._received_slot, {'file': file}) + def _build_request(self, file): iq = nbxmpp.Iq(typ='get', to=self.component) id_ = app.get_an_id() @@ -230,7 +233,7 @@ class ConnectionHTTPUpload: return stanza.getErrorMsg() - def received_slot(self, conn, stanza, file): + def _received_slot(self, conn, stanza, file): log.info("Received slot") if stanza.getType() == 'error': self.raise_progress_event('close', file) @@ -279,11 +282,11 @@ class ConnectionHTTPUpload: log.info('Uploading file to %s', file.put) log.info('Please download from %s', file.get) - thread = threading.Thread(target=self.upload_file, args=(file,)) + thread = threading.Thread(target=self._upload_file, args=(file,)) thread.daemon = True thread.start() - def upload_file(self, file): + def _upload_file(self, file): GLib.idle_add(self.raise_progress_event, 'upload', file) try: file.headers['User-Agent'] = 'Gajim %s' % app.version @@ -294,7 +297,7 @@ class ConnectionHTTPUpload: file.put, data=file.stream, headers=file.headers, method='PUT') log.info("Opening Urllib upload request...") - if not app.config.get_per('accounts', self.name, 'httpupload_verify'): + if not app.config.get_per('accounts', self._account, 'httpupload_verify'): context = ssl.create_default_context() context.check_hostname = False context.verify_mode = ssl.CERT_NONE @@ -309,7 +312,7 @@ class ConnectionHTTPUpload: file.stream.close() log.info('Urllib upload request done, response code: %s', transfer.getcode()) - GLib.idle_add(self.upload_complete, transfer.getcode(), file) + GLib.idle_add(self._upload_complete, transfer.getcode(), file) return except UploadAbortedException as exc: log.info(exc) @@ -326,9 +329,9 @@ class ConnectionHTTPUpload: log.exception("Exception during upload") error_msg = exc GLib.idle_add(self.raise_progress_event, 'close', file) - GLib.idle_add(self.on_upload_error, file, error_msg) + GLib.idle_add(self._on_upload_error, file, error_msg) - def upload_complete(self, response_code, file): + def _upload_complete(self, response_code, file): self.raise_progress_event('close', file) if 200 <= response_code < 300: log.info("Upload completed successfully") @@ -341,12 +344,12 @@ class ConnectionHTTPUpload: if file.groupchat: app.nec.push_outgoing_event(GcMessageOutgoingEvent( - None, account=self.name, jid=file.contact.jid, + None, account=self._account, jid=file.contact.jid, message=message, automatic_message=False, session=file.session)) else: app.nec.push_outgoing_event(MessageOutgoingEvent( - None, account=self.name, jid=file.contact.jid, + None, account=self._account, jid=file.contact.jid, message=message, keyID=file.keyID, type_='chat', automatic_message=False, session=file.session)) @@ -356,7 +359,7 @@ class ConnectionHTTPUpload: self.raise_information_event('httpupload-response-error', response_code) - def on_upload_error(self, file, reason): + def _on_upload_error(self, file, reason): self.raise_progress_event('close', file) self.raise_information_event('httpupload-error', str(reason)) @@ -428,3 +431,8 @@ class StreamFileWithProgress: class UploadAbortedException(Exception): def __str__(self): return "Upload Aborted" + + +class HTTPUploadProgressEvent(NetworkIncomingEvent): + name = 'httpupload-progress' + base_network_events = [] ===================================== gajim/common/modules/pubsub.py ===================================== --- a/gajim/common/modules/pubsub.py +++ b/gajim/common/modules/pubsub.py @@ -25,6 +25,8 @@ import logging import nbxmpp from gajim.common import app +from gajim.common import dataforms +from gajim.common.nec import NetworkIncomingEvent log = logging.getLogger('gajim.c.m.pubsub') @@ -185,7 +187,7 @@ class PubSub: self._con.connection.SendAndCallForResponse(query, cb) - def send_pb_configure(self, jid, node, form, cb=None): + def send_pb_configure(self, jid, node, form, cb=None, **kwargs): if not app.account_is_connected(self._account): return @@ -197,21 +199,58 @@ class PubSub: c = c.addChild('configure', {'node': node}) c.addChild(node=form) - self._con.connection.SendAndCallForResponse(query, cb) + log.info('Send node config for %s', node) + self._con.connection.SendAndCallForResponse(query, cb, kwargs) - def request_pb_configuration(self, jid, node, cb=None): + def request_pb_configuration(self, jid, node): if not app.account_is_connected(self._account): return - if cb is None: - cb = self._default_callback - query = nbxmpp.Iq('get', to=jid) e = query.addChild('pubsub', namespace=nbxmpp.NS_PUBSUB_OWNER) e = e.addChild('configure', {'node': node}) - self._con.connection.SendAndCallForResponse(query, cb) + log.info('Request node config for %s', node) + self._con.connection.SendAndCallForResponse( + query, self._received_pb_configuration, {'node': node}) + + def _received_pb_configuration(self, conn, stanza, node): + if not nbxmpp.isResultNode(stanza): + log.warning('Error: %s', stanza.getError()) + return + + pubsub = stanza.getTag('pubsub', namespace=nbxmpp.NS_PUBSUB_OWNER) + if pubsub is None: + log.warning('Malformed PubSub configure ' + 'stanza (no pubsub node): %s', stanza) + return + + configure = pubsub.getTag('configure') + if configure is None: + log.warning('Malformed PubSub configure ' + 'stanza (no configure node): %s', stanza) + return + + if configure.getAttr('node') != node: + log.warning('Malformed PubSub configure ' + 'stanza (wrong node): %s', stanza) + return + + form = configure.getTag('x', namespace=nbxmpp.NS_DATA) + if form is None: + log.warning('Malformed PubSub configure ' + 'stanza (no form): %s', stanza) + return + + app.nec.push_incoming_event(PubSubConfigReceivedEvent( + None, conn=self._con, node=node, + form=dataforms.ExtendForm(node=form))) def _default_callback(self, conn, stanza, *args, **kwargs): if not nbxmpp.isResultNode(stanza): log.warning('Error: %s', stanza.getError()) + + +class PubSubConfigReceivedEvent(NetworkIncomingEvent): + name = 'pubsub-config-received' + base_network_events = [] ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -2839,7 +2839,7 @@ class ManagePEPServicesWindow: self.xml.get_object('services_treeview').get_selection().connect( 'changed', self.on_services_selection_changed) - app.ged.register_event_handler('pep-config-received', ged.GUI1, + app.ged.register_event_handler('pubsub-config-received', ged.GUI1, self._nec_pep_config_received) app.ged.register_event_handler('agent-items-received', ged.GUI1, self._nec_agent_items_received) @@ -2849,7 +2849,7 @@ class ManagePEPServicesWindow: def on_manage_pep_services_window_destroy(self, widget): '''close window''' del app.interface.instances[self.account]['pep_services'] - app.ged.remove_event_handler('pep-config-received', ged.GUI1, + app.ged.remove_event_handler('pubsub-config-received', ged.GUI1, self._nec_pep_config_received) app.ged.remove_event_handler('agent-items-received', ged.GUI1, self._nec_agent_items_received) ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -574,6 +574,7 @@ class GroupchatControl(ChatControlBase): contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) online = app.gc_connected[self.account][self.room_jid] + con = app.connections[self.account] # Destroy Room win.lookup_action('destroy-' + self.control_id).set_enabled( @@ -615,7 +616,7 @@ class GroupchatControl(ChatControlBase): httpupload = win.lookup_action( 'send-file-httpupload-' + self.control_id) httpupload.set_enabled( - online and app.connections[self.account].httpupload) + online and con.get_module('HTTPUpload').available) win.lookup_action('send-file-' + self.control_id).set_enabled( httpupload.get_enabled()) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -93,8 +93,9 @@ from gajim.common import passwords from gajim.common import logging_helpers from gajim.common.connection_handlers_events import ( OurShowEvent, FileRequestErrorEvent, FileTransferCompletedEvent, - UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent, - HTTPUploadProgressEvent) + UpdateRosterAvatarEvent, UpdateGCAvatarEvent, UpdateRoomAvatarEvent) + +from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp from gajim import emoticons @@ -1142,11 +1143,12 @@ class Interface: con = app.connections[chat_control.account] groupchat = chat_control.type_id == message_control.TYPE_GC for path in paths: - con.check_file_before_transfer(path, - chat_control.encryption, - chat_control.contact, - chat_control.session, - groupchat) + con.get_module('HTTPUpload').check_file_before_transfer( + path, + chat_control.encryption, + chat_control.contact, + chat_control.session, + groupchat) def encrypt_file(self, file, callback): app.nec.push_incoming_event(HTTPUploadProgressEvent( ===================================== gajim/server_info.py ===================================== --- a/gajim/server_info.py +++ b/gajim/server_info.py @@ -177,7 +177,8 @@ class ServerInfoDialog(Gtk.Dialog): con.archiving_namespace, con.archiving_namespace, mam_enabled), Feature('XEP-0363: HTTP File Upload', - con.httpupload, con.httpupload_namespace, None)] + con.get_module('HTTPUpload').available, + con.get_module('HTTPUpload').httpupload_namespace, None)] def add_info(self, info): self.info_listbox.add(ServerInfoItem(info)) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0eeb111a02d23fd3dfc39f7e40620fb76… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/0eeb111a02d23fd3dfc39f7e40620fb76… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework Add Contact Dialog
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 0eeb111a by Sophie Herold at 2018-07-07T00:46:23+02:00 Rework Add Contact Dialog - - - - - 3 changed files: - gajim/app_actions.py - gajim/data/gui/add_new_contact_window.ui - gajim/dialogs.py Changes: ===================================== gajim/app_actions.py ===================================== --- a/gajim/app_actions.py +++ b/gajim/app_actions.py @@ -134,7 +134,11 @@ def on_join_gc(action, param): def on_add_contact(action, param): - dialogs.AddNewContactWindow(param.get_string()) + window = app.get_app_window(dialogs.AddNewContactWindow) + if window is None: + dialogs.AddNewContactWindow(param.get_string()) + else: + window.present() def on_single_message(action, param): ===================================== gajim/data/gui/add_new_contact_window.ui ===================================== --- a/gajim/data/gui/add_new_contact_window.ui +++ b/gajim/data/gui/add_new_contact_window.ui @@ -1,132 +1,234 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkListStore" id="groups_liststore"> <columns>  <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore2"> + <object class="GtkTextBuffer" id="message_textbuffer"> + <property name="text" translatable="yes">I would like to add you to my contact list.</property> + <signal name="end-user-action" handler="on_message_textbuffer_changed" swapped="no"/> + </object> + <object class="GtkListStore" id="protocol"> <columns> -  +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  <column type="gchararray"/> </columns> </object> - <object class="GtkListStore" id="liststore3"> + <object class="GtkListStore" id="protocol_jid"> <columns>  <column type="gchararray"/> </columns> </object> - <object class="GtkTextBuffer" id="textbuffer1"> - <property name="text" translatable="yes">I would like to add you to my contact list.</property> - </object> - <object class="GtkWindow" id="add_new_contact_window"> + <object class="GtkBox" id="add_contact_box"> + <property name="width_request">400</property> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="title" translatable="yes">Add New Contact</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_add_new_contact_window_destroy" swapped="no"/> - <signal name="key-press-event" handler="on_add_new_contact_window_key_press_event" swapped="no"/> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <property name="baseline_position">top</property> <child> - <object class="GtkBox" id="vbox8"> + <object class="GtkLabel" id="prompt_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="halign">center</property> + <property name="margin_top">18</property> + <property name="use_markup">True</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkGrid"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="prompt_label"> + <object class="GtkLabel" id="uid_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="use_markup">True</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Jabber ID</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="nickname_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Nickname</property> + <property name="use_underline">True</property> + <property name="xalign">0.03999999910593033</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="group_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Group</property> + <property name="use_underline">True</property> <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="uid_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">user(a)example.org</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nickname_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkBox" id="account_hbox"> + <object class="GtkComboBoxText" id="group_comboboxentry"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="account_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">A_ccount:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry" id="comboboxtext-entry"> + <property name="can_focus">True</property> + <property name="activates_default">True</property> + <property name="placeholder_text" translatable="yes">Choose or type new group name</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="account_combobox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="model">liststore3</property> - <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> - <child> - <object class="GtkCellRendererText" id="cellrenderertext3"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <placeholder/> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkBox" id="protocol_hbox"> + <object class="GtkLabel" id="account_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="protocol_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Protocol:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="halign">end</property> + <property name="margin_bottom">12</property> + <property name="label" translatable="yes">A_ccount</property> + <property name="use_underline">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="protocol_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Protocol</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> <child> <object class="GtkComboBox" id="protocol_combobox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="model">protocol</property> <signal name="changed" handler="on_protocol_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererPixbuf"/> + <attributes> + <attribute name="icon-name">1</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText"> + <property name="xpad">5</property> + </object> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -134,7 +236,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="no_show_all">True</property> - <property name="model">liststore2</property> + <property name="model">protocol_jid</property> <signal name="changed" handler="on_protocol_jid_combobox_changed" swapped="no"/> <child> <object class="GtkCellRendererText" id="cellrenderertext2"/> @@ -146,285 +248,224 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkGrid" id="subscription_table"> + <object class="GtkComboBox" id="account_combobox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">6</property> - <child> - <object class="GtkLabel" id="uid_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_User ID:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label188"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Nickname:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="label223"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Group:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> + <property name="margin_bottom">12</property> + <property name="model">account_liststore</property> + <property name="entry_text_column">1</property> + <property name="id_column">0</property> + <signal name="changed" handler="on_account_combobox_changed" swapped="no"/> <child> - <object class="GtkEntry" id="uid_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Type User ID</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nickname_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="activates_default">True</property> - <property name="placeholder_text" translatable="yes">Type Nickname</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="group_comboboxentry"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry" id="comboboxtext-entry"> - <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Choose a group of type a new group</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> + <object class="GtkCellRendererText" id="cellrenderertext3"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> </child> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="auto_authorize_checkbutton"> - <property name="label" translatable="yes">A_llow this contact to view my status</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="no_show_all">True</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="active">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="padding">18</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="auto_authorize_checkbutton"> + <property name="label" translatable="yes">A_llow contact to view my status</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">False</property> + <property name="no_show_all">True</property> + <property name="halign">start</property> + <property name="use_underline">True</property> + <property name="active">True</property> + <property name="draw_indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="message_scrolledwindow"> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="margin_top">18</property> + <property name="shadow_type">etched-in</property> + <property name="min_content_height">5</property> <child> - <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="height_request">60</property> + <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="border_width">6</property> - <property name="shadow_type">etched-in</property> - <property name="min_content_height">5</property> - <child> - <object class="GtkTextView" id="message_textview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word</property> - <property name="buffer">textbuffer1</property> - </object> - </child> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + <property name="buffer">message_textbuffer</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkRevealer" id="save_message_revealer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="transition_type">crossfade</property> <child> <object class="GtkCheckButton" id="save_message_checkbutton"> <property name="label" translatable="yes">_Save subscription message</property> - <property name="use_action_appearance">False</property> <property name="visible">True</property> <property name="can_focus">True</property> <property name="receives_default">False</property> + <property name="halign">start</property> <property name="use_underline">True</property> - <property name="xalign">0</property> <property name="draw_indicator">True</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">6</property> - </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkBox" id="register_hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="register_hbox"> + <object class="GtkLabel" id="label224"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label224"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">You have to register with this transport + <property name="label" translatable="yes">You have to register with this transport to be able to add a contact from this protocol. Click on Register button to proceed.</property> - <property name="wrap">True</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="register_button"> - <property name="label" translatable="yes">_Register</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="on_register_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="wrap">True</property> + <property name="xalign">0</property> </object> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkLabel" id="connected_label"> + <object class="GtkButton" id="register_button"> + <property name="label" translatable="yes">_Register</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">You must be connected to the transport to be able + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="halign">center</property> + <property name="valign">center</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="on_register_button_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="padding">18</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="connected_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="label" translatable="yes">You must be connected to the transport to be able to add a contact from this protocol.</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkButtonBox" id="hbuttonbox1"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">18</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">gtk-cancel</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">8</property> + <property name="position">0</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="add_button"> + <property name="label">gtk-add</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">5</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label">gtk-cancel</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_cancel_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="add_button"> - <property name="label">gtk-add</property> - <property name="use_action_appearance">False</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="on_add_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="can_default">True</property> + <property name="receives_default">False</property> + <property name="use_stock">True</property> + <signal name="clicked" handler="on_add_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">9</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">9</property> + </packing> </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -845,64 +845,63 @@ class ChangeStatusMessageDialog(TimeoutDialog): ChangeMoodDialog(on_response, self.pep_dict['mood'], self.pep_dict['mood_text']) -class AddNewContactWindow: +class AddNewContactWindow(Gtk.ApplicationWindow): """ Class for AddNewContactWindow """ - uid_labels = {'jabber': _('JID:'), - 'gadu-gadu': _('GG Number:'), - 'icq': _('ICQ Number:')} + uid_labels = {'jabber': _('Jabber ID'), + 'gadu-gadu': _('GG Number'), + 'icq': _('ICQ Number')} def __init__(self, account=None, jid=None, user_nick=None, group=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_resizable(False) + self.set_title(_('Add Contact')) + + self.connect('destroy', self.on_add_new_contact_window_destroy) + self.connect('key-press-event', self.on_add_new_contact_window_key_press_event) + self.account = account self.adding_jid = False - if account is None: - # fill accounts with active accounts - accounts = [] - for account in app.connections.keys(): - if account == 'Local': - continue - if app.connections[account].connected > 1: - accounts.append(account) - if not accounts: - return - if len(accounts) == 1: - self.account = account - else: - accounts = [self.account] - if self.account: - location = app.interface.instances[self.account] - else: - location = app.interface.instances - if 'add_contact' in location: - location['add_contact'].window.present() - # An instance is already opened + + # fill accounts with active accounts + accounts = app.get_enabled_accounts_with_labels() + + if not accounts: return - location['add_contact'] = self + + if not account: + self.account = accounts[0][0] + self.xml = gtkgui_helpers.get_gtk_builder('add_new_contact_window.ui') + self.add(self.xml.get_object('add_contact_box')) self.xml.connect_signals(self) - self.window = self.xml.get_object('add_new_contact_window') - for w in ('account_combobox', 'account_hbox', 'account_label', + + for w in ('account_combobox', 'account_label', 'prompt_label', 'uid_label', 'uid_entry', 'protocol_combobox', 'protocol_jid_combobox', - 'protocol_hbox', 'nickname_entry', 'message_scrolledwindow', - 'save_message_checkbutton', 'register_hbox', 'subscription_table', + 'protocol_label', 'nickname_entry', 'message_scrolledwindow', + 'save_message_checkbutton', 'register_hbox', 'add_button', 'message_textview', 'connected_label', - 'group_comboboxentry', 'auto_authorize_checkbutton'): + 'group_comboboxentry', 'auto_authorize_checkbutton', + 'save_message_revealer', 'nickname_label', 'group_label'): self.__dict__[w] = self.xml.get_object(w) - if account and len(app.connections) >= 2: - self.default_desc = _('Please fill in the data of the contact you want ' - 'to add to your account <b>%s</b>') % account - else: - self.default_desc = _('Please fill in the data of the contact you ' - 'want to add') - self.xml.get_object('prompt_label').set_markup(self.default_desc) + + self.subscription_table = [self.uid_label, self.uid_entry, + self.nickname_label, self.nickname_entry, + self.group_label, self.group_comboboxentry] + + self.add_button.grab_default() + self.agents = {'jabber': []} self.gateway_prompt = {} # types to which we are not subscribed but account has an agent for it self.available_types = [] for acct in accounts: - for j in app.contacts.get_jid_list(acct): + for j in app.contacts.get_jid_list(acct[0]): if app.jid_is_transport(j): type_ = app.get_transport_name_from_jid(j, False) if not type_: @@ -914,28 +913,20 @@ class AddNewContactWindow: self.gateway_prompt[j] = {'desc': None, 'prompt': None} # Now add the one to which we can register for acct in accounts: - for type_ in app.connections[acct].available_transports: + for type_ in app.connections[acct[0]].available_transports: if type_ in self.agents: continue self.agents[type_] = [] - for jid_ in app.connections[acct].available_transports[type_]: + for jid_ in app.connections[acct[0]].available_transports[type_]: if not jid_ in self.agents[type_]: self.agents[type_].append(jid_) self.gateway_prompt[jid_] = {'desc': None, 'prompt': None} self.available_types.append(type_) - # Combobox with transport/jabber icons - liststore = Gtk.ListStore(str, str, str) - cell = Gtk.CellRendererPixbuf() - self.protocol_combobox.pack_start(cell, False) - self.protocol_combobox.add_attribute(cell, 'icon_name', 1) - cell = Gtk.CellRendererText() - cell.set_property('xpad', 5) - self.protocol_combobox.pack_start(cell, True) - self.protocol_combobox.add_attribute(cell, 'text', 0) - self.protocol_combobox.set_model(liststore) + uf_type = {'jabber': 'XMPP', 'gadu-gadu': 'Gadu Gadu', 'icq': 'ICQ'} # Jabber as first + liststore = self.protocol_combobox.get_model() liststore.append(['XMPP', 'xmpp', 'jabber']) for type_ in self.agents: if type_ == 'jabber': @@ -950,8 +941,7 @@ class AddNewContactWindow: app.connections[account].request_gateway_prompt(service) self.protocol_combobox.set_active(0) self.auto_authorize_checkbutton.show() - liststore = Gtk.ListStore(str) - self.protocol_jid_combobox.set_model(liststore) + if jid: self.jid_escaped = True type_ = app.get_transport_name_from_jid(jid) @@ -992,7 +982,7 @@ class AddNewContactWindow: self.uid_entry.grab_focus() group_names = [] for acct in accounts: - for g in app.groups[acct].keys(): + for g in app.groups[acct[0]].keys(): if g not in helpers.special_groups and g not in group_names: group_names.append(g) group_names.sort() @@ -1003,21 +993,25 @@ class AddNewContactWindow: self.group_comboboxentry.set_active(i) i += 1 - self.window.set_transient_for(app.interface.roster.window) - self.window.show_all() + self.show_all() - if self.account: - self.account_label.hide() - self.account_hbox.hide() + self.prompt_label.hide() + self.save_message_revealer.hide() + + if len(accounts) > 1: + liststore = self.account_combobox.get_model() + for acc in accounts: + liststore.append(acc) + + self.account_combobox.set_active_id(self.account) else: - liststore = Gtk.ListStore(str, str) - for acct in accounts: - liststore.append([acct, acct]) - self.account_combobox.set_model(liststore) - self.account_combobox.set_active(0) + self.account_label.hide() + self.account_combobox.hide() if len(self.agents) == 1: - self.protocol_hbox.hide() + self.protocol_label.hide() + self.protocol_combobox.hide() + self.protocol_jid_combobox.hide() if self.account: message_buffer = self.message_textview.get_buffer() @@ -1031,15 +1025,10 @@ class AddNewContactWindow: self._nec_presence_received) def on_add_new_contact_window_destroy(self, widget): - if self.account: - location = app.interface.instances[self.account] - else: - location = app.interface.instances - del location['add_contact'] app.ged.remove_event_handler('presence-received', ged.GUI1, - self._nec_presence_received) + self._nec_presence_received) app.ged.remove_event_handler('gateway-prompt-received', ged.GUI1, - self._nec_gateway_prompt_received) + self._nec_gateway_prompt_received) def on_register_button_clicked(self, widget): model = self.protocol_jid_combobox.get_model() @@ -1049,13 +1038,17 @@ class AddNewContactWindow: def on_add_new_contact_window_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: # ESCAPE - self.window.destroy() + self.destroy() def on_cancel_button_clicked(self, widget): """ When Cancel button is clicked """ - self.window.destroy() + self.destroy() + + def on_message_textbuffer_changed(self, widget): + self.save_message_revealer.show() + self.save_message_revealer.set_reveal_child(True) def on_add_button_clicked(self, widget): """ @@ -1063,6 +1056,11 @@ class AddNewContactWindow: """ jid = self.uid_entry.get_text().strip() if not jid: + ErrorDialog( + _('%s Missing') % self.uid_label.get_text(), + _('You must supply the %s of the new contact.' % + self.uid_label.get_text()) + ) return model = self.protocol_combobox.get_model() @@ -1102,6 +1100,13 @@ class AddNewContactWindow: ErrorDialog(pritext, _('You cannot add yourself to your roster.')) return + if not app.account_is_connected(self.account): + ErrorDialog( + _('Account Offline'), + _('Your account must be online to add new contacts.') + ) + return + nickname = self.nickname_entry.get_text() or '' # get value of account combobox, if account was not specified if not self.account: @@ -1135,14 +1140,13 @@ class AddNewContactWindow: auto_auth = self.auto_authorize_checkbutton.get_active() app.interface.roster.req_sub(self, jid, message, self.account, groups=groups, nickname=nickname, auto_auth=auto_auth) - self.window.destroy() + self.destroy() def on_account_combobox_changed(self, widget): - model = widget.get_model() - iter_ = widget.get_active_iter() - account = model[iter_][0] + account = widget.get_active_id() message_buffer = self.message_textview.get_buffer() message_buffer.set_text(helpers.get_subscription_request_msg(account)) + self.account = account def on_protocol_jid_combobox_changed(self, widget): model = widget.get_model() @@ -1153,12 +1157,16 @@ class AddNewContactWindow: model = self.protocol_combobox.get_model() iter_ = self.protocol_combobox.get_active_iter() type_ = model[iter_][2] + desc = None if self.agents[type_] and jid_ in self.gateway_prompt: desc = self.gateway_prompt[jid_]['desc'] - if not desc: - desc = self.default_desc - self.xml.get_object('prompt_label').set_markup(desc) + + if desc: + self.prompt_label.set_markup(desc) + self.prompt_label.show() + else: + self.prompt_label.hide() prompt = None if self.agents[type_] and jid_ in self.gateway_prompt: @@ -1185,9 +1193,13 @@ class AddNewContactWindow: jid_ = self.agents[type_][0] if jid_ in self.gateway_prompt: desc = self.gateway_prompt[jid_]['desc'] - if not desc: - desc = self.default_desc - self.xml.get_object('prompt_label').set_markup(desc) + + if desc: + self.prompt_label.set_markup(desc) + self.prompt_label.show() + else: + self.prompt_label.hide() + if len(self.agents[type_]) > 1: self.protocol_jid_combobox.show() else: @@ -1214,7 +1226,7 @@ class AddNewContactWindow: self.register_hbox.show() self.auto_authorize_checkbutton.hide() self.connected_label.hide() - self.subscription_table.hide() + self._subscription_table_hide() self.add_button.set_sensitive(False) else: self.register_hbox.hide() @@ -1224,13 +1236,13 @@ class AddNewContactWindow: jid = model[row][0] contact = app.contacts.get_first_contact_from_jid( self.account, jid) - if contact.show in ('offline', 'error'): - self.subscription_table.hide() + if contact is None or contact.show in ('offline', 'error'): + self._subscription_table_hide() self.connected_label.show() self.add_button.set_sensitive(False) self.auto_authorize_checkbutton.hide() return - self.subscription_table.show() + self._subscription_table_show() self.auto_authorize_checkbutton.show() self.connected_label.hide() self.add_button.set_sensitive(True) @@ -1242,7 +1254,7 @@ class AddNewContactWindow: if _jid == jid: self.register_hbox.hide() self.connected_label.hide() - self.subscription_table.show() + self._subscription_table_show() self.auto_authorize_checkbutton.show() self.add_button.set_sensitive(True) @@ -1251,7 +1263,7 @@ class AddNewContactWindow: row = self.protocol_jid_combobox.get_active() _jid = model[row][0] if _jid == jid: - self.subscription_table.hide() + self._subscription_table_hide() self.auto_authorize_checkbutton.hide() self.connected_label.show() self.add_button.set_sensitive(False) @@ -1283,6 +1295,14 @@ class AddNewContactWindow: if obj.prompt: self.gateway_prompt[obj.jid]['prompt'] = obj.prompt + def _subscription_table_hide(self): + for widget in self.subscription_table: + widget.hide() + + def _subscription_table_show(self): + for widget in self.subscription_table: + widget.show() + class AboutDialog(Gtk.AboutDialog): def __init__(self): Gtk.AboutDialog.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0eeb111a02d23fd3dfc39f7e40620fb76e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/0eeb111a02d23fd3dfc39f7e40620fb76e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: remove plugin dependencies, they are provided by extensions
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 76403d74 by André Apitzsch at 2018-07-07T00:12:30+02:00 Flatpak: remove plugin dependencies, they are provided by extensions - - - - - 1 changed file: - org.gajim.Gajim.json Changes: ===================================== org.gajim.Gajim.json ===================================== --- a/org.gajim.Gajim.json +++ b/org.gajim.Gajim.json @@ -228,71 +228,6 @@ } ] }, - /* gnupg support */ - { - "name": "python3-python-gnupg", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app python_gnupg-0.4.3-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/4a/87/76ead690afc4c7710012ede242537…", - "sha256": "faa69bab58ed0936f0ccf96c99b92369b7a1819305d37dfe5c927d21a437a09d" - } - ] - }, - /* OMEMO support */ - { - "name": "protobuf", - "buildsystem": "simple", - "build-commands": [ - "pip3 install --prefix=/app protobuf-3.6.0-py2.py3-none-any.whl" - ], - "sources": [ - { - "type": "file", - "url": "https://files.pythonhosted.org/packages/85/f8/d09e4bf21c4de65405ce053e90542…", - "sha256": "9f1087abb67b34e55108bc610936b34363a7aac692023bcbb17e065c253a1f80" - } - ] - }, - { - "name": "python3-axolotl-curve25519", - "ensure-writable": [ - "easy-install.pth" - ], - "buildsystem": "simple", - "build-commands": [ - "python3 setup.py install --prefix=/app" - ], - "sources": [ - { - "type": "archive", - "url": "https://files.pythonhosted.org/packages/59/ca/c8111718bcc8da18e9b9868e78429…", - "sha256": "0705a66297ebd2f508a60dc94e22881c754301eb81db93963322f6b3bdcb63a3" - } - ] - }, - { - "name": "python3-axolotl", - "ensure-writable": [ - "easy-install.pth", - "setuptools.pth" - ], - "buildsystem": "simple", - "build-commands": [ - "python3 setup.py install --prefix=/app" - ], - "sources": [ - { - "type": "archive", - "url": "https://files.pythonhosted.org/packages/27/99/3b905f0061aba53526408d286e53c…", - "sha256": "ef78c2efabcd4c33741669334bdda04710a3ef0e00b653f00127acff6460a7f0" - } - ] - }, { "name": "python3-jeepney", "buildsystem": "simple", View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76403d748e1de99a7903a2e5151f6ea477… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/76403d748e1de99a7903a2e5151f6ea477… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix regression from 8b800f46
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1e9fb205 by Philipp Hörist at 2018-07-06T23:54:29+02:00 Fix regression from 8b800f46 - - - - - 1 changed file: - gajim/common/modules/vcard_avatars.py Changes: ===================================== gajim/common/modules/vcard_avatars.py ===================================== --- a/gajim/common/modules/vcard_avatars.py +++ b/gajim/common/modules/vcard_avatars.py @@ -119,7 +119,7 @@ class VCardAvatars: app.contacts.set_avatar(self._account, jid, avatar_sha) app.interface.update_avatar( self._account, jid, room_avatar=room) - return + return if avatar_sha not in self._requested_shas: self._requested_shas.append(avatar_sha) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e9fb205eec1dd2e347cd686cb3c35c2df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/1e9fb205eec1dd2e347cd686cb3c35c2df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Pass account when clicking on xmpp:?join link
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: a5b17a87 by Philipp Hörist at 2018-07-06T22:17:05+02:00 Pass account when clicking on xmpp:?join link - - - - - 1 changed file: - gajim/conversation_textview.py Changes: ===================================== gajim/conversation_textview.py ===================================== --- a/gajim/conversation_textview.py +++ b/gajim/conversation_textview.py @@ -781,7 +781,7 @@ class ConversationTextview(GObject.GObject): if '?' in word: (jid, action) = word.split('?') if action == 'join': - app.interface.join_gc_minimal(None, jid) + app.interface.join_gc_minimal(self.account, jid) else: self.on_start_chat_activate(None, jid) else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a5b17a87a978a405e8beb55c93776f82fa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/a5b17a87a978a405e8beb55c93776f82fa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework JoinGroupchat Dialog
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4fa4484d by Sophie Herold at 2018-07-06T22:14:32+02:00 Rework JoinGroupchat Dialog - - - - - 4 changed files: - gajim/common/app.py - gajim/data/gui/join_groupchat_window.ui - gajim/data/style/gajim.css - gajim/dialogs.py Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -389,6 +389,19 @@ def get_connected_accounts(): account_list.append(account) return account_list +def get_enabled_accounts_with_labels(exclude_local=True): + """ + Returns a list with [account, account_label] entries. + Order by account_label + """ + accounts = [] + for acc in connections: + if not exclude_local or acc != 'Local': + acc_label = config.get_per('accounts', acc, 'account_label') + accounts.append([acc, acc_label]) + accounts.sort(key=lambda xs: str.lower(xs[1])) + return accounts + def account_is_connected(account): if account not in connections: return False ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -1,170 +1,433 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> <requires lib="gtk+" version="3.20"/> - <object class="GtkGrid" id="grid"> - <property name="visible">True</property> + <object class="GtkListStore" id="account_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkListStore" id="recently_liststorex"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkPopoverMenu" id="recently_popover"> <property name="can_focus">False</property> - <property name="margin_left">18</property> - <property name="margin_right">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> <child> - <object class="GtkLabel" id="jid_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">center</property> - <property name="margin_bottom">12</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="bookmark_switch"> + <object class="GtkScrolledWindow"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Bookmark this Groupchat</property> - <property name="halign">start</property> - <property name="valign">center</property> + <property name="margin_left">6</property> + <property name="margin_right">6</property> <property name="margin_top">6</property> - <property name="active">True</property> - <signal name="notify::active" handler="_on_bookmark_activate" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">7</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkSwitch" id="autojoin_switch"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Join this Groupchat every time Gajim is started</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="active">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">8</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="margin_top">6</property> - <property name="label" translatable="yes">Bookmark</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">7</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="valign">center</property> - <property name="label" translatable="yes">Autojoin</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">8</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="account_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="valign">center</property> - <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="nick_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="valign">center</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="account_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Account</property> + <property name="margin_bottom">6</property> + <property name="max_content_width">300</property> + <property name="max_content_height">300</property> + <property name="propagate_natural_width">True</property> + <property name="propagate_natural_height">True</property> + <child> + <object class="GtkTreeView" id="recently_treeview"> + <property name="name">recently_treeview</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">recently_liststorex</property> + <property name="headers_visible">False</property> + <property name="enable_search">False</property> + <property name="hover_selection">True</property> + <property name="show_expanders">False</property> + <property name="activate_on_single_click">True</property> + <signal name="row-activated" handler="_on_recent_selected" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="title" translatable="yes">column</property> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">3</attribute> + </attributes> + </child> + </object> + </child> + <style> + <class name="popover_treeview"/> + </style> + </object> + </child> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="submenu">main</property> + <property name="position">1</property> </packing> </child> + </object> + <object class="GtkBox" id="main_box"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_left">18</property> + <property name="margin_right">18</property> + <property name="margin_top">18</property> + <property name="margin_bottom">18</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkLabel"> + <object class="GtkGrid" id="grid"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Nickname</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="password_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Password</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">6</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="password_entry"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="input_purpose">password</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> + <child> + <object class="GtkSwitch" id="autojoin_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Join group chat every time Gajim is started</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="active">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Autojoin</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">9</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="account_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Account</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="room_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Room</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="server_label"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Server</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="password_label"> + <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="label" translatable="yes">Password</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="nick_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="valign">center</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">6</property> + </packing> + </child> + <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">Nickname</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">6</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">5</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">7</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="bookmark_switch"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Bookmark group chat</property> + <property name="halign">start</property> + <property name="valign">center</property> + <property name="active">True</property> + <signal name="notify::active" handler="_on_bookmark_activate" swapped="no"/> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">center</property> + <property name="label" translatable="yes">Bookmark</property> + <property name="justify">right</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">8</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="height_request">6</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="account_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">account_liststore</property> + <property name="id_column">0</property> + <signal name="changed" handler="_on_account_combo_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText"/> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="password_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="activates_default">True</property> + <property name="input_purpose">password</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="spacing">12</property> + <child> + <object class="GtkEntry" id="room_entry"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="recently_button"> + <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">Recently used channels</property> + <property name="popover">recently_popover</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">document-open-recent-symbolic</property> + </object> + </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="search_button"> + <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">Search the rooms on this server</property> + <signal name="clicked" handler="_on_search_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">system-search-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">3</property> + </packing> + </child> + <child> + <object class="GtkComboBoxText" id="server_combo"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="has_entry">True</property> + <child internal-child="entry"> + <object class="GtkEntry"> + <property name="can_focus">True</property> + <property name="caps_lock_warning">False</property> + </object> + </child> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - <property name="width">2</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> </packing> </child> <child> <object class="GtkButtonBox" id="button_box"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="margin_top">18</property> - <property name="spacing">6</property> + <property name="spacing">12</property> <property name="layout_style">end</property> <child> <object class="GtkButton"> @@ -201,140 +464,9 @@ </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">9</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="server_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Server</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="room_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Room</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">4</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="recent_label"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="halign">start</property> - <property name="label" translatable="yes">Recently</property> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="room_entry"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="recent_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <signal name="changed" handler="_on_recent_changed" swapped="no"/> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> - </packing> - </child> - <child> - <object class="GtkComboBoxText" id="server_combo"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="has_entry">True</property> - <child internal-child="entry"> - <object class="GtkEntry"> - <property name="can_focus">True</property> - <property name="caps_lock_warning">False</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="search_button"> - <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">Search the rooms on this server</property> - <signal name="clicked" handler="_on_search_clicked" swapped="no"/> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">system-search-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">5</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <object class="GtkHeaderBar" id="headerbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="title" translatable="yes">Join Groupchat</property> - <child> - <object class="GtkButton"> - <property name="label">gtk-cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="use_stock">True</property> - <signal name="clicked" handler="_on_cancel_clicked" swapped="no"/> - </object> - </child> - <child> - <object class="GtkButton"> - <property name="label" translatable="yes">_Join</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="use_underline">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="_on_join_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="pack_type">end</property> - <property name="position">1</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -90,6 +90,11 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } #StartChatListBox > row { padding: 10px 20px 10px 10px; } #StartChatListBox > row:not(.activatable) label { color: @insensitive_fg_color } +/* Popover Treeview */ +.popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } +.popover_treeview { padding: 6px; } +.popover_treeview :hover { background-color: @theme_selected_bg_color; } + /* Text style */ .bold16 { font-size: 16px; font-weight: bold; } ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -2300,7 +2300,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.set_show_menubar(False) self.set_resizable(False) self.set_position(Gtk.WindowPosition.CENTER) - self.set_title(_('Join Groupchat')) + self.set_title(_('Join Group Chat')) if transient_for: self.set_transient_for(transient_for) @@ -2309,93 +2309,86 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.requested_jid = None self.room_jid = room_jid self.account = account - self.minimal_mode = 0 # 2: very mini, 1: with room, 0: show all - if room_jid is not None: - if '@' in room_jid: - self.minimal_mode = 2 - else: - self.minimal_mode = 1 - glade_objects = ['grid', 'nick_entry', 'account_combo', 'jid_label', - 'bookmark_switch', 'autojoin_switch', 'headerbar', - 'account_label', 'password_entry', 'password_label', - 'join_button', 'button_box', 'server_label', - 'server_combo', 'recent_label', 'recent_combo', - 'room_label', 'room_entry', 'search_button'] + if self.room_jid is None: + self.minimal_mode = False + else: + self.minimal_mode = True - minimal_widgets = ['jid_label'] - room_widgets = ['room_label', 'room_entry'] + glade_objects = ['main_box', 'account_label', 'account_combo', + 'server_label', 'server_combo', 'room_entry', + 'recently_button', 'recently_popover', + 'recently_treeview', 'search_button', 'password_label', + 'password_entry', 'nick_entry', 'bookmark_switch', + 'autojoin_switch'] - extended_widgets = ['server_label', 'server_combo', 'recent_label', - 'recent_combo', 'room_label', 'room_entry', - 'search_button'] self.builder = gtkgui_helpers.get_gtk_builder( 'join_groupchat_window.ui') for obj in glade_objects: setattr(self, obj, self.builder.get_object(obj)) - self.add(self.grid) - - if os.environ.get('GTK_CSD', '1') == '1': - self.set_titlebar(self.headerbar) - else: - self.button_box.show() + self.add(self.main_box) # Show widgets depending on the mode the window is in - if self.minimal_mode > 0: - for widget in minimal_widgets: - getattr(self, widget).show() - if self.minimal_mode == 1: - for widget in room_widgets: - getattr(self, widget).show() - self.jid_label.set_text(room_jid) - else: - for widget in extended_widgets: - getattr(self, widget).show() + if not self.minimal_mode: + self.recently_button.show() + self.search_button.show() - if account is None: - connected_accounts = app.get_connected_accounts() - account = connected_accounts[0] - for acc in connected_accounts: - self.account_combo.append_text(acc) - else: - connected_accounts = [account] - self.account_combo.append_text(account) + accounts = app.get_enabled_accounts_with_labels() + account_liststore = self.account_combo.get_model() + for acc in accounts: + account_liststore.append(acc) + + if not accounts: + return + + if not self.account: + self.account = accounts[0][0] self.builder.connect_signals(self) self.connect('key-press-event', self._on_key_press_event) self.connect('destroy', self._on_destroy) - if self.minimal_mode == 0: + if not self.minimal_mode: app.ged.register_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.register_event_handler('agent-info-error-received', ged.GUI1, self._nec_agent_info_error_received) # Show account combobox if there is more than one account - if len(connected_accounts) > 1: + if len(accounts) > 1: self.account_combo.show() self.account_label.show() - # Select first account - self.account_combo.set_active(0) + self.account_combo.set_active_id(self.account) + + if self.minimal_mode: + if '@' in self.room_jid: + (room, server) = self.room_jid.split('@') + self.room_entry.set_text(room) + if not muc_caps_cache.supports( + self.room_jid, 'muc_passwordprotected'): + self.password_entry.hide() + self.password_label.hide() + self.nick_entry.grab_focus() + else: + self.password_entry.grab_focus() + else: + server = self.room_jid + self.room_entry.grab_focus() + + self.server_combo.insert_text(0, server) + self.server_combo.set_active(0) if self.password is not None: self.password_entry.set_text(self.password) # Set bookmark switch sensitive if server supports bookmarks - acc = self.account_combo.get_active_text() + acc = self.account_combo.get_active_id() if not app.connections[acc].private_storage_supported: self.bookmark_switch.set_sensitive(False) self.autojoin_switch.set_sensitive(False) - # Show password field if we are in extended mode or - # The MUC is passwordprotected - if self.minimal_mode == 0 or muc_caps_cache.supports( - room_jid, 'muc_passwordprotected'): - self.password_entry.show() - self.password_label.show() - self.show_all() def set_room(self, room_jid): @@ -2404,16 +2397,18 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.server_combo.get_child().set_text(server) def _fill_recent_and_servers(self, account): - self.recent_combo.remove_all() + recently_liststore = self.recently_treeview.get_model() + recently_liststore.clear() self.server_combo.remove_all() recent = app.get_recent_groupchats(account) servers = [] for groupchat in recent: - text = '%s on %s@%s' % (groupchat.nickname, - groupchat.room, - groupchat.server) + label = '%s@%s' % (groupchat.room, groupchat.server) - self.recent_combo.append_text(text) + recently_liststore.append([groupchat.server, + groupchat.room, + groupchat.nickname, + label]) servers.append(groupchat.server) for server in set(servers): @@ -2424,24 +2419,18 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): if muc_domain is not None: self.server_combo.insert_text(0, muc_domain) - def _on_recent_changed(self, combo): - text = combo.get_active_text() - if text is None: - self.server_combo.set_active(0) - return - nickname, _, room_jid = text.split() - room, server = app.get_name_and_server_from_jid(room_jid) - self.room_entry.set_text(room) - self.nick_entry.set_text(nickname) - self.server_combo.get_child().set_text(server) + def _on_recent_selected(self, treeview, *args): + (model, iter_) = treeview.get_selection().get_selected() + self.server_combo.get_child().set_text(model[iter_][0]) + self.room_entry.set_text(model[iter_][1]) + self.nick_entry.set_text(model[iter_][2]) + self.recently_popover.popdown() def _on_account_combo_changed(self, combo): - account = combo.get_active_text() + account = combo.get_active_id() self.account = account self.nick_entry.set_text(app.nicks[account]) - if self.minimal_mode == 0: - self._fill_recent_and_servers(account) - self.recent_combo.set_active(0) + self._fill_recent_and_servers(account) def _on_key_press_event(self, widget, event): if event.keyval == Gdk.KEY_Escape: @@ -2451,7 +2440,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): return True def _on_join_clicked(self, *args): - account = self.account_combo.get_active_text() + account = self.account_combo.get_active_id() nickname = self.nick_entry.get_text() invisible_show = app.SHOW_LIST.index('invisible') @@ -2459,18 +2448,15 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): app.interface.raise_dialog('join-while-invisible') return - if self.minimal_mode < 2: - if self.minimal_mode == 0: - server = self.server_combo.get_active_text() - else: # mode 1 - server = self.room_jid - room = self.room_entry.get_text() - if room == '': - ErrorDialog(_('Invalid Room'), - _('Please choose a room'), transient_for=self) - return - self.room_jid = '%s@%s' % (room, server) + server = self.server_combo.get_active_text() + room = self.room_entry.get_text() + + if room == '': + ErrorDialog(_('Invalid Room'), + _('Please choose a room'), transient_for=self) + return + self.room_jid = '%s@%s' % (room, server) self.room_jid = self.room_jid.lower() if app.in_groupchat(account, self.room_jid): @@ -2518,7 +2504,10 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): self.destroy() def _on_bookmark_activate(self, switch, param): - self.autojoin_switch.set_sensitive(switch.get_active()) + bookmark_state = switch.get_active() + self.autojoin_switch.set_sensitive(bookmark_state) + if not bookmark_state: + self.autojoin_switch.set_active(False) def _add_bookmark(self, account, nickname, password): con = app.connections[account] @@ -2537,7 +2526,7 @@ class JoinGroupchatWindow(Gtk.ApplicationWindow): name, self.room_jid, autojoin, 1, password, nickname) def _on_destroy(self, *args): - if self.minimal_mode == 0: + if not self.minimal_mode: app.ged.remove_event_handler('agent-info-received', ged.GUI1, self._nec_agent_info_received) app.ged.remove_event_handler('agent-info-error-received', ged.GUI1, View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa4484dfd41b173dcf47908e90777e8c5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4fa4484dfd41b173dcf47908e90777e8c5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Call JoinGroupchat Dialog with account
by Philipp Hörist 06 Jul '18

06 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 15bcd80e by Philipp Hörist at 2018-07-06T21:56:17+02:00 Call JoinGroupchat Dialog with account - - - - - 1 changed file: - gajim/roster_window.py Changes: ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3636,7 +3636,8 @@ class RosterWindow: """ When the join gc menuitem is clicked, show the join gc window """ - app.app.activate_action('join-groupchat') + app.app.activate_action('%s-join-groupchat' % account, + GLib.Variant('s', account)) def on_show_transports_action(self, action, param): app.config.set('show_transports_group', param.get_boolean()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15bcd80e1980603ac6e87522e7ae7560ef… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/15bcd80e1980603ac6e87522e7ae7560ef… 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
Older →

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits July 2018