Commits April 2021

commits@gajim.org

1 participants
60 discussions

[Git][gajim/gajim][mainwindow] Remove unused imports
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f354d46a by lovetox at 2021-04-04T23:24:56+02:00 Remove unused imports - - - - - 1 changed file: - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/view.py ===================================== @@ -15,8 +15,6 @@ import logging import time -from bisect import bisect_right -from datetime import datetime from datetime import timedelta from gi.repository import GLib @@ -96,7 +94,6 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._last_incoming_timestamp = datetime.fromtimestamp(0) self._row_count = 0 self.clearing = False View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354d46a504a5ce53b9b9e419b0a2294… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f354d46a504a5ce53b9b9e419b0a2294… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Make read recipes work
by Philipp Hörist 04 Apr '21

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: d652c035 by lovetox at 2021-04-04T23:23:37+02:00 Make read recipes work - - - - - 2 changed files: - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -12,6 +12,7 @@ # 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 @@ -19,11 +20,12 @@ from .base import BaseRow + class ReadMarkerRow(BaseRow): - def __init__(self, account, contact, timestamp): + def __init__(self, account, contact): BaseRow.__init__(self, account) self.type = 'read_marker' - self.timestamp = timestamp + self.timestamp = datetime.fromtimestamp(0) text = _('%s has read up to this point') % contact.name self.label.set_text(text) @@ -32,4 +34,8 @@ def __init__(self, account, contact, timestamp): self.label.get_style_context().add_class( 'conversation-read-marker') self.grid.attach(self.label, 0, 0, 1, 1) + + def set_timestamp(self, timestamp): + self.timestamp = timestamp + self.changed() self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -15,9 +15,7 @@ import logging import time -from bisect import bisect_left from bisect import bisect_right -from collections import deque from datetime import datetime from datetime import timedelta @@ -68,15 +66,15 @@ def __init__(self, account, contact, history_mode=False): self._row_count = 0 self._max_row_count = 100 + # Keeps track of date rows we have added to the list self._active_date_rows = set() - # Keeps inserted message IDs to avoid re-inserting the same message - self._message_ids_inserted = {} + # message_id -> row mapping + self._message_id_row_map = {} - # Last incoming chat message timestamp (used for ReadMarkerRows) - self._last_incoming_timestamp = datetime.fromtimestamp(0) + self._read_marker_row = ReadMarkerRow(self._account, self._contact) + self.add(self._read_marker_row) - # Insert the very first row, containing the scroll hint and load button self._scroll_hint_row = ScrollHintRow(self._account, history_mode=self._history_mode) self.add(self._scroll_hint_row) @@ -98,9 +96,7 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._message_ids_inserted.clear() self._last_incoming_timestamp = datetime.fromtimestamp(0) - self._timestamps_inserted.clear() self._row_count = 0 self.clearing = False @@ -134,13 +130,6 @@ def add_message(self, other_text_tags, display_marking, additional_data, subject, marker, error, history, graphics) - if message_id: - if message_id in self._message_ids_inserted: - log.warning('Rejecting insertion of duplicate message_id %s', - str(message_id)) - return - self._message_ids_inserted[message_id] = True - if not timestamp: timestamp = time.time() @@ -189,6 +178,9 @@ def add_message(self, history_mode=self._history_mode, log_line_id=log_line_id) + if message.type == 'chat': + self._message_id_row_map[message.message_id] = message + self._insert_message(message) def _get_avatar(self, kind, name): @@ -309,10 +301,7 @@ def reduce_message_count(self): return successful def _get_row_by_message_id(self, id_): - for row in self.get_children(): - if row.message_id == id_: - return row - return None + return self._message_id_row_map.get(id_) def get_row_by_log_line_id(self, log_line_id): for row in self.get_children(): @@ -325,70 +314,14 @@ def iter_rows(self): yield row def set_read_marker(self, id_): - message_row = self._get_row_by_message_id(id_) - if message_row is None: - return - - message_row.set_displayed() - self._update_read_marker(message_row.timestamp) - - def _update_read_marker(self, current_timestamp): - marker_shown = False - - for row in self.get_children(): - if row.type == 'read_marker': - # We already have a ReadMarkerRow, decide if we keep it - marker_shown = True - - if self._last_incoming_timestamp > row.timestamp: - # Last incoming message is newer than read marker - self.remove(row) - self._timestamps_inserted.remove(row.timestamp) - marker_shown = False - break - - if self._last_incoming_timestamp > current_timestamp: - # Last incoming message is newer than current message - break - - if current_timestamp > row.timestamp: - # Message is newer than current ReadMarkerRow - current_row = self.get_row_at_index( - self._timestamps_inserted.index(current_timestamp)) - if current_row.has_displayed: - # Current row has a displayed marker, which means - # that the current ReadMarkerRow is out of date - self.remove(row) - self._timestamps_inserted.remove(row.timestamp) - marker_shown = False - break - break - - if self._last_incoming_timestamp >= current_timestamp: - # Don’t add ReadMarkerRow if last incoming message is newer - return - - if marker_shown: - # There is a ReadMarkerRow which has not been removed by previous - # rules, thus it’s the most current one (nothing more to do) + row = self._get_row_by_message_id(id_) + if row is None: return - current_row = self.get_row_at_index( - self._timestamps_inserted.index(current_timestamp)) - if current_row.type != 'chat': - return + row.set_displayed() - if current_row.has_displayed: - # Add a new ReadMarkerRow, if there is a marker for the current row - self._insert_read_marker(current_timestamp) - - def _insert_read_marker(self, timestamp): - insertion_point = bisect_right( - self._timestamps_inserted, timestamp) - read_marker_row = ReadMarkerRow( - self._account, self._contact, timestamp) - self.insert(read_marker_row, insertion_point) - self._timestamps_inserted.insert(insertion_point, timestamp) + timestamp = row.timestamp + timedelta(microseconds=1) + self._read_marker_row.set_timestamp(timestamp) def update_avatars(self): for row in self.get_children(): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d652c035d9280525da8943223310e9a7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/d652c035d9280525da8943223310e9a7… You're receiving this email because of your account on dev.gajim.org.

1 0

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

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 77a47d74 by lovetox at 2021-04-04T22:55:03+02:00 Improve View sorting - - - - - 5 changed files: - gajim/common/helpers.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/date.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/helpers.py ===================================== @@ -1361,3 +1361,10 @@ def get_muc_context(jid): if (disco_info.muc_is_members_only and disco_info.muc_is_nonanonymous): return 'private' return 'public' + + +def get_start_of_day(date_time): + return date_time.replace(hour=0, + minute=0, + second=0, + microsecond=0) ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -39,6 +39,7 @@ def __init__(self, account, widget='label', history_mode=False): self.message_id = None self.log_line_id = None self.text = '' + self._merged = False self.get_style_context().add_class('conversation-row') @@ -58,6 +59,10 @@ def __init__(self, account, widget='label', history_mode=False): self.label.set_line_wrap_mode( Pango.WrapMode.WORD_CHAR) + @property + def is_merged(self): + return self._merged + def update_text_tags(self): if self.textview is not None: self.textview.update_text_tags() ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -19,7 +19,7 @@ class DateRow(BaseRow): - def __init__(self, account, date_string, timestamp): + def __init__(self, account, timestamp): BaseRow.__init__(self, account) self.set_selectable(False) @@ -29,8 +29,10 @@ def __init__(self, account, date_string, timestamp): self.timestamp = timestamp self.get_style_context().add_class('conversation-date-row') - self.label.set_text(date_string) + self.label.set_text(timestamp.strftime('%a, %d %b %Y')) 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) + + self.show_all() ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. from datetime import datetime +from datetime import timedelta from gi.repository import Gdk from gi.repository import GLib @@ -31,6 +32,9 @@ from ...util import format_fingerprint +MERGE_TIMEFRAME = timedelta(seconds=120) + + class MessageRow(BaseRow): def __init__(self, account, @@ -135,6 +139,18 @@ def __init__(self, self.grid.attach(self._meta_box, 1, 0, 1, 1) self.grid.attach(bottom_box, 1, 1, 1, 1) + self.show_all() + + def is_same_sender(self, message): + return message.name == self.name + + def is_mergeable(self, message): + if message.type != self.type: + return False + if not self.is_same_sender(message): + return False + return abs(message.timestamp - self.timestamp) < MERGE_TIMEFRAME + def on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -232,6 +248,7 @@ def update_avatar(self, avatar): self._avatar_surface.set_from_surface(avatar) def set_merged(self, merged): + self._merged = merged if merged: self.get_style_context().add_class('merged') self._avatar_surface.set_no_show_all(True) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -28,6 +28,7 @@ from gajim.common import app from gajim.common.const import AvatarSize from gajim.common.helpers import to_user_string +from gajim.common.helpers import get_start_of_day from .util import scroll_to_end from .conversation.rows.read_marker import ReadMarkerRow @@ -53,6 +54,7 @@ class ConversationView(Gtk.ListBox): def __init__(self, account, contact, history_mode=False): Gtk.ListBox.__init__(self) self.set_selection_mode(Gtk.SelectionMode.NONE) + self.set_sort_func(self._sort_func) self._account = account self._client = app.get_client(account) self._contact = contact @@ -62,30 +64,15 @@ def __init__(self, account, contact, history_mode=False): self.autoscroll = True self.clearing = False - # Both first and last DateRow (datetime) - self._first_date = None - self._last_date = None - # Keeps track of the number of rows shown in ConversationView self._row_count = 0 self._max_row_count = 100 + self._active_date_rows = set() + # Keeps inserted message IDs to avoid re-inserting the same message self._message_ids_inserted = {} - # We keep a sorted array of all the timestamps we've inserted, which - # have a 1-to-1 mapping to the actual child elements of this ListBox - # (*all* rows are included). - # Binary-searching this array enables us to insert a message with a - # discontinuous timestamp (not less than or greater than the first or - # last message timestamp in the list), and insert it at the correct - # place in the ListBox. - self._timestamps_inserted = deque() - - # Stores the timestamp of the first *chat* row inserted - # (not a system row or date row) - self.first_message_timestamp = None - # Last incoming chat message timestamp (used for ReadMarkerRows) self._last_incoming_timestamp = datetime.fromtimestamp(0) @@ -93,7 +80,6 @@ def __init__(self, account, contact, history_mode=False): 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)) def clear(self): self.clearing = True @@ -112,15 +98,17 @@ def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): - self._first_date = None - self._last_date = None self._message_ids_inserted.clear() - self.first_message_timestamp = None self._last_incoming_timestamp = datetime.fromtimestamp(0) self._timestamps_inserted.clear() self._row_count = 0 self.clearing = False + def _sort_func(self, row1, row2): + if row1.timestamp == row2.timestamp: + return 0 + return -1 if row1.timestamp < row2.timestamp else 1 + def add_message(self, text, kind, @@ -201,7 +189,7 @@ def add_message(self, history_mode=self._history_mode, log_line_id=log_line_id) - self._insert_message(message, kind, history) + self._insert_message(message) def _get_avatar(self, kind, name): scale = self.get_scale_factor() @@ -217,128 +205,77 @@ def _get_avatar(self, kind, name): return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) - def _insert_message(self, message, kind, history): - current_date = message.timestamp.strftime('%a, %d %b %Y') - - 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 = 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) - self._timestamps_inserted.insert( - insertion_point, associated_timestamp) - self._row_count += 1 - insertion_point += 1 - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self.insert(message, insertion_point) - 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 = 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) - self._timestamps_inserted.insert(1, associated_timestamp) - self._row_count += 1 - self._first_date = current_date - if kind in ('incoming', 'incoming_queue', 'outgoing'): - self.first_message_timestamp = message.timestamp - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self.insert(message, 2) - self._timestamps_inserted.insert(2, message.timestamp) - if self._last_date is None: - self._last_date = current_date - current_timestamp = message.timestamp - self._row_count += 1 - else: - if current_date != self._last_date: - 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) - self._timestamps_inserted.append(associated_timestamp) - self._row_count += 1 - if self._first_date is None: - self._first_date = current_date - if (kind in ('incoming', 'incoming_queue', 'outgoing') and not - self.first_message_timestamp): - self.first_message_timestamp = message.timestamp - if (kind in ('incoming', 'incoming_queue') and - message.timestamp > self._last_incoming_timestamp): - self._last_incoming_timestamp = message.timestamp - self._last_date = current_date - self.add(message) - self._timestamps_inserted.append(message.timestamp) - current_timestamp = message.timestamp - self._row_count += 1 - - if message.type == 'chat': - self._merge_message(current_timestamp) - self._update_read_marker(current_timestamp) - - self.show_all() - - def _is_out_of_order(self, time_: datetime, history: bool) -> bool: - if history: - if self.first_message_timestamp: - return time_ > self.first_message_timestamp - return False - if len(self._timestamps_inserted) > 1: - return time_ < self._timestamps_inserted[-1] - return False - - def _merge_message(self, timestamp): - # 'Merge' message rows if they both meet certain conditions - # (see _is_mergeable). A merged message row does not display any - # avatar or meta info, and makes it look merged with the previous row. - if self._contact.is_groupchat: + def _insert_message(self, message): + self.add(message) + self._add_date_row(message.timestamp) + self._check_for_merge(message) + + def _add_date_row(self, timestamp): + start_of_day = get_start_of_day(timestamp) + if start_of_day in self._active_date_rows: return - current_index = self._timestamps_inserted.index(timestamp) - previous_row = self.get_row_at_index(current_index - 1) - current_row = self.get_row_at_index(current_index) - next_row = self.get_row_at_index(current_index + 1) - if next_row is not None: - if self._is_mergeable(current_row, next_row): - next_row.set_merged(True) - - if self._is_mergeable(current_row, previous_row): - current_row.set_merged(True) - if next_row is not None: - if self._is_mergeable(current_row, next_row): - next_row.set_merged(True) - - @staticmethod - def _is_mergeable(row1, row2): - # TODO: Check for same encryption - timestamp1 = row1.timestamp.strftime('%H:%M') - timestamp2 = row2.timestamp.strftime('%H:%M') - kind1 = row1.kind - kind2 = row2.kind - if timestamp1 == timestamp2 and kind1 == kind2: - return True - return False + date_row = DateRow(self._account, start_of_day) + self._active_date_rows.add(start_of_day) + self.add(date_row) + + row = self.get_row_at_index(date_row.get_index() + 1) + if row is None: + return + + if row.type != 'chat': + return + + row.set_merged(False) + + def _check_for_merge(self, message): + if message.type != 'chat': + return + + ancestor = self._find_ancestor(message) + if ancestor is None: + self._update_descendants(message) + else: + if message.is_mergeable(ancestor): + message.set_merged(True) + + def _find_ancestor(self, message): + index = message.get_index() + while index != 0: + index -= 1 + row = self.get_row_at_index(index) + if row is None: + return None + + if row.type != 'chat': + return None + + if not message.is_same_sender(row): + return None + + if not row.is_merged: + return row + return None + + def _update_descendants(self, message): + index = message.get_index() + while True: + index += 1 + row = self.get_row_at_index(index) + if row is None: + return + + if row.type != 'chat': + return + + if message.is_mergeable(row): + row.set_merged(True) + continue + + if message.is_same_sender(row): + row.set_merged(False) + self._update_descendants(row) + return def reduce_message_count(self): successful = False @@ -352,8 +289,6 @@ def reduce_message_count(self): # it’s safe to remove the fist row self.remove(row1) successful = True - self._timestamps_inserted.remove(row1.timestamp) - self._first_date = row2.timestamp.strftime('%a, %d %b %Y') self._row_count -= 1 continue @@ -362,14 +297,6 @@ def reduce_message_count(self): # remove the second row instead self.remove(row2) successful = True - self._timestamps_inserted.remove(row2.timestamp) - if row2.message_id: - self._message_ids_inserted.pop(row2.message_id) - chat_row = self._get_first_chat_row() - if chat_row is not None: - self.first_message_timestamp = chat_row.timestamp - else: - self.first_message_timestamp = None self._row_count -= 1 continue @@ -377,17 +304,6 @@ def reduce_message_count(self): # Not a date row, safe to remove self.remove(row1) successful = True - self._timestamps_inserted.remove(row1.timestamp) - if row1.message_id: - self._message_ids_inserted.pop(row1.message_id) - if row2.type == 'chat': - self.first_message_timestamp = row2.timestamp - else: - chat_row = self._get_first_chat_row() - if chat_row is not None: - self.first_message_timestamp = chat_row.timestamp - else: - self.first_message_timestamp = None self._row_count -= 1 return successful @@ -408,12 +324,6 @@ 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': - return row - return None - def set_read_marker(self, id_): message_row = self._get_row_by_message_id(id_) if message_row is None: @@ -516,5 +426,3 @@ def show_error(self, id_, error): def on_quote(self, text): self.emit('quote', text) - - # TODO: focus_out_line for group chats View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77a47d74ce985fc60a000306627363ea… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/77a47d74ce985fc60a000306627363ea… You're receiving this email because of your account on dev.gajim.org.

1 0

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

04 Apr '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 56f4d5eb by lovetox at 2021-04-04T17:50:50+02:00 Fix completion state - - - - - 4 changed files: - gajim/chat_control_base.py - gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -1413,7 +1413,7 @@ def fetch_n_lines_history(self, _scrolled, n_lines): n_lines) if not messages: - self._scrolled_view.set_history_complete() + self._scrolled_view.set_history_complete(True) return for msg in messages: ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -29,6 +29,7 @@ def __init__(self, account, history_mode=False): self.type = 'system' self.timestamp = datetime.fromtimestamp(0) + self._history_mode = history_mode self.get_style_context().add_class('conversation-system-row') @@ -36,14 +37,16 @@ def __init__(self, account, history_mode=False): self.label.set_hexpand(True) self.label.get_style_context().add_class( 'conversation-meta') + self.grid.attach(self.label, 0, 1, 1, 1) + + self.set_history_complete(False) - if history_mode: + def set_history_complete(self, complete): + if self._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) - - def set_history_complete(self): - self.label.set_text(_('There is no more history')) + if complete: + self.label.set_text(_('There is no more history')) + else: + self.label.set_text(_('Scroll up to load more chat history…')) ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -56,13 +56,15 @@ def __init__(self, *args, **kwargs): vadjustment.connect('notify::upper', self._on_adj_upper_changed) vadjustment.connect('notify::value', self._on_adj_value_changed) - @property - def autoscroll(self): + def get_autoscroll(self): return self._autoscroll - def set_history_complete(self): - self._complete = True - self.get_child().get_child().set_history_complete() + def get_view(self): + return self.get_child().get_child() + + def set_history_complete(self, complete): + self._complete = complete + self.get_view().set_history_complete(complete) def _on_adj_upper_changed(self, adj, *args): upper = adj.get_upper() @@ -72,6 +74,7 @@ def _on_adj_upper_changed(self, adj, *args): 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 ===================================== gajim/gtk/conversation/view.py ===================================== @@ -108,8 +108,8 @@ def get_first_message_row(self): return row return None - def set_history_complete(self): - self._scroll_hint_row.set_history_complete() + def set_history_complete(self, complete): + self._scroll_hint_row.set_history_complete(complete) def _reset_conversation_view(self): self._first_date = None @@ -203,10 +203,6 @@ def add_message(self, 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() - def _get_avatar(self, kind, name): scale = self.get_scale_factor() if self._contact.is_groupchat: @@ -344,7 +340,8 @@ def _is_mergeable(row1, row2): return True return False - def _reduce_message_count(self): + def reduce_message_count(self): + successful = False while self._row_count > self._max_row_count: # We want to keep relevant DateRows when removing rows row1 = self.get_row_at_index(1) @@ -354,6 +351,7 @@ def _reduce_message_count(self): # First two rows are date rows, # it’s safe to remove the fist row self.remove(row1) + successful = True self._timestamps_inserted.remove(row1.timestamp) self._first_date = row2.timestamp.strftime('%a, %d %b %Y') self._row_count -= 1 @@ -363,6 +361,7 @@ def _reduce_message_count(self): # First one is a date row, keep it and # remove the second row instead self.remove(row2) + successful = True self._timestamps_inserted.remove(row2.timestamp) if row2.message_id: self._message_ids_inserted.pop(row2.message_id) @@ -377,6 +376,7 @@ def _reduce_message_count(self): if row1.type != 'date': # Not a date row, safe to remove self.remove(row1) + successful = True self._timestamps_inserted.remove(row1.timestamp) if row1.message_id: self._message_ids_inserted.pop(row1.message_id) @@ -390,6 +390,8 @@ def _reduce_message_count(self): self.first_message_timestamp = None self._row_count -= 1 + return successful + def _get_row_by_message_id(self, id_): for row in self.get_children(): if row.message_id == id_: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56f4d5ebe9fc9444b024cb921a770561… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/56f4d5ebe9fc9444b024cb921a770561… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits April 2021