Commits

commits@gajim.org

17632 discussions

[Git][gajim/python-nbxmpp][master] Load files from FreeBSD specific location
by Philipp Hörist 20 Jul '18

20 Jul '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: d713ce90 by Philipp Hörist at 2018-07-20T23:49:26+02:00 Load files from FreeBSD specific location Fixes #53 - - - - - 1 changed file: - nbxmpp/tls_nb.py Changes: ===================================== nbxmpp/tls_nb.py ===================================== --- a/nbxmpp/tls_nb.py +++ b/nbxmpp/tls_nb.py @@ -448,12 +448,15 @@ class NonBlockingTLS(PlugIn): store = tcpsock._sslContext.get_cert_store() self._load_cert_file(self.cacerts, store) self._load_cert_file(self.mycerts, store) - if os.path.isdir('/etc/ssl/certs'): - for f in os.listdir('/etc/ssl/certs'): - # We don't logg because there is a lot a duplicated certs in this - # folder - self._load_cert_file(os.path.join('/etc/ssl/certs', f), store, - logg=False) + paths = ['/etc/ssl/certs', + '/etc/ssl'] # FreeBSD uses this + for path in paths: + if not os.path.isdir(path): + continue + for f in os.listdir(path): + # We don't logg because there is a lot a duplicated certs + # in this folder + self._load_cert_file(os.path.join(path, f), store, logg=False) tcpsock._sslObj = OpenSSL.SSL.Connection(tcpsock._sslContext, tcpsock._sock) View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d713ce9059de350ce41f6d41f0… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/d713ce9059de350ce41f6d41f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Mock bookmarks for zeroconf
by Philipp Hörist 20 Jul '18

20 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 54b5dec6 by Philipp Hörist at 2018-07-20T23:17:58+02:00 Mock bookmarks for zeroconf Fixes #9256 - - - - - 1 changed file: - gajim/common/modules/__init__.py Changes: ===================================== gajim/common/modules/__init__.py ===================================== --- a/gajim/common/modules/__init__.py +++ b/gajim/common/modules/__init__.py @@ -53,6 +53,9 @@ class ModuleMock: self.blocked_groups = [] self.blocked_all = False + # Bookmarks + self.bookmarks = {} + def __getattr__(self, key): def _mock(self, *args, **kwargs): return View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54b5dec6c73ba470799f5cd01b9a148d5f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/54b5dec6c73ba470799f5cd01b9a148d5f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Add JID to log output
by Philipp Hörist 19 Jul '18

19 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 5ed9768b by Philipp Hörist at 2018-07-19T17:15:28+02:00 Add JID to log output - - - - - 1 changed file: - gajim/common/modules/entity_time.py Changes: ===================================== gajim/common/modules/entity_time.py ===================================== --- a/gajim/common/modules/entity_time.py +++ b/gajim/common/modules/entity_time.py @@ -91,7 +91,8 @@ class EntityTime: # Remove the trailing "+00:00" utc_time = utc_time[:-6] else: - log.warning('Wrong timezone defintion: %s', utc_time) + log.warning('Wrong timezone defintion: %s %s', + utc_time, stanza.getFrom()) return try: @@ -101,7 +102,8 @@ class EntityTime: t = datetime.datetime.strptime(utc_time, '%Y-%m-%dT%H:%M:%S.%f') except ValueError as e: - log.warning('Wrong time format: %s', e) + log.warning('Wrong time format: %s %s', + e, stanza.getFrom()) return t = t.replace(tzinfo=UTC()) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ed9768b874d13ddfe9e374752febcbe06… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/5ed9768b874d13ddfe9e374752febcbe06… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Move some dialogs into gtk module
by Philipp Hörist 17 Jul '18

17 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 3a3b5aff by Philipp Hörist at 2018-07-18T00:15:46+02:00 Move some dialogs into gtk module - - - - - 25 changed files: - gajim/accounts_window.py - gajim/adhoc_commands.py - gajim/app_actions.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/connection_handlers_events.py - gajim/config.py - gajim/conversation_textview.py - gajim/data/style/gajim.css - gajim/dialog_messages.py - gajim/dialogs.py - gajim/disco.py - gajim/filetransfers_window.py - gajim/gajim_themes_window.py - gajim/groupchat_control.py - gajim/gtk/__init__.py - + gajim/gtk/about.py - + gajim/gtk/add_contact.py - + gajim/gtk/dialogs.py - gajim/gtk/history_sync.py - + gajim/gtk/join_groupchat.py - gajim/gtk/mam_preferences.py - + gajim/gtk/privacy_list.py - gajim/server_info.py → gajim/gtk/server_info.py - + gajim/gtk/single_message.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a3b5aff201a224770227086f823d92bf2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/3a3b5aff201a224770227086f823d92bf2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Move Carbons into own module
by Philipp Hörist 17 Jul '18

