Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][master] Windows: Add gssapi dependency
by Philipp Hörist 28 Apr '21

28 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 72f489b4 by lovetox at 2021-04-28T08:15:35+02:00 Windows: Add gssapi dependency Fixes #10540 - - - - - 1 changed file: - win/_base.sh Changes: ===================================== win/_base.sh ===================================== @@ -92,7 +92,8 @@ function install_deps { mingw-w64-"${ARCH}"-python-pyopenssl \ mingw-w64-"${ARCH}"-python-certifi \ mingw-w64-"${ARCH}"-python-six \ - mingw-w64-"${ARCH}"-python-pygments + mingw-w64-"${ARCH}"-python-pygments \ + mingw-w64-"${ARCH}"-python-gssapi build_pip install precis-i18n View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72f489b4c27440e5a03d0733cd7291f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/72f489b4c27440e5a03d0733cd7291f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] More Control work
by Philipp Hörist 27 Apr '21

27 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 16488c20 by lovetox at 2021-04-27T13:11:48+02:00 More Control work - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/info.py - + gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/view.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -478,7 +478,7 @@ def _on_mam_message_received(self, event): if not event.properties.jid.bare_match(self.contact.jid): return - kind = '' # incoming + kind = 'incoming' if event.kind == KindConstant.CHAT_MSG_SENT: kind = 'outgoing' @@ -493,12 +493,12 @@ def _on_message_received(self, event): if not event.msgtxt: return - typ = '' + kind = 'incoming' if event.properties.is_sent_carbon: - typ = 'out' + kind = 'outgoing' self.add_message(event.msgtxt, - typ, + kind, tim=event.properties.timestamp, subject=event.properties.subject, displaymarking=event.displaymarking, @@ -529,7 +529,7 @@ def _on_message_sent(self, event): self.msg_textview, 'gajim-msg-correcting') self.add_message(event.message, - self.contact.jid, + 'outgoing', tim=event.timestamp, displaymarking=displaymarking, message_id=message_id, @@ -928,7 +928,7 @@ def get_our_nick(self): def add_message(self, text, - frm='', + kind, tim=None, subject=None, displaymarking=None, @@ -936,36 +936,14 @@ def add_message(self, correct_id=None, message_id=None, additional_data=None): - """ - Print a line in the conversation - - If frm is set to status: it's a status message. - if frm is set to error: it's an error message. The difference between - status and error is mainly that with error, msg count as a new - message (in systray and in control). - If frm is set to info: it's a information message. - If frm is set to print_queue: it is incoming from queue. - If frm is set to another value: it's an outgoing message. - If frm is not set: it's an incoming message. - """ - contact = self.contact if additional_data is None: additional_data = AdditionalDataDict() - if frm == 'error': - kind = 'error' - name = '' + if kind == 'incoming': + name = self.contact.name else: - if not frm: - kind = 'incoming' - name = contact.name - elif frm == 'print_queue': - kind = 'incoming_queue' - name = contact.name - else: - kind = 'outgoing' - name = self.get_our_nick() + name = self.get_our_nick() ChatControlBase.add_message(self, text, @@ -978,11 +956,6 @@ def add_message(self, correct_id=correct_id, additional_data=additional_data) - if text.startswith('/me ') or text.startswith('/me\n'): - self.old_msg_kind = None - else: - self.old_msg_kind = kind - def prepare_context_menu(self, hide_buttonbar_items=False): """ Set compact view menuitem active state sets active and sensitivity state @@ -1117,7 +1090,7 @@ def _on_presence_received(self, event): status = '- %s' % event.status if event.status else '' status_line = _('%(name)s is now %(show)s %(status)s') % { 'name': name, 'show': uf_show, 'status': status} - self.add_status_message(status_line) + self.add_info_message(status_line) def _info_bar_show_message(self): if self.info_bar.get_visible(): ===================================== gajim/chat_control_base.py ===================================== @@ -1073,13 +1073,8 @@ def save_message(self, message, msg_type): else: self.received_history_pos = pos - def add_info_message(self, text, message_id=None): - self.conversation_view.add_message( - text, 'info', '', None, message_id=message_id) - - def add_status_message(self, text): - self.conversation_view.add_message( - text, 'status', '', None) + def add_info_message(self, text): + self.conversation_view.add_info_message(text) def add_message(self, text, @@ -1108,16 +1103,13 @@ def add_message(self, log_line_id=msg_log_id, additional_data=additional_data) - if restored: - return - if message_id: if self._type.is_groupchat: self.last_msg_id = stanza_id or message_id else: self.last_msg_id = message_id - if kind in ('incoming', 'incoming_queue'): + if kind == 'incoming': # Record the history of received messages self.save_message(text, 'received') @@ -1334,7 +1326,7 @@ def add_messages(self, messages): for msg in messages: if not msg: continue - kind = 'status' + contact_name = msg.contact_name if msg.kind in ( KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): @@ -1346,6 +1338,9 @@ def add_messages(self, messages): KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): kind = 'outgoing' contact_name = self.get_our_nick() + else: + raise ValueError('no kind attribute') + if not msg.message: continue self.conversation_view.add_message( ===================================== gajim/groupchat_control.py ===================================== @@ -691,26 +691,23 @@ def _on_gc_message_received(self, event): additional_data=event.additional_data) event.needs_highlight = self.needs_visual_notification(event.msgtxt) - def add_message(self, text, contact='', tim=None, - displaymarking=None, correct_id=None, message_id=None, - stanza_id=None, additional_data=None): - """ - Add message to the ConversationsTextview - - If contact is set: it's a message from someone - If contact is not set: it's a message from the server or help. - """ - - if not contact: - # Message from the server - kind = 'status' - elif contact == self.contact.nickname: # it's us + def add_message(self, + text, + contact='', + tim=None, + displaymarking=None, + correct_id=None, + message_id=None, + stanza_id=None, + additional_data=None): + + if contact == self.contact.nickname: kind = 'outgoing' else: kind = 'incoming' # muc-specific chatstate - if kind == 'incoming': # it's a message NOT from us + if kind == 'incoming': # highlighting and sounds highlight, _sound = self.highlighting_for_message(text, tim) # other_tags_for_name.append('muc_nickname_color_%s' % contact) @@ -820,7 +817,7 @@ def _on_room_subject(self, _contact, _signal_name, properties): if (app.settings.get('show_subject_on_join') or not self.contact.is_joining): - self.add_info_message(text) + self.conversation_view.add_muc_subject(text) def _on_room_config_changed(self, _contact, _signal_name, properties): # http://www.xmpp.org/extensions/xep-0045.html#roomconfig-notify @@ -996,7 +993,7 @@ def _on_user_status_show_changed(self, message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.add_status_message(message) + self.add_info_message(message) def _on_user_affiliation_changed(self, _contact, ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -23,7 +23,6 @@ from gajim.common.i18n import _ from gajim.common.helpers import from_one_line -from ...conversation_textview import ConversationTextview from ...util import convert_rgba_to_hex from ...util import text_to_color from ...util import wrap_with_event_box ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -12,40 +12,30 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +import time from datetime import datetime from gi.repository import GLib from gi.repository import Gtk from gajim.common.const import AvatarSize -from gajim.common.i18n import _ from gajim.common.styling import process from .base import BaseRow from ..message_widget import MessageWidget -class InfoMessageRow(BaseRow): - def __init__(self, - account, - timestamp, - text, - kind, - subject, - history_mode=False): - BaseRow.__init__(self, account, history_mode=history_mode) +class InfoMessage(BaseRow): + def __init__(self, account, text): + BaseRow.__init__(self, account) + self.type = 'info' + timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp - self.kind = kind - - if subject: - subject_title = _('Subject:') - text = (f'{subject_title}\n' - f'{GLib.markup_escape_text(subject)}\n' - f'{GLib.markup_escape_text(text)}') - else: - text = GLib.markup_escape_text(text) + self.kind = 'info' + + text = GLib.markup_escape_text(text) avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -0,0 +1,52 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import time +from datetime import datetime + +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common.styling import process + +from .base import BaseRow +from ..message_widget import MessageWidget + + +class MUCSubject(BaseRow): + + type = 'muc-subject' + + def __init__(self, account, text): + BaseRow.__init__(self, account) + + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + text = GLib.markup_escape_text(text) + + # avatar_placeholder = Gtk.Box() + # avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + # self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) + + result = process(text) + message_widget = MessageWidget(account) + message_widget.add_content(result) + + self.grid.attach(message_widget, 1, 0, 1, 1) + self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -30,8 +30,9 @@ from .conversation.rows.read_marker import ReadMarkerRow from .conversation.rows.scroll_hint import ScrollHintRow from .conversation.rows.message import MessageRow -from .conversation.rows.info import InfoMessageRow +from .conversation.rows.info import InfoMessage from .conversation.rows.date import DateRow +from .conversation.rows.muc_subject import MUCSubject log = logging.getLogger('gajim.gui.conversation_view') @@ -105,6 +106,14 @@ def _sort_func(self, row1, row2): return 0 return -1 if row1.timestamp < row2.timestamp else 1 + def add_muc_subject(self, text): + subject = MUCSubject(self._account, text) + self._insert_message(subject) + + def add_info_message(self, text): + message = InfoMessage(self._account, text) + self._insert_message(message) + def add_message(self, text, kind, @@ -122,43 +131,32 @@ def add_message(self, if not timestamp: timestamp = time.time() - muc_subject = bool(subject and self._contact is not None and - self._contact.is_groupchat) - if kind in ('status', 'info') or muc_subject: - message = InfoMessageRow( - self._account, - timestamp, - text, - kind, - subject, - history_mode=self._history_mode) - else: - if correct_id: - self.correct_message(correct_id, message_id, text) - return + if correct_id: + self.correct_message(correct_id, message_id, text) + return - avatar = self._get_avatar(kind, name) - - is_groupchat = False - if self._contact is not None: - is_groupchat = self._contact.is_groupchat - - message = MessageRow( - self._account, - message_id, - timestamp, - kind, - name, - text, - avatar, - is_groupchat, - additional_data=additional_data, - display_marking=display_marking, - marker=marker, - error=error, - encryption_enabled=self.encryption_enabled, - history_mode=self._history_mode, - log_line_id=log_line_id) + avatar = self._get_avatar(kind, name) + + is_groupchat = False + if self._contact is not None: + is_groupchat = self._contact.is_groupchat + + message = MessageRow( + self._account, + message_id, + timestamp, + kind, + name, + text, + avatar, + is_groupchat, + additional_data=additional_data, + display_marking=display_marking, + marker=marker, + error=error, + encryption_enabled=self.encryption_enabled, + history_mode=self._history_mode, + log_line_id=log_line_id) if message.type == 'chat': self._message_id_row_map[message.message_id] = message ===================================== gajim/privatechat_control.py ===================================== @@ -116,7 +116,7 @@ def _on_user_status_show_changed(self, message = _('{nick} is now {show}{status}').format(nick=nick, show=show, status=status) - self.add_status_message(message) + self.add_info_message(message) self.update_ui() # def _on_disconnected(self, event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/16488c203cddb121df156602a4909884… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/16488c203cddb121df156602a4909884… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: More ChatControl changes
by Philipp Hörist 27 Apr '21

