Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] make a string not translatable
by Yann Leboulanger 07 Oct '17

07 Oct '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 372c1f99 by Yann Leboulanger at 2017-10-07T14:54:39+02:00 make a string not translatable - - - - - 1 changed file: - gajim/data/gui/privacy_lists_window.ui Changes: ===================================== gajim/data/gui/privacy_lists_window.ui ===================================== --- a/gajim/data/gui/privacy_lists_window.ui +++ b/gajim/data/gui/privacy_lists_window.ui @@ -12,7 +12,7 @@ <property name="visible">True</property> <property name="can_focus">False</property> <property name="border_width">12</property> - <property name="title" translatable="yes">window1</property> + <property name="title">window1</property> <property name="type_hint">dialog</property> <signal name="destroy" handler="on_privacy_lists_first_window_destroy" swapped="no"/> <signal name="key-press-event" handler="on_key_press_event" swapped="no"/> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/372c1f9941e5fcd8d99ffc3d46bf225db2… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/372c1f9941e5fcd8d99ffc3d46bf225db2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Highlight on mention of own real JID in Groupchat
by Philipp Hörist 07 Oct '17

07 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f2fbde6 by Philipp Hörist at 2017-10-07T11:10:53+02:00 Highlight on mention of own real JID in Groupchat Fixes #8752 - - - - - 2a2d4477 by Philipp Hörist at 2017-10-07T11:15:10+02:00 Fix broken highlight sound in Groupchat tim is epoch, time.localtime() a struct_time - - - - - 1 changed file: - gajim/groupchat_control.py Changes: ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -1290,7 +1290,7 @@ class GroupchatControl(ChatControlBase): sound = 'received' # Is it a history message? Don't want sound-floods when we join. - if tim != time.localtime(): + if tim != time.mktime(time.localtime()): sound = None return (highlight, sound) @@ -1320,6 +1320,8 @@ class GroupchatControl(ChatControlBase): """ special_words = app.config.get('muc_highlight_words').split(';') special_words.append(self.nick) + con = app.connections[self.account] + special_words.append(con.get_own_jid().getStripped()) # Strip empties: ''.split(';') == [''] and would highlight everything. # Also lowercase everything for case insensitive compare. special_words = [word.lower() for word in special_words if word] View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cef… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/4e1d296dcfff5836b32132dfb11721cef… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Make Groupchat JID selectable
by Philipp Hörist 07 Oct '17

07 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4e1d296d by Philipp Hörist at 2017-10-07T10:28:43+02:00 Make Groupchat JID selectable Fixes #8753 - - - - - 1 changed file: - gajim/data/gui/groupchat_control.ui Changes: ===================================== gajim/data/gui/groupchat_control.ui ===================================== --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -49,6 +49,7 @@ <property name="can_focus">False</property> <property name="label"><span weight="heavy" size="large">room jid</span></property> <property name="use_markup">True</property> + <property name="selectable">True</property> <property name="xalign">0</property> </object> <packing> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4e1d296dcfff5836b32132dfb11721cefd… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/4e1d296dcfff5836b32132dfb11721cefd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Simplify check_X509.py
by Philipp Hörist 05 Oct '17

05 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 749a01a2 by André Apitzsch at 2017-10-05T21:58:45+02:00 Simplify check_X509.py as pyasn1 and pyOpenSSL are required now - - - - - c57753bd by Philipp Hörist at 2017-10-05T22:38:00+02:00 Merge branch 'ssl' into 'master' Simplify check_X509.py See merge request !140 - - - - - 3 changed files: - gajim/common/check_X509.py - gajim/features_window.py - setup.py Changes: ===================================== gajim/common/check_X509.py ===================================== --- a/gajim/common/check_X509.py +++ b/gajim/common/check_X509.py @@ -1,183 +1,171 @@ import logging log = logging.getLogger('gajim.c.check_X509') -try: - import OpenSSL.SSL - import OpenSSL.crypto - ver = OpenSSL.__version__ - if ver < '0.12': - raise ImportError - from pyasn1.type import univ, constraint, char, namedtype, tag - from pyasn1.codec.der.decoder import decode - from gajim.common.helpers import prep, InvalidFormat - - MAX = 64 - oid_xmppaddr = '1.3.6.1.5.5.7.8.5' - oid_dnssrv = '1.3.6.1.5.5.7.8.7' - - - - class DirectoryString(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType( - 'teletexString', char.TeletexString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'printableString', char.PrintableString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'universalString', char.UniversalString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'utf8String', char.UTF8String().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'bmpString', char.BMPString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'ia5String', char.IA5String().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - namedtype.NamedType( - 'gString', univ.OctetString().subtype( - subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), - ) - - class AttributeValue(DirectoryString): - pass - - class AttributeType(univ.ObjectIdentifier): - pass - - class AttributeTypeAndValue(univ.Sequence): - componentType = namedtype.NamedTypes( - namedtype.NamedType('type', AttributeType()), - namedtype.NamedType('value', AttributeValue()), - ) - - class RelativeDistinguishedName(univ.SetOf): - componentType = AttributeTypeAndValue() - - class RDNSequence(univ.SequenceOf): - componentType = RelativeDistinguishedName() - - class Name(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType('', RDNSequence()), - ) - - class GeneralName(univ.Choice): - componentType = namedtype.NamedTypes( - namedtype.NamedType('otherName', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x0))), - namedtype.NamedType('rfc822Name', char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 1))), - namedtype.NamedType('dNSName', char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 2))), - namedtype.NamedType('x400Address', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x3))), - namedtype.NamedType('directoryName', Name().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x4))), - namedtype.NamedType('ediPartyName', univ.Sequence().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatConstructed, 0x5))), - namedtype.NamedType('uniformResourceIdentifier', - char.IA5String().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 6))), - namedtype.NamedType('iPAddress', univ.OctetString().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 7))), - namedtype.NamedType('registeredID', univ.ObjectIdentifier().subtype( - implicitTag=tag.Tag(tag.tagClassContext, - tag.tagFormatSimple, 8))), - ) - - class GeneralNames(univ.SequenceOf): - componentType = GeneralName() - sizeSpec = univ.SequenceOf.sizeSpec + constraint.ValueSizeConstraint(1, MAX) - - def _parse_asn1(asn1): - obj = decode(asn1, asn1Spec=GeneralNames())[0] - r = {} - for o in obj: - name = o.getName() - if name == 'dNSName': - if name not in r: - r[name] = [] - r[name].append(str(o.getComponent())) - if name == 'otherName': - if name not in r: - r[name] = {} - tag = str(tuple(o.getComponent())[0]) - val = str(tuple(o.getComponent())[1]) - if tag not in r[name]: - r[name][tag] = [] - r[name][tag].append(val) - if name == 'uniformResourceIdentifier': - r['uniformResourceIdentifier'] = True - return r - - def check_certificate(cert, domain): - cnt = cert.get_extension_count() - if '.' in domain: - compared_domain = domain.split('.', 1)[1] - else: - compared_domain = '' - srv_domain = '_xmpp-client.' + domain - compared_srv_domain = '_xmpp-client.' + compared_domain - for i in range(0, cnt): - ext = cert.get_extension(i) - if ext.get_short_name() == b'subjectAltName': - try: - r = _parse_asn1(ext.get_data()) - except: - log.error('Wrong data in certificate: subjectAltName=%s' % \ - ext.get_data()) - continue - if 'otherName' in r: - if oid_xmppaddr in r['otherName']: - for host in r['otherName'][oid_xmppaddr]: - try: - host = prep(None, host, None) - except InvalidFormat: - continue - if host == domain: - return True - if oid_dnssrv in r['otherName']: - for host in r['otherName'][oid_dnssrv]: - if host.startswith('_xmpp-client.*.'): - if host.replace('*.', '', 1) == compared_srv_domain: - return True - continue - if host == srv_domain: - return True - if 'dNSName' in r: - for host in r['dNSName']: - if host.startswith('*.'): - if host[2:] == compared_domain: - return True +import OpenSSL.SSL +import OpenSSL.crypto + +from pyasn1.type import univ, constraint, char, namedtype, tag +from pyasn1.codec.der.decoder import decode +from gajim.common.helpers import prep, InvalidFormat + +MAX = 64 +oid_xmppaddr = '1.3.6.1.5.5.7.8.5' +oid_dnssrv = '1.3.6.1.5.5.7.8.7' + + +class DirectoryString(univ.Choice): + componentType = namedtype.NamedTypes( + namedtype.NamedType( + 'teletexString', char.TeletexString().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'printableString', char.PrintableString().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'universalString', char.UniversalString().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'utf8String', char.UTF8String().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'bmpString', char.BMPString().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'ia5String', char.IA5String().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + namedtype.NamedType( + 'gString', univ.OctetString().subtype( + subtypeSpec=constraint.ValueSizeConstraint(1, MAX))), + ) + +class AttributeValue(DirectoryString): + pass + +class AttributeType(univ.ObjectIdentifier): + pass + +class AttributeTypeAndValue(univ.Sequence): + componentType = namedtype.NamedTypes( + namedtype.NamedType('type', AttributeType()), + namedtype.NamedType('value', AttributeValue()), + ) + +class RelativeDistinguishedName(univ.SetOf): + componentType = AttributeTypeAndValue() + +class RDNSequence(univ.SequenceOf): + componentType = RelativeDistinguishedName() + +class Name(univ.Choice): + componentType = namedtype.NamedTypes( + namedtype.NamedType('', RDNSequence()), + ) + +class GeneralName(univ.Choice): + componentType = namedtype.NamedTypes( + namedtype.NamedType('otherName', univ.Sequence().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatConstructed, 0x0))), + namedtype.NamedType('rfc822Name', char.IA5String().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 1))), + namedtype.NamedType('dNSName', char.IA5String().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 2))), + namedtype.NamedType('x400Address', univ.Sequence().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatConstructed, 0x3))), + namedtype.NamedType('directoryName', Name().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatConstructed, 0x4))), + namedtype.NamedType('ediPartyName', univ.Sequence().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatConstructed, 0x5))), + namedtype.NamedType('uniformResourceIdentifier', + char.IA5String().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 6))), + namedtype.NamedType('iPAddress', univ.OctetString().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 7))), + namedtype.NamedType('registeredID', univ.ObjectIdentifier().subtype( + implicitTag=tag.Tag(tag.tagClassContext, + tag.tagFormatSimple, 8))), + ) + +class GeneralNames(univ.SequenceOf): + componentType = GeneralName() + sizeSpec = univ.SequenceOf.sizeSpec + constraint.ValueSizeConstraint(1, MAX) + +def _parse_asn1(asn1): + obj = decode(asn1, asn1Spec=GeneralNames())[0] + r = {} + for o in obj: + name = o.getName() + if name == 'dNSName': + if name not in r: + r[name] = [] + r[name].append(str(o.getComponent())) + if name == 'otherName': + if name not in r: + r[name] = {} + tag = str(tuple(o.getComponent())[0]) + val = str(tuple(o.getComponent())[1]) + if tag not in r[name]: + r[name][tag] = [] + r[name][tag].append(val) + if name == 'uniformResourceIdentifier': + r['uniformResourceIdentifier'] = True + return r + +def check_certificate(cert, domain): + cnt = cert.get_extension_count() + if '.' in domain: + compared_domain = domain.split('.', 1)[1] + else: + compared_domain = '' + srv_domain = '_xmpp-client.' + domain + compared_srv_domain = '_xmpp-client.' + compared_domain + for i in range(0, cnt): + ext = cert.get_extension(i) + if ext.get_short_name() == b'subjectAltName': + try: + r = _parse_asn1(ext.get_data()) + except: + log.error('Wrong data in certificate: subjectAltName=%s' % \ + ext.get_data()) + continue + if 'otherName' in r: + if oid_xmppaddr in r['otherName']: + for host in r['otherName'][oid_xmppaddr]: + try: + host = prep(None, host, None) + except InvalidFormat: continue if host == domain: return True - if r: - return False - break - - subject = cert.get_subject() - if subject.commonName == domain: - return True - return False -except ImportError: - log.warning('Import of PyOpenSSL or pyasn1 failed. Cannot correctly check ' - 'SSL certificate') - - def check_certificate(cert, domain): - subject = cert.get_subject() - if subject.commonName == domain: - return True - return False + if oid_dnssrv in r['otherName']: + for host in r['otherName'][oid_dnssrv]: + if host.startswith('_xmpp-client.*.'): + if host.replace('*.', '', 1) == compared_srv_domain: + return True + continue + if host == srv_domain: + return True + if 'dNSName' in r: + for host in r['dNSName']: + if host.startswith('*.'): + if host[2:] == compared_domain: + return True + continue + if host == domain: + return True + if r: + return False + break + + subject = cert.get_subject() + if subject.commonName == domain: + return True + return False + ===================================== gajim/features_window.py ===================================== --- a/gajim/features_window.py +++ b/gajim/features_window.py @@ -45,10 +45,6 @@ class FeaturesWindow: # {name: (available_function, unix_text, windows_text)} self.features = { - _('SSL certificate validation'): (self.pyopenssl_available, - _('A library used to validate server certificates to ensure a secure connection.'), - _('Requires python-pyopenssl > 0.12 and pyasn1.'), - _('Requires python-pyopenssl > 0.12 and pyasn1.')), _('Bonjour / Zeroconf'): (self.zeroconf_available, _('Serverless chatting with autodetected clients in a local network.'), _('Requires python-avahi.'), @@ -151,19 +147,6 @@ class FeaturesWindow: text = text + self.features[feature][2] self.desc_label.set_text(text) - def pyopenssl_available(self): - try: - import OpenSSL.SSL - import OpenSSL.crypto - ver = OpenSSL.__version__ - ver_l = [int(i) for i in ver.split('.')] - if ver_l < [0, 12]: - raise ImportError - import pyasn1 - except Exception: - return False - return True - def zeroconf_available(self): return app.HAVE_ZEROCONF ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -271,7 +271,7 @@ setup( install_requires=[ 'dbus-python;sys_platform=="linux"', 'nbxmpp', - 'pyOpenSSL', + 'pyOpenSSL>=0.12', 'pyasn1', ], ) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6d10a5e2cfb7b3063e215c009d2950d8b… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/6d10a5e2cfb7b3063e215c009d2950d8b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix translation strings
by Yann Leboulanger 03 Oct '17

03 Oct '17

Yann Leboulanger pushed to branch master at gajim / gajim Commits: 6d10a5e2 by Yann Leboulanger at 2017-10-03T12:36:31+02:00 fix translation strings - - - - - 2 changed files: - gajim/common/config.py - gajim/data/gui/data_form_window.ui Changes: ===================================== gajim/common/config.py ===================================== --- a/gajim/common/config.py +++ b/gajim/common/config.py @@ -101,7 +101,7 @@ class Config: 'urlmsgcolor': [ opt_color, '#204a87', '', True ], 'notif_signin_color': [ opt_color, '#32CD32', _('Contact signed in notification color.') ], # limegreen 'notif_signout_color': [ opt_color, '#FF0000', _('Contact signout notification color') ], # red - 'notif_message_color': [ opt_color, '#1E90FF', _('New message/email notification color.') ], # dodgerblue + 'notif_message_color': [ opt_color, '#1E90FF', _('New message notification color.') ], # dodgerblue 'notif_ftrequest_color': [ opt_color, '#F0E68C', _('File transfer request notification color.') ], # khaki 'notif_fterror_color': [ opt_color, '#B22222', _('File transfer error notification color.') ], # firebrick 'notif_ftcomplete_color': [ opt_color, '#9ACD32', _('File transfer complete or stopped notification color.') ], # yellowgreen ===================================== gajim/data/gui/data_form_window.ui ===================================== --- a/gajim/data/gui/data_form_window.ui +++ b/gajim/data/gui/data_form_window.ui @@ -5,7 +5,6 @@ <object class="GtkWindow" id="data_form_fake_window"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title" translatable="yes">window1</property> <child> <object class="GtkBox" id="data_form_vbox"> <property name="visible">True</property> View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d10a5e2cfb7b3063e215c009d2950d8be… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6d10a5e2cfb7b3063e215c009d2950d8be… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fuse Emoticons/Authentication with TextView
by Philipp Hörist 03 Oct '17

03 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7bd73e24 by Philipp Hörist at 2017-10-03T03:12:31+02:00 Fuse Emoticons/Authentication with TextView - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/message_textview.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -868,6 +868,11 @@ class ChatControl(ChatControlBase): self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) + context = self.msg_scrolledwindow.get_style_context() + if visible: + context.add_class('authentication') + else: + context.remove_class('authentication') self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -333,12 +333,13 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_scrolledwindow = ScrolledWindow() self.msg_scrolledwindow.set_max_content_height(100) self.msg_scrolledwindow.set_min_content_height(23) + self.msg_scrolledwindow.get_style_context().add_class('scrolledtextview') self.msg_scrolledwindow.set_property('shadow_type', Gtk.ShadowType.IN) self.msg_scrolledwindow.add(self.msg_textview) hbox = self.xml.get_object('hbox') - hbox.pack_end(self.msg_scrolledwindow, True, True, 0) + hbox.pack_start(self.msg_scrolledwindow, True, True, 0) id_ = self.msg_textview.connect('key_press_event', self._on_message_textview_key_press_event) ===================================== gajim/data/gui/chat_control.ui ===================================== --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -598,10 +598,36 @@ <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> - <property name="spacing">3</property> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile</property> + </object> + </child> + <style> + <class name="msgtextview-button"/> + <class name="left"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> <child> <object class="GtkButton" id="authentication_button"> - <property name="name">ChatControl-AuthenticationButton</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> @@ -616,16 +642,18 @@ <property name="icon_size">1</property> </object> </child> + <style> + <class name="msgtextview-button"/> + <class name="right"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="pack_type">end</property> + <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -645,27 +673,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkMenuButton" id="formattings_button"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -687,7 +694,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">0</property> </packing> </child> <child> @@ -700,7 +707,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">2</property> + <property name="position">1</property> </packing> </child> <child> @@ -726,7 +733,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">2</property> </packing> </child> <child> @@ -749,7 +756,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">3</property> </packing> </child> <child> @@ -770,7 +777,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">5</property> + <property name="position">4</property> </packing> </child> <child> @@ -791,7 +798,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">6</property> + <property name="position">5</property> </packing> </child> <child> @@ -818,7 +825,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">6</property> </packing> </child> <child> @@ -845,7 +852,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">8</property> + <property name="position">7</property> </packing> </child> <child> @@ -871,7 +878,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">8</property> </packing> </child> <child> @@ -884,7 +891,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">9</property> </packing> </child> <child> @@ -911,7 +918,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">11</property> + <property name="position">10</property> </packing> </child> <child> @@ -932,7 +939,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">12</property> + <property name="position">11</property> </packing> </child> <child> @@ -1035,7 +1042,7 @@ audio-mic-volume-low</property> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">13</property> + <property name="position">12</property> </packing> </child> <child> @@ -1046,15 +1053,9 @@ audio-mic-volume-low</property> <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">14</property> + <property name="position">13</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/gui/groupchat_control.ui ===================================== --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -126,10 +126,36 @@ <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> - <property name="spacing">3</property> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile</property> + </object> + </child> + <style> + <class name="msgtextview-button"/> + <class name="left"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> <child> <object class="GtkButton" id="authentication_button"> - <property name="name">ChatControl-AuthenticationButton</property> <property name="can_focus">True</property> <property name="focus_on_click">False</property> <property name="receives_default">True</property> @@ -144,16 +170,18 @@ <property name="icon_size">1</property> </object> </child> + <style> + <class name="msgtextview-button"/> + <class name="right"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">0</property> + <property name="pack_type">end</property> + <property name="position">2</property> </packing> </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> @@ -167,27 +195,6 @@ <property name="visible">True</property> <property name="can_focus">False</property> <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> <object class="GtkButton" id="formattings_button"> <property name="visible">True</property> <property name="can_focus">True</property> @@ -209,19 +216,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="vseparator2"> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> + <property name="position">0</property> </packing> </child> <child> @@ -246,7 +241,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">3</property> + <property name="position">1</property> </packing> </child> <child> @@ -271,7 +266,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">4</property> + <property name="position">2</property> </packing> </child> <child> @@ -297,7 +292,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">5</property> + <property name="position">3</property> </packing> </child> <child> @@ -322,7 +317,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">6</property> + <property name="position">4</property> </packing> </child> <child> @@ -334,7 +329,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">7</property> + <property name="position">5</property> </packing> </child> <child> @@ -359,7 +354,7 @@ <packing> <property name="expand">False</property> <property name="fill">False</property> - <property name="position">8</property> + <property name="position">6</property> </packing> </child> <child> @@ -370,7 +365,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">9</property> + <property name="position">7</property> </packing> </child> <child> @@ -391,15 +386,9 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">10</property> + <property name="position">8</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> </object> <packing> <property name="expand">False</property> ===================================== gajim/data/style/gajim.css ===================================== --- a/gajim/data/style/gajim.css +++ b/gajim/data/style/gajim.css @@ -1,7 +1,28 @@ /* Gajim Application CSS File */ -/* ChatControl */ -#ChatControl-AuthenticationButton { padding-top: 0px; padding-bottom: 0px} +.msgtextview-button { + padding: 0px 5px 0px 5px; + background-color: @theme_base_color; + border: 1px solid; + border-radius: 0px; + border-color: @borders; + } + +.msgtextview-button:hover, .msgtextview-button:checked { + color: @theme_base_color; + border-color: @borders; + text-shadow: none; + -gtk-icon-shadow: none; + box-shadow: none; + background-image: none; + } + + +.msgtextview-button.left { border-right: none; } +.msgtextview-button.right { border-left: none; } + +.scrolledtextview { border-left:none; } +.scrolledtextview.authentication { border-right:none; } /* VCardWindow */ .VCard-GtkLinkButton { padding-left: 5px; border-left: none; } ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -801,6 +801,11 @@ class GroupchatControl(ChatControlBase): self.authentication_button.set_tooltip_text(tooltip) self.widget_set_visible(self.authentication_button, not visible) + context = self.msg_scrolledwindow.get_style_context() + if visible: + context.add_class('authentication') + else: + context.remove_class('authentication') self.lock_image.set_sensitive(visible) def _on_authentication_button_clicked(self, widget): ===================================== gajim/message_textview.py ===================================== --- a/gajim/message_textview.py +++ b/gajim/message_textview.py @@ -42,7 +42,7 @@ class MessageTextView(Gtk.TextView): Gtk.TextView.__init__(self) # set properties - self.set_border_width(1) + self.set_border_width(3) self.set_accepts_tab(True) self.set_editable(True) self.set_cursor_visible(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7bd73e24244babcd6cf1b10808734dce64… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7bd73e24244babcd6cf1b10808734dce64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove send button
by Philipp Hörist 02 Oct '17

02 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ef748c6d by Philipp Hörist at 2017-10-03T00:38:47+02:00 Remove send button - - - - - 0b83a675 by Philipp Hörist at 2017-10-03T00:38:47+02:00 Make Groupchat Roster larger - - - - - 5 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== --- a/gajim/chat_control.py +++ b/gajim/chat_control.py @@ -324,11 +324,6 @@ class ChatControl(ChatControlBase): app.events.event_removed_unsubscribe(self.on_event_removed) def _update_toolbar(self): - if (app.connections[self.account].connected > 1 and not \ - self.TYPE_ID == 'pm') or (self.contact.show != 'offline' and \ - self.TYPE_ID == 'pm'): - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(True) # Formatting # TODO: find out what encryption allows for xhtml and which not if self.contact.supports(NS_XHTML_IM): @@ -1648,13 +1643,8 @@ class ChatControl(ChatControlBase): if contact: self.contact = contact self.draw_banner() - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(True) def got_disconnected(self): - # Emoticons button - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(False) # Add to roster self._add_to_roster_button.hide() # Audio button ===================================== gajim/chat_control_base.py ===================================== --- a/gajim/chat_control_base.py +++ b/gajim/chat_control_base.py @@ -353,12 +353,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) - # Hook up send button - widget = self.xml.get_object('send_button') - id_ = widget.connect('clicked', self._on_send_button_clicked) - widget.set_sensitive(False) - self.handlers[id_] = widget - # the following vars are used to keep history of user's messages self.sent_history = [] self.sent_history_pos = 0 @@ -566,20 +560,6 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if event.button == 3: # right click self.parent_win.popup_menu(event) - def _on_send_button_clicked(self, widget): - """ - When send button is pressed: send the current message - """ - message_buffer = self.msg_textview.get_buffer() - emoticons.replace_with_codepoint(message_buffer) - start_iter = message_buffer.get_start_iter() - end_iter = message_buffer.get_end_iter() - message = message_buffer.get_text(start_iter, end_iter, False) - xhtml = self.msg_textview.get_xhtml() - - # send the message - self.send_message(message, xhtml=xhtml) - def _conv_textview_key_press_event(self, widget, event): # translate any layout to latin_layout valid, entries = self.keymap.get_entries_for_keyval(event.keyval) ===================================== gajim/data/gui/chat_control.ui ===================================== --- a/gajim/data/gui/chat_control.ui +++ b/gajim/data/gui/chat_control.ui @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?>  <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkAdjustment" id="adjustment1"> <property name="upper">110</property> <property name="step_increment">1</property> @@ -358,11 +358,6 @@ </object> </child> </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-jump-to</property> - </object> <object class="GtkBox" id="chat_control_hbox"> <property name="can_focus">True</property> <property name="margin_left">7</property> @@ -1055,25 +1050,7 @@ audio-mic-volume-low</property> </packing> </child> <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">_Send</property> - <property name="width_request">80</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_markup" translatable="yes">Send message</property> - <property name="tooltip_text" translatable="yes">Send message</property> - <property name="image">image4</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">15</property> - </packing> + <placeholder/> </child> <child> <placeholder/> ===================================== gajim/data/gui/groupchat_control.ui ===================================== --- a/gajim/data/gui/groupchat_control.ui +++ b/gajim/data/gui/groupchat_control.ui @@ -1,12 +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-jump-to</property> - </object> + <requires lib="gtk+" version="3.20"/> <object class="GtkBox" id="groupchat_control_hbox"> <property name="can_focus">True</property> <child> @@ -166,6 +161,252 @@ <property name="position">1</property> </packing> </child> + <child> + <object class="GtkBox" id="actions_hbox"> + <property name="height_request">34</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <child> + <object class="GtkMenuButton" id="emoticons_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">face-smile</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="formattings_button"> + <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show a list of formattings</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image11"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-bold</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="vseparator2"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton" id="change_nick_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Change your nickname (Ctrl+N)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image4"> + <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> + <property name="stock">gtk-edit</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButton" id="change_subject_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Change the room's subject (Alt+T)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image6"> + <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> + <property name="stock">gtk-properties</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkButton" id="bookmark_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image7"> + <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> + <property name="stock">gtk-add</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkButton" id="history_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="history_image"> + <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> + <property name="stock">gtk-justify-fill</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">6</property> + </packing> + </child> + <child> + <object class="GtkSeparator" id="vseparator4"> + <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> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> + </child> + <child> + <object class="GtkButton" id="muc_window_actions_button"> + <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="image1344"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-execute</property> + <property name="icon_size">1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">8</property> + </packing> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> + <property name="visible">True</property> + <property name="can_focus">False</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">9</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="encryption_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose an encryption</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">channel-secure-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">10</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> </object> <packing> <property name="resize">False</property> @@ -204,268 +445,6 @@ <property name="position">1</property> </packing> </child> - <child> - <object class="GtkBox" id="actions_hbox"> - <property name="height_request">34</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emoticons (Alt+M)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="formattings_button"> - <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show a list of formattings</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="image11"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-bold</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="vseparator2"> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="change_nick_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Change your nickname (Ctrl+N)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="image4"> - <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> - <property name="stock">gtk-edit</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="change_subject_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Change the room's subject (Alt+T)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="image6"> - <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> - <property name="stock">gtk-properties</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> - <child> - <object class="GtkButton" id="bookmark_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Bookmark this room (Ctrl+B)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="image7"> - <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> - <property name="stock">gtk-add</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">5</property> - </packing> - </child> - <child> - <object class="GtkButton" id="history_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Browse the chat history (Ctrl+H)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="history_image"> - <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> - <property name="stock">gtk-justify-fill</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">6</property> - </packing> - </child> - <child> - <object class="GtkSeparator" id="vseparator4"> - <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> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> - </child> - <child> - <object class="GtkButton" id="muc_window_actions_button"> - <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="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="tooltip_text" translatable="yes">Show advanced functions (Alt+D)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="image1344"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-execute</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">8</property> - </packing> - </child> - <child> - <object class="GtkComboBox" id="label_selector"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">9</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose an encryption</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">channel-secure-symbolic</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">10</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">_Send</property> - <property name="width_request">80</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Send message</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <property name="always_show_image">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">11</property> - </packing> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> </object> <packing> <property name="expand">True</property> ===================================== gajim/groupchat_control.py ===================================== --- a/gajim/groupchat_control.py +++ b/gajim/groupchat_control.py @@ -296,8 +296,6 @@ class GroupchatControl(ChatControlBase): # Keep error dialog instance to be sure to have only once at a time self.error_dialog = None - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(False) self.actions_button = self.xml.get_object('muc_window_actions_button') id_ = self.actions_button.connect('clicked', @@ -1439,8 +1437,6 @@ class GroupchatControl(ChatControlBase): if self.parent_win: self.parent_win.redraw_tab(self) - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(True) formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(True) change_nick_button = self.xml.get_object('change_nick_button') @@ -1449,8 +1445,6 @@ class GroupchatControl(ChatControlBase): change_subject_button.set_sensitive(True) def got_disconnected(self): - send_button = self.xml.get_object('send_button') - send_button.set_sensitive(False) formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) change_nick_button = self.xml.get_object('change_nick_button') View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e7d1a2d5118898a0de5808561fb87912a… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/e7d1a2d5118898a0de5808561fb87912a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: Update README
by Philipp Hörist 01 Oct '17