17 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: d65253b0 by Philipp Hörist at 2018-07-17T18:38:36+02:00 Move Carbons into own module - - - - - bff5f14b by Philipp Hörist at 2018-07-17T18:38:36+02:00 Move invites into MUC module - - - - - 10 changed files: - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/connection_handlers.py - gajim/common/connection_handlers_events.py - + gajim/common/modules/carbons.py - + gajim/common/modules/muc.py - gajim/dialogs.py - gajim/groupchat_control.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== gajim/command_system/implementation/standard.py ===================================== --- a/gajim/command_system/implementation/standard.py +++ b/gajim/command_system/implementation/standard.py @@ -291,7 +291,7 @@ class StandardGroupChatCommands(CommandContainer): @command(raw=True, empty=True) @doc(_("Invite a user to a room for a reason")) def invite(self, jid, reason): - self.connection.send_invite(self.room_jid, jid, reason) + self.connection.get_module('MUC').invite(self.room_jid, jid, reason) return _("Invited %(jid)s to %(room_jid)s") % {'jid': jid, 'room_jid': self.room_jid} ===================================== gajim/common/connection.py ===================================== --- a/gajim/common/connection.py +++ b/gajim/common/connection.py @@ -2379,68 +2379,6 @@ class Connection(CommonConnection, ConnectionHandlers): else: _on_unregister_account_connect(self.connection) - def send_invite(self, room, to, reason='', continue_tag=False): - """ - Send invitation - """ - if not app.account_is_connected(self.name): - return - contact = app.contacts.get_contact_from_full_jid(self.name, to) - if contact and contact.supports(nbxmpp.NS_CONFERENCE): - # send direct invite - message=nbxmpp.Message(to=to) - attrs = {'jid': room} - if reason: - attrs['reason'] = reason - if continue_tag: - attrs['continue'] = 'true' - password = app.gc_passwords.get(room, '') - if password: - attrs['password'] = password - c = message.addChild(name='x', attrs=attrs, - namespace=nbxmpp.NS_CONFERENCE) - self.connection.send(message) - return - message=nbxmpp.Message(to=room) - c = message.addChild(name='x', namespace=nbxmpp.NS_MUC_USER) - c = c.addChild(name='invite', attrs={'to': to}) - if continue_tag: - c.addChild(name='continue') - if reason != '': - c.setTagData('reason', reason) - self.connection.send(message) - - def decline_invitation(self, room, to, reason=''): - """ - decline a groupchat invitation - """ - if not app.account_is_connected(self.name): - return - message=nbxmpp.Message(to=room) - c = message.addChild(name='x', namespace=nbxmpp.NS_MUC_USER) - c = c.addChild(name='decline', attrs={'to': to}) - if reason != '': - c.setTagData('reason', reason) - self.connection.send(message) - - def request_voice(self, room): - """ - Request voice in a moderated room - """ - if not app.account_is_connected(self.name): - return - message = nbxmpp.Message(to=room) - - x = nbxmpp.DataForm(typ='submit') - x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', - value=nbxmpp.NS_MUC + '#request')) - x.addChild(node=nbxmpp.DataField(name='muc#role', value='participant', - typ='text-single')) - - message.addChild(node=x) - - self.connection.send(message) - def _reconnect_alarm(self): if not app.config.get_per('accounts', self.name, 'active'): # Account may have been disabled ===================================== gajim/common/connection_handlers.py ===================================== --- a/gajim/common/connection_handlers.py +++ b/gajim/common/connection_handlers.py @@ -297,7 +297,8 @@ class ConnectionHandlersBase: nbxmpp.NS_PUBSUB_EVENT, nbxmpp.NS_ROSTERX, nbxmpp.NS_MAM_1, - nbxmpp.NS_MAM_2]) + nbxmpp.NS_MAM_2, + nbxmpp.NS_CONFERENCE]) app.ged.register_event_handler('iq-error-received', ged.CORE, self._nec_iq_error_received) @@ -950,6 +951,12 @@ class ConnectionHandlers(ConnectionSocks5Bytestream, ConnectionDisco, # but nbxmpp executes less common handlers last if self._message_namespaces & set(stanza.getProperties()): return + + muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is not None: + if muc_user.getChildren(): + # Not a PM, handled by MUC module + return log.debug('MessageCB') app.nec.push_incoming_event(NetworkEvent('raw-message-received', ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -42,7 +42,6 @@ from gajim.common.const import KindConstant, SSLError from gajim.common.pep import SUPPORTED_PERSONAL_USER_EVENTS from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp -from gajim.common.nec import NetworkEvent log = logging.getLogger('gajim.c.connection_handlers_events') @@ -643,9 +642,6 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): def generate(self): self.conn = self.base_event.conn self.stanza = self.base_event.stanza - self.get_id() - self.forwarded = False - self.sent = False self.encrypted = False self.self_message = None self.muc_pm = None @@ -659,6 +655,11 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): self.stanza.getFrom()) return + from gajim.common.modules.carbons import parse_carbon + self.stanza, self.sent, self.forwarded = parse_carbon(self.conn, + self.stanza) + + self.get_id() try: self.get_jid_resource() except helpers.InvalidFormat: @@ -696,73 +697,6 @@ class MessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): return self.jid = app.get_jid_without_resource(self.fjid) - carbon_marker = self.stanza.getTag('sent', namespace=nbxmpp.NS_CARBONS) - if not carbon_marker: - carbon_marker = self.stanza.getTag('received', - namespace=nbxmpp.NS_CARBONS) - # Be sure it comes from one of our resource, else ignore forward element - if carbon_marker and self.jid == app.get_jid_from_account(account): - forward_tag = carbon_marker.getTag('forwarded', - namespace=nbxmpp.NS_FORWARD) - if forward_tag: - msg = forward_tag.getTag('message') - self.stanza = nbxmpp.Message(node=msg) - self.get_id() - if carbon_marker.getName() == 'sent': - to = self.stanza.getTo() - frm = self.stanza.getFrom() - if not frm: - frm = app.get_jid_from_account(account) - self.stanza.setTo(frm) - if not to: - to = app.get_jid_from_account(account) - self.stanza.setFrom(to) - self.sent = True - elif carbon_marker.getName() == 'received': - full_frm = str(self.stanza.getFrom()) - frm = app.get_jid_without_resource(full_frm) - if frm == app.get_jid_from_account(account): - # Drop 'received' Carbons from ourself, we already - # got the message with the 'sent' Carbon or via the - # message itself - log.info( - 'Drop "received"-Carbon from ourself: %s' - % full_frm) - return - try: - self.get_jid_resource() - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - self.stanza.getFrom()) - return - self.forwarded = True - - # Mediated invitation? - muc_user = self.stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) - if muc_user: - if muc_user.getTag('decline'): - app.nec.push_incoming_event( - GcDeclineReceivedEvent( - None, conn=self.conn, - room_jid=self.fjid, stanza=muc_user)) - return - if muc_user.getTag('invite'): - app.nec.push_incoming_event( - GcInvitationReceivedEvent( - None, conn=self.conn, jid_from=self.fjid, - mediated=True, stanza=muc_user)) - return - else: - # Direct invitation? - direct = self.stanza.getTag( - 'x', namespace=nbxmpp.NS_CONFERENCE) - if direct: - app.nec.push_incoming_event( - GcInvitationReceivedEvent( - None, conn=self.conn, jid_from=self.fjid, - mediated=False, stanza=direct)) - return - self.thread_id = self.stanza.getThread() self.mtype = self.stanza.getType() if not self.mtype or self.mtype not in ('chat', 'groupchat', 'error'): @@ -880,72 +814,6 @@ class ZeroconfMessageReceivedEvent(MessageReceivedEvent): stanza=self.stanza) return super(ZeroconfMessageReceivedEvent, self).generate() -class GcInvitationReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-invitation-received' - base_network_events = [] - - def generate(self): - account = self.conn.name - if not self.mediated: - # direct invitation - try: - self.room_jid = helpers.parse_jid(self.stanza.getAttr('jid')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - self.stanza.getAttr('jid')) - return - self.reason = self.stanza.getAttr('reason') - self.password = self.stanza.getAttr('password') - self.is_continued = False - self.is_continued = self.stanza.getAttr('continue') == 'true' - else: - self.invite = self.stanza.getTag('invite') - self.room_jid = self.jid_from - try: - self.jid_from = helpers.parse_jid(self.invite.getAttr('from')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - self.invite.getAttr('from')) - return - - self.reason = self.invite.getTagData('reason') - self.password = self.stanza.getTagData('password') - self.is_continued = self.stanza.getTag('continue') is not None - - if self.room_jid in app.gc_connected[account] and \ - app.gc_connected[account][self.room_jid]: - # We are already in groupchat. Ignore invitation - return - jid = app.get_jid_without_resource(self.jid_from) - - ignore = app.config.get_per( - 'accounts', account, 'ignore_unknown_contacts') - if ignore and not app.contacts.get_contacts(account, jid): - return - - return True - -class GcDeclineReceivedEvent(nec.NetworkIncomingEvent): - name = 'gc-decline-received' - base_network_events = [] - - def generate(self): - account = self.conn.name - decline = self.stanza.getTag('decline') - try: - self.jid_from = helpers.parse_jid(decline.getAttr('from')) - except helpers.InvalidFormat: - log.warning('Invalid JID: %s, ignoring it', - decline.getAttr('from')) - return - jid = app.get_jid_without_resource(self.jid_from) - ignore = app.config.get_per( - 'accounts', account, 'ignore_unknown_contacts') - if ignore and not app.contacts.get_contacts(account, jid): - return - self.reason = decline.getTagData('reason') - - return True class DecryptedMessageReceivedEvent(nec.NetworkIncomingEvent, HelperEvent): name = 'decrypted-message-received' ===================================== gajim/common/modules/carbons.py ===================================== --- /dev/null +++ b/gajim/common/modules/carbons.py @@ -0,0 +1,77 @@ +# 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/>. + +# XEP-0280: Message Carbons + +import logging + +import nbxmpp + +log = logging.getLogger('gajim.c.m.carbons') + + +def parse_carbon(con, stanza): + carbon = stanza.getTag( + 'received', namespace=nbxmpp.NS_CARBONS, protocol=True) + if carbon is None: + carbon = stanza.getTag( + 'sent', namespace=nbxmpp.NS_CARBONS, protocol=True) + if carbon is None: + return stanza, False, False + + # Carbon must be from our bare jid + own_jid = con.get_own_jid() + if not stanza.getFrom().bareMatch(own_jid): + log.warning('Ignore message because from is invalid %s', + stanza.getFrom()) + raise nbxmpp.NodeProcessed + + forwarded = carbon.getTag('forwarded', + namespace=nbxmpp.NS_FORWARD, + protocol=True) + message = forwarded.getTag('message', protocol=True) + + type_ = carbon.getName() + to = message.getTo() + frm = message.getFrom() + log.info('Received type: %s, from: %s, to: %s', type_, to, frm) + + if type_ == 'received': + sent = False + if message.getFrom().bareMatch(own_jid): + # Drop 'received' Carbons from ourself, we already + # got the message with the 'sent' Carbon or via the + # message itself + log.info('Drop "received"-Carbon from ourself: %s') + raise nbxmpp.NodeProcessed + if message.getTag('x', namespace=nbxmpp.NS_MUC_USER) is not None: + # A MUC broadcasts messages sent to us to all resources + # there is no need to process carbons for these messages + log.info('Drop MUC-PM "received"-Carbon') + raise nbxmpp.NodeProcessed + + elif type_ == 'sent': + if frm is None: + frm = own_jid.getStripped() + message.setTo(frm) + if to is None: + to = own_jid.getStripped() + message.setFrom(to) + sent = True + + else: + log.warning('Ignore invalid carbon: %s', stanza) + raise nbxmpp.NodeProcessed + + return message, sent, True ===================================== gajim/common/modules/muc.py ===================================== --- /dev/null +++ b/gajim/common/modules/muc.py @@ -0,0 +1,205 @@ +# 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/>. + +# XEP-0045: Multi-User Chat +# XEP-0249: Direct MUC Invitations + +import logging + +import nbxmpp + +from gajim.common import app +from gajim.common import helpers +from gajim.common.nec import NetworkIncomingEvent + +log = logging.getLogger('gajim.c.m.muc') + + +class MUC: + def __init__(self, con): + self._con = con + self._account = con.name + + self.handlers = [ + ('message', self._mediated_invite, '', nbxmpp.NS_MUC_USER), + ('message', self._direct_invite, '', nbxmpp.NS_CONFERENCE), + ] + + def _mediated_invite(self, con, stanza): + muc_user = stanza.getTag('x', namespace=nbxmpp.NS_MUC_USER) + if muc_user is None: + return + + decline = muc_user.getTag('decline') + if decline is not None: + + room_jid = stanza.getFrom().getStripped() + from_ = self._get_from(room_jid, decline) + + reason = decline.getTagData('reason') + log.info('Invite declined: %s, %s', reason, from_) + app.nec.push_incoming_event( + GcDeclineReceived(None, + account=self._account, + from_=from_, + room_jid=room_jid, + reason=reason)) + raise nbxmpp.NodeProcessed + + invite = muc_user.getTag('invite') + if invite is not None: + + room_jid = stanza.getFrom().getStripped() + from_ = self._get_from(room_jid, invite) + + reason = invite.getTagData('reason') + password = muc_user.getTagData('password') + is_continued = invite.getTag('continue') is not None + log.info('Mediated invite: continued: %s, reason: %s, from: %s', + is_continued, reason, from_) + if room_jid in app.gc_connected[self._account] and \ + app.gc_connected[self._account][room_jid]: + # We are already in groupchat. Ignore invitation + log.info('We are already in this room') + raise nbxmpp.NodeProcessed + + app.nec.push_incoming_event( + GcInvitationReceived(None, + account=self._account, + from_=from_, + room_jid=room_jid, + reason=reason, + password=password, + is_continued=is_continued)) + raise nbxmpp.NodeProcessed + + def _get_from(self, room_jid, stanza): + try: + from_ = nbxmpp.JID(helpers.parse_jid(stanza.getAttr('from'))) + except helpers.InvalidFormat: + log.warning('Invalid JID on invite: %s, ignoring it', + stanza.getAttr('from')) + raise nbxmpp.NodeProcessed + + known_contact = app.contacts.get_contacts(self._account, room_jid) + ignore = app.config.get_per( + 'accounts', self._account, 'ignore_unknown_contacts') + if ignore and not known_contact: + log.info('Ignore invite from unknown contact %s', from_) + raise nbxmpp.NodeProcessed + + return from_ + + def _direct_invite(self, con, stanza): + direct = stanza.getTag('x', namespace=nbxmpp.NS_CONFERENCE) + if direct is None: + return + + from_ = stanza.getFrom() + + try: + room_jid = helpers.parse_jid(direct.getAttr('jid')) + except helpers.InvalidFormat: + log.warning('Invalid JID on invite: %s, ignoring it', + direct.getAttr('jid')) + raise nbxmpp.NodeProcessed + + reason = direct.getAttr('reason') + password = direct.getAttr('password') + is_continued = direct.getAttr('continue') == 'true' + + log.info('Direct invite: continued: %s, reason: %s, from: %s', + is_continued, reason, from_) + + app.nec.push_incoming_event( + GcInvitationReceived(None, + account=self._account, + from_=from_, + room_jid=room_jid, + reason=reason, + password=password, + is_continued=is_continued)) + raise nbxmpp.NodeProcessed + + def invite(self, room, to, reason=None, continue_=False): + if not app.account_is_connected(self._account): + return + contact = app.contacts.get_contact_from_full_jid(self._account, to) + if contact and contact.supports(nbxmpp.NS_CONFERENCE): + invite = self._build_direct_invite(room, to, reason, continue_) + else: + invite = self._build_mediated_invite(room, to, reason, continue_) + self._con.connection.send(invite) + + def _build_direct_invite(self, room, to, reason, continue_): + message = nbxmpp.Message(to=to) + attrs = {'jid': room} + if reason: + attrs['reason'] = reason + if continue_: + attrs['continue'] = 'true' + password = app.gc_passwords.get(room, None) + if password: + attrs['password'] = password + message = message.addChild(name='x', attrs=attrs, + namespace=nbxmpp.NS_CONFERENCE) + return message + + def _build_mediated_invite(self, room, to, reason, continue_): + message = nbxmpp.Message(to=room) + muc_user = message.addChild('x', namespace=nbxmpp.NS_MUC_USER) + invite = muc_user.addChild('invite', attrs={'to': to}) + if continue_: + invite.addChild(name='continue') + if reason: + invite.setTagData('reason', reason) + password = app.gc_passwords.get(room, None) + if password: + muc_user.setTagData('password', password) + return message + + def decline(self, room, to, reason=None): + if not app.account_is_connected(self._account): + return + message = nbxmpp.Message(to=room) + muc_user = message.addChild('x', namespace=nbxmpp.NS_MUC_USER) + decline = muc_user.addChild('decline', attrs={'to': to}) + if reason: + decline.setTagData('reason', reason) + self._con.connection.send(message) + + def request_voice(self, room): + if not app.account_is_connected(self._account): + return + message = nbxmpp.Message(to=room) + x = nbxmpp.DataForm(typ='submit') + x.addChild(node=nbxmpp.DataField(name='FORM_TYPE', + value=nbxmpp.NS_MUC + '#request')) + x.addChild(node=nbxmpp.DataField(name='muc#role', + value='participant', + typ='text-single')) + message.addChild(node=x) + self._con.connection.send(message) + + +class GcInvitationReceived(NetworkIncomingEvent): + name = 'gc-invitation-received' + + +class GcDeclineReceived(NetworkIncomingEvent): + name = 'gc-decline-received' + + +def get_instance(*args, **kwargs): + return MUC(*args, **kwargs), 'MUC' ===================================== gajim/dialogs.py ===================================== --- a/gajim/dialogs.py +++ b/gajim/dialogs.py @@ -4437,8 +4437,8 @@ class InvitationReceivedDialog: self.account, self.room_jid, password=self.password) def on_no(text): - app.connections[account].decline_invitation(self.room_jid, - self.contact_fjid, text) + app.connections[account].get_module('MUC').decline( + self.room_jid, self.contact_fjid, text) dlg = YesNoDialog(pritext, sectext, text_label=_('Reason (if you decline):'), on_response_yes=on_yes, ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -716,7 +716,8 @@ class GroupchatControl(ChatControlBase): """ Request voice in the current room """ - app.connections[self.account].request_voice(self.room_jid) + con = app.connections[self.account] + con.get_module('MUC').request_voice(self.room_jid) def _on_minimize(self, action, param): """ @@ -1797,7 +1798,7 @@ class GroupchatControl(ChatControlBase): # We just need to invite contacts for jid in app.automatic_rooms[self.account][ self.room_jid]['invities']: - obj.conn.send_invite(self.room_jid, jid) + obj.conn.get_module('MUC').invite(self.room_jid, jid) self.print_conversation(_('%(jid)s has been ' 'invited in this room') % {'jid': jid}, graphics=False) @@ -2405,7 +2406,8 @@ class GroupchatControl(ChatControlBase): return contact_jid = data - app.connections[self.account].send_invite(self.room_jid, contact_jid) + con = app.connections[self.account] + con.get_module('MUC').invite(self.room_jid, contact_jid) self.print_conversation(_('%(jid)s has been invited in this room') % {'jid': contact_jid}, graphics=False) ===================================== gajim/gui_interface.py ===================================== --- a/gajim/gui_interface.py +++ b/gajim/gui_interface.py @@ -608,8 +608,8 @@ class Interface: continue_tag = True if 'invities' in app.automatic_rooms[account][obj.jid]: for jid in app.automatic_rooms[account][obj.jid]['invities']: - obj.conn.send_invite(obj.jid, jid, - continue_tag=continue_tag) + obj.conn.get_module('MUC').invite( + obj.jid, jid, continue_=continue_tag) gc_control = self.msg_win_mgr.get_gc_control(obj.jid, account) if gc_control: @@ -629,35 +629,35 @@ class Interface: affiliation_list_received(obj.users_dict) def handle_event_gc_decline(self, obj): - account = obj.conn.name - gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, account) + gc_control = self.msg_win_mgr.get_gc_control(obj.room_jid, obj.account) if gc_control: if obj.reason: gc_control.print_conversation( _('%(jid)s declined the invitation: %(reason)s') % { - 'jid': obj.jid_from, 'reason': obj.reason}, graphics=False) + 'jid': obj.from_, 'reason': obj.reason}, + graphics=False) else: gc_control.print_conversation( _('%(jid)s declined the invitation') % { - 'jid': obj.jid_from}, graphics=False) + 'jid': obj.from_}, graphics=False) def handle_event_gc_invitation(self, obj): - #('GC_INVITATION', (room_jid, jid_from, reason, password, is_continued)) - account = obj.conn.name - if helpers.allow_popup_window(account) or not self.systray_enabled: - dialogs.InvitationReceivedDialog(account, obj.room_jid, - obj.jid_from, obj.password, obj.reason, + if helpers.allow_popup_window(obj.account) or not self.systray_enabled: + dialogs.InvitationReceivedDialog( + obj.account, obj.room_jid, + str(obj.from_), obj.password, obj.reason, is_continued=obj.is_continued) return - event = events.GcInvitationtEvent(obj.room_jid, obj.reason, - obj.password, obj.is_continued, obj.jid_from) - self.add_event(account, obj.jid_from, event) + event = events.GcInvitationtEvent( + obj.room_jid, obj.reason, + obj.password, obj.is_continued, str(obj.from_)) + self.add_event(obj.account, str(obj.from_), event) - if helpers.allow_showing_notification(account): + if helpers.allow_showing_notification(obj.account): event_type = _('Groupchat Invitation') app.notification.popup( - event_type, obj.jid_from, account, 'gc-invitation', + event_type, str(obj.from_), obj.account, 'gc-invitation', 'gajim-gc_invitation', event_type, obj.room_jid) def forget_gpg_passphrase(self, keyid): ===================================== gajim/roster_window.py ===================================== --- a/gajim/roster_window.py +++ b/gajim/roster_window.py @@ -3091,7 +3091,8 @@ class RosterWindow: contact_jid = contact.jid if resource: # we MUST have one contact only in list_ contact_jid += '/' + resource - app.connections[room_account].send_invite(room_jid, contact_jid) + con = app.connections[room_account] + con.get_module('MUC').invite(room_jid, contact_jid) gc_control = app.interface.msg_win_mgr.get_gc_control(room_jid, room_account) if gc_control: View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c70b63e34c6bb49365d8df707e9ab8d0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6c70b63e34c6bb49365d8df707e9ab8d0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix parsing jid from roster set event
by Philipp Hörist 16 Jul '18

16 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6c70b63e by Philipp Hörist at 2018-07-17T00:13:12+02:00 Fix parsing jid from roster set event - - - - - 1 changed file: - gajim/common/connection_handlers_events.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== --- a/gajim/common/connection_handlers_events.py +++ b/gajim/common/connection_handlers_events.py @@ -230,9 +230,9 @@ class RosterSetReceivedEvent(nec.NetworkIncomingEvent): base_network_events = [] def generate(self): - frm = helpers.get_jid_from_iq(self.stanza) - our_jid = app.get_jid_from_account(self.conn.name) - if frm and frm != our_jid and frm != app.get_server_from_jid(our_jid): + frm = self.stanza.getFrom() + our_jid = self.conn.get_own_jid() + if frm is not None and not frm.bareMatch(our_jid): return self.version = self.stanza.getTagAttr('query', 'ver') self.items = {} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c70b63e34c6bb49365d8df707e9ab8d05… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6c70b63e34c6bb49365d8df707e9ab8d05… You're receiving this email because of your account on dev.gajim.org.

1 0

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

16 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: f8916951 by Sophie Herold at 2018-07-16T22:38:08+02:00 Rework Plugins Dialog - - - - - 3 changed files: - gajim/data/gui/plugins_window.ui - gajim/data/style/gajim.css - gajim/plugins/gui.py Changes: ===================================== gajim/data/gui/plugins_window.ui ===================================== --- a/gajim/data/gui/plugins_window.ui +++ b/gajim/data/gui/plugins_window.ui @@ -1,22 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-apply</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-cancel</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-preferences</property> - </object> + <requires lib="gtk+" version="3.20"/> <object class="GtkWindow" id="plugins_window"> <property name="width_request">650</property> <property name="height_request">500</property> @@ -29,89 +14,126 @@ <signal name="destroy" handler="on_plugins_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkNotebook" id="plugins_notebook"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> <child> - <object class="GtkNotebook" id="plugins_notebook"> + <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="switch-page" handler="on_plugins_notebook_switch_page" swapped="no"/> + <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="spacing">18</property> <child> - <object class="GtkPaned" id="hpaned1"> + <object class="GtkBox" id="vbox6"> + <property name="width_request">200</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="position">250</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="vbox6"> - <property name="width_request">150</property> + <object class="GtkScrolledWindow" id="scrolledwindow1"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="hscrollbar_policy">never</property> + <property name="shadow_type">out</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow1"> + <object class="GtkTreeView" id="installed_plugins_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="hscrollbar_policy">never</property> - <child> - <object class="GtkTreeView" id="installed_plugins_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection"/> - </child> - </object> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection"/> </child> + <style> + <class name="space"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="install_plugin_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Install Plugin from File</property> + <property name="label" translatable="yes">Install from File…</property> + <property name="use_underline">True</property> + <property name="icon_name">document-open-symbolic</property> + <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">False</property> + <property name="homogeneous">True</property> </packing> </child> <child> - <object class="GtkButton" id="install_plugin_button"> - <property name="label" translatable="yes">Install from ZIP</property> + <object class="GtkToolButton" id="uninstall_plugin_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">start</property> - <property name="image">image1</property> - <signal name="clicked" handler="on_install_plugin_button_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Uninstall Plugin</property> + <property name="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="homogeneous">True</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> - <property name="resize">False</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="width_request">400</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="border_width">6</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="hexpand">False</property> + <property name="spacing">18</property> <child> <object class="GtkLabel" id="plugin_name_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">&lt;empty&gt;</property> + <property name="halign">start</property> + <property name="label" translatable="yes"><Plugin Name></property> <property name="selectable">True</property> - <property name="xalign">0</property> - <attributes> - <attribute name="weight" value="bold"/> - </attributes> + <style> + <class name="large-header"/> + </style> </object> <packing> <property name="expand">False</property> @@ -120,280 +142,242 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkButton" id="configure_plugin_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="label5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Version:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Plugin Settings</property> + <signal name="clicked" handler="on_configure_plugin_button_clicked" swapped="no"/> <child> - <object class="GtkLabel" id="plugin_version_label"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><empty></property> - <property name="selectable">True</property> - <property name="xalign">0</property> + <property name="icon_name">applications-system-symbolic</property> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox" id="hbox2"> - <property name="visible">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkInfoBar" id="available_text"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> + <property name="message_type">error</property> + <child internal-child="action_area"> + <object class="GtkButtonBox"> <property name="can_focus">False</property> <property name="spacing">6</property> + <property name="layout_style">end</property> <child> - <object class="GtkLabel" id="label4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Authors:</property> - <property name="yalign">0</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> + <placeholder/> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + <child internal-child="content_area"> + <object class="GtkBox"> + <property name="can_focus">False</property> + <property name="spacing">16</property> <child> - <object class="GtkLabel" id="plugin_authors_label"> + <object class="GtkLabel" id="available_text_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label"><empty></property> + <property name="wrap">True</property> <property name="wrap_mode">word-char</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> <property name="xalign">0</property> - <property name="yalign">0</property> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="fill">False</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="description"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes"><Description></property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</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="label5"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Version</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="GtkBox" id="hbox3"> + <object class="GtkLabel" id="plugin_version_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Homepage:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLinkButton" id="plugin_homepage_linkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label"><empty></property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkBox" id="vbox3"> + <object class="GtkLabel" id="label4"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <child> - <object class="GtkBox" id="hbox5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkLabel" id="label7"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Description:</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Authors</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">4</property> + <property name="left_attach">0</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox3"> + <object class="GtkLabel" id="plugin_authors_label"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">5</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="uninstall_plugin_button"> - <property name="label" translatable="yes">Uninstall</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image2</property> - <signal name="clicked" handler="on_uninstall_plugin_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="configure_plugin_button"> - <property name="label" translatable="yes">Configure</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="image">image3</property> - <signal name="clicked" handler="on_configure_plugin_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> + <property name="halign">start</property> + <property name="label"><empty></property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="selectable">True</property> + <property name="lines">10</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="label6"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="valign">start</property> + <property name="label" translatable="yes">Homepage</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="plugin_homepage_linkbutton"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes"><empty></property> + <property name="wrap">True</property> + <property name="wrap_mode">word-char</property> + <property name="xalign">0</property> + </object> + <packing> + <property name="left_attach">1</property> + <property name="top_attach">2</property> </packing> </child> </object> <packing> - <property name="resize">True</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> </packing> </child> </object> - </child> - <child type="tab"> - <object class="GtkLabel" id="label1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Installed</property> - </object> <packing> - <property name="tab_fill">False</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> - <child type="tab"> - <placeholder/> - </child> </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <child type="tab"> + <object class="GtkLabel" id="label1"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">15</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">gtk-close</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_close_button_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> + <property name="label" translatable="yes">Installed</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="tab_fill">False</property> </packing> </child> + <child> + <placeholder/> + </child> + <child type="tab"> + <placeholder/> + </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> <object class="GtkTextBuffer" id="textbuffer1"> <property name="text" translatable="yes">Plug-in decription should be displayed here. This text will be erased during PluginsWindow initialization.</property> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -111,14 +111,17 @@ list.settings > row > box { /* Text style */ .bold16 { font-size: 16px; font-weight: bold; } +.large-header { font-size: 20px; font-weight: bold; } .status-away { color: #ff8533;} .status-dnd { color: #e62e00;} .status-online { color: #66bf10;} /* Treeview */ - treeview.space { padding: 6px; } +/* GtkLinkButton style */ +button.flat.link { padding: 0; border: 0; } + /*MessageWindow Notebook*/ .notebook-tab-label {min-width: 80px} ===================================== gajim/plugins/gui.py ===================================== --- a/gajim/plugins/gui.py +++ b/gajim/plugins/gui.py @@ -37,7 +37,6 @@ from enum import IntEnum, unique from gajim import gtkgui_helpers from gajim.dialogs import WarningDialog, YesNoDialog from gajim.filechoosers import ArchiveChooserDialog -from gajim.htmltextview import HtmlTextView from gajim.common import app from gajim.common import configpaths from gajim.plugins.helpers import log_calls @@ -68,16 +67,12 @@ class PluginsWindow(object): 'plugin_version_label', 'plugin_authors_label', 'plugin_homepage_linkbutton', 'uninstall_plugin_button', 'configure_plugin_button', 'installed_plugins_treeview', - 'close_button') + 'available_text', 'available_text_label') for widget_name in widgets_to_extract: setattr(self, widget_name, builder.get_object(widget_name)) - self.plugin_description_textview = HtmlTextView() - self.plugin_description_textview.connect_tooltip() - self.plugin_description_textview.set_wrap_mode(Gtk.WrapMode.WORD) - sw = builder.get_object('scrolledwindow2') - sw.add(self.plugin_description_textview) + self.plugin_description_textview = builder.get_object('description') self.installed_plugins_model = Gtk.ListStore(object, str, bool, bool, GdkPixbuf.Pixbuf) self.installed_plugins_treeview.set_model(self.installed_plugins_model) @@ -116,7 +111,6 @@ class PluginsWindow(object): builder.connect_signals(self) self.plugins_notebook.set_current_page(0) - self.close_button.grab_focus() # Adding GUI extension point for Plugins that want to hook the Plugin Window app.plugin_manager.gui_extension_point('plugin_window', self) @@ -128,9 +122,6 @@ class PluginsWindow(object): if event.keyval == Gdk.KEY_Escape: self.window.destroy() - def on_plugins_notebook_switch_page(self, widget, page, page_num): - GLib.idle_add(self.close_button.grab_focus) - @log_calls('PluginsWindow') def installed_plugins_treeview_selection_changed(self, treeview_selection): model, iter = treeview_selection.get_selected() @@ -144,25 +135,20 @@ class PluginsWindow(object): self.plugin_name_label.set_text(plugin.name) self.plugin_version_label.set_text(plugin.version) self.plugin_authors_label.set_text(plugin.authors) - self.plugin_homepage_linkbutton.set_uri(plugin.homepage) - self.plugin_homepage_linkbutton.set_label(plugin.homepage) - label = self.plugin_homepage_linkbutton.get_children()[0] - label.set_ellipsize(Pango.EllipsizeMode.END) - self.plugin_homepage_linkbutton.set_property('sensitive', True) - - desc_textbuffer = self.plugin_description_textview.get_buffer() - desc_textbuffer.set_text('') - txt = plugin.description - txt.replace('</body>', '') + markup = '<a href="%s">%s</a>' % (plugin.homepage, plugin.homepage) + self.plugin_homepage_linkbutton.set_markup(markup) + if plugin.available_text: - txt += '<br/><br/>' + _('Warning: %s') % plugin.available_text - if not txt.startswith('<body '): - txt = '<body xmlns=\'http://www.w3.org/1999/xhtml\'>' + txt - txt += ' </body>' - self.plugin_description_textview.display_html(txt, - self.plugin_description_textview, None) - - self.plugin_description_textview.set_property('sensitive', True) + text = _('Warning: %s') % plugin.available_text + self.available_text_label.set_text(text) + self.available_text.show() + # Workaround for https://bugzilla.gnome.org/show_bug.cgi?id=710888 + self.available_text.queue_resize() + else: + self.available_text.hide() + + self.plugin_description_textview.set_text(plugin.description) + self.uninstall_plugin_button.set_property( 'sensitive', configpaths.get('PLUGINS_USER') in plugin.__path__) self.configure_plugin_button.set_property( @@ -172,13 +158,9 @@ class PluginsWindow(object): self.plugin_name_label.set_text('') self.plugin_version_label.set_text('') self.plugin_authors_label.set_text('') - self.plugin_homepage_linkbutton.set_uri('') - self.plugin_homepage_linkbutton.set_label('') - self.plugin_homepage_linkbutton.set_property('sensitive', False) + self.plugin_homepage_linkbutton.set_markup('') - desc_textbuffer = self.plugin_description_textview.get_buffer() - desc_textbuffer.set_text('') - self.plugin_description_textview.set_property('sensitive', False) + self.plugin_description_textview.set_text('') self.uninstall_plugin_button.set_property('sensitive', False) self.configure_plugin_button.set_property('sensitive', False) @@ -225,10 +207,6 @@ class PluginsWindow(object): del app.interface.instances['plugins'] @log_calls('PluginsWindow') - def on_close_button_clicked(self, widget): - self.window.destroy() - - @log_calls('PluginsWindow') def on_configure_plugin_button_clicked(self, widget): selection = self.installed_plugins_treeview.get_selection() model, iter = selection.get_selected() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f89169517e2ab6a061518962cf3ffb8cbe… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f89169517e2ab6a061518962cf3ffb8cbe… You're receiving this email because of your account on dev.gajim.org.

1 0

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

16 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 67d9b7a7 by Sophie Herold at 2018-07-16T19:44:38+02:00 Rework Bookmarks Dialog - - - - - 5 changed files: - gajim/common/app.py - gajim/config.py - gajim/data/gui/join_groupchat_window.ui - gajim/data/gui/manage_bookmarks_window.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/common/app.py ===================================== --- a/gajim/common/app.py +++ b/gajim/common/app.py @@ -389,20 +389,34 @@ def get_connected_accounts(): account_list.append(account) return account_list -def get_enabled_accounts_with_labels(exclude_local=True): +def get_enabled_accounts_with_labels(exclude_local=True, connected_only=False, + private_storage_only=False): """ 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') or acc - accounts.append([acc, acc_label]) + if exclude_local and account_is_zeroconf(acc): + continue + if connected_only and not account_is_connected(acc): + continue + if private_storage_only and not account_supports_private_storage(acc): + continue + + acc_label = config.get_per( + 'accounts', acc, 'account_label') or acc + accounts.append([acc, acc_label]) + accounts.sort(key=lambda xs: str.lower(xs[1])) return accounts +def account_is_zeroconf(account): + return connections[account].is_zeroconf + +def account_supports_private_storage(account): + return connections[account].private_storage_supported + def account_is_connected(account): if account not in connections: return False ===================================== gajim/config.py ===================================== --- a/gajim/config.py +++ b/gajim/config.py @@ -1886,19 +1886,14 @@ class ManageBookmarksWindow: # Account-JID, RoomName, Room-JID, Autojoin, Minimize, Password, Nick, # Show_Status - self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str) + self.treestore = Gtk.TreeStore(str, str, str, bool, bool, str, str, str, str) self.treestore.set_sort_column_id(1, Gtk.SortType.ASCENDING) # Store bookmarks in treeview. - for account in app.connections: - if app.connections[account].connected <= 1: - continue - if app.connections[account].is_zeroconf: - continue - if not app.connections[account].private_storage_supported: - continue + for account, account_label in app.get_enabled_accounts_with_labels( + connected_only=True, private_storage_only=True): iter_ = self.treestore.append(None, [None, account, None, None, - None, None, None, None]) + None, None, None, None, account_label]) con = app.connections[account] bookmarks = con.get_module('Bookmarks').bookmarks @@ -1927,7 +1922,8 @@ class ManageBookmarksWindow: minimize, bookmark['password'], bookmark['nick'], - print_status ]) + print_status, + bookmark['name'] ]) self.print_status_combobox = self.xml.get_object('print_status_combobox') model = Gtk.ListStore(str, str) @@ -1935,9 +1931,8 @@ class ManageBookmarksWindow: self.option_list = {'': _('Default'), 'all': Q_('?print_status:All'), 'in_and_out': _('Enter and leave only'), 'none': Q_('?print_status:None')} - opts = sorted(self.option_list.keys()) - for opt in opts: - model.append([self.option_list[opt], opt]) + for opt, label in sorted(self.option_list.items()): + model.append([label, opt]) self.print_status_combobox.set_model(model) self.print_status_combobox.set_active(1) @@ -1947,7 +1942,7 @@ class ManageBookmarksWindow: self.view.expand_all() renderer = Gtk.CellRendererText() - column = Gtk.TreeViewColumn('Bookmarks', renderer, text=1) + column = Gtk.TreeViewColumn('Bookmarks', renderer, text=8) self.view.append_column(column) self.selection = self.view.get_selection() @@ -1968,6 +1963,8 @@ class ManageBookmarksWindow: self.pass_entry.connect('changed', self.on_pass_entry_changed) self.autojoin_checkbutton = self.xml.get_object('autojoin_checkbutton') self.minimize_checkbutton = self.xml.get_object('minimize_checkbutton') + self.settings_box = self.xml.get_object('settings_box') + self.remove_bookmark_button = self.xml.get_object('remove_bookmark_button') self.xml.connect_signals(self) self.window.show_all() @@ -2001,8 +1998,9 @@ class ManageBookmarksWindow: account = model[add_to][1] nick = app.nicks[account] - iter_ = self.treestore.append(add_to, [account, _('New Group Chat'), - '@', False, False, '', nick, 'in_and_out']) + label = _('New Group Chat') + iter_ = self.treestore.append(add_to, [account, label, + '@', False, False, '', nick, 'in_and_out', label]) self.view.expand_row(model.get_path(add_to), True) self.view.set_cursor(model.get_path(iter_)) @@ -2023,6 +2021,7 @@ class ManageBookmarksWindow: model.remove(iter_) self.selection.unselect_all() self.clear_fields() + self.set_sensitive_all(False) self.ignore_events = False def check_valid_bookmark(self): @@ -2099,20 +2098,16 @@ class ManageBookmarksWindow: # this will be None, so we will just: return - widgets = [ self.title_entry, self.nick_entry, self.room_entry, - self.server_entry, self.pass_entry, self.autojoin_checkbutton, - self.minimize_checkbutton, self.print_status_combobox] + if model.iter_parent(iter_): # make the fields sensitive - for field in widgets: - field.set_sensitive(True) + self.set_sensitive_all(True) else: # Top-level has no data (it's the account fields) # clear fields & make them insensitive self.clear_fields() - for field in widgets: - field.set_sensitive(False) + self.set_sensitive_all(False) return # Fill in the data for childs @@ -2238,7 +2233,7 @@ class ManageBookmarksWindow: if iter_: model[iter_][5] = self.pass_entry.get_text() - def on_autojoin_checkbutton_toggled(self, widget): + def on_autojoin_checkbutton_toggled(self, widget, *args): if self.ignore_events: return (model, iter_) = self.selection.get_selected() @@ -2246,7 +2241,7 @@ class ManageBookmarksWindow: model[iter_][3] = self.autojoin_checkbutton.get_active() self.minimize_checkbutton.set_sensitive(model[iter_][3]) - def on_minimize_checkbutton_toggled(self, widget): + def on_minimize_checkbutton_toggled(self, widget, *args): if self.ignore_events: return (model, iter_) = self.selection.get_selected() @@ -2272,6 +2267,13 @@ class ManageBookmarksWindow: self.minimize_checkbutton.set_active(False) self.print_status_combobox.set_active(1) + def set_sensitive_all(self, sensitive): + widgets = [ self.title_entry, self.nick_entry, self.room_entry, + self.server_entry, self.pass_entry, self.settings_box, + self.remove_bookmark_button ] + for field in widgets: + field.set_sensitive(sensitive) + class AccountCreationWizardWindow: def __init__(self): self.xml = gtkgui_helpers.get_gtk_builder( ===================================== gajim/data/gui/join_groupchat_window.ui ===================================== --- a/gajim/data/gui/join_groupchat_window.ui +++ b/gajim/data/gui/join_groupchat_window.ui @@ -110,7 +110,7 @@ <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="label" translatable="yes">Auto Join</property> <property name="justify">right</property> <style> <class name="dim-label"/> ===================================== gajim/data/gui/manage_bookmarks_window.ui ===================================== --- a/gajim/data/gui/manage_bookmarks_window.ui +++ b/gajim/data/gui/manage_bookmarks_window.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.18"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -10,116 +10,124 @@ </object> <object class="GtkWindow" id="manage_bookmarks_window"> <property name="can_focus">False</property> - <property name="border_width">12</property> - <property name="title" translatable="yes">Manage Bookmarks</property> + <property name="title" translatable="yes">Group Chat Bookmarks</property> <property name="default_width">550</property> <property name="default_height">300</property> <property name="type_hint">dialog</property> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> <child> - <object class="GtkBox" id="vbox86"> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">12</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="spacing">18</property> <child> - <object class="GtkBox" id="hbox2965"> + <object class="GtkBox"> + <property name="width_request">220</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">12</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="vbox94"> + <object class="GtkScrolledWindow" id="scrolledwindow37"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow37"> + <object class="GtkTreeView" id="bookmarks_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <child> - <object class="GtkTreeView" id="bookmarks_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="headers_visible">False</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <property name="headers_visible">False</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> + <style> + <class name="space"/> + </style> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkToolbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="show_arrow">False</property> + <property name="icon_size">1</property> + <child> + <object class="GtkToolButton" id="add_bookmark_button"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="use_underline">True</property> + <property name="icon_name">list-add-symbolic</property> + <signal name="clicked" handler="on_add_bookmark_button_clicked" swapped="no"/> </object> <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> + <property name="expand">False</property> + <property name="homogeneous">False</property> </packing> </child> <child> - <object class="GtkButtonBox" id="hbuttonbox25"> + <object class="GtkToolButton" id="remove_bookmark_button"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <property name="layout_style">start</property> - <child> - <object class="GtkButton" id="add_bookmark_button"> - <property name="label">gtk-add</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_add_bookmark_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="remove_bookmark_button"> - <property name="label">gtk-remove</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_remove_bookmark_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="use_underline">True</property> + <property name="icon_name">list-remove-symbolic</property> + <signal name="clicked" handler="on_remove_bookmark_button_clicked" swapped="no"/> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="homogeneous">False</property> </packing> </child> + <style> + <class name="inline-toolbar"/> + </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> - <property name="position">0</property> + <property name="position">1</property> </packing> </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="orientation">vertical</property> + <property name="spacing">18</property> <child> - <object class="GtkGrid" id="grid1"> + <object class="GtkGrid"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="margin_left">6</property> <property name="row_spacing">6</property> - <property name="column_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="label325"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Title:</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Name</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> @@ -127,51 +135,63 @@ </packing> </child> <child> - <object class="GtkLabel" id="label315"> + <object class="GtkEntry" id="title_entry"> + <property name="width_request">230</property> <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> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="tooltip_text" translatable="yes">Bookmark Name</property> + <property name="hexpand">True</property> + <property name="activates_default">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="label316"> + <object class="GtkLabel" id="label317"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Roo_m:</property> + <property name="halign">end</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">_Server</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">2</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label317"> + <object class="GtkEntry" id="server_entry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Server:</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="margin_top">12</property> + <property name="activates_default">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="label318"> + <object class="GtkLabel" id="label315"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">_Password:</property> + <property name="halign">end</property> + <property name="margin_top">12</property> + <property name="label" translatable="yes">_Nickname</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> @@ -179,143 +199,223 @@ </packing> </child> <child> - <object class="GtkBox" id="hbox1"> + <object class="GtkEntry" id="nick_entry"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkCheckButton" id="autojoin_checkbutton"> - <property name="label" translatable="yes">A_uto join</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="tooltip_text" translatable="yes">If checked, Gajim will join this group chat on startup</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_autojoin_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="minimize_checkbutton"> - <property name="label" translatable="yes">Minimi_ze on Auto Join</property> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="use_underline">True</property> - <property name="xalign">0</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_minimize_checkbutton_toggled" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can_focus">True</property> + <property name="margin_top">12</property> + <property name="activates_default">True</property> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">5</property> - <property name="width">2</property> + <property name="left_attach">1</property> + <property name="top_attach">4</property> </packing> </child> <child> - <object class="GtkLabel" id="label326"> + <object class="GtkLabel" id="label316"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="label" translatable="yes">Pr_int status:</property> + <property name="halign">end</property> + <property name="label" translatable="yes">Roo_m</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">6</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="title_entry"> + <object class="GtkEntry" id="room_entry"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="top_attach">2</property> </packing> </child> <child> - <object class="GtkEntry" id="nick_entry"> + <object class="GtkLabel" id="label318"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> + <property name="can_focus">False</property> + <property name="halign">end</property> + <property name="label" translatable="yes">_Password</property> + <property name="use_underline">True</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> + <property name="left_attach">0</property> + <property name="top_attach">3</property> </packing> </child> <child> - <object class="GtkEntry" id="room_entry"> + <object class="GtkEntry" id="pass_entry"> <property name="visible">True</property> <property name="sensitive">False</property> <property name="can_focus">True</property> + <property name="visibility">False</property> + <property name="activates_default">True</property> </object> <packing> <property name="left_attach">1</property> - <property name="top_attach">2</property> + <property name="top_attach">3</property> </packing> </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkListBox" id="settings_box"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="selection_mode">none</property> <child> - <object class="GtkEntry" id="server_entry"> + <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Join chat when connected</property> + <property name="valign">center</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Auto Join</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="autojoin_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <signal name="state-set" handler="on_autojoin_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">3</property> - </packing> </child> <child> - <object class="GtkEntry" id="pass_entry"> + <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="sensitive">False</property> <property name="can_focus">True</property> - <property name="visibility">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="valign">center</property> + <property name="spacing">12</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Minimize on Auto Join</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSwitch" id="minimize_checkbutton"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="halign">end</property> + <signal name="state-set" handler="on_minimize_checkbutton_toggled" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">4</property> - </packing> </child> <child> - <object class="GtkComboBox" id="print_status_combobox"> + <object class="GtkListBoxRow"> <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">False</property> - <property name="model">liststore1</property> - <signal name="changed" handler="on_print_status_combobox_changed" swapped="no"/> + <property name="can_focus">True</property> <child> - <object class="GtkCellRendererText" id="cellrenderertext1"/> - <attributes> - <attribute name="text">0</attribute> - </attributes> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="tooltip_text" translatable="yes">Status messages displayed in chat window</property> + <property name="valign">center</property> + <property name="spacing">18</property> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="halign">start</property> + <property name="label" translatable="yes">Status Messages</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="print_status_combobox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="model">liststore1</property> + <signal name="changed" handler="on_print_status_combobox_changed" swapped="no"/> + <child> + <object class="GtkCellRendererText" id="cellrenderertext1"/> + <attributes> + <attribute name="text">0</attribute> + </attributes> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> </child> </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">6</property> - </packing> </child> + <style> + <class name="settings"/> + </style> </object> <packing> <property name="expand">False</property> @@ -323,49 +423,53 @@ <property name="position">1</property> </packing> </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButtonBox" id="hbuttonbox20"> - <property name="visible">True</property> - <property name="can_focus">False</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">0</property> - </packing> - </child> <child> - <object class="GtkButton" id="ok_button"> - <property name="label">gtk-ok</property> + <object class="GtkButtonBox"> <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_ok_button_clicked" swapped="no"/> + <property name="can_focus">False</property> + <property name="valign">end</property> + <property name="vexpand">True</property> + <property name="spacing">12</property> + <property name="layout_style">end</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label">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> + <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="ok_button"> + <property name="label">OK</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> + <signal name="clicked" handler="on_ok_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">1</property> + </packing> + </child> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> + <property name="fill">True</property> + <property name="position">2</property> </packing> </child> </object> @@ -377,5 +481,8 @@ </child> </object> </child> + <child type="titlebar"> + <placeholder/> + </child> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -74,6 +74,19 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } .PopoverButtonListbox > list > row { padding: 10px 20px 10px 20px; } .PopoverButtonListbox > list > row.activatable:active { box-shadow: none; background-color: @theme_selected_bg_color } +/* Settings ListBox */ + +list.settings { + border: @borders 1px solid; +} +list.settings > row:not(:last-child) { + border-bottom: @theme_unfocused_bg_color 1px solid; +} +list.settings row { min-height: 52px; } +list.settings > row > box { + margin: 6px 18px; +} + /* Accounts Window */ #AccountsWindow > box > stack { padding:30px 30px 30px 30px;} #AccountsWindow scrolledwindow {border: none;} @@ -102,6 +115,10 @@ popover#EmoticonPopover flowboxchild { padding-top: 5px; padding-bottom: 5px; } .status-dnd { color: #e62e00;} .status-online { color: #66bf10;} +/* Treeview */ + +treeview.space { padding: 6px; } + /*MessageWindow Notebook*/ .notebook-tab-label {min-width: 80px} View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/67d9b7a7eaa318945afede4bd4c8298113… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/67d9b7a7eaa318945afede4bd4c8298113… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Register mam handler correctly
by Philipp Hörist 15 Jul '18

15 Jul '18

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8fbafcd8 by Philipp Hörist at 2018-07-15T23:58:21+02:00 Register mam handler correctly - - - - - 1 changed file: - gajim/common/modules/mam.py Changes: ===================================== gajim/common/modules/mam.py ===================================== --- a/gajim/common/modules/mam.py +++ b/gajim/common/modules/mam.py @@ -37,8 +37,8 @@ class MAM: self._account = con.name self.handlers = [ - ('message', self._mam_message_received, nbxmpp.NS_MAM_1), - ('message', self._mam_message_received, nbxmpp.NS_MAM_2) + ('message', self._mam_message_received, '', nbxmpp.NS_MAM_1), + ('message', self._mam_message_received, '', nbxmpp.NS_MAM_2), ] self.available = False View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8fbafcd8fb9b10f0eb41f792d647657d92… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8fbafcd8fb9b10f0eb41f792d647657d92… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add more debug output for handlers
by Philipp Hörist 15 Jul '18

15 Jul '18

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 7bccbcba by Philipp Hörist at 2018-07-15T23:57:01+02:00 Add more debug output for handlers - - - - - 1 changed file: - nbxmpp/dispatcher_nb.py Changes: ===================================== nbxmpp/dispatcher_nb.py ===================================== --- a/nbxmpp/dispatcher_nb.py +++ b/nbxmpp/dispatcher_nb.py @@ -437,21 +437,21 @@ class XMPPDispatcher(PlugIn): # log.info('in dispatch, getting ns for %s, and the ns is %s' # % (stanza, xmlns)) if xmlns not in self.handlers: - log.warning("Unknown namespace: " + xmlns) + log.warning('Unknown namespace: %s', xmlns) xmlns = 'unknown' # features stanza has been handled before if name not in self.handlers[xmlns]: if name != 'features': - log.warning("Unknown stanza: " + name) + log.warning('Unknown stanza: %s', stanza) else: - log.debug("Got %s/%s stanza" % (xmlns, name)) - name='unknown' + log.debug('Got %s/%s stanza' % (xmlns, name)) + name = 'unknown' else: - log.debug("Got %s/%s stanza" % (xmlns, name)) + log.debug('Got %s/%s stanza' % (xmlns, name)) if stanza.__class__.__name__ == 'Node': # FIXME: this cannot work - stanza=self.handlers[xmlns][name][type](node=stanza) + stanza = self.handlers[xmlns][name][type](node=stanza) typ = stanza.getType() if not typ: @@ -459,6 +459,8 @@ class XMPPDispatcher(PlugIn): stanza.props = stanza.getProperties() ID = stanza.getID() + log.debug('type: %s, properties: %s', typ, stanza.props) + # If server supports stream management if self.sm and self.sm.enabled and (stanza.getName() != 'r' and stanza.getName() != 'a' and stanza.getName() != 'enabled' and @@ -498,6 +500,7 @@ class XMPPDispatcher(PlugIn): for handler in chain: if user or handler['system']: try: + log.debug('Call handler: %s', handler['func']) handler['func'](session, stanza) except Exception as typ: if typ.__class__.__name__ != 'NodeProcessed': View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7bccbcbac5b5cb9f1f124cc284… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/7bccbcbac5b5cb9f1f124cc284… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits