Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] Revert "Windows: Add Workaround for #10342"
by Philipp Hörist 21 Apr '21

21 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c7f95b5 by Philipp Hörist at 2021-04-21T20:34:11+02:00 Revert "Windows: Add Workaround for #10342" This reverts commit 3334790a15ff4664894f5f19bd60e01760d3f120 - - - - - 1 changed file: - gajim/common/i18n.py Changes: ===================================== gajim/common/i18n.py ===================================== @@ -171,9 +171,6 @@ def ngettext(s_sing, s_plural, n, replace_sing=None, replace_plural=None): # find the translation # Use LANGUAGE instead of LANG, LANG sets LC_ALL and thus # doesn't retain other region settings like LC_TIME - - # See https://gitlab.gnome.org/GNOME/pygobject/-/issues/442 - LANG = 'en' os.environ['LANGUAGE'] = LANG except Exception as error: print('Failed to determine default language', file=sys.stderr) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c7f95b5bac18dd8b0bcbfb222fb2272… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c7f95b5bac18dd8b0bcbfb222fb2272… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add Jump to bottom button
by Daniel Brötzmann 20 Apr '21

20 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a024992a by wurstsalat at 2021-04-20T20:49:18+02:00 Add Jump to bottom button - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a024992ab39c440f792a7d1a7b944b8d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a024992ab39c440f792a7d1a7b944b8d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Make Correction Work again
by Philipp Hörist 19 Apr '21