01 Oct '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 09b16810 by Philipp Hörist at 2017-10-01T18:50:16+02:00 Update README - - - - - 6d60022d by Philipp Hörist at 2017-10-01T18:50:20+02:00 Update Requirements - - - - - e7d1a2d5 by Philipp Hörist at 2017-10-01T18:53:57+02:00 Merge branch 'readme' into 'master' Update README See merge request !138 - - - - - 3 changed files: - − README - README.md - setup.py Changes: ===================================== README deleted ===================================== --- a/README +++ /dev/null @@ -1,133 +0,0 @@ -<!DOCTYPE html - PUBLIC "-//W3C//DTD XHTML 1.0 Strict//EN" - "http://www.w3.org/TR/xhtml1/DTD/xhtml1-strict.dtd"> -<html xmlns="http://www.w3.org/1999/xhtml" lang="en" xml:lang="en"> -<head> - <title>Gajim - Read Me</title> - <meta http-equiv="Content-Type" content="text/html; charset=utf-8" /> -</head> -<body> - -<h1>Gajim Read Me</h1> - -<p>Welcome to Gajim and thank you for trying out our client.</p> - -<h2>Runtime Requirements</h2> -<ul> -<li>python3.4 or higher</li> -<li>python3-gi</li> -<li>python3-gi-cairo</li> -<li>gir1.2-gtk-3.0</li> -<li>python3-nbxmpp</li> -</ul> - -<h2>Optional Runtime Requirements</h2> -<ul> -<li>python3-openssl (>=0.14) for <em>secure</em> SSL/TLS. Python's default SSL is insecure, so this package is highly recommended!</li> -<li>python3-pyasn1 to check SSL/TLS certificate</li> -<li>python3-crypto to enable End to end encryption</li> -<li>python3-gnupg to enable GPG encryption</li> -<li>For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi</li> -<li>dnsutils (or whatever package provides the nslookup binary) for SRV support</li> -<li>gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc</li> -<li>gir1.2-secret-1 for GNOME Keyring or KDE support as password storage</li> -<li>gir1.2-notify-0.7 to get cooler popups</li> -<li>D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required.</li> -<li>python3-dbus bindings (>=1.2.0)</li> -<li>gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls</li> -<li>gir1.2-gupnpigd-1.0 for better NAT traversing</li> -<li>gir1.2-networkmanager-1.0 for network lose detection</li> -<li>python3-idna and python3-precis-i18n for correctly parsing JIDs</li> -</ul> - -<p>Some distributions also split too much python standard library. I know SUSE does. In such distros you also need python-xml the xml lib that *comes* with python and not pyxml or whatever.</p> - -<h2>Compile-time Requirements</h2> -<ul> -<li>intltool (>= 0.40.1)</li> -<li>pkg-config</li> -<li>libtool</li> -</ul> - -<p><strong>NOTE:</strong> If you still have problems compiling, you may want to try removing the gtk1 series of the above dependencies.</p> - -<h2>Installation Procedure</h2> -<ol> -<li>tar jxvf gajim-version.tar.bz2</li> -<li>cd gajim</li> -<li>./configure</li> -<li>make (builds translations)</li> -<li>su -c make install</li> -</ol> - -<p>To specify where to install do:</p> -<pre> - ./configure --prefix=custom_path -</pre> - -<h2>Running Gajim</h2> -<p>Just do <em>gajim</em> or you can run Gajim from your GNOME/Xfce/KDE/whatever menus.<br/><br/> -or if you use Git version and you didn't 'make install' you can also run from gajim folder with<em>./launch.py</em></p> -<hr /> -<h3>Note for Git users</h3> -<p>You will need GNU autotools in order to install Gajim from Git. This includes:</p> -<ul> -<li>automake >= 1.8 </li> -<li>autoconf >= 2.59 </li> -<li>libtool</li> -<li>intltool-0.40.1 </li> -<li>pkgconfig >= 0.19</li> -</ul> -<p>steps to compile gajim:</p> -<pre> - $ ./autogen.sh - $ ./configure - $ make -</pre> -<p>Alternatively, if you don't want to install all these packages, you can get a nightly snapshot from <a href="http://www.gajim.org/downloads/snap/">here</a> and procede as usual:</p> -<pre> - $ ./configure - $ make -</pre> -<h2>Uninstallation Procedure</h2> -<pre> - su -c make uninstall -</pre> -<p>this will try to remove Gajim from the default directories. -If you want to remove it from custom directory provide it as: -</p> -<pre> - ./configure --prefix=custom_path - make uninstall -</pre> - -<h2>Miscellaneous</h2> -<h3>XML & Debugging</h3> -<p>If you want to see the xml stanzas and/or help us debugging -you're advised to enable verbose via advanced configuration window. -If you don't want to make this permanent, execute gajim with --verbose -everytime you want to have verbose output.</p> - -<h3>FAQ/Wiki</h3> -<p>FAQ can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq">https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq</a><br/> -Wiki can be found at <a href="https://dev.gajim.org/gajim/gajim/wikis/home">https://dev.gajim.org/gajim/gajim/wikis/home</a></p> - - -<p>That is all, <strong>enjoy!</strong></p> - -<p> -<br/> -<br/> -<br/> -(C) 2003-2017<br/> -The Gajim Team<br/> -https://gajim.org<br/> -<br/> -<br/> - -PS. -We use original art and parts of sounds and other art from Psi, Gossip, -Gnomebaker, Gaim and some icons from various gnome-icons -(mostly Dropline Etiquette) we found at art.gnome.org -If you think we're violating a license please inform us. Thank you.</p> -</body></html> ===================================== README.md ===================================== --- a/README.md +++ b/README.md @@ -1,24 +1,75 @@ -# Welcome to the Gajim project Wiki -The goal of Gajim is to provide a full featured and easy to use Jabber/XMPP client. Gajim works nicely with GNOME, but does not require it to run. It is released under the GNU General Public License. If you find bugs or have ideas how Gajim can be better, please send tickets here. - -## Links - -- [Help and Documentation](https://dev.gajim.org/gajim/gajim/wikis/help/home) - * FAQ, Did you know that... - * Quickstart guides - * Advanced configuration -- [Community](https://dev.gajim.org/gajim/gajim/wikis/community/home) - * Advanced use of gajim - * User groups - * Reviews -- [Development](https://dev.gajim.org/gajim/gajim/wikis/development/home) - * Guidelines and documentation - * How to contribute - * The Gajim team -- Latest release: - * [Gajim 0.16.8 (.tar.gz)](https://gajim.org/downloads/0.16/gajim-0.16.8.tar.gz) - * [Gajim 0.16.8-2 (.exe)](https://gajim.org/downloads/0.16/gajim-0.16.8-2.exe) - * [Gajim 0.16.8-2 portable (.exe)](https://gajim.org/downloads/0.16/gajim-portable-0.16.8-2.exe) - * [Daily snapshot](https://www.gajim.org/downloads/snap/?M=D) - -- [Bug reports and Feature requests](https://dev.gajim.org/gajim/gajim/issues) \ No newline at end of file +# Welcome to Gajim + + +### Runtime Requirements + +- python3.4 or higher +- python3-gi +- python3-gi-cairo +- gir1.2-gtk-3.0 +- python3-nbxmpp +- python3-openssl (>=0.14) +- python3-pyasn1 + + +### Optional Runtime Requirements + +- python3-crypto to enable End to end encryption +- python3-gnupg to enable GPG encryption +- For zeroconf (bonjour), the "enable link-local messaging" checkbox, you need dbus-glib, python-avahi +- dnsutils (or whatever package provides the nslookup binary) for SRV support +- gir1.2-gtkspell3-3.0 and aspell-LANG where lang is your locale eg. en, fr etc +- gir1.2-secret-1 for GNOME Keyring or KDE support as password storage +- D-Bus running to have gajim-remote working. Some distributions split dbus-x11, which is needed for dbus to work with Gajim. Version >= 0.80 is required. +- python3-dbus bindings (>=1.2.0) +- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls +- gir1.2-gupnpigd-1.0 for better NAT traversing +- gir1.2-networkmanager-1.0 for network lose detection +- python3-idna and python3-precis-i18n for correctly parsing JIDs + +### Compile-time Requirements + +- python-setuptools + + +### Installation Procedure + +##### Linux / Mac + +``./setup.py install --root=/`` + +or + +``pip install .`` (python-pip is required) + +##### Windows + +see [README](./win/README.md) + +### Miscellaneous + +##### Snapshots + +- [Daily Linux](https://www.gajim.org/downloads/snap/?M=D) +- [Daily Windows](https://gajim.org/downloads/snap/win) + + +##### Debugging + +Execute gajim with --verbose + +##### Links + +- [FAQ](https://dev.gajim.org/gajim/gajim/wikis/help/gajimfaq) +- [Wiki](https://dev.gajim.org/gajim/gajim/wikis/home) + + + +That is all, **enjoy**! + +(C) 2003-2017 +The Gajim Team +[https://gajim.org](https://gajim.org) + + +We use original art and parts of sounds and other art from Psi, Gossip, Gnomebaker, Gaim and some icons from various gnome-icons (mostly Dropline Etiquette) we found at art.gnome.org If you think we're violating a license please inform us. Thank you. \ No newline at end of file ===================================== setup.py ===================================== --- a/setup.py +++ b/setup.py @@ -271,6 +271,7 @@ setup( install_requires=[ 'dbus-python;sys_platform=="linux"', 'nbxmpp', - 'pyOpenSSL' + 'pyOpenSSL', + 'pyasn1', ], ) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ab23757f09a8cb194ebf0a4441fb44f16… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/ab23757f09a8cb194ebf0a4441fb44f16… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Use curl for Windows build instead of wget
by Philipp Hörist 30 Sep '17