27 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 15a0b039 by lovetox at 2021-04-27T11:07:47+02:00 More ChatControl changes - - - - - a35024a6 by lovetox at 2021-04-27T11:34:54+02:00 Refactor Add Message - - - - - 7 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/groupchat_control.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -42,7 +42,6 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import i18n from gajim.common.i18n import _ from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import open_uri @@ -67,7 +66,6 @@ from gajim.gui.util import format_tune from gajim.gui.util import format_location from gajim.gui.util import get_activity_icon_name -from gajim.gui.util import make_href_markup from gajim.gui.const import ControlType from gajim.command_system.implementation.hosts import ChatCommands @@ -187,20 +185,6 @@ def __init__(self, account, jid): # List of waiting infobar messages self.info_bar_queue = [] - self.subscribe_events() - - # if not session: - # # Don't use previous session if we want to a specific resource - # # and it's not the same - # if not resource: - # resource = contact.resource - # session = self._client.find_controlless_session( - # self.contact.jid, resource) - - # if session: - # session.control = self - # self.session = session - self.setup_seclabel() self.add_actions() self.update_ui() @@ -264,24 +248,15 @@ def add_actions(self): app.window.add_action(act) def update_actions(self): - win = app.window online = app.account_is_connected(self.account) - # Add to roster - # TODO - # if not isinstance(self.contact, GC_Contact) \ - # and _('Not in contact list') in self.contact.groups and \ - # self._client.roster_supported and online: - # win.lookup_action( - # 'add-to-roster-' + self.control_id).set_enabled(True) - # else: - # win.lookup_action( - # 'add-to-roster-' + self.control_id).set_enabled(False) + if self.type.is_chat: + self._get_action('add-to-roster-').set_enabled( + not self.contact.is_in_roster) # Block contact - win.lookup_action( - 'block-contact-' + self.control_id).set_enabled( - online and self._client.get_module('Blocking').supported) + self._get_action('block-contact-').set_enabled( + online and self._client.get_module('Blocking').supported) # Jingle AV detection if (self.contact.supports(Namespace.JINGLE_ICE_UDP) and @@ -297,31 +272,28 @@ def update_actions(self): self.jingle['audio'].available = False self.jingle['video'].available = False - win.lookup_action(f'start-call-{self.control_id}').set_enabled( + self._get_action(f'start-call-').set_enabled( online and (self.jingle['audio'].available or self.jingle['video'].available)) # Send message has_text = self.msg_textview.has_text() - win.lookup_action( - f'send-message-{self.control_id}').set_enabled(online and has_text) + self._get_action('send-message-').set_enabled(online and has_text) # Send file (HTTP File Upload) - httpupload = win.lookup_action( - 'send-file-httpupload-' + self.control_id) - httpupload.set_enabled( - online and self._client.get_module('HTTPUpload').available) + httpupload = self._get_action('send-file-httpupload-') + httpupload.set_enabled(online and + self._client.get_module('HTTPUpload').available) # Send file (Jingle) jingle_support = self.contact.supports(Namespace.JINGLE_FILE_TRANSFER_5) jingle_conditions = jingle_support and self.contact.is_available - jingle = win.lookup_action('send-file-jingle-' + self.control_id) + jingle = self._get_action('send-file-jingle-') jingle.set_enabled(online and jingle_conditions) # Send file - win.lookup_action( - 'send-file-' + self.control_id).set_enabled( - jingle.get_enabled() or httpupload.get_enabled()) + self._get_action('send-file-').set_enabled(jingle.get_enabled() or + httpupload.get_enabled()) # Set File Transfer Button tooltip if online and (httpupload.get_enabled() or jingle.get_enabled()): @@ -333,24 +305,17 @@ def update_actions(self): # Chat markers state = GLib.Variant.new_boolean( self.contact.settings.get('send_marker')) - win.lookup_action( - f'send-marker-{self.control_id}').change_state(state) + self._get_action('send-marker-').change_state(state) # Convert to GC if app.settings.get_account_setting(self.account, 'is_zeroconf'): - win.lookup_action( - 'invite-contacts-' + self.control_id).set_enabled(False) + self._get_action('invite-contacts-').set_enabled(False) else: - if self.contact.supports(Namespace.MUC) and online: - win.lookup_action( - 'invite-contacts-' + self.control_id).set_enabled(True) - else: - win.lookup_action( - 'invite-contacts-' + self.control_id).set_enabled(False) + enabled = self.contact.supports(Namespace.MUC) and online + self._get_action('invite-contacts-').set_enabled(enabled) # Information - win.lookup_action( - 'information-' + self.control_id).set_enabled(online) + self._get_action('information-').set_enabled(online) def remove_actions(self): super().remove_actions() @@ -375,8 +340,7 @@ def delegate_action(self, action): return res if action == 'show-contact-info': - app.window.lookup_action( - 'information-%s' % self.control_id).activate() + self._get_action('information-').activate() return Gdk.EVENT_STOP if action == 'send-file': @@ -385,8 +349,7 @@ def delegate_action(self, action): app.interface.roster.tree.grab_focus() return Gdk.EVENT_PROPAGATE - app.window.lookup_action( - 'send-file-%s' % self.control_id).activate() + self._get_action('send-file-').activate() return Gdk.EVENT_STOP return Gdk.EVENT_PROPAGATE @@ -414,20 +377,6 @@ def _on_send_marker(self, action, param): action.set_state(param) self.contact.settings.set('send_marker', param.get_boolean()) - def subscribe_events(self): - """ - Register listeners to the events class - """ - app.events.event_added_subscribe(self.on_event_added) - app.events.event_removed_subscribe(self.on_event_removed) - - def unsubscribe_events(self): - """ - Unregister listeners to the events class - """ - app.events.event_added_unsubscribe(self.on_event_added) - app.events.event_removed_unsubscribe(self.on_event_removed) - def _update_toolbar(self): # Formatting # TODO: find out what encryption allows for xhtml and which not @@ -986,8 +935,7 @@ def add_message(self, msg_log_id=None, correct_id=None, message_id=None, - additional_data=None, - error=None): + additional_data=None): """ Print a line in the conversation @@ -1024,14 +972,12 @@ def add_message(self, kind, name, tim, - subject=subject, - old_kind=self.old_msg_kind, displaymarking=displaymarking, msg_log_id=msg_log_id, message_id=message_id, correct_id=correct_id, - additional_data=additional_data, - error=error) + additional_data=additional_data) + if text.startswith('/me ') or text.startswith('/me\n'): self.old_msg_kind = None else: @@ -1062,8 +1008,6 @@ def shutdown(self): # instance object app.plugin_manager.remove_gui_extension_point('chat_control', self) - self.unsubscribe_events() - self.remove_actions() # Send 'gone' chatstate @@ -1077,12 +1021,6 @@ def shutdown(self): super(ChatControl, self).shutdown() app.check_finalize(self) - def minimizable(self): - return False - - def safe_shutdown(self): - return False - def allow_shutdown(self, method, on_yes, on_no, _on_minimize): time_ = app.last_message_time[self.account][self.contact.jid] # 2 seconds @@ -1395,46 +1333,3 @@ def on_event_added(self, event): _('Connection with peer cannot be established.')) elif event.type_ == 'gc-invitation': self._get_gc_invitation(event) - - def on_event_removed(self, event_list): - """ - Called when one or more events are removed from the event list - """ - for ev in event_list: - if ev.account != self.account: - continue - if ev.jid != self.contact.jid: - continue - if ev.type_ not in ('file-request', - 'file-completed', - 'file-error', - 'file-stopped', - 'file-request-error', - 'file-send-error', - 'gc-invitation', - 'jingle-incoming'): - continue - i = 0 - removed = False - for ib_msg in self.info_bar_queue: - if ev.type_ == 'gc-invitation': - if ev.muc == ib_msg[2][0]: - self.info_bar_queue.remove(ib_msg) - removed = True - elif ev.type_ == 'jingle-incoming': - # TODO: Need to be more specific here? - self.info_bar_queue.remove(ib_msg) - removed = True - else: # file-* - if ib_msg[2] == ev.file_props: - self.info_bar_queue.remove(ib_msg) - removed = True - if removed: - if i == 0: - # We are removing the one currently displayed - self.info_bar.set_no_show_all(True) - self.info_bar.hide() - # show next one? - GLib.idle_add(self._info_bar_show_message) - break - i += 1 ===================================== gajim/chat_control_base.py ===================================== @@ -267,6 +267,9 @@ def __init__(self, widget_name, account, jid): def _connect_contact_signals(self): raise NotImplementedError + def _get_action(self, name): + return app.window.lookup_action(name + self.control_id) + def process_event(self, event): method_name = event.name.replace('-', '_') method_name = f'_on_{method_name}' @@ -1072,7 +1075,7 @@ def save_message(self, message, msg_type): def add_info_message(self, text, message_id=None): self.conversation_view.add_message( - text, 'info', '', None, message_id=message_id, graphics=False) + text, 'info', '', None, message_id=message_id) def add_status_message(self, text): self.conversation_view.add_message( @@ -1083,36 +1086,14 @@ def add_message(self, kind, name, tim, - other_tags_for_name=None, - other_tags_for_time=None, - other_tags_for_text=None, restored=False, - subject=None, - old_kind=None, displaymarking=None, msg_log_id=None, message_id=None, stanza_id=None, correct_id=None, - additional_data=None, - marker=None, - error=None): - """ - Print 'chat' type messages - correct_id = (message_id, correct_id) - """ - jid = self.contact.jid - full_jid = self.contact.jid - end = False - if self.conversation_view.autoscroll or kind == 'outgoing': - end = True - - if other_tags_for_name is None: - other_tags_for_name = [] - if other_tags_for_time is None: - other_tags_for_time = [] - if other_tags_for_text is None: - other_tags_for_text = [] + additional_data=None): + if additional_data is None: additional_data = AdditionalDataDict() @@ -1121,14 +1102,11 @@ def add_message(self, kind, name, tim, - other_text_tags=other_tags_for_text, display_marking=displaymarking, message_id=message_id, correct_id=correct_id, log_line_id=msg_log_id, - additional_data=additional_data, - marker=marker, - error=error) + additional_data=additional_data) if restored: return @@ -1139,15 +1117,6 @@ def add_message(self, else: self.last_msg_id = message_id - if kind == 'incoming': - if (not self._type.is_groupchat or - # self.contact.can_notify() or TODO - 'marked' in other_tags_for_text): - # it's a normal message, or a muc message with want to be - # notified about if quitting just after - # other_tags_for_text == ['marked'] --> highlighted gc message - app.last_message_time[self.account][full_jid] = time.time() - if kind in ('incoming', 'incoming_queue'): # Record the history of received messages self.save_message(text, 'received') @@ -1162,60 +1131,6 @@ def add_message(self, # self.last_msg_id, # self._type) - # TODO old event Code - # if kind in ('incoming', 'incoming_queue', 'error'): - # gc_message = False - # if self._type.is_groupchat: - # gc_message = True - - # if ((self.parent_win and (not self.parent_win.get_active_control() or \ - # self != self.parent_win.get_active_control() or \ - # not self.parent_win.is_active() or not end)) or \ - # (gc_message and \ - # jid in app.interface.minimized_controls[self.account])) and \ - # kind in ('incoming', 'incoming_queue', 'error'): - # # we want to have save this message in events list - # # other_tags_for_text == ['marked'] --> highlighted gc message - # if gc_message: - # if 'marked' in other_tags_for_text: - # event_type = events.PrintedMarkedGcMsgEvent - # else: - # event_type = events.PrintedGcMsgEvent - # event = 'gc_message_received' - # else: - # if self._type.is_chat: - # event_type = events.PrintedChatEvent - # else: - # event_type = events.PrintedPmEvent - # event = 'message_received' - # show_in_roster = get_show_in_roster(event, self.session) - # show_in_systray = get_show_in_systray( - # event_type.type_, self.account, self.contact.jid) - - # event = event_type(text, - # subject, - # self, - # msg_log_id, - # message_id=message_id, - # stanza_id=stanza_id, - # show_in_roster=show_in_roster, - # show_in_systray=show_in_systray) - # app.events.add_event(self.account, full_jid, event) - # # We need to redraw contact if we show in roster - # if show_in_roster: - # app.interface.roster.draw_contact(self.contact.jid, - # self.account) - - # if (not self.parent_win.get_active_control() or \ - # self != self.parent_win.get_active_control() or \ - # not self.parent_win.is_active() or not end) and \ - # kind in ('incoming', 'incoming_queue', 'error'): - # self.parent_win.redraw_tab(self) - # if not self.parent_win.is_active(): - # self.parent_win.show_title(True, self) # Enabled Urgent hint - # else: - # self.parent_win.show_title(False, self) # Disabled Urgent hint - def toggle_emoticons(self): """ Hide show emoticons_button @@ -1438,13 +1353,11 @@ def add_messages(self, messages): kind, contact_name, msg.time, - subject=msg.subject, additional_data=msg.additional_data, message_id=msg.message_id, log_line_id=msg.log_line_id, marker=msg.marker, - error=msg.error, - history=True) + error=msg.error) def has_focus(self): if app.window.get_property('has-toplevel-focus'): ===================================== gajim/groupchat_control.py ===================================== @@ -408,10 +408,6 @@ def _is_subject_change_allowed(self): return False return self.disco_info.muc_subjectmod or False - def _get_action(self, name): - win = app.window - return win.lookup_action(name + self.control_id) - def _show_page(self, name): transition = Gtk.StackTransitionType.SLIDE_DOWN if name == 'groupchat': @@ -705,9 +701,6 @@ def add_message(self, text, contact='', tim=None, If contact is not set: it's a message from the server or help. """ - other_tags_for_name = [] - other_tags_for_text = [] - if not contact: # Message from the server kind = 'status' @@ -720,10 +713,10 @@ def add_message(self, text, contact='', tim=None, if kind == 'incoming': # it's a message NOT from us # highlighting and sounds highlight, _sound = self.highlighting_for_message(text, tim) - other_tags_for_name.append('muc_nickname_color_%s' % contact) - if highlight: - other_tags_for_name.append('bold') - other_tags_for_text.append('marked') + # other_tags_for_name.append('muc_nickname_color_%s' % contact) + # if highlight: + # other_tags_for_name.append('bold') + # other_tags_for_text.append('marked') self._nick_completion.record_message(contact, highlight) @@ -734,9 +727,6 @@ def add_message(self, text, contact='', tim=None, kind, contact, tim, - other_tags_for_name, - [], - other_tags_for_text, displaymarking=displaymarking, correct_id=correct_id, message_id=message_id, ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -30,10 +30,8 @@ def __init__(self, account, timestamp, text, - other_text_tags, kind, subject, - graphics, history_mode=False): BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'info' @@ -49,8 +47,6 @@ def __init__(self, else: text = GLib.markup_escape_text(text) - other_text_tags.append('status') - avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -45,7 +45,6 @@ def __init__(self, kind, name, text, - other_text_tags, avatar, is_groupchat, additional_data=None, @@ -56,12 +55,6 @@ def __init__(self, history_mode=False, log_line_id=None): - # other_tags_for_name contained 'marked', 'bold' and - # 'muc_nickname_color_', which are now derived from - # other_text_tags ('marked') - - # other_tags_for_time were always empty? - BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'chat' self.timestamp = datetime.fromtimestamp(timestamp) @@ -76,10 +69,10 @@ def __init__(self, self._has_receipt = marker == 'received' self._has_displayed = marker == 'displayed' - if is_groupchat: - if other_text_tags and 'marked' in other_text_tags: - self.get_style_context().add_class( - 'conversation-mention-highlight') + # if is_groupchat: + # if other_text_tags and 'marked' in other_text_tags: + # self.get_style_context().add_class( + # 'conversation-mention-highlight') result = process(text) self._message_widget = MessageWidget(account) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -110,7 +110,6 @@ def add_message(self, kind, name, timestamp, - other_text_tags=None, log_line_id=None, message_id=None, correct_id=None, @@ -118,24 +117,11 @@ def add_message(self, additional_data=None, subject=None, marker=None, - error=None, - history=False, - graphics=True): - - log.debug( - 'Adding message: %s, %s, %s, %s, message_id: %s, correct_id: %s, ' - 'other_text_tags: %s, display_marking: %s, additional_data: %s, ' - 'subject: %s, marker: %s, error: %s, history: %s, graphics: %s', - text, kind, name, timestamp, message_id, correct_id, - other_text_tags, display_marking, additional_data, subject, - marker, error, history, graphics) + error=None): if not timestamp: timestamp = time.time() - if other_text_tags is None: - other_text_tags = [] - muc_subject = bool(subject and self._contact is not None and self._contact.is_groupchat) if kind in ('status', 'info') or muc_subject: @@ -143,10 +129,8 @@ def add_message(self, self._account, timestamp, text, - other_text_tags, kind, subject, - graphics, history_mode=self._history_mode) else: if correct_id: @@ -166,7 +150,6 @@ def add_message(self, kind, name, text, - other_text_tags, avatar, is_groupchat, additional_data=additional_data, ===================================== gajim/privatechat_control.py ===================================== @@ -161,18 +161,7 @@ def send_message(self, message, xhtml=None, process_commands=True, attention=attention) def update_ui(self): - if not self.contact.is_available: - self.got_disconnected() - else: - self.got_connected() + ChatControl.update_ui(self) def _on_user_avatar_update(self, *args): self._update_avatar() - - def got_disconnected(self): - ChatControl.got_disconnected(self) - ChatControl.update_ui(self) - - def got_connected(self): - ChatControl.got_connected(self) - ChatControl.update_ui(self) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5c59b8d637b7eee8df583595801a064… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5c59b8d637b7eee8df583595801a064… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor accessing muc data in controls
by Philipp Hörist 27 Apr '21

