Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] Fix history mode
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 2561aac3 by lovetox at 2021-04-04T17:18:28+02:00 Fix history mode - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -90,7 +90,8 @@ def __init__(self, account, contact, history_mode=False): self._last_incoming_timestamp = datetime.fromtimestamp(0) # Insert the very first row, containing the scroll hint and load button - self._scroll_hint_row = ScrollHintRow(self._account) + self._scroll_hint_row = ScrollHintRow(self._account, + history_mode=self._history_mode) self.add(self._scroll_hint_row) self._timestamps_inserted.append(datetime.fromtimestamp(0)) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2561aac32c0cf6b65a624469dcabaf64… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2561aac32c0cf6b65a624469dcabaf64… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add ScrolledView
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c4b42214 by lovetox at 2021-04-04T17:16:05+02:00 Add ScrolledView - - - - - 8 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/scroll_hint.py - + gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -180,8 +180,8 @@ def __init__(self, parent_win, jid, acct, session, resource=None): content_area.add(self.info_bar_label) self.info_bar.set_no_show_all(True) - self.xml.vbox2.pack_start(self.info_bar, False, True, 5) - self.xml.vbox2.reorder_child(self.info_bar, 1) + self.xml.textview_box.pack_start(self.info_bar, False, True, 5) + self.xml.textview_box.reorder_child(self.info_bar, 1) # List of waiting infobar messages self.info_bar_queue = [] ===================================== gajim/chat_control_base.py ===================================== @@ -49,6 +49,7 @@ from gajim import gtkgui_helpers from gajim.gui.conversation.view import ConversationView +from gajim.gui.conversation.scrolled import ScrolledView from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog @@ -166,38 +167,18 @@ def __init__(self, parent_win, widget_name, jid, acct, # Create ConversationView and connect signals self.conversation_view = ConversationView(self.account, self.contact) - id_ = self.conversation_view.connect('quote', self.on_quote) - self.handlers[id_] = self.conversation_view - id_ = self.conversation_view.connect( - 'load-history', self._on_load_history) - self.handlers[id_] = self.conversation_view + self.conversation_view.connect('quote', self.on_quote) + id_ = self.conversation_view.connect( 'key-press-event', self._on_conversation_view_key_press) self.handlers[id_] = self.conversation_view - # This is a workaround: as soon as a line break occurs in Gtk.TextView - # with word-char wrapping enabled, a hyphen character is automatically - # inserted before the line break. This triggers the hscrollbar to show, - # see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 - # Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad - # performance during resize, and prevent the window from being shrunk - # horizontally under certain conditions (applies to GroupchatControl) - hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar() - hscrollbar.hide() - - self.xml.conversation_scrolledwindow.add(self.conversation_view) - self._scrolled_old_upper = None - self._scrolled_old_value = None - - self._fetch_start_upper = None - self._current_upper = 0 - self._autoscroll = True - self._no_more_messages = False - - vadjustment = self.xml.conversation_scrolledwindow.get_vadjustment() - - vadjustment.connect('notify::upper', self._on_adj_upper_changed) - vadjustment.connect('notify::value', self._on_adj_value_changed) + self._scrolled_view = ScrolledView() + self._scrolled_view.add(self.conversation_view) + self.xml.textview_box.add(self._scrolled_view) + self.xml.textview_box.reorder_child(self._scrolled_view, 2) + self._scrolled_view.connect('request-history', + self.fetch_n_lines_history, 30) self.msg_textview = MessageInputTextView() self.msg_textview.connect('paste-clipboard', @@ -710,7 +691,11 @@ def shutdown(self): self.handlers[i].disconnect(i) self.handlers.clear() + self.conversation_view.destroy() + self._scrolled_view.destroy() + del self.conversation_view + del self._scrolled_view del self.msg_textview del self.msg_scrolledwindow @@ -1407,10 +1392,7 @@ def set_control_active(self, state): def scroll_to_end(self, force=False): self.conversation_view.scroll_to_end(force) - def _on_load_history(self, _button, lines): - self.fetch_n_lines_history(lines) - - def fetch_n_lines_history(self, n_lines): + def fetch_n_lines_history(self, _scrolled, n_lines): row = self.conversation_view.get_first_message_row() if row is None: timestamp = time.time() @@ -1431,8 +1413,7 @@ def fetch_n_lines_history(self, n_lines): n_lines) if not messages: - self._no_more_messages = True - print('SET NO MORE') + self._scrolled_view.set_history_complete() return for msg in messages: @@ -1471,46 +1452,6 @@ def has_focus(self): return True return False - def _on_adj_upper_changed(self, adj, *args): - upper = adj.get_upper() - diff = upper - self._current_upper - - if diff != 0: - self._current_upper = upper - if self._autoscroll: - adj.set_value(adj.get_upper() - adj.get_page_size()) - else: - # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 - self.xml.conversation_scrolledwindow.set_kinetic_scrolling(True) - adj.set_value(adj.get_value() + diff) - - if upper == adj.get_page_size(): - # There is no scrollbar, load history until there is - self.fetch_n_lines_history(30) - - def _on_adj_value_changed(self, adj, *args): - bottom = adj.get_upper() - adj.get_page_size() - if (bottom - adj.get_value()) < 1: - self._autoscroll = True - else: - self._autoscroll = False - - if self._no_more_messages: - self._fetch_start_upper = None - return - - if self._fetch_start_upper == adj.get_upper(): - return - - self._fetch_start_upper = None - - # Load messages when we are near the top - if adj.get_value() < adj.get_page_size() * 2: - self._fetch_start_upper = adj.get_upper() - # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 - self.xml.conversation_scrolledwindow.set_kinetic_scrolling(False) - self.fetch_n_lines_history(30) - def scroll_messages(self, direction, msg_buf, msg_type): if msg_type == 'sent': history = self.sent_history ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -403,7 +403,7 @@ <property name="visible">True</property> <property name="can_focus">True</property> <child> - <object class="GtkBox" id="vbox2"> + <object class="GtkBox" id="textview_box"> <property name="visible">True</property> <property name="can_focus">False</property> <property name="orientation">vertical</property> @@ -618,25 +618,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="height_request">60</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <child> <object class="GtkSeparator"> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -143,7 +143,7 @@ <property name="margin_bottom">7</property> <property name="spacing">3</property> <child> - <object class="GtkBox" id="gc_textviews_vbox"> + <object class="GtkBox" id="textview_box"> <property name="width_request">0</property> <property name="visible">True</property> <property name="can_focus">False</property> @@ -256,27 +256,7 @@ </packing> </child> <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="width_request">200</property> - <property name="height_request">60</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">in</property> - <property name="overlay_scrolling">False</property> - <child> - <placeholder/> - </child> - <style> - <class name="scrolled-no-border"/> - <class name="no-scroll-indicator"/> - <class name="scrollbar-style"/> - </style> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> + <placeholder/> </child> <child> <object class="GtkSeparator"> ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -21,6 +21,10 @@ class DateRow(BaseRow): def __init__(self, account, date_string, timestamp): BaseRow.__init__(self, account) + + self.set_selectable(False) + self.set_activatable(False) + self.type = 'date' self.timestamp = timestamp self.get_style_context().add_class('conversation-date-row') ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -24,6 +24,9 @@ class ScrollHintRow(BaseRow): def __init__(self, account, history_mode=False): BaseRow.__init__(self, account) + self.set_selectable(False) + self.set_activatable(False) + self.type = 'system' self.timestamp = datetime.fromtimestamp(0) @@ -42,11 +45,5 @@ def __init__(self, account, history_mode=False): self.label.set_text(_('Scroll up to load more chat history…')) self.grid.attach(self.label, 0, 1, 1, 1) - self._button = Gtk.Button.new_from_icon_name( - 'go-up-symbolic', Gtk.IconSize.BUTTON) - self._button.set_tooltip_text(_('Load more messages')) - self._button.connect('clicked', self._on_load_history) - self.grid.attach(self._button, 0, 0, 1, 1) - - def _on_load_history(self, _button): - self.get_parent().emit('load-history', 30) + def set_history_complete(self): + self.label.set_text(_('There is no more history')) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -0,0 +1,109 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gtk +from gi.repository import GObject + + +class ScrolledView(Gtk.ScrolledWindow): + + __gsignals__ = { + 'request-history': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + () + ) + } + + def __init__(self, *args, **kwargs): + Gtk.ScrolledWindow.__init__(self, *args, **kwargs) + + self.set_overlay_scrolling(False) + self.get_style_context().add_class('scrolled-no-border') + self.get_style_context().add_class('no-scroll-indicator') + self.get_style_context().add_class('scrollbar-style') + self.set_shadow_type(Gtk.ShadowType.IN) + self.set_vexpand(True) + + self.set_policy(Gtk.PolicyType.AUTOMATIC, Gtk.PolicyType.AUTOMATIC) + + # This is a workaround: as soon as a line break occurs in Gtk.TextView + # with word-char wrapping enabled, a hyphen character is automatically + # inserted before the line break. This triggers the hscrollbar to show, + # see: https://gitlab.gnome.org/GNOME/gtk/-/issues/2384 + # Using set_hscroll_policy(Gtk.Scrollable.Policy.NEVER) would cause bad + # performance during resize, and prevent the window from being shrunk + # horizontally under certain conditions (applies to GroupchatControl) + self.get_hscrollbar().hide() + + self._current_upper = 0 + self._autoscroll = True + self._request_history_at_upper = None + self._complete = False + + vadjustment = self.get_vadjustment() + vadjustment.connect('notify::upper', self._on_adj_upper_changed) + vadjustment.connect('notify::value', self._on_adj_value_changed) + + @property + def autoscroll(self): + return self._autoscroll + + def set_history_complete(self): + self._complete = True + self.get_child().get_child().set_history_complete() + + def _on_adj_upper_changed(self, adj, *args): + upper = adj.get_upper() + diff = upper - self._current_upper + + if diff != 0: + self._current_upper = upper + if self._autoscroll: + adj.set_value(adj.get_upper() - adj.get_page_size()) + else: + # Workaround + # https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 + self.set_kinetic_scrolling(True) + adj.set_value(adj.get_value() + diff) + + if upper == adj.get_page_size(): + # There is no scrollbar, request history until there is + self.emit('request-history') + + def _on_adj_value_changed(self, adj, *args): + bottom = adj.get_upper() - adj.get_page_size() + if (bottom - adj.get_value()) < 1: + self._autoscroll = True + else: + self._autoscroll = False + + if self._complete: + self._request_history_at_upper = None + return + + if self._request_history_at_upper == adj.get_upper(): + # Abort here if we already did a history request and the upper + # did not change. This can happen if we scroll very fast and the + # value changes while the request has not been fullfilled. + return + + self._request_history_at_upper = None + + # Load messages when we are near the top + if adj.get_value() < adj.get_page_size() * 2: + self._request_history_at_upper = adj.get_upper() + # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 + self.set_kinetic_scrolling(False) + self.emit('request-history') ===================================== gajim/gtk/conversation/view.py ===================================== @@ -48,11 +48,6 @@ class ConversationView(Gtk.ListBox): None, (str, ) ), - 'load-history': ( - GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, - None, - (str, ) - ) } def __init__(self, account, contact, history_mode=False): @@ -95,7 +90,8 @@ def __init__(self, account, contact, history_mode=False): self._last_incoming_timestamp = datetime.fromtimestamp(0) # Insert the very first row, containing the scroll hint and load button - self.add(ScrollHintRow(self._account, history_mode=self._history_mode)) + self._scroll_hint_row = ScrollHintRow(self._account) + self.add(self._scroll_hint_row) self._timestamps_inserted.append(datetime.fromtimestamp(0)) def clear(self): @@ -111,6 +107,9 @@ def get_first_message_row(self): return row return None + def set_history_complete(self): + self._scroll_hint_row.set_history_complete() + def _reset_conversation_view(self): self._first_date = None self._last_date = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4b42214849d3aeca3b150c0b0a5458b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c4b42214849d3aeca3b150c0b0a5458b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Refactor scrolling
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 629b97e0 by lovetox at 2021-04-04T15:53:25+02:00 Refactor scrolling - - - - - 7 changed files: - gajim/chat_control_base.py - gajim/common/storage/archive.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -25,7 +25,6 @@ import os import sys -import datetime import time import uuid import tempfile @@ -189,18 +188,16 @@ def __init__(self, parent_win, widget_name, jid, acct, self.xml.conversation_scrolledwindow.add(self.conversation_view) self._scrolled_old_upper = None self._scrolled_old_value = None - self._scrolled_previous_value = 0 - self._fetching_history = False - self._initial_fetch_done = False + self._fetch_start_upper = None + self._current_upper = 0 + self._autoscroll = True + self._no_more_messages = False vadjustment = self.xml.conversation_scrolledwindow.get_vadjustment() - vadjustment.connect( - 'changed', self._on_conversation_vadjustment_changed) - vadjustment.connect('value-changed', self._on_scroll_value_changed) - vscrollbar = self.xml.conversation_scrolledwindow.get_vscrollbar() - vscrollbar.connect('button-release-event', - self._on_scrollbar_button_release) + + vadjustment.connect('notify::upper', self._on_adj_upper_changed) + vadjustment.connect('notify::value', self._on_adj_value_changed) self.msg_textview = MessageInputTextView() self.msg_textview.connect('paste-clipboard', @@ -1414,32 +1411,30 @@ def _on_load_history(self, _button, lines): self.fetch_n_lines_history(lines) def fetch_n_lines_history(self, n_lines): - if self._fetching_history: - return - - timestamp_end = self.conversation_view.first_message_timestamp - if not timestamp_end: - timestamp_end = datetime.datetime.now() - self._fetching_history = True - adjustment = self.xml.conversation_scrolledwindow.get_vadjustment() - - # Store these values so we can restore scroll position later - self._scrolled_old_upper = adjustment.get_upper() - self._scrolled_old_value = adjustment.get_value() + row = self.conversation_view.get_first_message_row() + if row is None: + timestamp = time.time() + else: + timestamp = row.db_timestamp if self.is_groupchat: messages = app.storage.archive.get_conversation_muc_before( self.account, self.contact.jid, - timestamp_end, + timestamp, n_lines) else: messages = app.storage.archive.get_conversation_before( self.account, self.contact.jid, - timestamp_end, + timestamp, n_lines) + if not messages: + self._no_more_messages = True + print('SET NO MORE') + return + for msg in messages: if not msg: continue @@ -1469,79 +1464,6 @@ def fetch_n_lines_history(self, n_lines): error=msg.error, history=True) - def _on_edge_reached(self, _scrolledwindow, pos): - if pos != Gtk.PositionType.BOTTOM: - return - # Remove all events and set autoscroll True - app.log('autoscroll').info('Autoscroll enabled') - self.conversation_view.autoscroll = True - if self.resource: - jid = self.contact.get_full_jid() - else: - jid = self.contact.jid - types_list = [] - if self._type.is_groupchat: - types_list = ['printed_gc_msg', 'gc_msg', 'printed_marked_gc_msg'] - else: - types_list = [f'printed_{self._type}', str(self._type)] - - if not app.events.get_events(self.account, jid, types_list): - return - if not self.parent_win: - return - if (self.parent_win.get_active_control() == self and - self.parent_win.window.is_active()): - # we are at the end - if not app.events.remove_events( - self.account, jid, types=types_list): - # There were events to remove - self.redraw_after_event_removed(jid) - # XEP-0333 Send <displayed> tag - self._client.get_module('ChatMarkers').send_displayed_marker( - self.contact, - self.last_msg_id, - self._type) - self.last_msg_id = None - - def _on_edge_overshot(self, _scrolledwindow, pos): - # Fetch messages if we scroll against the top - if pos != Gtk.PositionType.TOP: - return - self.fetch_n_lines_history(30) - - def _on_scroll_value_changed(self, adjustment): - if self.conversation_view.clearing or self._fetching_history: - return - - value = adjustment.get_value() - previous_value = self._scrolled_previous_value - self._scrolled_previous_value = value - - if value >= previous_value: - return - - # Fetch messages before we reach the top - if value <= int(0.1 * adjustment.get_upper()): - self.fetch_n_lines_history(10) - - def _on_scroll_realize(self, _widget): - # Initial message fetching when ChatControl is first opened - if not self._initial_fetch_done: - self._initial_fetch_done = True - restore_lines = app.settings.get('restore_lines') - if restore_lines <= 0: - return - self.fetch_n_lines_history(restore_lines) - - def _on_scrollbar_button_release(self, scrollbar, event): - if event.get_button()[1] != 1: - # We want only to catch the left mouse button - return - - if not at_the_end(scrollbar.get_parent()): - app.log('autoscroll').info('Autoscroll disabled') - self.conversation_view.autoscroll = False - def has_focus(self): if self.parent_win: if self.parent_win.window.get_property('has-toplevel-focus'): @@ -1549,57 +1471,46 @@ def has_focus(self): return True return False - def _on_scroll(self, widget, event): - if not self.conversation_view.autoscroll: - # autoscroll is already disabled - return + def _on_adj_upper_changed(self, adj, *args): + upper = adj.get_upper() + diff = upper - self._current_upper - if widget is None: - # call from _on_conversation_view_key_press() - # SHIFT + Gdk.KEY_Page_Up - if event != Gdk.KEY_Page_Up: - return + if diff != 0: + self._current_upper = upper + if self._autoscroll: + adj.set_value(adj.get_upper() - adj.get_page_size()) + else: + # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 + self.xml.conversation_scrolledwindow.set_kinetic_scrolling(True) + adj.set_value(adj.get_value() + diff) + + if upper == adj.get_page_size(): + # There is no scrollbar, load history until there is + self.fetch_n_lines_history(30) + + def _on_adj_value_changed(self, adj, *args): + bottom = adj.get_upper() - adj.get_page_size() + if (bottom - adj.get_value()) < 1: + self._autoscroll = True else: - # On scrolling UP disable autoscroll - # get_scroll_direction() sets has_direction only TRUE - # if smooth scrolling is deactivated. If we have smooth - # smooth scrolling we have to use get_scroll_deltas() - has_direction, direction = event.get_scroll_direction() - if not has_direction: - direction = None - smooth, delta_x, delta_y = event.get_scroll_deltas() - if smooth: - if delta_y < 0: - direction = Gdk.ScrollDirection.UP - elif delta_y > 0: - direction = Gdk.ScrollDirection.DOWN - elif delta_x < 0: - direction = Gdk.ScrollDirection.LEFT - elif delta_x > 0: - direction = Gdk.ScrollDirection.RIGHT - else: - app.log('autoscroll').warning( - 'Scroll directions can’t be determined') + self._autoscroll = False - if direction != Gdk.ScrollDirection.UP: - return - # Check if we have a Scrollbar - adjustment = self.xml.conversation_scrolledwindow.get_vadjustment() - if adjustment.get_upper() != adjustment.get_page_size(): - app.log('autoscroll').info('Autoscroll disabled') - self.conversation_view.autoscroll = False - - def _on_conversation_vadjustment_changed(self, adjustment): - self.scroll_to_end() - if self._fetching_history: - # Make sure the scroll position is kept - new_upper = adjustment.get_upper() - diff = new_upper - self._scrolled_old_upper - new_value = diff + self._scrolled_old_value - adjustment.set_value(new_value) - self._fetching_history = False + if self._no_more_messages: + self._fetch_start_upper = None return + if self._fetch_start_upper == adj.get_upper(): + return + + self._fetch_start_upper = None + + # Load messages when we are near the top + if adj.get_value() < adj.get_page_size() * 2: + self._fetch_start_upper = adj.get_upper() + # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 + self.xml.conversation_scrolledwindow.set_kinetic_scrolling(False) + self.fetch_n_lines_history(30) + def scroll_messages(self, direction, msg_buf, msg_type): if msg_type == 'sent': history = self.sent_history ===================================== gajim/common/storage/archive.py ===================================== @@ -321,15 +321,15 @@ def convert_show_values_to_db_api_values(show): return None @timeit - def get_conversation_before(self, account, jid, end_timestamp, n_lines): + def get_conversation_before(self, account, jid, timestamp, n_lines): """ - Load n_lines lines of conversation with jid before end_timestamp + Load n_lines lines of conversation with jid before timestamp :param account: The account :param jid: The jid for which we request the conversation - :param end_timestamp: end timestamp / datetime.datetime instance + :param timestamp: timestamp returns a list of namedtuples """ @@ -351,19 +351,18 @@ def get_conversation_before(self, account, jid, end_timestamp, n_lines): return self._con.execute( sql, - tuple(jids) + (end_timestamp.timestamp(), n_lines)).fetchall() + tuple(jids) + (timestamp, n_lines)).fetchall() @timeit - def get_conversation_muc_before(self, account, jid, end_timestamp, - n_lines): + def get_conversation_muc_before(self, account, jid, timestamp, n_lines): """ - Load n_lines lines of conversation with jid before end_timestamp + Load n_lines lines of conversation with jid before timestamp :param account: The account :param jid: The jid for which we request the conversation - :param end_timestamp: end timestamp / datetime.datetime instance + :param timestamp: timestamp returns a list of namedtuples """ @@ -386,7 +385,7 @@ def get_conversation_muc_before(self, account, jid, end_timestamp, return self._con.execute( sql, - tuple(jids) + (end_timestamp.timestamp(), n_lines)).fetchall() + tuple(jids) + (timestamp, n_lines)).fetchall() @timeit def get_last_conversation_line(self, account, jid): ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -623,10 +623,6 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> - <signal name="edge-overshot" handler="_on_edge_overshot" swapped="no"/> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="realize" handler="_on_scroll_realize" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -263,10 +263,6 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> - <signal name="edge-overshot" handler="_on_edge_overshot" swapped="no"/> - <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> - <signal name="realize" handler="_on_scroll_realize" swapped="no"/> - <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> </child> ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from datetime import datetime + from gi.repository import GLib from gi.repository import Gtk @@ -34,7 +36,8 @@ def __init__(self, BaseRow.__init__(self, account, widget='textview', history_mode=history_mode) self.type = 'info' - self.timestamp = timestamp + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp self.kind = kind if subject: @@ -50,7 +53,7 @@ def __init__(self, avatar_placeholder = Gtk.Box() avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - timestamp_widget = self.create_timestamp_widget(timestamp) + timestamp_widget = self.create_timestamp_widget(self.timestamp) timestamp_widget.set_valign(Gtk.Align.START) self.grid.attach(timestamp_widget, 2, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -12,6 +12,8 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. +from datetime import datetime + from gi.repository import Gdk from gi.repository import GLib from gi.repository import Gtk @@ -57,7 +59,8 @@ def __init__(self, BaseRow.__init__(self, account, widget='textview', history_mode=history_mode) self.type = 'chat' - self.timestamp = timestamp + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp self.message_id = message_id self.log_line_id = log_line_id self.kind = kind @@ -84,7 +87,7 @@ def __init__(self, self._meta_box = Gtk.Box(spacing=6) self._meta_box.pack_start( self.create_name_widget(name, kind, is_groupchat), False, True, 0) - timestamp_label = self.create_timestamp_widget(timestamp) + timestamp_label = self.create_timestamp_widget(self.timestamp) timestamp_label.set_margin_start(6) self._meta_box.pack_end(timestamp_label, False, True, 0) # TODO: implement app.settings.get('print_time') 'always', 'sometimes'? ===================================== gajim/gtk/conversation/view.py ===================================== @@ -105,6 +105,12 @@ def clear(self): GLib.idle_add(self._reset_conversation_view) + def get_first_message_row(self): + for row in self.get_children(): + if isinstance(row, MessageRow): + return row + return None + def _reset_conversation_view(self): self._first_date = None self._last_date = None @@ -149,7 +155,6 @@ def add_message(self, if not timestamp: timestamp = time.time() - time_ = datetime.fromtimestamp(timestamp) if other_text_tags is None: other_text_tags = [] @@ -158,7 +163,7 @@ def add_message(self, (subject and self._contact.is_groupchat)): message = InfoMessageRow( self._account, - time_, + timestamp, text, other_text_tags, kind, @@ -181,7 +186,7 @@ def add_message(self, message = MessageRow( self._account, message_id, - time_, + timestamp, kind, name, text, @@ -196,11 +201,11 @@ def add_message(self, history_mode=self._history_mode, log_line_id=log_line_id) - self._insert_message(message, time_, kind, history) + self._insert_message(message, kind, history) # Check for maximum message count - if self.autoscroll and self._row_count > self._max_row_count: - self._reduce_message_count() + # if self.autoscroll and self._row_count > self._max_row_count: + # self._reduce_message_count() def _get_avatar(self, kind, name): scale = self.get_scale_factor() @@ -216,20 +221,20 @@ def _get_avatar(self, kind, name): return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) - def _insert_message(self, message, time_, kind, history): - current_date = time_.strftime('%a, %d %b %Y') + def _insert_message(self, message, kind, history): + current_date = message.timestamp.strftime('%a, %d %b %Y') - if self._is_out_of_order(time_, history): - insertion_point = bisect_left(self._timestamps_inserted, time_) + if self._is_out_of_order(message.timestamp, history): + insertion_point = bisect_left(self._timestamps_inserted, message.timestamp) date_check_point = min(len( self._timestamps_inserted) - 1, insertion_point - 1) date_at_dcp = self._timestamps_inserted[date_check_point].strftime( '%a, %d %b %Y') if date_at_dcp != current_date: - associated_timestamp = time_ - timedelta( - hours=time_.hour, - minutes=time_.minute, - seconds=time_.second) + associated_timestamp = message.timestamp - timedelta( + hours=message.timestamp.hour, + minutes=message.timestamp.minute, + seconds=message.timestamp.second) date_row = DateRow( self._account, current_date, associated_timestamp) self.insert(date_row, insertion_point) @@ -238,18 +243,18 @@ def _insert_message(self, message, time_, kind, history): self._row_count += 1 insertion_point += 1 if (kind in ('incoming', 'incoming_queue') and - time_ > self._last_incoming_timestamp): - self._last_incoming_timestamp = time_ + message.timestamp > self._last_incoming_timestamp): + self._last_incoming_timestamp = message.timestamp self.insert(message, insertion_point) - self._timestamps_inserted.insert(insertion_point, time_) - current_timestamp = time_ + self._timestamps_inserted.insert(insertion_point, message.timestamp) + current_timestamp = message.timestamp self._row_count += 1 elif history: if current_date != self._first_date: - associated_timestamp = time_ - timedelta( - hours=time_.hour, - minutes=time_.minute, - seconds=time_.second) + associated_timestamp = message.timestamp - timedelta( + hours=message.timestamp.hour, + minutes=message.timestamp.minute, + seconds=message.timestamp.second) date_row = DateRow( self._account, current_date, associated_timestamp) self.insert(date_row, 1) @@ -257,22 +262,22 @@ def _insert_message(self, message, time_, kind, history): self._row_count += 1 self._first_date = current_date if kind in ('incoming', 'incoming_queue', 'outgoing'): - self.first_message_timestamp = time_ + self.first_message_timestamp = message.timestamp if (kind in ('incoming', 'incoming_queue') and - time_ > self._last_incoming_timestamp): - self._last_incoming_timestamp = time_ + message.timestamp > self._last_incoming_timestamp): + self._last_incoming_timestamp = message.timestamp self.insert(message, 2) - self._timestamps_inserted.insert(2, time_) + self._timestamps_inserted.insert(2, message.timestamp) if self._last_date is None: self._last_date = current_date - current_timestamp = time_ + current_timestamp = message.timestamp self._row_count += 1 else: if current_date != self._last_date: - associated_timestamp = time_ - timedelta( - hours=time_.hour, - minutes=time_.minute, - seconds=time_.second) + associated_timestamp = message.timestamp - timedelta( + hours=message.timestamp.hour, + minutes=message.timestamp.minute, + seconds=message.timestamp.second) date_row = DateRow( self._account, current_date, associated_timestamp) self.add(date_row) @@ -282,14 +287,14 @@ def _insert_message(self, message, time_, kind, history): self._first_date = current_date if (kind in ('incoming', 'incoming_queue', 'outgoing') and not self.first_message_timestamp): - self.first_message_timestamp = time_ + self.first_message_timestamp = message.timestamp if (kind in ('incoming', 'incoming_queue') and - time_ > self._last_incoming_timestamp): - self._last_incoming_timestamp = time_ + message.timestamp > self._last_incoming_timestamp): + self._last_incoming_timestamp = message.timestamp self._last_date = current_date self.add(message) - self._timestamps_inserted.append(time_) - current_timestamp = time_ + self._timestamps_inserted.append(message.timestamp) + current_timestamp = message.timestamp self._row_count += 1 if message.type == 'chat': View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/629b97e0fad60e15371c9f8ab7f957a0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/629b97e0fad60e15371c9f8ab7f957a0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Fix HtmlTextView test
by Philipp Hörist 02 Apr '21

02 Apr '21

Philipp Hörist pushed to branch master at gajim / gajim Commits: f08f3f0c by lovetox at 2021-04-02T18:51:01+02:00 Fix HtmlTextView test - - - - - 1 changed file: - test/gtk/htmltextview.py Changes: ===================================== test/gtk/htmltextview.py ===================================== @@ -7,17 +7,22 @@ from gajim.common import app from gajim.common import configpaths configpaths.init() -from gajim.common.helpers import AdditionalDataDict + from gajim import gui gui.init('gtk') +from gajim.common.helpers import AdditionalDataDict + from gajim.conversation_textview import ConversationTextview from gajim.gui_interface import Interface + +app.settings = MagicMock() app.plugin_manager = MagicMock() app.logger = MagicMock() app.cert_store = MagicMock() +app.storage = MagicMock() app.interface = Interface() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f08f3f0c217f9bdf7c86aff47e17a498… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f08f3f0c217f9bdf7c86aff47e17a498… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] HistoryWindow: Use ConversationView
by Daniel Brötzmann 01 Apr '21

01 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 7df2110f by wurstsalat at 2021-04-02T00:26:13+02:00 HistoryWindow: Use ConversationView - - - - - 9 changed files: - gajim/app_actions.py - gajim/common/storage/archive.py - gajim/data/gui/history_window.ui - gajim/data/style/gajim.css - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/view.py - gajim/gtk/history.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -25,10 +25,8 @@ from gajim.gui.dialogs import ShortcutsWindow from gajim.gui.about import AboutDialog -from gajim.gui.history import HistoryWindow from gajim.gui.discovery import ServiceDiscoveryWindow from gajim.gui.util import open_window -from gajim.gui.util import get_app_window # General Actions @@ -310,13 +308,7 @@ def on_browse_history(_action, param): jid = dict_.get('jid') account = dict_.get('account') - window = get_app_window(HistoryWindow) - if window is None: - HistoryWindow(jid, account) - else: - window.present() - if jid is not None and account is not None: - window.open_history(jid, account) + open_window('HistoryWindow', account=account, jid=jid) def on_groupchat_join(_action, param): ===================================== gajim/common/storage/archive.py ===================================== @@ -420,7 +420,7 @@ def get_last_conversation_line(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone() @timeit - def get_conversation_for_date(self, account, jid, date): + def get_messages_for_date(self, account, jid, date): """ Load the complete conversation with a given jid on a specific date @@ -435,21 +435,26 @@ def get_conversation_for_date(self, account, jid, date): """ jids = self._get_family_jids(account, jid) + account_id = self.get_account_id(account) delta = datetime.timedelta( hours=23, minutes=59, seconds=59, microseconds=999999) + date_ts = date.timestamp() + delta_ts = (date + delta).timestamp() sql = ''' SELECT contact_name, time, kind, show, message, subject, additional_data, log_line_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND time BETWEEN ? AND ? - ORDER BY time, log_line_id - '''.format(jids=', '.join('?' * len(jids))) + ORDER BY time DESC, log_line_id DESC + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) - return self._con.execute(sql, tuple(jids) + - (date.timestamp(), - (date + delta).timestamp())).fetchall() + return self._con.execute( + sql, + tuple(jids) + (date_ts, delta_ts)).fetchall() @timeit def search_log(self, account, jid, query, date=None): ===================================== gajim/data/gui/history_window.ui ===================================== @@ -1,7 +1,7 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> + <requires lib="gtk+" version="3.24"/> <object class="GtkListStore" id="liststore1"> <columns>  @@ -11,25 +11,25 @@ </columns> </object> <object class="GtkPopoverMenu" id="more_menu"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">12</property> - <property name="margin_end">12</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> + <property name="margin-top">12</property> + <property name="margin-bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkCheckButton" id="show_status_checkbutton"> <property name="label" translatable="yes">Display status changes</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_show_status_checkbutton_toggled" swapped="no"/> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="draw-indicator">True</property> + <signal name="toggled" handler="_on_show_status" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -40,7 +40,7 @@ <child> <object class="GtkSeparator"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> </object> <packing> <property name="expand">False</property> @@ -51,9 +51,9 @@ <child> <object class="GtkModelButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="action_name">app.history-manager</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> + <property name="action-name">app.history-manager</property> <property name="text" translatable="yes">History Manager</property> </object> <packing> @@ -69,22 +69,38 @@ </packing> </child> </object> + <object class="GtkListStore" id="search_liststore"> + <columns> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> +  + <column type="gchararray"/> + </columns> + </object> <object class="GtkPopover" id="search_menu"> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">12</property> - <property name="margin_end">12</property> - <property name="margin_top">12</property> - <property name="margin_bottom">12</property> + <property name="can-focus">False</property> + <property name="margin-start">12</property> + <property name="margin-end">12</property> + <property name="margin-top">12</property> + <property name="margin-bottom">12</property> <property name="orientation">vertical</property> <property name="spacing">6</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="label" translatable="yes">Date</property> <style> @@ -100,16 +116,16 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <property name="orientation">vertical</property> <child> <object class="GtkCalendar" id="calendar"> - <property name="width_request">270</property> + <property name="width-request">270</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="day-selected" handler="on_calendar_day_selected" swapped="no"/> - <signal name="month-changed" handler="on_calendar_month_changed" swapped="no"/> + <property name="can-focus">True</property> + <signal name="day-selected" handler="_on_day_selected" swapped="no"/> + <signal name="month-changed" handler="_on_month_changed" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -120,21 +136,21 @@ <child> <object class="GtkButtonBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">start</property> <property name="homogeneous">True</property> - <property name="layout_style">expand</property> + <property name="layout-style">expand</property> <child> <object class="GtkButton" id="button_first_day"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_change_date" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-first-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">go-first-symbolic</property> </object> </child> </object> @@ -147,14 +163,14 @@ <child> <object class="GtkButton" id="button_previous_day"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_change_date" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-previous-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">go-previous-symbolic</property> </object> </child> </object> @@ -167,14 +183,14 @@ <child> <object class="GtkButton" id="button_next_day"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_change_date" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-next-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">go-next-symbolic</property> </object> </child> </object> @@ -187,14 +203,14 @@ <child> <object class="GtkButton" id="button_last_day"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <signal name="clicked" handler="_change_date" swapped="no"/> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">go-last-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">go-last-symbolic</property> </object> </child> </object> @@ -227,9 +243,9 @@ <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> - <property name="margin_top">12</property> + <property name="margin-top">12</property> <property name="label" translatable="yes">Mode</property> <style> <class name="dim-label"/> @@ -245,12 +261,12 @@ <object class="GtkRadioButton" id="search_complete_history"> <property name="label" translatable="yes">Search complete history</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> <property name="active">True</property> - <property name="draw_indicator">True</property> - <signal name="toggled" handler="on_search_complete_history_toggled" swapped="no"/> + <property name="draw-indicator">True</property> + <signal name="toggled" handler="_on_search_complete_history" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -262,12 +278,12 @@ <object class="GtkRadioButton" id="search_in_date"> <property name="label" translatable="yes">Search selected day only</property> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> <property name="halign">start</property> - <property name="draw_indicator">True</property> + <property name="draw-indicator">True</property> <property name="group">search_complete_history</property> - <signal name="toggled" handler="on_search_in_date_toggled" swapped="no"/> + <signal name="toggled" handler="_on_search_in_date" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -279,25 +295,26 @@ </child> </object> <object class="GtkBox" id="history_box"> - <property name="width_request">600</property> + <property name="width-request">600</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">18</property> - <property name="margin_end">18</property> - <property name="margin_top">18</property> - <property name="margin_bottom">18</property> + <property name="can-focus">False</property> + <property name="margin-start">18</property> + <property name="margin-end">18</property> + <property name="margin-top">18</property> + <property name="margin-bottom">18</property> <property name="orientation">vertical</property> <property name="spacing">24</property> <child> +  <object class="GtkGrid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">start</property> <property name="valign">center</property> <property name="label" translatable="yes">Chat</property> @@ -306,62 +323,62 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkSwitch" id="log_history_checkbutton"> + <object class="GtkSwitch" id="store_history_switch"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="tooltip_text" translatable="yes">Store history for this chat</property> + <property name="can-focus">True</property> + <property name="tooltip-text" translatable="yes">Store history for this chat</property> <property name="valign">center</property> - <signal name="notify::active" handler="on_log_history_checkbutton_toggled" swapped="no"/> + <signal name="notify::active" handler="_on_log_history" swapped="no"/> </object> <packing> - <property name="left_attach">3</property> - <property name="top_attach">0</property> + <property name="left-attach">3</property> + <property name="top-attach">0</property> </packing> </child> <child> <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> - <property name="margin_start">6</property> + <property name="margin-start">6</property> <property name="label" translatable="yes">Store History</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">2</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkComboBox" id="query_entry"> - <property name="width_request">400</property> + <object class="GtkComboBox" id="query_combo"> + <property name="width-request">400</property> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="valign">center</property> <property name="hexpand">True</property> <property name="model">liststore1</property> - <property name="has_entry">True</property> - <property name="entry_text_column">1</property> - <property name="id_column">1</property> - <signal name="changed" handler="on_jid_entry_changed" swapped="no"/> + <property name="has-entry">True</property> + <property name="entry-text-column">1</property> + <property name="id-column">1</property> + <signal name="changed" handler="_on_query_combo_changed" swapped="no"/> <child internal-child="entry"> - <object class="GtkEntry"> + <object class="GtkEntry" id="query_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <signal name="activate" handler="on_jid_entry_activate" swapped="no"/> + <property name="can-focus">True</property> + <signal name="activate" handler="_on_jid_entry_activate" swapped="no"/> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> </object> @@ -374,25 +391,26 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child type="center"> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <child> <object class="GtkSearchEntry" id="search_entry"> - <property name="width_request">300</property> + <property name="width-request">300</property> <property name="visible">True</property> - <property name="can_focus">True</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_entry_activate" swapped="no"/> + <property name="can-focus">True</property> + <property name="primary-icon-name">edit-find-symbolic</property> + <property name="primary-icon-activatable">False</property> + <property name="primary-icon-sensitive">False</property> + <property name="placeholder-text" translatable="yes">Search…</property> + <signal name="activate" handler="_on_search_entry_activate" swapped="no"/> </object> <packing> <property name="expand">False</property> @@ -403,21 +421,21 @@ <child> <object class="GtkMenuButton" id="search_menu_button"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="halign">start</property> <property name="popover">search_menu</property> <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="spacing">6</property> <child> <object class="GtkLabel" id="date_label"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_start">3</property> - <property name="margin_end">3</property> + <property name="can-focus">False</property> + <property name="margin-start">3</property> + <property name="margin-end">3</property> </object> <packing> <property name="expand">False</property> @@ -428,8 +446,8 @@ <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">pan-down-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">pan-down-symbolic</property> </object> <packing> <property name="expand">False</property> @@ -459,19 +477,19 @@ <child> <object class="GtkBox"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> <child> <object class="GtkMenuButton"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> + <property name="can-focus">True</property> + <property name="receives-default">True</property> <property name="popover">more_menu</property> <child> <object class="GtkImage"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">view-more-symbolic</property> + <property name="can-focus">False</property> + <property name="icon-name">view-more-symbolic</property> </object> </child> </object> @@ -485,7 +503,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="pack_type">end</property> + <property name="pack-type">end</property> <property name="position">1</property> </packing> </child> @@ -503,23 +521,70 @@ <child> <object class="GtkPaned"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> <property name="orientation">vertical</property> <child> <object class="GtkScrolledWindow" id="results_scrolledwindow"> - <property name="can_focus">True</property> - <property name="no_show_all">True</property> - <property name="shadow_type">in</property> + <property name="can-focus">True</property> + <property name="no-show-all">True</property> + <property name="shadow-type">in</property> <child> <object class="GtkTreeView" id="results_treeview"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hover_expand">True</property> - <signal name="cursor-changed" handler="on_results_treeview_cursor_changed" swapped="no"/> + <property name="can-focus">True</property> + <property name="model">search_liststore</property> + <property name="hover-expand">True</property> + <signal name="cursor-changed" handler="_on_results_cursor_changed" swapped="no"/> <child internal-child="selection"> <object class="GtkTreeSelection"/> </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">Name</property> + <property name="clickable">True</property> + <property name="sort-column-id">1</property> + <child> + <object class="GtkCellRendererText" id="name"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="text">1</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">Date</property> + <property name="clickable">True</property> + <property name="sort-column-id">2</property> + <child> + <object class="GtkCellRendererText" id="date"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="text">2</attribute> + </attributes> + </child> + </object> + </child> + <child> + <object class="GtkTreeViewColumn"> + <property name="resizable">True</property> + <property name="title" translatable="yes">Message</property> + <child> + <object class="GtkCellRendererText" id="message"> + <property name="ellipsize">end</property> + </object> + <attributes> + <attribute name="text">3</attribute> + </attributes> + </child> + </object> + </child> </object> </child> </object> @@ -531,9 +596,9 @@ <child> <object class="GtkScrolledWindow" id="scrolledwindow"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="shadow_type">etched-in</property> - <property name="min_content_height">200</property> + <property name="can-focus">True</property> + <property name="shadow-type">etched-in</property> + <property name="min-content-height">200</property> <child> <placeholder/> </child> ===================================== gajim/data/style/gajim.css ===================================== @@ -59,6 +59,9 @@ .conversation-mention-highlight { background-color: rgb(255, 215, 194); } +.conversation-search-highlight { + background-color: rgb(194, 215, 255); +} .conversation-system-row { padding: 18px; } ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -37,6 +37,7 @@ def __init__(self, account, widget='label', history_mode=False): self.kind = None self.name = None self.message_id = None + self.log_line_id = None self.text = '' self.get_style_context().add_class('conversation-row') @@ -98,8 +99,9 @@ def create_name_widget(name: str, kind: str, @wrap_with_event_box class MoreMenuButton(Gtk.MenuButton): - def __init__(self, row): + def __init__(self, row, history_mode=False): Gtk.MenuButton.__init__(self) + self._history_mode = history_mode self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.END) @@ -116,17 +118,18 @@ def _create_popover(self, row): menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) menu_box.get_style_context().add_class('padding-6') - quote_button = Gtk.ModelButton() - quote_button.set_halign(Gtk.Align.START) - quote_button.connect('clicked', row._on_quote_message) - quote_button.set_label(_('Quote…')) - quote_button.set_image(Gtk.Image.new_from_icon_name( - 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) - menu_box.add(quote_button) + if not self._history_mode: + quote_button = Gtk.ModelButton() + quote_button.set_halign(Gtk.Align.START) + quote_button.connect('clicked', row.on_quote_message) + quote_button.set_label(_('Quote…')) + quote_button.set_image(Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + menu_box.add(quote_button) copy_button = Gtk.ModelButton() copy_button.set_halign(Gtk.Align.START) - copy_button.connect('clicked', row._on_copy_message) + copy_button.connect('clicked', row.on_copy_message) copy_button.set_label(_('Copy')) copy_button.set_image(Gtk.Image.new_from_icon_name( 'edit-copy-symbolic', Gtk.IconSize.MENU)) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -45,7 +45,8 @@ def __init__(self, marker=None, error=None, encryption_enabled=False, - history_mode=False): + history_mode=False, + log_line_id=None): # other_tags_for_name contained 'marked', 'bold' and # 'muc_nickname_color_', which are now derived from @@ -58,6 +59,7 @@ def __init__(self, self.type = 'chat' self.timestamp = timestamp self.message_id = message_id + self.log_line_id = log_line_id self.kind = kind self.name = name or '' self.text = text @@ -124,19 +126,19 @@ def __init__(self, bottom_box = Gtk.Box(spacing=6) bottom_box.add(self.textview) - bottom_box.add(MoreMenuButton(self)) + bottom_box.add(MoreMenuButton(self, history_mode=history_mode)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) self.grid.attach(self._meta_box, 1, 0, 1, 1) self.grid.attach(bottom_box, 1, 1, 1, 1) - def _on_copy_message(self, _widget): + def on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) clip.set_text( f'{timestamp} - {self.name}: {self.textview.get_text()}', -1) - def _on_quote_message(self, _widget): + def on_quote_message(self, _widget): self.get_parent().on_quote(self.textview.get_text()) def _get_encryption_image(self, additional_data, encryption_enabled=None): ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -22,24 +22,31 @@ class ScrollHintRow(BaseRow): - def __init__(self, account): + def __init__(self, account, history_mode=False): BaseRow.__init__(self, account) self.type = 'system' self.timestamp = datetime.fromtimestamp(0) - self.get_style_context().add_class('conversation-system-row') - self._button = Gtk.Button.new_from_icon_name( - 'go-up-symbolic', Gtk.IconSize.BUTTON) - self._button.set_tooltip_text(_('Load more messages')) - self._button.connect('clicked', self._on_load_history) - self.grid.attach(self._button, 0, 0, 1, 1) + self.get_style_context().add_class('conversation-system-row') - self.label.set_text(_('Scroll up to load more chat history…')) self.label.set_halign(Gtk.Align.CENTER) self.label.set_hexpand(True) self.label.get_style_context().add_class( 'conversation-meta') + + if history_mode: + self.label.set_text(_('Use the calendar to select a specific date')) + self.grid.attach(self.label, 0, 1, 1, 1) + return + + self.label.set_text(_('Scroll up to load more chat history…')) self.grid.attach(self.label, 0, 1, 1, 1) + self._button = Gtk.Button.new_from_icon_name( + 'go-up-symbolic', Gtk.IconSize.BUTTON) + self._button.set_tooltip_text(_('Load more messages')) + self._button.connect('clicked', self._on_load_history) + self.grid.attach(self._button, 0, 0, 1, 1) + def _on_load_history(self, _button): self.get_parent().emit('load-history', 30) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -95,7 +95,7 @@ def __init__(self, account, contact, history_mode=False): self._last_incoming_timestamp = datetime.fromtimestamp(0) # Insert the very first row, containing the scroll hint and load button - self.add(ScrollHintRow(self._account)) + self.add(ScrollHintRow(self._account, history_mode=self._history_mode)) self._timestamps_inserted.append(datetime.fromtimestamp(0)) def clear(self): @@ -121,6 +121,7 @@ def add_message(self, name, timestamp, other_text_tags=None, + log_line_id=None, message_id=None, correct_id=None, display_marking=None, @@ -153,7 +154,8 @@ def add_message(self, if other_text_tags is None: other_text_tags = [] - if kind in ('status', 'info') or subject: + if (kind in ('status', 'info') or + (subject and self._contact.is_groupchat)): message = InfoMessageRow( self._account, time_, @@ -191,7 +193,8 @@ def add_message(self, marker=marker, error=error, encryption_enabled=self.encryption_enabled, - history_mode=self._history_mode) + history_mode=self._history_mode, + log_line_id=log_line_id) self._insert_message(message, time_, kind, history) @@ -382,12 +385,22 @@ def _reduce_message_count(self): self.first_message_timestamp = None self._row_count -= 1 - def _get_row_by_id(self, id_): + def _get_row_by_message_id(self, id_): for row in self.get_children(): if row.message_id == id_: return row return None + def get_row_by_log_line_id(self, log_line_id): + for row in self.get_children(): + if row.log_line_id == log_line_id: + return row + return None + + def iter_rows(self): + for row in self.get_children(): + yield row + def _get_first_chat_row(self): for row in self.get_children(): if row.type == 'chat': @@ -395,7 +408,7 @@ def _get_first_chat_row(self): return None def set_read_marker(self, id_): - message_row = self._get_row_by_id(id_) + message_row = self._get_row_by_message_id(id_) if message_row is None: return @@ -476,7 +489,7 @@ def scroll_to_end(self, force=False): def correct_message(self, correct_id, message_id, text, other_text_tags, kind, name, additional_data=None): - message_row = self._get_row_by_id(correct_id) + 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, @@ -484,12 +497,12 @@ def correct_message(self, correct_id, message_id, text, message_row.set_merged(False) def show_receipt(self, id_): - message_row = self._get_row_by_id(id_) + message_row = self._get_row_by_message_id(id_) if message_row is not None: message_row.set_receipt() def show_error(self, id_, error): - message_row = self._get_row_by_id(id_) + message_row = self._get_row_by_message_id(id_) if message_row is not None: message_row.set_error(to_user_string(error)) message_row.set_merged(False) ===================================== gajim/gtk/history.py ===================================== @@ -32,14 +32,13 @@ from gajim.common import app from gajim.common import helpers -from gajim.common import exceptions from gajim.common.i18n import _ -from gajim.common.const import ShowConstant from gajim.common.const import KindConstant -from gajim.common.const import StyleAttr +from gajim.common.exceptions import PysqliteOperationalError -from gajim import conversation_textview +# from gajim import conversation_textview +from .conversation.view import ConversationView from .util import python_month from .util import gtk_month from .util import resize_window @@ -51,6 +50,7 @@ from .dialogs import ErrorDialog + @unique class InfoColumn(IntEnum): '''Completion dict''' @@ -71,68 +71,44 @@ class Column(IntEnum): class HistoryWindow(Gtk.ApplicationWindow): - def __init__(self, jid=None, account=None): + def __init__(self, account=None, jid=None): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) self.set_title(_('Conversation History')) - self._ui = get_builder('history_window.ui') + self.account = account + self.jid = jid + self._client = app.get_client(account) + self._contact = None + if jid is not None: + self._contact = self._client.get_module('Contacts').get_contact( + jid) + + self._ui = get_builder('history_window.ui') self.add(self._ui.history_box) - self.history_textview = conversation_textview.ConversationTextview( - account, used_in_history_window=True) - self._ui.scrolledwindow.add(self.history_textview.tv) - self.history_buffer = self.history_textview.tv.get_buffer() - highlight_color = app.css_config.get_value( - '.gajim-search-highlight', StyleAttr.COLOR) - self.history_buffer.create_tag('highlight', background=highlight_color) - self.history_buffer.create_tag('invisible', invisible=True) - - self.clearing_search = False - - # jid, contact_name, date, message, time, log_line_id - model = Gtk.ListStore(str, str, str, str, str, int) - self._ui.results_treeview.set_model(model) - col = Gtk.TreeViewColumn(_('Name')) - self._ui.results_treeview.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True) - col.add_attribute(renderer, 'text', Column.CONTACT_NAME) - # user can click this header and sort - col.set_sort_column_id(Column.CONTACT_NAME) - col.set_resizable(True) - - col = Gtk.TreeViewColumn(_('Date')) - self._ui.results_treeview.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True) - col.add_attribute(renderer, 'text', Column.UNIXTIME) - # user can click this header and sort - col.set_sort_column_id(Column.UNIXTIME) - col.set_resizable(True) - - col = Gtk.TreeViewColumn(_('Message')) - self._ui.results_treeview.append_column(col) - renderer = Gtk.CellRendererText() - col.pack_start(renderer, True) - col.add_attribute(renderer, 'text', Column.MESSAGE) - col.set_resizable(True) - - self.jid = None # The history we are currently viewing - self.account = account - self.completion_dict = {} - self.accounts_seen_online = [] # Update dict when new accounts connect - self.jids_to_search = [] + self._conversation_view = ConversationView( + account, self._contact, history_mode=True) + self._ui.scrolledwindow.add(self._conversation_view) + self._ui.scrolledwindow.set_focus_vadjustment(Gtk.Adjustment()) + + self._clearing_search = False + self._first_day = None + self._last_day = None + + self._completion_dict = {} + self._accounts_seen_online = [] # Update dict when new accounts connect + self._jids_to_search = [] # This will load history too task = self._fill_completion_dict() GLib.idle_add(next, task) if jid: - self._ui.query_entry.get_child().set_text(jid) + self._ui.query_entry.set_text(jid) else: self._load_history(None) @@ -154,6 +130,38 @@ def __init__(self, jid=None, account=None): app.plugin_manager.gui_extension_point( 'history_window', self) + def _on_delete(self, _widget, *args): + self._save_state() + + def _on_destroy(self, _widget): + app.plugin_manager.remove_gui_extension_point( + 'history_window', self) + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + if self._ui.results_scrolledwindow.get_visible(): + self._ui.results_scrolledwindow.set_visible(False) + return + self._save_state() + self.destroy() + + def _on_jid_entry_match_selected(self, _widget, model, iter_, *args): + self._jid_entry_search(model[iter_][1]) + return True + + def _on_query_combo_changed(self, combo): + # only if selected from combobox + jid = self._ui.query_entry.get_text() + if jid == combo.get_active_id(): + self._jid_entry_search(jid) + + def _on_jid_entry_activate(self, entry): + self._jid_entry_search(entry.get_text()) + + def _jid_entry_search(self, jid): + self._load_history(jid, self.account) + self._ui.results_scrolledwindow.set_visible(False) + def _fill_completion_dict(self): """ Fill completion_dict for key auto completion. Then load history for @@ -165,23 +173,22 @@ def _fill_completion_dict(self): {key : (jid, account, nick_name, full_completion_name} This is a generator and does pseudo-threading via idle_add(). """ - liststore = get_completion_liststore( - self._ui.query_entry.get_child()) + liststore = get_completion_liststore(self._ui.query_entry) liststore.set_sort_column_id(1, Gtk.SortType.ASCENDING) - self._ui.query_entry.get_child().get_completion().connect( - 'match-selected', self.on_jid_entry_match_selected) + self._ui.query_entry.get_completion().connect( + 'match-selected', self._on_jid_entry_match_selected) - self._ui.query_entry.set_model(liststore) + self._ui.query_combo.set_model(liststore) # Add all jids in logs.db: db_jids = app.storage.archive.get_jids_in_db() completion_dict = dict.fromkeys(db_jids) - self.accounts_seen_online = list(app.settings.get_active_accounts()) + self._accounts_seen_online = list(app.settings.get_active_accounts()) # Enhance contacts of online accounts with contact. # Needed for mapping below - for account in self.accounts_seen_online: + for account in self._accounts_seen_online: completion_dict.update( helpers.get_contact_dict_for_account(account)) @@ -190,7 +197,7 @@ def _fill_completion_dict(self): keys = list(completion_dict.keys()) # Move the actual jid at first so we load history faster - actual_jid = self._ui.query_entry.get_child().get_text() + actual_jid = self._ui.query_entry.get_text() if actual_jid in keys: keys.remove(actual_jid) keys.insert(0, actual_jid) @@ -205,7 +212,7 @@ def _fill_completion_dict(self): completed2 = None contact = completion_dict[completed] if contact: - info_name = contact.get_shown_name() + info_name = contact.name info_completion = info_name info_jid = contact.jid else: @@ -233,15 +240,15 @@ def _fill_completion_dict(self): if len(completed) > 70: completed = completed[:70] + '[\u2026]' liststore.append((icon, completed)) - self.completion_dict[key] = ( + self._completion_dict[key] = ( info_jid, info_acc, info_name, info_completion) - self.completion_dict[completed] = ( + self._completion_dict[completed] = ( info_jid, info_acc, info_name, info_completion) if completed2: if len(completed2) > 70: completed2 = completed2[:70] + '[\u2026]' liststore.append((icon, completed2)) - self.completion_dict[completed2] = ( + self._completion_dict[completed2] = ( info_jid, info_acc, info_name, info_completion2) if key == actual_jid: self._load_history(info_jid, self.account or info_acc) @@ -249,7 +256,8 @@ def _fill_completion_dict(self): keys.sort() yield False - def _get_account_for_jid(self, jid): + @staticmethod + def _get_account_for_jid(jid): """ Return the corresponding account of the jid. May be None if an account could not be found @@ -264,49 +272,14 @@ def _get_account_for_jid(self, jid): break return account - def _on_delete(self, widget, *args): - self.save_state() - - def _on_destroy(self, widget): - # PluginSystem: removing GUI extension points connected with - # HistoryWindow instance object - app.plugin_manager.remove_gui_extension_point( - 'history_window', self) - self.history_textview.del_handlers() - - def _on_key_press(self, widget, event): - if event.keyval == Gdk.KEY_Escape: - if self._ui.results_scrolledwindow.get_visible(): - self._ui.results_scrolledwindow.set_visible(False) - return - self.save_state() - self.destroy() - - def on_jid_entry_match_selected(self, widget, model, iter_, *args): - self._jid_entry_search(model[iter_][1]) - return True - - def on_jid_entry_changed(self, widget): - # only if selected from combobox - jid = self._ui.query_entry.get_child().get_text() - if jid == self._ui.query_entry.get_active_id(): - self._jid_entry_search(jid) - - def on_jid_entry_activate(self, widget): - self._jid_entry_search(self._ui.query_entry.get_child().get_text()) - - def _jid_entry_search(self, jid): - self._load_history(jid, self.account) - self._ui.results_scrolledwindow.set_visible(False) - def _load_history(self, jid_or_name, account=None): """ Load history for the given jid/name and show it """ - if jid_or_name and jid_or_name in self.completion_dict: + if jid_or_name and jid_or_name in self._completion_dict: # a full qualified jid or a contact name was entered - info_jid, info_account, _info_name, info_completion = self.completion_dict[jid_or_name] - self.jids_to_search = [info_jid] + info_jid, info_account, _info_name, info_completion = self._completion_dict[jid_or_name] + self._jids_to_search = [info_jid] self.jid = info_jid if account: @@ -317,37 +290,35 @@ def _load_history(self, jid_or_name, account=None): # We don't know account. Probably a gc not opened or an # account not connected. # Disable possibility to say if we want to log or not - self._ui.log_history_checkbutton.set_sensitive(False) + self._ui.store_history_switch.set_sensitive(False) else: - # Are log disabled for account ? - if self.account in app.settings.get_account_setting( - self.account, 'no_log_for').split(' '): - self._ui.log_history_checkbutton.set_active(False) - self._ui.log_history_checkbutton.set_sensitive(False) + # Are logs disabled for account ? + no_log_for = app.settings.get_account_setting( + self.account, 'no_log_for').split(' ') + if self.account in no_log_for: + self._ui.store_history_switch.set_active(False) + self._ui.store_history_switch.set_sensitive(False) else: - # Are log disabled for jid ? - log = True - if self.jid in app.settings.get_account_setting( - self.account, 'no_log_for').split(' '): - log = False - self._ui.log_history_checkbutton.set_active(log) - self._ui.log_history_checkbutton.set_sensitive(True) + # Are logs disabled for jid ? + self._ui.store_history_switch.set_active( + str(self.jid) not in no_log_for) + self._ui.store_history_switch.set_sensitive(True) - self.jids_to_search = [info_jid] + self._jids_to_search = [info_jid] # Get first/last date we have logs with contact self.first_log = app.storage.archive.get_first_date_that_has_logs( self.account, self.jid) - self.first_day = self._get_date_from_timestamp(self.first_log) + self._first_day = self._get_date_from_timestamp(self.first_log) self.last_log = app.storage.archive.get_last_date_that_has_logs( self.account, self.jid) - self.last_day = self._get_date_from_timestamp(self.last_log) + self._last_day = self._get_date_from_timestamp(self.last_log) # Select logs for last date we have logs with contact self._ui.search_menu_button.set_sensitive(True) - month = gtk_month(self.last_day.month) - self._ui.calendar.select_month(month, self.last_day.year) - self._ui.calendar.select_day(self.last_day.day) + month = gtk_month(self._last_day.month) + self._ui.calendar.select_month(month, self._last_day.year) + self._ui.calendar.select_day(self._last_day.day) self._ui.button_previous_day.set_sensitive(True) self._ui.button_next_day.set_sensitive(True) @@ -357,7 +328,7 @@ def _load_history(self, jid_or_name, account=None): self._ui.search_entry.set_sensitive(True) self._ui.search_entry.grab_focus() - self._ui.query_entry.get_child().set_text(info_completion) + self._ui.query_entry.set_text(info_completion) else: # neither a valid jid, nor an existing contact name was entered @@ -365,10 +336,8 @@ def _load_history(self, jid_or_name, account=None): self.jid = None self.account = None - self.history_buffer.set_text('') # clear the buffer self._ui.search_entry.set_sensitive(False) - - self._ui.log_history_checkbutton.set_sensitive(False) + self._ui.store_history_switch.set_sensitive(False) self._ui.search_menu_button.set_sensitive(False) self._ui.calendar.clear_marks() self._ui.button_previous_day.set_sensitive(False) @@ -378,7 +347,7 @@ def _load_history(self, jid_or_name, account=None): self._ui.results_scrolledwindow.set_visible(False) - def on_calendar_day_selected(self, widget): + def _on_day_selected(self, *args): if not self.jid: return year, month, day = self._ui.calendar.get_date() # integers @@ -388,102 +357,86 @@ def on_calendar_day_selected(self, widget): self._load_conversation(year, month, day) GLib.idle_add(scroll_to_end, self._ui.scrolledwindow) - def on_calendar_month_changed(self, widget): + def _on_month_changed(self, calendar): """ Ask for days in this month, if they have logs it bolds them (marks them) """ if not self.jid: return - year, month, _day = widget.get_date() # integers - if year < 1900: - widget.select_month(0, 1900) - widget.select_day(1) + year, month, _day = calendar.get_date() # integers + if year < 2000: + calendar.select_month(0, 2000) + calendar.select_day(1) return - widget.clear_marks() + calendar.clear_marks() month = python_month(month) try: log_days = app.storage.archive.get_days_with_logs( self.account, self.jid, year, month) - except exceptions.PysqliteOperationalError as error: - ErrorDialog(_('Disk Error'), str(error)) + except PysqliteOperationalError as err: + ErrorDialog(_('Disk Error'), str(err)) return for date in log_days: - widget.mark_day(date.day) + calendar.mark_day(date.day) - def _get_date_from_timestamp(self, timestamp): + @staticmethod + def _get_date_from_timestamp(timestamp): # Conversion from timestamp to date log = time.localtime(timestamp) - y, m, d = log[0], log[1], log[2] - date = datetime.datetime(y, m, d) + year, mmonth, day = log[0], log[1], log[2] + date = datetime.datetime(year, mmonth, day) return date - def _change_date(self, widget): - # Get day selected in calendar - y, m, d = self._ui.calendar.get_date() - py_m = python_month(m) - _date = datetime.datetime(y, py_m, d) + def _change_date(self, button): + year, month, day = self._ui.calendar.get_date() + python_m = python_month(month) + date_ = datetime.datetime(year, python_m, day) - if widget is self._ui.button_first_day: - gtk_m = gtk_month(self.first_day.month) - self._ui.calendar.select_month(gtk_m, self.first_day.year) - self._ui.calendar.select_day(self.first_day.day) + if button is self._ui.button_first_day: + gtk_m = gtk_month(self._first_day.month) + self._ui.calendar.select_month(gtk_m, self._first_day.year) + self._ui.calendar.select_day(self._first_day.day) return - if widget is self._ui.button_last_day: - gtk_m = gtk_month( - self.last_day.month) - self._ui.calendar.select_month(gtk_m, self.last_day.year) - self._ui.calendar.select_day(self.last_day.day) + if button is self._ui.button_last_day: + gtk_m = gtk_month(self._last_day.month) + self._ui.calendar.select_month(gtk_m, self._last_day.year) + self._ui.calendar.select_day(self._last_day.day) return - if widget is self._ui.button_previous_day: - end_date = self.first_day + if button is self._ui.button_previous_day: + end_date = self._first_day timedelta = datetime.timedelta(days=-1) - if end_date >= _date: + if end_date >= date_: return - elif widget is self._ui.button_next_day: - end_date = self.last_day + + if button is self._ui.button_next_day: + end_date = self._last_day timedelta = datetime.timedelta(days=1) - if end_date <= _date: + if end_date <= date_: return # Iterate through days until log entry found or # supplied end_date (first_log / last_log) reached logs = None while logs is None: - _date = _date + timedelta - if _date == end_date: + date_ = date_ + timedelta + if date_ == end_date: break try: logs = app.storage.archive.get_date_has_logs( - self.account, self.jid, _date) - except exceptions.PysqliteOperationalError as e: - ErrorDialog(_('Disk Error'), str(e)) + self.account, self.jid, date_) + except PysqliteOperationalError as err: + ErrorDialog(_('Disk Error'), str(err)) return - gtk_m = gtk_month(_date.month) - self._ui.calendar.select_month(gtk_m, _date.year) - self._ui.calendar.select_day(_date.day) - - def _get_string_show_from_constant_int(self, show): - if show == ShowConstant.ONLINE: - show = 'online' - elif show == ShowConstant.CHAT: - show = 'chat' - elif show == ShowConstant.AWAY: - show = 'away' - elif show == ShowConstant.XA: - show = 'xa' - elif show == ShowConstant.DND: - show = 'dnd' - elif show == ShowConstant.OFFLINE: - show = 'offline' - - return show + gtk_m = gtk_month(date_.month) + self._ui.calendar.select_month(gtk_m, date_.year) + self._ui.calendar.select_day(date_.day) def _load_conversation(self, year, month, day): """ @@ -491,162 +444,57 @@ def _load_conversation(self, year, month, day): given date into the history textbuffer. Values for `month` and `day` are 1-based. """ - self.history_buffer.set_text('') - self.last_time_printout = 0 - show_status = self._ui.show_status_checkbutton.get_active() + self._conversation_view.clear() + show_status = self._ui.show_status_checkbutton.get_active() date = datetime.datetime(year, month, day) - conversation = app.storage.archive.get_conversation_for_date( + messages = app.storage.archive.get_messages_for_date( self.account, self.jid, date) - - for message in conversation: - if not show_status and message.kind in (KindConstant.GCSTATUS, - KindConstant.STATUS): - continue - self._add_message(message) - - def _add_message(self, msg): - if not msg.message and msg.kind not in (KindConstant.STATUS, + for msg in messages: + if not show_status and msg.kind in (KindConstant.STATUS, KindConstant.GCSTATUS): - return + continue + if not msg.message and msg.kind not in (KindConstant.STATUS, + KindConstant.GCSTATUS): + continue - tim = msg.time - kind = msg.kind - show = msg.show - message = msg.message - subject = msg.subject - log_line_id = msg.log_line_id - contact_name = msg.contact_name - additional_data = msg.additional_data - - buf = self.history_buffer - end_iter = buf.get_end_iter() - - # Make the beginning of every message searchable by its log_line_id - buf.create_mark(str(log_line_id), end_iter, left_gravity=True) - - if app.settings.get('print_time') == 'always': - timestamp_str = app.settings.get('time_stamp') - timestamp_str = helpers.from_one_line(timestamp_str) - tim = time.strftime(timestamp_str, time.localtime(float(tim))) - buf.insert(end_iter, tim) - elif app.settings.get('print_time') == 'sometimes': - every_foo_seconds = 60 * app.settings.get( - 'print_ichat_every_foo_minutes') - seconds_passed = tim - self.last_time_printout - if seconds_passed > every_foo_seconds: - self.last_time_printout = tim - tim = time.strftime('%X ', time.localtime(float(tim))) - buf.insert_with_tags_by_name( - end_iter, tim + '\n', 'time_sometimes') - - # print the encryption icon - if kind in (KindConstant.CHAT_MSG_SENT, - KindConstant.CHAT_MSG_RECV): - self.history_textview.print_encryption_status( - end_iter, additional_data) - - tag_name = '' - tag_msg = '' - - show = self._get_string_show_from_constant_int(show) - - if kind == KindConstant.GC_MSG: - tag_name = 'incoming' - elif kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): - contact_name = self.completion_dict[self.jid][InfoColumn.NAME] - tag_name = 'incoming' - tag_msg = 'incomingtxt' - elif kind in (KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_SENT): - if self.account: + 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[self.account] - else: - # we don't have roster, we don't know our own nick, use first - # account one (urk!) - account = list(app.settings.get_active_accounts())[0] - contact_name = app.nicks[account] - tag_name = 'outgoing' - tag_msg = 'outgoingtxt' - elif kind == KindConstant.GCSTATUS: - # message here (if not None) is status message - if message: - message = _('%(nick)s is now %(status)s: %(status_msg)s') % { - 'nick': contact_name, - 'status': helpers.get_uf_show(show), - 'status_msg': message} - else: - message = _('%(nick)s is now %(status)s') % { - 'nick': contact_name, - 'status': helpers.get_uf_show(show)} - tag_msg = 'status' - else: # 'status' - # message here (if not None) is status message - if show is None: # it means error - if message: - message = _('Error: %s') % message - else: - message = _('Error') - elif message: - message = _('Status is now: %(status)s: %(status_msg)s') % { - 'status': helpers.get_uf_show(show), - 'status_msg': message} - else: - message = _('Status is now: %(status)s') % { - 'status': helpers.get_uf_show(show)} - tag_msg = 'status' - if message.startswith('/me ') or message.startswith('/me\n'): - tag_msg = tag_name - else: - # do not do this if gcstats, avoid dupping contact_name - # eg. nkour: nkour is now Offline - if contact_name and kind != KindConstant.GCSTATUS: - # add stuff before and after contact name - before_str = app.settings.get('before_nickname') - before_str = helpers.from_one_line(before_str) - after_str = app.settings.get('after_nickname') - after_str = helpers.from_one_line(after_str) - format_ = before_str + contact_name + after_str + ' ' - if tag_name: - buf.insert_with_tags_by_name(end_iter, format_, tag_name) - else: - buf.insert(end_iter, format_) - if subject: - message = _('Subject: %s\n') % subject + message - - if tag_msg: - self.history_textview.print_real_text( - message, - [tag_msg], - name=contact_name, - additional_data=additional_data) - else: - self.history_textview.print_real_text( - message, - name=contact_name, - additional_data=additional_data) - self.history_textview.print_real_text('\n', text_tags=['eol']) - - def on_search_complete_history_toggled(self, widget): + self._conversation_view.add_message( + msg.message, + kind, + contact_name, + msg.time, + subject=msg.subject, + additional_data=msg.additional_data, + history=True, + log_line_id=msg.log_line_id) + + def _on_search_complete_history(self, _widget): self._ui.date_label.get_style_context().remove_class('tagged') - def on_search_in_date_toggled(self, widget): + def _on_search_in_date(self, _widget): self._ui.date_label.get_style_context().add_class('tagged') - def on_search_entry_activate(self, widget): - text = self._ui.search_entry.get_text() + def _on_search_entry_activate(self, entry): + text = entry.get_text() model = self._ui.results_treeview.get_model() - self.clearing_search = True + self._clearing_search = True model.clear() - self.clearing_search = False - - start = self.history_buffer.get_start_iter() - end = self.history_buffer.get_end_iter() - self.history_buffer.remove_tag_by_name('highlight', start, end) + self._clearing_search = False if text == '': self._ui.results_scrolledwindow.set_visible(False) @@ -655,9 +503,9 @@ def on_search_entry_activate(self, widget): self._ui.results_scrolledwindow.set_visible(True) # perform search in preselected jids - # jids are preselected with the query_entry - for jid in self.jids_to_search: - account = self.completion_dict[jid][InfoColumn.ACCOUNT] + # jids are preselected with the query_combo + for jid in self._jids_to_search: + account = self._completion_dict[jid][InfoColumn.ACCOUNT] if account is None: # We do not know an account. This can only happen if # the contact is offine, or if we browse a groupchat history. @@ -688,30 +536,30 @@ def on_search_entry_activate(self, widget): if row.kind == KindConstant.CHAT_MSG_SENT: contact_name = app.nicks[account] else: - contact_name = self.completion_dict[jid][InfoColumn.NAME] + contact_name = self._completion_dict[jid][InfoColumn.NAME] local_time = time.localtime(row.time) date = time.strftime('%Y-%m-%d', local_time) result_found = True - model.append((jid, contact_name, date, row.message, - str(row.time), row.log_line_id)) + model.append((str(jid), contact_name, date, row.message, + str(row.time), str(row.log_line_id))) if result_found: self._ui.results_treeview.set_cursor(0) - def on_results_treeview_cursor_changed(self, *args): + def _on_results_cursor_changed(self, treeview): """ A row was selected, get date from row, and select it in calendar which results to showing conversation logs for that date """ - if self.clearing_search: + if self._clearing_search: return # get currently selected date cur_year, cur_month, cur_day = self._ui.calendar.get_date() cur_month = python_month(cur_month) - model, paths = self._ui.results_treeview.get_selection().get_selected_rows() + model, paths = treeview.get_selection().get_selected_rows() if not paths: return @@ -739,77 +587,41 @@ def on_results_treeview_cursor_changed(self, *args): self._scroll_to_message_and_highlight(model[path][Column.LOG_LINE_ID]) def _scroll_to_message_and_highlight(self, log_line_id): - """ - Scroll to a message and highlight it - """ - - def iterator_has_mark(iterator, mark_name): - for mark in iterator.get_marks(): - if mark.get_name() == mark_name: - return True - return False - - # Clear previous search result by removing the highlighting. The scroll - # mark is automatically removed when the new one is set. - start = self.history_buffer.get_start_iter() - end = self.history_buffer.get_end_iter() - self.history_buffer.remove_tag_by_name('highlight', start, end) - - log_line_id = str(log_line_id) - line = start - while not iterator_has_mark(line, log_line_id): - if not line.forward_line(): - return - - match_start = line - match_end = match_start.copy() - match_end.forward_to_tag_toggle(self.history_buffer.eol_tag) - - self.history_buffer.apply_tag_by_name( - 'highlight', match_start, match_end) - mark = self.history_buffer.create_mark('match', match_start, True) - GLib.idle_add( - self.history_textview.tv.scroll_to_mark, mark, 0, True, 0.0, 0.5) - - def on_log_history_checkbutton_toggled(self, widget, *args): - # log conversation history? + for row in self._conversation_view.iter_rows(): + row.get_style_context().remove_class( + 'conversation-search-highlight') + + row = self._conversation_view.get_row_by_log_line_id(int(log_line_id)) + if row is not None: + row.get_style_context().add_class('conversation-search-highlight') + # This scrolls the ListBox to the highlighted row + row.grab_focus() + self._ui.results_treeview.grab_focus() + + def _on_log_history(self, switch, *args): + jid = str(self.jid) oldlog = True no_log_for = app.settings.get_account_setting( self.account, 'no_log_for').split() - if self.jid in no_log_for: + if jid in no_log_for: oldlog = False - log = widget.get_active() - if not log and self.jid not in no_log_for: - no_log_for.append(self.jid) - if log and self.jid in no_log_for: - no_log_for.remove(self.jid) + log = switch.get_active() + if not log and jid not in no_log_for: + no_log_for.append(jid) + if log and jid in no_log_for: + no_log_for.remove(jid) if oldlog != log: app.settings.set_account_setting( self.account, 'no_log_for', ' '.join(no_log_for)) - def on_show_status_checkbutton_toggled(self, widget): - # reload logs - self.on_calendar_day_selected(None) - - def open_history(self, jid, account): - """ - Load chat history of the specified jid - """ - self._ui.query_entry.get_child().set_text(jid) - if account and account not in self.accounts_seen_online: - # Update dict to not only show bare jid - GLib.idle_add(next, self._fill_completion_dict()) - else: - # Only in that case because it's called by - # self._fill_completion_dict() otherwise - self._load_history(jid, account) - self._ui.results_scrolledwindow.set_visible(False) + def _on_show_status(self, _widget): + # Reload logs + self._on_day_selected(None) - def save_state(self): - x, y = self.get_window().get_root_origin() + def _save_state(self): + x_pos, y_pos = self.get_window().get_root_origin() width, height = self.get_size() - - app.settings.set('history_window_x-position', x) - app.settings.set('history_window_y-position', y) + app.settings.set('history_window_x-position', x_pos) + app.settings.set('history_window_y-position', y_pos) app.settings.set('history_window_width', width) app.settings.set('history_window_height', height) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7df2110f375fdd0826066769a36e8fe5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/7df2110f375fdd0826066769a36e8fe5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] SingleMessageWindow: Remove obsolete config values
by Daniel Brötzmann 01 Apr '21

01 Apr '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 782df3d6 by Daniel Brötzmann at 2021-04-01T10:39:08+02:00 SingleMessageWindow: Remove obsolete config values - - - - - 2 changed files: - gajim/common/config.py - gajim/common/setting_values.py Changes: ===================================== gajim/common/config.py ===================================== @@ -116,10 +116,6 @@ class Config: 'pm-msgwin-y-position': [opt_int, -1], # Default is to let the window manager decide 'pm-msgwin-width': [opt_int, 480], 'pm-msgwin-height': [opt_int, 440], - 'single-msg-x-position': [opt_int, 0], - 'single-msg-y-position': [opt_int, 0], - 'single-msg-width': [opt_int, 400], - 'single-msg-height': [opt_int, 280], 'save-roster-position': [opt_bool, True, _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.')], 'roster_x-position': [opt_int, 0], 'roster_y-position': [opt_int, 0], ===================================== gajim/common/setting_values.py ===================================== @@ -65,10 +65,6 @@ class _ACCOUNT_DEFAULT: 'pm-msgwin-y-position': -1, 'pm-msgwin-width': 480, 'pm-msgwin-height': 440, - 'single-msg-x-position': 0, - 'single-msg-y-position': 0, - 'single-msg-width': 400, - 'single-msg-height': 280, 'save-roster-position': True, 'roster_x-position': 0, 'roster_y-position': 0, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782df3d6e9f4ed655d19505caee6b76a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/782df3d6e9f4ed655d19505caee6b76a… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Accounts: Add account switch description
by Daniel Brötzmann 30 Mar '21