30 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: ab23757f by Philipp Hörist at 2017-09-30T18:00:39+02:00 Use curl for Windows build instead of wget wget seems to be broken currently on appveyor - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== --- a/win/_base.sh +++ b/win/_base.sh @@ -130,7 +130,7 @@ function install_gajim { "${QL_VERSION}" "${MINGW_ROOT}"/bin # Install plugin installer - wget -P "${BUILD_ROOT}" -c https://ftp.gajim.org/plugins_1/plugin_installer.zip + curl -o "${BUILD_ROOT}"/plugin_installer.zip https://ftp.gajim.org/plugins_1/plugin_installer.zip mkdir "${PACKAGE_DIR}"/gajim/data/plugins 7z x -o"${PACKAGE_DIR}"/gajim/data/plugins "${BUILD_ROOT}"/plugin_installer.zip View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab23757f09a8cb194ebf0a4441fb44f169… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/ab23757f09a8cb194ebf0a4441fb44f169… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Set message as read before removing an event
by Philipp Hörist 29 Sep '17

29 Sep '17

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6f472cc1 by Philipp Hörist at 2017-09-29T12:41:26+02:00 Set message as read before removing an event When we receive carbons of a conversation, we remove the events once we receive a carbon from ourself, because that means we anwered from another device. This sets these removed messages also as read in the unread_message table, so they dont popup on restart. - - - - - 1 changed file: - gajim/session.py Changes: ===================================== gajim/session.py ===================================== --- a/gajim/session.py +++ b/gajim/session.py @@ -247,6 +247,12 @@ class ChatControlSession(stanza_session.EncryptedStanzaSession): # Its a Carbon Copied Message we sent obj.show_in_roster = False obj.show_in_systray = False + unread_events = app.events.get_events( + self.conn.name, fjid, types=['chat']) + read_ids = [] + for msg in unread_events: + read_ids.append(msg.msg_log_id) + app.logger.set_read_messages(read_ids) app.events.remove_events(self.conn.name, fjid, types=['chat']) do_event = False else: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f472cc120142691c6a46ff95cb494b941… --- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/6f472cc120142691c6a46ff95cb494b941… 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