Commits June 2021

commits@gajim.org

1 participants
17 discussions

[Git][gajim/gajim][mainwindow] 2 commits: ChatList: Indicate if last message was a file
by Daniel Brötzmann 06 Jun '21

06 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 367650cf by wurstsalat at 2021-06-06T18:34:10+02:00 ChatList: Indicate if last message was a file - - - - - 9be2f4ae by wurstsalat at 2021-06-06T18:38:52+02:00 Preview: Fix initial button state after sending file - - - - - 5 changed files: - gajim/common/preview_helpers.py - gajim/common/storage/archive.py - gajim/data/gui/chat_list_row.ui - gajim/gtk/chat_list.py - gajim/gtk/preview.py Changes: ===================================== gajim/common/preview_helpers.py ===================================== @@ -35,6 +35,8 @@ from cryptography.hazmat.primitives.ciphers import algorithms from cryptography.hazmat.primitives.ciphers.modes import GCM +from gajim.common.i18n import _ + log = logging.getLogger('gajim.c.preview_helpers') Coords = namedtuple('Coords', 'location lat lon') @@ -372,6 +374,22 @@ def guess_mime_type(file_path, data=None): return mime_type +def guess_simple_file_type(file_path, data=None): + mime_type = guess_mime_type(file_path, data) + icon = get_icon_for_mime_type(mime_type) + if file_path.startswith('geo:'): + return icon, _('Location') + if mime_type.startswith('audio/'): + return icon, _('Audio File') + if mime_type.startswith('image/'): + return icon, _('Image') + if mime_type.startswith('video/'): + return icon, _('Video') + if mime_type.startswith('text/'): + return icon, _('Text File') + return icon, _('File') + + def get_icon_for_mime_type(mime_type): if mime_type is None: return Gio.Icon.new_for_string('mail-attachment') ===================================== gajim/common/storage/archive.py ===================================== @@ -431,7 +431,7 @@ def get_last_conversation_line(self, account, jid): KindConstant.ERROR]) sql = ''' - SELECT contact_name, time, kind, message + SELECT contact_name, time, kind, message, additional_data FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} AND kind NOT IN ({kinds}) ===================================== gajim/data/gui/chat_list_row.ui ===================================== @@ -161,6 +161,17 @@ <property name="position">0</property> </packing> </child> + <child> + <object class="GtkImage" id="message_icon"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> <child> <object class="GtkLabel" id="message_label"> <property name="visible">True</property> @@ -176,7 +187,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">1</property> + <property name="position">2</property> </packing> </child> <child> @@ -191,7 +202,7 @@ <property name="expand">False</property> <property name="fill">True</property> <property name="pack-type">end</property> - <property name="position">2</property> + <property name="position">3</property> </packing> </child> </object> ===================================== gajim/gtk/chat_list.py ===================================== @@ -27,6 +27,8 @@ from gajim.common.helpers import get_groupchat_name from gajim.common.helpers import get_group_chat_nick from gajim.common.helpers import get_uf_relative_time +from gajim.common.preview_helpers import filename_from_uri +from gajim.common.preview_helpers import guess_simple_file_type from gajim.gui_menu_builder import get_chat_list_row_menu @@ -228,12 +230,12 @@ def process_event(self, event): def _on_message_received(self, event): if not event.msgtxt: return - row = self._chats.get((event.account, event.jid)) nick = self._get_nick_for_received_message(event) - row.set_last_message_text(nick, event.msgtxt) + row.set_nick(nick) row.set_timestamp(event.properties.timestamp) - + GLib.idle_add( + row.set_message_text, event.msgtxt, event.additional_data) self._add_unread(row, event.properties) def _on_message_sent(self, event): @@ -249,8 +251,10 @@ def _on_message_sent(self, event): nick = '' else: nick = _('Me: ') - row.set_last_message_text(nick, msgtext) + row.set_nick(nick) row.set_timestamp(event.timestamp) + GLib.idle_add( + row.set_message_text, event.message, event.additional_data) @staticmethod def _get_nick_for_received_message(event): @@ -330,8 +334,8 @@ def __init__(self, workspace_id, account, jid, type_, pinned): # Get last chat message from archive line = app.storage.archive.get_last_conversation_line(account, jid) if line is not None and line.message is not None: - one_line = ' '.join(line.message.splitlines()) - self._ui.message_label.set_text(one_line) + GLib.idle_add( + self.set_message_text, line.message, line.additional_data) if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): self._ui.nick_label.set_text(_('Me:')) @@ -346,8 +350,6 @@ def __init__(self, workspace_id, account, jid, type_, pinned): 'muc_nick': line.contact_name}) self._ui.nick_label.show() - # TODO: file transfers have to be displayed differently - self._timestamp = line.time uf_timestamp = get_uf_relative_time(line.time) self._ui.timestamp_label.set_text(uf_timestamp) @@ -499,11 +501,27 @@ def reset_unread(self): return self.unread_count = 0 - def set_last_message_text(self, nickname, text): - self._ui.message_label.set_text(text.replace('\n', ' ')) + def set_nick(self, nickname): self._ui.nick_label.set_visible(bool(nickname)) self._ui.nick_label.set_text(nickname) + def set_message_text(self, text, additional_data): + icon = None + if app.interface.preview_manager.get_previewable(text, additional_data): + file_name = filename_from_uri(text) + icon, file_type = guess_simple_file_type(text) + text = _('%(file_type)s (%(file_name)s)') % { + 'file_type': file_type, + 'file_name': file_name} + else: + text = text.replace('\n', ' ') + self._ui.message_label.set_text(text) + if icon is None: + self._ui.message_icon.hide() + else: + self._ui.message_icon.set_from_gicon(icon, Gtk.IconSize.MENU) + self._ui.message_icon.show() + class BaseHeader(Gtk.Box): def __init__(self, row_type, text): ===================================== gajim/gtk/preview.py ===================================== @@ -112,10 +112,10 @@ def update(self, preview, data): if preview.orig_exists(): self._ui.download_button.hide() + self._ui.open_folder_button.show() + self._ui.save_as_button.show() if (preview.is_audio and app.is_installed('GST') and contains_audio_streams(preview.orig_path)): - self._ui.save_as_button.show() - self._ui.open_folder_button.show() self._ui.image_button.hide() audio_widget = AudioWidget(preview.orig_path) self._ui.right_box.pack_end(audio_widget, False, True, 0) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45f3049e8abec2d12611e9c67a04850… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/45f3049e8abec2d12611e9c67a04850… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Themes: Apply change of dark/light theme instantly
by Daniel Brötzmann 06 Jun '21

06 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: bf697b81 by wurstsalat at 2021-06-06T11:27:43+02:00 Themes: Apply change of dark/light theme instantly Fixes #10441 - - - - - b35bd9c0 by wurstsalat at 2021-06-06T11:28:52+02:00 Themes: Apply user themes instantly - - - - - 4 changed files: - gajim/data/gui/themes_window.ui - gajim/gtk/css_config.py - gajim/gtk/preferences.py - gajim/gtk/themes.py Changes: ===================================== gajim/data/gui/themes_window.ui ===================================== @@ -40,9 +40,10 @@ <object class="GtkLabel"> <property name="visible">True</property> <property name="can_focus">False</property> + <property name="wrap">True</property> + <property name="wrap_mode">word</property> <property name="label" translatable="yes">Add a setting you would like to change</property> <style> - <class name="bold"/> <class name="dim-label"/> </style> </object> ===================================== gajim/gtk/css_config.py ===================================== @@ -121,8 +121,7 @@ def prefer_dark(self): return settings.get_property('gtk-application-prefer-dark-theme') return setting == Theme.DARK - @staticmethod - def set_dark_theme(value=None): + def set_dark_theme(self, value=None): if value is None: value = app.settings.get('dark_theme') else: @@ -134,6 +133,7 @@ def set_dark_theme(value=None): settings.reset_property('gtk-application-prefer-dark-theme') return settings.set_property('gtk-application-prefer-dark-theme', bool(value)) + self._load_css() def _load_css(self): self._load_css_from_file('gajim.css', CSSPriority.APPLICATION) @@ -156,14 +156,16 @@ def _load_css_from_file(self, filename, priority): return self._activate_css(css, priority) - @staticmethod - def _activate_css(css, priority): + def _activate_css(self, css, priority): try: provider = Gtk.CssProvider() provider.load_from_data(bytes(css.encode('utf-8'))) Gtk.StyleContext.add_provider_for_screen(Gdk.Screen.get_default(), provider, priority) + self._load_selected() + self._activate_theme() + except Exception: log.exception('Error loading application css') ===================================== gajim/gtk/preferences.py ===================================== @@ -719,12 +719,14 @@ def _on_edit_themes(self, *args): def _on_theme_changed(value, *args): app.css_config.change_theme(value) app.nec.push_incoming_event(NetworkEvent('theme-update')) + app.nec.push_incoming_event(NetworkEvent('style-changed')) app.interface.roster.repaint_themed_widgets() app.interface.roster.change_roster_style(None) @staticmethod def _on_dark_theme(value, *args): app.css_config.set_dark_theme(int(value)) + app.nec.push_incoming_event(NetworkEvent('style-changed')) class Emoji(PreferenceBox): ===================================== gajim/gtk/themes.py ===================================== @@ -206,12 +206,16 @@ def __init__(self, transient): self._fill_choose_listbox() - def _on_key_press(self, widget, event): + def _on_key_press(self, _widget, event): if event.keyval == Gdk.KEY_Escape: self.destroy() def _get_themes(self): + current_theme = app.settings.get('roster_theme') for theme in app.css_config.themes: + if theme == current_theme: + self._ui.theme_store.prepend([theme]) + continue self._ui.theme_store.append([theme]) def _on_theme_name_edit(self, _renderer, path, new_name): @@ -255,6 +259,8 @@ def _on_theme_selected(self, tree_selection): self._ui.remove_theme_button.set_sensitive(True) self._load_options() + self._apply_theme(theme) + app.nec.push_incoming_event(NetworkEvent('style-changed')) def _load_options(self): self._ui.option_listbox.foreach(self._remove_option) @@ -321,7 +327,8 @@ def _apply_theme(theme): app.interface.roster.repaint_themed_widgets() app.interface.roster.change_roster_style(None) - def _update_preferences_window(self): + @staticmethod + def _update_preferences_window(): window = get_app_window('Preferences') if window is not None: window.update_theme_list() @@ -343,6 +350,7 @@ def _on_remove_theme(self, *args): def _remove_theme(): if theme == app.settings.get('roster_theme'): self._apply_theme('default') + app.nec.push_incoming_event(NetworkEvent('style-changed')) app.css_config.remove_theme(theme) self._update_preferences_window() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17b5488cebdf6740e4f4195273b0560… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/17b5488cebdf6740e4f4195273b0560… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Dependency check: Fix unused-variable
by Daniel Brötzmann 05 Jun '21

05 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 17b5488c by wurstsalat at 2021-06-06T00:39:47+02:00 Dependency check: Fix unused-variable - - - - - 1 changed file: - gajim/common/app.py Changes: ===================================== gajim/common/app.py ===================================== @@ -228,7 +228,7 @@ def detect_dependencies(): conference = Gst.ElementFactory.make('fsrtpconference', None) conference.new_session(Farstream.MediaType.AUDIO) from gajim.gui.gstreamer import create_gtk_widget - sink, widget, name = create_gtk_widget() + sink, _, _ = create_gtk_widget() if sink is not None: _dependencies['AV'] = True except Exception as error: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17b5488cebdf6740e4f4195273b05606… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/17b5488cebdf6740e4f4195273b05606… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Features: Check for gstreamer gtk plugin for AV support
by Daniel Brötzmann 05 Jun '21

05 Jun '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 8e66037c by wurstsalat at 2021-06-06T00:29:56+02:00 Features: Check for gstreamer gtk plugin for AV support Fixes #10551 - - - - - 3 changed files: - README.md - gajim/common/app.py - gajim/gtk/features.py Changes: ===================================== README.md ===================================== @@ -24,7 +24,7 @@ ### Optional Runtime Requirements - gir1.2-gspell-1 and hunspell-LANG where lang is your locale eg. en, fr etc - gir1.2-secret-1 for GNOME Keyring or KDE support as password storage - D-Bus running to have gajim-remote working -- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 and gir1.2-gst-plugins-base-1.0 for audio and video calls +- gir1.2-farstream-0.2, gir1.2-gstreamer-1.0 gir1.2-gst-plugins-base-1.0, gstreamer1.0-plugins-ugly, gstreamer1.0-libav, and gstreamer1.0-gtk3 for audio and video calls - gir1.2-gupnpigd-1.0 for better NAT traversing - gir1.2-networkmanager-1.0 for network lose detection - gir1.2-geoclue-2.0 for sharing your location ===================================== gajim/common/app.py ===================================== @@ -227,7 +227,10 @@ def detect_dependencies(): Gst.init(None) conference = Gst.ElementFactory.make('fsrtpconference', None) conference.new_session(Farstream.MediaType.AUDIO) - _dependencies['AV'] = True + from gajim.gui.gstreamer import create_gtk_widget + sink, widget, name = create_gtk_widget() + if sink is not None: + _dependencies['AV'] = True except Exception as error: log('gajim').warning('AV dependency test failed: %s', error) ===================================== gajim/gtk/features.py ===================================== @@ -91,7 +91,8 @@ def _get_features(self): app.is_installed('AV'), _('Enables Gajim to provide Audio and Video chats'), _('Requires: gir1.2-farstream-0.2, gir1.2-gstreamer-1.0, ' - 'gstreamer1.0-libav, gstreamer1.0-plugins-ugly'), + 'gstreamer1.0-plugins-base, gstreamer1.0-plugins-ugly, ' + 'gstreamer1.0-libav, and gstreamer1.0-gtk3'), _('Feature not available under Windows'), None), Feature(_('Automatic Status'), View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e66037cce0deb0fb9b5697b66d89c9f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8e66037cce0deb0fb9b5697b66d89c9f… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] GroupchatControl: Fix aborting join
by Daniel Brötzmann 05 Jun '21

05 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 45f3049e by wurstsalat at 2021-06-05T23:32:05+02:00 GroupchatControl: Fix aborting join - - - - - 1 changed file: - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -1674,7 +1674,9 @@ def _on_page_close_clicked(self, _button=None): self._close_control() def _on_groupchat_state_abort_clicked(self, _button): - app.window.lookup_action('disconnect-%s' % self.control_id).activate() + app.window.activate_action( + 'remove-chat', + GLib.Variant('as', [self.account, str(self.room_jid)])) def _on_groupchat_state_join_clicked(self, _groupchat_state): self._client.get_module('MUC').join(self.room_jid) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f3049e8abec2d12611e9c67a048502… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/45f3049e8abec2d12611e9c67a048502… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ConversationView: Implement cleanup mechanism
by Daniel Brötzmann 05 Jun '21

05 Jun '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a34a24af by wurstsalat at 2021-06-05T23:23:05+02:00 ConversationView: Implement cleanup mechanism - - - - - 4 changed files: - gajim/common/storage/archive.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/scrolled.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -330,20 +330,27 @@ def convert_show_values_to_db_api_values(show): return None @timeit - def get_conversation_before(self, account, jid, timestamp, n_lines): + def get_conversation_before_after(self, account, jid, before, timestamp, + n_lines): """ - Load n_lines lines of conversation with jid before timestamp + Load n_lines lines of conversation with jid before or after timestamp :param account: The account :param jid: The jid for which we request the conversation + :param before: bool for direction (before or after timestamp) + :param timestamp: timestamp returns a list of namedtuples """ jids = self._get_family_jids(account, jid) account_id = self.get_account_id(account) + if before: + time_order = 'AND time < ? ORDER BY time DESC, log_line_id DESC' + else: + time_order = 'AND time > ? ORDER BY time ASC, log_line_id ASC' sql = ''' SELECT contact_name, time, kind, show, message, subject, @@ -352,30 +359,38 @@ def get_conversation_before(self, account, jid, timestamp, n_lines): marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND account_id = {account_id} - AND time < ? - ORDER BY time DESC, log_line_id DESC + {time_order} LIMIT ? '''.format(jids=', '.join('?' * len(jids)), - account_id=account_id) + account_id=account_id, + time_order=time_order) return self._con.execute( sql, tuple(jids) + (timestamp, n_lines)).fetchall() @timeit - def get_conversation_muc_before(self, account, jid, timestamp, n_lines): + def get_conversation_muc_before_after(self, account, jid, before, + timestamp, n_lines): """ - Load n_lines lines of conversation with jid before timestamp + Load n_lines lines of conversation with jid before or after timestamp :param account: The account :param jid: The jid for which we request the conversation + :param before: bool for direction (before or after timestamp) + :param timestamp: timestamp returns a list of namedtuples """ jids = self._get_family_jids(account, jid) + if before: + time_order = 'AND time < ? ORDER BY time DESC, log_line_id DESC' + else: + time_order = 'AND time > ? ORDER BY time ASC, log_line_id ASC' + # TODO: this does not load messages correctly when account_id is set # account_id = self.get_account_id(account, type_=JIDConstant.ROOM_TYPE) @@ -386,11 +401,11 @@ def get_conversation_muc_before(self, account, jid, timestamp, n_lines): marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) AND kind = {kind} - AND time < ? - ORDER BY time DESC, log_line_id DESC + {time_order} LIMIT ? '''.format(jids=', '.join('?' * len(jids)), - kind=KindConstant.GC_MSG) + kind=KindConstant.GC_MSG, + time_order=time_order) return self._con.execute( sql, @@ -427,6 +442,55 @@ def get_last_conversation_line(self, account, jid): return self._con.execute(sql, tuple(jids)).fetchone() + @timeit + def get_conversation_around(self, account, jid, timestamp): + """ + Load all lines of conversation with jid around a specific timestamp + + :param account: The account + + :param jid: The jid for which we request the conversation + + :param timestamp: Timestamp around which to fetch messages + + returns a list of namedtuples + """ + jids = self._get_family_jids(account, jid) + account_id = self.get_account_id(account) + n_lines = 20 + + sql_before = ''' + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id, message_id, + error as "error [common_error]", + marker as "marker [marker]" + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND time < ? + ORDER BY time DESC, log_line_id DESC + LIMIT ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + sql_at_after = ''' + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id, message_id, + error as "error [common_error]", + marker as "marker [marker]" + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND time >= ? + ORDER BY time ASC, log_line_id ASC + LIMIT ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) + before = self._con.execute( + sql_before, + tuple(jids) + (timestamp, n_lines)).fetchall() + at_after = self._con.execute( + sql_at_after, + tuple(jids) + (timestamp, n_lines)).fetchall() + return before, at_after + @timeit def get_conversation_between(self, account, jid, before, after): """ ===================================== gajim/gtk/controls/base.py ===================================== @@ -176,7 +176,7 @@ def __init__(self, widget_name, account, jid): self._scrolled_view.connect('autoscroll-changed', self._on_autoscroll_changed) self._scrolled_view.connect('request-history', - self.fetch_n_lines_history, 30) + self.fetch_n_lines_history, 20) self.msg_textview = MessageInputTextView() self.msg_textview.connect('paste-clipboard', @@ -476,6 +476,7 @@ def _sec_labels_received(self, event): def delegate_action(self, action): if action == 'clear-chat': self.conversation_view.clear() + self._scrolled_view.reset() return Gdk.EVENT_STOP if action == 'delete-line': @@ -1268,52 +1269,70 @@ def set_control_active(self, state): self.contact, Chatstate.INACTIVE) def scroll_to_end(self, force=False): - self.conversation_view.scroll_to_end(force) + if self._scrolled_view.get_lower_complete(): + self.conversation_view.scroll_to_end(force) + else: + # Clear view and reload conversation + self.conversation_view.clear() + self._scrolled_view.reset() + self.conversation_view.scroll_to_end(force) def scroll_to_message(self, log_line_id, timestamp): row = self.conversation_view.get_row_by_log_line_id(log_line_id) if row is None: - first_row = self.conversation_view.get_first_message_row() - if first_row is None: - first_timestamp = time.time() - else: - first_timestamp = first_row.db_timestamp - messages = app.storage.archive.get_conversation_between( - self.account, self.contact.jid, first_timestamp, timestamp) - if not messages: - return - - self.add_messages(messages) + # Clear view and reload conversation around timestamp + self.conversation_view.lock() + self.conversation_view.clear() + self._scrolled_view.reset() + before, at_after = app.storage.archive.get_conversation_around( + self.account, self.contact.jid, timestamp) + self.add_messages(before) + self.add_messages(at_after) GLib.idle_add( self.conversation_view.scroll_to_message_and_highlight, log_line_id) + GLib.idle_add(self.conversation_view.unlock) + + def fetch_n_lines_history(self, _scrolled, before, n_lines): + if self.conversation_view.locked: + return - def fetch_n_lines_history(self, _scrolled, n_lines): - row = self.conversation_view.get_first_message_row() + self.conversation_view.lock() + if before: + row = self.conversation_view.get_first_message_row() + else: + row = self.conversation_view.get_last_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( + messages = app.storage.archive.get_conversation_muc_before_after( self.account, self.contact.jid, + before, timestamp, n_lines) else: - messages = app.storage.archive.get_conversation_before( + messages = app.storage.archive.get_conversation_before_after( self.account, self.contact.jid, + before, timestamp, n_lines) if not messages: - self._scrolled_view.set_history_complete(True) + self._scrolled_view.set_history_complete(before, True) + self.conversation_view.unlock() return self.add_messages(messages) + if self.conversation_view.reduce_message_count(not before): + self._scrolled_view.set_history_complete(not before, False) + + self.conversation_view.unlock() def add_messages(self, messages): for msg in messages: ===================================== gajim/gtk/conversation/scrolled.py ===================================== @@ -22,7 +22,7 @@ class ScrolledView(Gtk.ScrolledWindow): 'request-history': ( GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, None, - () + (bool, ) ), 'autoscroll-changed': ( GObject.SignalFlags.RUN_LAST, @@ -55,7 +55,9 @@ def __init__(self, *args, **kwargs): self._current_upper = 0 self._autoscroll = True self._request_history_at_upper = None - self._complete = False + self._upper_complete = False + self._lower_complete = False + self._requesting = None vadjustment = self.get_vadjustment() vadjustment.connect('notify::upper', self._on_adj_upper_changed) @@ -67,9 +69,22 @@ def get_autoscroll(self): 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 reset(self): + self._current_upper = 0 + self._request_history_at_upper = None + self._upper_complete = False + self._lower_complete = False + self._requesting = None + + def set_history_complete(self, before, complete): + if before: + self._upper_complete = complete + self.get_view().set_history_complete(complete) + else: + self._lower_complete = complete + + def get_lower_complete(self): + return self._lower_complete def _on_adj_upper_changed(self, adj, *args): upper = adj.get_upper() @@ -79,18 +94,22 @@ 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 self.set_kinetic_scrolling(True) - adj.set_value(adj.get_value() + diff) + if self._requesting == 'before': + 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') + self.emit('request-history', True) + self._requesting = None def _on_adj_value_changed(self, adj, *args): + if self._requesting is not None: + return + bottom = adj.get_upper() - adj.get_page_size() if (bottom - adj.get_value()) < 1: self._autoscroll = True @@ -99,9 +118,10 @@ def _on_adj_value_changed(self, adj, *args): self._autoscroll = False self.emit('autoscroll-changed', self._autoscroll) - if self._complete: + if self._upper_complete: self._request_history_at_upper = None - return + if self._lower_complete: + return if self._request_history_at_upper == adj.get_upper(): # Abort here if we already did a history request and the upper @@ -111,9 +131,22 @@ def _on_adj_value_changed(self, adj, *args): self._request_history_at_upper = None - # Load messages when we are near the top - if adj.get_value() < adj.get_page_size() * 2: + distance = adj.get_page_size() + if adj.get_value() < distance: + # Load messages when we are near the top + if self._upper_complete: + return 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') + self.emit('request-history', True) + self._requesting = 'before' + elif (adj.get_upper() - (adj.get_value() + adj.get_page_size()) < + distance): + # ..or near the bottom + if self._lower_complete: + return + # Workaround: https://gitlab.gnome.org/GNOME/gtk/merge_requests/395 + self.set_kinetic_scrolling(False) + self.emit('request-history', False) + self._requesting = 'after' ===================================== gajim/gtk/conversation/view.py ===================================== @@ -63,7 +63,7 @@ def __init__(self, account, contact): self.encryption_enabled = False self.autoscroll = True - self.clearing = False + self.locked = False # Keeps track of the number of rows shown in ConversationView self._row_count = 0 @@ -92,12 +92,21 @@ def __init__(self, account, contact): self._scroll_hint_row = ScrollHintRow(self._account) self.add(self._scroll_hint_row) + def lock(self): + self.locked = True + + def unlock(self): + self.locked = False + def clear(self): - self.clearing = True - for row in self.get_children()[1:]: + for row in self.get_children()[2:]: self.remove(row) + self._reset_conversation_view() - GLib.idle_add(self._reset_conversation_view) + def _reset_conversation_view(self): + self._row_count = 0 + self._active_date_rows = set() + self._message_id_row_map = {} def get_first_message_row(self): for row in self.get_children(): @@ -105,13 +114,17 @@ def get_first_message_row(self): return row return None + def get_last_message_row(self): + children = self.get_children() + children.reverse() + for row in children: + if isinstance(row, MessageRow): + return row + return None + def set_history_complete(self, complete): self._scroll_hint_row.set_history_complete(complete) - def _reset_conversation_view(self): - self._row_count = 0 - self.clearing = False - @staticmethod def _sort_func(row1, row2): if row1.timestamp == row2.timestamp: @@ -300,36 +313,50 @@ def _update_descendants(self, message): self._update_descendants(row) return - 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) - row2 = self.get_row_at_index(2) - - if row1.type == row2.type == 'date': - # First two rows are date rows, - # it’s safe to remove the fist row - self.remove(row1) - successful = True - self._row_count -= 1 - continue - - if row1.type == 'date' and row2.type != 'date': - # First one is a date row, keep it and - # remove the second row instead - self.remove(row2) - successful = True - self._row_count -= 1 - continue - - if row1.type != 'date': - # Not a date row, safe to remove - self.remove(row1) - successful = True - self._row_count -= 1 - - return successful + def reduce_message_count(self, before): + success = False + row_count = len(self.get_children()) + while row_count > self._max_row_count: + if before: + if self._reduce_messages_before(): + row_count -= 1 + success = True + else: + self._reduce_messages_after() + row_count -= 1 + success = True + + return success + + def _reduce_messages_before(self): + success = False + + # We want to keep relevant DateRows when removing rows + row1 = self.get_row_at_index(2) + row2 = self.get_row_at_index(3) + + if row1.type == row2.type == 'date': + # First two rows are date rows, + # it’s safe to remove the fist row + self.remove(row1) + success = True + + if row1.type == 'date' and row2.type != 'date': + # First one is a date row, keep it and + # remove the second row instead + self.remove(row2) + success = True + + if row1.type != 'date': + # Not a date row, safe to remove + self.remove(row1) + success = True + + return success + + def _reduce_messages_after(self): + row = self.get_row_at_index(len(self.get_children()) - 1) + self.remove(row) def scroll_to_message_and_highlight(self, log_line_id): highlight_row = None View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a34a24af10a920de686fddf228f01d93… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a34a24af10a920de686fddf228f01d93… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix read markers in groupchat
by Philipp Hörist 01 Jun '21

01 Jun '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: a8dbc2d9 by lovetox at 2021-06-01T22:03:22+02:00 Fix read markers in groupchat - - - - - 1 changed file: - gajim/common/modules/chat_markers.py Changes: ===================================== gajim/common/modules/chat_markers.py ===================================== @@ -52,7 +52,7 @@ def _process_chat_marker(self, _con, _stanza, properties): self._log.warning('Received chat marker while not joined') return - if properties.muc_nickname != muc_data.nick: + if properties.muc_nickname != contact.nickname: return self._raise_event('read-state-sync', properties) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8dbc2d9bd31ebae8ba3395e1743da3f… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a8dbc2d9bd31ebae8ba3395e1743da3f… 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 June 2021