19 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 3e598a4f by lovetox at 2021-04-19T21:47:00+02:00 Make Correction Work again - - - - - afe01954 by lovetox at 2021-04-19T21:47:37+02:00 Handle disconnect and resume-failed inside modules - - - - - 11 changed files: - gajim/common/client.py - gajim/common/helpers.py - gajim/common/modules/chatstates.py - gajim/common/modules/contacts.py - gajim/common/modules/mam.py - gajim/common/modules/muc.py - gajim/common/styling.py - gajim/gtk/conversation/message_widget.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/client.py ===================================== @@ -182,9 +182,9 @@ def _create_client(self): def _on_resume_failed(self, _client, _signal_name): log.info('Resume failed') + self.notify('resume-failed') app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) - self.get_module('Chatstate').enabled = False def _on_resume_successful(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) @@ -278,11 +278,9 @@ def _on_password(password): self.notify('state-changed', SimpleClientState.RESUME_IN_PREGRESS) else: - self.get_module('Chatstate').enabled = False app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) self._after_disconnect() - self.get_module('Contacts').reset_presence() self.notify('state-changed', SimpleClientState.DISCONNECTED) def _after_disconnect(self): @@ -305,12 +303,9 @@ def _on_connection_failed(self, _client, _signal_name): def _on_connected(self, _client, _signal_name): self._set_state(ClientState.CONNECTED) - self.get_module('MUC').reset_state() self.get_module('Discovery').discover_server_info() self.get_module('Discovery').discover_account_info() self.get_module('Discovery').discover_server_items() - self.get_module('Chatstate').enabled = True - self.get_module('MAM').reset_state() def _on_stanza_sent(self, _client, _signal_name, stanza): app.nec.push_incoming_event(NetworkEvent('stanza-sent', ===================================== gajim/common/helpers.py ===================================== @@ -1210,10 +1210,13 @@ def multi_connect(self, signal_dict): self.connect_signal(signal_name, func) def notify(self, signal_name, *args, qualifiers=None, **kwargs): + signal_callbacks = self._callbacks.get(signal_name) + if signal_callbacks is None: + return + if self._log is not None: self._log.info('Signal: %s', signal_name) - signal_callbacks = self._callbacks.get(signal_name, {}) callbacks = signal_callbacks.get(qualifiers, []) for func in list(callbacks): if func() is None: ===================================== gajim/common/modules/chatstates.py ===================================== @@ -29,7 +29,6 @@ from nbxmpp.const import Chatstate as State from gi.repository import GLib -from gajim.common import app from gajim.common.structs import OutgoingMessage from gajim.common.modules.base import BaseModule @@ -44,7 +43,7 @@ def ensure_enabled(func): @wraps(func) def func_wrapper(self, *args, **kwargs): - if not self.enabled: + if not self._enabled: return None return func(self, *args, **kwargs) return func_wrapper @@ -76,14 +75,22 @@ def __init__(self, con: ConnectionT) -> None: self._blocked = [] # type: List[str] self._enabled = False - @property - def enabled(self): - return self._enabled + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) - @enabled.setter - def enabled(self, value): + def _on_client_resume_failed(self, _client, _signal_name): + self._set_enabled(False) + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._set_enabled(False) + elif state.is_connected: + self._set_enabled(True) + + def _set_enabled(self, value): if self._enabled == value: return + self._log.info('Chatstate module %s', 'enabled' if value else 'disabled') self._enabled = value @@ -93,10 +100,7 @@ def enabled(self, value): 2, self._check_last_interaction) else: self.cleanup() - self._chatstates = {} - self._last_keyboard_activity = {} - self._last_mouse_activity = {} - self._blocked = [] + self._con.get_module('Contacts').force_chatstate_update() @ensure_enabled def _presence_received(self, @@ -171,23 +175,7 @@ def _check_last_interaction(self) -> GLib.SOURCE_CONTINUE: if new_chatstate is not None: if self._chatstates.get(jid) != new_chatstate: contact = self._get_contact(jid) - - # if contact is None: - # room, nick = app.get_room_and_nick_from_fjid(jid) - # contact = app.contacts.get_gc_contact( - # self._account, room, nick) - # if contact is not None: - # contact = contact.as_contact() - # else: - # # Contact not found, maybe we left the group chat - # # or the contact was removed from the roster - # self._log.info( - # 'Contact %s not found, reset chatstate', jid) - # self._chatstates.pop(jid, None) - # self._last_mouse_activity.pop(jid, None) - # self._last_keyboard_activity.pop(jid, None) - # continue - self.set_chatstate(contact, new_chatstate) + self.set_chatstate(contact, new_chatstate) return GLib.SOURCE_CONTINUE @@ -332,12 +320,19 @@ def remove_delay_timeout(self, contact): def remove_all_delay_timeouts(self): for timeout in self._delay_timeout_ids.values(): GLib.source_remove(timeout) - self._delay_timeout_ids = {} + self._delay_timeout_ids.clear() def cleanup(self): self.remove_all_delay_timeouts() if self._timeout_id is not None: GLib.source_remove(self._timeout_id) + self._timeout_id = None + + self._chatstates.clear() + self._remote_chatstate.clear() + self._last_keyboard_activity.clear() + self._last_mouse_activity.clear() + self._blocked = [] def get_instance(*args: Any, **kwargs: Any) -> Tuple[Chatstate, str]: ===================================== gajim/common/modules/contacts.py ===================================== @@ -47,6 +47,15 @@ def __init__(self, con: ConnectionT) -> None: BaseModule.__init__(self, con) self._contacts = {} + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) + + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_presence() + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_presence() def add_contact(self, jid, groupchat=False): if isinstance(jid, str): @@ -90,12 +99,16 @@ def get_contacts_with_domain(self, domain): contacts.append(contact) return contacts - def reset_presence(self): + def _reset_presence(self): for contact in self._contacts.values(): if contact.is_groupchat or contact.is_pm_contact: continue contact.update_presence(UNKNOWN_PRESENCE) + def force_chatstate_update(self): + for contact in self._contacts.values(): + contact.force_chatstate_update() + class CommonContact(Observable): def __init__(self, logger, jid, account): @@ -103,6 +116,8 @@ def __init__(self, logger, jid, account): self._jid = jid self._account = account + self._resources = {} + def _module(self, name): return app.get_client(self._account).get_module(name) @@ -135,6 +150,10 @@ def is_groupchat(self): def is_pm_contact(self): return False + def force_chatstate_update(self): + for contact in self._resources.values(): + contact.notify('chatstate-update') + class BareContact(CommonContact): def __init__(self, logger, jid, account): @@ -142,7 +161,6 @@ def __init__(self, logger, jid, account): self.settings = ContactSettings(account, str(jid)) - self._resources = {} self._avatar_sha = app.storage.cache.get_contact(jid, 'avatar') def add_resource(self, resource): @@ -320,8 +338,6 @@ def __init__(self, logger, jid, account): self.settings = GroupChatSettings(account, str(jid)) - self._resources = {} - @property def is_groupchat(self): return True ===================================== gajim/common/modules/mam.py ===================================== @@ -68,6 +68,9 @@ def __init__(self, con): # Holds archive jids where catch up was successful self._catch_up_finished = [] + self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', self._on_client_resume_failed) + def pass_disco(self, info): if Namespace.MAM_2 not in info.features: return @@ -80,7 +83,14 @@ def pass_disco(self, info): account=self._account, feature=Namespace.MAM_2)) - def reset_state(self): + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_state() + + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_state() + + def _reset_state(self): self._mam_query_ids.clear() self._catch_up_finished.clear() ===================================== gajim/common/modules/muc.py ===================================== @@ -30,12 +30,10 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import ged from gajim.common.const import KindConstant from gajim.common.const import MUCJoinedState from gajim.common.helpers import AdditionalDataDict from gajim.common.helpers import get_default_muc_config -from gajim.common.helpers import event_filter from gajim.common.helpers import get_group_chat_nick from gajim.common.structs import MUCData from gajim.common.structs import MUCPresenceData @@ -109,6 +107,8 @@ def __init__(self, con): self._con.connect_signal('state-changed', self._on_client_state_changed) + self._con.connect_signal('resume-failed', + self._on_client_resume_failed) self._rejoin_muc = set() self._join_timeouts = {} @@ -117,6 +117,14 @@ def __init__(self, con): self._joined_users = defaultdict(dict) self._mucs = {} + + def _on_resume_failed(self, _client, _signal_name): + self._reset_presence() + + def _on_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + self._reset_presence() + @property def supported(self): return self._muc_service_jid is not None @@ -158,7 +166,13 @@ def _set_muc_state(self, room_jid, state): contact = self._get_contact(room_jid, groupchat=True) contact.notify('state-changed') - def reset_state(self): + def _reset_state(self): + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) + + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + for muc in self._mucs.values(): self._joined_users.pop(muc.jid, None) self._set_muc_state(muc.jid, MUCJoinedState.NOT_JOINED) @@ -808,13 +822,10 @@ def invite(self, room, jid, reason=None, continue_=False): def _on_client_state_changed(self, _client, _signal_name, state): if state.is_disconnected: - for room_jid in list(self._rejoin_timeouts.keys()): - self._remove_rejoin_timeout(room_jid) - - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) + self._reset_state() - self.reset_state() + def _on_client_resume_failed(self, _client, _signal_name): + self._reset_state() def get_instance(*args, **kwargs): ===================================== gajim/common/styling.py ===================================== @@ -127,6 +127,7 @@ class StrikeSpan(StyleObject): @dataclass class ParsingResult: + text: str blocks: list @@ -144,7 +145,7 @@ def process(text, nested=False): result = process(block.unquote(), nested=True) block.blocks = result.blocks - return ParsingResult(blocks) + return ParsingResult(text, blocks) def _parse_blocks(text, nested): ===================================== gajim/gtk/conversation/message_widget.py ===================================== @@ -24,8 +24,15 @@ def __init__(self, account): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self._account = account - def add_content(self, blocks): - for block in blocks: + self._content = None + + def get_content(self): + return self._content + + def add_content(self, content): + self.clear() + self._content = content + for block in content.blocks: if block.name == 'plain': widget = PlainWidget(self._account) widget.add_content(block) @@ -40,8 +47,13 @@ def add_content(self, blocks): if block.name == 'quote': message_widget = MessageWidget(self._account) - message_widget.add_content(block.blocks) + message_widget.add_content(block) widget = QuoteWidget(self._account) widget.attach_message_widget(message_widget) self.add(widget) continue + + self.show_all() + + def clear(self): + self.foreach(self.remove) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -60,7 +60,7 @@ def __init__(self, result = process(text) message_widget = MessageWidget(account) - message_widget.add_content(result.blocks) + message_widget.add_content(result) self.grid.attach(message_widget, 1, 0, 1, 1) self.show_all() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -82,8 +82,8 @@ def __init__(self, 'conversation-mention-highlight') result = process(text) - message_widget = MessageWidget(account) - message_widget.add_content(result.blocks) + self._message_widget = MessageWidget(account) + self._message_widget.add_content(result) self._meta_box = Gtk.Box(spacing=6) self._meta_box.pack_start( @@ -129,7 +129,7 @@ def __init__(self, avatar_placeholder.add(self._avatar_surface) bottom_box = Gtk.Box(spacing=6) - bottom_box.add(message_widget) + bottom_box.add(self._message_widget) bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) @@ -214,21 +214,15 @@ def set_receipt(self): def set_displayed(self): self._has_displayed = True - def set_correction(self, message_id, text, other_text_tags, kind, name, - additional_data=None): - self._corrections.append(self.textview.get_text()) - self.textview.clear() + def set_correction(self, text, message_id): + self._corrections.append(self._message_widget.get_content().text) + result = process(text) + self._message_widget.add_content(result) + self._has_receipt = False self._message_icons.set_receipt_icon_visible(False) self._message_icons.set_correction_icon_visible(True) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - name=name, - additional_data=additional_data) - corrections = '\n'.join(line for line in self._corrections) corrections = reduce_chars_newlines( corrections, max_chars=150, max_lines=10) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -150,14 +150,7 @@ def add_message(self, history_mode=self._history_mode) else: if correct_id: - self.correct_message( - correct_id, - message_id, - text, - other_text_tags, - kind, - name, - additional_data=additional_data) + self.correct_message(correct_id, message_id, text) return avatar = self._get_avatar(kind, name) @@ -371,13 +364,10 @@ def scroll_to_end(self, force=False): if self.autoscroll or force: GLib.idle_add(scroll_to_end, self.get_parent().get_parent()) - def correct_message(self, correct_id, message_id, text, - other_text_tags, kind, name, additional_data=None): + def correct_message(self, correct_id, message_id, text): message_row = self._get_row_by_message_id(correct_id) if message_row is not None: - message_row.set_correction( - message_id, text, other_text_tags, kind, name, - additional_data=additional_data) + message_row.set_correction(text, message_id) message_row.set_merged(False) def show_receipt(self, id_): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43c93338dd2716c01472a468eb368ff… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/43c93338dd2716c01472a468eb368ff… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix some things
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 43c93338 by lovetox at 2021-04-18T23:09:16+02:00 Fix some things - - - - - 2 changed files: - gajim/chat_control.py - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -48,7 +48,6 @@ from gajim.common.helpers import open_uri from gajim.common.helpers import geo_provider_from_location from gajim.common.helpers import open_file -from gajim.common.contacts import GC_Contact from gajim.common.const import AvatarSize from gajim.common.const import KindConstant from gajim.common.const import PEPEventType @@ -1191,7 +1190,6 @@ def _on_client_state_changed(self, _client, _signal_name, state): self.msg_textview.set_sensitive(state.is_connected) self.msg_textview.set_editable(state.is_connected) - print(state) self._update_avatar() self.update_toolbar() self.draw_banner() ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -50,7 +50,7 @@ def __init__(self, account): self._textview = CodeTextview() self._scrolled = Gtk.ScrolledWindow() self._scrolled.set_policy(Gtk.PolicyType.AUTOMATIC, - Gtk.PolicyType.AUTOMATIC) + Gtk.PolicyType.NEVER) self._scrolled.set_hexpand(True) self._scrolled.set_vexpand(True) self._scrolled.set_propagate_natural_height(True) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/43c93338dd2716c01472a468eb368ffa… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/43c93338dd2716c01472a468eb368ffa… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Refactor Observable
by Philipp Hörist 18 Apr '21

18 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 7425ad59 by lovetox at 2021-04-18T23:01:45+02:00 Refactor Observable - - - - - cf93e345 by lovetox at 2021-04-18T23:01:45+02:00 Add SimpleClientState - - - - - e5527d7b by lovetox at 2021-04-18T23:01:45+02:00 Refactor active/inactive Control state - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/common/client.py - gajim/common/const.py - gajim/common/helpers.py - gajim/common/modules/contacts.py - gajim/common/modules/muc.py - gajim/groupchat_control.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -114,6 +114,10 @@ def __init__(self, parent_win, jid, acct, session, resource=None): self.toggle_emoticons() + if self._type == ControlType.CHAT: + self._client.connect_signal('state-changed', + self._on_client_state_changed) + if not app.settings.get('hide_chat_banner'): self.xml.banner_eventbox.set_no_show_all(False) @@ -1183,13 +1187,14 @@ def _on_convert_to_gc_menuitem_activate(self, _widget): """ dialogs.TransformChatToMUC(self.account, [self.contact.jid]) - def got_connected(self): - ChatControlBase.got_connected(self) - self.draw_banner() - self.update_actions() + def _on_client_state_changed(self, _client, _signal_name, state): + self.msg_textview.set_sensitive(state.is_connected) + self.msg_textview.set_editable(state.is_connected) - def got_disconnected(self): - ChatControlBase.got_disconnected(self) + print(state) + self._update_avatar() + self.update_toolbar() + self.draw_banner() self.update_actions() def _on_presence_received(self, event): ===================================== gajim/chat_control_base.py ===================================== @@ -251,7 +251,6 @@ def __init__(self, parent_win, widget_name, jid, acct, # pylint: disable=line-too-long self.register_events([ - ('our-show', ged.GUI1, self._on_our_show), ('ping-sent', ged.GUI1, self._nec_ping), ('ping-reply', ged.GUI1, self._nec_ping), ('ping-error', ged.GUI1, self._nec_ping), @@ -448,15 +447,6 @@ def remove_session(self, session): self.session.control = None self.session = None - def _on_our_show(self, event): - if event.show == 'connecting': - return - - if event.show == 'offline': - self.got_disconnected() - else: - self.got_connected() - def _nec_ping(self, obj): raise NotImplementedError @@ -686,6 +676,8 @@ def shutdown(self): app.plugin_manager.remove_gui_extension_point( 'chat_control_base_update_toolbar', self) + self._client.disconnect_all_from_obj(self) + for i in list(self.handlers.keys()): if self.handlers[i].handler_is_connected(i): self.handlers[i].disconnect(i) @@ -1523,18 +1515,6 @@ def scroll_messages(self, direction, msg_buf, msg_type): message = '> %s\n' % message.replace('\n', '\n> ') msg_buf.set_text(message) - def got_connected(self): - self.msg_textview.set_sensitive(True) - self.msg_textview.set_editable(True) - self.update_toolbar() - - def got_disconnected(self): - self.msg_textview.set_sensitive(False) - self.msg_textview.set_editable(False) - self.conversation_view.grab_focus() - - self.update_toolbar() - class ScrolledWindow(Gtk.ScrolledWindow): def __init__(self, *args, **kwargs): ===================================== gajim/common/client.py ===================================== @@ -28,12 +28,14 @@ from gajim.common import helpers from gajim.common import modules from gajim.common.const import ClientState +from gajim.common.const import SimpleClientState from gajim.common.structs import UNKNOWN_PRESENCE from gajim.common.helpers import get_custom_host from gajim.common.helpers import get_user_proxy from gajim.common.helpers import warn_about_plain_connection from gajim.common.helpers import get_resource from gajim.common.helpers import get_idle_status_message +from gajim.common.helpers import Observable from gajim.common.idle import Monitor from gajim.common.i18n import _ @@ -45,8 +47,9 @@ log = logging.getLogger('gajim.client') -class Client: +class Client(Observable): def __init__(self, account): + Observable.__init__(self, log) self._client = None self._account = account self.name = account @@ -199,6 +202,8 @@ def _on_resume_successful(self, _client, _signal_name): account=self._account, show=self._status)) + self.notify('state-changed', SimpleClientState.CONNECTED) + def _set_client_available(self): self._set_state(ClientState.AVAILABLE) app.nec.push_incoming_event(NetworkEvent('account-connected', @@ -270,18 +275,19 @@ def _on_password(password): self._schedule_reconnect() app.nec.push_incoming_event( NetworkEvent('our-show', account=self._account, show='error')) + self.notify('state-changed', SimpleClientState.RESUME_IN_PREGRESS) else: self.get_module('Chatstate').enabled = False app.nec.push_incoming_event(NetworkEvent( 'our-show', account=self._account, show='offline')) self._after_disconnect() + self.get_module('Contacts').reset_presence() + self.notify('state-changed', SimpleClientState.DISCONNECTED) def _after_disconnect(self): self._disable_reconnect_timer() - self.get_module('VCardAvatars').avatar_advertised = False - app.proxy65_manager.disconnect(self._client) self.get_module('Bytestream').remove_all_transfers() @@ -291,9 +297,6 @@ def _after_disconnect(self): self._destroy_client = False self._create_client() - jid = self.get_own_jid() - contact = self.get_module('Contacts').get_contact(jid) - contact.update_presence(UNKNOWN_PRESENCE) app.nec.push_incoming_event(NetworkEvent('account-disconnected', account=self._account)) @@ -440,6 +443,8 @@ def _finish_connect(self): self.get_module('Annotations').request_annotations() self.get_module('Blocking').get_blocking_list() + self.notify('state-changed', SimpleClientState.CONNECTED) + # Inform GUI we just signed in app.nec.push_incoming_event(NetworkEvent( 'signed-in', account=self._account, conn=self)) @@ -624,6 +629,7 @@ def _screensaver_state_changed(application, _param): Monitor.set_extended_away(active) def cleanup(self): + self.disconnect_signals() self._destroyed = True if Monitor.is_available(): Monitor.disconnect(self._idle_handler_id) ===================================== gajim/common/const.py ===================================== @@ -274,6 +274,24 @@ def is_available(self): return self == ClientState.AVAILABLE +class SimpleClientState(Enum): + DISCONNECTED = 'disconnected' + CONNECTED = 'connected' + RESUME_IN_PREGRESS = 'resume-in-progress' + + @property + def is_disconnected(self): + return self == SimpleClientState.DISCONNECTED + + @property + def is_connected(self): + return self == SimpleClientState.CONNECTED + + @property + def is_resume_in_progress(self): + return self == SimpleClientState.RESUME_IN_PREGRESS + + class JingleState(Enum): NULL = 'stop' CONNECTING = 'connecting' ===================================== gajim/common/helpers.py ===================================== @@ -1183,7 +1183,7 @@ def __init__(self, log_=None): def disconnect_signals(self): self._callbacks = defaultdict(lambda: defaultdict(list)) - def disconnect(self, object_): + def disconnect_all_from_obj(self, object_): for signal_name, qualifiers in self._callbacks.items(): for qualifier, handlers in qualifiers.items(): for handler in list(handlers): @@ -1191,7 +1191,10 @@ def disconnect(self, object_): if func is None or func.__self__ is object_: self._callbacks[signal_name][qualifier].remove(handler) - def connect(self, signal_name, func, qualifiers=None): + def disconnect(self, *args): + self.disconnect_all_from_obj(*args) + + def connect_signal(self, signal_name, func, qualifiers=None): if not inspect.ismethod(func): raise ValueError('Only bound methods allowed') @@ -1199,9 +1202,12 @@ def connect(self, signal_name, func, qualifiers=None): self._callbacks[signal_name][qualifiers].append(weak_func) + def connect(self, *args, **kwargs): + self.connect_signal(*args, **kwargs) + def multi_connect(self, signal_dict): for signal_name, func in signal_dict.items(): - self.connect(signal_name, func) + self.connect_signal(signal_name, func) def notify(self, signal_name, *args, qualifiers=None, **kwargs): if self._log is not None: ===================================== gajim/common/modules/contacts.py ===================================== @@ -90,6 +90,12 @@ def get_contacts_with_domain(self, domain): contacts.append(contact) return contacts + def reset_presence(self): + for contact in self._contacts.values(): + if contact.is_groupchat or contact.is_pm_contact: + continue + contact.update_presence(UNKNOWN_PRESENCE) + class CommonContact(Observable): def __init__(self, logger, jid, account): ===================================== gajim/common/modules/muc.py ===================================== @@ -107,10 +107,8 @@ def __init__(self, con): priority=49) ] - self.register_events([ - ('account-disconnected', ged.CORE, self._on_account_disconnected), - # ('signed-in', ged.GUI1, self._on_signed_in), - ]) + self._con.connect_signal('state-changed', + self._on_client_state_changed) self._rejoin_muc = set() self._join_timeouts = {} @@ -461,7 +459,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): self._remove_join_timeout(room_jid) self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('destroyed', properties) + room.notify('room-destroyed', properties) return if properties.is_nickname_changed: @@ -517,7 +515,7 @@ def _on_muc_user_presence(self, _con, stanza, properties): if properties.is_muc_self_presence and properties.is_kicked: self._set_muc_state(room_jid, MUCJoinedState.NOT_JOINED) room.set_not_joined() - room.notify('kicked', properties) + room.notify('room-kicked', properties) status_codes = properties.muc_status_codes or [] if StatusCode.REMOVED_SERVICE_SHUTDOWN in status_codes: self._start_rejoin_timeout(room_jid) @@ -808,13 +806,15 @@ def invite(self, room, jid, reason=None, continue_=False): return self._nbxmpp('MUC').invite(room, jid, reason, password, continue_, type_) - @event_filter(['account']) - def _on_account_disconnected(self, _event): - for room_jid in list(self._rejoin_timeouts.keys()): - self._remove_rejoin_timeout(room_jid) + def _on_client_state_changed(self, _client, _signal_name, state): + if state.is_disconnected: + for room_jid in list(self._rejoin_timeouts.keys()): + self._remove_rejoin_timeout(room_jid) - for room_jid in list(self._join_timeouts.keys()): - self._remove_join_timeout(room_jid) + for room_jid in list(self._join_timeouts.keys()): + self._remove_join_timeout(room_jid) + + self.reset_state() def get_instance(*args, **kwargs): ===================================== gajim/groupchat_control.py ===================================== @@ -49,6 +49,7 @@ from gajim.common.helpers import event_filter from gajim.common.helpers import to_user_string from gajim.common.const import AvatarSize +from gajim.common.const import SimpleClientState from gajim.common.i18n import _ from gajim.common.const import MUCJoinedState @@ -92,6 +93,9 @@ def __init__(self, parent_win, jid, muc_data, acct): jid, acct) + self._client.connect_signal('state-changed', + self._on_client_state_changed) + self.force_non_minimizable = False self.is_anonymous = True @@ -193,9 +197,7 @@ def __init__(self, parent_win, jid, muc_data, acct): ('bookmarks-received', ged.GUI1, self._on_bookmarks_received), ]) - self.is_connected = False - # disable win, we are not connected yet - ChatControlBase.got_disconnected(self) + self._set_control_inactive() # Stack self.xml.stack.show_all() @@ -241,31 +243,13 @@ def _connect_contact_signals(self): def _on_muc_state_changed(self, _contact, _signal_name): state = self.contact.state if state == MUCJoinedState.JOINED: - self.roster.initial_draw() - - self.is_connected = True - ChatControlBase.got_connected(self) - - self.xml.formattings_button.set_sensitive(True) - - self.conversation_view.update_avatars() - - self.update_actions() + self._set_control_active() elif state == MUCJoinedState.NOT_JOINED: + self._set_control_inactive() - self.xml.formattings_button.set_sensitive(False) - - self.roster.enable_sort(False) - self.roster.clear() - - self.is_connected = False - ChatControlBase.got_disconnected(self) - - self._client.get_module('Chatstate').remove_delay_timeout( - self.contact) - - self.update_actions() + def _on_client_state_changed(self, _client, _signal_name, state): + pass @property def _muc_data(self): @@ -914,12 +898,6 @@ def _on_room_config_changed(self, _contact, _signal_name, properties): for change in changes: self.add_info_message(change) - def _on_our_show(self, event): - client = app.get_client(event.account) - if (event.show == 'offline' and - not client.state.is_reconnect_scheduled): - self.got_disconnected() - @event_filter(['account']) def _nec_ping(self, event): if not event.contact.is_groupchat: @@ -946,14 +924,30 @@ def is_connected(self) -> bool: def is_connected(self, value: bool) -> None: app.gc_connected[self.account][self.room_jid] = value - def got_disconnected(self): + def _set_control_active(self): + self.xml.formattings_button.set_sensitive(True) + self.msg_textview.set_sensitive(True) + self.msg_textview.set_editable(True) + + self.roster.initial_draw() + + self.is_connected = True + + self.xml.formattings_button.set_sensitive(True) + + self.conversation_view.update_avatars() + + self.update_actions() + + def _set_control_inactive(self): self.xml.formattings_button.set_sensitive(False) + self.msg_textview.set_sensitive(False) + self.msg_textview.set_editable(False) self.roster.enable_sort(False) self.roster.clear() self.is_connected = False - ChatControlBase.got_disconnected(self) self._client.get_module('Chatstate').remove_delay_timeout(self.contact) @@ -998,7 +992,6 @@ def _on_user_joined(self, _contact, _signal_name, user_contact, properties): self.update_actions() def _on_room_config_finished(self, _contact, _signal_name): - self.got_connected() self._show_page('groupchat') self.add_info_message(_('A new group chat has been created')) @@ -1164,11 +1157,6 @@ def _on_room_kicked(self, _contact, _signal_name, properties): message = message.format(actor=actor, reason=reason) self.add_info_message(message) - self.got_disconnected() - - # Update Actions - self.update_actions() - def _on_user_left(self, _contact, _signal_name, user_contact, properties): status_codes = properties.muc_status_codes or [] nick = user_contact.name @@ -1225,7 +1213,6 @@ def _on_user_left(self, _contact, _signal_name, user_contact, properties): self.add_info_message(message) def _on_room_joined(self, _contact, _signal_name): - self.got_connected() self._show_page('groupchat') def _on_room_password_required(self, _contact, _signal_name, _properties): @@ -1263,8 +1250,6 @@ def _on_room_destroyed(self, _contact, _signal_name, properties): 'instead: xmpp:%s?join') % str(alternate) self.add_info_message(join_message) - self.got_disconnected() - self._client.get_module('Bookmarks').remove(self.room_jid) if self._wait_for_destruction: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a5a8b4b10ed5c071cebec6df8a03f4b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a5a8b4b10ed5c071cebec6df8a03f4b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] CodeWidget: Add header and styling
by Daniel Brötzmann 18 Apr '21

18 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a5a8b4b1 by wurstsalat at 2021-04-18T15:34:51+02:00 CodeWidget: Add header and styling - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/conversation/code_widget.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -88,6 +88,20 @@ font-size: small; font-weight: bold; } +.code-widget { + border: 1px solid @borders; + border-radius: 4px; +} +.code-widget-header { + background-color: alpha(@insensitive_fg_color, 0.4); + padding: 0 6px; +} +.code-widget-header label { + font-size: small; +} +.code-widget-header button { + padding: 0; +} .link-button { min-height: 0px; } ===================================== gajim/gtk/conversation/code_widget.py ===================================== @@ -12,34 +12,77 @@ # 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 gi gi.require_version('GtkSource', '4') from gi.repository import GObject +from gi.repository import Gdk from gi.repository import Gtk from gi.repository import GtkSource +from gajim.common.i18n import _ + +log = logging.getLogger('gajim.gui.conversation.code_widget') + class CodeWidget(Gtk.Box): def __init__(self, account): Gtk.Box.__init__(self, orientation=Gtk.Orientation.VERTICAL) self.set_vexpand(True) + self.get_style_context().add_class('code-widget') self._account = account + header = Gtk.Box() + header.set_spacing(6) + header.get_style_context().add_class('code-widget-header') + self._lang_label = Gtk.Label() + header.add(self._lang_label) + + copy_button = Gtk.Button.new_from_icon_name( + 'edit-copy-symbolic', Gtk.IconSize.MENU) + copy_button.set_tooltip_text(_('Copy code snippet')) + copy_button.connect('clicked', self._on_copy) + header.add(copy_button) + self.add(header) + 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._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._scrolled) - self.add(self._textview) + def _on_copy(self, _button): + text = self._textview.get_code() + clipboard = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clipboard.set_text(text, -1) def add_content(self, block): - self._textview.print_code(block) + code, lang = self._prepare_code(block.text) + lang_name = self._textview.set_language(lang) + if lang is None: + self._lang_label.set_text(_('Code snippet')) + else: + self._lang_label.set_text(_('Code snippet (%s)') % lang_name) + + self._textview.print_code(code) + + @staticmethod + def _prepare_code(text): + code_start = text.partition('\n')[0] + lang = None + if len(code_start) > 3: + lang = code_start[3:] + + code = text.partition('\n')[2][:-4] + return code, lang class CodeTextview(GtkSource.View): @@ -51,9 +94,21 @@ def __init__(self): self._source_manager = GtkSource.LanguageManager.get_default() - def print_code(self, block): + def set_language(self, language_string): + if language_string is None: + lang = self._source_manager.get_language('python3') + else: + lang = self._source_manager.get_language(language_string) + log.debug('Code snippet lang: %s', lang.get_name()) + self.get_buffer().set_language(lang) + return lang.get_name() + + def get_code(self): buffer_ = self.get_buffer() - lang = self._source_manager.get_language('python3') - buffer_.set_language(lang) + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def print_code(self, code): self.set_show_line_numbers(True) - buffer_.insert(buffer_.get_start_iter(), block.text) + buffer_ = self.get_buffer() + buffer_.insert(buffer_.get_start_iter(), code) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5a8b4b10ed5c071cebec6df8a03f4b6… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a5a8b4b10ed5c071cebec6df8a03f4b6… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits