Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] 3 commits: Consider private variables for @event_filter
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: c230f5c4 by Philipp Hörist at 2019-09-22T16:43:17Z Consider private variables for @event_filter - - - - - 94b058cd by Philipp Hörist at 2019-09-22T16:59:32Z Add account-disconnected event This is a dedicated event so we dont have to use the our-show event - - - - - 44e6b0f0 by Philipp Hörist at 2019-09-22T19:58:58Z MUC: Refactor auto-rejoin - Rewrite auto-rejoin code and move it into muc module - - - - - 4 changed files: - gajim/common/connection.py - gajim/common/helpers.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/common/connection.py ===================================== @@ -595,6 +595,8 @@ class Connection(CommonConnection, ConnectionHandlers): self.get_module('Bytestream').remove_all_transfers() self._unregister_new_handlers(self.connection) self.connection = None + app.nec.push_incoming_event(NetworkEvent('account-disconnected', + account=self.name)) def _set_reconnect_timer(self): self.connected = -1 ===================================== gajim/common/helpers.py ===================================== @@ -1471,8 +1471,12 @@ def event_filter(filter_): @wraps(func) def func_wrapper(self, event, *args, **kwargs): for attr in filter_: - if getattr(event, attr) != getattr(self, attr): - return + try: + if getattr(event, attr) != getattr(self, attr): + return + except AttributeError: + if getattr(event, attr) != getattr(self, '_%s' % attr): + return return func(self, event, *args, **kwargs) return func_wrapper return event_filter_decorator ===================================== gajim/common/modules/muc.py ===================================== @@ -24,6 +24,7 @@ from datetime import timezone import nbxmpp from nbxmpp.const import InviteType from nbxmpp.const import PresenceType +from nbxmpp.const import StatusCode from nbxmpp.structs import StanzaHandler from nbxmpp.util import is_error_result @@ -31,6 +32,7 @@ from gi.repository import GLib from gajim.common import app from gajim.common import helpers +from gajim.common import ged from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.const import SyncThreshold @@ -38,6 +40,7 @@ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config from gajim.common.helpers import get_sync_threshold from gajim.common.helpers import to_user_string +from gajim.common.helpers import event_filter from gajim.common import idle from gajim.common.nec import NetworkEvent from gajim.common.modules.bits_of_binary import store_bob_data @@ -106,8 +109,17 @@ class MUC(BaseModule): priority=49) ] + self._event_handlers = [ + ('account-disconnected', ged.CORE, self._on_account_disconnected), + ] + + for handler in self._event_handlers: + app.ged.register_event_handler(*handler) + self._muc_data = {} + self._rejoin_muc = set() self._join_timeouts = {} + self._rejoin_timeouts = {} def pass_disco(self, info): for identity in info.identities: @@ -187,6 +199,13 @@ class MUC(BaseModule): self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.connection.send(presence) + def _rejoin(self, room_jid): + muc_data = self._get_muc_data(room_jid) + if muc_data.state == MUCJoinedState.NOT_JOINED: + self._log.info('Rejoin %s', room_jid) + self._join(muc_data) + return True + def _create(self, muc_data): show = helpers.get_xmpp_show(app.SHOW_LIST[self._con.connected]) @@ -204,6 +223,7 @@ class MUC(BaseModule): def leave(self, room_jid, reason=None): self._log.info('Leave MUC: %s', room_jid) self._remove_join_timeout(room_jid) + self._remove_rejoin_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) muc_data = self._get_muc_data(room_jid) self._con.get_module('Presence').send_presence( @@ -361,20 +381,23 @@ class MUC(BaseModule): if muc_data.state == MUCJoinedState.JOINING: if properties.error.condition == 'conflict': + self._remove_rejoin_timeout(room_jid) muc_data.nick += '_' self._log.info('Nickname conflict: %s change to %s', muc_data.jid, muc_data.nick) self._join(muc_data) elif properties.error.condition == 'not-authorized': + self._remove_rejoin_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) self._raise_muc_event('muc-password-required', properties) else: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) - app.nec.push_incoming_event( - NetworkEvent('muc-join-failed', - account=self._account, - room_jid=room_jid, - error=properties.error)) + if room_jid not in self._rejoin_muc: + app.nec.push_incoming_event( + NetworkEvent('muc-join-failed', + account=self._account, + room_jid=room_jid, + error=properties.error)) elif muc_data.state == MUCJoinedState.CREATING: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) @@ -467,6 +490,9 @@ class MUC(BaseModule): 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) + status_codes = properties.muc_status_codes or [] + if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: + self._start_rejoin_timeout(room_jid) return if properties.is_muc_self_presence and properties.type.is_unavailable: @@ -527,6 +553,21 @@ class MUC(BaseModule): properties.show) self._raise_muc_event('muc-user-status-show-changed', properties) + def _start_rejoin_timeout(self, room_jid): + self._remove_rejoin_timeout(room_jid) + self._rejoin_muc.add(room_jid) + self._log.info('Start rejoin timeout for: %s', room_jid) + id_ = GLib.timeout_add_seconds(2, self._rejoin, room_jid) + self._rejoin_timeouts[room_jid] = id_ + + def _remove_rejoin_timeout(self, room_jid): + self._rejoin_muc.discard(room_jid) + id_ = self._rejoin_timeouts.get(room_jid) + if id_ is not None: + self._log.info('Remove rejoin timeout for: %s', room_jid) + GLib.source_remove(id_) + del self._rejoin_timeouts[room_jid] + def _start_join_timeout(self, room_jid): self._remove_join_timeout(room_jid) self._log.info('Start join timeout for: %s', room_jid) @@ -644,6 +685,7 @@ class MUC(BaseModule): def _room_join_complete(self, muc_data): self._remove_join_timeout(muc_data.jid) self._set_muc_state(muc_data.jid, MUCJoinedState.JOINED) + self._remove_rejoin_timeout(muc_data.jid) # We successfully joined a MUC, set add bookmark with autojoin self._con.get_module('Bookmarks').modify(muc_data.jid, @@ -695,6 +737,7 @@ class MUC(BaseModule): muc_data.captcha_id = properties.id self._set_muc_state(properties.jid, MUCJoinedState.CAPTCHA_REQUEST) + self._remove_rejoin_timeout(properties.jid) app.nec.push_incoming_event( NetworkEvent('muc-captcha-challenge', @@ -792,10 +835,18 @@ class MUC(BaseModule): self._log.info('Invite %s to %s', to, room) self._nbxmpp('MUC').invite(room, to, reason, password, continue_, type_) - def cleanup(self): + @event_filter(['account']) + def _on_account_disconnected(self, event): + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) + for room_jid in list(self._join_timeouts.keys()): self._remove_join_timeout(room_jid) + def cleanup(self): + for handler in self._event_handlers: + app.ged.remove_event_handler(*handler) + def get_instance(*args, **kwargs): return MUC(*args, **kwargs), 'MUC' ===================================== gajim/groupchat_control.py ===================================== @@ -94,14 +94,6 @@ class GroupchatControl(ChatControlBase): self.is_continued = is_continued self.is_anonymous = True - # Controls the state of autorejoin. - # None - autorejoin is neutral. - # False - autorejoin is to be prevented (gets reset to initial state in - # got_connected()). - # int - autorejoin is being active and working (gets reset to initial - # state in got_connected()). - self.autorejoin = None - # Keep error dialog instance to be sure to have only once at a time self.error_dialog = None @@ -1194,10 +1186,6 @@ class GroupchatControl(ChatControlBase): def got_connected(self): self.roster.draw() - # Make autorejoin stop. - if self.autorejoin: - GLib.source_remove(self.autorejoin) - self.autorejoin = None if self.disco_info.has_mam: # Request MAM @@ -1252,14 +1240,6 @@ class GroupchatControl(ChatControlBase): if self.parent_win: self.parent_win.redraw_tab(self) - # Autorejoin stuff goes here. - # Notice that we don't need to activate autorejoin if connection is lost - # or in progress. - if self.autorejoin is None and app.account_is_connected(self.account): - ar_to = app.config.get('muc_autorejoin_timeout') - if ar_to: - self.autorejoin = GLib.timeout_add_seconds(ar_to, self.rejoin) - self.update_actions() def leave(self, reason=None): @@ -1267,10 +1247,7 @@ class GroupchatControl(ChatControlBase): self._close_control(reason=reason) def rejoin(self): - if not self.autorejoin: - return False app.connections[self.account].get_module('MUC').join(self._muc_data) - return True def send_pm(self, nick, message=None): ctrl = self._start_private_message(nick) @@ -1421,8 +1398,6 @@ class GroupchatControl(ChatControlBase): @event_filter(['account', 'room_jid']) def _on_self_kicked(self, event): - self.autorejoin = False - status_codes = event.properties.muc_status_codes or [] reason = event.properties.muc_user.reason @@ -1473,7 +1448,6 @@ class GroupchatControl(ChatControlBase): reason = ': System shutdown' message = message.format(actor=actor, reason=reason) self.add_info_message(message) - self.autorejoin = True self.got_disconnected() @@ -1566,7 +1540,6 @@ class GroupchatControl(ChatControlBase): def _on_muc_join_failed(self, event): self.xml.error_label.set_text(to_user_string(event.error)) self._show_page('error') - self.autorejoin = False @event_filter(['account', 'room_jid']) def _on_muc_creation_failed(self, event): @@ -1594,7 +1567,6 @@ class GroupchatControl(ChatControlBase): 'instead: xmpp:%s?join') % alternate self.add_info_message(join_message) - self.autorejoin = False self.got_disconnected() con = app.connections[self.account] @@ -1695,9 +1667,6 @@ class GroupchatControl(ChatControlBase): del win._controls[self.account][self.contact.jid] def shutdown(self, reason=None): - # Preventing autorejoin from being activated - self.autorejoin = False - # Leave MUC if we are still joined if self._muc_data.state != MUCJoinedState.NOT_JOINED: self.got_disconnected() View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/837e9a1a27942d3abcf3ba3e736d00460… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/837e9a1a27942d3abcf3ba3e736d00460… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] MUC: Recognize server shutdown as room kick
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 589c0417 by Philipp Hörist at 2019-09-22T15:42:57Z MUC: Recognize server shutdown as room kick - - - - - 1 changed file: - nbxmpp/structs.py Changes: ===================================== nbxmpp/structs.py ===================================== @@ -659,6 +659,7 @@ class PresenceProperties: StatusCode.REMOVED_KICKED, StatusCode.REMOVED_AFFILIATION_CHANGE, StatusCode.REMOVED_NONMEMBER_IN_MEMBERS_ONLY, + StatusCode.REMOVED_SERVICE_SHUTDOWN, StatusCode.REMOVED_ERROR } return (self.from_muc and View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/589c0417455010c0ba1a41aae2… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/589c0417455010c0ba1a41aae2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Icons: Add 32 px feather icons for HiDPI Screens
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 837e9a1a by Philipp Hörist at 2019-09-22T09:35:22Z Icons: Add 32 px feather icons for HiDPI Screens - - - - - 13 changed files: - + gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png Changes: ===================================== gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-clock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-eye-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-eye-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-globe-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-hard-drive-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-lock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-mic-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-mic-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-server-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-shield-off-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-shield-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-unlock-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-user-check-symbolic.symbolic.png differ View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/837e9a1a27942d3abcf3ba3e736d004608… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/837e9a1a27942d3abcf3ba3e736d004608… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] AdHoc: Dont report empty command list as stanza-malformed
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 67a5562d by Philipp Hörist at 2019-09-22T09:21:58Z AdHoc: Dont report empty command list as stanza-malformed - - - - - 1 changed file: - nbxmpp/modules/adhoc.py Changes: ===================================== nbxmpp/modules/adhoc.py ===================================== @@ -54,7 +54,7 @@ class AdHoc: return raise_error(log.info, stanza) payload = stanza.getQueryPayload() - if not payload: + if payload is None: return raise_error(log.warning, stanza, 'stanza-malformed') command_list = [] View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/67a5562db9d3d335aa21eab56d… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/67a5562db9d3d335aa21eab56d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Remove unused import
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: dcbd5f9c by Philipp Hörist at 2019-09-22T08:31:49Z Remove unused import - - - - - 1 changed file: - gajim/common/helpers.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -59,7 +59,6 @@ import nbxmpp from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep from nbxmpp.structs import DiscoInfo -from nbxmpp.const import Affiliation from nbxmpp.const import Role from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dcbd5f9c4d99ef5c85cd4be9e47ac87806… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/commit/dcbd5f9c4d99ef5c85cd4be9e47ac87806… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MUC: Improve change affiliation logic
by Philipp Hörist 22 Sep '19

