Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][mainwindow] Remove Session Code
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d14ca6b0 by lovetox at 2021-04-18T14:03:49+02:00 Remove Session Code - - - - - 5 changed files: - gajim/common/client.py - − gajim/common/connection_handlers.py - gajim/common/zeroconf/connection_handlers_zeroconf.py - gajim/gui_interface.py - − gajim/session.py Changes: ===================================== gajim/common/client.py ===================================== @@ -37,7 +37,6 @@ from gajim.common.idle import Monitor from gajim.common.i18n import _ -from gajim.common.connection_handlers import ConnectionHandlers from gajim.common.connection_handlers_events import MessageSentEvent from gajim.gui.util import open_window @@ -46,7 +45,7 @@ log = logging.getLogger('gajim.client') -class Client(ConnectionHandlers): +class Client: def __init__(self, account): self._client = None self._account = account @@ -91,8 +90,6 @@ def __init__(self, account): self._screensaver_handler_id = app.app.connect( 'notify::screensaver-active', self._screensaver_state_changed) - ConnectionHandlers.__init__(self) - def _set_state(self, state): log.info('State: %s', state) self._state = state @@ -286,7 +283,6 @@ def _after_disconnect(self): self.get_module('VCardAvatars').avatar_advertised = False app.proxy65_manager.disconnect(self._client) - self.terminate_sessions() self.get_module('Bytestream').remove_all_transfers() if self._destroy_client: ===================================== gajim/common/connection_handlers.py deleted ===================================== @@ -1,181 +0,0 @@ -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Junglecow J <junglecow AT gmail.com> -# Copyright (C) 2006-2007 Tomasz Melcer <liori AT exroot.org> -# Travis Shirk <travis AT pobox.com> -# Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> -# Copyright (C) 2007-2008 Brendan Taylor <whateley AT gmail.com> -# Jean-Marie Traissard <jim AT lapin.org> -# Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# -# 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 logging -import operator - -import nbxmpp - -from gajim.common import app -from gajim.common.connection_handlers_events import PresenceReceivedEvent -from gajim.common.connection_handlers_events import NotificationEvent - - -log = logging.getLogger('gajim.c.connection_handlers') - -# basic connection handlers used here and in zeroconf -class ConnectionHandlersBase: - def __init__(self): - # keep track of sessions this connection has with other JIDs - self.sessions = {} - - def get_sessions(self, jid): - """ - Get all sessions for the given full jid - """ - if not app.interface.is_pm_contact(jid, self.name): - jid = app.get_jid_without_resource(jid) - - try: - return list(self.sessions[jid].values()) - except KeyError: - return [] - - def get_or_create_session(self, fjid, thread_id): - """ - Return an existing session between this connection and 'jid', returns a - new one if none exist - """ - pm = True - jid = fjid - - if not app.interface.is_pm_contact(fjid, self.name): - pm = False - jid = app.get_jid_without_resource(fjid) - - session = self.find_session(jid, thread_id) - - if session: - return session - - if pm: - return self.make_new_session(fjid, thread_id, type_='pm') - return self.make_new_session(fjid, thread_id) - - def find_session(self, jid, thread_id): - try: - if not thread_id: - return self.find_null_session(jid) - return self.sessions[jid][thread_id] - except KeyError: - return None - - def terminate_sessions(self): - self.sessions = {} - - def delete_session(self, jid, thread_id): - if not jid in self.sessions: - jid = app.get_jid_without_resource(jid) - if not jid in self.sessions: - return - - del self.sessions[jid][thread_id] - - if not self.sessions[jid]: - del self.sessions[jid] - - def find_null_session(self, jid): - """ - Find all of the sessions between us and a remote jid in which we haven't - received a thread_id yet and returns the session that we last sent a - message to - """ - sessions = list(self.sessions[jid].values()) - - # sessions that we haven't received a thread ID in - idless = [s for s in sessions if not s.received_thread_id] - - # filter out everything except the default session type - chat_sessions = [s for s in idless if isinstance(s, - app.default_session_type)] - - if chat_sessions: - # return the session that we last sent a message in - return sorted(chat_sessions, - key=operator.attrgetter('last_send'))[-1] - return None - - def get_latest_session(self, jid): - """ - Get the session that we last sent a message to - """ - if jid not in self.sessions: - return None - sessions = self.sessions[jid].values() - if not sessions: - return None - return sorted(sessions, key=operator.attrgetter('last_send'))[-1] - - def find_controlless_session(self, jid, resource=None): - """ - Find an active session that doesn't have a control attached - """ - try: - sessions = list(self.sessions[jid].values()) - - # filter out everything except the default session type - chat_sessions = [s for s in sessions if isinstance(s, - app.default_session_type)] - - orphaned = [s for s in chat_sessions if not s.control] - - if resource: - orphaned = [s for s in orphaned if s.resource == resource] - - return orphaned[0] - except (KeyError, IndexError): - return None - - def make_new_session(self, jid, thread_id=None, type_='chat', cls=None): - """ - Create and register a new session - - thread_id=None to generate one. - type_ should be 'chat' or 'pm'. - """ - if not cls: - cls = app.default_session_type - - sess = cls(self, nbxmpp.JID.from_string(jid), thread_id, type_) - - # determine if this session is a pm session - # if not, discard the resource so that all sessions are stored bare - if type_ != 'pm': - jid = app.get_jid_without_resource(jid) - - if not jid in self.sessions: - self.sessions[jid] = {} - - self.sessions[jid][sess.thread_id] = sess - - return sess - -class ConnectionHandlers(ConnectionHandlersBase): - def __init__(self): - ConnectionHandlersBase.__init__(self) - - app.nec.register_incoming_event(PresenceReceivedEvent) - app.nec.register_incoming_event(NotificationEvent) ===================================== gajim/common/zeroconf/connection_handlers_zeroconf.py ===================================== @@ -24,7 +24,6 @@ from gajim.common import app -from gajim.common import connection_handlers from gajim.common.helpers import AdditionalDataDict from gajim.common.nec import NetworkEvent from gajim.common.modules.util import get_eme_message @@ -36,10 +35,7 @@ log = logging.getLogger('gajim.c.z.connection_handlers_zeroconf') -class ConnectionHandlersZeroconf(connection_handlers.ConnectionHandlersBase): - def __init__(self): - connection_handlers.ConnectionHandlersBase.__init__(self) - +class ConnectionHandlersZeroconf: def _messageCB(self, con, stanza, properties): """ Called when we receive a message ===================================== gajim/gui_interface.py ===================================== @@ -63,8 +63,6 @@ from gajim.groupchat_control import GroupchatControl from gajim.privatechat_control import PrivateChatControl -from gajim.session import ChatControlSession - from gajim.common import idle from gajim.common.zeroconf import connection_zeroconf from gajim.common import proxy65_manager @@ -1906,7 +1904,6 @@ def __init__(self): self.handle_event_file_progress, self.handle_event_file_error) app.proxy65_manager = proxy65_manager.Proxy65Manager(app.idlequeue) - app.default_session_type = ChatControlSession # Creating Network Events Controller from gajim.common import nec ===================================== gajim/session.py deleted ===================================== @@ -1,359 +0,0 @@ -# Copyright (C) 2008-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Jonathan Schleifer <js-gajim AT webkeks.org> -# Stephan Erb <steve-e AT h3c.de> -# -# 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 string -import random -import itertools - -from gajim.common import helpers -from gajim.common import events -from gajim.common import app -from gajim.common import contacts -from gajim.common import ged -from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import KindConstant -from gajim.gui.util import get_show_in_roster -from gajim.gui.util import get_show_in_systray - - -class ChatControlSession: - def __init__(self, conn, jid, thread_id, type_='chat'): - self.conn = conn - self.jid = jid - self.type_ = type_ - self.resource = jid.resource - self.control = None - - if thread_id: - self.received_thread_id = True - self.thread_id = thread_id - else: - self.received_thread_id = False - if type_ == 'normal': - self.thread_id = None - else: - self.thread_id = self.generate_thread_id() - - self.loggable = True - - self.last_send = 0 - self.last_receive = 0 - - app.ged.register_event_handler('decrypted-message-received', - ged.PREGUI, - self._nec_decrypted_message_received) - - def generate_thread_id(self): - return ''.join( - [f(string.ascii_letters) for f in itertools.repeat( - random.choice, 32)] - ) - - def is_loggable(self): - return helpers.should_log(self.conn.name, self.jid.bare) - - def get_to(self): - bare_jid = self.jid.bare - if not self.resource: - return bare_jid - return bare_jid + '/' + self.resource - - def _nec_decrypted_message_received(self, obj): - """ - Dispatch a received <message> stanza - """ - if obj.session != self: - return - - if obj.properties.is_muc_pm: - contact = app.contacts.get_gc_contact( - self.conn.name, obj.jid, obj.resource) - else: - contact = app.contacts.get_contact( - self.conn.name, obj.jid, obj.resource) - if self.resource != obj.resource: - self.resource = obj.resource - if self.control: - if isinstance(contact, contacts.GC_Contact): - self.control.gc_contact = contact - self.control.contact = contact.as_contact() - else: - self.control.contact = contact - if self.control.resource: - self.control.change_resource(self.resource) - - if not obj.msgtxt: - return - - log_type = KindConstant.CHAT_MSG_RECV - if obj.properties.is_sent_carbon: - log_type = KindConstant.CHAT_MSG_SENT - - if self.is_loggable() and obj.msgtxt: - jid = obj.fjid - if not obj.properties.is_muc_pm: - jid = obj.jid - - obj.msg_log_id = app.storage.archive.insert_into_logs( - self.conn.name, - jid, - obj.properties.timestamp, - log_type, - message=obj.msgtxt, - subject=obj.properties.subject, - additional_data=obj.additional_data, - stanza_id=obj.unique_id, - message_id=obj.properties.id) - - if obj.properties.is_muc_pm and not obj.gc_control: - # This is a carbon of a PM from a MUC we are not currently - # joined. We log it silently without notification. - return True - - if not obj.msgtxt: # empty message text - return True - - if not self.control: - ctrl = app.interface.msg_win_mgr.search_control(obj.jid, - obj.conn.name, obj.resource) - if ctrl: - self.control = ctrl - self.control.set_session(self) - if isinstance(contact, contacts.GC_Contact): - self.control.gc_contact = contact - self.control.contact = contact.as_contact() - else: - self.control.contact = contact - - if not obj.properties.is_muc_pm: - self.roster_message2(obj) - - def roster_message2(self, obj): - """ - Display the message or show notification in the roster - """ - contact = None - jid = obj.jid - resource = obj.resource - - fjid = jid - - # Try to catch the contact with correct resource - if resource: - fjid = jid + '/' + resource - contact = app.contacts.get_contact(obj.conn.name, jid, resource) - - highest_contact = app.contacts.get_contact_with_highest_priority( - obj.conn.name, jid) - if not contact: - # If there is another resource, it may be a message from an - # invisible resource - lcontact = app.contacts.get_contacts(obj.conn.name, jid) - if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ - lcontact[0].show != 'offline')) and jid.find('@') > 0: - contact = app.contacts.copy_contact(highest_contact) - contact.resource = resource - contact.priority = 0 - contact.show = 'offline' - contact.status = '' - app.contacts.add_contact(obj.conn.name, contact) - - else: - # Default to highest prio - fjid = jid - contact = highest_contact - - if not contact: - # contact is not in roster - contact = app.interface.roster.add_to_not_in_the_roster( - obj.conn.name, jid, obj.properties.nickname) - - if not self.control: - ctrl = app.interface.msg_win_mgr.search_control(obj.jid, - obj.conn.name, obj.resource) - if ctrl: - self.control = ctrl - self.control.set_session(self) - else: - fjid = jid - - obj.popup = helpers.allow_popup_window(self.conn.name) - - event_t = events.ChatEvent - event_type = 'message_received' - - if self.control: - # We have a ChatControl open - obj.show_in_roster = False - obj.show_in_systray = False - do_event = False - elif obj.properties.is_sent_carbon: - # Its a Carbon Copied Message we sent - obj.show_in_roster = False - obj.show_in_systray = False - unread_events = app.events.get_events( - self.conn.name, fjid, types=['chat']) - read_ids = [] - for msg in unread_events: - read_ids.append(msg.msg_log_id) - app.storage.archive.set_read_messages(read_ids) - app.events.remove_events(self.conn.name, fjid, types=['chat']) - do_event = False - else: - # Everything else - obj.show_in_roster = get_show_in_roster(event_type, self) - obj.show_in_systray = get_show_in_systray(event_type, - obj.conn.name, - contact.jid) - do_event = True - if do_event: - kind = obj.properties.type.value - event = event_t( - obj.msgtxt, - obj.properties.subject, - kind, - obj.properties.timestamp, - obj.resource, - obj.msg_log_id, - correct_id=obj.correct_id, - message_id=obj.properties.id, - session=self, - displaymarking=obj.displaymarking, - sent_forwarded=obj.properties.is_sent_carbon, - show_in_roster=obj.show_in_roster, - show_in_systray=obj.show_in_systray, - additional_data=obj.additional_data) - - app.events.add_event(self.conn.name, fjid, event) - - def roster_message(self, jid, msg, tim, msg_type='', - subject=None, resource='', msg_log_id=None, user_nick='', - displaymarking=None, additional_data=None): - """ - Display the message or show notification in the roster - """ - contact = None - fjid = jid - - if additional_data is None: - additional_data = AdditionalDataDict() - - # Try to catch the contact with correct resource - if resource: - fjid = jid + '/' + resource - contact = app.contacts.get_contact(self.conn.name, jid, resource) - - highest_contact = app.contacts.get_contact_with_highest_priority( - self.conn.name, jid) - if not contact: - # If there is another resource, it may be a message from an invisible - # resource - lcontact = app.contacts.get_contacts(self.conn.name, jid) - if (len(lcontact) > 1 or (lcontact and lcontact[0].resource and \ - lcontact[0].show != 'offline')) and jid.find('@') > 0: - contact = app.contacts.copy_contact(highest_contact) - contact.resource = resource - if resource: - fjid = jid + '/' + resource - contact.priority = 0 - contact.show = 'offline' - contact.status = '' - app.contacts.add_contact(self.conn.name, contact) - - else: - # Default to highest prio - fjid = jid - contact = highest_contact - - if not contact: - # contact is not in roster - contact = app.interface.roster.add_to_not_in_the_roster( - self.conn.name, jid, user_nick) - - if not self.control: - ctrl = app.interface.msg_win_mgr.get_control(fjid, self.conn.name) - if ctrl: - self.control = ctrl - self.control.set_session(self) - else: - fjid = jid - - # Do we have a queue? - no_queue = len(app.events.get_events(self.conn.name, fjid)) == 0 - - popup = helpers.allow_popup_window(self.conn.name) - - # We print if window is opened and it's not a single message - if self.control: - typ = '' - - if msg_type == 'error': - typ = 'error' - - self.control.add_message(msg, - typ, - tim=tim, - subject=subject, - displaymarking=displaymarking, - additional_data=additional_data) - - if msg_log_id: - app.storage.archive.set_read_messages([msg_log_id]) - - return - - # We save it in a queue - event_t = events.ChatEvent - event_type = 'message_received' - - show_in_roster = get_show_in_roster(event_type, self) - show_in_systray = get_show_in_systray(event_type, - self.conn.name, - contact.jid) - - event = event_t(msg, subject, msg_type, tim, resource, - msg_log_id, session=self, - displaymarking=displaymarking, sent_forwarded=False, - show_in_roster=show_in_roster, show_in_systray=show_in_systray, - additional_data=additional_data) - - app.events.add_event(self.conn.name, fjid, event) - - if popup: - if not self.control: - self.control = app.interface.new_chat(contact, - self.conn.name, session=self) - - if app.events.get_events(self.conn.name, fjid): - self.control.read_queue() - else: - if no_queue: # We didn't have a queue: we change icons - app.interface.roster.draw_contact(jid, self.conn.name) - - app.interface.roster.show_title() # we show the * or [n] - # Select the big brother contact in roster, it's visible because it has - # events. - family = app.contacts.get_metacontacts_family(self.conn.name, jid) - if family: - _nearby_family, bb_jid, bb_account = \ - app.contacts.get_nearby_family_and_big_brother(family, - self.conn.name) - else: - bb_jid, bb_account = jid, self.conn.name - app.interface.roster.select_contact(bb_jid, bb_account) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d14ca6b072d313f0b53a1077855d7028… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d14ca6b072d313f0b53a1077855d7028… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Change Shortcut
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 03b861e4 by lovetox at 2021-04-18T13:51:19+02:00 Change Shortcut - - - - - ae227c96 by lovetox at 2021-04-18T13:57:08+02:00 Remove MessageWindow - - - - - 4 changed files: - gajim/application.py - − gajim/data/gui/message_window.ui - − gajim/message_window.py - gajim/roster_window.py Changes: ===================================== gajim/application.py ===================================== @@ -526,7 +526,6 @@ def _set_shortcuts(self): 'win.change-nickname': ['<Primary><Shift>N'], 'win.change-subject': ['<Primary><Shift>S'], 'win.escape': ['Escape'], - 'win.browse-history': ['<Primary>H'], 'win.send-file': ['<Primary>F'], 'win.show-contact-info': ['<Primary>I'], 'win.show-emoji-chooser': ['<Primary><Shift>M'], @@ -548,6 +547,7 @@ def _set_shortcuts(self): 'win.switch-tab-7': ['<Alt>7', '<Alt>KP_7'], 'win.switch-tab-8': ['<Alt>8', '<Alt>KP_8'], 'win.switch-tab-9': ['<Alt>9', '<Alt>KP_9'], + 'win.search-history': ['<Primary>H'], } for action, accels in shortcuts.items(): ===================================== gajim/data/gui/message_window.ui deleted ===================================== @@ -1,89 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkEventBox" id="chat_tab_ebox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="visible_window">False</property> - <child> - <object class="GtkBox" id="tab_hbox"> - <property name="width_request">170</property> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">4</property> - <child> - <object class="GtkImage" id="tab_image"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="tab_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">start</property> - <property name="margin_start">3</property> - <property name="use_markup">True</property> - <property name="ellipsize">end</property> - <property name="single_line_mode">True</property> - <property name="xalign">0</property> - <style> - <class name="notebook-tab-label"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButton" id="tab_close_button"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="halign">end</property> - <property name="relief">none</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">window-close</property> - <property name="icon_size">1</property> - </object> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - </object> - </child> - </object> - <object class="GtkApplicationWindow" id="message_window"> - <property name="name">MessageWindow</property> - <property name="can_focus">False</property> - <property name="default_width">480</property> - <property name="default_height">440</property> - <property name="show_menubar">False</property> - <child> - <object class="GtkNotebook" id="notebook"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="scrollable">True</property> - </object> - </child> - <child type="titlebar"> - <placeholder/> - </child> - </object> -</interface> ===================================== gajim/message_window.py deleted ===================================== @@ -1,1276 +0,0 @@ -# Copyright (C) 2003-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2005-2008 Travis Shirk <travis AT pobox.com> -# Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2006 Geobert Quach <geobert AT gmail.com> -# Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2007 Julien Pivotto <roidelapluie AT gmail.com> -# Stephan Erb <steve-e AT h3c.de> -# Copyright (C) 2008 Brendan Taylor <whateley AT gmail.com> -# Jonathan Schleifer <js-gajim AT webkeks.org> -# -# 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 logging - -from gi.repository import Gtk -from gi.repository import Gdk -from gi.repository import GObject -from gi.repository import GLib -from gi.repository import Gio - -from gajim.common import app -from gajim.common import ged -from gajim.common.i18n import Q_ -from gajim.common.i18n import _ -from gajim.common.nec import EventHelper - -from gajim import gtkgui_helpers -from gajim.chat_control_base import ChatControlBase -from gajim.chat_control import ChatControl - -from gajim.gui.dialogs import DialogButton -from gajim.gui.dialogs import ConfirmationCheckDialog -from gajim.gui.util import get_icon_name -from gajim.gui.util import resize_window -from gajim.gui.util import move_window -from gajim.gui.util import get_app_icon_list -from gajim.gui.util import get_builder -from gajim.gui.util import set_urgency_hint -from gajim.gui.util import get_app_window -from gajim.gui.const import ControlType - - -log = logging.getLogger('gajim.message_window') - - -WINDOW_TYPES = ['never', - 'always', - 'always_with_roster', - 'peracct', - 'pertype'] - - -class MessageWindow(EventHelper): - """ - Class for windows which contain message like things; chats, groupchats, etc - """ - - # DND_TARGETS is the targets needed by drag_source_set and drag_dest_set - DND_TARGETS = [('GAJIM_TAB', 0, 81)] - hid = 0 # drag_data_received handler id - ( - CLOSE_TAB_MIDDLE_CLICK, - CLOSE_ESC, - CLOSE_CLOSE_BUTTON, - CLOSE_COMMAND, - CLOSE_CTRL_KEY - ) = range(5) - - def __init__(self, acct, type_, parent_window=None, parent_paned=None): - EventHelper.__init__(self) - # A dictionary of dictionaries - # where _contacts[account][jid] == A MessageControl - self._controls = {} - - # If None, the window is not tied to any specific account - self.account = acct - # If None, the window is not tied to any specific type - self.type_ = type_ - # dict { handler id: widget}. Keeps callbacks, which - # lead to circular references - self.handlers = {} - # Don't show warning dialogs when we want to delete the window - self.dont_warn_on_delete = False - - self.widget_name = 'message_window' - self.xml = get_builder('%s.ui' % self.widget_name) - self.window = self.xml.get_object(self.widget_name) - self.window.set_application(app.app) - self.notebook = self.xml.get_object('notebook') - self.parent_paned = None - - if parent_window: - orig_window = self.window - self.window = parent_window - self.parent_paned = parent_paned - old_parent = self.notebook.get_parent() - old_parent.remove(self.notebook) - if app.settings.get('roster_on_the_right'): - child1 = self.parent_paned.get_child1() - self.parent_paned.remove(child1) - self.parent_paned.pack1(self.notebook, resize=False) - self.parent_paned.pack2(child1) - else: - self.parent_paned.pack2(self.notebook) - self.window.lookup_action('show-roster').set_enabled(True) - orig_window.destroy() - del orig_window - - # NOTE: we use 'connect_after' here because in - # MessageWindowMgr._new_window we register handler that saves window - # state when closing it, and it should be called before - # MessageWindow._on_window_delete, which manually destroys window - # through win.destroy() - this means no additional handlers for - # 'delete-event' are called. - id_ = self.window.connect_after('delete-event', self._on_window_delete) - self.handlers[id_] = self.window - id_ = self.window.connect('destroy', self._on_window_destroy) - self.handlers[id_] = self.window - id_ = self.window.connect('focus-in-event', self._on_window_focus) - self.handlers[id_] = self.window - - self._add_actions() - - # gtk+ doesn't make use of the motion notify on gtkwindow by default - # so this line adds that - self.window.add_events(Gdk.EventMask.POINTER_MOTION_MASK) - - id_ = self.notebook.connect('switch-page', - self._on_notebook_switch_page) - self.handlers[id_] = self.notebook - - # Tab customizations - pref_pos = app.settings.get('tabs_position') - if pref_pos == 'bottom': - nb_pos = Gtk.PositionType.BOTTOM - elif pref_pos == 'left': - nb_pos = Gtk.PositionType.LEFT - elif pref_pos == 'right': - nb_pos = Gtk.PositionType.RIGHT - else: - nb_pos = Gtk.PositionType.TOP - self.notebook.set_tab_pos(nb_pos) - window_mode = app.interface.msg_win_mgr.mode - if app.settings.get('tabs_always_visible') or \ - window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - self.notebook.set_show_tabs(True) - else: - self.notebook.set_show_tabs(False) - self.notebook.set_show_border(app.settings.get('tabs_border')) - self.show_icon() - - # self.register_events([ - # ('muc-disco-update', ged.GUI1, self._on_muc_disco_update), - # ]) - - def _add_actions(self): - actions = [ - 'change-nickname', - 'change-subject', - 'escape', - 'browse-history', - 'send-file', - 'show-contact-info', - 'show-emoji-chooser', - 'clear-chat', - 'delete-line', - 'close-tab', - 'move-tab-up', - 'move-tab-down', - 'switch-next-tab', - 'switch-prev-tab', - 'switch-next-unread-tab-right' - 'switch-next-unread-tab-left', - 'switch-tab-1', - 'switch-tab-2', - 'switch-tab-3', - 'switch-tab-4', - 'switch-tab-5', - 'switch-tab-6', - 'switch-tab-7', - 'switch-tab-8', - 'switch-tab-9', - ] - - disabled_for_emacs = ( - 'browse-history', - 'send-file', - 'close-tab' - ) - - key_theme = Gtk.Settings.get_default().get_property( - 'gtk-key-theme-name') - - for action in actions: - if key_theme == 'Emacs' and action in disabled_for_emacs: - continue - act = Gio.SimpleAction.new(action, None) - act.connect('activate', self._on_action) - self.window.add_action(act) - - def _on_action(self, action, _param): - control = self.get_active_control() - if not control: - # No more control in this window - return - - log.info('Activate action: %s, active control: %s', - action.get_name(), control.contact.jid) - - action = action.get_name() - - # Pass the event to the control - res = control.delegate_action(action) - if res != Gdk.EVENT_PROPAGATE: - return res - - if action == 'escape' and app.settings.get('escape_key_closes'): - self.remove_tab(control, self.CLOSE_ESC) - return - - if action == 'close-tab': - self.remove_tab(control, self.CLOSE_CTRL_KEY) - return - - if action == 'move-tab-up': - old_position = self.notebook.get_current_page() - self.notebook.reorder_child(control.widget, - old_position - 1) - return - - if action == 'move-tab-down': - old_position = self.notebook.get_current_page() - total_pages = self.notebook.get_n_pages() - if old_position == total_pages - 1: - self.notebook.reorder_child(control.widget, 0) - else: - self.notebook.reorder_child(control.widget, - old_position + 1) - return - - if action == 'switch-next-tab': - new = self.notebook.get_current_page() + 1 - if new >= self.notebook.get_n_pages(): - new = 0 - self.notebook.set_current_page(new) - return - - if action == 'switch-prev-tab': - new = self.notebook.get_current_page() - 1 - if new < 0: - new = self.notebook.get_n_pages() - 1 - self.notebook.set_current_page(new) - return - - if action == 'switch-next-unread-tab-right': - self.move_to_next_unread_tab(True) - return - - if action == 'switch-next-unread-tab-left': - self.move_to_next_unread_tab(False) - return - - if action.startswith('switch-tab-'): - number = int(action[-1]) - self.notebook.set_current_page(number - 1) - return - - def change_jid(self, account, old_jid, new_jid): - """ - Called when the full jid of the control is changed - """ - if account not in self._controls: - return - if old_jid not in self._controls[account]: - return - if old_jid == new_jid: - return - self._controls[account][new_jid] = self._controls[account][old_jid] - del self._controls[account][old_jid] - - def get_num_controls(self): - return sum(len(d) for d in self._controls.values()) - - def resize(self, width, height): - resize_window(self.window, width, height) - - def _on_muc_disco_update(self, event): - # If there is only one control in a window, - # the name is shown in the window title - if self.get_num_controls() != 1: - return - ctrl = self.get_active_control() - if ctrl.contact.jid != event.room_jid: - return - self.show_title() - - def _on_window_focus(self, widget, event): - # on destroy() the window that was last focused gets the focus - # again. if destroy() is called from the StartChat Dialog, this - # Window is not yet focused, because present() seems to be asynchronous - # at least on KDE, and takes time. - start_chat = get_app_window('StartChatDialog') - if start_chat is not None and start_chat.ready_to_destroy: - start_chat.destroy() - - # window received focus, so if we had urgency REMOVE IT - # NOTE: we do not have to read the message (it maybe in a bg tab) - # to remove urgency hint so this functions does that - set_urgency_hint(self.window, False) - - ctrl = self.get_active_control() - if ctrl: - ctrl.set_control_active(True) - # Undo "unread" state display, etc. - if ctrl.is_groupchat: - self.redraw_tab(ctrl, 'active') - else: - # NOTE: we do not send any chatstate to preserve - # inactive, gone, etc. - self.redraw_tab(ctrl) - - def _on_window_delete(self, win, event): - if self.dont_warn_on_delete: - # Destroy the window - return False - - # Number of controls that will be closed and for which we'll loose data: - # chat, pm, gc that won't go in roster - number_of_closed_control = 0 - for ctrl in self.controls(): - if not ctrl.safe_shutdown(): - number_of_closed_control += 1 - - if number_of_closed_control > 1: - def _on_yes1(checked): - if checked: - app.settings.set('confirm_close_multiple_tabs', False) - self.dont_warn_on_delete = True - for ctrl in self.controls(): - if ctrl.minimizable(): - ctrl.minimize() - win.destroy() - - if not app.settings.get('confirm_close_multiple_tabs'): - for ctrl in self.controls(): - if ctrl.minimizable(): - ctrl.minimize() - # destroy window - return False - - ConfirmationCheckDialog( - _('Close Tabs'), - _('You are about to close several tabs'), - _('Do you really want to close all of them?'), - _('_Do not ask me again'), - [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Close'), - callback=_on_yes1)], - transient_for=self.window).show() - return True - - def on_yes(ctrl): - if self.on_delete_ok == 1: - self.dont_warn_on_delete = True - win.destroy() - self.on_delete_ok -= 1 - - def on_no(ctrl): - return - - def on_minimize(ctrl): - ctrl.minimize() - if self.on_delete_ok == 1: - self.dont_warn_on_delete = True - win.destroy() - self.on_delete_ok -= 1 - - # Make sure all controls are okay with being deleted - self.on_delete_ok = self.get_nb_controls() - for ctrl in self.controls(): - ctrl.allow_shutdown(self.CLOSE_CLOSE_BUTTON, on_yes, on_no, - on_minimize) - return True # halt the delete for the moment - - def _on_window_destroy(self, win): - for ctrl in self.remove_all_controls(): - ctrl.shutdown() - self._controls.clear() - # Clean up handlers connected to the parent window, this is important since - # self.window may be the RosterWindow - for i in list(self.handlers.keys()): - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - del self.handlers[i] - del self.handlers - - self.unregister_events() - - def new_tab(self, control): - fjid = control.get_full_jid() - - if control.account not in self._controls: - self._controls[control.account] = {} - - self._controls[control.account][fjid] = control - - if self.get_num_controls() == 2: - first_widget = self.notebook.get_nth_page(0) - ctrl = self._widget_to_control(first_widget) - self.notebook.set_show_tabs(True) - ctrl.scroll_to_end() - - # Add notebook page and connect up to the tab's close button - xml = get_builder('message_window.ui', ['chat_tab_ebox']) - tab_label_box = xml.get_object('chat_tab_ebox') - widget = xml.get_object('tab_close_button') - # this reduces the size of the button -# style = Gtk.RcStyle() -# style.xthickness = 0 -# style.ythickness = 0 -# widget.modify_style(style) - - id_ = widget.connect('clicked', self._on_close_button_clicked, control) - control.handlers[id_] = widget - - id_ = tab_label_box.connect('button-press-event', - self.on_tab_eventbox_button_press_event, control.widget) - control.handlers[id_] = tab_label_box - position = self.notebook.get_current_page() + 1 - self.notebook.insert_page(control.widget, tab_label_box, position) - - self.notebook.set_tab_reorderable(control.widget, True) - - self.redraw_tab(control) - if self.parent_paned: - self.notebook.show_all() - else: - self.window.show_all() - - # NOTE: we do not call set_control_active(True) since we don't know - # whether the tab is the active one. - self.show_title() - if self.get_num_controls() == 1: - GLib.timeout_add(500, control.focus) - - def on_tab_eventbox_button_press_event(self, widget, event, child): - if event.button == 3: # right click - n = self.notebook.page_num(child) - self.notebook.set_current_page(n) - self.popup_menu(event) - elif event.button == 2: # middle click - ctrl = self._widget_to_control(child) - self.remove_tab(ctrl, self.CLOSE_TAB_MIDDLE_CLICK) - else: - ctrl = self._widget_to_control(child) - GLib.idle_add(ctrl.focus) - - def _on_close_button_clicked(self, button, control): - """ - When close button is pressed: close a tab - """ - self.remove_tab(control, self.CLOSE_CLOSE_BUTTON) - - def show_icon(self): - window_mode = app.interface.msg_win_mgr.mode - if window_mode in (MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE, - MessageWindowMgr.ONE_MSG_WINDOW_NEVER): - if self.type_ == 'gc': - icon = get_icon_name('muc-active') - self.window.set_icon_name(icon) - - def show_title(self, urgent=True, control=None): - """ - Redraw the window's title - """ - if not control: - control = self.get_active_control() - if not control: - # No more control in this window - return - unread = 0 - for ctrl in self.controls(): - if (ctrl.is_groupchat and - not ctrl.contact.can_notify() and - not ctrl.attention_flag): - # count only pm messages - unread += ctrl.get_nb_unread_pm() - continue - unread += ctrl.get_nb_unread() - - unread_str = '' - if unread > 1: - unread_str = '[' + str(unread) + '] ' - elif unread == 1: - unread_str = '* ' - else: - urgent = False - - if control.is_groupchat: - name = control.contact.get_shown_name() - urgent = (control.attention_flag or - control.contact.can_notify()) - else: - name = control.contact.get_shown_name() - if control.resource: - name += '/' + control.resource - - window_mode = app.interface.msg_win_mgr.mode - if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE: - # Show the plural form since number of tabs > 1 - if self.type_ == 'chat': - label = Q_('?Noun:Chats') - if self.get_num_controls() == 1: - label = name - elif self.type_ == 'gc': - label = _('Group Chats') - if self.get_num_controls() == 1: - label = name - else: - label = _('Private Chats') - elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - label = None - elif self.get_num_controls() == 1: - label = name - else: - label = _('Messages') - - title = 'Gajim' - if label: - title = '%s - %s' % (label, title) - - if window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERACCT: - title = title + ": " + control.account - - self.window.set_title(unread_str + title) - set_urgency_hint(self.window, urgent and unread > 0) - - def set_active_tab(self, ctrl): - ctrl_page = self.notebook.page_num(ctrl.widget) - self.notebook.set_current_page(ctrl_page) - self.window.present() - GLib.idle_add(ctrl.focus) - - def remove_tab(self, ctrl, method, reason=None, force=False): - """ - Reason is only for gc (offline status message) if force is True, do not - ask any confirmation - """ - def close(ctrl): - # Update external state - app.events.remove_events( - ctrl.account, ctrl.get_full_jid, - types=['printed_msg', 'chat', 'gc_msg']) - - fjid = ctrl.get_full_jid() - jid = app.get_jid_without_resource(fjid) - - fctrl = self.get_control(fjid, ctrl.account) - bctrl = self.get_control(jid, ctrl.account) - - # keep last_message_time around unless this was our last control with - # that jid - if not fctrl and not bctrl and \ - fjid in app.last_message_time[ctrl.account]: - del app.last_message_time[ctrl.account][fjid] - - self.notebook.remove_page(self.notebook.page_num(ctrl.widget)) - - del self._controls[ctrl.account][fjid] - - if not self._controls[ctrl.account]: - del self._controls[ctrl.account] - - if reason is not None: # We are leaving gc with a status message - ctrl.shutdown(reason) - else: # We are leaving gc without status message or it's a chat - ctrl.shutdown() - - self.check_tabs() - self.show_title() - - def on_yes(ctrl): - close(ctrl) - - def on_no(ctrl): - return - - def on_minimize(ctrl): - if method != self.CLOSE_COMMAND: - ctrl.minimize() - self.check_tabs() - return - close(ctrl) - - # Shutdown the MessageControl - if force: - close(ctrl) - else: - ctrl.allow_shutdown(method, on_yes, on_no, on_minimize) - - def check_tabs(self): - if self.parent_paned: - # Do nothing in single window mode - pass - elif self.get_num_controls() == 0: - # These are not called when the window is destroyed like this, fake it - app.interface.msg_win_mgr._on_window_delete(self.window, None) - app.interface.msg_win_mgr._on_window_destroy(self.window) - # dnd clean up - self.notebook.drag_dest_unset() - if self.parent_paned: - # Don't close parent window, just remove the child - child = self.parent_paned.get_child2() - self.parent_paned.remove(child) - self.window.lookup_action('show-roster').set_enabled(False) - else: - self.window.destroy() - return # don't show_title, we are dead - elif self.get_num_controls() == 1: # we are going from two tabs to one - window_mode = app.interface.msg_win_mgr.mode - show_tabs_if_one_tab = app.settings.get('tabs_always_visible') or \ - window_mode == MessageWindowMgr.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER - self.notebook.set_show_tabs(show_tabs_if_one_tab) - - def redraw_tab(self, ctrl, chatstate=None): - tab = self.notebook.get_tab_label(ctrl.widget) - if not tab: - return - - hbox = tab.get_children()[0] - status_img = hbox.get_children()[0] - nick_label = hbox.get_children()[1] - - # Optionally hide close button - close_button = hbox.get_children()[2] - if app.settings.get('tabs_close_button'): - close_button.show() - else: - close_button.hide() - - # Update nick - if isinstance(ctrl, ChatControl): - tab_label_str = ctrl.get_tab_label() - # Set Label Color - if app.settings.get('show_chatstate_in_tabs'): - gtkgui_helpers.add_css_class( - nick_label, chatstate, 'gajim-state-') - else: - tab_label_str, color = ctrl.get_tab_label(chatstate) - # Set Label Color - if color == 'active': - gtkgui_helpers.add_css_class(nick_label, None, 'gajim-state-') - elif color is not None: - gtkgui_helpers.add_css_class(nick_label, color, 'gajim-state-') - - nick_label.set_markup(tab_label_str) - - tab_img = ctrl.get_tab_image() - if tab_img: - if isinstance(tab_img, Gtk.Image): - if tab_img.get_storage_type() == Gtk.ImageType.ANIMATION: - status_img.set_from_animation(tab_img.get_animation()) - else: - status_img.set_from_pixbuf(tab_img.get_pixbuf()) - elif isinstance(tab_img, str): - status_img.set_from_icon_name(tab_img, Gtk.IconSize.MENU) - else: - status_img.set_from_surface(tab_img) - - self.show_icon() - - def repaint_themed_widgets(self): - """ - Repaint controls in the window with theme color - """ - # iterate through controls and repaint - for ctrl in self.controls(): - ctrl.repaint_themed_widgets() - - def _widget_to_control(self, widget): - for ctrl in self.controls(): - if ctrl.widget == widget: - return ctrl - return None - - def get_active_control(self): - notebook = self.notebook - active_widget = notebook.get_nth_page(notebook.get_current_page()) - return self._widget_to_control(active_widget) - - def get_active_contact(self): - ctrl = self.get_active_control() - if ctrl: - return ctrl.contact - return None - - def get_active_jid(self): - contact = self.get_active_contact() - if contact: - return contact.jid - return None - - def is_active(self): - return self.window.is_active() - - def get_origin(self): - return self.window.get_window().get_origin() - - def get_control(self, jid, acct): - """ - Return the MessageControl for jid - """ - try: - return self._controls[acct][jid] - except Exception: - return None - - def has_control(self, jid, acct): - return acct in self._controls and jid in self._controls[acct] - - def change_key(self, old_jid, new_jid, acct): - """ - Change the JID key of a control - """ - try: - # Check if controls exists - ctrl = self._controls[acct][old_jid] - except KeyError: - return - - if new_jid in self._controls[acct]: - self.remove_tab(self._controls[acct][new_jid], - self.CLOSE_CLOSE_BUTTON, force=True) - - self._controls[acct][new_jid] = ctrl - del self._controls[acct][old_jid] - - if old_jid in app.last_message_time[acct]: - app.last_message_time[acct][new_jid] = \ - app.last_message_time[acct][old_jid] - del app.last_message_time[acct][old_jid] - - def controls(self): - for jid_dict in list(self._controls.values()): - for ctrl in list(jid_dict.values()): - yield ctrl - - def remove_all_controls(self): - for _account, control_dict in self._controls.items(): - for contact in list(control_dict.keys()): - yield control_dict[contact] - del control_dict[contact] - - def get_nb_controls(self): - return sum(len(jid_dict) for jid_dict in self._controls.values()) - - def move_to_next_unread_tab(self, forward): - ind = self.notebook.get_current_page() - current = ind - found = False - first_composing_ind = -1 # id of first composing ctrl to switch to - # if no others controls have awaiting events - # loop until finding an unread tab or having done a complete cycle - while True: - if forward is True: # look for the first unread tab on the right - ind = ind + 1 - if ind >= self.notebook.get_n_pages(): - ind = 0 - else: # look for the first unread tab on the right - ind = ind - 1 - if ind < 0: - ind = self.notebook.get_n_pages() - 1 - - nth_child = self.notebook.get_nth_page(ind) - ctrl = self._widget_to_control(nth_child) - if ctrl.get_nb_unread() > 0: - found = True - break # found - if app.settings.get('ctrl_tab_go_to_next_composing'): - # Search for a composing contact - contact = ctrl.contact - if first_composing_ind == -1 and contact.chatstate == 'composing': - # If no composing contact found yet, check if this one is composing - first_composing_ind = ind - if ind == current: - break # a complete cycle without finding an unread tab - if found: - self.notebook.set_current_page(ind) - elif first_composing_ind != -1: - self.notebook.set_current_page(first_composing_ind) - else: # not found and nobody composing - if forward: # CTRL + TAB - if current < (self.notebook.get_n_pages() - 1): - self.notebook.next_page() - else: # traverse for ever (eg. don't stop at last tab) - self.notebook.set_current_page(0) - else: # CTRL + SHIFT + TAB - if current > 0: - self.notebook.prev_page() - else: # traverse for ever (eg. don't stop at first tab) - self.notebook.set_current_page( - self.notebook.get_n_pages() - 1) - - def popup_menu(self, event): - menu = self.get_active_control().prepare_context_menu() - if menu is None: - return - # show the menu - menu.attach_to_widget(app.interface.roster.window, None) - menu.show_all() - menu.popup(None, None, None, None, event.button, event.time) - - def _on_notebook_switch_page(self, notebook, page, page_num): - old_no = notebook.get_current_page() - if old_no >= 0: - old_ctrl = self._widget_to_control(notebook.get_nth_page(old_no)) - old_ctrl.set_control_active(False) - - new_ctrl = self._widget_to_control(notebook.get_nth_page(page_num)) - new_ctrl.set_control_active(True) - self.show_title(control=new_ctrl) - - control = self.get_active_control() - if isinstance(control, ChatControlBase): - control.focus() - - def get_tab_at_xy(self, x, y): - """ - Return the tab under xy and if its nearer from left or right side of the - tab - """ - page_num = -1 - to_right = False - horiz = self.notebook.get_tab_pos() == Gtk.PositionType.TOP or \ - self.notebook.get_tab_pos() == Gtk.PositionType.BOTTOM - for i in range(self.notebook.get_n_pages()): - page = self.notebook.get_nth_page(i) - tab = self.notebook.get_tab_label(page) - tab_alloc = tab.get_allocation() - if horiz: - if tab_alloc.x <= x <= (tab_alloc.x + tab_alloc.width): - page_num = i - if x >= tab_alloc.x + (tab_alloc.width / 2.0): - to_right = True - break - else: - if tab_alloc.y <= y <= (tab_alloc.y + tab_alloc.height): - page_num = i - - if y > tab_alloc.y + (tab_alloc.height / 2.0): - to_right = True - break - return (page_num, to_right) - - def find_page_num_according_to_tab_label(self, tab_label): - """ - Find the page num of the tab label - """ - page_num = -1 - for i in range(self.notebook.get_n_pages()): - page = self.notebook.get_nth_page(i) - tab = self.notebook.get_tab_label(page) - if tab == tab_label: - page_num = i - break - return page_num - -################################################################################ -class MessageWindowMgr(GObject.GObject): - """ - A manager and factory for MessageWindow objects - """ - - __gsignals__ = { - 'window-delete': (GObject.SignalFlags.RUN_LAST, None, (object,)), - } - - # These constants map to WINDOW_TYPES indices - ( - ONE_MSG_WINDOW_NEVER, - ONE_MSG_WINDOW_ALWAYS, - ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER, - ONE_MSG_WINDOW_PERACCT, - ONE_MSG_WINDOW_PERTYPE, - ) = range(5) - - # A key constant for the main window in ONE_MSG_WINDOW_ALWAYS mode - MAIN_WIN = 'main' - # A key constant for the main window in ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER mode - ROSTER_MAIN_WIN = 'roster' - - def __init__(self, parent_window, parent_paned): - """ - A dictionary of windows; the key depends on the config: - ONE_MSG_WINDOW_NEVER: The key is the contact JID - ONE_MSG_WINDOW_ALWAYS: The key is MessageWindowMgr.MAIN_WIN - ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: The key is MessageWindowMgr.MAIN_WIN - ONE_MSG_WINDOW_PERACCT: The key is the account name - ONE_MSG_WINDOW_PERTYPE: The key is a message type constant - """ - GObject.GObject.__init__(self) - self._windows = {} - - # Map the mode to a int constant for frequent compares - mode = app.settings.get('one_message_window') - self.mode = WINDOW_TYPES.index(mode) - - self.parent_win = parent_window - self.parent_paned = parent_paned - - Gtk.Window.set_default_icon_list(get_app_icon_list(parent_window)) - - def _new_window(self, acct, type_): - parent_win = None - parent_paned = None - if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - parent_win = self.parent_win - parent_paned = self.parent_paned - win = MessageWindow(acct, type_, parent_win, parent_paned) - # we track the lifetime of this window - win.window.connect('delete-event', self._on_window_delete) - win.window.connect('destroy', self._on_window_destroy) - return win - - def _gtk_win_to_msg_win(self, gtk_win): - for w in self.windows(): - if w.window == gtk_win: - return w - return None - - def get_window(self, jid, acct): - for win in self.windows(): - if win.has_control(jid, acct): - return win - - return None - - def has_window(self, jid, acct): - return self.get_window(jid, acct) is not None - - def one_window_opened(self, contact=None, acct=None, type_=None): - try: - return \ - self._windows[self._mode_to_key(contact, acct, type_)] is not None - except KeyError: - return False - - def _resize_window(self, win, acct, type_): - """ - Resizes window according to config settings - """ - hpaned = app.settings.get('roster_hpaned_position') - if self.mode in (self.ONE_MSG_WINDOW_ALWAYS, - self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER): - size = (app.settings.get('msgwin-width'), - app.settings.get('msgwin-height')) - if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Add the hpaned position to our message window's size - size = (hpaned + size[0], size[1]) - elif self.mode == self.ONE_MSG_WINDOW_PERACCT: - size = (app.settings.get_account_setting(acct, 'msgwin-width'), - app.settings.get_account_setting(acct, 'msgwin-height')) - elif self.mode in (self.ONE_MSG_WINDOW_NEVER, self.ONE_MSG_WINDOW_PERTYPE): - opt_width = type_ + '-msgwin-width' - opt_height = type_ + '-msgwin-height' - size = (app.settings.get(opt_width), app.settings.get(opt_height)) - else: - return - win.resize(size[0], size[1]) - if win.parent_paned: - win.parent_paned.set_position(hpaned) - - def _position_window(self, win, acct, type_): - """ - Moves window according to config settings - """ - if (self.mode in [self.ONE_MSG_WINDOW_NEVER, - self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER]): - return - - if self.mode == self.ONE_MSG_WINDOW_ALWAYS: - pos = (app.settings.get('msgwin-x-position'), - app.settings.get('msgwin-y-position')) - elif self.mode == self.ONE_MSG_WINDOW_PERACCT: - pos = (app.settings.get_account_setting(acct, 'msgwin-x-position'), - app.settings.get_account_setting(acct, 'msgwin-y-position')) - elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - pos = (app.settings.get(type_ + '-msgwin-x-position'), - app.settings.get(type_ + '-msgwin-y-position')) - else: - return - - move_window(win.window, pos[0], pos[1]) - - def _mode_to_key(self, contact, acct, type_, resource=None): - if self.mode == self.ONE_MSG_WINDOW_NEVER: - key = acct + contact.jid - if resource: - key += '/' + resource - return key - - if self.mode == self.ONE_MSG_WINDOW_ALWAYS: - return self.MAIN_WIN - - if self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - return self.ROSTER_MAIN_WIN - - if self.mode == self.ONE_MSG_WINDOW_PERACCT: - return acct - - if self.mode == self.ONE_MSG_WINDOW_PERTYPE: - return type_ - - def create_window(self, contact, acct, type_, resource=None): - type_ = str(type_) - win_acct = None - win_type = None - win_role = None # X11 window role - - win_key = self._mode_to_key(contact, acct, type_, resource) - if self.mode == self.ONE_MSG_WINDOW_PERACCT: - win_acct = acct - win_role = acct - elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - win_type = type_ - win_role = type_ - elif self.mode == self.ONE_MSG_WINDOW_NEVER: - win_type = type_ - win_role = contact.jid - elif self.mode == self.ONE_MSG_WINDOW_ALWAYS: - win_role = 'messages' - - win = None - try: - win = self._windows[win_key] - except KeyError: - win = self._new_window(win_acct, win_type) - - if win_role: - win.window.set_role(win_role) - - # Position and size window based on saved state and window mode - if not self.one_window_opened(contact, acct, type_): - if app.settings.get('msgwin-max-state'): - win.window.maximize() - else: - self._resize_window(win, acct, type_) - self._position_window(win, acct, type_) - - self._windows[win_key] = win - return win - - def change_key(self, old_jid, new_jid, acct): - win = self.get_window(old_jid, acct) - if self.mode == self.ONE_MSG_WINDOW_NEVER: - old_key = acct + old_jid - if old_jid not in self._windows: - return - new_key = acct + new_jid - self._windows[new_key] = self._windows[old_key] - del self._windows[old_key] - win.change_key(old_jid, new_jid, acct) - - def _on_window_delete(self, win, event): - self.save_state(self._gtk_win_to_msg_win(win)) - app.interface.save_config() - return False - - def _on_window_destroy(self, win): - for k in list(self._windows.keys()): - if self._windows[k].window == win: - self.emit('window-delete', self._windows[k]) - del self._windows[k] - return - - def get_control(self, jid, acct): - """ - Amongst all windows, return the MessageControl for jid - """ - win = self.get_window(jid, acct) - if win: - return win.get_control(jid, acct) - return None - - def search_control(self, jid, account, resource=None): - """ - Search windows with this policy: - 1. try to find already opened tab for resource - 2. find the tab for this jid with ctrl.resource not set - 3. there is none - """ - fjid = jid - if resource: - fjid += '/' + resource - ctrl = self.get_control(fjid, account) - if ctrl: - return ctrl - win = self.get_window(jid, account) - if win: - ctrl = win.get_control(jid, account) - if not ctrl.resource and not ctrl.is_groupchat: - return ctrl - return None - - def get_gc_control(self, jid, acct): - """ - Same as get_control. Was briefly required, is not any more. May be useful - some day in the future? - """ - ctrl = self.get_control(jid, acct) - if ctrl and ctrl.is_groupchat: - return ctrl - return None - - def get_controls(self, type_=None, acct=None): - ctrls = [] - for c in self.controls(): - if acct and c.account != acct: - continue - if not type_ or c.type == type_: - ctrls.append(c) - return ctrls - - def windows(self): - for w in list(self._windows.values()): - yield w - - def controls(self): - for w in self._windows.values(): - for c in w.controls(): - yield c - - def shutdown(self, width_adjust=0): - for w in self.windows(): - self.save_state(w, width_adjust) - if not w.parent_paned: - w.window.hide() - w.window.destroy() - - app.interface.save_config() - - def save_state(self, msg_win, width_adjust=0): - # Save window size and position - max_win_key = 'msgwin-max-state' - pos_x_key = 'msgwin-x-position' - pos_y_key = 'msgwin-y-position' - size_width_key = 'msgwin-width' - size_height_key = 'msgwin-height' - - acct = None - x, y = msg_win.window.get_position() - width, height = msg_win.window.get_size() - - # If any of these values seem bogus don't update. - if x < 0 or y < 0 or width < 0 or height < 0: - return - - if self.mode == self.ONE_MSG_WINDOW_PERACCT: - acct = msg_win.account - elif self.mode == self.ONE_MSG_WINDOW_PERTYPE: - type_ = msg_win.type_ - pos_x_key = type_ + '-msgwin-x-position' - pos_y_key = type_ + '-msgwin-y-position' - size_width_key = type_ + '-msgwin-width' - size_height_key = type_ + '-msgwin-height' - elif self.mode == self.ONE_MSG_WINDOW_NEVER: - type_ = msg_win.type_ - size_width_key = type_ + '-msgwin-width' - size_height_key = type_ + '-msgwin-height' - elif self.mode == self.ONE_MSG_WINDOW_ALWAYS_WITH_ROSTER: - # Ignore hpaned separator's width and calculate width ourselves - win_width = msg_win.window.get_allocation().width - hpaned_position = app.settings.get('roster_hpaned_position') - width = win_width - hpaned_position - - if acct: - app.settings.set_account_setting(acct, size_width_key, width) - app.settings.set_account_setting(acct, size_height_key, height) - - if self.mode != self.ONE_MSG_WINDOW_NEVER: - app.settings.set_account_setting(acct, pos_x_key, x) - app.settings.set_account_setting(acct, pos_y_key, y) - - else: - win_maximized = msg_win.window.get_window().get_state() == \ - Gdk.WindowState.MAXIMIZED - app.settings.set(max_win_key, win_maximized) - width += width_adjust - app.settings.set(size_width_key, width) - app.settings.set(size_height_key, height) - - if self.mode != self.ONE_MSG_WINDOW_NEVER: - app.settings.set(pos_x_key, x) - app.settings.set(pos_y_key, y) - - def reconfig(self): - for w in self.windows(): - self.save_state(w) - - mode = app.settings.get('one_message_window') - if self.mode == WINDOW_TYPES.index(mode): - # No change - return - self.mode = WINDOW_TYPES.index(mode) - - controls = [] - for w in self.windows(): - # Note, we are taking care not to hide/delete the roster window when the - # MessageWindow is embedded. - if not w.parent_paned: - w.window.hide() - else: - # Stash current size so it can be restored if the MessageWindow - # is not longer embedded - roster_width = w.parent_paned.get_position() - app.settings.set('roster_width', roster_width) - - while w.notebook.get_n_pages(): - page = w.notebook.get_nth_page(0) - ctrl = w._widget_to_control(page) - w.notebook.remove_page(0) - page.unparent() - controls.append(ctrl) - - # Must clear _controls to prevent MessageControl.shutdown calls - w._controls = {} - if not w.parent_paned: - w.window.destroy() - else: - # Don't close parent window, just remove the child - child = w.parent_paned.get_child2() - w.parent_paned.remove(child) - self.parent_win.lookup_action('show-roster').set_enabled(False) - resize_window(w.window, - app.settings.get('roster_width'), - app.settings.get('roster_height')) - - self._windows = {} - - for ctrl in controls: - mw = self.get_window(ctrl.contact.jid, ctrl.account) - if not mw: - mw = self.create_window(ctrl.contact, ctrl.account, ctrl.type) - ctrl.parent_win = mw - ctrl.add_actions() - ctrl.update_actions() - mw.new_tab(ctrl) - - def save_opened_controls(self): - if not app.settings.get('remember_opened_chat_controls'): - return - chat_controls = {} - for acct in app.connections: - chat_controls[acct] = [] - for ctrl in self.get_controls(type_=ControlType.CHAT): - acct = ctrl.account - if ctrl.contact.jid not in chat_controls[acct]: - chat_controls[acct].append(ctrl.contact.jid) - for acct in app.connections: - app.settings.set_account_setting(acct, - 'opened_chat_controls', - ','.join(chat_controls[acct])) ===================================== gajim/roster_window.py ===================================== @@ -59,7 +59,6 @@ from gajim.common.dbus import location from gajim.common import ged -from gajim.message_window import MessageWindowMgr from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58b4764d2ad5e0c6a5c7ad32c90d85b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/58b4764d2ad5e0c6a5c7ad32c90d85b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: QuoteWidget: Add styling
by Daniel Brötzmann 17 Apr '21

17 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7591ff17 by wurstsalat at 2021-04-17T11:26:35+02:00 QuoteWidget: Add styling - - - - - 8c631b02 by wurstsalat at 2021-04-17T23:48:13+02:00 PlainWidget: Strip text - - - - - 58b4764d by wurstsalat at 2021-04-18T00:35:20+02:00 Add SearchView - - - - - 11 changed files: - gajim/chat_control_base.py - gajim/common/storage/archive.py - gajim/data/gui/main.ui - + gajim/data/gui/search_view.ui - gajim/data/style/gajim.css - gajim/gtk/conversation/plain_widget.py - gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/view.py - gajim/gtk/main.py - + gajim/gtk/search_view.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -174,6 +174,7 @@ def __init__(self, parent_win, widget_name, jid, acct, self._scrolled_view = ScrolledView() self._scrolled_view.add(self.conversation_view) + self._scrolled_view.set_focus_vadjustment(Gtk.Adjustment()) self.xml.textview_box.add(self._scrolled_view) self.xml.textview_box.reorder_child(self._scrolled_view, 2) self._scrolled_view.connect('request-history', @@ -1144,6 +1145,7 @@ def add_message(self, 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) @@ -1391,6 +1393,25 @@ def set_control_active(self, state): def scroll_to_end(self, force=False): self.conversation_view.scroll_to_end(force) + def scroll_to_message(self, log_line_id, timestamp): + row = self.conversation_view.get_row_by_log_line_id(log_line_id) + if row is None: + first_row = self.conversation_view.get_first_message_row() + if first_row is None: + first_timestamp = time.time() + else: + first_timestamp = first_row.db_timestamp + messages = app.storage.archive.get_conversation_between( + self.account, self.contact.jid, first_timestamp, timestamp) + if not messages: + return + + self.add_messages(messages) + + GLib.idle_add( + self.conversation_view.scroll_to_message_and_highlight, + log_line_id) + def fetch_n_lines_history(self, _scrolled, n_lines): row = self.conversation_view.get_first_message_row() if row is None: @@ -1415,6 +1436,9 @@ def fetch_n_lines_history(self, _scrolled, n_lines): self._scrolled_view.set_history_complete(True) return + self.add_messages(messages) + + def add_messages(self, messages): for msg in messages: if not msg: continue @@ -1440,6 +1464,7 @@ def fetch_n_lines_history(self, _scrolled, n_lines): 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) ===================================== gajim/common/storage/archive.py ===================================== @@ -208,6 +208,9 @@ def _get_jid_ids_from_db(self): self._jid_ids[row.jid] = row self._jid_ids_reversed[row.jid_id] = row + def get_jid_from_id(self, jid_id): + return self._jid_ids_reversed[jid_id] + def get_jids_in_db(self): return self._jid_ids.keys() @@ -418,6 +421,40 @@ def get_last_conversation_line(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone() + @timeit + def get_conversation_between(self, account, jid, before, after): + """ + Load all lines of conversation with jid between two timestamps + + :param account: The account + + :param jid: The jid for which we request the conversation + + :param before: latest timestamp + + :param after: earliest timestamp + + returns a list of namedtuples + """ + jids = self._get_family_jids(account, jid) + account_id = self.get_account_id(account) + + sql = ''' + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id, message_id, + error as "error [common_error]", + marker as "marker [marker]" + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND time < ? AND time >= ? + ORDER BY time DESC, log_line_id DESC + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + + return self._con.execute( + sql, + tuple(jids) + (before, after)).fetchall() + @timeit def get_messages_for_date(self, account, jid, date): """ @@ -477,6 +514,9 @@ def search_log(self, account, jid, query, date=None): """ jids = self._get_family_jids(account, jid) + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + if date: delta = datetime.timedelta( hours=23, minutes=59, seconds=59, microseconds=999999) @@ -491,12 +531,36 @@ def search_log(self, account, jid, query, date=None): additional_data, log_line_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND message LIKE like(?) {date_search} + AND kind NOT IN ({kinds}) ORDER BY time DESC, log_line_id '''.format(jids=', '.join('?' * len(jids)), - date_search=between if date else '') + date_search=between if date else '', + kinds=', '.join(kinds)) return self._con.execute(sql, tuple(jids) + (query,)).fetchall() + @timeit + def search_all_logs(self, query): + """ + Search all conversation logs for messages containing the `query` + string. + + :param query: A search string + + returns a list of namedtuples + """ + kinds = map(str, [KindConstant.STATUS, + KindConstant.GCSTATUS]) + sql = ''' + SELECT account_id, jid_id, contact_name, time, kind, show, message, + subject, additional_data, log_line_id + FROM logs WHERE message LIKE like(?) + AND kind NOT IN ({kinds}) + ORDER BY time DESC, log_line_id + '''.format(kinds=', '.join(kinds)) + + return self._con.execute(sql, (query,)).fetchall() + @timeit def get_days_with_logs(self, account, jid, year, month): """ ===================================== gajim/data/gui/main.ui ===================================== @@ -141,7 +141,7 @@ <property name="position">250</property> <property name="position-set">True</property> <child> -  +  <object class="GtkGrid" id="middle_grid"> <property name="visible">True</property> <property name="can-focus">False</property> @@ -287,27 +287,6 @@ <property name="top-attach">1</property> </packing> </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> <style> <class name="middle-grid"/> </style> @@ -318,38 +297,26 @@ </packing> </child> <child> -  +  <object class="GtkGrid" id="right_grid"> <property name="visible">True</property> <property name="can-focus">False</property> <property name="hexpand">True</property> <property name="vexpand">True</property> <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> - </child> - <child> - <placeholder/> + <object class="GtkOverlay" id="right_grid_overlay"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="vexpand">True</property> + <child> + <placeholder/> + </child> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + </packing> </child> </object> <packing> ===================================== gajim/data/gui/search_view.ui ===================================== @@ -0,0 +1,289 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="header_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="spacing">6</property> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="header_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="ellipsize">end</property> + <property name="max-width-chars">15</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="header_date_label"> + <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">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <style> + <class name="search-view-header"/> + </style> + </object> +  + <object class="GtkGrid" id="result_row_grid"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="row-spacing">3</property> + <property name="column-spacing">12</property> + <child> + <object class="GtkImage" id="row_avatar"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">start</property> + </object> + <packing> + <property name="left-attach">0</property> + <property name="top-attach">0</property> + <property name="height">2</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="row_time_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">end</property> + <property name="single-line-mode">True</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="left-attach">2</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="row_name_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">start</property> + <property name="ellipsize">end</property> + <property name="single-line-mode">True</property> + <style> + <class name="bold"/> + </style> + </object> + <packing> + <property name="left-attach">1</property> + <property name="top-attach">0</property> + </packing> + </child> + <child> + <placeholder/> + </child> + <child> + <placeholder/> + </child> + <style> + <class name="search-view-row-grid"/> + </style> + </object> + <object class="GtkBox" id="search_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="hexpand">True</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="spacing">12</property> + <child type="center"> + <object class="GtkLabel"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="label" translatable="yes">Search</property> + <style> + <class name="bold16"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkButton"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="tooltip-text" translatable="yes">Close Search</property> + <property name="relief">none</property> + <signal name="clicked" handler="_on_hide_clicked" swapped="no"/> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">window-close-symbolic</property> + </object> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkSearchEntry" id="search_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="halign">center</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <signal name="activate" handler="_on_search" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="search_checkbutton"> + <property name="label" translatable="yes">Search everywhere</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="halign">center</property> + <property name="active">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkSeparator"> + <property name="visible">True</property> + <property name="can-focus">False</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkScrolledWindow"> + <property name="visible">True</property> + <property name="can-focus">True</property> + <child> + <object class="GtkViewport"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <child> + <object class="GtkListBox" id="results_listbox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="selection-mode">none</property> + <signal name="row-activated" handler="_on_row_activated" swapped="no"/> + <child type="placeholder"> + <object class="GtkBox" id="placeholder"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="valign">center</property> + <property name="orientation">vertical</property> + <property name="spacing">12</property> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">system-search-symbolic</property> + <property name="icon_size">6</property> + <style> + <class name="dim-label"/> + </style> + </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">No results</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + </object> + </child> + </object> + </child> + </object> + </child> + </object> + <packing> + <property name="expand">True</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <style> + <class name="search-view"/> + </style> + </object> +</interface> ===================================== gajim/data/style/gajim.css ===================================== @@ -59,8 +59,15 @@ .conversation-mention-highlight { background-color: rgb(255, 215, 194); } +@keyframes highlight { + from { background: rgb(194, 215, 255) } + to { background: transparent } +} .conversation-search-highlight { - background-color: rgb(194, 215, 255); + animation-duration: 3s; + animation-timing-function: ease-out; + animation-iteration-count: 1; + animation-name: highlight; } .conversation-system-row { padding: 18px; @@ -303,6 +310,33 @@ padding: 0px 18px 6px 18px; } +/* Seach view */ +.search-view { + padding: 12px; + border-left: 1px solid @borders; + background-color: @theme_base_color; +} +.search-view-row-grid textview { + background: transparent; +} +.search-view-row-grid textview text { + background: transparent; +} +.search-view-row-grid label { + font-size: small; +} +.search-view-counter label { + font-style: italic; + color: @insensitive_fg_color; +} +.search-view-header { + padding: 12px 6px 6px 6px; +} +.search-view-header label { + font-size: small; + color: @insensitive_fg_color; +} + /* Profile window */ #NicknameEntry:disabled { font-size: 28px; @@ -711,7 +745,15 @@ popover.combo scrollbar.vertical { messagedialog.confirmation-dialog > box { margin-top: 18px; } - +.conversation-quote { + padding-bottom: 6px; +} +.conversation-quote textview text { + color: alpha(@theme_text_color, 0.6); +} +.conversation-quote-bar { + background-color: @unfocused_borders; +} .conversation-more-button { padding-top: 0px; padding-bottom:0px; ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -125,7 +125,7 @@ def get_text(self): def print_text_with_styling(self, block): buffer_ = self.get_buffer() - buffer_.insert(buffer_.get_start_iter(), block.text) + buffer_.insert(buffer_.get_start_iter(), block.text.strip()) for span in block.spans: start_iter = buffer_.get_iter_at_offset(span.start) ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -18,8 +18,14 @@ class QuoteWidget(Gtk.Box): def __init__(self, account): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + Gtk.Box.__init__(self) self.set_vexpand(True) + self.get_style_context().add_class('conversation-quote') + quote_bar = Gtk.Box() + quote_bar.set_size_request(3, -1) + quote_bar.set_margin_right(6) + quote_bar.get_style_context().add_class('conversation-quote-bar') + self.add(quote_bar) self._account = account ===================================== gajim/gtk/conversation/view.py ===================================== @@ -316,6 +316,20 @@ def reduce_message_count(self): return successful + def scroll_to_message_and_highlight(self, log_line_id): + highlight_row = None + for row in self.get_children(): + row.get_style_context().remove_class( + 'conversation-search-highlight') + if row.log_line_id == log_line_id: + highlight_row = row + + if highlight_row is not None: + highlight_row.get_style_context().add_class( + 'conversation-search-highlight') + # This scrolls the ListBox to the highlighted row + highlight_row.grab_focus() + def _get_row_by_message_id(self, id_): return self._message_id_row_map.get(id_) ===================================== gajim/gtk/main.py ===================================== @@ -13,6 +13,7 @@ from gajim.gui.account_page import AccountPage from gajim.gui.adhoc import AdHocCommand +from gajim.gui.search_view import SearchView from gajim.gui.chat_list_stack import ChatListStack from gajim.gui.chat_stack import ChatStack from gajim.gui.account_side_bar import AccountSideBar @@ -57,9 +58,20 @@ def __init__(self): self._ui.app_image.set_from_surface(surface) self._chat_stack = ChatStack() - self._ui.right_grid.add(self._chat_stack) + self._ui.right_grid_overlay.add(self._chat_stack) + + self._search_view = SearchView() + self._search_view.connect('hide-search', self._on_search_hide) + + self._search_revealer = Gtk.Revealer() + self._search_revealer.set_reveal_child(True) + self._search_revealer.set_halign(Gtk.Align.END) + self._search_revealer.set_no_show_all(True) + self._search_revealer.add(self._search_view) + self._ui.right_grid_overlay.add_overlay(self._search_revealer) self._chat_list_stack = ChatListStack(self, self._ui, self._chat_stack) + self._chat_list_stack.connect('chat-selected', self._on_chat_selected) self._ui.chat_list_scrolled.add(self._chat_list_stack) self._workspace_side_bar = WorkspaceSideBar(self._chat_list_stack) @@ -138,6 +150,7 @@ def _add_actions(self): ('toggle-chat-pinned', 'as', self._toggle_chat_pinned), ('move-chat-to-workspace', 'as', self._move_chat_to_workspace), ('add-to-roster', 'as', self._add_to_roster), + ('search-history', None, self._on_search_history), ] for action in actions: @@ -207,6 +220,10 @@ def _on_action(self, action, _param): if res != Gdk.EVENT_PROPAGATE: return res + if action == 'escape': + if self._search_revealer.get_reveal_child(): + self._search_revealer.hide() + # if action == 'escape' and app.settings.get('escape_key_closes'): # self.remove_tab(control, self.CLOSE_ESC) # return @@ -559,6 +576,22 @@ def _load_chats(self): def _on_start_chat_clicked(_button): app.app.activate_action('start-chat', GLib.Variant('s', '')) + def _on_chat_selected(self, _chat_list_stack, _workspace_id, *args): + control = self.get_active_control() + if control is not None: + self._search_view.set_context(control.account, control.contact.jid) + + def _on_search_history(self, _action, _param): + control = self.get_active_control() + if control is not None: + self._search_view.set_context(control.account, control.contact.jid) + self._search_view.clear() + self._search_revealer.show() + self._search_view.set_focus() + + def _on_search_hide(self, *args): + self._search_revealer.hide() + def _on_event(self, event): if event.name == 'caps-update': #TODO ===================================== gajim/gtk/search_view.py ===================================== @@ -0,0 +1,253 @@ +# 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 logging +import time + +from gi.repository import Gdk +from gi.repository import GObject +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.const import KindConstant +from gajim.common.i18n import _ +from gajim.common.styling import process + +from .conversation.message_widget import MessageWidget +from .util import get_builder + +log = logging.getLogger('gajim.gui.search_view') + + +class SearchView(Gtk.Box): + + __gsignals__ = { + 'hide-search': ( + GObject.SignalFlags.RUN_FIRST, + None, + ()), + } + + def __init__(self): + Gtk.Box.__init__(self) + self.set_size_request(300, -1) + + self._account = None + self._jid = None + + self._ui = get_builder('search_view.ui') + self._ui.results_listbox.set_header_func(self._header_func) + self.add(self._ui.search_box) + + self._ui.connect_signals(self) + self.connect('key-press-event', self._on_key_press) + self.show_all() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.emit('hide-search') + + @staticmethod + def _header_func(row, before): + if before is None: + if row.type == 'counter': + row.set_header(None) + else: + row.set_header(RowHeader(row.account, row.jid, row.time)) + else: + date1 = time.strftime('%x', time.localtime(row.time)) + date2 = time.strftime('%x', time.localtime(before.time)) + if before.jid != row.jid: + row.set_header(RowHeader(row.account, row.jid, row.time)) + elif date1 != date2: + row.set_header(RowHeader(row.account, row.jid, row.time)) + else: + row.set_header(None) + + def _on_hide_clicked(self, _button): + self.emit('hide-search') + + def clear(self): + self._ui.search_entry.set_text('') + self._clear_results() + + def _clear_results(self): + for row in self._ui.results_listbox.get_children(): + self._ui.results_listbox.remove(row) + + def _on_search(self, entry): + self._clear_results() + text = entry.get_text() + if text == '': + return + + accounts = self._get_accounts() + everywhere = self._ui.search_checkbutton.get_active() + context = self._account is not None and self._jid is not None + + if not context or everywhere: + # Global search + results = app.storage.archive.search_all_logs(text) + results_count = len(results) + if results_count: + self._ui.results_listbox.add(CounterRow(results_count)) + for msg in results: + result_row = ResultRow( + msg, + accounts.get(msg.account_id), + app.storage.archive.get_jid_from_id(msg.jid_id).jid) + self._ui.results_listbox.add(result_row) + else: + results = app.storage.archive.search_log( + self._account, self._jid, text) + results_count = len(results) + if results_count: + self._ui.results_listbox.add(CounterRow(results_count)) + for msg in results: + result_row = ResultRow(msg, self._account, self._jid) + self._ui.results_listbox.add(result_row) + + @staticmethod + def _get_accounts(): + accounts = {} + for account in app.settings.get_accounts(): + account_id = app.storage.archive.get_account_id(account) + accounts[account_id] = account + return accounts + + @staticmethod + def _on_row_activated(_listbox, row): + if row.type == 'counter': + return + + control = app.window.get_active_control() + if control is not None: + if control.contact.jid == row.jid: + control.scroll_to_message(row.log_line_id, row.timestamp) + return + + # Wrong chat or no control opened + # TODO: type 'pm' is KindConstant.CHAT_MSG_RECV, too + app.window.add_chat(row.account, row.jid, row.type, select=True) + control = app.window.get_active_control() + control.scroll_to_message(row.log_line_id, row.timestamp) + + def set_focus(self): + self._ui.search_entry.grab_focus() + + def set_context(self, account, jid): + self._account = account + self._jid = jid + self._ui.search_checkbutton.set_active(False) + + +class RowHeader(Gtk.Box): + def __init__(self, account, jid, timestamp): + Gtk.Box.__init__(self) + self.set_hexpand(True) + + self._ui = get_builder('search_view.ui') + self.add(self._ui.header_box) + + client = app.get_client(account) + contact = client.get_module('Contacts').get_contact(jid) + self._ui.header_name_label.set_text(contact.name or '') + + local_time = time.localtime(timestamp) + date = time.strftime('%x', local_time) + self._ui.header_date_label.set_text(date) + + self.show_all() + + +class CounterRow(Gtk.ListBoxRow): + def __init__(self, count): + Gtk.ListBoxRow.__init__(self) + self.type = 'counter' + self.jid = '' + self.time = 0 + self.get_style_context().add_class('search-view-counter') + + if count == 1: + counter_text = _('1 result') + else: + counter_text = _('%s results') % count + label = Gtk.Label(label=counter_text) + self.add(label) + self.show_all() + + +class ResultRow(Gtk.ListBoxRow): + def __init__(self, msg, account, jid): + Gtk.ListBoxRow.__init__(self) + self.account = account + self.jid = 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 + + self.type = 'contact' + if msg.kind == KindConstant.GC_MSG: + self.type = 'groupchat' + + self._ui = get_builder('search_view.ui') + self.add(self._ui.result_row_grid) + + kind = 'status' + contact_name = msg.contact_name + if msg.kind in ( + KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): + kind = 'incoming' + contact_name = self.contact.name + elif msg.kind == KindConstant.GC_MSG: + kind = 'incoming' + elif msg.kind in ( + KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): + kind = 'outgoing' + contact_name = app.nicks[account] + self._ui.row_name_label.set_text(contact_name) + + avatar = self._get_avatar(kind, contact_name) + self._ui.row_avatar.set_from_surface(avatar) + + local_time = time.localtime(msg.time) + date = time.strftime('%H:%M', local_time) + self._ui.row_time_label.set_label(date) + + 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) + + self.show_all() + + def _get_avatar(self, kind, name): + scale = self.get_scale_factor() + if self.contact.is_groupchat: + contact = self.contact.get_resource(name) + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + + if kind == 'outgoing': + contact = self._client.get_module('Contacts').get_contact( + str(self._client.get_own_jid().bare)) + else: + contact = self.contact + + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) ===================================== gajim/gui_menu_builder.py ===================================== @@ -525,6 +525,7 @@ def get_singlechat_menu(control_id, account, jid, type_): ('win.start-call-', _('Start Call…')), ('win.information-', _('Information')), ('app.browse-history', _('History')), + ('win.search-history', _('Search…')), ] def build_chatstate_menu(): @@ -549,7 +550,11 @@ def build_menu(preset): if action_name == 'win.send-marker-' and type_ == 'pm': continue - if action_name == 'app.browse-history': + if action_name == 'win.search-history': + menuitem = Gio.MenuItem.new(label, action_name) + menuitem.set_action_and_target_value(action_name, None) + menu.append_item(menuitem) + elif action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), 'jid': GLib.Variant('s', str(jid))} @@ -586,6 +591,7 @@ def get_groupchat_menu(control_id, account, jid): ('win.request-voice-', _('Request Voice')), ('win.execute-command-', _('Execute Command…')), ('app.browse-history', _('History')), + ('win.search-history', _('Search…')), ] def build_menu(preset): @@ -593,7 +599,12 @@ def build_menu(preset): for item in preset: if isinstance(item[1], str): action_name, label = item - if action_name == 'app.browse-history': + if action_name == 'win.search-history': + menuitem = Gio.MenuItem.new(label, action_name) + menuitem.set_action_and_target_value(action_name, None) + menu.append_item(menuitem) + + elif action_name == 'app.browse-history': menuitem = Gio.MenuItem.new(label, action_name) dict_ = {'account': GLib.Variant('s', account), 'jid': GLib.Variant('s', jid)} View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d07283dab924d9c300f94d44dba671c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d07283dab924d9c300f94d44dba671c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Info message
by Philipp Hörist 13 Apr '21

13 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d07283da by lovetox at 2021-04-13T23:46:08+02:00 Fix Info message - - - - - 1 changed file: - gajim/gtk/conversation/rows/info.py Changes: ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -19,8 +19,10 @@ 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): @@ -56,12 +58,9 @@ def __init__(self, timestamp_widget.set_valign(Gtk.Align.START) self.grid.attach(timestamp_widget, 2, 0, 1, 1) - self.textview.set_justification(Gtk.Justification.CENTER) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - graphics=graphics) + result = process(text) + message_widget = MessageWidget(account) + message_widget.add_content(result.blocks) - self.grid.attach(self.textview, 1, 0, 1, 1) + self.grid.attach(message_widget, 1, 0, 1, 1) self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d07283dab924d9c300f94d44dba671c9… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d07283dab924d9c300f94d44dba671c9… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Prevent readmarker from showing until called
by Philipp Hörist 13 Apr '21

13 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 9a2e6506 by lovetox at 2021-04-13T23:37:03+02:00 Prevent readmarker from showing until called - - - - - 2c38a4d3 by lovetox at 2021-04-13T23:37:03+02:00 Rework Message Row - Add Styling - - - - - 14 changed files: - gajim/chat_control_base.py - + gajim/common/styling.py - + gajim/gtk/conversation/code_widget.py - + gajim/gtk/conversation/message_widget.py - + gajim/gtk/conversation/plain_widget.py - + gajim/gtk/conversation/quote_widget.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/view.py - + test/no_gui/test_styling.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -54,7 +54,6 @@ from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog from gajim.gui.message_input import MessageInputTextView -from gajim.gui.util import at_the_end from gajim.gui.util import get_hardware_key_codes from gajim.gui.util import get_builder from gajim.gui.util import generate_account_badge ===================================== gajim/common/styling.py ===================================== @@ -0,0 +1,337 @@ +import string +import re +from dataclasses import dataclass +from dataclasses import field + +PRE = '`' +STRONG = '*' +STRIKE = '~' +EMPH = '_' + +QUOTE = '> ' +PRE_TEXT = '```' + +WHITESPACE = set(string.whitespace) +BLOCK_DIRS = set([QUOTE, PRE_TEXT]) +SPAN_DIRS = set([PRE, STRONG, STRIKE, EMPH]) +VALID_SPAN_START = WHITESPACE | SPAN_DIRS + +SD = 0 +SD_POS = 1 + +PRE_RX = r'(?P<pre>^```.+?(^```$(.|\Z)))' +PRE_NESTED_RX = r'(?P<pre>^```.+?((^```$(.|\Z))|\Z))' +QUOTE_RX = r'(?P<quote>^(?=>).*?(^|\Z)(?!>))' + +BLOCK_RX = re.compile(PRE_RX + '|' + QUOTE_RX, re.S | re.M) +BLOCK_NESTED_RX = re.compile(PRE_NESTED_RX + '|' + QUOTE_RX, re.S | re.M) +UNQUOTE_RX = re.compile(r'^> |^>', re.M) + +URI_RX = r'((?P<protocol>[\w-]+://?|www[.])[\S()<>]+?(?=[,]?(\s|\Z)+))' +URI_RX = re.compile(URI_RX) + +ADDRESS_RX = r'(\b(?P<protocol>(xmpp|mailto)+:)?[\w-]*@(.*?\.)+[\w]+([\?].*?(?=([\s\),]|$)))?)' +ADDRESS_RX = re.compile(ADDRESS_RX) + + +@dataclass +class StyleObject: + start: int + end: int + text: str + + +@dataclass +class Uri(StyleObject): + name: str = field(default='uri', init=False) + + +@dataclass +class Address(StyleObject): + name: str = field(default='address', init=False) + + +@dataclass +class XMPPAddress(StyleObject): + name: str = field(default='xmppadr', init=False) + + +@dataclass +class MailAddress(StyleObject): + name: str = field(default='mailadr', init=False) + + +@dataclass +class Block(StyleObject): + + @classmethod + def from_match(cls, match): + return cls(start=match.start(), + end=match.end(), + text=str(match.group(cls.name))) + + +@dataclass +class PlainBlock(Block): + name: str = field(default='plain', init=False) + spans: list = field(default_factory=list) + uris: list = field(default_factory=list) + + +@dataclass +class PreBlock(Block): + name: str = field(default='pre', init=False) + + +@dataclass +class QuoteBlock(Block): + name: str = field(default='quote', init=False) + blocks: list = field(default_factory=list) + + def unquote(self): + return UNQUOTE_RX.sub('', self.text) + + +@dataclass +class PlainSpan(StyleObject): + name: str = field(default='plain', init=False) + + +@dataclass +class StrongSpan(StyleObject): + name: str = field(default='strong', init=False) + + +@dataclass +class EmphasisSpan(StyleObject): + name: str = field(default='emphasis', init=False) + + +@dataclass +class PreTextSpan(StyleObject): + name: str = field(default='pre', init=False) + + +@dataclass +class StrikeSpan(StyleObject): + name: str = field(default='strike', init=False) + + +SPAN_CLS_DICT = { + STRONG: StrongSpan, + EMPH: EmphasisSpan, + PRE: PreTextSpan, + STRIKE: StrikeSpan +} + + +@dataclass +class ParsingResult: + blocks: list + + +def process(text, nested=False): + blocks = _parse_blocks(text, nested) + for block in blocks: + if isinstance(block, PlainBlock): + offset = block.start + for line in block.text.splitlines(keepends=True): + block.spans += _parse_line(line, offset) + block.uris += _parse_uris(line, offset) + offset += len(line) + + if isinstance(block, QuoteBlock): + result = process(block.unquote(), nested=True) + block.blocks = result.blocks + + return ParsingResult(blocks) + + +def _parse_blocks(text, nested): + blocks = [] + text_len = len(text) + last_end_pos = 0 + + rx = BLOCK_NESTED_RX if nested else BLOCK_RX + + for match in rx.finditer(text): + if match.start() != last_end_pos: + blocks.append(PlainBlock(start=last_end_pos, + end=match.start(), + text=text[last_end_pos:match.start()])) + + last_end_pos = match.end() + group_dict = match.groupdict() + + if group_dict.get('quote') is not None: + blocks.append(QuoteBlock.from_match(match)) + + if group_dict.get('pre') is not None: + blocks.append(PreBlock.from_match(match)) + + if last_end_pos != text_len: + blocks.append(PlainBlock(start=last_end_pos, + end=text_len, + text=text[last_end_pos:])) + return blocks + + +def _parse_line(line, offset): + index = 0 + length = len(line) + stack = [] + spans = [] + + while index < length: + sd = line[index] + if sd not in SPAN_DIRS: + index += 1 + continue + + is_valid_start = _is_valid_span_start(line, index) + is_valid_end = _is_valid_span_end(line, index) + + if is_valid_start and is_valid_end: + # Favor end over new start, this means parsing is done non-greedy + if sd in [open_sd for open_sd, _ in stack]: + is_valid_start = False + + if is_valid_start: + if sd == PRE: + index = _handle_pre_span(line, index, offset, spans) + continue + + stack.append((sd, index)) + index += 1 + continue + + if is_valid_end: + if sd not in [open_sd for open_sd, _ in stack]: + index += 1 + continue + + if _is_span_empty(sd, index, stack): + stack.pop() + index += 1 + continue + + start_pos = _find_span_start_position(sd, stack) + spans.append(_make_span(line, sd, start_pos, index, offset)) + + index += 1 + + return spans + + +def _parse_uris(line, offset): + uris = [] + for match in URI_RX.finditer(line): + uri = _make_uri(line, match.start(), match.end(), offset) + uris.append(uri) + + for match in ADDRESS_RX.finditer(line): + uri = _make_address(line, match.start(), match.end(), offset) + uris.append(uri) + + return uris + + +def _handle_pre_span(line, index, offset, spans): + # Scan ahead for the end + end = line.find(PRE, index + 1) + if end == -1: + return index + 1 + + if end - index == 1: + # empty span + return index + 1 + + spans.append(_make_span(line, PRE, index, end, offset)) + return end + 1 + + +def _make_span(line, sd, start, end, offset): + text = line[start:end + 1] + start += offset + end += offset + 1 + span_class = SPAN_CLS_DICT.get(sd) + return span_class(start=start, end=end, text=text) + + +def _make_uri(line, start, end, offset): + text = line[start:end] + start += offset + end += offset + return Uri(start=start, end=end, text=text) + + +def _make_address(line, start, end, offset): + text = line[start:end] + start += offset + end += offset + + if text.startswith('xmpp'): + return XMPPAddress(start=start, end=end, text=text) + + if text.startswith('mailto'): + return MailAddress(start=start, end=end, text=text) + + return Address(start=start, end=end, text=text) + + +def _is_span_empty(sd, index, stack): + start_sd = stack[-1][SD] + if start_sd != sd: + return False + + pos = stack[-1][SD_POS] + return pos == index - 1 + + +def _find_span_start_position(sd, stack): + while stack: + start_sd, pos = stack.pop() + if start_sd == sd: + return pos + + raise ValueError('Unable to find opening span') + + +def _is_valid_span_start(line, index): + ''' + https://xmpp.org/extensions/xep-0393.html#span + + ... The opening styling directive MUST be located at the beginning + of the line, after a whitespace character, or after a different opening + styling directive. The opening styling directive MUST NOT be followed + by a whitespace character ... + ''' + + try: + char = line[index + 1] + except IndexError: + return False + + if char in WHITESPACE: + return False + + if index == 0: + return True + + char = line[index - 1] + return char in VALID_SPAN_START + + +def _is_valid_span_end(line, index): + ''' + https://xmpp.org/extensions/xep-0393.html#span + + ... and the closing styling directive MUST NOT be preceeded + by a whitespace character ... + ''' + + if index == 0: + return False + + char = line[index - 1] + return char not in WHITESPACE ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -0,0 +1,59 @@ +# 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 gi +gi.require_version('GtkSource', '4') +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import GtkSource + + +class CodeWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._textview = CodeTextview() + # self._scrolled = Gtk.ScrolledWindow() + # self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, + # Gtk.PolicyType.AUTOMATIC) + # self._scrolled.set_hexpand(True) + # self._scrolled.set_vexpand(True) + # self._scrolled.set_propagate_natural_height(True) + # self._scrolled.set_max_content_height(400) + # self._scrolled.add(self._textview) + + self.add(self._textview) + + def add_content(self, block): + self._textview.print_code(block) + + +class CodeTextview(GtkSource.View): + def __init__(self): + GtkSource.View.__init__(self) + self.set_editable(False) + self.set_cursor_visible(False) + self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + + self._source_manager = GtkSource.LanguageManager.get_default() + + def print_code(self, block): + buffer_ = self.get_buffer() + lang = self._source_manager.get_language('python3') + buffer_.set_language(lang) + self.set_show_line_numbers(True) + buffer_.insert(buffer_.get_start_iter(), block.text) ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -0,0 +1,47 @@ +# 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 .code_widget import CodeWidget +from .quote_widget import QuoteWidget +from .plain_widget import PlainWidget + + +class MessageWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self._account = account + + def add_content(self, blocks): + for block in blocks: + if block.name == 'plain': + widget = PlainWidget(self._account) + widget.add_content(block) + self.add(widget) + continue + + if block.name == 'pre': + widget = CodeWidget(self._account) + widget.add_content(block) + self.add(widget) + continue + + if block.name == 'quote': + message_widget = MessageWidget(self._account) + message_widget.add_content(block.blocks) + widget = QuoteWidget(self._account) + widget.attach_message_widget(message_widget) + self.add(widget) + continue ===================================== gajim/gtk/conversation/plain_widget.py ===================================== @@ -0,0 +1,335 @@ +# 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 urllib.parse import quote + +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango +from gi.repository import Gdk +from gi.repository import GLib + +from gajim.common import app +from gajim.common import i18n +from gajim.common.const import StyleAttr +from gajim.common.helpers import open_uri +from gajim.common.helpers import reduce_chars_newlines +from gajim.common.helpers import parse_uri +from gajim.common.i18n import _ + +from .util import get_cursor + + +URI_TAGS = ['uri', 'address', 'xmppadr', 'mailadr'] +STYLE_TAGS = ['strong', 'emphasis', 'strike', 'pre'] + + +class PlainWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._textview = MessageTextview(self._account) + self.add(self._textview) + + def add_content(self, block): + self._textview.print_text_with_styling(block) + + +class MessageTextview(Gtk.TextView): + + __gsignals__ = { + 'quote': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ), + } + + def __init__(self, account): + Gtk.TextView.__init__(self) + self.set_hexpand(True) + self.set_margin_start(0) + self.set_margin_end(0) + self.set_border_width(0) + self.set_left_margin(0) + self.set_right_margin(0) + self.set_has_tooltip(True) + self.set_editable(False) + self.set_cursor_visible(False) + self.set_wrap_mode(Gtk.WrapMode.WORD_CHAR) + + self.connect('query-tooltip', self._query_tooltip) + self.connect('button-press-event', self._on_button_press) + self.connect('populate-popup', self._on_populate_popup) + + self._account = account + + # Used for changing the mouse pointer when hovering clickable URIs + self._cursor_changed = False + + # Keeps text selections for quoting and search actions + self._selected_text = '' + + self.get_style_context().add_class('gajim-conversation-font') + + # Create Tags + self._create_url_tags() + self.get_buffer().create_tag('strong', weight=Pango.Weight.BOLD) + self.get_buffer().create_tag('emphasis', style=Pango.Style.ITALIC) + self.get_buffer().create_tag('strike', strikethrough=True) + self.get_buffer().create_tag('pre', family='monospace') + + self.connect('destroy', self._on_destroy) + + def _on_destroy(self, *args): + pass + + def _create_url_tags(self): + color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + for name in URI_TAGS: + tag = self.get_buffer().create_tag(name, + foreground=color, + underline=Pango.Underline.SINGLE) + tag.connect('event', self._on_uri_clicked, tag) + + def update_tags(self): + tag_table = self.get_buffer().get_tag_table() + color = app.css_config.get_value('.gajim-url', StyleAttr.COLOR) + + for tag in URI_TAGS: + tag_table.lookup(tag).set_property('foreground', color) + + def clear(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + buffer_.delete(start, end) + + def get_text(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def print_text_with_styling(self, block): + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), block.text) + + for span in block.spans: + start_iter = buffer_.get_iter_at_offset(span.start) + end_iter = buffer_.get_iter_at_offset(span.end) + buffer_.apply_tag_by_name(span.name, start_iter, end_iter) + + for uri in block.uris: + start_iter = buffer_.get_iter_at_offset(uri.start) + end_iter = buffer_.get_iter_at_offset(uri.end) + buffer_.apply_tag_by_name(uri.name, start_iter, end_iter) + + def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + window = widget.get_window(Gtk.TextWindowType.TEXT) + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, x_pos, y_pos) + + iter_ = self.get_iter_at_position(x_pos, y_pos)[1] + for tag in iter_.get_tags(): + tag_name = tag.get_property('name') + if getattr(tag, 'is_anchor', False): + text = getattr(tag, 'title', False) + if text: + if len(text) > 50: + text = reduce_chars_newlines(text, 47, 1) + tooltip.set_text(text) + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return True + if tag_name in URI_TAGS: + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return False + + if self._cursor_changed: + window.set_cursor(get_cursor('text')) + self._cursor_changed = False + return False + + def _on_button_press(self, _widget, event): + ''' + We don’t open the standard context menu when receiving + a click on tagged text. + If it’s untagged text, check if something is selected + ''' + self._selected_text = '' + + if event.button != 3: + # If it’s not a right click + return False + + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, + int(event.x), + int(event.y)) + iter_ = self.get_iter_at_location(x_pos, y_pos) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() + + if tags: + # A tagged text fragment has been clicked + for tag in tags: + tag_name = tag.get_property('name') + if tag_name in URI_TAGS: + # Block regular context menu + return True + + # Check if there is a selection and make it available for + # _on_populate_popup + buffer_ = self.get_buffer() + return_val = buffer_.get_selection_bounds() + if return_val: + # Something has been selected, get the text + start_sel, finish_sel = return_val[0], return_val[1] + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + elif iter_.get_char() and ord(iter_.get_char()) > 31: + # Clicked on a word, take whole word for selection + start_sel = iter_.copy() + if not start_sel.starts_word(): + start_sel.backward_word_start() + finish_sel = iter_.copy() + if not finish_sel.ends_word(): + finish_sel.forward_word_end() + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + return False + + def _on_populate_popup(self, _textview, menu): + ''' + Overrides the default context menu. + If text is selected, a submenu with actions on the selection is added. + (see _on_button_press) + ''' + if not self._selected_text: + menu.show_all() + return + + if not self._history_mode: + item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) + id_ = item.connect('activate', self._on_quote) + self.handlers[id_] = item + menu.prepend(item) + + selected_text_short = reduce_chars_newlines( + self._selected_text, 25, 2) + item = Gtk.MenuItem.new_with_mnemonic( + _('_Actions for "%s"') % selected_text_short) + menu.prepend(item) + submenu = Gtk.Menu() + item.set_submenu(submenu) + uri_text = quote(self._selected_text.encode('utf-8')) + + if app.settings.get('always_english_wikipedia'): + uri = (f'https://en.wikipedia.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wikipedia.org/' + f'wiki/Special:Search?search={uri_text}') + item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic( + _('Look it up in _Dictionary')) + dict_link = app.settings.get('dictionary_url') + if dict_link == 'WIKTIONARY': + # Default is wikitionary.org + if app.settings.get('always_english_wiktionary'): + uri = (f'https://en.wiktionary.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wiktionary.org/' + f'wiki/Special:Search?search={uri_text}') + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + else: + if dict_link.find('%s') == -1: + # There has to be a '%s' in the url if it’s not WIKTIONARY + item = Gtk.MenuItem.new_with_label( + _('Dictionary URL is missing a "%s"')) + item.set_sensitive(False) + else: + uri = dict_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + search_link = app.settings.get('search_engine') + if search_link.find('%s') == -1: + # There has to be a '%s' in the url + item = Gtk.MenuItem.new_with_label( + _('Web Search URL is missing a "%s"')) + item.set_sensitive(False) + else: + item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) + uri = search_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + menu.show_all() + + def _on_uri_clicked(self, texttag, _widget, event, iter_, _kind): + if event.type != Gdk.EventType.BUTTON_PRESS: + return Gdk.EVENT_PROPAGATE + + begin_iter = iter_.copy() + # we get the beginning of the tag + while not begin_iter.starts_tag(texttag): + begin_iter.backward_char() + end_iter = iter_.copy() + # we get the end of the tag + while not end_iter.ends_tag(texttag): + end_iter.forward_char() + + # Detect XHTML-IM link + word = getattr(texttag, 'href', None) + if not word: + word = self.get_buffer().get_text(begin_iter, end_iter, True) + + uri = parse_uri(word) + if event.button.button == 3: # right click + self.show_context_menu(uri) + return Gdk.EVENT_STOP + + # self.plugin_modified = False + # app.plugin_manager.extension_point( + # 'hyperlink_handler', uri, self, self.get_toplevel()) + # if self.plugin_modified: + # return Gdk.EVENT_STOP + + open_uri(uri, account=self._account) + return Gdk.EVENT_STOP + + def _on_quote(self, _widget): + self.emit('quote', self._selected_text) + + @staticmethod + def _visit_uri(_widget, uri): + open_uri(uri) ===================================== gajim/gtk/conversation/quote_widget.py ===================================== @@ -0,0 +1,33 @@ +# 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 + + +class QuoteWidget(Gtk.Box): + def __init__(self, account): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) + self.set_vexpand(True) + + self._account = account + + self._message_widget = None + + def attach_message_widget(self, message_widget): + # Purpose of this method is to prevent circular imports + if self._message_widget is not None: + raise ValueError('QuoteWidget already has a MessageWidget attached') + self._message_widget = message_widget + self.add(message_widget) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -30,7 +30,7 @@ class BaseRow(Gtk.ListBoxRow): - def __init__(self, account, widget='label', history_mode=False): + def __init__(self, account, widget=None, history_mode=False): Gtk.ListBoxRow.__init__(self) self.type = '' self.timestamp = None @@ -46,18 +46,12 @@ def __init__(self, account, widget='label', history_mode=False): self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) self.add(self.grid) - if widget == 'textview': - self.label = None - self.textview = ConversationTextview( - account, history_mode=history_mode) - else: - self.textview = None + if widget == 'label': self.label = Gtk.Label() self.label.set_selectable(True) self.label.set_line_wrap(True) self.label.set_xalign(0) - self.label.set_line_wrap_mode( - Pango.WrapMode.WORD_CHAR) + self.label.set_line_wrap_mode(Pango.WrapMode.WORD_CHAR) @property def is_merged(self): ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -20,7 +20,7 @@ class DateRow(BaseRow): def __init__(self, account, timestamp): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.set_selectable(False) self.set_activatable(False) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -33,8 +33,7 @@ def __init__(self, subject, graphics, history_mode=False): - BaseRow.__init__(self, account, widget='textview', - history_mode=history_mode) + BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'info' self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -24,11 +24,13 @@ from gajim.common.const import TRUST_SYMBOL_DATA from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string +from gajim.common.styling import process from gajim.common.i18n import _ from gajim.common.i18n import Q_ from .base import BaseRow from .base import MoreMenuButton +from ..message_widget import MessageWidget from ...util import format_fingerprint @@ -60,8 +62,7 @@ def __init__(self, # other_tags_for_time were always empty? - BaseRow.__init__(self, account, widget='textview', - history_mode=history_mode) + BaseRow.__init__(self, account, history_mode=history_mode) self.type = 'chat' self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp @@ -80,13 +81,9 @@ def __init__(self, self.get_style_context().add_class( 'conversation-mention-highlight') - self.textview.connect('quote', self._on_quote_selection) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - name=name, - additional_data=additional_data) + result = process(text) + message_widget = MessageWidget(account) + message_widget.add_content(result.blocks) self._meta_box = Gtk.Box(spacing=6) self._meta_box.pack_start( @@ -132,7 +129,7 @@ def __init__(self, avatar_placeholder.add(self._avatar_surface) bottom_box = Gtk.Box(spacing=6) - bottom_box.add(self.textview) + bottom_box.add(message_widget) bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -23,7 +23,7 @@ class ReadMarkerRow(BaseRow): def __init__(self, account, contact): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) @@ -34,6 +34,7 @@ def __init__(self, account, contact): self.label.get_style_context().add_class( 'conversation-read-marker') self.grid.attach(self.label, 0, 0, 1, 1) + self.set_no_show_all(True) def set_timestamp(self, timestamp): self.timestamp = timestamp ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -23,7 +23,7 @@ class ScrollHintRow(BaseRow): def __init__(self, account, history_mode=False): - BaseRow.__init__(self, account) + BaseRow.__init__(self, account, widget='label') self.set_selectable(False) self.set_activatable(False) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -210,6 +210,7 @@ def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): start_of_day = get_start_of_day(timestamp) ===================================== test/no_gui/test_styling.py ===================================== @@ -0,0 +1,352 @@ +import unittest + +import gajim.common.styling as styling +from gajim.common.styling import PlainBlock +from gajim.common.styling import PreBlock +from gajim.common.styling import QuoteBlock +from gajim.common.styling import PreTextSpan +from gajim.common.styling import StrongSpan +from gajim.common.styling import EmphasisSpan +from gajim.common.styling import StrikeSpan +from gajim.common.styling import Url +from gajim.common.styling import URL_RX +from gajim.common.styling import ADDRESS_RX + + +STYLING = { + 'pre cannot have children': { + 'input': '_no pre `with *children*`_', + 'tokens': [ + PlainBlock(start=0, end=26, text='_no pre `with *children*`_', spans=[ + PreTextSpan(start=8, end=25, text='`with *children*`'), + EmphasisSpan(start=0, end=26, text='_no pre `with *children*`_') + ]) + ] + }, + + 'nested spans': { + 'input': '_*~children~*_', + 'tokens': [ + PlainBlock(start=0, end=14, text='_*~children~*_', spans=[ + StrikeSpan(start=2, end=12, text='~children~'), + StrongSpan(start=1, end=13, text='*~children~*'), + EmphasisSpan(start=0, end=14, text='_*~children~*_'), + ]) + ] + }, + + 'spans': { + 'input': '*strong* _emph_~strike~ `pre`', + 'tokens': [ + PlainBlock(start=0, end=30, text='*strong* _emph_~strike~ `pre`', spans=[ + StrongSpan(start=0, end=8, text='*strong*'), + EmphasisSpan(start=9, end=15, text='_emph_'), + StrikeSpan(start=15, end=23, text='~strike~'), + PreTextSpan(start=25, end=30, text='`pre`') + ]) + ] + }, + + 'spans lazily match': { + 'input': '*strong*plain*', + 'tokens': [ + PlainBlock(start=0, end=14, text='*strong*plain*', spans=[ + StrongSpan(start=0, end=8, text='*strong*') + ]) + ] + }, + + 'start span only': { + 'input': '*not strong', + 'tokens': [ + PlainBlock(start=0, end=11, text='*not strong', spans=[]) + ] + }, + + 'end span only': { + 'input': 'not strong*', + 'tokens': [ + PlainBlock(start=0, end=11, text='not strong*', spans=[]) + ] + }, + + 'invalid end span': { + 'input': '*not *strong', + 'tokens': [ + PlainBlock(start=0, end=12, text='*not *strong', spans=[]) + ] + }, + + 'empty span': { + 'input': '**', + 'tokens': [ + PlainBlock(start=0, end=2, text='**', spans=[]) + ] + }, + + '3 unmatched directives': { + 'input': '***', + 'tokens': [ + PlainBlock(start=0, end=3, text='***', spans=[]) + ] + }, + + '4 unmatched directives': { + 'input': '****', + 'tokens': [ + PlainBlock(start=0, end=4, text='****', spans=[]) + ] + }, + + 'invalid diretives ignored': { + 'input': '* plain *strong*', + 'tokens': [ + PlainBlock(start=0, end=16, text='* plain *strong*', spans=[ + StrongSpan(start=8, end=16, text='*strong*') + ]) + ] + }, + + 'uneven start directives': { + 'input': '*this is *uneven*', + 'tokens': [ + PlainBlock(start=0, end=17, text='*this is *uneven*', spans=[ + StrongSpan(start=9, end=17, text='*uneven*') + ]) + ] + }, + + 'overlapping directives': { + 'input': '*this cannot _overlap*_', + 'tokens': [ + PlainBlock(start=0, end=23, text='*this cannot _overlap*_', spans=[ + StrongSpan(start=0, end=22, text='*this cannot _overlap*') + ]) + ] + }, + + 'plain blocks': { + 'input': 'one\nand two', + 'tokens': [ + PlainBlock(start=0, end=11, text='one\nand two', spans=[]) + ] + }, + + 'pre block with closing': { + 'input': '```\npre *fmt* ```\n```\nplain', + 'tokens': [ + PreBlock(start=0, end=22, text='```\npre *fmt* ```\n```\n', spans=[]), + PlainBlock(start=22, end=27, text='plain', spans=[]) + ] + }, + + 'pre block EOF': { + 'input': '````\na\n```', + 'tokens': [ + PreBlock(start=0, end=10, text='````\na\n```', spans=[]) + ] + }, + + 'pre block no terminator EOF': { + 'input': '```\na```', + 'tokens': [ + PlainBlock(start=0, end=8, text='```\na```', spans=[]) + ] + }, + + 'pre block no body EOF': { + 'input': '```newtoken\n', + 'tokens': [ + PlainBlock(start=0, end=12, text='```newtoken\n', spans=[]) + ] + }, + + 'single level block quote': { + 'input': '> quoted\nnot quoted', + 'tokens': [ + QuoteBlock(start=0, end=10, text='> quoted\n', spans=[], blocks=[ + PlainBlock(start=0, end=8, text=' quoted\n', spans=[]) + ]), + PlainBlock(start=10, end=20, text='not quoted', spans=[]) + ] + }, + + 'multi level block quote': { + 'input': '> quoted\n>> quote > 2\n>quote 1\n\nnot quoted', + 'tokens': [ + QuoteBlock(start=0, end=34, text='> quoted\n>> quote > 2\n>quote 1\n', spans=[], blocks=[ + PlainBlock(start=0, end=8, text=' quoted\n', spans=[]), + QuoteBlock(start=8, end=22, text='> quote > 2\n', spans=[], blocks=[ + PlainBlock(start=0, end=12, text=' quote > 2\n', spans=[]) + ]), + PlainBlock(start=22, end=30, text='quote 1\n', spans=[]) + ]), + PlainBlock(start=34, end=45, text='\nnot quoted', spans=[]) + ] + }, + + 'quote start then EOF': { + 'input': '> ', + 'tokens': [ + QuoteBlock(start=0, end=2, text='> ', spans=[], blocks=[]) + ] + }, + + 'quote with children': { + 'input': '> ```\n> pre\n> ```\n> not pre', + 'tokens': [ + QuoteBlock(start=0, end=27, text='> ```\n> pre\n> ```\n> not pre', spans=[], blocks=[ + PreBlock(start=0, end=12, text='```\npre\n```\n', spans=[]), + PlainBlock(start=12, end=19, text='not pre', spans=[]) + ]) + ] + }, + + 'pre end of parent': { + 'input': '> ``` \n> pre\nplain', + 'tokens': [ + QuoteBlock(start=0, end=13, text='> ``` \n> pre\n', spans=[], blocks=[ + PreBlock(start=0, end=9, text='``` \npre\n', spans=[]) + ]), + PlainBlock(start=13, end=18, text='plain', spans=[]) + ] + }, + + 'span lines': { + 'input': '*not \n strong*', + 'tokens': [ + PlainBlock(start=0, end=14, text='*not \n strong*', spans=[]) + ] + }, + + 'plain with uri': { + 'input': 'some kind of link http://foo.com/blah_blah', + 'tokens': [ + PlainBlock(start=0, end=42, text='some kind of link http://foo.com/blah_blah', spans=[], uris=[ + Url(start=18, end=42, text='http://foo.com/blah_blah') + ]) + ] + }, + + 'plain with uri don’t consider comma': { + 'input': 'some kind of link http://foo.com/blah_blah,', + 'tokens': [ + PlainBlock(start=0, end=43, text='some kind of link http://foo.com/blah_blah,', spans=[], uris=[ + Url(start=18, end=42, text='http://foo.com/blah_blah') + ]) + ] + }, + + 'plain with uri and styling': { + 'input': 'some *kind* of link http://foo.com/blah_blah', + 'tokens': [ + PlainBlock(start=0, end=44, text='some *kind* of link http://foo.com/blah_blah', spans=[ + StrongSpan(start=5, end=11, text='*kind*') + ], uris=[ + Url(start=20, end=44, text='http://foo.com/blah_blah') + ]) + ] + }, + +} + + +URLS = [ + 'http://foo.com/blah_blah', + 'http://foo.com/blah_blah/', + 'http://foo.com/blah_blah_(wikipedia)', + 'http://foo.com/blah_blah_(wikipedia)_(again)', + 'http://www.example.com/wpstyle/?p=364', + 'https://www.example.com/foo/?bar=baz&inga=42&quux', + 'http://✪df.ws/123', + 'http://userid:password@example.com:8080', + 'http://userid:password@example.com:8080/', + 'http://userid@example.com', + 'http://userid@example.com/', + 'http://userid@example.com:8080', + 'http://userid@example.com:8080/', + 'http://userid:password@example.com', + 'http://userid:password@example.com/', + 'http://142.42.1.1/', + 'http://142.42.1.1:8080/', + 'http://➡.ws/䨹', + 'http://⌘.ws', + 'http://⌘.ws/', + 'http://foo.com/blah_(wikipedia)#cite-1', + 'http://foo.com/blah_(wikipedia)_blah#cite-1', + 'http://foo.com/unicode_(✪)_in_parens', + 'http://foo.com/(something)?after=parens', + 'http://☺.damowmow.com/', + 'http://code.google.com/events/#&product=browser', + 'http://j.mp', + 'ftp://foo.bar/baz', + 'http://foo.bar/?q=Test%20URL-encoded%20stuff', + 'http://مثال.إختبار', + 'http://例子.测试', + 'http://उदाहरण.परीक्षा', + 'http://-.~_!$&\'()*+,;=:%40:80%2f::::::@example.com', + 'http://1337.net', + 'http://a.b-c.de', + 'http://223.255.255.254', + 'https://foo_bar.example.com/', +] + + +EMAILS = [ + 'asd(a)asd.at', + 'asd(a)asd.asd.at', +] + + +URL_WITH_TEXT = [ + ('see this http://userid@example.com/ link', 'http://userid@example.com/'), + ('see this http://userid@example.com/, and ..', 'http://userid@example.com/'), +] + +XMPP_URIS = [ + ('see xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message ...', 'xmpp:romeo@montague.net?message;subject=Test%20Message;body=Here%27s%20a%20test%20message'), +] + + +class Test(unittest.TestCase): + def test_styling(self): + for _name, params in STYLING.items(): + result = styling.process(params['input']) + self.assertTrue(result.blocks == params['tokens']) + + def test_urls(self): + for url in URLS: + match = URL_RX.search(url) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(url[start:end] == url) + + def test_emails(self): + for email in EMAILS: + match = ADDRESS_RX.search(email) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(email[start:end] == email) + + def test_url_with_text(self): + for text, result in URL_WITH_TEXT: + match = URL_RX.search(text) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(text[start:end] == result) + + def test_xmpp_uris(self): + for text, result in XMPP_URIS: + match = ADDRESS_RX.search(text) + self.assertIsNotNone(match) + start = match.start() + end = match.end() + self.assertTrue(text[start:end] == result) + + + +if __name__ == "__main__": + unittest.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b56b0da6ca78c27eb9a925534efc089… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b56b0da6ca78c27eb9a925534efc089… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Windows: Fix appveyor build
by Philipp Hörist 09 Apr '21

09 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 1691af57 by lovetox at 2021-04-09T20:00:19+02:00 Windows: Fix appveyor build - - - - - 1 changed file: - appveyor.yml Changes: ===================================== appveyor.yml ===================================== @@ -24,6 +24,7 @@ install: - bash -lc "pacman --needed --noconfirm -Syu" # This is needed because without killing all processes -Su will fail - ps: Get-Process | Where-Object {$_.path -like 'C:\msys64*'} | Stop-Process + - bash -lc "pacman -Sydd --noconfirm filesystem" - bash -lc "pacman --needed --noconfirm -Su" build_script: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1691af5715585bf1be96b6c0e77f0ecc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1691af5715585bf1be96b6c0e77f0ecc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: GTK Tests: Use ConversationView for XHTML test
by Daniel Brötzmann 04 Apr '21

04 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f821fecc by wurstsalat at 2021-04-05T00:01:38+02:00 GTK Tests: Use ConversationView for XHTML test - - - - - b56b0da6 by wurstsalat at 2021-04-05T00:03:49+02:00 Remove obsolete conversation_textview.py - - - - - 5 changed files: - − gajim/conversation_textview.py - gajim/gtk/conversation/view.py - gajim/gtk/conversation_textview.py - gajim/gtk/htmltextview.py - test/gtk/htmltextview.py Changes: ===================================== gajim/conversation_textview.py deleted ===================================== @@ -1,1297 +0,0 @@ -# Copyright (C) 2005 Norman Rasmussen <norman AT rasmussen.co.za> -# Copyright (C) 2005-2006 Alex Mauer <hawke AT hawkesnest.net> -# Travis Shirk <travis AT pobox.com> -# Copyright (C) 2005-2007 Nikos Kouremenos <kourem AT gmail.com> -# Copyright (C) 2005-2014 Yann Leboulanger <asterix AT lagaule.org> -# Copyright (C) 2006 Dimitur Kirov <dkirov AT gmail.com> -# Copyright (C) 2006-2008 Jean-Marie Traissard <jim AT lapin.org> -# Copyright (C) 2008 Jonathan Schleifer <js-gajim AT webkeks.org> -# Julien Pivotto <roidelapluie AT gmail.com> -# Stephan Erb <steve-e AT h3c.de> -# -# 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 -import queue -import urllib -import logging - -from gi.repository import Gtk -from gi.repository import Pango -from gi.repository import GObject -from gi.repository import GLib -from gi.repository import Gdk - -from gajim.common import app -from gajim.common import helpers -from gajim.common import i18n -from gajim.common.i18n import _ -from gajim.common.i18n import Q_ -from gajim.common.helpers import AdditionalDataDict -from gajim.common.const import StyleAttr -from gajim.common.const import Trust -from gajim.common.const import URI_SCHEMES -from gajim.common.helpers import to_user_string -from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX -from gajim.common.regex import BASIC_REGEX -from gajim.common.regex import LINK_REGEX -from gajim.common.regex import EMOT_AND_BASIC_REGEX -from gajim.common.regex import EMOT_AND_LINK_REGEX - -from gajim.gui import util -from gajim.gui.util import get_cursor -from gajim.gui.util import format_fingerprint -from gajim.gui.util import text_to_color -from gajim.gui.emoji_data import emoji_pixbufs -from gajim.gui.emoji_data import is_emoji -from gajim.gui.emoji_data import get_emoji_pixbuf -from gajim.gui.htmltextview import HtmlTextView - -NOT_SHOWN = 0 -ALREADY_RECEIVED = 1 -SHOWN = 2 - -log = logging.getLogger('gajim.conversation_textview') - -TRUST_SYMBOL_DATA = { - Trust.UNTRUSTED: ('dialog-error-symbolic', - _('Untrusted'), - 'error-color'), - Trust.UNDECIDED: ('security-low-symbolic', - _('Trust Not Decided'), - 'warning-color'), - Trust.BLIND: ('security-medium-symbolic', - _('Unverified'), - 'encrypted-color'), - Trust.VERIFIED: ('security-high-symbolic', - _('Verified'), - 'encrypted-color') -} - - -class ConversationTextview(GObject.GObject): - """ - Class for the conversation textview (where user reads already said messages) - for chat/groupchat windows - """ - __gsignals__ = dict(quote=( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, # return value - (str, ) # arguments - )) - - def __init__(self, account, used_in_history_window=False): - """ - If used_in_history_window is True, then we do not show Clear menuitem in - context menu - """ - GObject.GObject.__init__(self) - self.used_in_history_window = used_in_history_window - self.line = 0 - self._message_list = [] - self.corrected_text_list = {} - - # no need to inherit TextView, use it as attribute is safer - self.tv = HtmlTextView(account) - self.tv.connect('query-tooltip', self._query_tooltip) - - self._buffer = self.tv.get_buffer() - self.handlers = {} - self.image_cache = {} - # self.last_sent_message_id = message_id - self.last_sent_message_id = None - # last_received_message_id[name] = (message_id, line_start_mark) - self.last_received_message_id = {} - self.autoscroll = True - # connect signals - id_ = self.tv.connect('populate_popup', self.on_textview_populate_popup) - self.handlers[id_] = self.tv - id_ = self.tv.connect('button_press_event', - self.on_textview_button_press_event) - self.handlers[id_] = self.tv - - self.account = account - self._cursor_changed = False - self.last_time_printout = 0 - self.encryption_enabled = False - - style = self.tv.get_style_context() - style.add_class('gajim-conversation-font') - buffer_ = self.tv.get_buffer() - end_iter = buffer_.get_end_iter() - buffer_.create_mark('end', end_iter, False) - - self.tagIn = buffer_.create_tag('incoming') - color = app.css_config.get_value( - '.gajim-incoming-nickname', StyleAttr.COLOR) - self.tagIn.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-nickname') - self.tagIn.set_property('font-desc', desc) - - self.tagOut = buffer_.create_tag('outgoing') - color = app.css_config.get_value( - '.gajim-outgoing-nickname', StyleAttr.COLOR) - self.tagOut.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-nickname') - self.tagOut.set_property('font-desc', desc) - - self.tagStatus = buffer_.create_tag('status') - color = app.css_config.get_value( - '.gajim-status-message', StyleAttr.COLOR) - self.tagStatus.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-status-message') - self.tagStatus.set_property('font-desc', desc) - - self.tagInText = buffer_.create_tag('incomingtxt') - color = app.css_config.get_value( - '.gajim-incoming-message-text', StyleAttr.COLOR) - if color: - self.tagInText.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-incoming-message-text') - self.tagInText.set_property('font-desc', desc) - - self.tagOutText = buffer_.create_tag('outgoingtxt') - color = app.css_config.get_value( - '.gajim-outgoing-message-text', StyleAttr.COLOR) - if color: - self.tagOutText.set_property('foreground', color) - desc = app.css_config.get_font('.gajim-outgoing-message-text') - self.tagOutText.set_property('font-desc', desc) - - self.tagMarked = buffer_.create_tag('marked') - color = app.css_config.get_value( - '.gajim-highlight-message', StyleAttr.COLOR) - self.tagMarked.set_property('foreground', color) - self.tagMarked.set_property('weight', Pango.Weight.BOLD) - - textview_icon = buffer_.create_tag('textview-icon') - textview_icon.set_property('rise', Pango.units_from_double(-2.45)) - - # To help plugins easily identify the nickname - buffer_.create_tag('nickname') - - tag = buffer_.create_tag('time_sometimes') - tag.set_property('foreground', 'darkgrey') - #Pango.SCALE_SMALL - tag.set_property('scale', 0.8333333333333) - tag.set_property('justification', Gtk.Justification.CENTER) - - tag = buffer_.create_tag('small') - #Pango.SCALE_SMALL - tag.set_property('scale', 0.8333333333333) - - self.tv.create_tags() - - tag = buffer_.create_tag('bold') - tag.set_property('weight', Pango.Weight.BOLD) - - tag = buffer_.create_tag('italic') - tag.set_property('style', Pango.Style.ITALIC) - - tag = buffer_.create_tag('strikethrough') - tag.set_property('strikethrough', True) - - buffer_.create_tag('focus-out-line', justification=Gtk.Justification.CENTER) - self.displaymarking_tags = {} - - # One mark at the beginning then 2 marks between each lines - size = app.settings.get('max_conversation_lines') - size = 2 * size - 1 - self.marks_queue = queue.Queue(size) - - self.allow_focus_out_line = True - # holds a mark at the end of --- line - self.focus_out_end_mark = None - - self.just_cleared = False - - def _query_tooltip(self, widget, x_pos, y_pos, keyboard_mode, tooltip): - window = widget.get_window(Gtk.TextWindowType.TEXT) - x_pos, y_pos = self.tv.window_to_buffer_coords( - Gtk.TextWindowType.TEXT, x_pos, y_pos) - - iter_ = self.tv.get_iter_at_position(x_pos, y_pos)[1] - for tag in iter_.get_tags(): - tag_name = tag.get_property('name') - if tag_name == 'focus-out-line': - tooltip.set_text(_( - 'Text below this line is what has ' - 'been said since the\nlast time you paid attention to this ' - 'group chat')) - return True - if getattr(tag, 'is_anchor', False): - text = getattr(tag, 'title', False) - if text: - if len(text) > 50: - text = text[:47] + '…' - tooltip.set_text(text) - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return True - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - window.set_cursor(get_cursor('pointer')) - self._cursor_changed = True - return False - - if self._cursor_changed: - window.set_cursor(get_cursor('text')) - self._cursor_changed = False - return False - - def del_handlers(self): - for i in self.handlers: - if self.handlers[i].handler_is_connected(i): - self.handlers[i].disconnect(i) - del self.handlers - self.tv.destroy() - - def update_tags(self): - self.tagIn.set_property('foreground', app.css_config.get_value('.gajim-incoming-nickname', StyleAttr.COLOR)) - self.tagOut.set_property('foreground', app.css_config.get_value('.gajim-outgoing-nickname', StyleAttr.COLOR)) - self.tagStatus.set_property('foreground', - app.css_config.get_value('.gajim-status-message', StyleAttr.COLOR)) - self.tagMarked.set_property('foreground', - app.css_config.get_value('.gajim-highlight-message', StyleAttr.COLOR)) - self.tv.update_tags() - - def scroll_to_end(self, force=False): - if self.autoscroll or force: - GLib.idle_add(util.scroll_to_end, self.tv.get_parent()) - - def correct_message(self, correct_id, kind, name): - allowed = True - if kind == 'incoming': - try: - if correct_id in self.last_received_message_id[name]: - start_mark = self.last_received_message_id[name][1] - else: - allowed = False - except KeyError: - allowed = False - elif kind == 'outgoing': - if self.last_sent_message_id[0] == correct_id: - start_mark = self.last_sent_message_id[1] - else: - allowed = False - else: - allowed = False - - if not allowed: - log.debug('Message correction not allowed') - return None - - end_mark, index = self.get_end_mark(correct_id, start_mark) - if not index: - log.debug('Could not find line to correct') - return None - - buffer_ = self.tv.get_buffer() - if not end_mark: - end_iter = self.tv.get_buffer().get_end_iter() - else: - end_iter = buffer_.get_iter_at_mark(end_mark) - - start_iter = buffer_.get_iter_at_mark(start_mark) - - old_txt = buffer_.get_text(start_iter, end_iter, True) - buffer_.delete(start_iter, end_iter) - buffer_.delete_mark(start_mark) - - return index, end_mark, old_txt - - def show_receipt(self, id_): - line = self._get_message_line(id_) - if line is None: - return - line.set_receipt() - - def show_displayed(self, id_): - line = self._get_message_line(id_) - if line is None: - return - line.set_displayed() - - def show_error(self, id_, error): - line = self._get_message_line(id_) - if line is None: - return - line.set_error(to_user_string(error)) - - def show_focus_out_line(self): - if not self.allow_focus_out_line: - # if room did not receive focus-in from the last time we added - # --- line then do not add again - return - - print_focus_out_line = False - buffer_ = self.tv.get_buffer() - - if self.focus_out_end_mark is None: - # this happens only first time we focus out on this room - print_focus_out_line = True - - else: - focus_out_end_iter = buffer_.get_iter_at_mark(self.focus_out_end_mark) - focus_out_end_iter_offset = focus_out_end_iter.get_offset() - if focus_out_end_iter_offset != buffer_.get_end_iter().get_offset(): - # this means after last-focus something was printed - # (else end_iter's offset is the same as before) - # only then print ---- line (eg. we avoid printing many following - # ---- lines) - print_focus_out_line = True - - if print_focus_out_line and buffer_.get_char_count() > 0: - buffer_.begin_user_action() - - # remove previous focus out line if such focus out line exists - if self.focus_out_end_mark is not None: - end_iter_for_previous_line = buffer_.get_iter_at_mark( - self.focus_out_end_mark) - begin_iter_for_previous_line = end_iter_for_previous_line.copy() - # img_char+1 (the '\n') - begin_iter_for_previous_line.backward_chars(21) - - # remove focus out line - buffer_.delete(begin_iter_for_previous_line, - end_iter_for_previous_line) - buffer_.delete_mark(self.focus_out_end_mark) - - # add the new focus out line - end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, '\n' + '―' * 20) - - end_iter = buffer_.get_end_iter() - before_img_iter = end_iter.copy() - # one char back (an image also takes one char) - before_img_iter.backward_chars(20) - buffer_.apply_tag_by_name('focus-out-line', before_img_iter, end_iter) - - self.allow_focus_out_line = False - - # update the iter we hold to make comparison the next time - self.focus_out_end_mark = buffer_.create_mark(None, - buffer_.get_end_iter(), left_gravity=True) - - buffer_.end_user_action() - self.scroll_to_end() - - def clear(self, tv=None): - """ - Clear text in the textview - """ - buffer_ = self.tv.get_buffer() - start, end = buffer_.get_bounds() - buffer_.delete(start, end) - size = app.settings.get('max_conversation_lines') - size = 2 * size - 1 - self.marks_queue = queue.Queue(size) - self.focus_out_end_mark = None - self.just_cleared = True - - def visit_url_from_menuitem(self, widget, link): - """ - Basically it filters out the widget instance - """ - helpers.open_uri(link) - - def on_textview_populate_popup(self, textview, menu): - """ - Override the default context menu and we prepend Clear (only if - used_in_history_window is False) and if we have sth selected we show a - submenu with actions on the phrase (see - on_conversation_textview_button_press_event) - """ - separator_menuitem_was_added = False - if not self.used_in_history_window: - item = Gtk.SeparatorMenuItem.new() - menu.prepend(item) - separator_menuitem_was_added = True - - item = Gtk.MenuItem.new_with_mnemonic(_('_Clear')) - menu.prepend(item) - id_ = item.connect('activate', self.clear) - self.handlers[id_] = item - - if self.selected_phrase: - if not separator_menuitem_was_added: - item = Gtk.SeparatorMenuItem.new() - menu.prepend(item) - - if not self.used_in_history_window: - item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) - id_ = item.connect('activate', self.on_quote) - self.handlers[id_] = item - menu.prepend(item) - - _selected_phrase = helpers.reduce_chars_newlines( - self.selected_phrase, 25, 2) - item = Gtk.MenuItem.new_with_mnemonic( - _('_Actions for "%s"') % _selected_phrase) - menu.prepend(item) - submenu = Gtk.Menu() - item.set_submenu(submenu) - phrase_for_url = urllib.parse.quote(self.selected_phrase.encode( - 'utf-8')) - - always_use_en = app.settings.get('always_english_wikipedia') - if always_use_en: - link = 'https://en.wikipedia.org/wiki/Special:Search?search=%s'\ - % phrase_for_url - else: - link = 'https://%s.wikipedia.org/wiki/Special:Search?search=%s'\ - % (i18n.get_short_lang_code(), phrase_for_url) - item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('Look it up in _Dictionary')) - dict_link = app.settings.get('dictionary_url') - if dict_link == 'WIKTIONARY': - # special link (yeah undocumented but default) - always_use_en = app.settings.get('always_english_wiktionary') - if always_use_en: - link = 'https://en.wiktionary.org/wiki/Special:Search?search=%s'\ - % phrase_for_url - else: - link = 'https://%s.wiktionary.org/wiki/Special:Search?search=%s'\ - % (i18n.get_short_lang_code(), phrase_for_url) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - else: - if dict_link.find('%s') == -1: - # we must have %s in the url if not WIKTIONARY - item = Gtk.MenuItem.new_with_label(_( - 'Dictionary URL is missing an "%s" and it is not WIKTIONARY')) - item.set_property('sensitive', False) - else: - link = dict_link % phrase_for_url - id_ = item.connect('activate', self.visit_url_from_menuitem, - link) - self.handlers[id_] = item - submenu.append(item) - - - search_link = app.settings.get('search_engine') - if search_link.find('%s') == -1: - # we must have %s in the url - item = Gtk.MenuItem.new_with_label( - _('Web Search URL is missing an "%s"')) - item.set_property('sensitive', False) - else: - item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) - link = search_link % phrase_for_url - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) - id_ = item.connect('activate', self.visit_url_from_menuitem, link) - self.handlers[id_] = item - submenu.append(item) - - menu.show_all() - - def on_quote(self, widget): - self.emit('quote', self.selected_phrase) - - def on_textview_button_press_event(self, widget, event): - # If we clicked on a tagged text do NOT open the standard popup menu - # if normal text check if we have sth selected - self.selected_phrase = '' # do not move below event button check! - - if event.button != 3: # if not right click - return False - - x, y = self.tv.window_to_buffer_coords(Gtk.TextWindowType.TEXT, - int(event.x), int(event.y)) - iter_ = self.tv.get_iter_at_location(x, y) - if isinstance(iter_, tuple): - iter_ = iter_[1] - tags = iter_.get_tags() - - if tags: # we clicked on sth special (it can be status message too) - for tag in tags: - tag_name = tag.get_property('name') - if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): - return True # we block normal context menu - - # we check if sth was selected and if it was we assign - # selected_phrase variable - # so on_conversation_textview_populate_popup can use it - buffer_ = self.tv.get_buffer() - return_val = buffer_.get_selection_bounds() - if return_val: # if sth was selected when we right-clicked - # get the selected text - start_sel, finish_sel = return_val[0], return_val[1] - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) - elif iter_.get_char() and ord(iter_.get_char()) > 31: - # we clicked on a word, do as if it's selected for context menu - start_sel = iter_.copy() - if not start_sel.starts_word(): - start_sel.backward_word_start() - finish_sel = iter_.copy() - if not finish_sel.ends_word(): - finish_sel.forward_word_end() - self.selected_phrase = buffer_.get_text(start_sel, finish_sel, True) - - def detect_and_print_special_text(self, otext, other_tags, graphics=True, - iter_=None, additional_data=None): - """ - Detect special text (emots & links & formatting), print normal text - before any special text it founds, then print special text (that happens - many times until last special text is printed) and then return the index - after *last* special text, so we can print it in - print_conversation_line() - """ - if not otext: - return - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - if other_tags: - insert_tags_func = buffer_.insert_with_tags_by_name - else: - insert_tags_func = buffer_.insert - # detect_and_print_special_text() is also used by - # HtmlHandler.handle_specials() and there tags is Gtk.TextTag objects, - # not strings - if other_tags and isinstance(other_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - - index = 0 - - # Too many special elements (emoticons, LaTeX formulas, etc) - # may cause Gajim to freeze (see #5129). - # We impose an arbitrary limit of 100 specials per message. - specials_limit = 100 - - # add oob text to the end - - oob_url = additional_data.get_value('gajim', 'oob_url') - if oob_url is not None: - oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') - if oob_url != otext: - otext += '\n{} {}'.format(oob_desc, oob_url) - - # basic: links + mail + formatting is always checked (we like that) - if app.settings.get('emoticons_theme') and graphics: - # search for emoticons & urls - if app.settings.get('ascii_formatting'): - regex = EMOT_AND_BASIC_REGEX - else: - regex = EMOT_AND_LINK_REGEX - else: - if app.settings.get('ascii_formatting'): - # search for just urls + mail + formatting - regex = BASIC_REGEX - else: # search for just urls + mail - regex = LINK_REGEX - iterator = regex.finditer(otext) - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - for match in iterator: - start, end = match.span() - special_text = otext[start:end] - if start > index: - text_before_special_text = otext[index:start] - if not iter_: - end_iter = buffer_.get_end_iter() - # we insert normal text - if other_tags: - insert_tags_func(end_iter, text_before_special_text, *other_tags) - else: - buffer_.insert(end_iter, text_before_special_text) - index = end # update index - - # now print it - self.print_special_text(special_text, other_tags, graphics=graphics, - iter_=end_iter, additional_data=additional_data) - specials_limit -= 1 - if specials_limit <= 0: - break - - # add the rest of text located in the index and after - insert_tags_func(end_iter, otext[index:], *other_tags) - - return end_iter - - def print_special_text(self, special_text, other_tags, graphics=True, - iter_=None, additional_data=None): - """ - Is called by detect_and_print_special_text and prints special text - (emots, links, formatting) - """ - if additional_data is None: - additional_data = AdditionalDataDict() - - # PluginSystem: adding GUI extension point for ConversationTextview - self.plugin_modified = False - app.plugin_manager.extension_point('print_special_text', self, - special_text, other_tags, graphics, additional_data, iter_) - if self.plugin_modified: - return - - tags = [] - use_other_tags = True - text_is_valid_uri = False - is_xhtml_link = None - show_ascii_formatting_chars = \ - app.settings.get('show_ascii_formatting_chars') - buffer_ = self.tv.get_buffer() - - # Detect XHTML-IM link - ttt = buffer_.get_tag_table() - tags_ = [(ttt.lookup(t) if isinstance(t, str) else t) for t in other_tags] - for t in tags_: - is_xhtml_link = getattr(t, 'href', None) - if is_xhtml_link: - break - - # Check if we accept this as an uri - for scheme in URI_SCHEMES: - if special_text.startswith(scheme): - text_is_valid_uri = True - - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - theme = app.settings.get('emoticons_theme') - show_emojis = theme and theme != 'font' - if show_emojis and graphics and is_emoji(special_text): - # it's an emoticon - if emoji_pixbufs.complete: - # only search for the pixbuf if we are sure - # that loading is completed - pixbuf = get_emoji_pixbuf(special_text) - if pixbuf is None: - buffer_.insert(end_iter, special_text) - else: - pixbuf = pixbuf.copy() - anchor = buffer_.create_child_anchor(end_iter) - anchor.plaintext = special_text - img = Gtk.Image.new_from_pixbuf(pixbuf) - img.show() - self.tv.add_child_at_anchor(img, anchor) - else: - # Set marks and save them so we can replace the emojis - # once the loading is complete - start_mark = buffer_.create_mark(None, end_iter, True) - buffer_.insert(end_iter, special_text) - end_mark = buffer_.create_mark(None, end_iter, True) - emoji_pixbufs.append_marks( - self.tv, start_mark, end_mark, special_text) - - elif (special_text.startswith('www.') or - special_text.startswith('ftp.') or - text_is_valid_uri and not is_xhtml_link): - tags.append('url') - elif special_text.startswith('mailto:') and not is_xhtml_link: - tags.append('mail') - elif special_text.startswith('xmpp:') and not is_xhtml_link: - tags.append('xmpp') - elif STH_AT_STH_DOT_STH_REGEX.match(special_text) and \ - not is_xhtml_link: - # it's a JID or mail - tags.append('sth_at_sth') - elif special_text.startswith('*'): # it's a bold text - tags.append('bold') - if special_text[1] == '~' and special_text[-2] == '~' and\ - len(special_text) > 4: # it's also strikethrough - tags.append('strikethrough') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove *~ ~* - elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also italic - tags.append('italic') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove *_ _* - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove * * - elif special_text.startswith('~'): # it's a strikethrough text - tags.append('strikethrough') - if special_text[1] == '*' and special_text[-2] == '*' and \ - len(special_text) > 4: # it's also bold - tags.append('bold') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove ~* *~ - elif special_text[1] == '_' and special_text[-2] == '_' and \ - len(special_text) > 4: # it's also italic - tags.append('italic') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove ~_ _~ - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove ~ ~ - elif special_text.startswith('_'): # it's an italic text - tags.append('italic') - if special_text[1] == '*' and special_text[-2] == '*' and \ - len(special_text) > 4: # it's also bold - tags.append('bold') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove _* *_ - elif special_text[1] == '~' and special_text[-2] == '~' and \ - len(special_text) > 4: # it's also strikethrough - tags.append('strikethrough') - if not show_ascii_formatting_chars: - special_text = special_text[2:-2] # remove _~ ~_ - else: - if not show_ascii_formatting_chars: - special_text = special_text[1:-1] # remove _ _ - else: - # It's nothing special - if use_other_tags: - insert_tags_func = buffer_.insert_with_tags_by_name - if other_tags and isinstance(other_tags[0], Gtk.TextTag): - insert_tags_func = buffer_.insert_with_tags - if other_tags: - insert_tags_func(end_iter, special_text, *other_tags) - else: - buffer_.insert(end_iter, special_text) - - if tags: - all_tags = tags[:] - if use_other_tags: - all_tags += other_tags - # convert all names to TextTag - all_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] - buffer_.insert_with_tags(end_iter, special_text, *all_tags) - if 'url' in tags: - puny_text = helpers.puny_encode_url(special_text) - if puny_text != special_text: - puny_tags = [] - if use_other_tags: - puny_tags += other_tags - if not puny_text: - puny_text = _('Invalid URL') - puny_tags = [(ttt.lookup(t) if isinstance(t, str) else t) for t in puny_tags] - buffer_.insert_with_tags(end_iter, " (%s)" % puny_text, *puny_tags) - - def print_empty_line(self, iter_=None): - buffer_ = self.tv.get_buffer() - if not iter_: - iter_ = buffer_.get_end_iter() - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - self.just_cleared = False - - def get_end_mark(self, message_id, start_mark): - for index, line in enumerate(self._message_list): - if line.id == message_id and line.start_mark == start_mark: - try: - end_mark = self._message_list[index + 1].start_mark - end_mark_name = end_mark.get_name() - except IndexError: - # We are at the last message - end_mark = None - end_mark_name = None - - log.debug('start mark: %s, end mark: %s, ' - 'replace message-list index: %s', - start_mark.get_name(), end_mark_name, index) - - return end_mark, index - log.debug('stanza-id not in message list') - return None, None - - def get_insert_mark(self, timestamp): - # message_list = [(timestamp, line_start_mark, message_id)] - # We check if this is a new Message - try: - if self._message_list[-1].timestamp <= timestamp: - return None, None - except IndexError: - # We have no Messages in the TextView - return None, None - - # Not a new Message - # Search for insertion point - for index, line in enumerate(self._message_list): - if line.timestamp > timestamp: - return line.start_mark, index - - # Should not happen, but who knows - return None, None - - def _get_message_line(self, id_): - for message_line in reversed(self._message_list): - if message_line.id == id_: - return message_line - - def print_conversation_line(self, text, kind, name, tim, - other_tags_for_name=None, other_tags_for_time=None, other_tags_for_text=None, - subject=None, old_kind=None, graphics=True, - displaymarking=None, message_id=None, correct_id=None, additional_data=None, - marker=None, error=None): - """ - Print 'chat' type messages - """ - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - buffer_.begin_user_action() - insert_mark = None - insert_mark_name = None - - if kind == 'incoming_queue': - kind = 'incoming' - if old_kind == 'incoming_queue': - old_kind = 'incoming' - - if not tim: - # For outgoing Messages and Status prints - tim = time.time() - - corrected = False - if correct_id: - try: - index, insert_mark, old_txt = \ - self.correct_message(correct_id, kind, name) - if correct_id in self.corrected_text_list: - self.corrected_text_list[message_id] = \ - self.corrected_text_list[correct_id] + '\n{}' \ - .format(GLib.markup_escape_text(old_txt)) - del self.corrected_text_list[correct_id] - else: - self.corrected_text_list[message_id] = \ - _('<b>Message corrected. Original message:</b>\n{}') \ - .format(GLib.markup_escape_text(old_txt)) - corrected = True - except TypeError: - log.debug('Message was not corrected !') - - if not corrected: - # Get insertion point into TextView - insert_mark, index = self.get_insert_mark(tim) - - if insert_mark: - insert_mark_name = insert_mark.get_name() - - log.debug( - 'Printed Line: %s, %s, %s, inserted after: %s' - ', stanza-id: %s, correct-id: %s', - self.line, text, tim, insert_mark_name, - message_id, correct_id) - - if not insert_mark: # Texview is empty or Message is new - iter_ = buffer_.get_end_iter() - # Insert new Line if Textview is not empty - if buffer_.get_char_count() > 0 and not corrected: - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - else: - iter_ = buffer_.get_iter_at_mark(insert_mark) - - # Create a temporary mark at the start of the line - # with gravity=Left, so it will not move - # even if we insert directly at the mark iter - temp_mark = buffer_.create_mark('temp', iter_, left_gravity=True) - - if text.startswith('/me '): - direction_mark = i18n.paragraph_direction_mark(str(text[3:])) - else: - direction_mark = i18n.paragraph_direction_mark(text) - # don't apply direction mark if it's status message - if kind == 'status': - direction_mark = i18n.direction_mark - - # print the encryption icon - if kind in ('incoming', 'outgoing'): - self.print_encryption_status(iter_, additional_data) - - # print the time stamp - self.print_time(text, kind, tim, direction_mark, - other_tags_for_time, iter_) - - # If there's a displaymarking, print it here. - if displaymarking: - self.print_displaymarking(displaymarking, iter_) - - # kind = info, we print things as if it was a status: same color, ... - if kind in ('error', 'info'): - kind = 'status' - other_text_tag = self.detect_other_text_tag(text, kind) - text_tags = [] - if other_tags_for_text: - text_tags = other_tags_for_text[:] # create a new list - if other_text_tag: - text_tags.append(other_text_tag) - - else: # not status nor /me - if app.settings.get('chat_merge_consecutive_nickname'): - if kind != old_kind or self.just_cleared: - self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark, iter_=iter_) - else: - self.print_real_text(app.settings.get( - 'chat_merge_consecutive_nickname_indent'), - mark=insert_mark, additional_data=additional_data) - else: - self.print_name(name, kind, other_tags_for_name, - direction_mark=direction_mark, iter_=iter_) - if kind == 'incoming': - text_tags.append('incomingtxt') - elif kind == 'outgoing': - text_tags.append('outgoingtxt') - - self.print_subject(subject, iter_=iter_) - - iter_ = self.print_real_text(text, text_tags, name, graphics=graphics, - mark=insert_mark, additional_data=additional_data) - - message_icons = MessageIcons() - self._insert_message_icons(iter_, message_icons) - - # If we inserted a Line we add a new line at the end - if insert_mark: - buffer_.insert_with_tags_by_name(iter_, '\n', 'eol') - # We delete the temp mark and replace it with a mark - # that has gravity=right - temp_iter = buffer_.get_iter_at_mark(temp_mark) - buffer_.delete_mark(temp_mark) - new_mark = buffer_.create_mark( - str(self.line), temp_iter, left_gravity=False) - - message_line = MessageLine(message_id, tim, message_icons, new_mark) - - if corrected: - message_line.set_correction( - self.corrected_text_list[message_id]) - - if error is not None: - message_line.set_error(to_user_string(error)) - - if marker is not None: - if marker == 'received': - message_line.set_receipt() - elif marker == 'displayed': - message_line.set_displayed() - - if index is None: - # New Message - self._message_list.append(message_line) - elif corrected: - # Replace the corrected message - self._message_list[index] = message_line - else: - # We insert the message at index - self._message_list.insert(index, message_line) - - if kind == 'incoming': - self.last_received_message_id[name] = (message_id, new_mark) - elif kind == 'outgoing': - self.last_sent_message_id = (message_id, new_mark) - - if not insert_mark: - if self.autoscroll or kind == 'outgoing': - # we are at the end or we are sending something - self.scroll_to_end(force=True) - - self.just_cleared = False - buffer_.end_user_action() - - self.line += 1 - - def get_time_to_show(self, tim): - """ - Format the time according to config setting 'time_stamp' - """ - format_ = helpers.from_one_line(app.settings.get('time_stamp')) - tim_format = time.strftime(format_, tim) - return tim_format - - def detect_other_text_tag(self, text, kind): - if kind == 'status': - return kind - if text.startswith('/me ') or text.startswith('/me\n'): - return kind - - def _insert_message_icons(self, iter_, message_icons): - temp_mark = self._buffer.create_mark(None, iter_, True) - self._buffer.insert(iter_, ' ') - anchor = self._buffer.create_child_anchor(iter_) - anchor.plaintext = '' - self._buffer.insert(iter_, ' ') - - # Apply mark to vertically center the icon - start = self._buffer.get_iter_at_mark(temp_mark) - self._buffer.apply_tag_by_name('textview-icon', start, iter_) - self.tv.add_child_at_anchor(message_icons, anchor) - - def print_encryption_status(self, iter_, additional_data): - details = self._get_encryption_details(additional_data) - if details is None: - # Message was not encrypted - if not self.encryption_enabled: - return - icon = 'channel-insecure-symbolic' - color = 'unencrypted-color' - tooltip = _('Not encrypted') - else: - name, fingerprint, trust = details - tooltip = _('Encrypted (%s)') % (name) - if trust is None: - # The encryption plugin did not pass trust information - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - else: - icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] - tooltip = '%s\n%s' % (tooltip, trust_tooltip) - if fingerprint is not None: - fingerprint = format_fingerprint(fingerprint) - tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) - - temp_mark = self._buffer.create_mark(None, iter_, True) - self._buffer.insert(iter_, ' ') - anchor = self._buffer.create_child_anchor(iter_) - anchor.plaintext = '' - self._buffer.insert(iter_, ' ') - - # Apply mark to vertically center the icon - start = self._buffer.get_iter_at_mark(temp_mark) - self._buffer.apply_tag_by_name('textview-icon', start, iter_) - - image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) - image.show() - image.set_tooltip_markup(tooltip) - image.get_style_context().add_class(color) - self.tv.add_child_at_anchor(image, anchor) - - @staticmethod - def _get_encryption_details(additional_data): - name = additional_data.get_value('encrypted', 'name') - if name is None: - return - - fingerprint = additional_data.get_value('encrypted', 'fingerprint') - trust = additional_data.get_value('encrypted', 'trust') - return name, fingerprint, trust - - def print_time(self, text, kind, tim, direction_mark, other_tags_for_time, iter_): - local_tim = time.localtime(tim) - buffer_ = self.tv.get_buffer() - current_print_time = app.settings.get('print_time') - - if current_print_time == 'always': - timestamp_str = self.get_time_to_show(local_tim) - timestamp = time.strftime(timestamp_str, local_tim) - timestamp = direction_mark + timestamp + direction_mark - if other_tags_for_time: - buffer_.insert_with_tags_by_name(iter_, timestamp, - *other_tags_for_time) - else: - buffer_.insert(iter_, timestamp) - elif current_print_time == 'sometimes': - every_foo_seconds = 60 * app.settings.get( - 'print_ichat_every_foo_minutes') - seconds_passed = tim - self.last_time_printout - if seconds_passed > every_foo_seconds: - self.last_time_printout = tim - tim_format = self.get_time_to_show(local_tim) - buffer_.insert_with_tags_by_name(iter_, tim_format + '\n', - 'time_sometimes') - - def print_displaymarking(self, displaymarking, iter_): - bgcolor = displaymarking.bgcolor - fgcolor = displaymarking.fgcolor - text = displaymarking.name - if text: - buffer_ = self.tv.get_buffer() - tag = self.displaymarking_tags.setdefault(bgcolor + '/' + fgcolor, - buffer_.create_tag(None, background=bgcolor, foreground=fgcolor)) - buffer_.insert_with_tags(iter_, '[' + text + ']', tag) - buffer_.insert_with_tags(iter_, ' ') - - def print_name(self, name, kind, other_tags_for_name, direction_mark='', - iter_=None): - if name: - name_tags = [] - buffer_ = self.tv.get_buffer() - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - - if other_tags_for_name: - name_tags = other_tags_for_name[:] # create a new list - name_tags.append(kind) - name_tags.append('nickname') - - for tag in name_tags: - if tag.startswith('muc_nickname_color_'): - self._add_new_colour_tags(tag, name) - - before_str = app.settings.get('before_nickname') - before_str = helpers.from_one_line(before_str) - after_str = app.settings.get('after_nickname') - after_str = helpers.from_one_line(after_str) - format_ = before_str + name + direction_mark + after_str + ' ' - buffer_.insert_with_tags_by_name(end_iter, format_, *name_tags) - - def _add_new_colour_tags(self, tag, name): - if self._buffer.get_tag_table().lookup(tag) is not None: - return - rgba = Gdk.RGBA(*text_to_color(name)) - self._buffer.create_tag(tag, foreground_rgba=rgba) - - def print_subject(self, subject, iter_=None): - if subject: # if we have subject, show it too! - subject = _('Subject: %s\n') % subject - buffer_ = self.tv.get_buffer() - if iter_: - end_iter = iter_ - else: - end_iter = buffer_.get_end_iter() - buffer_.insert(end_iter, subject) - self.print_empty_line(end_iter) - - def print_real_text(self, text, text_tags=None, name=None, - graphics=True, mark=None, additional_data=None): - """ - Add normal and special text. call this to add text - """ - if text_tags is None: - text_tags = [] - if additional_data is None: - additional_data = AdditionalDataDict() - buffer_ = self.tv.get_buffer() - if not mark: - iter_ = buffer_.get_end_iter() - else: - iter_ = buffer_.get_iter_at_mark(mark) - - xhtml = additional_data.get_value('gajim', 'xhtml', False) - if xhtml and app.settings.get('show_xhtml'): - try: - if name and (text.startswith('/me ') or text.startswith('/me\n')): - xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) - self.tv.display_html(xhtml, self.tv, self, iter_=iter_) - return iter_ - except Exception as error: - log.debug('Error processing xhtml: %s', error) - log.debug('with |%s|', xhtml) - - # /me is replaced by name if name is given - if name and (text.startswith('/me ') or text.startswith('/me\n')): - text = '* ' + name + text[3:] - text_tags.append('italic') - - # PluginSystem: adding GUI extension point for ConversationTextview - self.plugin_modified = False - app.plugin_manager.extension_point('print_real_text', self, - text, text_tags, graphics, iter_, additional_data) - - if self.plugin_modified: - if not mark: - return buffer_.get_end_iter() - return buffer_.get_iter_at_mark(mark) - - if not mark: - iter_ = buffer_.get_end_iter() - else: - iter_ = buffer_.get_iter_at_mark(mark) - - # detect urls formatting and if the user has it on emoticons - return self.detect_and_print_special_text(text, text_tags, graphics=graphics, - iter_=iter_, additional_data=additional_data) - - -class MessageLine: - def __init__(self, id_, timestamp, message_icons, start_mark): - self.id = id_ - self.timestamp = timestamp - self.start_mark = start_mark - self._has_receipt = False - self._has_displayed = False - self._message_icons = message_icons - - @property - def has_receipt(self): - return self._has_receipt - - @property - def has_displayed(self): - return self._has_displayed - - def set_receipt(self): - self._has_receipt = True - if self._has_displayed: - return - self._message_icons.set_receipt_icon_visible(True) - - def set_displayed(self): - self._has_displayed = True - self._message_icons.set_displayed_icon_visible(True) - - def set_correction(self, tooltip): - self._message_icons.set_correction_icon_visible(True) - self._message_icons.set_correction_tooltip(tooltip) - - def set_error(self, tooltip): - self._message_icons.set_error_icon_visible(True) - self._message_icons.set_error_tooltip(tooltip) - - -class MessageIcons(Gtk.Box): - def __init__(self): - Gtk.Box.__init__(self, - orientation=Gtk.Orientation.HORIZONTAL) - - self._correction_image = Gtk.Image.new_from_icon_name( - 'document-edit-symbolic', Gtk.IconSize.MENU) - self._correction_image.set_no_show_all(True) - - self._marker_image = Gtk.Image.new_from_icon_name( - 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.get_style_context().add_class( - 'receipt-received-color') - self._marker_image.set_tooltip_text(_('Received')) - self._marker_image.set_no_show_all(True) - - self._error_image = Gtk.Image.new_from_icon_name( - 'dialog-warning-symbolic', Gtk.IconSize.MENU) - self._error_image.get_style_context().add_class('warning-color') - self._error_image.set_no_show_all(True) - - self.add(self._correction_image) - self.add(self._marker_image) - self.add(self._error_image) - self.show_all() - - def set_receipt_icon_visible(self, visible): - if not app.settings.get('positive_184_ack'): - return - self._marker_image.set_visible(visible) - - def set_displayed_icon_visible(self, visible): - self._marker_image.set_visible(visible) - self._marker_image.set_from_icon_name( - 'feather-check-double-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Read')) - - def set_correction_icon_visible(self, visible): - self._correction_image.set_visible(visible) - - def set_correction_tooltip(self, text): - self._correction_image.set_tooltip_markup(text) - - def set_error_icon_visible(self, visible): - self._error_image.set_visible(visible) - - def set_error_tooltip(self, text): - self._error_image.set_tooltip_markup(text) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -52,7 +52,9 @@ def __init__(self, account, contact, history_mode=False): self.set_selection_mode(Gtk.SelectionMode.NONE) self.set_sort_func(self._sort_func) self._account = account - self._client = app.get_client(account) + self._client = None + if account is not None: + self._client = app.get_client(account) self._contact = contact self._history_mode = history_mode @@ -70,8 +72,9 @@ def __init__(self, account, contact, history_mode=False): # message_id -> row mapping self._message_id_row_map = {} - self._read_marker_row = ReadMarkerRow(self._account, self._contact) - self.add(self._read_marker_row) + if self._contact is not None: + self._read_marker_row = ReadMarkerRow(self._account, self._contact) + self.add(self._read_marker_row) self._scroll_hint_row = ScrollHintRow(self._account, history_mode=self._history_mode) @@ -133,8 +136,9 @@ def add_message(self, if other_text_tags is None: other_text_tags = [] - if (kind in ('status', 'info') or - (subject and self._contact.is_groupchat)): + 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, @@ -157,6 +161,11 @@ def add_message(self, 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, @@ -166,7 +175,7 @@ def add_message(self, text, other_text_tags, avatar, - self._contact.is_groupchat, + is_groupchat, additional_data=additional_data, display_marking=display_marking, marker=marker, @@ -181,6 +190,9 @@ def add_message(self, self._insert_message(message) def _get_avatar(self, kind, name): + if self._contact is None: + return None + scale = self.get_scale_factor() if self._contact.is_groupchat: contact = self._contact.get_resource(name) ===================================== gajim/gtk/conversation_textview.py ===================================== @@ -184,8 +184,7 @@ def print_text(self, text, other_text_tags=None, kind=None, graphics=True, if (name and (text.startswith('/me ') or text.startswith('/me\n'))): xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) - self.display_html( - xhtml, self, self) + self.display_html(xhtml, self) return except Exception as err: log.debug('Error processing xhtml: %s', err) @@ -217,7 +216,7 @@ def print_text(self, text, other_text_tags=None, kind=None, graphics=True, GLib.idle_add(self.queue_resize) def parse_formatting(self, text, text_tags, graphics=True, - additional_data=None): + additional_data=None, iter_=None): ''' Parses message formatting (Emojis, URIs, Styles). A regex is used for text matching. Each text fragment gets @@ -237,10 +236,8 @@ def parse_formatting(self, text, text_tags, graphics=True, else: insert_tags_func = buffer_.insert - # TODO: Adapt HtmlHandler.handle_specials() - # detect_and_print_special_text() is used by - # HtmlHandler.handle_specials() and uses Gtk.TextTag objects, - # not strings + # parse_formatting() is used by HtmlHandler.handle_specials() + # and uses Gtk.TextTag objects, not strings if text_tags and isinstance(text_tags[0], Gtk.TextTag): insert_tags_func = buffer_.insert_with_tags @@ -273,7 +270,11 @@ def parse_formatting(self, text, text_tags, graphics=True, regex = LINK_REGEX iterator = regex.finditer(text) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() + # TODO: Evaluate limit # Too many fragments (emoticons, LaTeX formulas, etc) # may cause Gajim to freeze (see #5129). @@ -285,7 +286,8 @@ def parse_formatting(self, text, text_tags, graphics=True, fragment = text[start:end] if start > index: text_before_fragment = text[index:start] - end_iter = buffer_.get_end_iter() + if not iter_: + end_iter = buffer_.get_end_iter() if text_tags: insert_tags_func( end_iter, text_before_fragment, *text_tags) @@ -296,7 +298,8 @@ def parse_formatting(self, text, text_tags, graphics=True, self.apply_formatting(fragment, text_tags, graphics=graphics, - additional_data=additional_data) + additional_data=additional_data, + iter_=end_iter) fragment_limit += 1 if fragment_limit <= 0: break @@ -304,8 +307,10 @@ def parse_formatting(self, text, text_tags, graphics=True, # Add remaining text after last match insert_tags_func(buffer_.get_end_iter(), text[index:], *text_tags) + return end_iter + def apply_formatting(self, fragment, text_tags, graphics=True, - additional_data=None): + additional_data=None, iter_=None): # TODO: Plugin system GUI extension point # self.plugin_modified = False # app.plugin_manager.extension_point('print_special_text', self, @@ -329,7 +334,10 @@ def apply_formatting(self, fragment, text_tags, graphics=True, # Check if we accept this as an uri is_valid_uri = fragment.startswith(tuple(URI_SCHEMES)) - end_iter = buffer_.get_end_iter() + if iter_: + end_iter = iter_ + else: + end_iter = buffer_.get_end_iter() theme = app.settings.get('emoticons_theme') show_emojis = theme and theme != 'font' ===================================== gajim/gtk/htmltextview.py ===================================== @@ -208,12 +208,11 @@ class HtmlHandler(xml.sax.handler.ContentHandler): It keeps a stack of "style spans" (start/end element pairs) and a stack of list counters, for nested lists. """ - def __init__(self, textview, conv_textview, startiter): + def __init__(self, textview, startiter): xml.sax.handler.ContentHandler.__init__(self) self.textbuf = textview.get_buffer() self.textview = textview self.iter = startiter - self.conv_textview = conv_textview self.text = '' self.starting = True self.preserve = False @@ -561,11 +560,10 @@ def _anchor_event(self, _tag, _textview, event, _iter, href, type_): return False def handle_specials(self, text): - if self.conv_textview: - self.iter = self.conv_textview.detect_and_print_special_text( - text, self._get_style_tags(), iter_=self.iter) - else: - self._insert_text(text) + # TODO: Parse formatting + # self.iter = self.textview.parse_formatting( + # text, self._get_style_tags(), iter_=self.iter) + self._insert_text(text) def characters(self, content): if self.preserve: @@ -830,14 +828,14 @@ def hyperlink_handler(self, texttag, _widget, event, iter_, _kind): open_uri(uri, account=self.account) return Gdk.EVENT_STOP - def display_html(self, html, textview, conv_textview, iter_=None): + def display_html(self, html, textview, iter_=None): buffer_ = self.get_buffer() if iter_: eob = iter_ else: eob = buffer_.get_end_iter() parser = xml.sax.make_parser() - parser.setContentHandler(HtmlHandler(textview, conv_textview, eob)) + parser.setContentHandler(HtmlHandler(textview, eob)) parser.parse(StringIO(html)) # If the xhtml ends with a BLOCK element we have to remove # the \n we add after BLOCK elements ===================================== test/gtk/htmltextview.py ===================================== @@ -7,17 +7,33 @@ from gajim.common import app from gajim.common import configpaths configpaths.init() -from gajim.common.helpers import AdditionalDataDict +from gajim.common.const import KindConstant from gajim import gui gui.init('gtk') -from gajim.conversation_textview import ConversationTextview +from gajim.common.helpers import AdditionalDataDict + +from gajim.gui.conversation.view import ConversationView from gajim.gui_interface import Interface + +def setting_side_effect(*args, **kwargs): + if args[0] == 'chat_timestamp_format': + return '%H:%M' + if args[0] in ('autoawaytime', 'autoxatime'): + return 5 + if args[0] == 'show_xhtml': + return True + + +app.settings = MagicMock() +app.settings.get.side_effect = setting_side_effect + app.plugin_manager = MagicMock() app.logger = MagicMock() app.cert_store = MagicMock() +app.storage = MagicMock() app.interface = Interface() @@ -45,10 +61,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <p style='font-size:large'> @@ -60,10 +72,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <p> @@ -77,10 +85,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <p style='text-align:center'> @@ -93,10 +97,6 @@ </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <ul style='background-color:rgb(120,140,100)'> @@ -114,10 +114,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <ol style='background-color:rgb(120,140,100)'> @@ -136,10 +132,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <p> @@ -163,10 +155,6 @@ def faciter(n,acc): </body> ''', - ''' - <hr /> - ''', - ''' <body xmlns='http://www.w3.org/1999/xhtml'> <img src='data:image/png;base64,R0lGODdhMAAwAPAAAAAAAP///ywAAAAAMAAw\ @@ -178,32 +166,38 @@ def faciter(n,acc): hhx4dbgYKAAA7' alt='Larry'/> </body> ''', - ] class TextviewWindow(Gtk.Window): def __init__(self): - Gtk.Window.__init__(self, title="Textview Test") + Gtk.Window.__init__(self, title='Textview Test') self.set_default_size(600, 600) - self._textview = ConversationTextview(None) + self._conversation_view = ConversationView(None, None) scrolled = Gtk.ScrolledWindow() scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) - scrolled.add(self._textview.tv) + scrolled.add(self._conversation_view) self.add(scrolled) self.show() self._print_xhtml() def _print_xhtml(self): + timestamp = 1 for xhtml in XHTML: additional_data = AdditionalDataDict() additional_data.set_value('gajim', 'xhtml', xhtml) - self._textview.print_real_text(None, additional_data=additional_data) - self._textview.print_real_text('\n') + self._conversation_view.add_message( + '', + KindConstant.SINGLE_MSG_RECV, + 'Test Row', + timestamp, + additional_data=additional_data) + timestamp += 1 + win = TextviewWindow() -win.connect("destroy", Gtk.main_quit) +win.connect('destroy', Gtk.main_quit) win.show_all() Gtk.main() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45033ce8f89390dd7765c279918467… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a45033ce8f89390dd7765c279918467… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix readmarker breaking merge
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a45033ce by lovetox at 2021-04-04T23:51:48+02:00 Fix readmarker breaking merge - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -236,6 +236,9 @@ def _find_ancestor(self, message): if row is None: return None + if row.type == 'read_marker': + continue + if row.type != 'chat': return None @@ -254,6 +257,9 @@ def _update_descendants(self, message): if row is None: return + if row.type == 'read_marker': + continue + if row.type != 'chat': return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a45033ce8f89390dd7765c279918467d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] show info messages
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 5a86aeb2 by lovetox at 2021-04-04T23:45:14+02:00 show info messages - - - - - 1 changed file: - gajim/gtk/conversation/rows/info.py Changes: ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -65,3 +65,4 @@ def __init__(self, graphics=graphics) self.grid.attach(self.textview, 1, 0, 1, 1) + self.show_all() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a86aeb247715ebc31c5f44e159a3825… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/5a86aeb247715ebc31c5f44e159a3825… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Improve read marker
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 27cdd4a7 by lovetox at 2021-04-04T23:38:23+02:00 Improve read marker - - - - - 2 changed files: - gajim/chat_control.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -559,6 +559,8 @@ def _on_message_received(self, event): correct_id=event.correct_id, additional_data=event.additional_data) + self.conversation_view.set_read_marker(event.properties.id) + def _on_message_error(self, event): self.conversation_view.show_error(event.message_id, event.error) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -311,6 +311,10 @@ def iter_rows(self): yield row def set_read_marker(self, id_): + if id_ is None: + self._read_marker_row.hide() + return + row = self._get_row_by_message_id(id_) if row is None: return View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27cdd4a72f7d18dbf71df34cf9f60da8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/27cdd4a72f7d18dbf71df34cf9f60da8… 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