27 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5c59b8d6 by lovetox at 2021-04-27T09:47:12+02:00 Refactor accessing muc data in controls - - - - - 9 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/chat_stack.py - gajim/privatechat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -99,13 +99,11 @@ class ChatControl(ChatControlBase): # processed with this command host. COMMAND_HOST = ChatCommands # type: ClassVar[Type[CommandHost]] - def __init__(self, parent_win, jid, acct, session, resource=None): + def __init__(self, account, jid): ChatControlBase.__init__(self, - parent_win, 'chat_control', - jid, - acct, - resource) + account, + jid) self.last_recv_message_id = None self.last_recv_message_marks = None @@ -245,7 +243,7 @@ def add_actions(self): action_name, func = action act = Gio.SimpleAction.new(action_name + self.control_id, None) act.connect('activate', func) - self.parent_win.window.add_action(act) + app.window.add_action(act) chatstate = self.contact.settings.get('send_chatstate') @@ -254,7 +252,7 @@ def add_actions(self): GLib.VariantType.new("s"), GLib.Variant("s", chatstate)) act.connect('change-state', self._on_send_chatstate) - self.parent_win.window.add_action(act) + app.window.add_action(act) marker = self.contact.settings.get('send_marker') @@ -263,10 +261,10 @@ def add_actions(self): None, GLib.Variant.new_boolean(marker)) act.connect('change-state', self._on_send_marker) - self.parent_win.window.add_action(act) + app.window.add_action(act) def update_actions(self): - win = self.parent_win.window + win = app.window online = app.account_is_connected(self.account) # Add to roster @@ -366,7 +364,7 @@ def remove_actions(self): 'send-marker-', ] for action in actions: - self.parent_win.window.remove_action(f'{action}{self.control_id}') + app.window.remove_action(f'{action}{self.control_id}') def focus(self): self.msg_textview.grab_focus() @@ -377,7 +375,7 @@ def delegate_action(self, action): return res if action == 'show-contact-info': - self.parent_win.window.lookup_action( + app.window.lookup_action( 'information-%s' % self.control_id).activate() return Gdk.EVENT_STOP @@ -387,7 +385,7 @@ def delegate_action(self, action): app.interface.roster.tree.grab_focus() return Gdk.EVENT_PROPAGATE - self.parent_win.window.lookup_action( + app.window.lookup_action( 'send-file-%s' % self.control_id).activate() return Gdk.EVENT_STOP @@ -499,8 +497,6 @@ def _on_location_received(self, _event): def _on_nickname_received(self, _event): self.update_ui() - self.parent_win.redraw_tab(self) - self.parent_win.show_title() def _on_update_client_info(self, event): contact = app.contacts.get_contact( @@ -527,7 +523,7 @@ def _on_caps_update(self, event): def _on_mam_message_received(self, event): if event.properties.is_muc_pm: - if not event.properties.jid == self.contact.get_full_jid(): + if not event.properties.jid == self.contact.jid: return else: if not event.properties.jid.bare_match(self.contact.jid): @@ -608,19 +604,6 @@ def _nec_ping(self, event): elif event.name == 'ping-error': self.add_info_message(event.error) - def change_resource(self, resource): - old_full_jid = self.get_full_jid() - self.resource = resource - new_full_jid = self.get_full_jid() - # update app.last_message_time - if old_full_jid in app.last_message_time[self.account]: - app.last_message_time[self.account][new_full_jid] = \ - app.last_message_time[self.account][old_full_jid] - # update events - app.events.change_jid(self.account, old_full_jid, new_full_jid) - # update MessageWindow._controls - self.parent_win.change_jid(self.account, old_full_jid, new_full_jid) - # Jingle AV def _on_start_call(self, *args): audio_state = self.jingle['audio'].state @@ -771,7 +754,7 @@ def update_video(self): self.xml.outgoing_viewport.add(self._video_widget_self) session = self._client.get_module('Jingle').get_jingle_session( - self.contact.get_full_jid(), self.jingle['video'].sid) + self.contact.jid, self.jingle['video'].sid) content = session.get_content('video') content.do_setup(sink_self, sink_other) @@ -834,7 +817,7 @@ def close_jingle_content(self, jingle_type: str, return session = self._client.get_module('Jingle').get_jingle_session( - self.contact.get_full_jid(), jingle.sid) + self.contact.jid, jingle.sid) if session: content = session.get_content(jingle_type) if content: @@ -857,7 +840,7 @@ def _on_jingle_button_toggled(self, jingle_types): if all(item in jingle_types for item in ['audio', 'video']): # Both 'audio' and 'video' in jingle_types sid = self._client.get_module('Jingle').start_audio_video( - self.contact.get_full_jid()) + self.contact.jid) self.set_jingle_state('audio', JingleState.CONNECTING, sid) self.set_jingle_state('video', JingleState.CONNECTING, sid) return @@ -867,7 +850,7 @@ def _on_jingle_button_toggled(self, jingle_types): self.close_jingle_content('audio') else: sid = self._client.get_module('Jingle').start_audio( - self.contact.get_full_jid()) + self.contact.jid) self.set_jingle_state('audio', JingleState.CONNECTING, sid) if 'video' in jingle_types: @@ -875,12 +858,12 @@ def _on_jingle_button_toggled(self, jingle_types): self.close_jingle_content('video') else: sid = self._client.get_module('Jingle').start_video( - self.contact.get_full_jid()) + self.contact.jid) self.set_jingle_state('video', JingleState.CONNECTING, sid) def _get_audio_content(self): session = self._client.get_module('Jingle').get_jingle_session( - self.contact.get_full_jid(), self.jingle['audio'].sid) + self.contact.jid, self.jingle['audio'].sid) return session.get_content('audio') def on_num_button_pressed(self, _widget, num): @@ -912,11 +895,11 @@ def on_location_eventbox_leave_notify_event(self, _widget, _event): Just moved the mouse so show the cursor """ cursor = get_cursor('default') - self.parent_win.window.get_window().set_cursor(cursor) + app.window.get_window().set_cursor(cursor) def on_location_eventbox_enter_notify_event(self, _widget, _event): cursor = get_cursor('pointer') - self.parent_win.window.get_window().set_cursor(cursor) + app.window.get_window().set_cursor(cursor) def update_ui(self): # The name banner is drawn here @@ -932,14 +915,14 @@ def draw_banner_text(self): """ contact = self.contact name = contact.name - if self.resource: - name += '/' + self.resource - if self._type.is_privatechat: - name = i18n.direction_mark + _( - '%(nickname)s from group chat %(room_name)s') % \ - {'nickname': name, 'room_name': self.room_name} + # if self.resource: + # name += '/' + self.resource + # if self._type.is_privatechat: + # name = i18n.direction_mark + _( + # '%(nickname)s from group chat %(room_name)s') % \ + # {'nickname': name, 'room_name': self.room_name} - name = i18n.direction_mark + GLib.markup_escape_text(name) + # name = i18n.direction_mark + GLib.markup_escape_text(name) cs = self.contact.chatstate if cs is not None: @@ -1091,17 +1074,6 @@ def shutdown(self): self.close_jingle_content(jingle_type, shutdown=True) self.jingle.clear() - # disconnect self from session - if self.session: - self.session.control = None - - # Clean events - app.events.remove_events( - self.account, - self.get_full_jid(), - types=['printed_%s' % self._type, str(self._type)]) - # Remove contact instance if contact has been removed - super(ChatControl, self).shutdown() app.check_finalize(self) @@ -1112,7 +1084,7 @@ def safe_shutdown(self): return False def allow_shutdown(self, method, on_yes, on_no, _on_minimize): - time_ = app.last_message_time[self.account][self.get_full_jid()] + time_ = app.last_message_time[self.account][self.contact.jid] # 2 seconds if time.time() - time_ < 2: no_log_for = app.settings.get_account_setting( @@ -1136,7 +1108,7 @@ def allow_shutdown(self, method, on_yes, on_no, _on_minimize): DialogButton.make('Remove', text=_('_Close'), callback=lambda: on_yes(self))], - transient_for=self.parent_win.window).show() + transient_for=app.window).show() return on_yes(self) @@ -1144,7 +1116,7 @@ def _on_avatar_update(self, _contact, _signal_name): self._update_avatar() def _update_avatar(self): - scale = self.parent_win.window.get_scale_factor() + scale = app.window.get_scale_factor() surface = self.contact.get_avatar(AvatarSize.CHAT, scale) self.xml.avatar_image.set_from_surface(surface) @@ -1200,7 +1172,6 @@ def _on_presence_received(self, event): name = self.contact.name self.update_ui() - self.parent_win.redraw_tab(self) if not app.settings.get('print_status_in_chats'): return ===================================== gajim/chat_control_base.py ===================================== @@ -98,20 +98,17 @@ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): _type = None # type: ControlType - def __init__(self, parent_win, widget_name, jid, acct, - resource=None): + def __init__(self, widget_name, account, jid): EventHelper.__init__(self) # Undo needs this variable to know if space has been pressed. # Initialize it to True so empty textview is saved in undo list self.space_pressed = True self.handlers = {} - self.parent_win = parent_win - self.account = acct - self.resource = resource + self.account = account - self._client = app.get_client(acct) + self._client = app.get_client(account) groupchat = self._type != ControlType.CHAT self.contact = self._client.get_module('Contacts').get_contact( @@ -123,7 +120,7 @@ def __init__(self, parent_win, widget_name, jid, acct, self.control_id = str(uuid.uuid4()) self.session = None - app.last_message_time[self.account][self.get_full_jid()] = 0 + app.last_message_time[self.account][self.contact.jid] = 0 self.xml = get_builder('%s.ui' % widget_name) self.xml.connect_signals(self) @@ -241,10 +238,10 @@ def __init__(self, parent_win, widget_name, jid, acct, self._client.get_module('Chatstate').set_active(self.contact) - if parent_win is not None: - id_ = parent_win.window.connect('motion-notify-event', - self._on_window_motion_notify) - self.handlers[id_] = parent_win.window + # TODO + # id_ = app.window.connect('motion-notify-event', + # self._on_window_motion_notify) + # self.handlers[id_] = app.window self.encryption = self.get_encryption_state() self.conversation_view.encryption_enabled = self.encryption is not None @@ -322,12 +319,6 @@ def is_privatechat(self): def is_groupchat(self): return self._type.is_groupchat - def get_full_jid(self): - fjid = self.contact.jid - if self.resource: - fjid += '/' + self.resource - return fjid - def minimizable(self): """ Called to check if control can be minimized @@ -360,15 +351,6 @@ def allow_shutdown(self, method, on_response_yes, on_response_no, def focus(self): raise NotImplementedError - def get_nb_unread(self): - jid = self.contact.jid - if self.resource: - jid += '/' + self.resource - return len(app.events.get_events( - self.account, - jid, - ['printed_%s' % self._type, str(self._type)])) - def draw_banner(self): """ Draw the fat line at the top of the window @@ -522,7 +504,7 @@ def add_actions(self): GLib.VariantType.new('s'), GLib.Variant('s', self.encryption or 'disabled')) action.connect('change-state', self.change_encryption) - self.parent_win.window.add_action(action) + app.window.add_action(action) actions = { 'send-message-%s': self._on_send_message, @@ -535,7 +517,7 @@ def add_actions(self): action = Gio.SimpleAction.new(name % self.control_id, None) action.connect('activate', func) action.set_enabled(False) - self.parent_win.window.add_action(action) + app.window.add_action(action) def remove_actions(self): actions = [ @@ -547,7 +529,7 @@ def remove_actions(self): ] for action in actions: - self.parent_win.window.remove_action(f'{action}{self.control_id}') + app.window.remove_action(f'{action}{self.control_id}') def change_encryption(self, action, param): encryption = param.get_string() @@ -783,9 +765,9 @@ def _paste_event_confirmed(self, is_checked, image): def _get_pref_ft_method(self): ft_pref = app.settings.get_account_setting(self.account, 'filetransfer_preference') - httpupload = self.parent_win.window.lookup_action( + httpupload = app.window.lookup_action( 'send-file-httpupload-%s' % self.control_id) - jingle = self.parent_win.window.lookup_action( + jingle = app.window.lookup_action( 'send-file-jingle-%s' % self.control_id) if self._type.is_groupchat: @@ -1038,9 +1020,6 @@ def _on_window_motion_notify(self, *args): """ It gets called no matter if it is the active window or not """ - if not self.parent_win: - # when a groupchat is minimized there is no parent window - return # TODO return if self.parent_win.get_active_jid() == self.contact.jid: @@ -1050,8 +1029,7 @@ def _on_window_motion_notify(self, *args): def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() - if self.parent_win is not None: - self.parent_win.window.lookup_action( + app.window.lookup_action( 'send-message-' + self.control_id).set_enabled(has_text) if textbuffer.get_char_count() and self.encryption: @@ -1124,7 +1102,7 @@ def add_message(self, correct_id = (message_id, correct_id) """ jid = self.contact.jid - full_jid = self.get_full_jid() + full_jid = self.contact.jid end = False if self.conversation_view.autoscroll or kind == 'outgoing': end = True @@ -1253,9 +1231,6 @@ def set_emoticon_popover(self): if not app.settings.get('emoticons_theme'): return - if not self.parent_win: - return - if sys.platform in ('win32', 'darwin'): emoji_chooser.text_widget = self.msg_textview self.xml.emoticons_button.set_popover(emoji_chooser) @@ -1271,13 +1246,13 @@ def _on_emoticon_button_clicked(self, _widget): self.xml.emoticons_button.set_property('active', False) def on_color_menuitem_activate(self, _widget): - color_dialog = Gtk.ColorChooserDialog(None, self.parent_win.window) + color_dialog = Gtk.ColorChooserDialog(None, app.window) color_dialog.set_use_alpha(False) color_dialog.connect('response', self.msg_textview.color_set) color_dialog.show_all() def on_font_menuitem_activate(self, _widget): - font_dialog = Gtk.FontChooserDialog(None, self.parent_win.window) + font_dialog = Gtk.FontChooserDialog(None, app.window) start, finish = self.msg_textview.get_active_iters() font_dialog.connect('response', self.msg_textview.font_set, start, finish) font_dialog.show_all() @@ -1370,7 +1345,7 @@ def set_control_active(self, state): if self._type.is_groupchat: type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] if not app.events.remove_events(self.account, - self.get_full_jid(), + self.contact.jid, types=type_): # There were events to remove self.redraw_after_event_removed(jid) @@ -1472,10 +1447,9 @@ def add_messages(self, messages): history=True) def has_focus(self): - if self.parent_win: - if self.parent_win.window.get_property('has-toplevel-focus'): - if self == self.parent_win.get_active_control(): - return True + if app.window.get_property('has-toplevel-focus'): + if self == app.window.get_active_control(): + return True return False def scroll_messages(self, direction, msg_buf, msg_type): ===================================== gajim/common/modules/caps.py ===================================== @@ -212,9 +212,11 @@ def preconditions_met(self): return False if self._from_muc: - muc = client.get_module('MUC').get_muc_data(self.entity.jid.bare) + contact = client.get_module('Contacts').get_contact( + self.entity.jid.bare, + groupchat=True) - if muc is None or not muc.state.is_joined: + if not contact.is_joined: self.set_obsolete() return False ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -45,9 +45,11 @@ def _process_chat_marker(self, _con, _stanza, properties): return if properties.type.is_groupchat: - muc_data = self._con.get_module('MUC').get_muc_data( - properties.muc_jid) - if muc_data is None: + contact = self._con.get_module('Contacts').get_contact( + properties.muc_jid, + groupchat=True) + if not contact.is_joined: + self._log.warning('Received chat marker while not joined') return if properties.muc_nickname != muc_data.nick: ===================================== gajim/common/modules/contacts.py ===================================== @@ -346,11 +346,6 @@ def __init__(self, logger, jid, account): def is_groupchat(self): return True - @property - def state(self): - muc_data = self._module('MUC').get_muc_data(self._jid) - return muc_data.state - def add_resource(self, resource): jid = self._jid.new_with(resource=resource) contact = GroupchatParticipant(self._log, jid, self._account) @@ -392,6 +387,26 @@ def update_avatar(self, *args): app.interface.avatar_storage.invalidate_cache(self._jid) self.notify('avatar-update') + def get_self(self): + nick = self.nickname + if nick is None: + return None + return self.get_resource(nick) + + @property + def nickname(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return None + return muc_data.nick + + @property + def occupant_jid(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return None + return muc_data.occupant_jid + @property def is_joined(self): muc_data = self._module('MUC').get_muc_data(self._jid) @@ -399,6 +414,20 @@ def is_joined(self): return False return muc_data.state.is_joined + @property + def is_joining(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return False + return muc_data.state.is_joining + + @property + def is_not_joined(self): + muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return True + return muc_data.state.is_not_joined + def set_not_joined(self): for contact in self._resources.values(): contact.update_presence(UNKNOWN_MUC_PRESENCE, notify=False) ===================================== gajim/common/modules/muc.py ===================================== @@ -116,7 +116,7 @@ def __init__(self, con): self._muc_service_jid = None self._joined_users = defaultdict(dict) self._mucs = {} - + self._muc_nicknames = {} def _on_resume_failed(self, _client, _signal_name): self._reset_presence() @@ -147,6 +147,10 @@ def pass_disco(self, info): def get_muc_data(self, room_jid): return self._mucs.get(room_jid) + def set_password(self, room_jid, password): + muc_data = self.get_muc_data(room_jid) + muc_data.password = password + def _get_mucs_with_state(self, states): return [muc for muc in self._mucs.values() if muc.state in states] ===================================== gajim/groupchat_control.py ===================================== @@ -86,12 +86,11 @@ class GroupchatControl(ChatControlBase): # will be processed with this command host. COMMAND_HOST = GroupChatCommands - def __init__(self, parent_win, jid, muc_data, acct): + def __init__(self, account, jid): ChatControlBase.__init__(self, - parent_win, 'groupchat_control', - jid, - acct) + account, + jid) self._client.connect_signal('state-changed', self._on_client_state_changed) @@ -119,12 +118,9 @@ def __init__(self, parent_win, jid, muc_data, acct): self.xml.roster_revealer.add(self.roster) self.roster.connect('row-activated', self._on_roster_row_activated) - if parent_win is not None: - self.add_actions() - GLib.idle_add(self.update_actions) - self.scale_factor = parent_win.window.get_scale_factor() - else: - self.scale_factor = app.interface.roster.scale_factor + self.add_actions() + GLib.idle_add(self.update_actions) + self.scale_factor = app.window.get_scale_factor() if not app.settings.get('hide_groupchat_banner'): self.xml.banner_eventbox.set_no_show_all(False) @@ -246,45 +242,33 @@ def _connect_contact_signals(self): }) def _on_muc_state_changed(self, _contact, _signal_name): - state = self.contact.state - if state == MUCJoinedState.JOINING: + if self.contact.is_joining: self._groupchat_state.set_joining() - if state == MUCJoinedState.JOINED: + if self.contact.is_joined: self._set_control_active() self.show_roster() self._groupchat_state.set_joined() - elif state == MUCJoinedState.NOT_JOINED: + elif self.contact.is_not_joined: self._set_control_inactive() def _on_client_state_changed(self, _client, _signal_name, state): pass - @property - def _muc_data(self): - return self._client.get_module('MUC').get_muc_data(self.room_jid) - @property def _nick_completion(self): if self.__nick_completion is None: - self.__nick_completion = NickCompletionGenerator(self._muc_data.nick) + self.__nick_completion = NickCompletionGenerator( + self.contact.nickname) return self.__nick_completion - @property - def nick(self): - return self._muc_data.nick - @property def subject(self): if self._subject_data is None: return '' return self._subject_data.subject - @property - def room_name(self): - return self.contact.get_shown_name() - @property def disco_info(self): return app.storage.cache.get_last_disco_info(self.contact.jid) @@ -316,50 +300,51 @@ def add_actions(self): 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) + app.window.add_action(act) def update_actions(self, *args): - if self._muc_data is None: - return - - contact = self.contact.get_resource(self.nick) + joined = self.contact.is_joined + if joined: + contact = self.contact.get_self() # Destroy Room - self._get_action('destroy-').set_enabled(self.is_connected and + self._get_action('destroy-').set_enabled(joined and contact.affiliation.is_owner) # Configure Room self._get_action('configure-').set_enabled( - self.is_connected and contact.affiliation in (Affiliation.ADMIN, - Affiliation.OWNER)) + joined and contact.affiliation in (Affiliation.ADMIN, + Affiliation.OWNER)) - self._get_action('request-voice-').set_enabled(self.is_connected and + self._get_action('request-voice-').set_enabled(joined and contact.role.is_visitor) + self._get_action('rename-groupchat-').set_enabled(joined) + # Change Subject subject_change = self._is_subject_change_allowed() - self._get_action('change-subject-').set_enabled(self.is_connected and + self._get_action('change-subject-').set_enabled(joined and subject_change) # Change Nick - self._get_action('change-nickname-').set_enabled(self.is_connected) + self._get_action('change-nickname-').set_enabled(joined) # Execute command - self._get_action('execute-command-').set_enabled(self.is_connected) + self._get_action('execute-command-').set_enabled(joined) # Send message has_text = self.msg_textview.has_text() self._get_action('send-message-').set_enabled( - self.is_connected and has_text) + joined and has_text) # Send file (HTTP File Upload) httpupload = self._get_action( 'send-file-httpupload-') - httpupload.set_enabled(self.is_connected and + httpupload.set_enabled(joined and self._client.get_module('HTTPUpload').available) self._get_action('send-file-').set_enabled(httpupload.get_enabled()) - if self.is_connected and httpupload.get_enabled(): + if joined and httpupload.get_enabled(): tooltip_text = _('Send File…') max_file_size = self._client.get_module('HTTPUpload').max_file_size if max_file_size is not None: @@ -374,17 +359,17 @@ def update_actions(self, *args): if self.disco_info is not None: vcard_support = self.disco_info.supports(Namespace.VCARD) self._get_action('upload-avatar-').set_enabled( - self.is_connected and + joined and vcard_support and contact.affiliation.is_owner) - self._get_action('contact-information-').set_enabled(self.is_connected) + self._get_action('contact-information-').set_enabled(joined) - self._get_action('execute-command-').set_enabled(self.is_connected) + self._get_action('execute-command-').set_enabled(joined) - self._get_action('ban-').set_enabled(self.is_connected) + self._get_action('ban-').set_enabled(joined) - self._get_action('kick-').set_enabled(self.is_connected) + self._get_action('kick-').set_enabled(joined) def remove_actions(self): super().remove_actions() @@ -409,10 +394,13 @@ def remove_actions(self): ] for action in actions: - self.parent_win.window.remove_action(f'{action}{self.control_id}') + app.window.remove_action(f'{action}{self.control_id}') def _is_subject_change_allowed(self): - contact = self.contact.get_resource(self.nick) + contact = self.contact.get_self() + if contact is None: + return False + if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): return True @@ -421,7 +409,7 @@ def _is_subject_change_allowed(self): return self.disco_info.muc_subjectmod or False def _get_action(self, name): - win = self.parent_win.window + win = app.window return win.lookup_action(name + self.control_id) def _show_page(self, name): @@ -519,7 +507,7 @@ def _on_configure_room(self, _action, _param): win.present() return - contact = self.contact.get_resource(self.nick) + contact = self.contact.get_self() if contact.affiliation.is_owner: self._client.get_module('MUC').request_config( self.room_jid, callback=self._on_configure_form_received) @@ -567,7 +555,7 @@ def _on_accept(filename): callback=self._on_upload_avatar_result) AvatarChooserDialog(_on_accept, - transient_for=self.parent_win.window, + transient_for=app.window, modal=True) def _on_upload_avatar_result(self, task): @@ -623,23 +611,6 @@ def show_roster(self): self.xml.roster_revealer.set_transition_type(transition) self.xml.roster_revealer.set_reveal_child(show) - def on_groupchat_maximize(self): - self.roster.enable_tooltips() - self.add_actions() - self.update_actions() - self.set_lock_image() - self.draw_banner_text() - type_ = ['printed_gc_msg', 'printed_marked_gc_msg'] - if not app.events.remove_events(self.account, - self.get_full_jid(), - types=type_): - # XEP-0333 Send <displayed> marker - self._client.get_module('ChatMarkers').send_displayed_marker( - self.contact, - self.last_msg_id, - self._type) - self.last_msg_id = None - def _on_roster_row_activated(self, _roster, nick): muc_prefer_direct_msg = app.settings.get('muc_prefer_direct_msg') if not self.is_anonymous and muc_prefer_direct_msg: @@ -682,7 +653,7 @@ def on_approve(): _('Voice Request'), _('Voice Request'), _('<b>%(nick)s</b> from <b>%(room_name)s</b> requests voice') % { - 'nick': voice_request.nick, 'room_name': self.room_name}, + 'nick': voice_request.nick, 'room_name': self.contact.name}, [DialogButton.make('Cancel'), DialogButton.make('Accept', text=_('_Approve'), @@ -709,7 +680,7 @@ def _on_gc_message_received(self, event): displaymarking=event.displaymarking, additional_data=event.additional_data) else: - if event.properties.muc_nickname == self.nick: + if event.properties.muc_nickname == self.contact.nickname: self.last_sent_txt = event.msgtxt stanza_id = None if event.properties.stanza_id: @@ -740,24 +711,17 @@ def add_message(self, text, contact='', tim=None, if not contact: # Message from the server kind = 'status' - elif contact == self.nick: # it's us + elif contact == self.contact.nickname: # it's us kind = 'outgoing' else: kind = 'incoming' # muc-specific chatstate - if self.parent_win: - self.parent_win.redraw_tab(self, 'newmsg') if kind == 'incoming': # it's a message NOT from us # highlighting and sounds highlight, _sound = self.highlighting_for_message(text, tim) other_tags_for_name.append('muc_nickname_color_%s' % contact) if highlight: - # muc-specific chatstate - if self.parent_win: - self.parent_win.redraw_tab(self, 'attention') - else: - self.attention_flag = True other_tags_for_name.append('bold') other_tags_for_text.append('marked') @@ -828,7 +792,7 @@ def needs_visual_notification(self, text): nick) appear """ special_words = app.settings.get('muc_highlight_words').split(';') - special_words.append(self.nick) + special_words.append(self.contact.nickname) special_words.append(self._client.get_own_jid().bare) # Strip empties: ''.split(';') == [''] and would highlight everything. # Also lowercase everything for case insensitive compare. @@ -865,7 +829,7 @@ def _on_room_subject(self, _contact, _signal_name, properties): text = '%s - %s' % (text, date) if (app.settings.get('show_subject_on_join') or - self._muc_data.state != MUCJoinedState.JOINING): + not self.contact.is_joining): self.add_info_message(text) def _on_room_config_changed(self, _contact, _signal_name, properties): @@ -926,14 +890,6 @@ def _nec_ping(self, event): elif event.name == 'ping-error': self.add_info_message(event.error) - @property - def is_connected(self) -> bool: - return app.gc_connected[self.account][self.room_jid] - - @is_connected.setter - def is_connected(self, value: bool) -> None: - app.gc_connected[self.account][self.room_jid] = value - def _set_control_active(self): self.xml.formattings_button.set_sensitive(True) self.msg_textview.set_sensitive(True) @@ -941,8 +897,6 @@ def _set_control_active(self): self.roster.initial_draw() - self.is_connected = True - self.xml.formattings_button.set_sensitive(True) self.conversation_view.update_avatars() @@ -957,8 +911,6 @@ def _set_control_inactive(self): self.roster.enable_sort(False) self.roster.clear() - self.is_connected = False - self._client.get_module('Chatstate').remove_delay_timeout(self.contact) self.update_actions() @@ -975,13 +927,14 @@ def _on_user_joined(self, _contact, _signal_name, user_contact, properties): nick = user_contact.name if not properties.is_muc_self_presence: - if self.is_connected and self.contact.settings.get('print_join_left'): + if (self.contact.is_joined and + self.contact.settings.get('print_join_left')): self.add_info_message(_('%s has joined the group chat') % nick) return status_codes = properties.muc_status_codes or [] - if not self.is_connected: + if not self.contact.is_joined: # We just joined the room self.add_info_message(_('You (%s) joined the group chat') % nick) @@ -1347,21 +1300,20 @@ def shutdown(self, reason=None): # Remove unread events from systray app.events.remove_events(self.account, self.room_jid) - if self.parent_win is not None: - self.remove_actions() + self.remove_actions() super(GroupchatControl, self).shutdown() app.check_finalize(self) def safe_shutdown(self): # whether to ask for confirmation before closing muc - if app.settings.get('confirm_close_muc') and self.is_connected: + if app.settings.get('confirm_close_muc') and self.contact.is_joined: return False return True def allow_shutdown(self, method, on_yes, on_no): # whether to ask for confirmation before closing muc - if app.settings.get('confirm_close_muc') and self.is_connected: + if app.settings.get('confirm_close_muc') and self.contact.is_joined: def on_ok(is_checked): if is_checked: # User does not want to be asked again @@ -1378,33 +1330,24 @@ def on_cancel(is_checked): _('Leave Group Chat'), _('Are you sure you want to leave this group chat?'), _('If you close this window, you will leave ' - '\'%s\'.') % self.room_name, + '\'%s\'.') % self.contact.name, _('_Do not ask me again'), [DialogButton.make('Cancel', callback=on_cancel), DialogButton.make('Accept', text=_('_Leave'), callback=on_ok)], - transient_for=self.parent_win.window).show() + transient_for=app.window).show() return on_yes(self) def _close_control(self, reason=None): - # if self.parent_win is None: self.shutdown(reason) - # else: - # self.parent_win.remove_tab(self, None, reason=reason, force=True) def set_control_active(self, state): - # self.conv_textview.allow_focus_out_line = True self.attention_flag = False ChatControlBase.set_control_active(self, state) - # if not state: - # # add the focus-out line to the tab we are leaving - # self.check_focus_out_line() - # Sending active to undo unread state - self.parent_win.redraw_tab(self, 'active') def _on_drag_data_received(self, widget, context, x, y, selection, target_type, timestamp): @@ -1553,7 +1496,7 @@ def delegate_action(self, action): if action == 'change-nickname': control_action = '%s-%s' % (action, self.control_id) - self.parent_win.window.lookup_action(control_action).activate() + app.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP if action == 'escape': @@ -1574,11 +1517,11 @@ def delegate_action(self, action): if action == 'change-subject': control_action = '%s-%s' % (action, self.control_id) - self.parent_win.window.lookup_action(control_action).activate() + app.window.lookup_action(control_action).activate() return Gdk.EVENT_STOP if action == 'show-contact-info': - self.parent_win.window.lookup_action( + app.window.lookup_action( 'information-%s' % self.control_id).activate() return Gdk.EVENT_STOP @@ -1652,14 +1595,14 @@ def _on_page_change(self, stack, _param): def _on_change_nick(self, _action, _param): if self._get_current_page() != 'groupchat': return - self.xml.nickname_entry.set_text(self.nick) + self.xml.nickname_entry.set_text(self.contact.nickname) self.xml.nickname_entry.grab_focus() self.xml.nickname_change_button.grab_default() self._show_page('nickname') def _on_nickname_text_changed(self, entry, _param): text = entry.get_text() - if not text or text == self.nick: + if not text or text == self.contact.nickname: self.xml.nickname_change_button.set_sensitive(False) else: try: @@ -1677,7 +1620,7 @@ def _on_nickname_change_clicked(self, _button): def _on_rename_groupchat(self, _action, _param): if self._get_current_page() != 'groupchat': return - self.xml.name_entry.set_text(self.room_name) + self.xml.name_entry.set_text(self.contact.name) self.xml.name_entry.grab_focus() self.xml.rename_button.grab_default() self._show_page('rename') @@ -1705,7 +1648,7 @@ def _on_subject_change_clicked(self, _button): def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() - self._muc_data.password = password + self._client.get_module('MUC').set_password(self.room_jid, password) self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') @@ -1727,11 +1670,6 @@ def _on_room_captcha_challenge(self, _contact, _signal_name, properties): self._captcha_request.show_all() self.xml.captcha_box.add(self._captcha_request) - if self.parent_win: - self.parent_win.redraw_tab(self, 'attention') - else: - self.attention_flag = True - self._show_page('captcha') self._captcha_request.focus_first_entry() ===================================== gajim/gtk/chat_stack.py ===================================== @@ -47,8 +47,7 @@ def add_chat(self, account, jid): # Control is already in the Stack return - mw = self.get_toplevel() - chat_control = ChatControl(mw, jid, account, None, None) + chat_control = ChatControl(account, jid) self._controls[(account, jid)] = chat_control self.add_named(chat_control.widget, f'{account}:{jid}') chat_control.widget.show_all() @@ -57,21 +56,13 @@ def add_group_chat(self, account, jid): if self._controls.get((account, jid)) is not None: return - # muc_data = self._create_muc_data(account, - # room_jid, - # nick, - # password, - # None) - - mw = self.get_toplevel() - control = GroupchatControl(mw, jid, None, account) + control = GroupchatControl(account, jid) self._controls[(account, jid)] = control self.add_named(control.widget, f'{account}:{jid}') control.widget.show_all() def add_private_chat(self, account, jid): - mw = self.get_toplevel() - control = PrivateChatControl(mw, jid, account) + control = PrivateChatControl(account, jid) self._controls[(account, str(jid))] = control self.add_named(control.widget, f'{account}:{jid}') control.widget.show_all() ===================================== gajim/privatechat_control.py ===================================== @@ -42,11 +42,11 @@ class PrivateChatControl(ChatControl): # will be processed with this command host. COMMAND_HOST = PrivateChatCommands - def __init__(self, parent_win, jid, account): + def __init__(self, account, jid): self._room_contact = self._client.get_module('Contacts').get_contact( jid.bare) - ChatControl.__init__(self, parent_win, jid, account, None) + ChatControl.__init__(self, account, jid) # self.register_events([ # ('update-gc-avatar', ged.GUI1, self._on_update_gc_avatar), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c59b8d637b7eee8df583595801a0641… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5c59b8d637b7eee8df583595801a0641… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatState: Add styling
by Daniel Brötzmann 26 Apr '21

26 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 63df2cd9 by wurstsalat at 2021-04-26T23:06:02+02:00 GroupchatState: Add styling - - - - - 2 changed files: - gajim/data/gui/groupchat_state.ui - gajim/data/style/gajim.css Changes: ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -5,18 +5,19 @@ <object class="GtkStack" id="groupchat_state"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="margin-bottom">12</property> <child> <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> - <child> - <placeholder/> - </child> + <property name="spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Not joined</property> + <property name="label" translatable="yes">You left this group chat</property> + <property name="wrap">True</property> + <property name="max-width-chars">32</property> </object> <packing> <property name="expand">False</property> @@ -26,11 +27,15 @@ </child> <child> <object class="GtkButton"> - <property name="label" translatable="yes">Join Now</property> + <property name="label" translatable="yes">Join</property> <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> + <property name="valign">center</property> <signal name="clicked" handler="_on_join_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> @@ -47,11 +52,12 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkSpinner"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="active">True</property> + <property name="label" translatable="yes">Joining…</property> </object> <packing> <property name="expand">False</property> @@ -60,10 +66,10 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkSpinner"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Joining</property> + <property name="active">True</property> </object> <packing> <property name="expand">False</property> @@ -77,6 +83,7 @@ <property name="visible">True</property> <property name="can-focus">True</property> <property name="receives-default">True</property> + <property name="valign">center</property> <signal name="clicked" handler="_on_abort_clicked" swapped="no"/> </object> <packing> @@ -95,10 +102,12 @@ <object class="GtkBox"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="spacing">12</property> <child> - <object class="GtkSpinner"> + <object class="GtkLabel"> <property name="visible">True</property> <property name="can-focus">False</property> + <property name="label" translatable="yes">Fetching messages…</property> </object> <packing> <property name="expand">False</property> @@ -107,10 +116,9 @@ </packing> </child> <child> - <object class="GtkLabel"> + <object class="GtkSpinner"> <property name="visible">True</property> <property name="can-focus">False</property> - <property name="label" translatable="yes">Fetching</property> </object> <packing> <property name="expand">False</property> @@ -124,5 +132,8 @@ <property name="position">2</property> </packing> </child> + <style> + <class name="groupchat-state"/> + </style> </object> </interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -568,6 +568,18 @@ infobar.error > revealer > box { } #GroupchatConfig treeview { padding: 5px; } +.groupchat-state box { + background-color: alpha(rgb(70, 70, 70), 0.8); + padding: 12px; + border-radius: 6px; +} +.groupchat-state box > label { + color: @theme_base_color; +} +.groupchat-state box > spinner { + color: @theme_base_color; +} + /* Popover Treeview */ .popover_treeview { border-radius: 3px; background-color: @theme_bg_color; } .popover_treeview { padding: 6px; } View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63df2cd9a77c8d9a2c7f521f38cf9e4e… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63df2cd9a77c8d9a2c7f521f38cf9e4e… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix bugs when joining mucs
by Philipp Hörist 26 Apr '21

