Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 7 commits: Contacts: Make is_groupchat a property
by Philipp Hörist 19 Jun '19

19 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 668048c3 by Philipp Hörist at 2019-06-19T21:39:53Z Contacts: Make is_groupchat a property - - - - - a11ce9da by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Move join into MUC module - - - - - a87a4699 by Philipp Hörist at 2019-06-19T21:39:53Z Windows: Fix appveyor build - - - - - 99cf0c7b by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Add MUCState This will help to better track the various states a MUC is in and to act on it - - - - - 3626505e by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Resolve nickname conflicts automatically - - - - - 501b993b by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Add dedicated leave() method - - - - - 4e47062a by Philipp Hörist at 2019-06-19T21:39:53Z MUC: Refactor sending status presence - - - - - 13 changed files: - appveyor.yml - gajim/command_system/implementation/standard.py - gajim/common/connection.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/modules/chatstates.py - gajim/common/modules/muc.py - gajim/common/structs.py - gajim/groupchat_control.py - gajim/gtk/dialogs.py - gajim/gtk/single_message.py - gajim/gui_interface.py - gajim/roster_window.py Changes: ===================================== appveyor.yml ===================================== @@ -20,6 +20,10 @@ clone_depth: 1 build_script: - del C:\Windows\System32\libssl-*.dll C:\Windows\system32\libcrypto-*.dll - del C:\Windows\SysWOW64\libssl-*.dll C:\Windows\SysWOW64\libcrypto-*.dll + # Temporary fix until appveyor updates its msys build https://github.com/msys2/MINGW-packages/issues/5437 + - C:\msys64\usr\bin\pacman -Rdd mingw-w64-i686-ncurses mingw-w64-i686-termcap mingw-w64-i686-gcc-ada mingw-w64-i686-gcc-objc --noconfirm --noprogressbar + - C:\msys64\usr\bin\pacman -Rdd mingw-w64-x86_64-ncurses mingw-w64-x86_64-termcap mingw-w64-x86_64-gcc-ada mingw-w64-x86_64-gcc-objc --noconfirm --noprogressbar + - C:\msys64\usr\bin\pacman -Syuu --needed --noconfirm --noprogressbar --overwrite \\* - ps: | $env:TIME_STRING=(get-date -UFormat "%Y-%m-%d").ToString() ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -258,7 +258,9 @@ class StandardGroupChatCommands(CommandContainer): new_nick = helpers.parse_resource(new_nick) except Exception: raise CommandError(_("Invalid nickname")) - self.connection.join_gc(new_nick, self.room_jid, None, change_nick=True) + # FIXME: Check state of MUC + self.connection.get_module('MUC').change_nick( + self.room_jid, new_nick) self.new_nick = new_nick @command('query', raw=True) ===================================== gajim/common/connection.py ===================================== @@ -1638,35 +1638,6 @@ class Connection(CommonConnection, ConnectionHandlers): show=show, caps=ptype != 'unavailable') - def join_gc(self, nick, room_jid, password, change_nick=False, - rejoin=False): - # FIXME: This room JID needs to be normalized; see #1364 - if not app.account_is_connected(self.name): - return - show = helpers.get_xmpp_show(app.SHOW_LIST[self.connected]) - if show == 'invisible': - # Never join a room when invisible - return - - self.get_module('Discovery').disco_muc( - room_jid, partial(self._join_gc, nick, show, room_jid, - password, change_nick, rejoin)) - - def _join_gc(self, nick, show, room_jid, password, change_nick, rejoin): - if change_nick: - self.get_module('Presence').send_presence( - '%s/%s' % (room_jid, nick), - show=show, - status=self.status) - else: - self.get_module('MUC').send_muc_join_presence( - '%s/%s' % (room_jid, nick), - show=show, - status=self.status, - room_jid=room_jid, - password=password, - rejoin=rejoin) - def _nec_gc_message_outgoing(self, obj): if obj.account != self.name: return @@ -1719,30 +1690,6 @@ class Connection(CommonConnection, ConnectionHandlers): automatic_message=obj.automatic_message, stanza_id=obj.stanza_id, additional_data=obj.additional_data)) - def send_gc_status(self, nick, jid, show, status, auto=False): - if not app.account_is_connected(self.name): - return - if show == 'invisible': - show = 'offline' - ptype = None - if show == 'offline': - ptype = 'unavailable' - xmpp_show = helpers.get_xmpp_show(show) - - idle_time = None - if auto and app.is_installed('IDLE') and app.config.get('autoaway'): - idle_sec = idle.Monitor.get_idle_sec() - idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', - time.gmtime(time.time() - idle_sec)) - - self.get_module('Presence').send_presence( - '%s/%s' % (jid, nick), - typ=ptype, - show=xmpp_show, - status=status, - caps=ptype != 'unavailable', - idle_time=idle_time) - def unregister_account(self, on_remove_success): self._unregister_account = True self._unregister_account_cb = on_remove_success ===================================== gajim/common/const.py ===================================== @@ -200,6 +200,15 @@ class URIAction(Enum): SUBSCRIBE = 'subscribe' +class MUCJoinedState(Enum): + JOINED = 'joined' + NOT_JOINED = 'not joined' + JOINING = 'joining' + + def __str__(self): + return self.name + + EME_MESSAGES = { 'urn:xmpp:otr:0': _('This message was encrypted with OTR ' ===================================== gajim/common/contacts.py ===================================== @@ -108,6 +108,10 @@ class CommonContact(XMPPEntity): def is_pm_contact(self): return self._is_pm_contact + @property + def is_groupchat(self): + return False + def get_full_jid(self): raise NotImplementedError @@ -178,7 +182,7 @@ class Contact(CommonContact): def get_shown_groups(self): if self.is_observer(): return [_('Observers')] - if self.is_groupchat(): + if self.is_groupchat: return [_('Groupchats')] if self.is_transport(): return [_('Transports')] @@ -211,6 +215,7 @@ class Contact(CommonContact): is_observer = True return is_observer + @property def is_groupchat(self): return self._is_groupchat @@ -524,7 +529,7 @@ class Contacts(): self._contacts = {} def add_contact(self, contact): - if contact.jid not in self._contacts or contact.is_groupchat(): + if contact.jid not in self._contacts or contact.is_groupchat: self._contacts[contact.jid] = [contact] return contacts = self._contacts[contact.jid] @@ -591,7 +596,7 @@ class Contacts(): def get_groupchat_contact(self, jid): if jid in self._contacts: contacts = self._contacts[jid] - if contacts[0].is_groupchat(): + if contacts[0].is_groupchat: return contacts[0] def get_avatar(self, jid, size, scale): @@ -630,7 +635,7 @@ class Contacts(): def get_contacts_jid_list(self): return [jid for jid, contact in self._contacts.items() if not - contact[0].is_groupchat()] + contact[0].is_groupchat] def get_contact_from_full_jid(self, fjid): """ ===================================== gajim/common/modules/chatstates.py ===================================== @@ -229,7 +229,7 @@ class Chatstate(BaseModule): if self._get_chatstate_setting(contact) == 'disabled': return None - if not contact.is_groupchat(): + if not contact.is_groupchat: # Dont send chatstates to ourself if self._con.get_own_jid().bareMatch(contact.jid): return None @@ -283,7 +283,7 @@ class Chatstate(BaseModule): 'jid': contact.jid, 'chatstate': str(State.ACTIVE)} - if contact.is_groupchat(): + if contact.is_groupchat: if contact.is_connected: app.nec.push_outgoing_event( GcMessageOutgoingEvent(None, **event_attrs)) @@ -296,7 +296,7 @@ class Chatstate(BaseModule): self._last_keyboard_activity.pop(contact.jid, None) return - if not contact.is_groupchat(): + if not contact.is_groupchat: # Dont leak presence to contacts # which are not allowed to see our status if not contact.is_pm_contact: @@ -328,7 +328,7 @@ class Chatstate(BaseModule): 'jid': contact.jid, 'chatstate': str(state)} - if contact.is_groupchat(): + if contact.is_groupchat: if contact.is_connected: app.nec.push_outgoing_event( GcMessageOutgoingEvent(None, **event_attrs)) @@ -355,7 +355,7 @@ class Chatstate(BaseModule): @staticmethod def _get_chatstate_setting(contact): - if contact.is_groupchat(): + if contact.is_groupchat: default = app.config.get('send_chatstate_muc_default') return app.config.get_per( 'rooms', contact.jid, 'send_chatstate', default) ===================================== gajim/common/modules/muc.py ===================================== @@ -17,17 +17,22 @@ import time import logging +from functools import partial import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType +from nbxmpp.const import Error from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result from gajim.common import app from gajim.common import helpers from gajim.common.const import KindConstant +from gajim.common.const import MUCJoinedState +from gajim.common.structs import MUCData from gajim.common.helpers import AdditionalDataDict +from gajim.common import idle from gajim.common.caps_cache import muc_caps_cache from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data @@ -65,6 +70,7 @@ class MUC(BaseModule): priority=49), StanzaHandler(name='presence', callback=self._on_muc_presence, + typ='error', ns=nbxmpp.NS_MUC, priority=49), StanzaHandler(name='message', @@ -96,6 +102,8 @@ class MUC(BaseModule): self._register_callback('request_config', self._config_received) + self._muc_data = {} + def pass_disco(self, from_, identities, features, _data, _node): for identity in identities: if identity.get('category') != 'conference': @@ -108,24 +116,91 @@ class MUC(BaseModule): self._con.muc_jid['jabber'] = from_ raise nbxmpp.NodeProcessed - def send_muc_join_presence(self, *args, room_jid=None, password=None, - rejoin=False, **kwargs): + def _get_muc_data(self, room_jid): + return self._muc_data[room_jid] + + def _set_muc_state(self, room_jid, state): + if self._muc_data[room_jid].state == state: + return + self._log.info('Set MUC state: %s %s', room_jid, state) + self._muc_data[room_jid].state = state + + def _get_muc_state(self, room_jid): + return self._muc_data[room_jid].state + + def join(self, room_jid, nick, password, rejoin=False): if not app.account_is_connected(self._account): return + + self._muc_data[room_jid] = MUCData(room_jid, nick, password, rejoin) + + self._con.get_module('Discovery').disco_muc( + room_jid, partial(self._join, room_jid)) + + def _join(self, room_jid): + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + muc = self._get_muc_data(room_jid) + presence = self._con.get_module('Presence').get_presence( - *args, **kwargs) + '%s/%s' % (room_jid, muc.nick), + show=show, + status=self._con.status) muc_x = presence.setTag(nbxmpp.NS_MUC + ' x') if room_jid is not None: - self._add_history_query(muc_x, room_jid, rejoin) + self._add_history_query(muc_x, room_jid, muc.rejoin) - if password is not None: - muc_x.setTagData('password', password) - - self._log.debug('Send MUC join presence:\n%s', presence) + if muc.password is not None: + muc_x.setTagData('password', muc.password) + self._log.info('Join MUC: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.JOINING) self._con.connection.send(presence) + def leave(self, room_jid): + self._log.info('Leave MUC: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) + muc = self._get_muc_data(room_jid) + self._con.get_module('Presence').send_presence( + '%s/%s' % (room_jid, muc.nick), + typ='unavailable') + + def send_muc_presence(self, room_jid, auto=False): + show = app.SHOW_LIST[self._con.connected] + if show in ('invisible', 'offline'): + # FIXME: Check if this + return + + muc = self._get_muc_data(room_jid) + status = self._con.status + + xmpp_show = helpers.get_xmpp_show(show) + + idle_time = None + if auto and app.is_installed('IDLE') and app.config.get('autoaway'): + idle_sec = idle.Monitor.get_idle_sec() + idle_time = time.strftime('%Y-%m-%dT%H:%M:%SZ', + time.gmtime(time.time() - idle_sec)) + + full_jid = '%s/%s' % (room_jid, muc.nick) + + self._log.info('Send presence: %s, show: %s, status: %s, idle_time: %s', + full_jid, xmpp_show, status, idle_time) + + self._con.get_module('Presence').send_presence( + full_jid, + show=xmpp_show, + status=status, + caps=True, + idle_time=idle_time) + + def change_nick(self, room_jid, new_nick): + show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) + self._con.get_module('Presence').send_presence( + '%s/%s' % (room_jid, new_nick), + show=show, + status=self._con.status) + def _add_history_query(self, muc_x, room_jid, rejoin): last_date = app.logger.get_room_last_message_time( self._account, room_jid) @@ -159,19 +234,32 @@ class MUC(BaseModule): muc_x.setTag('history', tags) def _on_muc_presence(self, _con, _stanza, properties): - if properties.type == PresenceType.ERROR: - self._raise_muc_event('muc-presence-error', properties) + muc = self._get_muc_data(properties.jid.getBare()) + if (properties.error.type == Error.CONFLICT and + muc.state == MUCJoinedState.JOINING): + muc.nick += '_' + self._log.info('Nickname conflict: %s change to %s', + muc.jid, muc.nick) + self._join(muc.jid) return + self._raise_muc_event('muc-presence-error', properties) - def _on_muc_user_presence(self, _con, _stanza, properties): + def _on_muc_user_presence(self, _con, stanza, properties): if properties.type == PresenceType.ERROR: return + room_jid = properties.jid.getBare() + if room_jid not in self._muc_data: + self._log.warning('Presence from unknown MUC') + self._log.warning(stanza) + return + if properties.is_muc_destroyed: for contact in app.contacts.get_gc_contact_list( - self._account, properties.jid.getBare()): + self._account, room_jid): contact.presence = PresenceType.UNAVAILABLE - self._log.info('MUC destroyed: %s', properties.jid.getBare()) + self._log.info('MUC destroyed: %s', room_jid) + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-destroyed', properties) return @@ -186,6 +274,7 @@ class MUC(BaseModule): self._log.info('Nickname changed: %s to %s', properties.jid, properties.muc_user.nick) + self._get_muc_data(room_jid).nick = properties.muc_user.nick self._raise_muc_event('muc-nickname-changed', properties) return @@ -200,6 +289,7 @@ class MUC(BaseModule): return if properties.is_muc_self_presence and properties.is_kicked: + self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-self-kicked', properties) return @@ -337,6 +427,10 @@ class MUC(BaseModule): subject=properties.subject, nickname=properties.muc_nickname, user_timestamp=properties.user_timestamp)) + + if self._get_muc_state(jid) == MUCJoinedState.JOINING: + self._set_muc_state(jid, MUCJoinedState.JOINED) + raise nbxmpp.NodeProcessed def _on_voice_request(self, _con, _stanza, properties): ===================================== gajim/common/structs.py ===================================== @@ -14,5 +14,48 @@ from collections import namedtuple +from gajim.common.const import MUCJoinedState + URI = namedtuple('URI', 'type action data') URI.__new__.__defaults__ = (None, None) # type: ignore + + +class MUCData: + def __init__(self, room_jid, nick, password, rejoin): + self._room_jid = room_jid + self._nick = nick + self._password = password + self._rejoin = rejoin + self._state = MUCJoinedState.NOT_JOINED + + @property + def jid(self): + return self._room_jid + + @property + def nick(self): + return self._nick + + @nick.setter + def nick(self, value): + self._nick = value + + @property + def password(self): + return self._password + + @property + def state(self): + return self._state + + @state.setter + def state(self, value): + self._state = value + + @property + def rejoin(self): + return self._rejoin + + @rejoin.setter + def rejoin(self, value): + self._rejoin = value ===================================== gajim/groupchat_control.py ===================================== @@ -1123,9 +1123,8 @@ class GroupchatControl(ChatControlBase): def _nec_vcard_published(self, obj): if obj.conn.name != self.account: return - show = app.SHOW_LIST[obj.conn.connected] - status = obj.conn.status - obj.conn.send_gc_status(self.nick, self.room_jid, show, status) + + obj.conn.get_module('MUC').send_muc_presence(self.room_jid) def _nec_update_avatar(self, obj): if obj.contact.room_jid != self.room_jid: @@ -1474,7 +1473,8 @@ class GroupchatControl(ChatControlBase): if obj.conn.name != self.account: return password = app.gc_passwords.get(self.room_jid, '') - obj.conn.join_gc(self.nick, self.room_jid, password, rejoin=True) + obj.conn.get_module('MUC').join(self.room_jid, self.nick, password, + rejoin=True) def _nec_decrypted_message_received(self, obj): if obj.conn.name != self.account: @@ -1610,8 +1610,8 @@ class GroupchatControl(ChatControlBase): if not self.autorejoin: return False password = app.gc_passwords.get(self.room_jid, '') - app.connections[self.account].join_gc(self.nick, self.room_jid, - password, rejoin=True) + app.connections[self.account].get_module('MUC').join( + self.room_jid, self.nick, password, rejoin=True) return True def draw_roster(self): @@ -2077,11 +2077,6 @@ class GroupchatControl(ChatControlBase): _('You are not in the members ' 'list in groupchat %s.') % self.room_jid) - elif error_type == Error.CONFLICT: - win = None if self.parent_win is None else self.parent_win.window - app.interface.handle_ask_new_nick( - self.account, self.room_jid, win) - else: self.add_info_message( 'Error %s: %s' % (error_type.value, error_message)) @@ -2297,8 +2292,7 @@ class GroupchatControl(ChatControlBase): app.ged.remove_event_handler(*handler) if self.is_connected: - app.connections[self.account].send_gc_status(self.nick, - self.room_jid, show='offline', status=status) + app.connections[self.account].get_module('MUC').leave(self.room_jid) nick_list = app.contacts.get_nick_list(self.account, self.room_jid) for nick in nick_list: ===================================== gajim/gtk/dialogs.py ===================================== @@ -771,8 +771,8 @@ class ChangeNickDialog(InputDialogCheck): self.on_ok(nick, self.is_checked()) def on_ok(self, nick, is_checked): - app.connections[self.account].join_gc(nick, self.room_jid, None, - change_nick=self.change_nick) + app.connections[self.account].get_module('MUC').change_nick( + self.room_jid, nick) if app.gc_connected[self.account][self.room_jid]: # We are changing nick, we will change self.nick when we receive # presence that inform that it works ===================================== gajim/gtk/single_message.py ===================================== @@ -145,7 +145,7 @@ class SingleMessageWindow(Gtk.ApplicationWindow): if not c: # Groupchat is maybe already destroyed return - if c.is_groupchat() and self.from_whom not in \ + if c.is_groupchat and self.from_whom not in \ app.interface.minimized_controls[self.account] and self.action == \ 'receive' and app.events.get_nb_roster_events(self.account, self.from_whom, types=['chat', 'normal']) == 0: ===================================== gajim/gui_interface.py ===================================== @@ -103,7 +103,6 @@ from gajim.gtk.dialogs import YesNoDialog from gajim.gtk.dialogs import PassphraseDialog from gajim.gtk.dialogs import PlainConnectionDialog from gajim.gtk.dialogs import SSLErrorDialog -from gajim.gtk.dialogs import ChangeNickDialog from gajim.gtk.dialogs import InvitationReceivedDialog from gajim.gtk.profile import ProfileWindow from gajim.gtk.join_groupchat import JoinGroupchatWindow @@ -160,19 +159,6 @@ class Interface: def raise_dialog(name, *args, **kwargs): get_dialog(name, *args, **kwargs) - def handle_ask_new_nick(self, account, room_jid, parent_win): - title = _('Unable to join group chat') - prompt = _('Your desired nickname in group chat\n' - '<b>%s</b>\n' - 'is in use or registered by another occupant.\n' - 'Please specify another nickname below:') % room_jid - if 'change_nick_dialog' in self.instances: - self.instances['change_nick_dialog'].add_room( - account, room_jid, prompt) - else: - self.instances['change_nick_dialog'] = ChangeNickDialog( - account, room_jid, title, prompt, transient_for=parent_win) - @staticmethod def handle_event_http_auth(obj): #('HTTP_AUTH', account, (method, url, transaction_id, iq_obj, msg)) @@ -270,7 +256,8 @@ class Interface: def handle_gc_password_required(self, account, room_jid, nick): def on_ok(text): - app.connections[account].join_gc(nick, room_jid, text) + app.connections[account].get_module('MUC').join( + room_jid, nick, text) app.gc_passwords[room_jid] = text gc_control.error_dialog = None @@ -1591,7 +1578,7 @@ class Interface: """ if app.contacts.get_contact(account, room_jid) and \ - not app.contacts.get_contact(account, room_jid).is_groupchat(): + not app.contacts.get_contact(account, room_jid).is_groupchat: ErrorDialog( _('This is not a group chat'), _('%(room_jid)s is already in your roster. Please check ' @@ -1644,7 +1631,8 @@ class Interface: gc_control.parent_win.set_active_tab(gc_control) # Connect - app.connections[account].join_gc(nick, room_jid, password) + app.connections[account].get_module('MUC').join( + room_jid, nick, password) if password: app.gc_passwords[room_jid] = password ===================================== gajim/roster_window.py ===================================== @@ -424,7 +424,7 @@ class RosterWindow: if contact.is_transport(): typestr = 'agent' - elif contact.is_groupchat(): + elif contact.is_groupchat: typestr = 'groupchat' else: typestr = 'contact' @@ -836,7 +836,7 @@ class RosterWindow: Remove groupchat from roster and redraw account and group """ contact = app.contacts.get_contact_with_highest_priority(account, jid) - if contact.is_groupchat(): + if contact.is_groupchat: if jid in app.interface.minimized_controls[account]: del app.interface.minimized_controls[account][jid] self.remove_contact(jid, account, force=True, backend=True, maximize=maximize) @@ -2120,9 +2120,8 @@ class RosterWindow: list(app.interface.minimized_controls[account].values()): if gc_control.account == account: if app.gc_connected[account][gc_control.room_jid]: - app.connections[account].send_gc_status( - gc_control.nick, gc_control.room_jid, status, txt, - auto=auto) + app.connections[account].get_module('MUC').send_muc_presence( + gc_control.room_jid, auto=auto) if was_invisible and status != 'offline': # We come back from invisible, join bookmarks con = app.connections[account] @@ -2179,7 +2178,7 @@ class RosterWindow: keep_pep = any(c.show not in ('error', 'offline') for c in contact_instances) if not keep_pep and contact.jid != app.get_jid_from_account(account) \ - and not contact.is_groupchat(): + and not contact.is_groupchat: self.delete_pep(contact.jid, account) # Redraw everything and select the sender @@ -3622,7 +3621,7 @@ class RosterWindow: resource = None contact = app.contacts.get_contact_with_highest_priority(account, jid) titer = model.get_iter(path) - if contact.is_groupchat(): + if contact.is_groupchat: first_ev = app.events.get_first_event(account, jid) if first_ev and self.open_event(account, jid, first_ev): # We are invited to a GC View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f828118f2af25c2fa8d3d2c5054a00c84… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/f828118f2af25c2fa8d3d2c5054a00c84… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] FileChooser: Fix deprecation warnings
by Philipp Hörist 18 Jun '19

18 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: f828118f by Daniel Brötzmann at 2019-06-18T10:40:23Z FileChooser: Fix deprecation warnings Fixes PyGIDeprecationWarning: GObject.GError is deprecated and button initialization, see: https://wiki.gnome.org/action/show/Projects/PyGObject/ InitializerDeprecations?action=show&redirect=PyGObject%2FInitializerDeprecations - - - - - 1 changed file: - gajim/gtk/filechoosers.py Changes: ===================================== gajim/gtk/filechoosers.py ===================================== @@ -21,7 +21,7 @@ from pathlib import Path from gi.repository import Gtk from gi.repository import GdkPixbuf -from gi.repository import GObject +from gi.repository import GLib from gajim.common import app from gajim.common.i18n import _ @@ -76,7 +76,7 @@ class BaseFileChooser: try: pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_size( path_to_file, *self._preivew_size) - except GObject.GError: + except GLib.GError: preview.clear() return filechooser.get_preview_widget().set_from_pixbuf(pixbuf) @@ -173,10 +173,12 @@ class GtkFileChooserDialog(Gtk.FileChooserDialog, BaseFileChooser): self, title=self._title, action=self._action, - buttons=[Gtk.STOCK_CANCEL, Gtk.ResponseType.CANCEL, - Gtk.STOCK_OPEN, Gtk.ResponseType.ACCEPT], transient_for=transient_for) + self.add_button(_('_Cancel'), Gtk.ResponseType.CANCEL) + open_button = self.add_button(_('_Open'), Gtk.ResponseType.ACCEPT) + open_button.get_style_context().add_class('suggested-action') + self.set_current_folder(path or str(Path.home())) if file_name is not None: self.set_current_name(file_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f828118f2af25c2fa8d3d2c5054a00c840… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/f828118f2af25c2fa8d3d2c5054a00c840… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove log message
by Philipp Hörist 16 Jun '19

16 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 835cf86c by Philipp Hörist at 2019-06-16T09:45:55Z Remove log message - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -678,8 +678,6 @@ def load_pixbuf(path, size=None): return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, size, size, True) except GLib.GError: - log.warning('loading pixbuf failed. Try to convert ' - 'image with pillow: %s', path) try: with open(path, 'rb') as im_handle: img = Image.open(im_handle) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835cf86ca8e6bec61318b3a0fac721dbe1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/835cf86ca8e6bec61318b3a0fac721dbe1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 6 commits: GajimRemote: Remove change_avatar command
by Philipp Hörist 15 Jun '19

15 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 26c441dc by Philipp Hörist at 2019-06-15T23:20:21Z GajimRemote: Remove change_avatar command - - - - - b2aa7352 by Philipp Hörist at 2019-06-15T23:20:22Z Refactor avatar storage code - - - - - 78b06833 by Philipp Hörist at 2019-06-15T23:20:22Z Notifications: Detect DE and set icons accordingly - - - - - 3a845eb0 by Philipp Hörist at 2019-06-15T23:20:22Z DataFormDialog: Limit ComboBox width - - - - - 44229636 by Philipp Hörist at 2019-06-15T23:20:22Z Remove duplicated code ellipsize is set in MaxWidthComboBoxText - - - - - a2c36d7a by Philipp Hörist at 2019-06-15T23:20:22Z Update .pylintrc Relax refactor warnings - - - - - 16 changed files: - data/gajim-remote.1 - gajim/common/app.py - gajim/common/config.py - gajim/common/contacts.py - gajim/gajim_remote.py - gajim/groupchat_control.py - + gajim/gtk/avatar.py - gajim/gtk/dataform.py - gajim/gtk/notification.py - gajim/gtk/profile.py - gajim/gtk/settings.py - gajim/gtk/util.py - gajim/gtkgui_helpers.py - gajim/gui_interface.py - gajim/remote_control.py - pylintrc Changes: ===================================== data/gajim-remote.1 ===================================== @@ -19,8 +19,6 @@ by D-Bus. .El .Ss account_info Aq account Gets detailed info on a account -.Ss change_avatar Ao picture Ac Bq account -Change the avatar .Ss change_status Bo status Bc Bo message Bc Bq account Changes the status of account or accounts .Ss check_gajim_running ===================================== gajim/common/app.py ===================================== @@ -314,6 +314,20 @@ def detect_dependencies(): log('gajim').info('Used language: %s', LANG) +def detect_desktop_env(): + if sys.platform in ('win32', 'darwin'): + return sys.platform + + desktop = os.environ.get('XDG_CURRENT_DESKTOP') + if desktop is None: + return None + + if 'gnome' in desktop.lower(): + return 'gnome' + return desktop + +desktop_env = detect_desktop_env() + def get_an_id(): return str(uuid.uuid4()) ===================================== gajim/common/config.py ===================================== @@ -294,7 +294,6 @@ class Config: 'show_chatstate_in_banner': [opt_bool, True, _('Shows a text in the banner that describes the current chatstate of the contact')], 'send_chatstate_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to contacts. Possible values: all, composing_only, disabled')], 'send_chatstate_muc_default': [opt_str, 'composing_only', _('Chat state notifications that are sent to the group chat. Possible values: all, composing_only, disabled')], - 'avatar_clipping': [opt_str, 'rounded_corners', _('How to display avatars:\n\'rounded_corners\' - Display avatars with cropped corners.\n\'circle\' - Display round avatars.\n\'no_clipping\' - Display avatar as-is.')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/contacts.py ===================================== @@ -594,7 +594,7 @@ class Contacts(): if contacts[0].is_groupchat(): return contacts[0] - def get_avatar(self, jid, size=None, scale=None): + def get_avatar(self, jid, size, scale): if jid not in self._contacts: return None ===================================== gajim/gajim_remote.py ===================================== @@ -224,15 +224,6 @@ class GajimRemote: False) ] ], - 'change_avatar': [ - _('Change the avatar'), - [ - ('picture', _('Picture to use'), True), - ('account', _('Account in which the avatar will be set; ' - 'if not specified, the avatar will be set for all accounts'), - False) - ] - ], 'check_gajim_running': [ _('Check if Gajim is running'), ===================================== gajim/groupchat_control.py ===================================== @@ -740,15 +740,15 @@ class GroupchatControl(ChatControlBase): def _on_upload_avatar(self, action, param): def _on_accept(filename): - sha = app.interface.save_avatar(filename, publish=True) + data, sha = app.interface.avatar_storage.prepare_for_publish( + filename) if sha is None: ErrorDialog( _('Could not load image'), transient_for=self.parent_win.window) return - publish = app.interface.get_avatar_from_storage(sha, publish=True) - avatar = base64.b64encode(publish).decode('utf-8') + avatar = base64.b64encode(data).decode('utf-8') con = app.connections[self.account] con.get_module('VCardTemp').upload_room_avatar( self.room_jid, avatar) ===================================== gajim/gtk/avatar.py ===================================== @@ -0,0 +1,242 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import os +import logging +import hashlib +from math import pi +from functools import lru_cache +from collections import defaultdict + +from gi.repository import Gdk +from gi.repository import GdkPixbuf +import cairo + +from gajim.common import configpaths +from gajim.common.helpers import Singleton +from gajim.common.const import AvatarSize + +from gajim.gtk.util import load_pixbuf +from gajim.gtk.util import text_to_color +from gajim.gtk.util import scale_with_ratio + + +log = logging.getLogger('gajim.gtk.avatar') + + +@lru_cache(maxsize=1024) +def generate_avatar(letters, color, size, scale): + # Get color for nickname with XEP-0392 + color_r, color_g, color_b = color + + # Set up colors and size + if scale is not None: + size = size * scale + + width = size + height = size + font_size = size * 0.5 + + # Set up surface + surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) + context = cairo.Context(surface) + + context.set_source_rgb(color_r, color_g, color_b) + context.rectangle(0, 0, width, height) + context.fill() + + # Draw letters + context.select_font_face('sans-serif', + cairo.FONT_SLANT_NORMAL, + cairo.FONT_WEIGHT_NORMAL) + context.set_font_size(font_size) + extends = context.text_extents(letters) + if isinstance(extends, tuple): + # For cairo < 1.15 + x_bearing, y_bearing, ex_width, ex_height = extends[0:4] + else: + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height + + x_pos = width / 2 - (ex_width / 2 + x_bearing) + y_pos = height / 2 - (ex_height / 2 + y_bearing) + context.move_to(x_pos, y_pos) + context.set_source_rgb(0.95, 0.95, 0.95) + # use cairo.OPERATOR_OVER legacy constant because its + # compatible with cairo < 1.13 + context.set_operator(cairo.OPERATOR_OVER) + context.show_text(letters) + + return context.get_target() + + +def clip_circle(surface): + new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, + surface.get_width(), + surface.get_height()) + context = cairo.Context(new_surface) + context.set_source_surface(surface, 0, 0) + + width = surface.get_width() + height = surface.get_height() + radius = width / 2 + + context.arc(width / 2, height / 2, radius, 0, 2 * pi) + + context.clip() + context.paint() + + return context.get_target() + + +class AvatarStorage(metaclass=Singleton): + def __init__(self): + self._cache = defaultdict(dict) + + def invalidate_cache(self, jid): + self._cache.pop(jid, None) + + def get_pixbuf(self, contact, size, scale): + surface = self.get_surface(contact, size, scale) + return Gdk.pixbuf_get_from_surface(surface, 0, 0, size, size) + + def get_surface(self, contact, size, scale): + jid = contact.jid + if contact.is_gc_contact: + jid = contact.get_full_jid() + + surface = self._cache[jid].get((size, scale)) + if surface is not None: + return surface + + surface = self._get_avatar_from_storage(contact, size, scale) + if surface is not None: + self._cache[jid][(size, scale)] = surface + return surface + + surface = self._generate_default_avatar(contact, size, scale) + self._cache[jid][(size, scale)] = surface + return surface + + def prepare_for_publish(self, path): + success, data = self._load_for_publish(path) + if not success: + return None, None + + sha = self.save_avatar(data) + if sha is None: + return None, None + return data, sha + + @staticmethod + def _load_for_publish(path): + pixbuf = load_pixbuf(path) + if pixbuf is None: + return None + + width = pixbuf.get_width() + height = pixbuf.get_height() + if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: + # Scale only down, never up + width, height = scale_with_ratio(AvatarSize.PUBLISH, width, height) + pixbuf = pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + + return pixbuf.save_to_bufferv('png', [], []) + + @staticmethod + def save_avatar(data): + """ + Save an avatar to the harddisk + + :param data: bytes + + returns SHA1 value of the avatar or None on error + """ + if data is None: + return None + + sha = hashlib.sha1(data).hexdigest() + path = os.path.join(configpaths.get('AVATAR'), sha) + try: + with open(path, 'wb') as output_file: + output_file.write(data) + except Exception: + log.error('Storing avatar failed', exc_info=True) + return None + return sha + + @staticmethod + def get_avatar_path(filename): + path = os.path.join(configpaths.get('AVATAR'), filename) + if not os.path.isfile(path): + return None + return path + + def pixbuf_from_filename(self, filename): + path = self.get_avatar_path(filename) + if path is None: + return None + return load_pixbuf(path) + + def surface_from_filename(self, filename, size, scale): + size = size * scale + path = self.get_avatar_path(filename) + if path is None: + return None + + pixbuf = load_pixbuf(path, size) + if pixbuf is None: + return None + + return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + + def _load_surface_from_storage(self, contact, size, scale): + filename = contact.avatar_sha + size = size * scale + path = self.get_avatar_path(filename) + if path is None: + return None + + pixbuf = load_pixbuf(path, size) + if pixbuf is None: + return None + return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) + + def _get_avatar_from_storage(self, contact, size, scale): + if contact.avatar_sha is None: + return None + + surface = self._load_surface_from_storage(contact, size, scale) + if surface is None: + return None + return clip_circle(surface) + + @staticmethod + def _generate_default_avatar(contact, size, scale): + # Get initial from name + name = contact.get_shown_name() + letter = name[0].capitalize() + + # Use nickname for group chats and bare JID for single contacts + if contact.is_gc_contact: + color_string = contact.name + else: + color_string = contact.jid + color = text_to_color(color_string) + surface = generate_avatar(letter, color, size, scale) + return clip_circle(surface) ===================================== gajim/gtk/dataform.py ===================================== @@ -25,6 +25,7 @@ from gajim.common.helpers import open_uri from gajim.common.modules.dataforms import extend_form from gajim.gtk.util import MultiLineLabel +from gajim.gtk.util import MaxWidthComboBoxText class DataFormWidget(Gtk.ScrolledWindow): @@ -318,7 +319,7 @@ class ListSingleField(Field): def __init__(self, field, form_grid, options): Field.__init__(self, field, form_grid, options) - self._widget = Gtk.ComboBoxText() + self._widget = MaxWidthComboBoxText() self._widget.set_valign(Gtk.Align.CENTER) for value, label in field.iter_options(): if not label: ===================================== gajim/gtk/notification.py ===================================== @@ -42,7 +42,6 @@ from gajim.gtk.util import get_builder from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_monitor_scale_factor from gajim.gtk.util import get_total_screen_geometry -from gajim.gtk.util import load_icon log = logging.getLogger('gajim.gtk.notification') @@ -142,7 +141,7 @@ class Notification: """ if icon_name is None: - icon_name = 'gajim-chat_msg_recv' + icon_name = 'mail-message-new' if timeout < 0: timeout = app.config.get('notification_timeout') @@ -158,8 +157,7 @@ class Notification: if not self._dbus_available: return - scale = get_monitor_scale_factor() - icon_pixbuf = load_icon(icon_name, size=48, pixbuf=True, scale=scale) + icon = Gio.ThemedIcon.new(icon_name) notification = Gio.Notification() if title is not None: @@ -202,16 +200,23 @@ class Notification: _('New Single Message'), _('New Private Message'), _('New Group Chat Message')): - avatar = app.contacts.get_avatar(account, jid) - if avatar: - icon_pixbuf = avatar + if app.desktop_env == 'gnome': + icon = self._get_avatar_for_notification(account, jid) notif_id = self._make_id('new-message', account, jid) - notification.set_icon(icon_pixbuf) + notification.set_icon(icon) notification.set_priority(Gio.NotificationPriority.NORMAL) app.app.send_notification(notif_id, notification) + @staticmethod + def _get_avatar_for_notification(account, jid): + scale = get_monitor_scale_factor() + contact = app.contacts.get_contact(account, jid) + if contact is None: + return None + return app.interface.get_avatar(contact, 16, scale, pixbuf=True) + def _on_popup_destroy(self, *args): self._win32_active_popup = None ===================================== gajim/gtk/profile.py ===================================== @@ -128,14 +128,16 @@ class ProfileWindow(Gtk.ApplicationWindow): def on_set_avatar_button_clicked(self, widget): def on_ok(path_to_file): - sha = app.interface.save_avatar(path_to_file, publish=True) + data, sha = app.interface.avatar_storage.prepare_for_publish( + path_to_file) if sha is None: ErrorDialog( _('Could not load image'), transient_for=self) return scale = self.get_scale_factor() - surface = app.interface.get_avatar_from_storage(sha, AvatarSize.VCARD, scale) + surface = app.interface.avatar_storage.surface_from_filename( + sha, AvatarSize.VCARD, scale) button = self.xml.get_object('PHOTO_button') image = self.xml.get_object('PHOTO_image') @@ -145,8 +147,7 @@ class ProfileWindow(Gtk.ApplicationWindow): text_button.hide() self.avatar_sha = sha - publish = app.interface.get_avatar_from_storage(sha, publish=True) - self.avatar_encoded = base64.b64encode(publish).decode('utf-8') + self.avatar_encoded = base64.b64encode(data).decode('utf-8') self.avatar_mime_type = 'image/png' AvatarChooserDialog(on_ok, transient_for=self) @@ -212,7 +213,7 @@ class ProfileWindow(Gtk.ApplicationWindow): self.avatar_mime_type = vcard_[i]['TYPE'] scale = self.get_scale_factor() - surface = app.interface.get_avatar_from_storage( + surface = app.interface.avatar_storage.surface_from_filename( self.avatar_sha, AvatarSize.VCARD, scale) if surface is None: pixbuf = gtkgui_helpers.scale_pixbuf_from_data( ===================================== gajim/gtk/settings.py ===================================== @@ -523,8 +523,7 @@ class ComboSetting(GenericSetting): self.combo = MaxWidthComboBoxText() self.combo.set_valign(Gtk.Align.CENTER) - text_renderer = self.combo.get_cells()[0] - text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) + for index, value in enumerate(combo_items): if isinstance(value, tuple): value, label = value @@ -563,8 +562,6 @@ class ProxyComboSetting(GenericSetting): self.combo = MaxWidthComboBoxText() self.combo.set_valign(Gtk.Align.CENTER) - text_renderer = self.combo.get_cells()[0] - text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) self._signal_id = None self.update_values() ===================================== gajim/gtk/util.py ===================================== @@ -26,14 +26,18 @@ import logging import textwrap import xml.etree.ElementTree as ET from pathlib import Path -from functools import lru_cache from functools import wraps -from math import pi + +try: + from PIL import Image +except Exception: + pass from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GLib from gi.repository import Pango +from gi.repository import GdkPixbuf import nbxmpp import cairo @@ -620,98 +624,6 @@ def find_widget(name, container): return find_widget(name, child) -@lru_cache(maxsize=1024) -def generate_avatar(letters, color, size, scale): - # Get color for nickname with XEP-0392 - color_r, color_g, color_b = color - - # Set up colors and size - if scale is not None: - size = size * scale - - width = size - height = size - font_size = size * 0.5 - - # Set up surface - surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, width, height) - context = cairo.Context(surface) - - context.set_source_rgb(color_r, color_g, color_b) - context.rectangle(0, 0, width, height) - context.fill() - - # Draw letters - context.select_font_face('sans-serif', - cairo.FONT_SLANT_NORMAL, - cairo.FONT_WEIGHT_NORMAL) - context.set_font_size(font_size) - extends = context.text_extents(letters) - if isinstance(extends, tuple): - # For cairo < 1.15 - x_bearing, y_bearing, ex_width, ex_height = extends[0:4] - else: - x_bearing = extends.x_bearing - y_bearing = extends.y_bearing - ex_width = extends.width - ex_height = extends.height - - x_pos = width / 2 - (ex_width / 2 + x_bearing) - y_pos = height / 2 - (ex_height / 2 + y_bearing) - context.move_to(x_pos, y_pos) - context.set_source_rgb(0.95, 0.95, 0.95) - # use cairo.OPERATOR_OVER legacy constant because its - # compatible with cairo < 1.13 - context.set_operator(cairo.OPERATOR_OVER) - context.show_text(letters) - - return context.get_target() - - -def clip_circle(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, - surface.get_width(), - surface.get_height()) - context = cairo.Context(new_surface) - context.set_source_surface(surface, 0, 0) - - width = surface.get_width() - height = surface.get_height() - radius = width / 2 - - context.arc(width / 2, height / 2, radius, 0, 2 * pi) - - context.clip() - context.paint() - - return context.get_target() - - -def clip_rounded_corners(surface): - new_surface = cairo.ImageSurface(cairo.FORMAT_ARGB32, - surface.get_width(), - surface.get_height()) - context = cairo.Context(new_surface) - context.set_source_surface(surface, 0, 0) - - width = surface.get_width() - height = surface.get_height() - radius = width * 0.1 - deg = pi / 180.0 - - context.new_sub_path() - context.arc(width - radius, radius, radius, -90 * deg, 0) - context.arc(width - radius, height - radius, radius, 0, 90 * deg) - context.arc(radius, height - radius, radius, 90 * deg, 180 * deg) - context.arc(radius, radius, radius, 180 * deg, 270 * deg) - context.close_path() - - context.clip() - context.paint() - - return context.get_target() - - class MultiLineLabel(Gtk.Label): def __init__(self, *args, **kwargs): Gtk.Label.__init__(self, *args, **kwargs) @@ -724,6 +636,8 @@ class MaxWidthComboBoxText(Gtk.ComboBoxText): def __init__(self, *args, **kwargs): Gtk.ComboBoxText.__init__(self, *args, **kwargs) self._max_width = 100 + text_renderer = self.get_cells()[0] + text_renderer.set_property('ellipsize', Pango.EllipsizeMode.END) def set_max_size(self, size): self._max_width = size @@ -744,3 +658,45 @@ def text_to_color(text): else: background = (1, 1, 1) # RGB (255, 255, 255) white return nbxmpp.util.text_to_color(text, background) + + +def scale_with_ratio(size, width, height): + if height == width: + return size, size + if height > width: + ratio = height / float(width) + return int(size / ratio), size + + ratio = width / float(height) + return size, int(size / ratio) + + +def load_pixbuf(path, size=None): + try: + if size is None: + return GdkPixbuf.Pixbuf.new_from_file(path) + return GdkPixbuf.Pixbuf.new_from_file_at_scale(path, size, size, True) + + except GLib.GError: + log.warning('loading pixbuf failed. Try to convert ' + 'image with pillow: %s', path) + try: + with open(path, 'rb') as im_handle: + img = Image.open(im_handle) + avatar = img.convert("RGBA") + except (NameError, OSError): + log.warning('Pillow convert failed: %s', path) + log.debug('Error', exc_info=True) + return None + + array = GLib.Bytes.new(avatar.tobytes()) + width, height = avatar.size + pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( + array, GdkPixbuf.Colorspace.RGB, True, + 8, width, height, width * 4) + if size is not None: + width, height = scale_with_ratio(size, width, height) + return pixbuf.scale_simple(width, + height, + GdkPixbuf.InterpType.BILINEAR) + return pixbuf ===================================== gajim/gtkgui_helpers.py ===================================== @@ -159,7 +159,7 @@ def on_avatar_save_as_menuitem_activate(widget, avatar, default_name=''): app.config.set('last_save_dir', os.path.dirname(file_path)) if isinstance(avatar, str): # We got a SHA - pixbuf = app.interface.get_avatar_from_storage(avatar) + pixbuf = app.interface.avatar_storage.pixbuf_from_filename(avatar) else: # We got a pixbuf pixbuf = avatar ===================================== gajim/gui_interface.py ===================================== @@ -35,26 +35,18 @@ import os import sys import re import time -import hashlib import logging from functools import partial from threading import Thread from gi.repository import Gtk -from gi.repository import GdkPixbuf from gi.repository import GLib from gi.repository import Gio -from gi.repository import Gdk from nbxmpp import idlequeue from nbxmpp import Hashes2 from nbxmpp.structs import TuneData import OpenSSL -try: - from PIL import Image -except Exception: - pass - from gajim.common import app from gajim.common import events from gajim.common.dbus import screensaver @@ -62,7 +54,6 @@ from gajim.common.dbus import location from gajim.common.dbus import music_track from gajim.common.dbus import logind -from gajim import gtkgui_helpers from gajim import gui_menu_builder from gajim import dialogs from gajim import message_control @@ -94,7 +85,6 @@ from gajim.common.connection_handlers_events import ( from gajim.common.modules.httpupload import HTTPUploadProgressEvent from gajim.common.connection import Connection from gajim.common.file_props import FilesProp -from gajim.common.const import AvatarSize from gajim.common.const import SSLError from gajim import roster_window @@ -103,6 +93,7 @@ from gajim.common.caps_cache import muc_caps_cache from gajim.common import configpaths from gajim.common import optparser +from gajim.gtk.avatar import AvatarStorage from gajim.gtk.notification import Notification from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import WarningDialog @@ -125,10 +116,6 @@ from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray -from gajim.gtk.util import generate_avatar -from gajim.gtk.util import clip_circle -from gajim.gtk.util import clip_rounded_corners -from gajim.gtk.util import text_to_color parser = optparser.OptionsParser(configpaths.get('CONFIG_FILE')) @@ -1988,8 +1975,9 @@ class Interface: _('Could not save your settings and preferences')) error_dialog.run() - @staticmethod - def update_avatar(account=None, jid=None, contact=None, room_avatar=False): + def update_avatar(self, account=None, jid=None, + contact=None, room_avatar=False): + self.avatar_storage.invalidate_cache(jid or contact.jid) if room_avatar: app.nec.push_incoming_event( NetworkEvent('update-room-avatar', account=account, jid=jid)) @@ -2000,157 +1988,16 @@ class Interface: app.nec.push_incoming_event( NetworkEvent('update-gc-avatar', contact=contact)) - def save_avatar(self, data, publish=False): - """ - Save an avatar to the harddisk - - :param data: publish=False data must be bytes - publish=True data must be a path to a file - - :param publish: If publish is True, the method scales the file - to AvatarSize.PUBLISH size before saving - - returns SHA1 value of the avatar or None on error - """ - if data is None: - return - - if publish: - with open(data, 'rb') as file: - data = file.read() - pixbuf = gtkgui_helpers.get_pixbuf_from_data(data) - if pixbuf is None: - return + def save_avatar(self, data): + return self.avatar_storage.save_avatar(data) - width = pixbuf.get_width() - height = pixbuf.get_height() - if width > AvatarSize.PUBLISH or height > AvatarSize.PUBLISH: - # Scale only down, never up - width, height = gtkgui_helpers.scale_with_ratio( - AvatarSize.PUBLISH, width, height) - pixbuf = pixbuf.scale_simple(width, - height, - GdkPixbuf.InterpType.BILINEAR) - publish_path = os.path.join( - configpaths.get('AVATAR'), 'temp_publish') - pixbuf.savev(publish_path, 'png', [], []) - with open(publish_path, 'rb') as file: - data = file.read() - return self.save_avatar(data) - - sha = hashlib.sha1(data).hexdigest() - path = os.path.join(configpaths.get('AVATAR'), sha) - try: - with open(path, "wb") as output_file: - output_file.write(data) - except Exception: - app.log('avatar').error('Saving avatar failed', exc_info=True) - return - - return sha - - def get_avatar(self, contact, size=None, scale=None, publish=False): - surface = self.get_avatar_from_storage(contact.avatar_sha, - size, - scale, - publish) - - if surface is None: - # No avatar found, generate one - - # Get initial from name - name = contact.get_shown_name() - letter = name[0].capitalize() - - # Use nickname for group chats and bare JID for single contacts - if contact.is_gc_contact: - color_string = contact.name - else: - color_string = contact.jid - color = text_to_color(color_string) - surface = generate_avatar(letter, color, size, scale) + def get_avatar(self, contact, size, scale, pixbuf=False): + if pixbuf: + return self.avatar_storage.get_pixbuf(contact, size, scale) + return self.avatar_storage.get_surface(contact, size, scale) - # Clip avatar - clip_setting = app.config.get('avatar_clipping') - if clip_setting == 'circle': - return clip_circle(surface) - if clip_setting == 'rounded_corners': - return clip_rounded_corners(surface) - - return surface - - def get_avatar_from_storage(self, filename, size=None, scale=None, publish=False): - if filename is None or '': - return - - if size is None and scale is not None: - raise ValueError - - if scale is not None: - size = size * scale - - if publish: - path = os.path.join(configpaths.get('AVATAR'), filename) - with open(path, 'rb') as file: - data = file.read() - return data - - try: - pixbuf = app.avatar_cache[filename][size] - if scale is None: - return pixbuf - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) - except KeyError: - pass - - path = os.path.join(configpaths.get('AVATAR'), filename) - if not os.path.isfile(path): - return - - pixbuf = None - try: - if size is not None: - pixbuf = GdkPixbuf.Pixbuf.new_from_file_at_scale( - path, size, size, True) - else: - pixbuf = GdkPixbuf.Pixbuf.new_from_file(path) - except GLib.GError: - app.log('avatar').info( - 'loading avatar %s failed. Try to convert ' - 'avatar image using pillow', filename) - try: - with open(path, 'rb') as im_handle: - img = Image.open(im_handle) - avatar = img.convert("RGBA") - except (NameError, OSError): - app.log('avatar').warning('Pillow convert failed: %s', filename) - app.log('avatar').debug('Error', exc_info=True) - return - array = GLib.Bytes.new(avatar.tobytes()) - width, height = avatar.size - pixbuf = GdkPixbuf.Pixbuf.new_from_bytes( - array, GdkPixbuf.Colorspace.RGB, True, - 8, width, height, width * 4) - if size: - width, height = gtkgui_helpers.scale_with_ratio( - size, width, height) - pixbuf = pixbuf.scale_simple( - width, height, GdkPixbuf.InterpType.BILINEAR) - - if filename not in app.avatar_cache: - app.avatar_cache[filename] = {} - app.avatar_cache[filename][size] = pixbuf - - if scale is None: - return pixbuf - return Gdk.cairo_surface_create_from_pixbuf(pixbuf, scale) - - @staticmethod - def avatar_exists(filename): - path = os.path.join(configpaths.get('AVATAR'), filename) - if not os.path.isfile(path): - return False - return True + def avatar_exists(self, filename): + return self.avatar_storage.get_avatar_path(filename) is not None # does JID exist only within a groupchat? def is_pm_contact(self, fjid, account): @@ -2311,6 +2158,8 @@ class Interface: self.emot_and_basic = None self.sth_at_sth_dot_sth = None + self.avatar_storage = AvatarStorage() + cfg_was_read = parser.read() if not cfg_was_read: ===================================== gajim/remote_control.py ===================================== @@ -23,8 +23,6 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import os -import base64 -import mimetypes import logging from gi.repository import GLib @@ -132,10 +130,6 @@ class GajimRemote(Server): <arg name='account' type='s' /> <arg direction='out' type='b' /> </method> - <method name='change_avatar'> - <arg name='picture' type='s' /> - <arg name='account' type='s' /> - </method> <method name='change_status'> <arg name='status' type='s' /> <arg name='message' type='s' /> @@ -904,35 +898,6 @@ class GajimRemote(Server): for acc in app.contacts.get_accounts(): app.connections[acc].send_stanza(str(xml)) - def change_avatar(self, picture, account): - filesize = os.path.getsize(picture) - invalid_file = False - if os.path.isfile(picture): - stat = os.stat(picture) - if stat[6] == 0: - invalid_file = True - else: - invalid_file = True - if not invalid_file and filesize < 16384: - sha = app.interface.save_avatar(picture, publish=True) - if sha is None: - return - app.config.set_per('accounts', self.name, 'avatar_sha', sha) - data = app.interface.get_avatar_from_storage(sha, publish=True) - avatar = base64.b64encode(data).decode('utf-8') - avatar_mime_type = mimetypes.guess_type(picture)[0] - vcard = {} - vcard['PHOTO'] = {'BINVAL': avatar} - if avatar_mime_type: - vcard['PHOTO']['TYPE'] = avatar_mime_type - if account: - app.connections[account].get_module('VCardTemp').send_vcard( - vcard, sha) - else: - for acc in app.connections: - app.connections[acc].get_module('VCardTemp').send_vcard( - vcard, sha) - def join_room(self, room_jid, nick, password, account): if not account: # get the first connected account ===================================== pylintrc ===================================== @@ -225,7 +225,7 @@ indent-string=' ' max-line-length=80 # Maximum number of lines in a module -max-module-lines=1000 +max-module-lines=3000 # List of optional constructs for which whitespace checking is disabled. `dict- # separator` is used to allow tabulation in dicts, etc.: {1 : 1,\n222: 2}. @@ -368,22 +368,22 @@ max-attributes=9999 max-bool-expr=5 # Maximum number of branch for function / method body -max-branches=12 +max-branches=20 # Maximum number of locals for function / method body -max-locals=15 +max-locals=50 # Maximum number of parents for a class (see R0901). max-parents=7 # Maximum number of public methods for a class (see R0904). -max-public-methods=20 +max-public-methods=50 # Maximum number of return / yield for function / method body max-returns=100 # Maximum number of statements in function / method body -max-statements=50 +max-statements=100 # Minimum number of public methods for a class (see R0903). min-public-methods=0 View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/51e73a2eedc49691850dea023abc88448… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/51e73a2eedc49691850dea023abc88448… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MucCapsCache: Add more queries
by Philipp Hörist 15 Jun '19

15 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 51e73a2e by Daniel Brötzmann at 2019-06-14T22:44:26Z MucCapsCache: Add more queries This adds the following queries for room infos: is_open, is_password_protected, and is_persistent - - - - - 1 changed file: - gajim/common/caps_cache.py Changes: ===================================== gajim/common/caps_cache.py ===================================== @@ -505,9 +505,18 @@ class MucCapsCache: pass return allowed + def is_open(self, jid): + return 'muc_membersonly' not in self.cache[jid].features + + def is_password_protected(self, jid): + return 'muc_unsecured' not in self.cache[jid].features + def is_anonymous(self, jid): return 'muc_nonanonymous' not in self.cache[jid].features + def is_persistent(self, jid): + return 'muc_temporary' not in self.cache[jid].features + def get_room_infos(self, jid): room_info = {} if jid in self.cache: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51e73a2eedc49691850dea023abc88448b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/51e73a2eedc49691850dea023abc88448b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] GroupChatControl: Fix drag and drop invites
by Philipp Hörist 14 Jun '19

14 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 780fcfa5 by Daniel Brötzmann at 2019-06-14T16:50:38Z GroupChatControl: Fix drag and drop invites This adds the correct TargetList to our drag destination. Dropping a contact on the group chat's roster will send an invite. - - - - - 3 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -1241,17 +1241,17 @@ class ChatControl(ChatControlBase): c = self.contact if target_type == self.TARGET_TYPE_URI_LIST: - # file drag and drop (handled in chat_control_base) + # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(c, selection, self) else: - # chat2muc + # Convert single chat to MUC treeview = app.interface.roster.tree model = treeview.get_model() - data = selection.get_data() + data = selection.get_data().decode() path = treeview.get_selection().get_selected_rows()[1][0] iter_ = model.get_iter(path) type_ = model[iter_][2] - if type_ != 'contact': # source is not a contact + if type_ != 'contact': # Source is not a contact return dropped_jid = data ===================================== gajim/chat_control_base.py ===================================== @@ -244,35 +244,48 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): # Init DND self.TARGET_TYPE_URI_LIST = 80 - self.dnd_list = [Gtk.TargetEntry.new('text/uri-list', 0, - self.TARGET_TYPE_URI_LIST), Gtk.TargetEntry.new('MY_TREE_MODEL_ROW', - Gtk.TargetFlags.SAME_APP, 0)] + uri_entry = Gtk.TargetEntry.new( + 'text/uri-list', + Gtk.TargetFlags.OTHER_APP, + self.TARGET_TYPE_URI_LIST) + dst_targets = Gtk.TargetList.new([uri_entry]) + dst_targets.add_text_targets(0) + self.dnd_list = [uri_entry, + Gtk.TargetEntry.new( + 'MY_TREE_MODEL_ROW', + Gtk.TargetFlags.SAME_APP, + 0)] id_ = self.widget.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.widget - self.widget.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, - self.dnd_list, Gdk.DragAction.COPY) + self.widget.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) + self.widget.drag_dest_set_target_list(dst_targets) # Create textviews and connect signals self.conv_textview = ConversationTextview(self.account) id_ = self.conv_textview.connect('quote', self.on_quote) self.handlers[id_] = self.conv_textview.tv - id_ = self.conv_textview.tv.connect('key_press_event', - self._conv_textview_key_press_event) + id_ = self.conv_textview.tv.connect( + 'key_press_event', self._conv_textview_key_press_event) self.handlers[id_] = self.conv_textview.tv + # FIXME: DND on non editable TextView, find a better way self.drag_entered = False id_ = self.conv_textview.tv.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_motion', self._on_drag_motion) self.handlers[id_] = self.conv_textview.tv id_ = self.conv_textview.tv.connect('drag_leave', self._on_drag_leave) self.handlers[id_] = self.conv_textview.tv - self.conv_textview.tv.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT | Gtk.DestDefaults.DROP, - self.dnd_list, Gdk.DragAction.COPY) + self.conv_textview.tv.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) + self.conv_textview.tv.drag_dest_set_target_list(dst_targets) self.conv_scrolledwindow = self.xml.get_object( 'conversation_scrolledwindow') @@ -307,12 +320,15 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): id_ = self.msg_textview.connect('populate_popup', self.on_msg_textview_populate_popup) self.handlers[id_] = self.msg_textview + # Setup DND id_ = self.msg_textview.connect('drag_data_received', - self._on_drag_data_received) + self._on_drag_data_received) self.handlers[id_] = self.msg_textview - self.msg_textview.drag_dest_set(Gtk.DestDefaults.MOTION | - Gtk.DestDefaults.HIGHLIGHT, self.dnd_list, Gdk.DragAction.COPY) + self.msg_textview.drag_dest_set( + Gtk.DestDefaults.ALL, + self.dnd_list, + Gdk.DragAction.COPY) self._overlay = self.xml.get_object('overlay') ===================================== gajim/groupchat_control.py ===================================== @@ -2420,27 +2420,26 @@ class GroupchatControl(ChatControlBase): if not selection.get_data(): return - # get contact info + # Get contact info contact = contacts.Contact(jid=self.room_jid, account=self.account) - if target_type == self.TARGET_TYPE_URI_LIST: - # file drag and drop (handled in chat_control_base) + # File drag and drop (handled in chat_control_base) self.drag_data_file_transfer(contact, selection, self) else: # Invite contact to groupchat treeview = app.interface.roster.tree model = treeview.get_model() - data = selection.get_data() + data = selection.get_data().decode() path = treeview.get_selection().get_selected_rows()[1][0] iter_ = model.get_iter(path) type_ = model[iter_][2] - if type_ != 'contact': # source is not a contact + if type_ != 'contact': # Source is not a contact return contact_jid = data con = app.connections[self.account] con.get_module('MUC').invite(self.room_jid, contact_jid) - self.add_info_message(_('%(jid)s has been invited in this room') % + self.add_info_message(_('%(jid)s has been invited to this group chat') % {'jid': contact_jid}) def _jid_not_blocked(self, bare_jid: str) -> bool: View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/780fcfa5ceeb97e17a752debadf943fe36… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/780fcfa5ceeb97e17a752debadf943fe36… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Keep cairo < 1.13 compatibility
by Philipp Hörist 14 Jun '19

14 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7c3d4740 by Philipp Hörist at 2019-06-14T16:40:16Z Keep cairo < 1.13 compatibility - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -660,7 +660,9 @@ def generate_avatar(letters, color, size, scale): y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) - context.set_operator(cairo.Operator.OVER) + # use cairo.OPERATOR_OVER legacy constant because its + # compatible with cairo < 1.13 + context.set_operator(cairo.OPERATOR_OVER) context.show_text(letters) return context.get_target() View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7c3d474070ebca82e186be8c19c1d39442… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/7c3d474070ebca82e186be8c19c1d39442… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Split message actions from URIs
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 8992ae1a by Daniel Brötzmann at 2019-06-13T21:02:47Z Split message actions from URIs - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -32,7 +32,6 @@ import sys import re import os import subprocess -import urllib import webbrowser import errno import select @@ -48,6 +47,8 @@ import collections import random import string from string import Template +import urllib +from urllib.parse import unquote from io import StringIO from datetime import datetime, timedelta from distutils.version import LooseVersion as V @@ -1480,20 +1481,38 @@ def delay_execution(milliseconds): return delay_execution_decorator +def parse_uri_actions(uri): + uri = uri[5:] + if '?' not in uri: + return 'message', {'jid': uri} + + jid, action = uri.split('?', 1) + data = {'jid': jid} + if ';' in action: + action, keys = action.split(';', 1) + action_keys = keys.split(';') + for key in action_keys: + if key.startswith('subject='): + data['subject'] = unquote(key[8:]) + + elif key.startswith('body='): + data['body'] = unquote(key[5:]) + + elif key.startswith('thread='): + data['thread'] = key[7:] + return action, data + + def parse_uri(uri): if uri.startswith('xmpp:'): - uri = uri[5:] - if '?' in uri: - jid, action = uri.split('?') - try: - return URI(type=URIType.XMPP, - action=URIAction(action), - data=jid) - except ValueError: - # Unknown action - pass - - return URI(type=URIType.XMPP, action=URIAction.MESSAGE, data=uri) + action, data = parse_uri_actions(uri) + try: + return URI(type=URIType.XMPP, + action=URIAction(action), + data=data) + except ValueError: + # Unknown action + return URI(type=URIType.UNKNOWN) if uri.startswith('mailto:'): uri = uri[7:] @@ -1548,7 +1567,8 @@ def open_uri(uri, account=None): if uri.action == URIAction.JOIN: app.interface.join_gc_minimal(account, uri.data) elif uri.action == URIAction.MESSAGE: - app.interface.new_chat_from_jid(account, uri.data) + app.interface.new_chat_from_jid(account, uri.data['jid'], + message=uri.data.get('body')) else: log.warning('Cant open URI: %s', uri) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8992ae1ab730295ab813822b6353b155cb… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/8992ae1ab730295ab813822b6353b155cb… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Rework RosterItemExchangeWindow
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 485d0e7b by Daniel Brötzmann at 2019-06-13T19:25:31Z Rework RosterItemExchangeWindow - - - - - 4 changed files: - gajim/data/gui/roster_item_exchange_window.ui - gajim/dialogs.py - + gajim/gtk/roster_item_exchange.py - gajim/gui_interface.py Changes: ===================================== gajim/data/gui/roster_item_exchange_window.ui ===================================== @@ -1,154 +1,167 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.12"/> + <requires lib="gtk+" version="3.20"/> <object class="GtkTextBuffer" id="textbuffer1"/> - <object class="GtkWindow" id="roster_item_exchange_window"> + <object class="GtkBox" id="roster_item_exchange"> + <property name="visible">True</property> <property name="can_focus">False</property> - <property name="title" translatable="yes">Roster Item Exchange</property> - <property name="type_hint">dialog</property> + <property name="border_width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> <child> - <object class="GtkBox" id="vbox1"> + <object class="GtkGrid"> <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">8</property> + <property name="margin_bottom">6</property> + <property name="row_spacing">6</property> + <property name="column_spacing">12</property> <child> <object class="GtkLabel" id="type_label"> <property name="visible">True</property> <property name="can_focus">False</property> -  - <property name="label"><b>someone(a)somewhere.com</b> would like you to <b>add</b> some contacts in your roster.</property> - <property name="use_markup">True</property> - <property name="justify">center</property> - <property name="selectable">True</property> + <property name="halign">start</property> + <property name="label"><user(a)example.org> would like to <action> some contacts in your contact list</property> + <property name="wrap">True</property> + <property name="max_width_chars">50</property> + <property name="xalign">0</property> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="padding">4</property> - <property name="position">0</property> + <property name="left_attach">1</property> + <property name="top_attach">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="body_scrolledwindow"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <child> - <object class="GtkTextView" id="body_textview"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="editable">False</property> - <property name="justification">center</property> - <property name="cursor_visible">False</property> - <property name="buffer">textbuffer1</property> - </object> - </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">Contact List Exchange</property> + <style> + <class name="large-header"/> + </style> </object> <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> + <property name="left_attach">1</property> + <property name="top_attach">0</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">avatar-default-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="left_attach">0</property> + <property name="top_attach">0</property> + <property name="height">2</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="GtkScrolledWindow" id="body_scrolledwindow"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="shadow_type">in</property> + <child> + <object class="GtkTextView" id="body_textview"> + <property name="can_focus">True</property> + <property name="no_show_all">True</property> + <property name="editable">False</property> + <property name="wrap_mode">word</property> + <property name="left_margin">6</property> + <property name="right_margin">6</property> + <property name="top_margin">6</property> + <property name="bottom_margin">6</property> + <property name="cursor_visible">False</property> + <property name="buffer">textbuffer1</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="width_request">350</property> + <property name="height_request">250</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="vexpand">True</property> + <property name="shadow_type">in</property> <child> - <object class="GtkScrolledWindow" id="scrolledwindow2"> + <object class="GtkTreeView" id="items_list_treeview"> <property name="visible">True</property> <property name="can_focus">True</property> - <child> - <object class="GtkTreeView" id="items_list_treeview"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> - </object> + <property name="has_focus">True</property> + <child internal-child="selection"> + <object class="GtkTreeSelection" id="treeview-selection1"/> </child> </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkButtonBox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="margin_top">6</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="receives_default">True</property> + <property name="use_underline">True</property> + <signal name="clicked" handler="_on_cancel_button_clicked" swapped="no"/> + </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> <child> - <object class="GtkButtonBox" id="hbuttonbox1"> + <object class="GtkButton" id="accept_button"> + <property name="label" translatable="yes">OK</property> <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="receives_default">True</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="accept_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <signal name="clicked" handler="on_accept_button_clicked" swapped="no"/> - <child> - <object class="GtkBox" id="hbox1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">3</property> - <child> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">1</property> - <property name="stock">gtk-ok</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="accept_button_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="xalign">0</property> - <property name="label" translatable="yes">_OK</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">1</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <signal name="clicked" handler="_on_accept_button_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">3</property> + <property name="fill">False</property> + <property name="position">1</property> </packing> </child> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> </child> </object> </interface> ===================================== gajim/dialogs.py ===================================== @@ -45,13 +45,11 @@ from gajim.common.const import MOODS from gajim.common import app from gajim.common import helpers -from gajim.common import i18n from gajim.common.exceptions import GajimGeneralException from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import ConfirmationDialog from gajim.gtk.dialogs import InputDialog -from gajim.gtk.dialogs import InformationDialog from gajim.gtk.dialogs import AspellDictError from gajim.gtk.util import get_icon_name from gajim.gtk.util import get_builder @@ -870,234 +868,6 @@ class SynchroniseSelectContactsDialog: iter_ = model.iter_next(iter_) self.dialog.destroy() -#Action that can be done with an incoming list of contacts -TRANSLATED_ACTION = {'add': _('add'), 'modify': _('modify'), - 'remove': _('remove')} -class RosterItemExchangeWindow: - """ - Windows used when someone send you a exchange contact suggestion - """ - - def __init__(self, account, action, exchange_list, jid_from, - message_body=None): - self.account = account - self.action = action - self.exchange_list = exchange_list - self.message_body = message_body - self.jid_from = jid_from - - show_dialog = False - - # Connect to gtk builder - self.xml = get_builder('roster_item_exchange_window.ui') - self.window = self.xml.get_object('roster_item_exchange_window') - - # Add Widgets. - for widget_to_add in ['accept_button_label', 'type_label', - 'body_scrolledwindow', 'body_textview', 'items_list_treeview']: - self.__dict__[widget_to_add] = self.xml.get_object(widget_to_add) - - # Set labels - # self.action can be 'add', 'modify' or 'remove' - self.type_label.set_label( - _('<b>%(jid)s</b> would like you to <b>%(action)s</b> some contacts ' - 'in your roster.') % {'jid': jid_from, - 'action': TRANSLATED_ACTION[self.action]}) - if message_body: - buffer_ = self.body_textview.get_buffer() - buffer_.set_text(self.message_body) - else: - self.body_scrolledwindow.hide() - # Treeview - model = Gtk.ListStore(bool, str, str, str, str) - self.items_list_treeview.set_model(model) - # columns - renderer1 = Gtk.CellRendererToggle() - renderer1.set_property('activatable', True) - renderer1.connect('toggled', self.toggled_callback) - if self.action == 'add': - title = _('Add') - elif self.action == 'modify': - title = _('Modify') - elif self.action == 'delete': - title = _('Delete') - self.items_list_treeview.insert_column_with_attributes(-1, title, - renderer1, active=0) - renderer2 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('JID'), - renderer2, text=1) - renderer3 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('Name'), - renderer3, text=2) - renderer4 = Gtk.CellRendererText() - self.items_list_treeview.insert_column_with_attributes(-1, _('Groups'), - renderer4, text=3) - - # Init contacts - model = self.items_list_treeview.get_model() - model.clear() - - if action == 'add': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - if not contact or _('Not in Roster') in contact.groups: - is_in_roster = False - name = self.exchange_list[jid][0] - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if contact and not group in contact.groups: - is_in_roster = False - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if not is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Add')) - elif action == 'modify': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - is_right = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False - is_right = False - else: - if name != contact.name: - is_right = False - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if contact and not group in contact.groups: - is_right = False - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if not is_right and is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Modify')) - elif action == 'delete': - for jid in self.exchange_list: - groups = '' - is_in_roster = True - contact = app.contacts.get_contact_with_highest_priority( - self.account, jid) - name = self.exchange_list[jid][0] - if not contact: - is_in_roster = False - num_list = len(self.exchange_list[jid][1]) - current = 0 - for group in self.exchange_list[jid][1]: - current += 1 - if current == num_list: - groups = groups + group - else: - groups = groups + group + ', ' - if is_in_roster: - show_dialog = True - iter_ = model.append() - model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) - - # Change label for accept_button to action name instead of 'OK'. - self.accept_button_label.set_label(_('Delete')) - - if show_dialog: - self.window.show_all() - self.xml.connect_signals(self) - - def toggled_callback(self, cell, path): - model = self.items_list_treeview.get_model() - iter_ = model.get_iter(path) - model[iter_][0] = not cell.get_active() - - def on_accept_button_clicked(self, widget): - model = self.items_list_treeview.get_model() - iter_ = model.get_iter_first() - if self.action == 'add': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - #remote_jid = model[iter_][1] - message = _('%s suggested me to add you in my roster.' - % self.jid_from) - # keep same groups and same nickname - groups = model[iter_][3].split(', ') - if groups == ['']: - groups = [] - jid = model[iter_][1] - if app.jid_is_transport(self.jid_from): - con = app.connections[self.account] - con.get_module('Presence').automatically_added.append(jid) - app.interface.roster.req_sub(self, jid, message, - self.account, groups=groups, nickname=model[iter_][2], - auto_auth=True) - iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Added %d contact', - 'Added %d contacts', a, a, a)) - elif self.action == 'modify': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - jid = model[iter_][1] - # keep same groups and same nickname - groups = model[iter_][3].split(', ') - if groups == ['']: - groups = [] - for u in app.contacts.get_contact(self.account, jid): - u.name = model[iter_][2] - con = app.connections[self.account] - con.get_module('Roster').update_contact( - jid, model[iter_][2], groups) - self.draw_contact(jid, self.account) - # Update opened chat - ctrl = app.interface.msg_win_mgr.get_control(jid, self.account) - if ctrl: - ctrl.update_ui() - win = app.interface.msg_win_mgr.get_window(jid, - self.account) - win.redraw_tab(ctrl) - win.show_title() - iter_ = model.iter_next(iter_) - elif self.action == 'delete': - a = 0 - while iter_: - if model[iter_][0]: - a += 1 - # it is selected - jid = model[iter_][1] - app.connections[self.account].get_module('Presence').unsubscribe(jid) - app.interface.roster.remove_contact(jid, self.account) - app.contacts.remove_jid(self.account, jid) - iter_ = model.iter_next(iter_) - InformationDialog(i18n.ngettext('Removed %d contact', - 'Removed %d contacts', a, a, a)) - self.window.destroy() - - def on_cancel_button_clicked(self, widget): - self.window.destroy() - class TransformChatToMUC: # Keep a reference on windows so garbage collector don't restroy them ===================================== gajim/gtk/roster_item_exchange.py ===================================== @@ -0,0 +1,257 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk + +from gajim.common import app +from gajim.common import i18n +from gajim.common.i18n import _ + +from gajim.gtk.dialogs import InformationDialog +from gajim.gtk.util import get_builder + + +class RosterItemExchangeWindow(Gtk.ApplicationWindow): + """ + Used when someone sends a Roster Item Exchange suggestion (XEP-0144) + """ + def __init__(self, account, action, exchange_list, jid_from, + message_body=None): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_show_menubar(False) + self.set_title(_('Contact List Exchange')) + self.set_name('RosterItemExchangeWindow') + + self.account = account + self.action = action + self.exchange_list = exchange_list + self.message_body = message_body + self.jid_from = jid_from + + self._ui = get_builder('roster_item_exchange_window.ui') + self.add(self._ui.roster_item_exchange) + + # Set label depending on action + if action == 'add': + type_label = _('<b>%s</b> would like to add some ' + 'contacts to your contact list.') % self.jid_from + elif action == 'modify': + type_label = _('<b>%s</b> would like to modify some ' + 'contacts in your contact list.') % self.jid_from + elif action == 'delete': + type_label = _('<b>%s</b> would like to delete some ' + 'contacts from your contact list.') % self.jid_from + self._ui.type_label.set_markup(type_label) + if message_body: + buffer_ = self._ui.body_textview.get_buffer() + buffer_.set_text(self.message_body) + else: + self._ui.body_scrolledwindow.hide() + # Treeview + model = Gtk.ListStore(bool, str, str, str, str) + self._ui.items_list_treeview.set_model(model) + # Columns + renderer1 = Gtk.CellRendererToggle() + renderer1.set_property('activatable', True) + renderer1.connect('toggled', self._toggled) + if self.action == 'add': + title = _('Add') + elif self.action == 'modify': + title = _('Modify') + elif self.action == 'delete': + title = _('Delete') + self._ui.items_list_treeview.insert_column_with_attributes( + -1, title, renderer1, active=0) + renderer2 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('JID'), renderer2, text=1) + renderer3 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('Name'), renderer3, text=2) + renderer4 = Gtk.CellRendererText() + self._ui.items_list_treeview.insert_column_with_attributes( + -1, _('Groups'), renderer4, text=3) + + # Init contacts + self.model = self._ui.items_list_treeview.get_model() + self.model.clear() + + if action == 'add': + self._add() + elif action == 'modify': + self._modify() + elif action == 'delete': + self._delete() + + self._ui.connect_signals(self) + + def _toggled(self, cell, path): + model = self._ui.items_list_treeview.get_model() + iter_ = model.get_iter(path) + model[iter_][0] = not cell.get_active() + + def _add(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + if not contact or _('Not in Roster') in contact.groups: + is_in_roster = False + name = self.exchange_list[jid][0] + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if contact and group not in contact.groups: + is_in_roster = False + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if not is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Add')) + + def _modify(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + is_right = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + name = self.exchange_list[jid][0] + if not contact: + is_in_roster = False + is_right = False + else: + if name != contact.name: + is_right = False + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if contact and group not in contact.groups: + is_right = False + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if not is_right and is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Modify')) + + def _delete(self): + for jid in self.exchange_list: + groups = '' + is_in_roster = True + contact = app.contacts.get_contact_with_highest_priority( + self.account, jid) + name = self.exchange_list[jid][0] + if not contact: + is_in_roster = False + num_list = len(self.exchange_list[jid][1]) + current = 0 + for group in self.exchange_list[jid][1]: + current += 1 + if current == num_list: + groups = groups + group + else: + groups = groups + group + ', ' + if is_in_roster: + self.show_all() + iter_ = self.model.append() + self.model.set(iter_, 0, True, 1, jid, 2, name, 3, groups) + + self._ui.accept_button.set_label(_('Delete')) + + def _on_accept_button_clicked(self, widget): + model = self._ui.items_list_treeview.get_model() + iter_ = model.get_iter_first() + if self.action == 'add': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + message = _('%s suggested me to add you to my ' + 'contact list.' % self.jid_from) + # Keep same groups and same nickname + groups = model[iter_][3].split(', ') + if groups == ['']: + groups = [] + jid = model[iter_][1] + if app.jid_is_transport(self.jid_from): + con = app.connections[self.account] + con.get_module('Presence').automatically_added.append( + jid) + app.interface.roster.req_sub( + self, jid, message, self.account, groups=groups, + nickname=model[iter_][2], auto_auth=True) + iter_ = model.iter_next(iter_) + InformationDialog(i18n.ngettext('Added %d contact', + 'Added %d contacts', a, a, a)) + elif self.action == 'modify': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + jid = model[iter_][1] + # Keep same groups and same nickname + groups = model[iter_][3].split(', ') + if groups == ['']: + groups = [] + for u in app.contacts.get_contact(self.account, jid): + u.name = model[iter_][2] + con = app.connections[self.account] + con.get_module('Roster').update_contact( + jid, model[iter_][2], groups) + self.draw_contact(jid, self.account) + # Update opened chats + ctrl = app.interface.msg_win_mgr.get_control(jid, + self.account) + if ctrl: + ctrl.update_ui() + win = app.interface.msg_win_mgr.get_window(jid, + self.account) + win.redraw_tab(ctrl) + win.show_title() + iter_ = model.iter_next(iter_) + elif self.action == 'delete': + a = 0 + while iter_: + if model[iter_][0]: + a += 1 + # It is selected + jid = model[iter_][1] + app.connections[self.account].get_module( + 'Presence').unsubscribe(jid) + app.interface.roster.remove_contact(jid, self.account) + app.contacts.remove_jid(self.account, jid) + iter_ = model.iter_next(iter_) + InformationDialog(i18n.ngettext('Removed %d contact', + 'Removed %d contacts', a, a, a)) + self.destroy() + + def _on_cancel_button_clicked(self, widget): + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -121,6 +121,7 @@ from gajim.gtk.emoji_data import emoji_data from gajim.gtk.emoji_data import emoji_ascii_data from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.filetransfer import FileTransfersWindow +from gajim.gtk.roster_item_exchange import RosterItemExchangeWindow from gajim.gtk.subscription_request import SubscriptionRequestWindow from gajim.gtk.util import get_show_in_roster from gajim.gtk.util import get_show_in_systray @@ -1127,8 +1128,8 @@ class Interface: @staticmethod def handle_event_roster_item_exchange(obj): # data = (action in [add, delete, modify], exchange_list, jid_from) - dialogs.RosterItemExchangeWindow(obj.conn.name, obj.action, - obj.exchange_items_list, obj.fjid) + RosterItemExchangeWindow(obj.conn.name, obj.action, + obj.exchange_items_list, obj.fjid) def handle_event_ssl_error(self, obj): account = obj.conn.name View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/485d0e7b83e9ab077c1ca4778f15539d9a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/485d0e7b83e9ab077c1ca4778f15539d9a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Keep cairo < 1.15 compatibility
by Philipp Hörist 13 Jun '19

13 Jun '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 68b87bbb by Philipp Hörist at 2019-06-13T19:19:37Z Keep cairo < 1.15 compatibility Fixes #9733 - - - - - 1 changed file: - gajim/gtk/util.py Changes: ===================================== gajim/gtk/util.py ===================================== @@ -647,8 +647,17 @@ def generate_avatar(letters, color, size, scale): cairo.FONT_WEIGHT_NORMAL) context.set_font_size(font_size) extends = context.text_extents(letters) - x_pos = width / 2 - (extends.width / 2 + extends.x_bearing) - y_pos = height / 2 - (extends.height / 2 + extends.y_bearing) + if isinstance(extends, tuple): + # For cairo < 1.15 + x_bearing, y_bearing, ex_width, ex_height = extends[0:4] + else: + x_bearing = extends.x_bearing + y_bearing = extends.y_bearing + ex_width = extends.width + ex_height = extends.height + + x_pos = width / 2 - (ex_width / 2 + x_bearing) + y_pos = height / 2 - (ex_height / 2 + y_bearing) context.move_to(x_pos, y_pos) context.set_source_rgb(0.95, 0.95, 0.95) context.set_operator(cairo.Operator.OVER) View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68b87bbb3569684281c6ace7d3fd76cd85… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/68b87bbb3569684281c6ace7d3fd76cd85… 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