22 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: e1cdd603 by Philipp Hörist at 2019-09-22T07:29:36Z MUC: Improve change affiliation logic - - - - - 933702df by Philipp Hörist at 2019-09-22T08:22:52Z MUC: Show Make/Revoke Member menu entry correctly - - - - - 2 changed files: - gajim/common/helpers.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1665,10 +1665,21 @@ def get_alternative_venue(error): return uri.data['jid'] -def is_affiliation_change_allowed(self_contact, contact): - if self_contact.affiliation < Affiliation.ADMIN: +def is_affiliation_change_allowed(self_contact, contact, target_aff): + if contact.affiliation.value == target_aff: + # Contact has already the target affiliation return False - return self_contact.affiliation >= contact.affiliation + + if self_contact.affiliation.is_owner: + return True + + if not self_contact.affiliation.is_admin: + return False + + if target_aff in ('admin', 'owner'): + # Admin cant edit admin/owner list + return False + return self_contact.affiliation > contact.affiliation def is_role_change_allowed(self_contact, contact): ===================================== gajim/gui_menu_builder.py ===================================== @@ -897,7 +897,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Ban')) action = 'win.ban-%s::%s' % (control_id, contact.jid or '') - if is_affiliation_change_allowed(self_contact, contact): + if is_affiliation_change_allowed(self_contact, contact, 'outcast'): item.set_detailed_action_name(action) else: item.set_sensitive(False) @@ -908,8 +908,7 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Owner')) action = 'win.change-affiliation-%s(["%s", "owner"])' % (control_id, contact.jid) - if (is_affiliation_change_allowed(self_contact, contact) and - not contact.affiliation.is_owner): + if is_affiliation_change_allowed(self_contact, contact, 'owner'): item.set_detailed_action_name(action) else: item.set_sensitive(False) @@ -918,26 +917,25 @@ def get_groupchat_roster_menu(account, control_id, self_contact, contact): item = Gtk.MenuItem(label=_('Make Admin')) action = 'win.change-affiliation-%s(["%s", "admin"])' % (control_id, contact.jid) - if (is_affiliation_change_allowed(self_contact, contact) and - not contact.affiliation.is_admin): + if is_affiliation_change_allowed(self_contact, contact, 'admin'): item.set_detailed_action_name(action) else: item.set_sensitive(False) menu.append(item) - if contact.affiliation.is_none: - label = _('Make Member') - affiliation = 'member' + item = Gtk.MenuItem(label=_('Make Member')) + action = 'win.change-affiliation-%s(["%s", "member"])' % (control_id, + contact.jid) + if is_affiliation_change_allowed(self_contact, contact, 'member'): + item.set_detailed_action_name(action) else: - label = _('Revoke Member') - affiliation = 'none' + item.set_sensitive(False) + menu.append(item) - item = Gtk.MenuItem(label=label) - action = 'win.change-affiliation-%s(["%s", "%s"])' % (control_id, - contact.jid, - affiliation) - if (is_affiliation_change_allowed(self_contact, contact) and - contact.affiliation.value != affiliation): + item = Gtk.MenuItem(label=_('Revoke Member')) + action = 'win.change-affiliation-%s(["%s", "none"])' % (control_id, + contact.jid) + if is_affiliation_change_allowed(self_contact, contact, 'none'): item.set_detailed_action_name(action) else: item.set_sensitive(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/921594c14c5129f0d8030e032f765d40b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/921594c14c5129f0d8030e032f765d40b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] Add ordering to some enums
by Philipp Hörist 21 Sep '19

21 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: 09198dd4 by Philipp Hörist at 2019-09-21T22:02:10Z Add ordering to some enums - - - - - 1 changed file: - nbxmpp/const.py Changes: ===================================== nbxmpp/const.py ===================================== @@ -18,6 +18,7 @@ from enum import Enum from enum import IntEnum from enum import unique +from functools import total_ordering @unique @@ -141,6 +142,7 @@ class PresenceType(Enum): return self == PresenceType.SUBSCRIBED +@total_ordering class PresenceShow(Enum): ONLINE = 'online' CHAT = 'chat' @@ -168,6 +170,23 @@ class PresenceShow(Enum): def is_dnd(self): return self == PresenceShow.DND + def __lt__(self, other): + try: + w1 = self._WEIGHTS[self] + w2 = self._WEIGHTS[other] + except KeyError: + return NotImplemented + return w1 < w2 + + +PresenceShow._WEIGHTS = { + PresenceShow.CHAT: 1, + PresenceShow.ONLINE: 0, + PresenceShow.AWAY: -1, + PresenceShow.XA: -2, + PresenceShow.DND: -3, +} + class StatusCode(Enum): NON_ANONYMOUS = '100' @@ -204,6 +223,7 @@ class AvatarState(Enum): ADVERTISED = 'advertised' +@total_ordering class Affiliation(Enum): OWNER = 'owner' ADMIN = 'admin' @@ -231,7 +251,25 @@ class Affiliation(Enum): def is_none(self): return self == Affiliation.NONE + def __lt__(self, other): + try: + w1 = self._WEIGHTS[self] + w2 = self._WEIGHTS[other] + except KeyError: + return NotImplemented + return w1 < w2 + + +Affiliation._WEIGHTS = { + Affiliation.OWNER: 4, + Affiliation.ADMIN: 3, + Affiliation.MEMBER: 2, + Affiliation.NONE: 1, + Affiliation.OUTCAST: 0, +} + +@total_ordering class Role(Enum): MODERATOR = 'moderator' PARTICIPANT = 'participant' @@ -254,6 +292,22 @@ class Role(Enum): def is_none(self): return self == Role.NONE + def __lt__(self, other): + try: + w1 = self._WEIGHTS[self] + w2 = self._WEIGHTS[other] + except KeyError: + return NotImplemented + return w1 < w2 + + +Role._WEIGHTS = { + Role.MODERATOR: 3, + Role.PARTICIPANT: 2, + Role.VISITOR: 1, + Role.NONE: 0, +} + class BookmarkStoreType(Enum): PUBSUB = 'pubsub' View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/09198dd41ddedb08ca5b4d3e74… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/09198dd41ddedb08ca5b4d3e74… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Change some MUC helper methods
by Philipp Hörist 21 Sep '19