30 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15f73dad by Daniel Brötzmann at 2021-03-30T09:05:46+02:00 Accounts: Add account switch description - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -25,6 +25,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -482,11 +483,17 @@ def __init__(self, account): Gtk.IconSize.MENU) next_icon.get_style_context().add_class('insensitive-fg-color') + account_enabled = app.settings.get_account_setting( + self._account, 'active') self._switch = Gtk.Switch() - self._switch.set_active( - app.settings.get_account_setting(self._account, 'active')) + self._switch.set_active(account_enabled) self._switch.set_vexpand(False) + self._switch_state_label = Gtk.Label() + self._switch_state_label.set_xalign(1) + self._switch_state_label.set_valign(Gtk.Align.CENTER) + self._set_label(account_enabled) + if (self._account == app.ZEROCONF_ACC_NAME and not app.is_installed('ZEROCONF')): self._switch.set_active(False) @@ -502,6 +509,8 @@ def __init__(self, account): 'state-set', self._on_enable_switch, self._account) box.add(self._switch) + box.add(self._switch_state_label) + box.add(Gtk.Separator()) box.add(self._label) box.add(next_icon) self.add(box) @@ -519,12 +528,18 @@ def update_account_label(self): def enable_account(self, state): self._switch.set_state(state) + self._set_label(state) + + def _set_label(self, active): + text = Q_('?switch:On') if active else Q_('?switch:Off') + self._switch_state_label.set_text(text) def _on_enable_switch(self, switch, state, account): def _disable(): app.connections[account].change_status('offline', 'offline') app.interface.disable_account(account) switch.set_state(state) + self._set_label(state) old_state = app.settings.get_account_setting(account, 'active') if old_state == state: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15f73dadff5740e1fd74a87ca184fdc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15f73dadff5740e1fd74a87ca184fdc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André 29 Mar '21

29 Mar '21

André pushed to branch master at gajim / gajim Commits: b8690214 by André Apitzsch at 2021-03-29T12:50:51+02:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '3.38' +runtime-version: '40' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -86,8 +86,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/66/6a/98e023b3d11537a5521902ac6b50d… - sha256: 1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c + url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438… + sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c - name: python3-asn1crypto buildsystem: simple @@ -101,11 +101,11 @@ modules: - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-2.10-py2.py3-none-any.whl + - pip3 install --prefix=/app idna-3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/a2/38/928ddce2273eaa564f6f50de91932… - sha256: b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 + url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987… + sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16 - name: python3-cryptography buildsystem: simple @@ -113,8 +113,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/b7/82/f7a4ddc1af185936c1e4fa000942f… - sha256: 7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6 + url: https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d5598… + sha256: 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed - name: python3-pyopenssl buildsystem: simple @@ -146,31 +146,43 @@ modules: - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install --prefix=/app SecretStorage-3.3.0-py3-none-any.whl + - pip3 install --prefix=/app SecretStorage-3.3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/63/a2/a6d9099b14eb5dbbb04fb722d2b53… - sha256: 5c36f6537a523ec5f969ef9fad61c98eb9e017bc601d811e53aa25bece64892f + url: https://files.pythonhosted.org/packages/d9/1e/29cd69fdac7391aa51510dfd42aa7… + sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.4.0-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/41/ad/6a4f1a124b325618a7fb758b885b6… - sha256: 102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 + url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7d… + sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 + + # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl + cleanup: + - /bin + sources: + - type: file + url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b2… + sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-22.0.1-py3-none-any.whl + - pip3 install --prefix=/app keyring-23.0.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/96/17/86e1e5b50dc14e5984a661dde2ed3… - sha256: 9f44660a5d4931bdc14c08a1d01ef30b18a7a8147380710d8c9f9531e1f6c3c0 + url: https://files.pythonhosted.org/packages/26/f9/41230ac47f738f1ba66676dc8d3b3… + sha256: 8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - name: python3-css-parser buildsystem: simple @@ -184,11 +196,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install --prefix=/app precis_i18n-1.0.2-py3-none-any.whl + - pip3 install --prefix=/app precis_i18n-1.0.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/13/f5/3a7485a32dd4422a2a78de744bea4… - sha256: c7d5a1f5667a6e7cb85db0a5a4ec8e1090eaeb6e189e8131a5ee238492d60445 + url: https://files.pythonhosted.org/packages/c1/28/0df691ebe7e28a68b839887ce81be… + sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45 # GSound dependency - name: libcanberra View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8690214dc98a21e1beda89ebe2a8b43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8690214dc98a21e1beda89ebe2a8b43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: add new timestamp setting
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 298e80a2 by lovetox at 2021-03-28T21:53:19+02:00 add new timestamp setting - - - - - c86decc7 by lovetox at 2021-03-28T23:03:25+02:00 Group conversation code into own module - - - - - 12 changed files: - gajim/chat_control_base.py - gajim/common/setting_values.py - + gajim/gtk/conversation/__init__.py - + gajim/gtk/conversation/rows/__init__.py - + gajim/gtk/conversation/rows/base.py - + gajim/gtk/conversation/rows/date.py - + gajim/gtk/conversation/rows/info.py - + gajim/gtk/conversation/rows/message.py - + gajim/gtk/conversation/rows/read_marker.py - + gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation_view.py → gajim/gtk/conversation/view.py - gajim/gui/__init__.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -49,7 +49,7 @@ from gajim import gtkgui_helpers -from gajim.gui.conversation_view import ConversationView +from gajim.gui.conversation.view import ConversationView from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog ===================================== gajim/common/setting_values.py ===================================== @@ -189,6 +189,7 @@ class _ACCOUNT_DEFAULT: 'show_send_message_button': False, 'workspace_order': [], 'chat_handle_position': 350, + 'chat_timestamp_format': '%H:%M', } ACCOUNT_SETTINGS = { @@ -413,6 +414,7 @@ class _ACCOUNT_DEFAULT: 'save-roster-position': _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.'), 'roster_on_the_right': _('Place the contact list on the right in single window mode'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), + 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', 'before_nickname': _('Characters that are printed before the nickname in conversations.'), 'after_nickname': _('Characters that are printed after the nickname in conversations.'), 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), ===================================== gajim/gtk/conversation/__init__.py ===================================== ===================================== gajim/gtk/conversation/rows/__init__.py ===================================== ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -0,0 +1,139 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from datetime import datetime + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.helpers import from_one_line + +from ...conversation_textview import ConversationTextview +from ...util import convert_rgba_to_hex +from ...util import text_to_color +from ...util import wrap_with_event_box + + +class BaseRow(Gtk.ListBoxRow): + def __init__(self, account, widget='label', history_mode=False): + Gtk.ListBoxRow.__init__(self) + self.type = '' + self.timestamp = None + self.kind = None + self.name = None + self.message_id = None + self.text = '' + + self.get_style_context().add_class('conversation-row') + + self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) + self.add(self.grid) + + if widget == 'textview': + self.label = None + self.textview = ConversationTextview( + account, history_mode=history_mode) + else: + self.textview = None + self.label = Gtk.Label() + self.label.set_selectable(True) + self.label.set_line_wrap(True) + self.label.set_xalign(0) + self.label.set_line_wrap_mode( + Pango.WrapMode.WORD_CHAR) + + def update_text_tags(self): + if self.textview is not None: + self.textview.update_text_tags() + + @staticmethod + def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + timestamp_formatted = timestamp.strftime(time_format) + label = Gtk.Label(label=timestamp_formatted) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.END) + label.get_style_context().add_class('conversation-meta') + label.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X')) + return label + + @staticmethod + def create_name_widget(name: str, kind: str, + is_groupchat: bool) -> Gtk.Label: + label = Gtk.Label() + label.set_selectable(True) + label.get_style_context().add_class('conversation-nickname') + + name = GLib.markup_escape_text(name) + if is_groupchat: + rgba = Gdk.RGBA(*text_to_color(name)) + nick_color = convert_rgba_to_hex(rgba) + label.set_markup( + f'<span foreground="{nick_color}">{name}</span>') + else: + if kind in ('incoming', 'incoming_queue'): + label.get_style_context().add_class( + 'gajim-incoming-nickname') + elif kind == 'outgoing': + label.get_style_context().add_class( + 'gajim-outgoing-nickname') + label.set_markup(name) + return label + + +@wrap_with_event_box +class MoreMenuButton(Gtk.MenuButton): + def __init__(self, row): + Gtk.MenuButton.__init__(self) + + self.set_valign(Gtk.Align.START) + self.set_halign(Gtk.Align.END) + self.set_relief(Gtk.ReliefStyle.NONE) + image = Gtk.Image.new_from_icon_name( + 'feather-more-horizontal-symbolic', Gtk.IconSize.BUTTON) + self.add(image) + + self._create_popover(row) + + self.get_style_context().add_class('conversation-more-button') + + def _create_popover(self, row): + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + menu_box.get_style_context().add_class('padding-6') + + quote_button = Gtk.ModelButton() + quote_button.set_halign(Gtk.Align.START) + quote_button.connect('clicked', row._on_quote_message) + quote_button.set_label(_('Quote…')) + quote_button.set_image(Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + menu_box.add(quote_button) + + copy_button = Gtk.ModelButton() + copy_button.set_halign(Gtk.Align.START) + copy_button.connect('clicked', row._on_copy_message) + copy_button.set_label(_('Copy')) + copy_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-copy-symbolic', Gtk.IconSize.MENU)) + menu_box.add(copy_button) + + menu_box.show_all() + + popover = Gtk.PopoverMenu() + popover.add(menu_box) + self.set_popover(popover) ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -0,0 +1,32 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk + +from .base import BaseRow + + +class DateRow(BaseRow): + def __init__(self, account, date_string, timestamp): + BaseRow.__init__(self, account) + self.type = 'date' + self.timestamp = timestamp + self.get_style_context().add_class('conversation-date-row') + + self.label.set_text(date_string) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class('conversation-meta') + self.grid.attach(self.label, 0, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -0,0 +1,64 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .base import BaseRow + + +class InfoMessageRow(BaseRow): + def __init__(self, + account, + timestamp, + text, + other_text_tags, + kind, + subject, + graphics, + history_mode=False): + BaseRow.__init__(self, account, widget='textview', + history_mode=history_mode) + self.type = 'info' + self.timestamp = timestamp + self.kind = kind + + if subject: + subject_title = _('Subject:') + text = (f'{subject_title}\n' + f'{GLib.markup_escape_text(subject)}\n' + f'{GLib.markup_escape_text(text)}') + else: + text = GLib.markup_escape_text(text) + + other_text_tags.append('status') + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + timestamp_widget = self.create_timestamp_widget(timestamp) + 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) + + self.grid.attach(self.textview, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -0,0 +1,285 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.const import TRUST_SYMBOL_DATA +from gajim.common.helpers import reduce_chars_newlines +from gajim.common.helpers import to_user_string +from gajim.common.i18n import _ +from gajim.common.i18n import Q_ + +from .base import BaseRow +from .base import MoreMenuButton +from ...util import format_fingerprint + + +class MessageRow(BaseRow): + def __init__(self, + account, + message_id, + timestamp, + kind, + name, + text, + other_text_tags, + avatar, + is_groupchat, + additional_data=None, + display_marking=None, + marker=None, + error=None, + encryption_enabled=False, + history_mode=False): + + # other_tags_for_name contained 'marked', 'bold' and + # 'muc_nickname_color_', which are now derived from + # other_text_tags ('marked') + + # other_tags_for_time were always empty? + + BaseRow.__init__(self, account, widget='textview', + history_mode=history_mode) + self.type = 'chat' + self.timestamp = timestamp + self.message_id = message_id + self.kind = kind + self.name = name or '' + self.text = text + + self._corrections = [] + self._has_receipt = marker == 'received' + self._has_displayed = marker == 'displayed' + + if is_groupchat: + if other_text_tags and 'marked' in other_text_tags: + self.get_style_context().add_class( + 'conversation-mention-highlight') + + self.textview.connect('quote', self._on_quote_selection) + self.textview.print_text( + text, + other_text_tags=other_text_tags, + kind=kind, + name=name, + additional_data=additional_data) + + self._meta_box = Gtk.Box(spacing=6) + self._meta_box.pack_start( + self.create_name_widget(name, kind, is_groupchat), False, True, 0) + timestamp_label = self.create_timestamp_widget(timestamp) + timestamp_label.set_margin_start(6) + self._meta_box.pack_end(timestamp_label, False, True, 0) + # TODO: implement app.settings.get('print_time') 'always', 'sometimes'? + + if kind in ('incoming', 'incoming_queue', 'outgoing'): + encryption_img = self._get_encryption_image( + additional_data, encryption_enabled) + if encryption_img: + self._meta_box.pack_end(encryption_img, False, True, 0) + + if display_marking: + label_text = GLib.markup_escape_text(display_marking.name) + if label_text: + bgcolor = display_marking.bgcolor + fgcolor = display_marking.fgcolor + label_text = ( + f'<span size="small" bgcolor="{bgcolor}" ' + f'fgcolor="{fgcolor}"><tt>[{label_text}]</tt></span>') + display_marking_label = Gtk.Label() + display_marking_label.set_markup(label_text) + self._meta_box.add(display_marking_label) + + self._message_icons = MessageIcons() + + if error is not None: + self.set_error(to_user_string(error)) + + if marker is not None: + if marker in ('received', 'displayed'): + self.set_receipt() + + self._meta_box.pack_end(self._message_icons, False, True, 0) + + self._avatar_surface = Gtk.Image.new_from_surface(avatar) + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + avatar_placeholder.set_valign(Gtk.Align.START) + avatar_placeholder.add(self._avatar_surface) + + bottom_box = Gtk.Box(spacing=6) + bottom_box.add(self.textview) + bottom_box.add(MoreMenuButton(self)) + + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + self.grid.attach(self._meta_box, 1, 0, 1, 1) + self.grid.attach(bottom_box, 1, 1, 1, 1) + + def _on_copy_message(self, _widget): + timestamp = self.timestamp.strftime('%x, %X') + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text( + f'{timestamp} - {self.name}: {self.textview.get_text()}', -1) + + def _on_quote_message(self, _widget): + self.get_parent().on_quote(self.textview.get_text()) + + def _get_encryption_image(self, additional_data, encryption_enabled=None): + details = self._get_encryption_details(additional_data) + if details is None: + # Message was not encrypted + if not encryption_enabled: + return None + icon = 'channel-insecure-symbolic' + color = 'unencrypted-color' + tooltip = _('Not encrypted') + else: + name, fingerprint, trust = details + tooltip = _('Encrypted (%s)') % (name) + if trust is None: + # The encryption plugin did not pass trust information + icon = 'channel-secure-symbolic' + color = 'encrypted-color' + else: + icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] + tooltip = '%s\n%s' % (tooltip, trust_tooltip) + if fingerprint is not None: + fingerprint = format_fingerprint(fingerprint) + tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + image.set_tooltip_markup(tooltip) + image.get_style_context().add_class(color) + image.show() + return image + + @staticmethod + def _get_encryption_details(additional_data): + name = additional_data.get_value('encrypted', 'name') + if name is None: + return None + + fingerprint = additional_data.get_value('encrypted', 'fingerprint') + trust = additional_data.get_value('encrypted', 'trust') + return name, fingerprint, trust + + def _on_quote_selection(self, _widget, text): + self.get_parent().on_quote(text) + + @property + def has_receipt(self): + return self._has_receipt + + @property + def has_displayed(self): + return self._has_displayed + + def set_receipt(self): + self._has_receipt = True + self._message_icons.set_receipt_icon_visible(True) + + 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() + 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) + self._message_icons.set_correction_tooltip( + _('Message corrected. Original message:\n%s') % corrections) + # Update message_id for this row + self.message_id = message_id + + def set_error(self, tooltip): + self._message_icons.set_error_icon_visible(True) + self._message_icons.set_error_tooltip(tooltip) + + def update_avatar(self, avatar): + self._avatar_surface.set_from_surface(avatar) + + def set_merged(self, merged): + if merged: + self.get_style_context().add_class('merged') + self._avatar_surface.set_no_show_all(True) + self._avatar_surface.hide() + self._meta_box.set_no_show_all(True) + self._meta_box.hide() + else: + self.get_style_context().remove_class('merged') + self._avatar_surface.set_no_show_all(False) + self._avatar_surface.show() + self._meta_box.set_no_show_all(False) + self._meta_box.show() + + +class MessageIcons(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL) + + self._correction_image = Gtk.Image.new_from_icon_name( + 'document-edit-symbolic', Gtk.IconSize.MENU) + self._correction_image.set_no_show_all(True) + self._correction_image.get_style_context().add_class('dim-label') + + self._marker_image = Gtk.Image() + self._marker_image.set_no_show_all(True) + self._marker_image.get_style_context().add_class('dim-label') + + self._error_image = Gtk.Image.new_from_icon_name( + 'dialog-warning-symbolic', Gtk.IconSize.MENU) + self._error_image.get_style_context().add_class('warning-color') + self._error_image.set_no_show_all(True) + + self.add(self._correction_image) + self.add(self._marker_image) + self.add(self._error_image) + self.show_all() + + def set_receipt_icon_visible(self, visible): + if not app.settings.get('positive_184_ack'): + return + self._marker_image.set_visible(visible) + self._marker_image.set_from_icon_name( + 'feather-check-symbolic', Gtk.IconSize.MENU) + self._marker_image.set_tooltip_text(Q_('?Message state:Received')) + + def set_correction_icon_visible(self, visible): + self._correction_image.set_visible(visible) + + def set_correction_tooltip(self, text): + self._correction_image.set_tooltip_markup(text) + + def set_error_icon_visible(self, visible): + self._error_image.set_visible(visible) + + def set_error_tooltip(self, text): + self._error_image.set_tooltip_markup(text) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -0,0 +1,35 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk + +from gajim.common.i18n import _ + +from .base import BaseRow + +class ReadMarkerRow(BaseRow): + def __init__(self, account, contact, timestamp): + BaseRow.__init__(self, account) + self.type = 'read_marker' + self.timestamp = timestamp + + text = _('%s has read up to this point') % contact.name + self.label.set_text(text) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class( + 'conversation-read-marker') + self.grid.attach(self.label, 0, 0, 1, 1) + self.show_all() ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -0,0 +1,45 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.i18n import _ + +from .base import BaseRow + + +class ScrollHintRow(BaseRow): + def __init__(self, account): + BaseRow.__init__(self, account) + self.type = 'system' + self.timestamp = datetime.fromtimestamp(0) + self.get_style_context().add_class('conversation-system-row') + + self._button = Gtk.Button.new_from_icon_name( + 'go-up-symbolic', Gtk.IconSize.BUTTON) + self._button.set_tooltip_text(_('Load more messages')) + self._button.connect('clicked', self._on_load_history) + self.grid.attach(self._button, 0, 0, 1, 1) + + self.label.set_text(_('Scroll up to load more chat history…')) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class( + 'conversation-meta') + self.grid.attach(self.label, 0, 1, 1, 1) + + def _on_load_history(self, _button): + self.get_parent().emit('load-history', 30) ===================================== gajim/gtk/conversation_view.py → gajim/gtk/conversation/view.py ===================================== @@ -21,27 +21,21 @@ from datetime import datetime from datetime import timedelta -from gi.repository import Gdk from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk -from gi.repository import Pango from gajim.common import app from gajim.common.const import AvatarSize -from gajim.common.const import TRUST_SYMBOL_DATA -from gajim.common.helpers import from_one_line -from gajim.common.helpers import reduce_chars_newlines from gajim.common.helpers import to_user_string -from gajim.common.i18n import _ -from gajim.common.i18n import Q_ -from .conversation_textview import ConversationTextview -from .util import convert_rgba_to_hex -from .util import format_fingerprint from .util import scroll_to_end -from .util import text_to_color -from .util import wrap_with_event_box +from .conversation.rows.read_marker import ReadMarkerRow +from .conversation.rows.scroll_hint import ScrollHintRow +from .conversation.rows.message import MessageRow +from .conversation.rows.info import InfoMessageRow +from .conversation.rows.date import DateRow + log = logging.getLogger('gajim.gui.conversation_view') @@ -182,7 +176,7 @@ def add_message(self, return avatar = self._get_avatar(kind, name) - message = TextMessageRow( + message = MessageRow( self._account, message_id, time_, @@ -504,468 +498,3 @@ def on_quote(self, text): self.emit('quote', text) # TODO: focus_out_line for group chats - - -class ConversationRow(Gtk.ListBoxRow): - def __init__(self, account, widget='label', history_mode=False): - Gtk.ListBoxRow.__init__(self) - self.type = '' - self.timestamp = None - self.kind = None - self.name = None - self.message_id = None - self.text = '' - - self.get_style_context().add_class('conversation-row') - - self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) - self.add(self.grid) - - if widget == 'textview': - self.label = None - self.textview = ConversationTextview( - account, history_mode=history_mode) - else: - self.textview = None - self.label = Gtk.Label() - self.label.set_selectable(True) - self.label.set_line_wrap(True) - self.label.set_xalign(0) - self.label.set_line_wrap_mode( - Pango.WrapMode.WORD_CHAR) - - def update_text_tags(self): - if self.textview is not None: - self.textview.update_text_tags() - - @staticmethod - def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: - # TODO: maybe change default to '%H:%M' - time_format = from_one_line(app.settings.get('time_stamp')) - timestamp_formatted = timestamp.strftime(time_format) - label = Gtk.Label(label=timestamp_formatted) - label.set_halign(Gtk.Align.START) - label.set_valign(Gtk.Align.END) - label.get_style_context().add_class('conversation-meta') - label.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %H:%M:%S')) - return label - - @staticmethod - def create_name_widget(name: str, kind: str, - is_groupchat: bool) -> Gtk.Label: - label = Gtk.Label() - label.set_selectable(True) - label.get_style_context().add_class('conversation-nickname') - - name = GLib.markup_escape_text(name) - if is_groupchat: - rgba = Gdk.RGBA(*text_to_color(name)) - nick_color = convert_rgba_to_hex(rgba) - label.set_markup( - f'<span foreground="{nick_color}">{name}</span>') - else: - if kind in ('incoming', 'incoming_queue'): - label.get_style_context().add_class( - 'gajim-incoming-nickname') - elif kind == 'outgoing': - label.get_style_context().add_class( - 'gajim-outgoing-nickname') - label.set_markup(name) - return label - - -class ScrollHintRow(ConversationRow): - def __init__(self, account): - ConversationRow.__init__(self, account) - self.type = 'system' - self.timestamp = datetime.fromtimestamp(0) - self.get_style_context().add_class('conversation-system-row') - - self._button = Gtk.Button.new_from_icon_name( - 'go-up-symbolic', Gtk.IconSize.BUTTON) - self._button.set_tooltip_text(_('Load more messages')) - self._button.connect('clicked', self._on_load_history) - self.grid.attach(self._button, 0, 0, 1, 1) - - self.label.set_text(_('Scroll up to load more chat history…')) - self.label.set_halign(Gtk.Align.CENTER) - self.label.set_hexpand(True) - self.label.get_style_context().add_class( - 'conversation-meta') - self.grid.attach(self.label, 0, 1, 1, 1) - - def _on_load_history(self, _button): - self.get_parent().emit('load-history', 30) - - -class ReadMarkerRow(ConversationRow): - def __init__(self, account, contact, timestamp): - ConversationRow.__init__(self, account) - self.type = 'read_marker' - self.timestamp = timestamp - - text = _('%s has read up to this point') % contact.name - self.label.set_text(text) - self.label.set_halign(Gtk.Align.CENTER) - self.label.set_hexpand(True) - self.label.get_style_context().add_class( - 'conversation-read-marker') - self.grid.attach(self.label, 0, 0, 1, 1) - self.show_all() - - -class DateRow(ConversationRow): - def __init__(self, account, date_string, timestamp): - ConversationRow.__init__(self, account) - self.type = 'date' - self.timestamp = timestamp - self.get_style_context().add_class('conversation-date-row') - - self.label.set_text(date_string) - self.label.set_halign(Gtk.Align.CENTER) - self.label.set_hexpand(True) - self.label.get_style_context().add_class( - 'conversation-meta') - self.grid.attach(self.label, 0, 0, 1, 1) - - -class InfoMessageRow(ConversationRow): - def __init__(self, - account, - timestamp, - text, - other_text_tags, - kind, - subject, - graphics, - history_mode=False): - ConversationRow.__init__(self, account, widget='textview', - history_mode=history_mode) - self.type = 'info' - self.timestamp = timestamp - self.kind = kind - - if subject: - subject_title = _('Subject:') - text = (f'{subject_title}\n' - f'{GLib.markup_escape_text(subject)}\n' - f'{GLib.markup_escape_text(text)}') - else: - text = GLib.markup_escape_text(text) - - other_text_tags.append('status') - - avatar_placeholder = Gtk.Box() - avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - timestamp_widget = self.create_timestamp_widget(timestamp) - 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) - - self.grid.attach(self.textview, 1, 0, 1, 1) - - -class TextMessageRow(ConversationRow): - def __init__(self, - account, - message_id, - timestamp, - kind, - name, - text, - other_text_tags, - avatar, - is_groupchat, - additional_data=None, - display_marking=None, - marker=None, - error=None, - encryption_enabled=False, - history_mode=False): - - # other_tags_for_name contained 'marked', 'bold' and - # 'muc_nickname_color_', which are now derived from - # other_text_tags ('marked') - - # other_tags_for_time were always empty? - - ConversationRow.__init__(self, account, widget='textview', - history_mode=history_mode) - self.type = 'chat' - self.timestamp = timestamp - self.message_id = message_id - self.kind = kind - self.name = name or '' - self.text = text - - self._corrections = [] - self._has_receipt = marker == 'received' - self._has_displayed = marker == 'displayed' - - if is_groupchat: - if other_text_tags and 'marked' in other_text_tags: - self.get_style_context().add_class( - 'conversation-mention-highlight') - - self.textview.connect('quote', self._on_quote_selection) - self.textview.print_text( - text, - other_text_tags=other_text_tags, - kind=kind, - name=name, - additional_data=additional_data) - - self._meta_box = Gtk.Box(spacing=6) - self._meta_box.pack_start( - self.create_name_widget(name, kind, is_groupchat), False, True, 0) - timestamp_label = self.create_timestamp_widget(timestamp) - timestamp_label.set_margin_start(6) - self._meta_box.pack_end(timestamp_label, False, True, 0) - # TODO: implement app.settings.get('print_time') 'always', 'sometimes'? - - if kind in ('incoming', 'incoming_queue', 'outgoing'): - encryption_img = self._get_encryption_image( - additional_data, encryption_enabled) - if encryption_img: - self._meta_box.pack_end(encryption_img, False, True, 0) - - if display_marking: - label_text = GLib.markup_escape_text(display_marking.name) - if label_text: - bgcolor = display_marking.bgcolor - fgcolor = display_marking.fgcolor - label_text = ( - f'<span size="small" bgcolor="{bgcolor}" ' - f'fgcolor="{fgcolor}"><tt>[{label_text}]</tt></span>') - display_marking_label = Gtk.Label() - display_marking_label.set_markup(label_text) - self._meta_box.add(display_marking_label) - - self._message_icons = MessageIcons() - - if error is not None: - self.set_error(to_user_string(error)) - - if marker is not None: - if marker in ('received', 'displayed'): - self.set_receipt() - - self._meta_box.pack_end(self._message_icons, False, True, 0) - - self._avatar_surface = Gtk.Image.new_from_surface(avatar) - avatar_placeholder = Gtk.Box() - avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - avatar_placeholder.set_valign(Gtk.Align.START) - avatar_placeholder.add(self._avatar_surface) - - bottom_box = Gtk.Box(spacing=6) - bottom_box.add(self.textview) - bottom_box.add(MoreMenuButton(self)) - - self.grid.attach(avatar_placeholder, 0, 0, 1, 2) - self.grid.attach(self._meta_box, 1, 0, 1, 1) - self.grid.attach(bottom_box, 1, 1, 1, 1) - - def _on_copy_message(self, _widget): - timestamp = self.timestamp.strftime('%x, %X') - clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) - clip.set_text( - f'{timestamp} - {self.name}: {self.textview.get_text()}', -1) - - def _on_quote_message(self, _widget): - self.get_parent().on_quote(self.textview.get_text()) - - def _get_encryption_image(self, additional_data, encryption_enabled=None): - details = self._get_encryption_details(additional_data) - if details is None: - # Message was not encrypted - if not encryption_enabled: - return None - icon = 'channel-insecure-symbolic' - color = 'unencrypted-color' - tooltip = _('Not encrypted') - else: - name, fingerprint, trust = details - tooltip = _('Encrypted (%s)') % (name) - if trust is None: - # The encryption plugin did not pass trust information - icon = 'channel-secure-symbolic' - color = 'encrypted-color' - else: - icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] - tooltip = '%s\n%s' % (tooltip, trust_tooltip) - if fingerprint is not None: - fingerprint = format_fingerprint(fingerprint) - tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) - - image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) - image.set_tooltip_markup(tooltip) - image.get_style_context().add_class(color) - image.show() - return image - - @staticmethod - def _get_encryption_details(additional_data): - name = additional_data.get_value('encrypted', 'name') - if name is None: - return None - - fingerprint = additional_data.get_value('encrypted', 'fingerprint') - trust = additional_data.get_value('encrypted', 'trust') - return name, fingerprint, trust - - def _on_quote_selection(self, _widget, text): - self.get_parent().on_quote(text) - - @property - def has_receipt(self): - return self._has_receipt - - @property - def has_displayed(self): - return self._has_displayed - - def set_receipt(self): - self._has_receipt = True - self._message_icons.set_receipt_icon_visible(True) - - 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() - 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) - self._message_icons.set_correction_tooltip( - _('Message corrected. Original message:\n%s') % corrections) - # Update message_id for this row - self.message_id = message_id - - def set_error(self, tooltip): - self._message_icons.set_error_icon_visible(True) - self._message_icons.set_error_tooltip(tooltip) - - def update_avatar(self, avatar): - self._avatar_surface.set_from_surface(avatar) - - def set_merged(self, merged): - if merged: - self.get_style_context().add_class('merged') - self._avatar_surface.set_no_show_all(True) - self._avatar_surface.hide() - self._meta_box.set_no_show_all(True) - self._meta_box.hide() - else: - self.get_style_context().remove_class('merged') - self._avatar_surface.set_no_show_all(False) - self._avatar_surface.show() - self._meta_box.set_no_show_all(False) - self._meta_box.show() - - -class MessageIcons(Gtk.Box): - def __init__(self): - Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL) - - self._correction_image = Gtk.Image.new_from_icon_name( - 'document-edit-symbolic', Gtk.IconSize.MENU) - self._correction_image.set_no_show_all(True) - self._correction_image.get_style_context().add_class('dim-label') - - self._marker_image = Gtk.Image() - self._marker_image.set_no_show_all(True) - self._marker_image.get_style_context().add_class('dim-label') - - self._error_image = Gtk.Image.new_from_icon_name( - 'dialog-warning-symbolic', Gtk.IconSize.MENU) - self._error_image.get_style_context().add_class('warning-color') - self._error_image.set_no_show_all(True) - - self.add(self._correction_image) - self.add(self._marker_image) - self.add(self._error_image) - self.show_all() - - def set_receipt_icon_visible(self, visible): - if not app.settings.get('positive_184_ack'): - return - self._marker_image.set_visible(visible) - self._marker_image.set_from_icon_name( - 'feather-check-symbolic', Gtk.IconSize.MENU) - self._marker_image.set_tooltip_text(Q_('?Message state:Received')) - - def set_correction_icon_visible(self, visible): - self._correction_image.set_visible(visible) - - def set_correction_tooltip(self, text): - self._correction_image.set_tooltip_markup(text) - - def set_error_icon_visible(self, visible): - self._error_image.set_visible(visible) - - def set_error_tooltip(self, text): - self._error_image.set_tooltip_markup(text) - - -@wrap_with_event_box -class MoreMenuButton(Gtk.MenuButton): - def __init__(self, row): - Gtk.MenuButton.__init__(self) - - self.set_valign(Gtk.Align.START) - self.set_halign(Gtk.Align.END) - self.set_relief(Gtk.ReliefStyle.NONE) - image = Gtk.Image.new_from_icon_name( - 'feather-more-horizontal-symbolic', Gtk.IconSize.BUTTON) - self.add(image) - - self._create_popover(row) - - self.get_style_context().add_class('conversation-more-button') - - def _create_popover(self, row): - menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) - menu_box.get_style_context().add_class('padding-6') - - quote_button = Gtk.ModelButton() - quote_button.set_halign(Gtk.Align.START) - quote_button.connect('clicked', row._on_quote_message) - quote_button.set_label(_('Quote…')) - quote_button.set_image(Gtk.Image.new_from_icon_name( - 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) - menu_box.add(quote_button) - - copy_button = Gtk.ModelButton() - copy_button.set_halign(Gtk.Align.START) - copy_button.connect('clicked', row._on_copy_message) - copy_button.set_label(_('Copy')) - copy_button.set_image(Gtk.Image.new_from_icon_name( - 'edit-copy-symbolic', Gtk.IconSize.MENU)) - menu_box.add(copy_button) - - menu_box.show_all() - - popover = Gtk.PopoverMenu() - popover.add(menu_box) - self.set_popover(popover) ===================================== gajim/gui/__init__.py ===================================== @@ -28,22 +28,36 @@ def find_spec(self, fullname, _path, _target=None): return spec def _find_module(self, module_name): - module_path = self._path / f'{module_name}.py' + base_path = Path(self._path) + + fallback_base_path = None + if self._fallback_path is not None: + fallback_base_path = Path(self._fallback_path) + + module_path = base_path / module_name + if module_path.is_dir(): + base_path = module_path + if fallback_base_path is not None: + fallback_base_path = fallback_base_path / module_name + + module_name = '__init__' + + module_path = base_path / f'{module_name}.py' if module_path.exists(): return module_path - module_path = self._path / f'{module_name}.pyc' + module_path = base_path / f'{module_name}.pyc' if module_path.exists(): return module_path - if self._fallback_path is None: + if fallback_base_path is None: return None - module_path = self._fallback_path / f'{module_name}.py' + module_path = fallback_base_path / f'{module_name}.py' if module_path.exists(): return module_path - module_path = self._fallback_path / f'{module_name}.pyc' + module_path = fallback_base_path / f'{module_name}.pyc' if module_path.exists(): return module_path View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80bac099bcc5f650e845cccc176bcf1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80bac099bcc5f650e845cccc176bcf1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Wrap menu button in eventbox
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 80bac099 by lovetox at 2021-03-28T21:24:12+02:00 Wrap menu button in eventbox - - - - - 2 changed files: - gajim/gtk/conversation_view.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/conversation_view.py ===================================== @@ -41,7 +41,7 @@ from .util import format_fingerprint from .util import scroll_to_end from .util import text_to_color -from .util import get_cursor +from .util import wrap_with_event_box log = logging.getLogger('gajim.gui.conversation_view') @@ -928,12 +928,11 @@ def set_error_tooltip(self, text): self._error_image.set_tooltip_markup(text) +@wrap_with_event_box class MoreMenuButton(Gtk.MenuButton): def __init__(self, row): Gtk.MenuButton.__init__(self) - self.connect_after('realize', self._on_realize) - self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.END) self.set_relief(Gtk.ReliefStyle.NONE) @@ -970,6 +969,3 @@ def _create_popover(self, row): popover = Gtk.PopoverMenu() popover.add(menu_box) self.set_popover(popover) - - def _on_realize(self, *args): - self.get_window().set_cursor(get_cursor('pointer')) ===================================== gajim/gtk/util.py ===================================== @@ -884,3 +884,18 @@ def disconnect_cb(*args): def connect_destroy(sender, *args, **kwargs): return _connect_destroy(sender, sender.connect, *args, **kwargs) + + +def wrap_with_event_box(klass): + @wraps(klass) + def klass_wrapper(*args, **kwargs): + widget = klass(*args, **kwargs) + event_box = Gtk.EventBox() + + def _on_realize(*args): + event_box.get_window().set_cursor(get_cursor('pointer')) + + event_box.connect_after('realize', _on_realize) + event_box.add(widget) + return event_box + return klass_wrapper View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80bac099bcc5f650e845cccc176bcf1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80bac099bcc5f650e845cccc176bcf1a… 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