26 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 1c73a02e by lovetox at 2021-04-26T16:34:37+02:00 Fix bugs when joining mucs - - - - - 4 changed files: - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/groupchat_control.py - gajim/gtk/search_view.py Changes: ===================================== gajim/common/modules/contacts.py ===================================== @@ -69,6 +69,7 @@ def add_contact(self, jid, groupchat=False): contact = GroupchatContact(self._log, jid, self._account) else: contact = BareContact(self._log, jid, self._account) + self._contacts[jid] = contact return contact @@ -154,6 +155,9 @@ def force_chatstate_update(self): for contact in self._resources.values(): contact.notify('chatstate-update') + def __repr__(self): + return f'{self.jid} ({self._account})' + class BareContact(CommonContact): def __init__(self, logger, jid, account): ===================================== gajim/common/modules/muc.py ===================================== @@ -214,6 +214,7 @@ def join(self, jid, nick=None, password=None, config=None): disco_info = app.storage.cache.get_last_disco_info(muc_data.jid, max_age=60) if disco_info is None: + self._set_muc_state(muc_data.jid, MUCJoinedState.JOINING) self._con.get_module('Discovery').disco_muc( muc_data.jid, callback=self._on_disco_result) ===================================== gajim/groupchat_control.py ===================================== @@ -964,7 +964,7 @@ def _set_control_inactive(self): self.update_actions() def rejoin(self): - self._client.get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self.room_jid) # def send_pm(self, nick, message=None): # ctrl = self._start_private_message(nick) @@ -1706,7 +1706,7 @@ def _on_subject_change_clicked(self, _button): def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() self._muc_data.password = password - self._client.get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') def _on_password_changed(self, entry, _param): @@ -1763,7 +1763,7 @@ def _on_captcha_cancel_clicked(self, _button=None): self._close_control() def _on_captcha_try_again_clicked(self, _button=None): - self._client.get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') def _on_remove_bookmark_button_clicked(self, _button=None): @@ -1771,7 +1771,7 @@ def _on_remove_bookmark_button_clicked(self, _button=None): self._close_control() def _on_retry_join_clicked(self, _button=None): - self._client.get_module('MUC').join(self._muc_data) + self._client.get_module('MUC').join(self.room_jid) self._show_page('groupchat') def _on_page_cancel_clicked(self, _button=None): @@ -1783,5 +1783,5 @@ def _on_page_close_clicked(self, _button=None): def _on_groupchat_state_abort_clicked(self, _button): app.window.lookup_action('disconnect-%s' % self.control_id).activate() - def _on_groupchat_state_join_clicked(self, groupchat_state): - pass + def _on_groupchat_state_join_clicked(self, _groupchat_state): + self._client.get_module('MUC').join(self.room_jid) ===================================== gajim/gtk/search_view.py ===================================== @@ -197,8 +197,6 @@ def __init__(self, msg, account, jid): self.time = msg.time self._client = app.get_client(account) - self.contact = self._client.get_module('Contacts').get_contact(jid) - self.log_line_id = msg.log_line_id self.timestamp = msg.time self.kind = msg.kind @@ -207,6 +205,9 @@ def __init__(self, msg, account, jid): if msg.kind == KindConstant.GC_MSG: self.type = 'groupchat' + self.contact = self._client.get_module('Contacts').get_contact( + jid, groupchat=self.type == 'groupchat') + self._ui = get_builder('search_view.ui') self.add(self._ui.result_row_grid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1c73a02e55d6ee19fc68ef389c1f959f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1c73a02e55d6ee19fc68ef389c1f959f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Move overlay to glade
by Philipp Hörist 26 Apr '21

26 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 171d2622 by lovetox at 2021-04-26T09:27:00+02:00 Move overlay to glade - - - - - 301d9e3c by lovetox at 2021-04-26T11:44:08+02:00 Add GroupchatState widget - - - - - 7 changed files: - gajim/chat_control_base.py - gajim/common/modules/contacts.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - + gajim/data/gui/groupchat_state.ui - gajim/groupchat_control.py - + gajim/gtk/groupchat_state.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -176,11 +176,9 @@ def __init__(self, parent_win, widget_name, jid, acct, self._scrolled_view.add(self.conversation_view) self._scrolled_view.set_focus_vadjustment(Gtk.Adjustment()) - overlay = Gtk.Overlay() - overlay.add(self._scrolled_view) - overlay.add_overlay(self.xml.jump_to_end_button) - self.xml.textview_box.add(overlay) - self.xml.textview_box.reorder_child(overlay, 2) + self.xml.conv_view_overlay.add(self._scrolled_view) + self.xml.conv_view_overlay.add_overlay(self.xml.jump_to_end_button) + self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) self._scrolled_view.connect('request-history', ===================================== gajim/common/modules/contacts.py ===================================== @@ -391,6 +391,8 @@ def update_avatar(self, *args): @property def is_joined(self): muc_data = self._module('MUC').get_muc_data(self._jid) + if muc_data is None: + return False return muc_data.state.is_joined def set_not_joined(self): ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -629,7 +629,18 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkOverlay" id="conv_view_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> <child> <object class="GtkSeparator"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -256,7 +256,18 @@ </packing> </child> <child> - <placeholder/> + <object class="GtkOverlay" id="conv_view_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> </child> <child> <object class="GtkSeparator"> @@ -512,7 +523,6 @@ <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> @@ -529,93 +539,7 @@ </packing> </child> <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="orientation">vertical</property> - <child> -  - <object class="GtkGrid"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="halign">center</property> - <property name="valign">center</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="row-spacing">6</property> - <child> - <object class="GtkSpinner" id="progress_spinner"> - <property name="width-request">40</property> - <property name="height-request">40</property> - <property name="visible">True</property> - <property name="can-focus">False</property> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel"> - <property name="visible">True</property> - <property name="can-focus">False</property> - <property name="label" translatable="yes">Joining…</property> - <style> - <class name="bold16"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="abort_button"> - <property name="label" translatable="yes">_Abort</property> - <property name="visible">True</property> - <property name="can-focus">True</property> - <property name="receives-default">True</property> - <property name="use-underline">True</property> - <signal name="clicked" handler="_on_abort_button_clicked" swapped="no"/> - <style> - <class name="margin-top12"/> - </style> - </object> - <packing> - <property name="left-attach">0</property> - <property name="top-attach">2</property> - </packing> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - <packing> - <property name="name">progress</property> - <property name="position">1</property> - </packing> + <placeholder/> </child> <child> <object class="GtkBox"> ===================================== gajim/data/gui/groupchat_state.ui ===================================== @@ -0,0 +1,128 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkStack" id="groupchat_state"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <placeholder/> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Not joined</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Join Now</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_join_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="name">not-joined</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkSpinner"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="active">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Joining</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="label" translatable="yes">Abort</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <signal name="clicked" handler="_on_abort_clicked" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + </object> + <packing> + <property name="name">joining</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkSpinner"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Fetching</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="name">fetching</property> + <property name="position">2</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/groupchat_control.py ===================================== @@ -49,7 +49,6 @@ from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string from gajim.common.const import AvatarSize -from gajim.common.const import SimpleClientState from gajim.common.i18n import _ from gajim.common.const import MUCJoinedState @@ -70,6 +69,7 @@ from gajim.gui.groupchat_invite import GroupChatInvite from gajim.gui.groupchat_settings import GroupChatSettings from gajim.gui.groupchat_roster import GroupchatRoster +from gajim.gui.groupchat_state import GroupchatState from gajim.gui.util import NickCompletionGenerator from gajim.gui.util import get_app_window from gajim.gui.util import open_window @@ -157,7 +157,7 @@ def __init__(self, parent_win, jid, muc_data, acct): # Banner self.hide_roster_button = Gtk.Button.new_from_icon_name( - 'go-next-symbolic', Gtk.IconSize.MENU) + 'go-previous-symbolic', Gtk.IconSize.MENU) self.hide_roster_button.set_valign(Gtk.Align.CENTER) self.hide_roster_button.connect('clicked', lambda *args: self.show_roster()) @@ -190,8 +190,10 @@ def __init__(self, parent_win, jid, muc_data, acct): self.xml.settings_menu.set_menu_model(self.control_menu) - app.settings.connect_signal('gc_print_join_left_default', self.update_actions) - app.settings.connect_signal('gc_print_status_default', self.update_actions) + app.settings.connect_signal('gc_print_join_left_default', + self.update_actions) + app.settings.connect_signal('gc_print_status_default', + self.update_actions) self.register_events([ ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), @@ -199,6 +201,13 @@ def __init__(self, parent_win, jid, muc_data, acct): self._set_control_inactive() + self._groupchat_state = GroupchatState() + self._groupchat_state.connect('join-clicked', + self._on_groupchat_state_join_clicked) + self._groupchat_state.connect('abort-clicked', + self._on_groupchat_state_abort_clicked) + self.xml.conv_view_overlay.add_overlay(self._groupchat_state) + # Stack self.xml.stack.show_all() self.xml.stack.set_visible_child_name('groupchat') @@ -206,10 +215,6 @@ def __init__(self, parent_win, jid, muc_data, acct): self.update_ui() self.widget.show_all() - if app.settings.get('hide_groupchat_occupants_list'): - # Roster is shown by default, so toggle the roster button to hide it - self.show_roster() - # PluginSystem: adding GUI extension point for this GroupchatControl # instance object app.plugin_manager.gui_extension_point('groupchat_control', self) @@ -242,8 +247,13 @@ def _connect_contact_signals(self): def _on_muc_state_changed(self, _contact, _signal_name): state = self.contact.state + if state == MUCJoinedState.JOINING: + self._groupchat_state.set_joining() + if state == MUCJoinedState.JOINED: self._set_control_active() + self.show_roster() + self._groupchat_state.set_joined() elif state == MUCJoinedState.NOT_JOINED: self._set_control_inactive() @@ -1625,9 +1635,7 @@ def _on_ban_participant_clicked(self, _button): def _on_page_change(self, stack, _param): page_name = stack.get_visible_child_name() if page_name == 'groupchat': - self.xml.progress_spinner.stop() - elif page_name == 'progress': - self.xml.progress_spinner.start() + pass elif page_name == 'muc-info': self.xml.info_close_button.grab_default() elif page_name == 'password': @@ -1699,7 +1707,7 @@ def _on_password_set_clicked(self, _button): password = self.xml.password_entry.get_text() self._muc_data.password = password self._client.get_module('MUC').join(self._muc_data) - self._show_page('progress') + self._show_page('groupchat') def _on_password_changed(self, entry, _param): self.xml.password_set_button.set_sensitive(bool(entry.get_text())) @@ -1747,7 +1755,7 @@ def _on_captcha_set_clicked(self, _button): form_node = self._captcha_request.get_submit_form() self._client.get_module('MUC').send_captcha(self.room_jid, form_node) self._remove_captcha_request() - self._show_page('progress') + self._show_page('groupchat') def _on_captcha_cancel_clicked(self, _button=None): self._client.get_module('MUC').cancel_captcha(self.room_jid) @@ -1756,7 +1764,7 @@ def _on_captcha_cancel_clicked(self, _button=None): def _on_captcha_try_again_clicked(self, _button=None): self._client.get_module('MUC').join(self._muc_data) - self._show_page('progress') + self._show_page('groupchat') def _on_remove_bookmark_button_clicked(self, _button=None): self._client.get_module('Bookmarks').remove(self.room_jid) @@ -1764,7 +1772,7 @@ def _on_remove_bookmark_button_clicked(self, _button=None): def _on_retry_join_clicked(self, _button=None): self._client.get_module('MUC').join(self._muc_data) - self._show_page('progress') + self._show_page('groupchat') def _on_page_cancel_clicked(self, _button=None): self._show_page('groupchat') @@ -1772,6 +1780,8 @@ def _on_page_cancel_clicked(self, _button=None): def _on_page_close_clicked(self, _button=None): self._close_control() - def _on_abort_button_clicked(self, _button): - self.parent_win.window.lookup_action( - 'disconnect-%s' % self.control_id).activate() + def _on_groupchat_state_abort_clicked(self, _button): + app.window.lookup_action('disconnect-%s' % self.control_id).activate() + + def _on_groupchat_state_join_clicked(self, groupchat_state): + pass ===================================== gajim/gtk/groupchat_state.py ===================================== @@ -0,0 +1,63 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk +from gi.repository import GObject + +from gajim.gui.util import get_builder + + +class GroupchatState(Gtk.Box): + + __gsignals__ = { + 'join-clicked': ( + GObject.SignalFlags.RUN_FIRST, + None, + ()), + 'abort-clicked': ( + GObject.SignalFlags.RUN_FIRST, + None, + ()), + } + + def __init__(self): + Gtk.Box.__init__(self) + + self.set_halign(Gtk.Align.CENTER) + self.set_valign(Gtk.Align.END) + + self._ui = get_builder('groupchat_state.ui') + self._ui.connect_signals(self) + self.add(self._ui.groupchat_state) + self.show_all() + + def set_joining(self): + self._ui.groupchat_state.set_visible_child_name('joining') + + def set_joined(self): + self.hide() + + def set_not_joined(self): + self._ui.groupchat_state.set_visible_child_name('not-joining') + self.show() + + def set_fetching(self): + self._ui.groupchat_state.set_visible_child_name('fetching') + + def _on_join_clicked(self, _button): + self.emit('join-clicked') + + def _on_abort_clicked(self, _button): + self.emit('abort-clicked') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd9a20f506c693f8dba91d644bc3253… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/cd9a20f506c693f8dba91d644bc3253… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Search
by Philipp Hörist 25 Apr '21

25 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: cd9a20f5 by lovetox at 2021-04-25T20:18:05+02:00 Fix Search - - - - - 1 changed file: - gajim/gtk/search_view.py Changes: ===================================== gajim/gtk/search_view.py ===================================== @@ -234,7 +234,7 @@ def __init__(self, msg, account, jid): message_widget = MessageWidget(account) self._ui.result_row_grid.attach(message_widget, 1, 1, 2, 1) result = process(msg.message) - message_widget.add_content(result.blocks) + message_widget.add_content(result) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd9a20f506c693f8dba91d644bc32530… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/cd9a20f506c693f8dba91d644bc32530… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim] Pushed new tag gajim-1.3.2
by Philipp Hörist 24 Apr '21

24 Apr '21

Philipp Hörist pushed new tag gajim-1.3.2 at gajim / gajim -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/tree/gajim-1.3.2 You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][gajim_1.3] 2 commits: Update ChangeLog
by Philipp Hörist 24 Apr '21

24 Apr '21

Philipp Hörist pushed to branch gajim_1.3 at gajim / gajim Commits: afca14f1 by lovetox at 2021-04-24T13:27:40+02:00 Update ChangeLog - - - - - 19e371c8 by lovetox at 2021-04-24T13:27:40+02:00 1.3.2 - - - - - 4 changed files: - ChangeLog - appveyor.yml - data/org.gajim.Gajim.appdata.xml.in - gajim/__init__.py Changes: ===================================== ChangeLog ===================================== @@ -1,3 +1,21 @@ +Gajim 1.3.2 (24 April 2021) + + New + + * Accounts: Add account switch description + + Changes + + * MessageInput: Remove custom placeholder + * MessageInput: Add focus borders + + Bug fixes + + * #10010 Only convert domain name to ASCII + * #10342 UnicodeDecodeError related to avatars + * #10428 Roster: Handle missing avatar_sha + + Gajim 1.3.1 (01 March 2021) New ===================================== appveyor.yml ===================================== @@ -40,8 +40,8 @@ build_script: bash "git clone C:/projects/gajim C:/msys64/home/appveyor/gajim" bash "C:/msys64/home/appveyor/gajim/win/build.sh $($env:MSYS_ARCH)" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.1-$($env:ARCH)-$($env:TIME_STRING).exe" - Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.1-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim.exe" -FileName "Gajim-1.3.2-$($env:ARCH)-$($env:TIME_STRING).exe" + Push-AppveyorArtifact "$($env:BUILDROOT)/Gajim-Portable.exe" -FileName "Gajim-Portable-1.3.2-$($env:ARCH)-$($env:TIME_STRING).exe" # on_finish: # - ps: $blockRdp = $true; iex ((new-object net.webclient).DownloadString('https://raw.githubusercontent.com/appveyor/ci/master/scripts/enable-rdp.ps1')) ===================================== data/org.gajim.Gajim.appdata.xml.in ===================================== @@ -72,6 +72,7 @@ <content_attribute id="social-audio">intense</content_attribute> </content_rating> <releases> + <release version="1.3.2" date="2021-04-24" /> <release version="1.3.1" date="2021-03-01" /> <release version="1.3.0" date="2021-02-08" /> <release version="1.2.2" date="2020-08-15" /> ===================================== gajim/__init__.py ===================================== @@ -2,7 +2,7 @@ import sys from pathlib import Path -__version__ = "1.3.1" +__version__ = "1.3.2" IS_FLATPAK = Path('/app/share/run-as-flatpak').exists() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e85687a194a11d9e98d66654d471601… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e85687a194a11d9e98d66654d471601… You're receiving this email because of your account on dev.gajim.org.

1 0

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2021