21 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: 7f5a6d0a by Philipp Hörist at 2019-09-21T21:57:33Z Change some MUC helper methods - Add plural support for get_uf_affiliation() - Accept nbxmpp.Role and nbxmpp.Affiliation as arguments - Add is_affiliation_change_allowed() - Add is_role_change_allowed() - - - - - 921594c1 by Philipp Hörist at 2019-09-21T21:59:47Z Rework Groupchat Roster - Add own module for roster code - Use avatars with status integrated - Favor performance over features - - - - - 16 changed files: - gajim/chat_control_base.py - gajim/command_system/implementation/standard.py - gajim/common/config.py - gajim/common/helpers.py - − gajim/data/gui/gc_occupants_menu.ui - gajim/data/gui/groupchat_control.ui - + gajim/data/gui/groupchat_roster.ui - + gajim/data/icons/hicolor/16x16/status/gajim-event.png - + gajim/data/icons/hicolor/32x32/status/gajim-event.png - gajim/data/style/gajim.css - gajim/groupchat_control.py - + gajim/gtk/groupchat_roster.py - gajim/gtk/preferences.py - gajim/gtk/util.py - gajim/gui_interface.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1320,7 +1320,7 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools): if contact: app.interface.roster.draw_contact(room_jid, self.account) if groupchat_control: - groupchat_control.draw_contact(nick) + groupchat_control.roster.draw_contact(nick) if groupchat_control.parent_win: groupchat_control.parent_win.redraw_tab(groupchat_control) else: ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -282,17 +282,17 @@ class StandardGroupChatCommands(CommandContainer): def chat(self, nick): nicks = app.contacts.get_nick_list(self.account, self.room_jid) if nick in nicks: - self.on_send_pm(nick=nick) + self.send_pm(nick) else: raise CommandError(_("Nickname not found")) @command('msg', raw=True) @doc(_("Open a private chat window with a specified participant and send " "him a message")) - def message(self, nick, a_message): + def message(self, nick, message): nicks = app.contacts.get_nick_list(self.account, self.room_jid) if nick in nicks: - self.on_send_pm(nick=nick, msg=a_message) + self.send_pm(nick, message) else: raise CommandError(_("Nickname not found")) ===================================== gajim/common/config.py ===================================== @@ -128,7 +128,6 @@ class Config: 'custombrowser': [opt_str, DEFAULT_BROWSER], 'custommailapp': [opt_str, DEFAULT_MAILAPP], 'custom_file_manager': [opt_str, DEFAULT_FILE_MANAGER], - 'gc-hpaned-position': [opt_int, 430], 'gc_refer_to_nick_char': [opt_str, ',', _('Character to add after nickname when using nickname completion (tab) in group chat.')], 'gc_proposed_nick_char': [opt_str, '_', _('Character to propose to add after desired nickname when nickname is already used in group chat.')], 'msgwin-max-state': [opt_bool, False], @@ -289,6 +288,7 @@ class Config: 'muclumbus_api_pref': [opt_str, 'http', _('API Preferences. Possible values: \'http\', \'iq\'')], 'auto_copy': [opt_bool, True, _('Selecting text will copy it to the clipboard')], 'command_system_execute': [opt_bool, False, _('If enabled, Gajim will execute commands (/show, /sh, /execute, /exec).')], + 'groupchat_roster_width': [opt_int, 210, _('Width of group chat roster in pixel')], }, {}) # type: Tuple[Dict[str, List[Any]], Dict[Any, Any]] __options_per_key = { ===================================== gajim/common/helpers.py ===================================== @@ -59,6 +59,8 @@ import nbxmpp from nbxmpp.util import compute_caps_hash from nbxmpp.stringprepare import nameprep from nbxmpp.structs import DiscoInfo +from nbxmpp.const import Affiliation +from nbxmpp.const import Role from nbxmpp.protocol import JID from nbxmpp.protocol import InvalidJid from gi.repository import GLib @@ -356,37 +358,50 @@ def get_uf_ask(ask): def get_uf_role(role, plural=False): ''' plural determines if you get Moderators or Moderator''' - if role.value == 'none': + if not isinstance(role, str): + role = role.value + + if role == 'none': role_name = Q_('?Group Chat Contact Role:None') - elif role.value == 'moderator': + elif role == 'moderator': if plural: role_name = _('Moderators') else: role_name = _('Moderator') - elif role.value == 'participant': + elif role == 'participant': if plural: role_name = _('Participants') else: role_name = _('Participant') - elif role.value == 'visitor': + elif role == 'visitor': if plural: role_name = _('Visitors') else: role_name = _('Visitor') return role_name -def get_uf_affiliation(affiliation): +def get_uf_affiliation(affiliation, plural=False): '''Get a nice and translated affilition for muc''' - if affiliation.value == 'none': + if not isinstance(affiliation, str): + affiliation = affiliation.value + + if affiliation == 'none': affiliation_name = Q_('?Group Chat Contact Affiliation:None') - elif affiliation.value == 'owner': - affiliation_name = _('Owner') - elif affiliation.value == 'admin': - affiliation_name = _('Administrator') - elif affiliation.value == 'member': - affiliation_name = _('Member') - else: # Argl ! An unknown affiliation ! - affiliation_name = affiliation.capitalize() + elif affiliation == 'owner': + if plural: + affiliation_name = _('Owners') + else: + affiliation_name = _('Owner') + elif affiliation == 'admin': + if plural: + affiliation_name = _('Administrators') + else: + affiliation_name = _('Administrator') + elif affiliation == 'member': + if plural: + affiliation_name = _('Members') + else: + affiliation_name = _('Member') return affiliation_name def get_sorted_keys(adict): @@ -1648,3 +1663,15 @@ def get_alternative_venue(error): uri = parse_uri(error.condition_data) if uri.type == URIType.XMPP and uri.action == URIAction.JOIN: return uri.data['jid'] + + +def is_affiliation_change_allowed(self_contact, contact): + if self_contact.affiliation < Affiliation.ADMIN: + return False + return self_contact.affiliation >= contact.affiliation + + +def is_role_change_allowed(self_contact, contact): + if self_contact.role < Role.MODERATOR: + return False + return self_contact.affiliation >= contact.affiliation ===================================== gajim/data/gui/gc_occupants_menu.ui deleted ===================================== @@ -1,175 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkAccelGroup" id="accelgroup1"/> - <object class="GtkMenu" id="gc_occupants_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="send_private_message_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Send Private Message</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="send_file_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">Send _File</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="group_chat_actions_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Participant Actions</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="group_chat_actions_menuitem_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkCheckMenuItem" id="voice_checkmenuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Voice</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="moderator_checkmenuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Mo_derator</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator5"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="member_checkmenuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Member</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="admin_checkmenuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Admin</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="owner_checkmenuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Owner</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="kick_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Kick</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="ban_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Ban</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkMenuItem" id="invite_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">In_vite to</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator6"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="add_to_roster_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Add to Contact List</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="execute_command_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Execute command</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="block_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Block</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="unblock_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Unblock</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separator1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="information_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label">_Information</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="history_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - </object> - </child> - </object> -</interface> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -92,365 +92,334 @@ <property name="margin_right">7</property> <property name="margin_top">5</property> <property name="margin_bottom">7</property> - <property name="orientation">vertical</property> - <property name="spacing">5</property> + <property name="spacing">3</property> <child> - <object class="GtkPaned" id="hpaned"> + <object class="GtkBox" id="gc_textviews_vbox"> + <property name="width_request">0</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="position">495</property> - <property name="position_set">True</property> - <signal name="button-release-event" handler="_on_hpaned_release_button" swapped="no"/> - <signal name="notify::position" handler="_on_hpaned_handle_change" swapped="no"/> + <property name="can_focus">False</property> + <property name="margin_right">4</property> + <property name="orientation">vertical</property> <child> - <object class="GtkBox" id="gc_textviews_vbox"> - <property name="width_request">0</property> + <object class="GtkEventBox" id="banner_eventbox"> + <property name="name">GroupChatControl-BannerEventBox</property> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="margin_right">4</property> - <property name="orientation">vertical</property> <child> - <object class="GtkEventBox" id="banner_eventbox"> - <property name="name">GroupChatControl-BannerEventBox</property> + <object class="GtkBox"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="spacing">6</property> + <child> + <object class="GtkImage" id="gc_banner_status_image"> + <property name="width_request">48</property> + <property name="height_request">48</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-missing-image</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="banner_name_label"> + <property name="name">GroupChatControl-BannerNameLabel</property> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="hexpand">True</property> + <property name="label">Group Chat Name</property> + <property name="selectable">True</property> + <property name="ellipsize">end</property> + <property name="single_line_mode">True</property> + <property name="xalign">0</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkActionBar" id="banner_actionbar"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="actionbar-no-border"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="pack_type">end</property> + <property name="position">2</property> + </packing> + </child> + </object> + </child> + <style> + <class name="gajim-banner"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator-top"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> + <property name="width_request">200</property> + <property name="height_request">60</property> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="shadow_type">in</property> + <property name="overlay_scrolling">False</property> + <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <child> + <placeholder/> + </child> + <style> + <class name="scrolled-no-border"/> + <class name="no-scroll-indicator"/> + <class name="scrollbar-style"/> + </style> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <style> + <class name="chatcontrol-separator"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkBox" id="hbox"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <child> + <object class="GtkMenuButton" id="settings_menu"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="relief">none</property> <child> - <object class="GtkBox"> + <object class="GtkImage"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="spacing">6</property> - <child> - <object class="GtkImage" id="gc_banner_status_image"> - <property name="width_request">48</property> - <property name="height_request">48</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-missing-image</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="banner_name_label"> - <property name="name">GroupChatControl-BannerNameLabel</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="hexpand">True</property> - <property name="label">Group Chat Name</property> - <property name="selectable">True</property> - <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="xalign">0</property> - <style> - <class name="large-header"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkActionBar" id="banner_actionbar"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <style> - <class name="actionbar-no-border"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> + <property name="icon_name">open-menu-symbolic</property> </object> </child> <style> - <class name="gajim-banner"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">0</property> </packing> </child> <child> - <object class="GtkSeparator"> - <property name="visible">True</property> - <property name="can_focus">False</property> + <object class="GtkButton" id="authentication_button"> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="no_show_all">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage" id="lock_image"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="stock">gtk-dialog-authentication</property> + <property name="icon_size">1</property> + </object> + </child> <style> - <class name="chatcontrol-separator-top"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">1</property> </packing> </child> <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> + <object class="GtkMenuButton" id="encryption_menu"> <property name="visible">True</property> <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Choose encryption</property> + <property name="relief">none</property> <child> <placeholder/> </child> <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> <property name="fill">True</property> + <property name="pack_type">end</property> <property name="position">2</property> </packing> </child> <child> - <object class="GtkSeparator"> + <object class="GtkButton" id="sendfile_button"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="relief">none</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="icon_name">mail-attachment-symbolic</property> + </object> + </child> <style> - <class name="chatcontrol-separator"/> + <class name="chatcontrol-actionbar-button"/> </style> </object> <packing> <property name="expand">False</property> - <property name="fill">True</property> + <property name="fill">False</property> + <property name="pack_type">end</property> <property name="position">3</property> </packing> </child> <child> - <object class="GtkBox" id="hbox"> + <object class="GtkMenuButton" id="emoticons_button"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuButton" id="settings_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">open-menu-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="authentication_button"> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="no_show_all">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage" id="lock_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="stock">gtk-dialog-authentication</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="encryption_menu"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Choose encryption</property> - <property name="relief">none</property> - <child> - <placeholder/> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="sendfile_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-attachment-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="pack_type">end</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkMenuButton" id="emoticons_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">face-smile-symbolic</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">4</property> - </packing> - </child> + <property name="can_focus">True</property> + <property name="receives_default">True</property> + <property name="tooltip_text" translatable="yes">Show a list of emojis (Alt+M)</property> + <property name="relief">none</property> <child> - <object class="GtkMenuButton" id="formattings_button"> + <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="focus_on_click">False</property> - <property name="receives_default">True</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="has_tooltip">True</property> - <property name="relief">none</property> - <property name="popup">formattings_menu</property> - <child> - <object class="GtkImage" id="image10"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">format-text-bold-symbolic</property> - <property name="icon_size">1</property> - </object> - </child> - <style> - <class name="chatcontrol-actionbar-button"/> - </style> + <property name="can_focus">False</property> + <property name="icon_name">face-smile-symbolic</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">5</property> - </packing> - </child> - <child> - <placeholder/> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkMenuButton" id="formattings_button"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="focus_on_click">False</property> + <property name="receives_default">True</property> + <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> + <property name="has_tooltip">True</property> + <property name="relief">none</property> + <property name="popup">formattings_menu</property> <child> - <object class="GtkComboBox" id="label_selector"> + <object class="GtkImage" id="image10"> <property name="visible">True</property> <property name="can_focus">False</property> - <property name="no_show_all">True</property> + <property name="icon_name">format-text-bold-symbolic</property> + <property name="icon_size">1</property> </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">7</property> - </packing> </child> + <style> + <class name="chatcontrol-actionbar-button"/> + </style> </object> <packing> <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> + <property name="fill">True</property> + <property name="position">5</property> </packing> </child> - </object> - <packing> - <property name="resize">False</property> - <property name="shrink">True</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="list_scrolledwindow"> - <property name="width_request">100</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="margin_left">4</property> - <property name="margin_bottom">5</property> - <property name="hscrollbar_policy">never</property> - <property name="shadow_type">in</property> <child> - <object class="GtkTreeView" id="list_treeview"> + <placeholder/> + </child> + <child> + <object class="GtkComboBox" id="label_selector"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="border_width">1</property> - <property name="headers_visible">False</property> - <property name="search_column">1</property> - <child internal-child="selection"> - <object class="GtkTreeSelection" id="treeview-selection1"/> - </child> + <property name="can_focus">False</property> + <property name="no_show_all">True</property> </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">7</property> + </packing> </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - </style> </object> <packing> - <property name="resize">False</property> - <property name="shrink">False</property> + <property name="expand">False</property> + <property name="fill">False</property> + <property name="position">4</property> </packing> </child> </object> <packing> - <property name="expand">True</property> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkRevealer" id="roster_revealer"> + <property name="visible">True</property> + <property name="can_focus">False</property> + <property name="transition_type">none</property> + <property name="reveal_child">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> <property name="fill">True</property> <property name="position">1</property> </packing> ===================================== gajim/data/gui/groupchat_roster.ui ===================================== @@ -0,0 +1,82 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.20"/> + <object class="GtkTreeStore" id="participant_store"> + <columns> +  + <column type="CairoGObjectSurface"/> +  + <column type="gchararray"/> +  + <column type="gboolean"/> +  + <column type="gboolean"/> +  + <column type="gchararray"/> + </columns> + </object> + <object class="GtkTreeView" id="roster_treeview"> + <property name="visible">True</property> + <property name="can_focus">True</property> + <property name="model">participant_store</property> + <property name="headers_visible">False</property> + <property name="expander_column">expander</property> + <property name="search_column">1</property> + <signal name="button-press-event" handler="_on_roster_button_press_event" swapped="no"/> + <signal name="focus-out-event" handler="_on_focus_out" swapped="no"/> + <signal name="row-activated" handler="_on_roster_row_activated" swapped="no"/> + <child internal-child="selection"> + <object class="GtkTreeSelection"/> + </child> + <child> + <object class="GtkTreeViewColumn" id="contact_column"> + <property name="sizing">fixed</property> + <property name="fixed_width">210</property> + <property name="title">avatar</property> + <property name="expand">True</property> + <child> + <object class="GtkCellRendererPixbuf" id="avatar_renderer"> + <property name="width">40</property> + <property name="xalign">0</property> + </object> + <attributes> + <attribute name="visible">3</attribute> + <attribute name="surface">0</attribute> + </attributes> + </child> + <child> + <object class="GtkCellRendererText" id="text_renderer"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="markup">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="event_column"> + <property name="sizing">fixed</property> + <property name="fixed_width">35</property> + <property name="title">event</property> + <child> + <object class="GtkCellRendererPixbuf" id="icon"> + <property name="xalign">0</property> + <property name="icon_name">gajim-event</property> + </object> + <attributes> + <attribute name="visible">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn" id="expander"> + <property name="visible">False</property> + <property name="sizing">fixed</property> + <property name="title">expander</property> + </object> + </child> + </object> +</interface> ===================================== gajim/data/icons/hicolor/16x16/status/gajim-event.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/status/gajim-event.png differ ===================================== gajim/data/icons/hicolor/32x32/status/gajim-event.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/status/gajim-event.png differ ===================================== gajim/data/style/gajim.css ===================================== @@ -141,6 +141,10 @@ list.settings > row > box { .start-chat-row:not(.activatable) label { color: @insensitive_fg_color } .start-chat-row:focus { outline: none; } +/* GroupChatRoster */ +.groupchat-roster { border-left: 1px solid; + border-color: @borders; } +.groupchat-roster treeview { padding-left: 4px; } /* GroupchatConfig */ #GroupchatConfig > box > buttonbox { margin: 0px 12px 12px 12px; } ===================================== gajim/groupchat_control.py ===================================== @@ -24,26 +24,20 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import Optional - import time -import locale import base64 import logging -from enum import IntEnum, unique import nbxmpp from nbxmpp.protocol import InvalidJid from nbxmpp.protocol import validate_resourcepart from nbxmpp.const import StatusCode from nbxmpp.const import Affiliation -from nbxmpp.const import Role from nbxmpp.const import PresenceType from nbxmpp.util import is_error_result from gi.repository import Gtk from gi.repository import Gdk -from gi.repository import Pango from gi.repository import GLib from gi.repository import Gio @@ -61,7 +55,6 @@ from gajim.common.helpers import to_user_string from gajim.common import ged from gajim.common.i18n import _ from gajim.common import contacts -from gajim.common.const import StyleAttr from gajim.common.const import Chatstate from gajim.common.const import MUCJoinedState @@ -75,28 +68,17 @@ from gajim.gtk.dialogs import NewConfirmationCheckDialog from gajim.gtk.dialogs import ErrorDialog from gajim.gtk.dialogs import NewConfirmationDialog from gajim.gtk.filechoosers import AvatarChooserDialog -from gajim.gtk.add_contact import AddNewContactWindow -from gajim.gtk.tooltips import GCTooltip from gajim.gtk.groupchat_config import GroupchatConfig from gajim.gtk.adhoc import AdHocCommand from gajim.gtk.dataform import DataFormWidget from gajim.gtk.groupchat_info import GroupChatInfoScrolled +from gajim.gtk.groupchat_roster import GroupchatRoster from gajim.gtk.util import NickCompletionGenerator from gajim.gtk.util import get_icon_name -from gajim.gtk.util import get_affiliation_surface -from gajim.gtk.util import get_builder log = logging.getLogger('gajim.groupchat_control') -@unique -class Column(IntEnum): - IMG = 0 # image to show state (online, new message etc) - NICK = 1 # contact nickname or ROLE name - TYPE = 2 # type of the row ('contact' or 'role') - TEXT = 3 # text shown in the cellrenderer - AVATAR_IMG = 4 # avatar of the contact - class GroupchatControl(ChatControlBase): TYPE_ID = message_control.TYPE_GC @@ -132,41 +114,29 @@ class GroupchatControl(ChatControlBase): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) - self._state_change_handler_id = None + self.room_jid = self.contact.jid + self._muc_data = muc_data + + # Stores nickname we want to kick + self._kick_nick = None + + # Stores nickname we want to ban + self._ban_jid = None + + self.roster = GroupchatRoster(self.account, self.room_jid, self) + self.xml.roster_revealer.add(self.roster) + self.roster.connect('row-activated', self._on_roster_row_activated) + if parent_win is not None: # On AutoJoin with minimize Groupchats are created without parent # Tooltip Window and Actions have to be created with parent - self.set_tooltip() + self.roster.enable_tooltips() self.add_actions() GLib.idle_add(self.update_actions) self.scale_factor = parent_win.window.get_scale_factor() - self._connect_window_state_change(parent_win) else: self.scale_factor = app.interface.roster.scale_factor - widget = self.xml.get_object('list_treeview') - id_ = widget.connect('row_expanded', self.on_list_treeview_row_expanded) - self.handlers[id_] = widget - - id_ = widget.connect('row_collapsed', - self.on_list_treeview_row_collapsed) - self.handlers[id_] = widget - - id_ = widget.connect('row_activated', - self.on_list_treeview_row_activated) - self.handlers[id_] = widget - - id_ = widget.connect('button_press_event', - self.on_list_treeview_button_press_event) - self.handlers[id_] = widget - - id_ = widget.connect('key_press_event', - self.on_list_treeview_key_press_event) - self.handlers[id_] = widget - - self.room_jid = self.contact.jid - self._muc_data = muc_data - self.widget_set_visible(self.xml.get_object('banner_eventbox'), app.config.get('hide_groupchat_banner')) @@ -186,77 +156,8 @@ class GroupchatControl(ChatControlBase): self.name_label = self.xml.get_object('banner_name_label') self.event_box = self.xml.get_object('banner_eventbox') - self.list_treeview = self.xml.get_object('list_treeview') - id_ = self.list_treeview.connect('style-set', - self.on_list_treeview_style_set) - self.handlers[id_] = self.list_treeview - - # flag that stops hpaned position event - # when the handle gets resized in another control - self._resize_from_another_muc = False - - self.hpaned = self.xml.get_object('hpaned') - - # set the position of the current hpaned - hpaned_position = app.config.get('gc-hpaned-position') - self.hpaned.set_position(hpaned_position) - - # Holds the Gtk.TreeRowReference for each contact - self._contact_refs = {} - # Holds the Gtk.TreeRowReference for each role - self._role_refs = {} - - #status_image, shown_nick, type, nickname, avatar - self.columns = [str, str, str, str, Gtk.Image] - self.model = Gtk.TreeStore(*self.columns) - self.model.set_sort_func(Column.NICK, self.tree_compare_iters) - - # columns - column = Gtk.TreeViewColumn() - # list of renderers with attributes / properties in the form: - # (name, renderer_object, expand?, attribute_name, attribute_value, - # cell_data_func, func_arg) - self.renderers_list = [] - # Number of renderers plugins added - self.nb_ext_renderers = 0 - self.renderers_propertys = {} - renderer_text = Gtk.CellRendererText() - self.renderers_propertys[renderer_text] = ('ellipsize', - Pango.EllipsizeMode.END) - - self.renderers_list += ( - # status img - ('icon', Gtk.CellRendererPixbuf(), False, - 'icon_name', Column.IMG, self._cell_data_func, 'status'), - # contact name - ('name', renderer_text, True, - 'markup', Column.TEXT, self._cell_data_func, 'name')) - - # avatar img - avatar_renderer = ('avatar', Gtk.CellRendererPixbuf(), - False, None, Column.AVATAR_IMG, - self._cell_data_func, 'avatar') - - if app.config.get('avatar_position_in_roster') == 'right': - self.renderers_list.append(avatar_renderer) - else: - self.renderers_list.insert(0, avatar_renderer) - - self.fill_column(column) - self.list_treeview.append_column(column) - - # workaround to avoid gtk arrows to be shown - column = Gtk.TreeViewColumn() # 2nd COLUMN - renderer = Gtk.CellRendererPixbuf() - column.pack_start(renderer, False) - self.list_treeview.append_column(column) - column.set_visible(False) - self.list_treeview.set_expander_column(column) - self.setup_seclabel() - self.list_treeview.set_search_equal_func(self._search_func) - # Send file self.sendfile_button = self.xml.get_object('sendfile_button') self.sendfile_button.set_action_name('win.send-file-' + \ @@ -293,9 +194,6 @@ class GroupchatControl(ChatControlBase): self._muc_info_box = GroupChatInfoScrolled(self.account, {'width': 600}) self.xml.info_grid.attach(self._muc_info_box, 0, 0, 1, 1) - # GC Roster tooltip - self.gc_tooltip = GCTooltip() - self.control_menu = gui_menu_builder.get_groupchat_menu(self.control_id, self.account, self.room_jid) @@ -327,7 +225,6 @@ class GroupchatControl(ChatControlBase): ('muc-configuration-failed', ged.GUI1, self._on_configuration_failed), ('gc-message-received', ged.GUI1, self._nec_gc_message_received), ('mam-decrypted-message-received', ged.GUI1, self._nec_mam_decrypted_message_received), - ('update-gc-avatar', ged.GUI1, self._nec_update_avatar), ('update-room-avatar', ged.GUI1, self._nec_update_room_avatar), ('signed-in', ged.GUI1, self._nec_signed_in), ('decrypted-message-received', ged.GUI2, self._nec_decrypted_message_received), @@ -379,20 +276,29 @@ class GroupchatControl(ChatControlBase): def add_actions(self): super().add_actions() actions = [ - ('change-subject-', self._on_change_subject), - ('change-nickname-', self._on_change_nick), - ('disconnect-', self._on_disconnect), - ('destroy-', self._on_destroy_room), - ('configure-', self._on_configure_room), - ('request-voice-', self._on_request_voice), - ('execute-command-', self._on_execute_command), - ('upload-avatar-', self._on_upload_avatar), - ('information-', self._on_information), + ('change-subject-', None, self._on_change_subject), + ('change-nickname-', None, self._on_change_nick), + ('disconnect-', None, self._on_disconnect), + ('destroy-', None, self._on_destroy_room), + ('configure-', None, self._on_configure_room), + ('request-voice-', None, self._on_request_voice), + ('upload-avatar-', None, self._on_upload_avatar), + ('information-', None, self._on_information), + ('contact-information-', 's', self._on_contact_information), + ('execute-command-', 's', self._on_execute_command), + ('block-', 's', self._on_block), + ('unblock-', 's', self._on_unblock), + ('ban-', 's', self._on_ban), + ('kick-', 's', self._on_kick), + ('change-role-', 'as', self._on_change_role), + ('change-affiliation-', 'as', self._on_change_affiliation), ] for action in actions: - action_name, func = action - act = Gio.SimpleAction.new(action_name + self.control_id, None) + action_name, variant, func = action + if variant is not None: + variant = GLib.VariantType.new(variant) + act = Gio.SimpleAction.new(action_name + self.control_id, variant) act.connect("activate", func) self.parent_win.window.add_action(act) @@ -487,10 +393,8 @@ class GroupchatControl(ChatControlBase): self.is_connected and contact.affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) - # Request Voice - role = self.get_role(self.nick) self._get_action('request-voice-').set_enabled(self.is_connected and - role.is_visitor) + contact.role.is_visitor) # Change Subject subject_change = self._is_subject_change_allowed() @@ -543,6 +447,21 @@ class GroupchatControl(ChatControlBase): self._get_action('print-status-').set_state( GLib.Variant.new_boolean(value)) + self._get_action('contact-information-').set_enabled(self.is_connected) + + self._get_action('execute-command-').set_enabled(self.is_connected) + + block_supported = con.get_module('PrivacyLists').supported + self._get_action('block-').set_enabled(self.is_connected and + block_supported) + + self._get_action('unblock-').set_enabled(self.is_connected and + block_supported) + + self._get_action('ban-').set_enabled(self.is_connected) + + self._get_action('kick-').set_enabled(self.is_connected) + def _is_subject_change_allowed(self): contact = app.contacts.get_gc_contact( self.account, self.room_jid, self.nick) @@ -574,70 +493,6 @@ class GroupchatControl(ChatControlBase): def _get_current_page(self): return self.xml.stack.get_visible_child_name() - def _cell_data_func(self, column, renderer, model, iter_, user_data): - # Background color has to be rendered for all cells - theme = app.config.get('roster_theme') - has_parent = bool(model.iter_parent(iter_)) - if has_parent: - bgcolor = app.css_config.get_value('.gajim-contact-row', StyleAttr.BACKGROUND) - renderer.set_property('cell-background', bgcolor) - else: - bgcolor = app.css_config.get_value('.gajim-group-row', StyleAttr.BACKGROUND) - renderer.set_property('cell-background', bgcolor) - - if user_data == 'status': - self._status_cell_data_func(column, renderer, model, iter_, has_parent) - elif user_data == 'name': - self._text_cell_data_func(column, renderer, model, iter_, has_parent, theme) - elif user_data == 'avatar': - self._avatar_cell_data_func(column, renderer, model, iter_, has_parent) - - def _status_cell_data_func(self, column, renderer, model, iter_, has_parent): - renderer.set_property('width', 26) - icon_name = model[iter_][Column.IMG] - if ':' in icon_name: - icon_name, affiliation = icon_name.split(':') - surface = get_affiliation_surface( - icon_name, affiliation, self.scale_factor) - renderer.set_property('icon_name', None) - renderer.set_property('surface', surface) - else: - renderer.set_property('surface', None) - renderer.set_property('icon_name', icon_name) - - def _avatar_cell_data_func(self, column, renderer, model, iter_, has_parent): - image = model[iter_][Column.AVATAR_IMG] - if image is None: - renderer.set_property('surface', None) - else: - surface = image.get_property('surface') - renderer.set_property('surface', surface) - - renderer.set_property('xalign', 0.5) - if has_parent: - renderer.set_property('visible', True) - renderer.set_property('width', AvatarSize.ROSTER) - else: - renderer.set_property('visible', False) - - def _text_cell_data_func(self, column, renderer, model, iter_, has_parent, theme): - # cell data func is global, because we don't want it to keep - # reference to GroupchatControl instance (self) - if has_parent: - color = app.css_config.get_value('.gajim-contact-row', StyleAttr.COLOR) - renderer.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-contact-row') - renderer.set_property('font-desc', desc) - else: - color = app.css_config.get_value('.gajim-group-row', StyleAttr.COLOR) - renderer.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-group-row') - renderer.set_property('font-desc', desc) - - @staticmethod - def _search_func(model, _column, search_text, iter_): - return search_text.lower() not in model[iter_][1].lower() - @event_filter(['account', 'room_jid']) def _on_disco_update(self, _event): if self.parent_win is None: @@ -654,12 +509,6 @@ class GroupchatControl(ChatControlBase): win.change_action_state('choose-sync-%s' % self.control_id, GLib.Variant('s', str(threshold))) - def _connect_window_state_change(self, parent_win): - if self._state_change_handler_id is None: - id_ = parent_win.window.connect('notify::is-maximized', - self._on_window_state_change) - self._state_change_handler_id = id_ - # Actions def _on_disconnect(self, action, param): @@ -769,11 +618,12 @@ class GroupchatControl(ChatControlBase): action.set_state(param) app.logger.set_archive_infos(self.contact.jid, sync_threshold=threshold) - def _on_execute_command(self, action, param): - """ - Execute AdHoc commands on the current room - """ - AdHocCommand(self.account, self.room_jid) + def _on_execute_command(self, _action, param): + jid = self.room_jid + nick = param.get_string() + if nick: + jid += '/' + nick + AdHocCommand(self.account, jid) def _on_upload_avatar(self, action, param): def _on_accept(filename): @@ -794,114 +644,83 @@ class GroupchatControl(ChatControlBase): transient_for=self.parent_win.window, modal=True) + def _on_contact_information(self, _action, param): + nick = param.get_string() + gc_contact = app.contacts.get_gc_contact(self.account, + self.room_jid, + nick) + contact = gc_contact.as_contact() + if contact.jid in app.interface.instances[self.account]['infos']: + app.interface.instances[self.account]['infos'][contact.jid].\ + window.present() + else: + app.interface.instances[self.account]['infos'][contact.jid] = \ + vcard.VcardWindow(contact, self.account, gc_contact) + + def _on_block(self, _action, param): + nick = param.get_string() + fjid = self.room_jid + '/' + nick + con = app.connections[self.account] + con.get_module('PrivacyLists').block_gc_contact(fjid) + self.roster.draw_contact(nick) + + def _on_unblock(self, _action, param): + nick = param.get_string() + fjid = self.room_jid + '/' + nick + con = app.connections[self.account] + con.get_module('PrivacyLists').unblock_gc_contact(fjid) + self.roster.draw_contact(nick) + + def _on_kick(self, _action, param): + nick = param.get_string() + self._kick_nick = nick + self.xml.kick_label.set_text(_('Kick %s' % nick)) + self.xml.kick_reason_entry.grab_focus() + self.xml.kick_participant_button.grab_default() + self._show_page('kick') + + def _on_ban(self, _action, param): + jid = param.get_string() + self._ban_jid = jid + nick = app.get_nick_from_jid(jid) + self.xml.ban_label.set_text(_('Ban %s' % nick)) + self.xml.ban_reason_entry.grab_focus() + self.xml.ban_participant_button.grab_default() + self._show_page('ban') + + def _on_change_role(self, _action, param): + nick, role = param.get_strv() + con = app.connections[self.account] + con.get_module('MUC').set_role(self.room_jid, nick, role) + + def _on_change_affiliation(self, _action, param): + jid, affiliation = param.get_strv() + con = app.connections[self.account] + con.get_module('MUC').set_affiliation( + self.room_jid, + {jid: {'affiliation': affiliation}}) + def show_roster(self): - new_state = not self.hpaned.get_child2().is_visible() + show = not self.xml.roster_revealer.get_reveal_child() + icon = 'go-next-symbolic' if show else 'go-previous-symbolic' image = self.hide_roster_button.get_image() - if new_state: - self.hpaned.get_child2().show() - image.set_from_icon_name('go-next-symbolic', Gtk.IconSize.MENU) - else: - self.hpaned.get_child2().hide() - image.set_from_icon_name('go-previous-symbolic', Gtk.IconSize.MENU) + image.set_from_icon_name(icon, Gtk.IconSize.MENU) + + transition = Gtk.RevealerTransitionType.SLIDE_RIGHT + if show: + transition = Gtk.RevealerTransitionType.SLIDE_LEFT + self.xml.roster_revealer.set_transition_type(transition) + self.xml.roster_revealer.set_reveal_child(show) def on_groupchat_maximize(self): - self.set_tooltip() + self.roster.enable_tooltips() self.add_actions() self.update_actions() self.set_lock_image() - self._connect_window_state_change(self.parent_win) self.draw_banner_text() - def set_tooltip(self): - widget = self.xml.get_object('list_treeview') - if widget.get_tooltip_window(): - return - widget.set_has_tooltip(True) - id_ = widget.connect('query-tooltip', self.query_tooltip) - self.handlers[id_] = widget - - def query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): - try: - row = self.list_treeview.get_path_at_pos(x_pos, y_pos)[0] - except TypeError: - self.gc_tooltip.clear_tooltip() - return False - if not row: - self.gc_tooltip.clear_tooltip() - return False - - iter_ = None - try: - iter_ = self.model.get_iter(row) - except Exception: - self.gc_tooltip.clear_tooltip() - return False - - typ = self.model[iter_][Column.TYPE] - nick = self.model[iter_][Column.NICK] - - if typ != 'contact': - self.gc_tooltip.clear_tooltip() - return False - - contact = app.contacts.get_gc_contact( - self.account, self.room_jid, nick) - if not contact: - self.gc_tooltip.clear_tooltip() - return False - - value, widget = self.gc_tooltip.get_tooltip(contact) - tooltip.set_custom(widget) - return value - - def fill_column(self, col): - for rend in self.renderers_list: - col.pack_start(rend[1], rend[2]) - if rend[0] not in ('avatar', 'icon'): - col.add_attribute(rend[1], rend[3], rend[4]) - col.set_cell_data_func(rend[1], rend[5], rend[6]) - # set renderers properties - for renderer in self.renderers_propertys: - renderer.set_property(self.renderers_propertys[renderer][0], - self.renderers_propertys[renderer][1]) - - def tree_compare_iters(self, model, iter1, iter2, data=None): - """ - Compare two iterators to sort them - """ - type1 = model[iter1][Column.TYPE] - type2 = model[iter2][Column.TYPE] - if not type1 or not type2: - return 0 - nick1 = model[iter1][Column.NICK] - nick2 = model[iter2][Column.NICK] - if not nick1 or not nick2: - return 0 - if type1 == 'role': - return locale.strcoll(nick1, nick2) - if type1 == 'contact': - gc_contact1 = app.contacts.get_gc_contact(self.account, - self.room_jid, nick1) - if not gc_contact1: - return 0 - if type2 == 'contact': - gc_contact2 = app.contacts.get_gc_contact(self.account, - self.room_jid, nick2) - if not gc_contact2: - return 0 - if type1 == 'contact' and type2 == 'contact' and \ - app.config.get('sort_by_show_in_muc'): - cshow = {'chat':0, 'online': 1, 'away': 2, 'xa': 3, 'dnd': 4} - show1 = cshow[gc_contact1.show.value] - show2 = cshow[gc_contact2.show.value] - if show1 < show2: - return -1 - if show1 > show2: - return 1 - # We compare names - name1 = gc_contact1.get_shown_name() - name2 = gc_contact2.get_shown_name() - return locale.strcoll(name1.lower(), name2.lower()) + def _on_roster_row_activated(self, _roster, nick): + self._start_private_message(nick) def on_msg_textview_populate_popup(self, textview, menu): """ @@ -928,91 +747,6 @@ class GroupchatControl(ChatControlBase): menu.show_all() - def resize_occupant_treeview(self, position): - if self.hpaned.get_position() == position: - return - self._resize_from_another_muc = True - self.hpaned.set_position(position) - def _reset_flag(): - self._resize_from_another_muc = False - # Reset the flag when everything will be redrawn, and in particular when - # on_treeview_size_allocate will have been called. - GLib.timeout_add(500, _reset_flag) - - def _on_window_state_change(self, win, param): - # Add with timeout, because state change happens before - # the hpaned notifys us about a new handle position - GLib.timeout_add(100, self._check_for_resize) - - def _on_hpaned_release_button(self, hpaned, event): - if event.get_button()[1] != 1: - # We want only to catch the left mouse button - return - self._check_for_resize() - - def _check_for_resize(self): - # Check if we have a new position - pos = self.hpaned.get_position() - if pos == app.config.get('gc-hpaned-position'): - return - - # Save new position - self._remove_handle_timeout() - app.config.set('gc-hpaned-position', pos) - # Resize other MUC rosters - for account in app.gc_connected: - for room_jid in [i for i in app.gc_connected[account] if \ - app.gc_connected[account][i] and i != self.room_jid]: - ctrl = app.interface.msg_win_mgr.get_gc_control(room_jid, - account) - if not ctrl and room_jid in \ - app.interface.minimized_controls[account]: - ctrl = app.interface.minimized_controls[account][room_jid] - if ctrl and app.config.get('one_message_window') != 'never': - ctrl.resize_occupant_treeview(pos) - - def _on_hpaned_handle_change(self, hpaned, param): - if self._resize_from_another_muc: - return - # Window was resized, save new handle pos - pos = hpaned.get_position() - if pos != app.config.get('gc-hpaned-position'): - self._remove_handle_timeout(renew=True) - - def _remove_handle_timeout(self, renew=False): - if self._handle_timeout_id is not None: - GLib.source_remove(self._handle_timeout_id) - self._handle_timeout_id = None - if renew: - pos = self.hpaned.get_position() - self._handle_timeout_id = GLib.timeout_add_seconds( - 2, self._save_handle_position, pos) - - def _save_handle_position(self, pos): - self._handle_timeout_id = None - app.config.set('gc-hpaned-position', pos) - - def iter_contact_rows(self): - """ - Iterate over all contact rows in the tree model - """ - role_iter = self.model.get_iter_first() - while role_iter: - contact_iter = self.model.iter_children(role_iter) - while contact_iter: - yield self.model[contact_iter] - contact_iter = self.model.iter_next(contact_iter) - role_iter = self.model.iter_next(role_iter) - - def on_list_treeview_style_set(self, treeview, style): - """ - When style (theme) changes, redraw all contacts - """ - # Get the room_jid from treeview - for contact in self.iter_contact_rows(): - nick = contact[Column.NICK] - self.draw_contact(nick) - def get_tab_label(self, chatstate): """ Markup the label if necessary. Returns a tuple such as: (new_label_str, @@ -1059,11 +793,6 @@ class GroupchatControl(ChatControlBase): tab_image = get_icon_name('muc-inactive') return tab_image - def update_ui(self): - ChatControlBase.update_ui(self) - for nick in app.contacts.get_nick_list(self.account, self.room_jid): - self.draw_contact(nick) - def set_lock_image(self): encryption_state = {'visible': self.encryption is not None, 'enc_type': self.encryption, @@ -1099,16 +828,6 @@ class GroupchatControl(ChatControlBase): app.plugin_manager.extension_point( 'encryption_dialog' + self.encryption, self) - def _change_style(self, model, path, iter_, option): - model[iter_][Column.NICK] = model[iter_][Column.NICK] - - def change_roster_style(self): - self.model.foreach(self._change_style, None) - - def repaint_themed_widgets(self): - ChatControlBase.repaint_themed_widgets(self) - self.change_roster_style() - def _update_banner_state_image(self): surface = app.interface.avatar_storage.get_muc_surface( self.account, @@ -1142,13 +861,6 @@ class GroupchatControl(ChatControlBase): """ self.name_label.set_text(self.room_name) - def _nec_update_avatar(self, obj): - if obj.contact.room_jid != self.room_jid: - return - app.log('avatar').debug('Draw Groupchat Avatar: %s %s', - obj.contact.name, obj.contact.avatar_sha) - self.draw_avatar(obj.contact) - def _nec_update_room_avatar(self, obj): if obj.jid != self.room_jid: return @@ -1214,7 +926,6 @@ class GroupchatControl(ChatControlBase): encrypted=False, displaymarking=None): # Do we have a queue? fjid = self.room_jid + '/' + nick - no_queue = len(app.events.get_events(self.account, fjid)) == 0 event = events.PmEvent(msg, '', 'incoming', tim, encrypted, '', msg_log_id, xhtml=xhtml, session=session, form_node=None, @@ -1223,43 +934,20 @@ class GroupchatControl(ChatControlBase): autopopup = app.config.get('autopopup') autopopupaway = app.config.get('autopopupaway') - iter_ = self.get_contact_iter(nick) - path = self.model.get_path(iter_) if not autopopup or (not autopopupaway and \ app.connections[self.account].connected > 2): - if no_queue: # We didn't have a queue: we change icons - transport = None - if app.jid_is_transport(self.room_jid): - transport = app.get_transport_name_from_jid(self.room_jid) - self.model[iter_][Column.IMG] = get_icon_name( - 'event', transport=transport) + self.roster.draw_contact(nick) if self.parent_win: self.parent_win.show_title() self.parent_win.redraw_tab(self) else: self._start_private_message(nick) - # Scroll to line - path_ = path.copy() - path_.up() - self.list_treeview.expand_row(path_, False) - self.list_treeview.scroll_to_cell(path) - self.list_treeview.set_cursor(path) + contact = app.contacts.get_contact_with_highest_priority( self.account, self.room_jid) if contact: app.interface.roster.draw_contact(self.room_jid, self.account) - def get_contact_iter(self, nick: str) -> Optional[Gtk.TreeIter]: - try: - ref = self._contact_refs[nick] - except KeyError: - return None - - path = ref.get_path() - if path is None: - return None - return self.model.get_iter(path) - def add_message(self, text, contact='', tim=None, xhtml=None, displaymarking=None, correct_id=None, message_id=None, encrypted=None, additional_data=None): @@ -1504,22 +1192,8 @@ class GroupchatControl(ChatControlBase): def is_connected(self, value: bool) -> None: app.gc_connected[self.account][self.room_jid] = value - def _disable_roster_sort(self): - self.model.set_sort_column_id(Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID, - Gtk.SortType.ASCENDING) - self.list_treeview.set_model(None) - - def _enable_roster_sort(self): - self.model.set_sort_column_id(Column.NICK, Gtk.SortType.ASCENDING) - self.list_treeview.set_model(self.model) - self.list_treeview.expand_all() - - def _reset_roster(self): - self._contact_refs = {} - self._role_refs = {} - self.model.clear() - def got_connected(self): + self.roster.draw() # Make autorejoin stop. if self.autorejoin: GLib.source_remove(self.autorejoin) @@ -1534,9 +1208,6 @@ class GroupchatControl(ChatControlBase): self.is_connected = True ChatControlBase.got_connected(self) - # Sort model and assign it to treeview - self._enable_roster_sort() - # We don't redraw the whole banner here, because only icon change self._update_banner_state_image() if self.parent_win: @@ -1554,8 +1225,8 @@ class GroupchatControl(ChatControlBase): formattings_button = self.xml.get_object('formattings_button') formattings_button.set_sensitive(False) - self._reset_roster() - self._disable_roster_sort() + self.roster.enable_sort(False) + self.roster.clear() for contact in app.contacts.get_gc_contact_list( self.account, self.room_jid): @@ -1601,94 +1272,10 @@ class GroupchatControl(ChatControlBase): app.connections[self.account].get_module('MUC').join(self._muc_data) return True - def draw_roster(self): - self._reset_roster() - self._disable_roster_sort() - - for nick in app.contacts.get_nick_list(self.account, self.room_jid): - self.add_contact_to_roster(nick) - - self._enable_roster_sort() - self.draw_all_roles() - # Recalculate column width for ellipsizin - self.list_treeview.columns_autosize() - - def on_send_pm(self, widget=None, model=None, iter_=None, nick=None, - msg=None): - """ - Open a chat window and if msg is not None - send private message to a - contact in a room - """ - if nick is None: - nick = model[iter_][Column.NICK] - + def send_pm(self, nick, message=None): ctrl = self._start_private_message(nick) - if ctrl and msg: - ctrl.send_message(msg) - - def draw_contact(self, nick): - iter_ = self.get_contact_iter(nick) - if not iter_: - return - - gc_contact = app.contacts.get_gc_contact( - self.account, self.room_jid, nick) - - if app.events.get_events(self.account, self.room_jid + '/' + nick): - icon_name = get_icon_name('event') - else: - icon_name = get_icon_name(gc_contact.show.value) - - name = GLib.markup_escape_text(gc_contact.name) - - # Strike name if blocked - fjid = self.room_jid + '/' + nick - if helpers.jid_is_blocked(self.account, fjid): - name = '<span strikethrough="true">%s</span>' % name - - status = gc_contact.status - # add status msg, if not empty, under contact name in the treeview - if status and app.config.get('show_status_msgs_in_roster'): - status = status.strip() - if status != '': - status = helpers.reduce_chars_newlines(status, max_lines=1) - # escape markup entities and make them small italic and fg color - name += ('\n<span size="small" style="italic" alpha="70%">' - '{}</span>'.format(GLib.markup_escape_text(status))) - - if (not gc_contact.affiliation.is_none and - app.config.get('show_affiliation_in_groupchat')): - icon_name += ':%s' % gc_contact.affiliation.value - - self.model[iter_][Column.IMG] = icon_name - self.model[iter_][Column.TEXT] = name - - def draw_avatar(self, gc_contact): - if not app.config.get('show_avatars_in_roster'): - return - iter_ = self.get_contact_iter(gc_contact.name) - if not iter_: - return - - surface = app.interface.get_avatar( - gc_contact, AvatarSize.ROSTER, self.scale_factor) - image = Gtk.Image.new_from_surface(surface) - self.model[iter_][Column.AVATAR_IMG] = image - - def draw_role(self, role): - role_iter = self.get_role_iter(role) - if not role_iter: - return - role_name = helpers.get_uf_role(role, plural=True) - if app.config.get('show_contacts_number'): - nbr_role, nbr_total = app.contacts.get_nb_role_total_gc_contacts( - self.account, self.room_jid, role) - role_name += ' (%s/%s)' % (repr(nbr_role), repr(nbr_total)) - self.model[role_iter][Column.TEXT] = role_name - - def draw_all_roles(self): - for role in (Role.VISITOR, Role.PARTICIPANT, Role.MODERATOR): - self.draw_role(role) + if message is not None: + ctrl.send_message(message) @event_filter(['account', 'room_jid']) def _on_self_presence(self, event): @@ -1698,7 +1285,7 @@ class GroupchatControl(ChatControlBase): if not self.is_connected: # We just joined the room self.add_info_message(_('You (%s) joined the group chat') % nick) - self.add_contact_to_roster(nick) + self.roster.add_contact(nick) if StatusCode.NON_ANONYMOUS in status_codes: self.add_info_message( @@ -1747,8 +1334,8 @@ class GroupchatControl(ChatControlBase): tv.last_received_message_id[nick] del tv.last_received_message_id[nick] - self.remove_contact(nick) - self.add_contact_to_roster(new_nick) + self.roster.remove_contact(nick) + self.roster.add_contact(new_nick) @event_filter(['account', 'room_jid']) def _on_status_show_changed(self, event): @@ -1771,7 +1358,7 @@ class GroupchatControl(ChatControlBase): status=status) self.add_status_message(message) - self.draw_contact(nick) + self.roster.draw_contact(nick) @event_filter(['account', 'room_jid']) def _on_affiliation_changed(self, event): @@ -1800,7 +1387,8 @@ class GroupchatControl(ChatControlBase): reason=reason) self.add_info_message(message) - self.draw_contact(nick) + self.roster.remove_contact(nick) + self.roster.add_contact(nick) self.update_actions() @event_filter(['account', 'room_jid']) @@ -1827,8 +1415,8 @@ class GroupchatControl(ChatControlBase): reason=reason) self.add_info_message(message) - self.remove_contact(nick) - self.add_contact_to_roster(nick) + self.roster.remove_contact(nick) + self.roster.add_contact(nick) self.update_actions() @event_filter(['account', 'room_jid']) @@ -1950,8 +1538,8 @@ class GroupchatControl(ChatControlBase): reason=reason) self.add_info_message(message) - self.remove_contact(nick) - self.draw_all_roles() + self.roster.remove_contact(nick) + self.roster.draw_groups() @event_filter(['account', 'room_jid']) def _on_muc_joined(self, _event): @@ -1965,7 +1553,7 @@ class GroupchatControl(ChatControlBase): print_join_left = app.config.get_per( 'rooms', self.room_jid, 'print_join_left', join_default) - self.add_contact_to_roster(nick) + self.roster.add_contact(nick) if self.is_connected and print_join_left: self.add_info_message(_('%s has joined the group chat') % nick) @@ -1990,46 +1578,6 @@ class GroupchatControl(ChatControlBase): error_message = to_user_string(event.properties.error) self.add_info_message('Error: %s' % error_message) - def add_contact_to_roster(self, nick): - contact = app.contacts.get_gc_contact(self.account, - self.room_jid, - nick) - role_name = helpers.get_uf_role(contact.role, plural=True) - - # Create Role - role_iter = self.get_role_iter(contact.role) - if not role_iter: - icon_name = get_icon_name('closed') - ext_columns = [None] * self.nb_ext_renderers - row = [icon_name, contact.role.value, - 'role', role_name, None] + ext_columns - role_iter = self.model.append(None, row) - self._role_refs[contact.role] = Gtk.TreeRowReference( - self.model, self.model.get_path(role_iter)) - - # Avatar - image = None - if app.config.get('show_avatars_in_roster'): - surface = app.interface.get_avatar( - contact, AvatarSize.ROSTER, self.scale_factor) - image = Gtk.Image.new_from_surface(surface) - - # Add to model - ext_columns = [None] * self.nb_ext_renderers - row = [None, nick, 'contact', nick, image] + ext_columns - iter_ = self.model.append(role_iter, row) - self._contact_refs[nick] = Gtk.TreeRowReference( - self.model, self.model.get_path(iter_)) - - self.draw_all_roles() - self.draw_contact(nick) - - if self.list_treeview.get_model(): - self.list_treeview.expand_row( - (self.model.get_path(role_iter)), False) - if self.is_continued: - self.draw_banner_text() - @event_filter(['account', 'room_jid']) def _on_destroyed(self, event): destroyed = event.properties.muc_destroyed @@ -2055,37 +1603,6 @@ class GroupchatControl(ChatControlBase): if self._wait_for_destruction: self._close_control() - def get_role_iter(self, role: str) -> Optional[Gtk.TreeIter]: - try: - ref = self._role_refs[role] - except KeyError: - return None - - path = ref.get_path() - if path is None: - return None - return self.model.get_iter(path) - - - def remove_contact(self, nick): - """ - Remove a user from the contacts_list - """ - iter_ = self.get_contact_iter(nick) - if not iter_: - return - - parent_iter = self.model.iter_parent(iter_) - if parent_iter is None: - # This is not a child, should never happen - return - self.model.remove(iter_) - del self._contact_refs[nick] - if self.model.iter_n_children(parent_iter) == 0: - role = self.model[parent_iter][Column.NICK] - del self._role_refs[Role(role)] - self.model.remove(parent_iter) - @event_filter(['account']) def _message_sent(self, obj): if not obj.message: @@ -2142,12 +1659,6 @@ class GroupchatControl(ChatControlBase): self.msg_textview.get_buffer().set_text('') self.msg_textview.grab_focus() - def get_role(self, nick): - gc_contact = app.contacts.get_gc_contact( - self.account, self.room_jid, nick) - if gc_contact: - return gc_contact.role - return Role.VISITOR def minimizable(self): if self.force_non_minimizable: @@ -2224,8 +1735,9 @@ class GroupchatControl(ChatControlBase): app.contacts.remove_room(self.account, self.room_jid) del app.gc_connected[self.account][self.room_jid] - # Save hpaned position - app.config.set('gc-hpaned-position', self.hpaned.get_position()) + self.roster.destroy() + self.roster = None + # remove all register handlers on wigets, created by self.xml # to prevent circular references among objects for i in list(self.handlers.keys()): @@ -2247,12 +1759,6 @@ class GroupchatControl(ChatControlBase): if self.minimizable(): on_minimize(self) return - if method == self.parent_win.CLOSE_ESC: - iter_ = self.list_treeview.get_selection().get_selected()[1] - if iter_: - self.list_treeview.get_selection().unselect_all() - on_no(self) - return # whether to ask for confirmation before closing muc if app.config.get('confirm_close_muc') and self.is_connected: @@ -2455,14 +1961,6 @@ class GroupchatControl(ChatControlBase): return True self.last_key_tabs = False - def on_list_treeview_key_press_event(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - selection = widget.get_selection() - iter_ = selection.get_selected()[1] - if iter_: - widget.get_selection().unselect_all() - return True - def delegate_action(self, action): res = super().delegate_action(action) if res == Gdk.EVENT_STOP: @@ -2496,175 +1994,6 @@ class GroupchatControl(ChatControlBase): return Gdk.EVENT_PROPAGATE - def on_list_treeview_row_expanded(self, widget, iter_, path): - """ - When a row is expanded: change the icon of the arrow - """ - model = widget.get_model() - model[iter_][Column.IMG] = get_icon_name('opened') - - def on_list_treeview_row_collapsed(self, widget, iter_, path): - """ - When a row is collapsed: change the icon of the arrow - """ - model = widget.get_model() - model[iter_][Column.IMG] = get_icon_name('closed') - - def mk_menu(self, event, iter_): - """ - Make contact's popup menu - """ - nick = self.model[iter_][Column.NICK] - c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) - fjid = self.room_jid + '/' + nick - jid = c.jid - target_affiliation = c.affiliation - target_role = c.role - - # looking for user's affiliation and role - user_nick = self.nick - user_affiliation = app.contacts.get_gc_contact(self.account, - self.room_jid, user_nick).affiliation - user_role = self.get_role(user_nick) - - # making menu from gtk builder - xml = get_builder('gc_occupants_menu.ui') - - # these conditions were taken from JEP 0045 - item = xml.get_object('kick_menuitem') - if not user_role.is_moderator or \ - (user_affiliation.is_admin and target_affiliation.is_owner) or \ - (user_affiliation.is_member and target_affiliation in (Affiliation.ADMIN, - Affiliation.OWNER)) or (user_affiliation.is_none and not target_affiliation.is_none): - item.set_sensitive(False) - id_ = item.connect('activate', self._on_kick_participant, nick) - self.handlers[id_] = item - - item = xml.get_object('voice_checkmenuitem') - item.set_active(not target_role.is_visitor) - if not user_role.is_moderator or \ - user_affiliation.is_none or \ - (user_affiliation.is_member and not target_affiliation.is_none) or \ - target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER): - item.set_sensitive(False) - id_ = item.connect('activate', self.on_voice_checkmenuitem_activate, - nick) - self.handlers[id_] = item - - item = xml.get_object('moderator_checkmenuitem') - item.set_active(target_role.is_moderator) - if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ - target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER): - item.set_sensitive(False) - id_ = item.connect('activate', self.on_moderator_checkmenuitem_activate, - nick) - self.handlers[id_] = item - - item = xml.get_object('ban_menuitem') - if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ - (target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) and\ - not user_affiliation.is_owner): - item.set_sensitive(False) - id_ = item.connect('activate', self._on_ban_participant, jid) - self.handlers[id_] = item - - item = xml.get_object('member_checkmenuitem') - item.set_active(not target_affiliation.is_none) - if not user_affiliation in (Affiliation.ADMIN, Affiliation.OWNER) or \ - (not user_affiliation.is_owner and target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER)): - item.set_sensitive(False) - id_ = item.connect('activate', self.on_member_checkmenuitem_activate, - jid) - self.handlers[id_] = item - - item = xml.get_object('admin_checkmenuitem') - item.set_active(target_affiliation in (Affiliation.ADMIN, Affiliation.OWNER)) - if not user_affiliation.is_owner: - item.set_sensitive(False) - id_ = item.connect('activate', self.on_admin_checkmenuitem_activate, - jid) - self.handlers[id_] = item - - item = xml.get_object('owner_checkmenuitem') - item.set_active(target_affiliation.is_owner) - if not user_affiliation.is_owner: - item.set_sensitive(False) - id_ = item.connect('activate', self.on_owner_checkmenuitem_activate, - jid) - self.handlers[id_] = item - - item = xml.get_object('invite_menuitem') - if jid and c.name != self.nick: - bookmarked = False - contact = app.contacts.get_contact(self.account, jid, c.resource) - if contact and contact.supports(nbxmpp.NS_CONFERENCE): - bookmarked = True - gui_menu_builder.build_invite_submenu(item, ((c, self.account),), - ignore_rooms=[self.room_jid], show_bookmarked=bookmarked) - else: - item.set_sensitive(False) - - item = xml.get_object('information_menuitem') - id_ = item.connect('activate', self.on_info, nick) - self.handlers[id_] = item - - item = xml.get_object('history_menuitem') - item.set_action_name('app.browse-history') - dict_ = {'jid': GLib.Variant('s', fjid), - 'account': GLib.Variant('s', self.account)} - variant = GLib.Variant('a{sv}', dict_) - item.set_action_target_value(variant) - - item = xml.get_object('add_to_roster_menuitem') - our_jid = app.get_jid_from_account(self.account) - if not jid or jid == our_jid or not app.connections[self.account].\ - roster_supported: - item.set_sensitive(False) - else: - id_ = item.connect('activate', self.on_add_to_roster, jid) - self.handlers[id_] = item - - item = xml.get_object('execute_command_menuitem') - id_ = item.connect('activate', self._on_execute_command_occupant, nick) - self.handlers[id_] = item - - item = xml.get_object('block_menuitem') - item2 = xml.get_object('unblock_menuitem') - if not app.connections[self.account].get_module('PrivacyLists').supported: - item2.set_no_show_all(True) - item.set_no_show_all(True) - item.hide() - item2.hide() - elif helpers.jid_is_blocked(self.account, fjid): - item.set_no_show_all(True) - item.hide() - id_ = item2.connect('activate', self.on_unblock, nick) - self.handlers[id_] = item2 - else: - id_ = item.connect('activate', self.on_block, nick) - self.handlers[id_] = item - item2.set_no_show_all(True) - item2.hide() - - item = xml.get_object('send_private_message_menuitem') - id_ = item.connect('activate', self.on_send_pm, self.model, iter_) - self.handlers[id_] = item - - item = xml.get_object('send_file_menuitem') - if not c.jid: - item.set_sensitive(False) - else: - item.set_sensitive(True) - # ToDo: integrate HTTP File Upload - id_ = item.connect('activate', lambda x: self._on_send_file_jingle(c)) - self.handlers[id_] = item - - # show the popup now! - menu = xml.get_object('gc_occupants_menu') - menu.show_all() - menu.attach_to_widget(app.interface.roster.window, None) - menu.popup(None, None, None, None, event.button, event.time) - def _start_private_message(self, nick): gc_c = app.contacts.get_gc_contact(self.account, self.room_jid, nick) nick_jid = gc_c.get_full_jid() @@ -2678,76 +2007,6 @@ class GroupchatControl(ChatControlBase): return ctrl - def _on_execute_command_occupant(self, widget, nick): - jid = self.room_jid + '/' + nick - AdHocCommand(self.account, jid) - - def on_row_activated(self, widget, path): - """ - When an iter is activated (double click or single click if gnome - is set this way) - """ - if path.get_depth() == 1: # It's a group - if widget.row_expanded(path): - widget.collapse_row(path) - else: - widget.expand_row(path, False) - else: # We want to send a private message - nick = self.model[path][Column.NICK] - self._start_private_message(nick) - - def on_list_treeview_row_activated(self, widget, path, col=0): - """ - When an iter is double clicked: open the chat window - """ - if not app.single_click: - self.on_row_activated(widget, path) - - def on_list_treeview_button_press_event(self, widget, event): - """ - Popup user's group's or agent menu - """ - try: - pos = widget.get_path_at_pos(int(event.x), int(event.y)) - path, x = pos[0], pos[2] - except TypeError: - widget.get_selection().unselect_all() - return - if event.button == 3: # right click - widget.get_selection().select_path(path) - iter_ = self.model.get_iter(path) - if path.get_depth() == 2: - self.mk_menu(event, iter_) - return True - - if event.button == 2: # middle click - widget.get_selection().select_path(path) - iter_ = self.model.get_iter(path) - if path.get_depth() == 2: - nick = self.model[iter_][Column.NICK] - self._start_private_message(nick) - return True - - if event.button == 1: # left click - if app.single_click and not event.get_state() & Gdk.ModifierType.SHIFT_MASK: - self.on_row_activated(widget, path) - return True - - iter_ = self.model.get_iter(path) - nick = self.model[iter_][Column.NICK] - if not nick in app.contacts.get_nick_list( - self.account, self.room_jid): - # it's a group - if x < 27: - if widget.row_expanded(path): - widget.collapse_row(path) - else: - widget.expand_row(path, False) - elif event.get_state() & Gdk.ModifierType.SHIFT_MASK: - self.append_nick_in_msg_textview(self.msg_textview, nick) - self.msg_textview.grab_focus() - return True - def append_nick_in_msg_textview(self, widget, nick): self.msg_textview.remove_placeholder() message_buffer = self.msg_textview.get_buffer() @@ -2765,41 +2024,6 @@ class GroupchatControl(ChatControlBase): add = gc_refer_to_nick_char + ' ' message_buffer.insert_at_cursor(start + nick + add) - def grant_voice(self, widget, nick): - """ - Grant voice privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, 'participant') - - def revoke_voice(self, widget, nick): - """ - Revoke voice privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, 'visitor') - - def grant_moderator(self, widget, nick): - """ - Grant moderator privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, 'moderator') - - def revoke_moderator(self, widget, nick): - """ - Revoke moderator privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_role(self.room_jid, nick, 'participant') - - def _on_kick_participant(self, _widget, nick): - self._kick_nick = nick - self.xml.kick_label.set_text(_('Kick %s' % nick)) - self.xml.kick_reason_entry.grab_focus() - self.xml.kick_participant_button.grab_default() - self._show_page('kick') - def _on_kick_participant_clicked(self, _button): reason = self.xml.kick_reason_entry.get_text() con = app.connections[self.account] @@ -2807,14 +2031,6 @@ class GroupchatControl(ChatControlBase): self.room_jid, self._kick_nick, 'none', reason) self._show_page('groupchat') - def _on_ban_participant(self, _widget, jid): - self._ban_jid = jid - nick = app.get_nick_from_jid(jid) - self.xml.ban_label.set_text(_('Ban %s' % nick)) - self.xml.ban_reason_entry.grab_focus() - self.xml.ban_participant_button.grab_default() - self._show_page('ban') - def _on_ban_participant_clicked(self, _button): reason = self.xml.ban_reason_entry.get_text() con = app.connections[self.account] @@ -2823,119 +2039,6 @@ class GroupchatControl(ChatControlBase): {self._ban_jid: {'affiliation': 'outcast', 'reason': reason}}) self._show_page('groupchat') - def grant_membership(self, widget, jid): - """ - Grant membership privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'member'}}) - - def revoke_membership(self, widget, jid): - """ - Revoke membership privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'none'}}) - - def grant_admin(self, widget, jid): - """ - Grant administrative privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'admin'}}) - - def revoke_admin(self, widget, jid): - """ - Revoke administrative privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'member'}}) - - def grant_owner(self, widget, jid): - """ - Grant owner privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'owner'}}) - - def revoke_owner(self, widget, jid): - """ - Revoke owner privilege to a user - """ - con = app.connections[self.account] - con.get_module('MUC').set_affiliation( - self.room_jid, - {jid: {'affiliation': 'admin'}}) - - def on_info(self, widget, nick): - """ - Call vcard_information_window class to display user's information - """ - gc_contact = app.contacts.get_gc_contact(self.account, self.room_jid, - nick) - contact = gc_contact.as_contact() - if contact.jid in app.interface.instances[self.account]['infos']: - app.interface.instances[self.account]['infos'][contact.jid].\ - window.present() - else: - app.interface.instances[self.account]['infos'][contact.jid] = \ - vcard.VcardWindow(contact, self.account, gc_contact) - - def on_add_to_roster(self, widget, jid): - AddNewContactWindow(self.account, jid) - - def on_block(self, widget, nick): - fjid = self.room_jid + '/' + nick - con = app.connections[self.account] - con.get_module('PrivacyLists').block_gc_contact(fjid) - self.draw_contact(nick) - - def on_unblock(self, widget, nick): - fjid = self.room_jid + '/' + nick - con = app.connections[self.account] - con.get_module('PrivacyLists').unblock_gc_contact(fjid) - self.draw_contact(nick) - - def on_voice_checkmenuitem_activate(self, widget, nick): - if widget.get_active(): - self.grant_voice(widget, nick) - else: - self.revoke_voice(widget, nick) - - def on_moderator_checkmenuitem_activate(self, widget, nick): - if widget.get_active(): - self.grant_moderator(widget, nick) - else: - self.revoke_moderator(widget, nick) - - def on_member_checkmenuitem_activate(self, widget, jid): - if widget.get_active(): - self.grant_membership(widget, jid) - else: - self.revoke_membership(widget, jid) - - def on_admin_checkmenuitem_activate(self, widget, jid): - if widget.get_active(): - self.grant_admin(widget, jid) - else: - self.revoke_admin(widget, jid) - - def on_owner_checkmenuitem_activate(self, widget, jid): - if widget.get_active(): - self.grant_owner(widget, jid) - else: - self.revoke_owner(widget, jid) - def _on_page_change(self, stack, _param): page_name = stack.get_visible_child_name() if page_name == 'groupchat': ===================================== gajim/gtk/groupchat_roster.py ===================================== @@ -0,0 +1,492 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from typing import Optional + +import locale +from enum import IntEnum + +from gi.repository import Gtk +from gi.repository import GLib +from gi.repository import GObject +from nbxmpp.const import Role +from nbxmpp.const import Affiliation + +from gajim.common import app +from gajim.common import ged +from gajim.common.helpers import get_uf_role +from gajim.common.helpers import get_uf_affiliation +from gajim.common.helpers import jid_is_blocked +from gajim.common.helpers import event_filter +from gajim.common.const import AvatarSize +from gajim.common.const import StyleAttr + +from gajim.gui_menu_builder import get_groupchat_roster_menu +from gajim.gtk.tooltips import GCTooltip +from gajim.gtk.util import get_builder + + +AffiliationRoleSortOrder = { + 'owner': 0, + 'admin': 1, + 'moderator': 2, + 'participant': 3, + 'visitor': 4 +} + + +class Column(IntEnum): + AVATAR = 0 + TEXT = 1 + EVENT = 2 + IS_CONTACT = 3 + NICK_OR_GROUP = 4 + + +class GroupchatRoster(Gtk.ScrolledWindow): + + __gsignals__ = { + 'row-activated': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, # return value + (str, )) # arguments + } + + def __init__(self, account, room_jid, control): + Gtk.ScrolledWindow.__init__(self) + self.set_policy(Gtk.PolicyType.NEVER, Gtk.PolicyType.AUTOMATIC) + self.get_style_context().add_class('groupchat-roster') + self._account = account + self.room_jid = room_jid + self._control = control + self._control_id = control.control_id + self._show_roles = True + self._handler_ids = {} + self._tooltip = GCTooltip() + + self._ui = get_builder('groupchat_roster.ui') + self._ui.roster_treeview.set_model(None) + self.add(self._ui.roster_treeview) + + # Holds the Gtk.TreeRowReference for each contact + self._contact_refs = {} + # Holds the Gtk.TreeRowReference for each group + self._group_refs = {} + + self._store = self._ui.participant_store + self._store.set_sort_func(Column.TEXT, self._tree_compare_iters) + + self._roster = self._ui.roster_treeview + self._roster.set_search_equal_func(self._search_func) + + self._ui.contact_column.set_fixed_width( + app.config.get('groupchat_roster_width')) + self._ui.contact_column.set_cell_data_func(self._ui.text_renderer, + self._text_cell_data_func) + + self.connect('destroy', self._on_destroy) + self._ui.connect_signals(self) + + self._event_handlers = [ + ('theme-update', ged.GUI2, self._on_theme_update), + ('update-gc-avatar', ged.GUI1, self._on_avatar_update), + ] + + for handler in self._event_handlers: + app.ged.register_event_handler(*handler) + + @staticmethod + def _on_focus_out(treeview, _param): + treeview.get_selection().unselect_all() + + def set_model(self): + self._roster.set_model(self._store) + + def set_show_roles(self, enabled): + self._show_roles = enabled + + def enable_tooltips(self): + if self._roster.get_tooltip_window(): + return + + self._roster.set_has_tooltip(True) + id_ = self._roster.connect('query-tooltip', self._query_tooltip) + self._handler_ids[id_] = self._roster + + def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + try: + row = self._roster.get_path_at_pos(x_pos, y_pos)[0] + except TypeError: + self._tooltip.clear_tooltip() + return False + if not row: + self._tooltip.clear_tooltip() + return False + + iter_ = None + try: + iter_ = self._store.get_iter(row) + except Exception: + self._tooltip.clear_tooltip() + return False + + if not self._store[iter_][Column.IS_CONTACT]: + self._tooltip.clear_tooltip() + return False + + nickname = self._store[iter_][Column.NICK_OR_GROUP] + contact = app.contacts.get_gc_contact(self._account, + self.room_jid, + nickname) + if contact is None: + self._tooltip.clear_tooltip() + return False + + value, widget = self._tooltip.get_tooltip(contact) + tooltip.set_custom(widget) + return value + + @staticmethod + def _search_func(model, _column, search_text, iter_): + return search_text.lower() not in model[iter_][1].lower() + + def _get_group_iter(self, group_name: str) -> Optional[Gtk.TreeIter]: + try: + ref = self._group_refs[group_name] + except KeyError: + return None + + path = ref.get_path() + if path is None: + return None + return self._store.get_iter(path) + + def _get_contact_iter(self, nick: str) -> Optional[Gtk.TreeIter]: + try: + ref = self._contact_refs[nick] + except KeyError: + return None + + path = ref.get_path() + if path is None: + return None + return self._store.get_iter(path) + + def add_contact(self, nick): + contact = app.contacts.get_gc_contact(self._account, + self.room_jid, + nick) + group_name, group_text = self._get_group_from_contact(contact) + + # Create Group + group_iter = self._get_group_iter(group_name) + role_path = None + if not group_iter: + group_iter = self._store.append( + None, (None, group_text, None, False, group_name)) + role_path = self._store.get_path(group_iter) + group_ref = Gtk.TreeRowReference(self._store, role_path) + self._group_refs[group_name] = group_ref + + # Avatar + surface = app.interface.get_avatar(contact, + AvatarSize.ROSTER, + self.get_scale_factor(), + contact.show.value) + + iter_ = self._store.append(group_iter, + (surface, nick, None, True, nick)) + self._contact_refs[nick] = Gtk.TreeRowReference( + self._store, self._store.get_path(iter_)) + + self.draw_groups() + self.draw_contact(nick) + + if (role_path is not None and + self._roster.get_model() is not None): + self._roster.expand_row(role_path, False) + + def remove_contact(self, nick): + """ + Remove a user + """ + iter_ = self._get_contact_iter(nick) + if not iter_: + return + + group_iter = self._store.iter_parent(iter_) + if group_iter is None: + raise ValueError('Trying to remove non-child') + + self._store.remove(iter_) + del self._contact_refs[nick] + if not self._store.iter_has_child(group_iter): + group = self._store[group_iter][Column.NICK_OR_GROUP] + del self._group_refs[group] + self._store.remove(group_iter) + + @staticmethod + def _get_group_from_contact(contact): + if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): + return contact.affiliation.value, get_uf_affiliation( + contact.affiliation, plural=True) + return contact.role.value, get_uf_role(contact.role, plural=True) + + @staticmethod + def _text_cell_data_func(_column, renderer, model, iter_, _user_data): + has_parent = bool(model.iter_parent(iter_)) + style = 'contact' if has_parent else 'group' + + bgcolor = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.BACKGROUND) + renderer.set_property('cell-background', bgcolor) + + color = app.css_config.get_value('.gajim-%s-row' % style, + StyleAttr.COLOR) + renderer.set_property('foreground', color) + + desc = app.css_config.get_font('.gajim-%s-row' % style) + renderer.set_property('font-desc', desc) + + if not has_parent: + renderer.set_property('weight', 600) + renderer.set_property('height', 32) + + elif app.config.get('show_status_msgs_in_roster'): + renderer.set_property('height', 38) + + else: + renderer.set_property('height', 32) + + def _on_roster_row_activated(self, _treeview, path, _column): + iter_ = self._store.get_iter(path) + if self._store.iter_parent(iter_) is None: + # This is a group row + return + nick = self._store[iter_][Column.NICK_OR_GROUP] + if self._control.nick == nick: + return + self.emit('row-activated', nick) + + def _on_roster_button_press_event(self, treeview, event): + if event.button not in (2, 3): + return + + pos = treeview.get_path_at_pos(int(event.x), int(event.y)) + if pos is None: + return + + path, _, _, _ = pos + iter_ = self._store.get_iter(path) + if self._store.iter_parent(iter_) is None: + # Group row + return + + nick = self._store[iter_][Column.NICK_OR_GROUP] + if self._control.nick == nick: + return + + if event.button == 3: # right click + self._show_contact_menu(nick) + + if event.button == 2: # middle click + self.emit('row-activated', nick) + + def _show_contact_menu(self, nick): + self_contact = app.contacts.get_gc_contact( + self._account, self.room_jid, self._control.nick) + contact = app.contacts.get_gc_contact( + self._account, self.room_jid, nick) + menu = get_groupchat_roster_menu(self._account, + self._control_id, + self_contact, + contact) + + def destroy(menu, _pspec): + visible = menu.get_property('visible') + if not visible: + GLib.idle_add(menu.destroy) + + menu.attach_to_widget(self, None) + menu.connect('notify::visible', destroy) + menu.popup_at_pointer() + + def _tree_compare_iters(self, model, iter1, iter2, _user_data): + """ + Compare two iterators to sort them + """ + + is_contact = model.iter_parent(iter1) + if is_contact: + # Sort contacts with pending events to top + if model[iter1][Column.EVENT] != model[iter2][Column.EVENT]: + return -1 if model[iter1][Column.EVENT] else 1 + + nick1 = model[iter1][Column.NICK_OR_GROUP] + nick2 = model[iter2][Column.NICK_OR_GROUP] + + if not app.config.get('sort_by_show_in_muc'): + return locale.strcoll(nick1.lower(), nick2.lower()) + + gc_contact1 = app.contacts.get_gc_contact(self._account, + self.room_jid, + nick1) + gc_contact2 = app.contacts.get_gc_contact(self._account, + self.room_jid, + nick2) + if gc_contact1.show != gc_contact2.show: + return -1 if gc_contact1.show < gc_contact2.show else 1 + + return locale.strcoll(nick1.lower(), nick2.lower()) + + # Group + group1 = model[iter1][Column.NICK_OR_GROUP] + group2 = model[iter2][Column.NICK_OR_GROUP] + group1_index = AffiliationRoleSortOrder[group1] + group2_index = AffiliationRoleSortOrder[group2] + return -1 if group1_index < group2_index else 1 + + def enable_sort(self, enable): + column = Gtk.TREE_SORTABLE_UNSORTED_SORT_COLUMN_ID + if enable: + column = Column.TEXT + + self._store.set_sort_column_id(column, Gtk.SortType.ASCENDING) + + def invalidate_sort(self): + self.enable_sort(False) + self.enable_sort(True) + + def draw(self): + self.enable_sort(True) + self.set_model() + self._roster.expand_all() + + def redraw(self): + self._roster.set_model(None) + self._roster.set_model(self._store) + self._roster.expand_all() + + def draw_contact(self, nick): + iter_ = self._get_contact_iter(nick) + if not iter_: + return + + gc_contact = app.contacts.get_gc_contact( + self._account, self.room_jid, nick) + + if app.events.get_events(self._account, self.room_jid + '/' + nick): + self._store[iter_][Column.EVENT] = True + else: + self._store[iter_][Column.EVENT] = False + + name = GLib.markup_escape_text(gc_contact.name) + + # Strike name if blocked + fjid = self.room_jid + '/' + nick + if jid_is_blocked(self._account, fjid): + name = '<span strikethrough="true">%s</span>' % name + + # add status msg, if not empty, under contact name + status = gc_contact.status + if status is not None: + status = status.strip() + + if status and app.config.get('show_status_msgs_in_roster'): + # Display only first line + status = status.split('\n', 1)[0] + # escape markup entities and make them small italic and fg color + name += ('\n<span size="small" style="italic" alpha="70%">' + '{}</span>'.format(GLib.markup_escape_text(status))) + + self._store[iter_][Column.TEXT] = name + + def draw_contacts(self): + for nick in self._contact_refs: + self.draw_contact(nick) + + def draw_group(self, group): + group_iter = self._get_group_iter(group) + if not group_iter: + return + + if group in ('owner', 'admin'): + group_text = get_uf_affiliation(group, plural=True) + else: + group_text = get_uf_role(group, plural=True) + + total_users = self._get_total_user_count() + group_users = self._store.iter_n_children(group_iter) + + group_text += ' (%s/%s)' % (group_users, total_users) + + self._store[group_iter][Column.TEXT] = group_text + + def draw_groups(self): + for group in self._group_refs: + self.draw_group(group) + + def draw_avatar(self, contact): + iter_ = self._get_contact_iter(contact.name) + if iter_ is None: + return + surface = app.interface.get_avatar(contact, + AvatarSize.ROSTER, + self.get_scale_factor(), + contact.show.value) + self._store[iter_][Column.AVATAR] = surface + + def _get_total_user_count(self): + count = 0 + for group_row in self._store: + count += self._store.iter_n_children(group_row.iter) + return count + + def get_role(self, nick): + gc_contact = app.contacts.get_gc_contact( + self._account, self.room_jid, nick) + if gc_contact: + return gc_contact.role + return Role.VISITOR + + def _on_theme_update(self, _event): + self.redraw() + + @event_filter(['room_jid']) + def _on_avatar_update(self, event): + self.draw_avatar(event.contact) + + def clear(self): + self._contact_refs = {} + self._group_refs = {} + self._store.clear() + + def _on_destroy(self, _roster): + for handler in self._event_handlers: + app.ged.remove_event_handler(*handler) + + for id_ in list(self._handler_ids.keys()): + if self._handler_ids[id_].handler_is_connected(id_): + self._handler_ids[id_].disconnect(id_) + del self._handler_ids[id_] + + self._contact_refs = {} + self._group_refs = {} + self._control = None + self._roster.set_model(None) + self._roster = None + self._store.clear() + self._store = None + self._tooltip.destroy() + self._tooltip = None ===================================== gajim/gtk/preferences.py ===================================== @@ -22,6 +22,7 @@ from gajim.common import app from gajim.common import helpers from gajim.common import config as c_config from gajim.common import idle +from gajim.common.nec import NetworkEvent from gajim.common.i18n import _ from gajim.common.i18n import ngettext @@ -517,15 +518,12 @@ class Preferences(Gtk.ApplicationWindow): def on_show_avatars_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_avatars_in_roster') app.interface.roster.setup_and_draw_roster() - # Redraw groupchats (in an ugly way) - for ctrl in self._get_all_muc_controls(): - ctrl.draw_roster() def on_show_status_msgs_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_status_msgs_in_roster') app.interface.roster.setup_and_draw_roster() for ctrl in self._get_all_muc_controls(): - ctrl.update_ui() + ctrl.roster.draw_contacts() def on_show_pep_in_roster_checkbutton_toggled(self, widget): self.on_checkbutton_toggled(widget, 'show_mood_in_roster') @@ -542,7 +540,7 @@ class Preferences(Gtk.ApplicationWindow): self.on_checkbutton_toggled(widget, 'sort_by_show_in_muc') # Redraw groupchats for ctrl in self._get_all_muc_controls(): - ctrl.draw_roster() + ctrl.roster.invalidate_sort() ### Chat tab ### def on_auto_copy_toggled(self, widget): @@ -860,6 +858,7 @@ class Preferences(Gtk.ApplicationWindow): theme = combobox.get_active_id() app.config.set('roster_theme', theme) app.css_config.change_theme(theme) + app.nec.push_incoming_event(NetworkEvent('theme-update')) # Begin repainting themed widgets throughout app.interface.roster.repaint_themed_widgets() ===================================== gajim/gtk/util.py ===================================== @@ -467,22 +467,6 @@ def get_metacontact_surface(icon_name, expanded, scale): return state_surface -def get_affiliation_surface(icon_name, affiliation, scale): - surface = _icon_theme.load_surface( - icon_name, 16, scale, None, 0) - - ctx = cairo.Context(surface) - ctx.rectangle(16 - 4, 16 - 4, 4, 4) - if affiliation == 'owner': - ctx.set_source_rgb(204/255, 0, 0) - elif affiliation == 'admin': - ctx.set_source_rgb(255/255, 140/255, 0) - elif affiliation == 'member': - ctx.set_source_rgb(0, 255/255, 0) - ctx.fill() - return surface - - def get_show_in_roster(event, session=None): """ Return True if this event must be shown in roster, else False ===================================== gajim/gui_interface.py ===================================== @@ -1923,7 +1923,7 @@ class Interface: def update_avatar(self, account=None, jid=None, contact=None, room_avatar=False): - self.avatar_storage.invalidate_cache(jid or contact.jid) + self.avatar_storage.invalidate_cache(jid or contact.get_full_jid()) if room_avatar: app.nec.push_incoming_event( NetworkEvent('update-room-avatar', account=account, jid=jid)) @@ -1931,8 +1931,9 @@ class Interface: app.nec.push_incoming_event( NetworkEvent('update-roster-avatar', account=account, jid=jid)) else: - app.nec.push_incoming_event( - NetworkEvent('update-gc-avatar', contact=contact)) + app.nec.push_incoming_event(NetworkEvent('update-gc-avatar', + contact=contact, + room_jid=contact.room_jid)) def save_avatar(self, data): return self.avatar_storage.save_avatar(data) ===================================== gajim/gui_menu_builder.py ===================================== @@ -22,6 +22,8 @@ from gajim import gtkgui_helpers from gajim import message_control from gajim.common import app from gajim.common import helpers +from gajim.common.helpers import is_affiliation_change_allowed +from gajim.common.helpers import is_role_change_allowed from gajim.common.i18n import ngettext from gajim.common.i18n import _ from gajim.common.const import URIType @@ -604,6 +606,13 @@ def get_groupchat_menu(control_id, account, jid): menuitem.set_action_and_target_value(action_name, variant_dict) menu.append_item(menuitem) + + elif action_name == 'win.execute-command-': + action_name = action_name + control_id + menuitem = Gio.MenuItem.new(label, action_name) + menuitem.set_action_and_target_value(action_name, + GLib.Variant('s', '')) + menu.append_item(menuitem) else: menu.append(label, action_name + control_id) else: @@ -834,6 +843,127 @@ def get_conv_context_menu(account, uri): return menu +def get_groupchat_roster_menu(account, control_id, self_contact, contact): + menu = Gtk.Menu() + + item = Gtk.MenuItem(label=_('Information')) + action = 'win.contact-information-%s::%s' % (control_id, contact.name) + item.set_detailed_action_name(action) + menu.append(item) + + item = Gtk.MenuItem(label=_('Add to Contact List')) + action = 'app.{account}-add-contact(["{account}", "{jid}"])'.format( + account=account, jid=contact.jid or '') + if contact.jid is None: + item.set_sensitive(False) + else: + item.set_detailed_action_name(action) + menu.append(item) + + item = Gtk.MenuItem(label=_('Invite')) + if contact.jid is not None: + build_invite_submenu(item, + ((contact, account),), + show_bookmarked=True) + else: + item.set_sensitive(False) + menu.append(item) + + item = Gtk.MenuItem(label=_('Execute command')) + action = 'win.execute-command-%s::%s' % (control_id, contact.name) + item.set_detailed_action_name(action) + menu.append(item) + + menu.append(Gtk.SeparatorMenuItem()) + + if helpers.jid_is_blocked(account, contact.get_full_jid()): + action = 'win.unblock-%s::%s' % (control_id, contact.name) + label = _('Unblock') + else: + action = 'win.block-%s::%s' % (control_id, contact.name) + label = _('Block') + + item = Gtk.MenuItem(label=label) + item.set_detailed_action_name(action) + menu.append(item) + + item = Gtk.MenuItem(label=_('Kick')) + action = 'win.kick-%s::%s' % (control_id, contact.name) + if is_role_change_allowed(self_contact, contact): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + item = Gtk.MenuItem(label=_('Ban')) + action = 'win.ban-%s::%s' % (control_id, contact.jid or '') + if is_affiliation_change_allowed(self_contact, contact): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + menu.append(Gtk.SeparatorMenuItem()) + + item = Gtk.MenuItem(label=_('Make Owner')) + action = 'win.change-affiliation-%s(["%s", "owner"])' % (control_id, + contact.jid) + if (is_affiliation_change_allowed(self_contact, contact) and + not contact.affiliation.is_owner): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + item = Gtk.MenuItem(label=_('Make Admin')) + action = 'win.change-affiliation-%s(["%s", "admin"])' % (control_id, + contact.jid) + if (is_affiliation_change_allowed(self_contact, contact) and + not contact.affiliation.is_admin): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + if contact.affiliation.is_none: + label = _('Make Member') + affiliation = 'member' + else: + label = _('Revoke Member') + affiliation = 'none' + + item = Gtk.MenuItem(label=label) + action = 'win.change-affiliation-%s(["%s", "%s"])' % (control_id, + contact.jid, + affiliation) + if (is_affiliation_change_allowed(self_contact, contact) and + contact.affiliation.value != affiliation): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + if contact.role.is_visitor: + label = _('Grant Voice') + role = 'participant' + else: + label = _('Revoke Voice') + role = 'visitor' + + item = Gtk.MenuItem(label=label) + action = 'win.change-role-%s(["%s", "%s"])' % (control_id, + contact.name, + role) + if is_role_change_allowed(self_contact, contact): + item.set_detailed_action_name(action) + else: + item.set_sensitive(False) + menu.append(item) + + menu.show_all() + return menu + + class SearchMenu(Gtk.Menu): def __init__(self, treeview): Gtk.Menu.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/642638becd126ee8b80dfa5f17648e2f7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/642638becd126ee8b80dfa5f17648e2f7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Remove unused glade file
by Philipp Hörist 21 Sep '19

21 Sep '19

Philipp Hörist pushed to branch master at gajim / gajim Commits: fee45899 by Philipp Hörist at 2019-09-21T11:02:11Z Remove unused glade file - - - - - 642638be by Philipp Hörist at 2019-09-21T11:03:09Z Make GCTooltip destructable - - - - - 2 changed files: - − gajim/data/gui/gc_control_popup_menu.ui - gajim/gtk/tooltips.py Changes: ===================================== gajim/data/gui/gc_control_popup_menu.ui deleted ===================================== @@ -1,125 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.12"/> - <object class="GtkMenu" id="gc_control_popup_menu"> - <property name="can_focus">False</property> - <child> - <object class="GtkMenuItem" id="change_nick_menuitem"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Change _Nickname...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="manage_room_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <property name="label" translatable="yes">_Manage Group Chat</property> - <property name="use_underline">True</property> - <child type="submenu"> - <object class="GtkMenu" id="menu1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property> - <child> - <object class="GtkMenuItem" id="change_subject_menuitem"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">Change _Subject...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="configure_room_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Configure _Group Chat...</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="destroy_room_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Destroy Group Chat</property> - <property name="use_underline">True</property> - </object> - </child> - </object> - </child> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="minimize_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Minimize on close</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkCheckMenuItem" id="notify_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">Notify on all messages</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="request_voice_separator"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="request_voice_menuitem"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Request Voice</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="bookmark_separator"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="bookmark_room_menuitem"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_Bookmark</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkSeparatorMenuItem" id="separatormenuitem2"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="history_menuitem"> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="label" translatable="yes">_History</property> - <property name="use_underline">True</property> - </object> - </child> - <child> - <object class="GtkMenuItem" id="disconnect_menuitem"> - <property name="can_focus">False</property> - <property name="label" translatable="yes">_Disconnect</property> - <property name="use_underline">True</property> - </object> - </child> - </object> -</interface> ===================================== gajim/gtk/tooltips.py ===================================== @@ -262,6 +262,9 @@ class GCTooltip(): affiliation = formatted % (color, affiliation) return affiliation + def destroy(self): + self._ui.tooltip_grid.destroy() + class RosterTooltip(StatusTable): def __init__(self): StatusTable.__init__(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1c352f24b4aee30fe60459b04d61e818… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/compare/a1c352f24b4aee30fe60459b04d61e818… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/python-nbxmpp][master] make BOSH work when more than 16384 bytes need to be sent
by Philipp Hörist 18 Sep '19

18 Sep '19

Philipp Hörist pushed to branch master at gajim / python-nbxmpp Commits: fedc80c9 by Yann Leboulanger at 2019-09-17T13:26:38Z make BOSH work when more than 16384 bytes need to be sent - - - - - 1 changed file: - nbxmpp/transports.py Changes: ===================================== nbxmpp/transports.py ===================================== @@ -571,7 +571,7 @@ class NonBlockingTCP(NonBlockingTransport, IdleObject): if send_count: sent_data = self.sendbuff[:send_count] self.sendbuff = self.sendbuff[send_count:] - self._plug_idle(writable=(self.sendqueue != []), readable=True) + self._plug_idle(writable=((self.sendqueue != []) or (len(self.sendbuff) != 0)), readable=True) if self.sent_bytes_buff: sent_data = self.sent_bytes_buff + sent_data View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/fedc80c99b021f0e59db0cca80… -- View it on GitLab: https://dev.gajim.org/gajim/python-nbxmpp/commit/fedc80c99b021f0e59db0cca80… 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