Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] AV: Fix notification
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: f62b8bfe by wurstsalat at 2021-10-31T20:58:02+01:00 AV: Fix notification - - - - - 3 changed files: - gajim/gtk/call_widget.py - gajim/gtk/notification.py - gajim/gui_interface.py Changes: ===================================== gajim/gtk/call_widget.py ===================================== @@ -206,16 +206,13 @@ def _on_jingle_request(self, event): # There is no voice call running running yet self.emit('incoming-call', event) - contact = self._client.get_module('Contacts').get_contact( - event.jid) - app.nec.push_incoming_event( NetworkEvent('notification', - account=self.account, - jid=self.contact.jid, - notif_type='jingle-incoming', + account=self._account, + jid=self._contact.jid, + notif_type='incoming-call', title=_('Incoming Call'), - text=_('%s is calling') % contact.name)) + text=_('%s is calling') % self._contact.name)) def _on_jingle_connected(self, event): session = self._client.get_module('Jingle').get_jingle_session( ===================================== gajim/gtk/notification.py ===================================== @@ -52,7 +52,7 @@ NOTIFICATION_ICONS = { 'incoming-message': 'gajim-chat_msg_recv', 'group-chat-invitation': 'gajim-gc_invitation', - 'jingle-incoming': 'call-start-symbolic', + 'incoming-call': 'call-start-symbolic', 'subscription_request': 'gajim-subscription_request', 'unsubscribed': 'gajim-unsubscribed', 'file-request-received': 'document-send', ===================================== gajim/gui_interface.py ===================================== @@ -234,7 +234,7 @@ def handle_event(self, account, jid, notif_detail): app.window.select_chat(account, jid) elif notif_detail in ('chat-message', 'group-chat-message'): app.window.select_chat(account, jid.bare) - elif notif_detail == 'jingle-incoming': + elif notif_detail == 'incoming-call': app.window.select_chat(account, jid.bare) elif notif_detail == 'file-request-received': app.window.select_chat(account, jid.bare) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f62b8bfe546763db48b279d69634d996… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f62b8bfe546763db48b279d69634d996… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Workspace: Add removal confirmation
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 78bf8ae2 by wurstsalat at 2021-10-31T17:36:42+01:00 Workspace: Add removal confirmation - - - - - f2931af5 by wurstsalat at 2021-10-31T17:46:01+01:00 ChatList: Show move to workspace only if we have more than one - - - - - 5 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/main.py - gajim/gtk/workspace_dialog.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -277,17 +277,19 @@ def toggle_chat_pinned(self, account, jid): row.toggle_pinned() self.invalidate_sort() - def remove_chat(self, account, jid): + def remove_chat(self, account, jid, emit_unread=True): row = self._chats.pop((account, jid)) self.remove(row) row.destroy() - self.emit_unread_changed() + if emit_unread: + self.emit_unread_changed() def remove_chats_for_account(self, account): for row_account, jid in list(self._chats.keys()): if row_account != account: continue self.remove_chat(account, jid) + self.emit_unread_changed() def get_selected_chat(self): row = self.get_selected_row() ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -209,7 +209,7 @@ def _move_chat_to_workspace(self, _action, param): def remove_chat(self, workspace_id, account, jid): chat_list = self._chat_lists[workspace_id] type_ = chat_list.get_chat_type(account, jid) - chat_list.remove_chat(account, jid) + chat_list.remove_chat(account, jid, emit_unread=False) self.store_open_chats(workspace_id) self.emit('chat-removed', account, jid, type_) ===================================== gajim/gtk/main.py ===================================== @@ -380,6 +380,10 @@ def update_workspace(self, workspace_id): self._chat_page.update_workspace(workspace_id) self._workspace_side_bar.update_avatar(workspace_id) + def get_chat_list(self, workspace_id): + chat_list_stack = self._chat_page.get_chat_list_stack() + return chat_list_stack.get_chatlist(workspace_id) + def _add_group_chat(self, _action, param): self.add_group_chat(**param.unpack()) ===================================== gajim/gtk/workspace_dialog.py ===================================== @@ -21,6 +21,8 @@ from .avatar import make_workspace_avatar from .avatar_selector import AvatarSelector +from .dialogs import ConfirmationDialog +from .dialogs import DialogButton from .util import get_builder from .util import rgba_to_float from .util import make_rgba @@ -83,8 +85,24 @@ def _on_key_press_event(self, _widget, event): self.destroy() def _on_remove_workspace(self, _button): - app.window.remove_workspace(self._workspace_id) - self.destroy() + def _on_remove(): + app.window.remove_workspace(self._workspace_id) + self.destroy() + + chat_list = app.window.get_chat_list(self._workspace_id) + open_chats = chat_list.get_open_chats() + if len(open_chats) > 0: + ConfirmationDialog( + _('Remove Workspace'), + _('Remove Workspace'), + _('This workspace contains chats. Remove anyway?'), + [DialogButton.make('Cancel', + text=_('_No')), + DialogButton.make('Remove', + callback=_on_remove)]).show() + return + # No chats in chat list, it is save to remove workspace + _on_remove() def _on_cancel(self, _button): self.destroy() ===================================== gajim/gui_menu_builder.py ===================================== @@ -388,9 +388,12 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): menu_items = [ ('toggle-chat-pinned', toggle_label), - (_('Move Chat'), []), ] + workspaces = app.settings.get_workspaces() + if len(workspaces) > 1: + menu_items.append((_('Move Chat'), [])) + is_self_contact = contact.jid.bare == client.get_own_jid().bare pm_with_jid = contact.is_pm_contact and contact.real_jid is not None if (not contact.is_groupchat and not contact.is_in_roster and @@ -409,8 +412,10 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): menu.append_item(menuitem) else: # This is a submenu - submenu = build_workspaces_submenu(workspace_id, account, str(jid)) - menu.append_submenu(item[0], submenu) + if len(workspaces) > 1: + submenu = build_workspaces_submenu( + workspace_id, account, str(jid)) + menu.append_submenu(item[0], submenu) return menu View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38b74fa10b61ae9e6448e06d011c72… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/b38b74fa10b61ae9e6448e06d011c72… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Interface: Use present_with_time to show main window
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b38b74fa by wurstsalat at 2021-10-31T16:13:37+01:00 Interface: Use present_with_time to show main window - - - - - 1 changed file: - gajim/gui_interface.py Changes: ===================================== gajim/gui_interface.py ===================================== @@ -243,7 +243,7 @@ def handle_event(self, account, jid, notif_detail): 'group-chat-invitation'): app.window.show_account_page(account) - app.window.present() + app.window.present_with_time(Gtk.get_current_event_time()) @staticmethod def handle_event_information(event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b38b74fa10b61ae9e6448e06d011c728… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b38b74fa10b61ae9e6448e06d011c728… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Jingle File Transfers: Store and load transfer events from DB
by Daniel Brötzmann (＠wurstsalat) 31 Oct '21

31 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1d4414bc by wurstsalat at 2021-10-31T13:56:36+01:00 Jingle File Transfers: Store and load transfer events from DB - - - - - 7 changed files: - gajim/common/const.py - gajim/common/jingle_ft.py - gajim/gtk/chat_list.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/view.py - gajim/gtk/filetransfer.py Changes: ===================================== gajim/common/const.py ===================================== @@ -69,6 +69,7 @@ class KindConstant(IntEnum): SINGLE_MSG_SENT = 5 CHAT_MSG_SENT = 6 ERROR = 7 + FILE_TRANSFER = 8 def __str__(self): return str(self.value) ===================================== gajim/common/jingle_ft.py ===================================== @@ -16,20 +16,23 @@ Handles Jingle File Transfer (XEP 0234) """ -import hashlib import logging import threading +import time from enum import IntEnum, unique import nbxmpp +from nbxmpp import JID from nbxmpp.namespaces import Namespace from gajim.common import app from gajim.common import configpaths +from gajim.common.const import KindConstant from gajim.common import jingle_xtls from gajim.common.jingle_content import contents, JingleContent from gajim.common.jingle_transport import JingleTransportSocks5, TransportType from gajim.common import helpers +from gajim.common.helpers import AdditionalDataDict from gajim.common.connection_handlers_events import FileRequestReceivedEvent from gajim.common.jingle_ftstates import ( StateInitialized, StateCandSent, StateCandReceived, StateTransfering, @@ -128,11 +131,29 @@ def __state_changed(self, nextstate, args=None): def __on_session_initiate(self, stanza, content, error, action): log.debug("Jingle FT request received") - app.nec.push_incoming_event(FileRequestReceivedEvent(None, - conn=self.session.connection, - stanza=stanza, - jingle_content=content, - FT_content=self)) + app.nec.push_incoming_event( + FileRequestReceivedEvent(None, + conn=self.session.connection, + stanza=stanza, + jingle_content=content, + FT_content=self)) + + account = self.session.connection.name + jid = self.session.connection.get_module('Bytestream')._ft_get_from( + stanza) + jid = JID.from_string(jid) + sid = stanza.getTag('jingle').getAttr('sid') + timestamp = time.time() + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'type', 'jingle') + additional_data.set_value('gajim', 'sid', sid) + app.storage.archive.insert_into_logs( + account, + jid.bare, + timestamp, + KindConstant.FILE_TRANSFER, + additional_data=additional_data) + if self.session.request: # accept the request self.session.approve_content(self.media, self.name) ===================================== gajim/gtk/chat_list.py ===================================== @@ -437,7 +437,12 @@ 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: + + if line is None: + self.show_all() + return + + if line.message is not None: self.set_message_text(line.message, line.additional_data) if line.kind in (KindConstant.CHAT_MSG_SENT, KindConstant.SINGLE_MSG_SENT): @@ -457,6 +462,12 @@ def __init__(self, workspace_id, account, jid, type_, pinned): uf_timestamp = get_uf_relative_time(line.time) self._ui.timestamp_label.set_text(uf_timestamp) + if line.kind == KindConstant.FILE_TRANSFER: + self._ui.message_label.set_text(_('File Transfer')) + self.timestamp = line.time + uf_timestamp = get_uf_relative_time(line.time) + self._ui.timestamp_label.set_text(uf_timestamp) + self.show_all() @property @@ -613,7 +624,7 @@ def set_message_text(self, text, additional_data): 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)') % { + text = '%(file_type)s (%(file_name)s)' % { 'file_type': file_type, 'file_name': file_name} else: ===================================== gajim/gtk/controls/base.py ===================================== @@ -283,7 +283,7 @@ def process_event(self, event): self._process_jingle_av_event(event) return if event.name in ('file-request-received', 'file-request-sent'): - self.add_jingle_file_transfer(event) + self.add_jingle_file_transfer(event=event) return method_name = event.name.replace('-', '_') @@ -1087,7 +1087,9 @@ def add_file_transfer(self, transfer): self.conversation_view.add_file_transfer(transfer) def add_jingle_file_transfer(self, event): - self.conversation_view.add_jingle_file_transfer(event) + control_selected = bool(self == app.window.get_active_control()) + if self._scrolled_view.get_lower_complete() and control_selected: + self.conversation_view.add_jingle_file_transfer(event) def add_call_message(self, timestamp, text, event=None): self.conversation_view.add_call_message(timestamp, text, event) @@ -1107,10 +1109,8 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - chat_active = app.window.is_chat_active( - self.account, self.contact.jid) - - if self._scrolled_view.get_lower_complete() and chat_active: + control_selected = bool(self == app.window.get_active_control()) + if self._scrolled_view.get_lower_complete() and control_selected: self.conversation_view.add_message( text, kind, @@ -1144,6 +1144,8 @@ def add_message(self, self._notify(name, text, tim) # Send chat marker if we’re actively following the chat + chat_active = app.window.is_chat_active( + self.account, self.contact.jid) if chat_active and self._scrolled_view.get_autoscroll(): app.window.mark_as_read(self.account, self.contact.jid) @@ -1356,7 +1358,13 @@ def fetch_n_lines_history(self, _scrolled, before, n_lines): def add_messages(self, messages): for msg in messages: - if not msg or not msg.message: + if msg.kind == KindConstant.FILE_TRANSFER: + if msg.additional_data.get_value('gajim', 'type') == 'jingle': + self.conversation_view.add_jingle_file_transfer( + db_message=msg) + continue + + if not msg.message: continue contact_name = msg.contact_name ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.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/>. +import logging import os import time from datetime import datetime @@ -22,6 +23,7 @@ from gajim.common import app from gajim.common import ged from gajim.common.const import AvatarSize +from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.i18n import _ @@ -29,18 +31,33 @@ from ...util import get_builder from ...util import format_eta +log = logging.getLogger('gajim.gui.conversation.rows.file_transfer_jingle') + class FileTransferJingleRow(BaseRow): - def __init__(self, account, contact, event): + def __init__(self, account, contact, event=None, db_message=None): BaseRow.__init__(self, account) self.type = 'file-transfer' - timestamp = time.time() + + is_from_db = bool(db_message is not None) + + if is_from_db: + timestamp = db_message.time + else: + timestamp = time.time() self.timestamp = datetime.fromtimestamp(timestamp) self.db_timestamp = timestamp self._contact = contact - self._file_props = event.file_props + + if is_from_db: + sid = db_message.additional_data.get_value('gajim', 'sid') + self._file_props = FilesProp.getFilePropBySid(sid) + if self._file_props is None: + log.debug('File props not found for SID: %s', sid) + else: + self._file_props = event.file_props self._start_time = 0 if app.settings.get('use_kib_mib'): @@ -63,6 +80,16 @@ def __init__(self, account, contact, event): self._ui.connect_signals(self) + self.show_all() + + if is_from_db: + self._reconstruct_transfer() + else: + self._display_transfer_info(event.name) + + if self._file_props is None: + return + # pylint: disable=line-too-long app.ged.register_event_handler('file-completed', ged.GUI1, self.process_event) app.ged.register_event_handler('file-hash-error', ged.GUI1, self.process_event) @@ -74,16 +101,44 @@ def __init__(self, account, contact, event): app.ged.register_event_handler('jingle-ft-cancelled-received', ged.GUI1, self.process_event) # pylint: enable=line-too-long - self.show_all() + def _reconstruct_transfer(self): + self._show_file_infos() + if self._file_props is None: + self._ui.transfer_action.set_text(_('File Transfer')) + self._ui.error_label.set_text(_('No info available')) + self._ui.action_stack.set_visible_child_name('error') + return - self._display_transfer_info(event) + if self._file_props.completed: + self._show_completed() + return + + if self._file_props.stopped: + self._ui.action_stack.set_visible_child_name('error') + self._ui.transfer_action.set_text(_('File Transfer Stopped')) + self._ui.error_label.set_text('') + return + + if self._file_props.error is not None: + self._show_error(self._file_props) + return - def _display_transfer_info(self, event): - if event.name == 'file-request-sent': + self._ui.transfer_action.set_text(_('File Offered…')) + + def _display_transfer_info(self, event_name): + if event_name == 'file-request-sent': self._ui.action_stack.set_visible_child_name('progress') self._ui.progress_label.set_text(_('Waiting…')) self._ui.transfer_action.set_text(_('File Offered…')) + self._show_file_infos() + + def _show_file_infos(self): + if self._file_props is None: + self._ui.file_name.hide() + self._ui.file_description.hide() + self._ui.file_size.hide() + return file_name = GLib.markup_escape_text(self._file_props.name) if self._file_props.mime_type: @@ -127,7 +182,7 @@ def process_event(self, event): if event.name == 'file-completed': self._show_completed() elif event.name == 'file-error': - self._show_error(event) + self._show_error(event.file_props) elif event.name == 'file-hash-error': self._ui.action_stack.set_visible_child_name('hash-error') self._ui.transfer_action.set_text(_('File Verification Failed')) @@ -153,7 +208,10 @@ def _update_progress(self, file_props): if file_props.type_ == 's': # We're sending a file if self._start_time == 0: - self._start_time = time.time() + self._start_time = time_now + return + if not file_props.transfered_size: + return transferred_size = file_props.transfered_size[-1][1] else: # We're receiving a file @@ -180,15 +238,15 @@ def _update_progress(self, file_props): self._ui.progress_bar.set_fraction(progress) - def _show_error(self, event): + def _show_error(self, file_props): self._ui.action_stack.set_visible_child_name('error') self._ui.transfer_action.set_text(_('File Transfer Stopped')) - if event.file_props.error == -1: + if file_props.error == -1: self._ui.error_label.set_text( _('%s stopped the transfer') % self._contact.name) - elif event.file_props.error == -6: + elif file_props.error == -6: self._ui.error_label.set_text(_('Error opening file')) - elif event.file_props.error == -12: + elif file_props.error == -12: self._ui.error_label.set_text(_('SSL certificate error')) else: self._ui.error_label.set_text(_('An error occurred')) @@ -205,6 +263,7 @@ def _on_accept_file_request(self, _widget): def _on_reject_file_request(self, _widget): self._client.get_module('Bytestream').send_file_rejection( self._file_props) + self._file_props.stopped = True self._ui.action_stack.set_visible_child_name('rejected') self._ui.transfer_action.set_text(_('File Transfer Cancelled')) ===================================== gajim/gtk/conversation/view.py ===================================== @@ -188,9 +188,9 @@ def add_file_transfer(self, transfer): transfer_row = FileTransferRow(self._account, transfer) self._insert_message(transfer_row) - def add_jingle_file_transfer(self, event): + def add_jingle_file_transfer(self, event=None, db_message=None): jingle_transfer_row = FileTransferJingleRow( - self._account, self._contact, event) + self._account, self._contact, event=event, db_message=db_message) self._insert_message(jingle_transfer_row) def add_call_message(self, timestamp, text, event): ===================================== gajim/gtk/filetransfer.py ===================================== @@ -32,10 +32,12 @@ from gajim.common import app from gajim.common import ged from gajim.common import helpers +from gajim.common.const import KindConstant from gajim.common.i18n import _ from gajim.common.file_props import FilesProp from gajim.common.helpers import open_file from gajim.common.helpers import file_is_locked +from gajim.common.helpers import AdditionalDataDict from gajim.common.modules.bytestream import is_transfer_active from gajim.common.modules.bytestream import is_transfer_paused from gajim.common.modules.bytestream import is_transfer_stopped @@ -404,6 +406,17 @@ def send_file(self, account, contact, resource_jid, file_path, if file_props is None: return False + # Insert file request into DB + additional_data = AdditionalDataDict() + additional_data.set_value('gajim', 'type', 'jingle') + additional_data.set_value('gajim', 'sid', file_props.sid) + app.storage.archive.insert_into_logs( + account, + contact.jid.bare, + time.time(), + KindConstant.FILE_TRANSFER, + additional_data=additional_data) + client = app.get_client(account) client.get_module('Jingle').start_file_transfer( str(resource_jid), file_props) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d4414bc99a2a7b9b7f25d8f5e72d1f0… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d4414bc99a2a7b9b7f25d8f5e72d1f0… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ChatStack: Reset active control when removing it
by Daniel Brötzmann (＠wurstsalat) 30 Oct '21

30 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e257a81b by wurstsalat at 2021-10-31T01:15:40+02:00 ChatStack: Reset active control when removing it - - - - - 1 changed file: - gajim/gtk/chat_stack.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -91,6 +91,8 @@ def add_private_chat(self, account, jid): def remove_chat(self, account, jid): control = self._controls.pop((account, jid)) + if control == self._active_control: + self._active_control = None self.remove(control.widget) control.shutdown() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e257a81ba8530d5612090b6fcaa4dc48… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e257a81ba8530d5612090b6fcaa4dc48… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] ConversationView: Read marker improvements
by Daniel Brötzmann (＠wurstsalat) 30 Oct '21

30 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 1d81a63c by wurstsalat at 2021-10-30T21:25:38+02:00 ConversationView: Read marker improvements - - - - - 2 changed files: - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -26,6 +26,7 @@ def __init__(self, account, contact): BaseRow.__init__(self, account, widget='label') self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) + self._last_incoming_timestamp = datetime.fromtimestamp(0) contact.connect('nickname-update', self._on_nickname_update) @@ -43,7 +44,15 @@ def _on_nickname_update(self, contact, _signal_name): self.label.set_text(text) def set_timestamp(self, timestamp): + if timestamp < self._last_incoming_timestamp: + return + self.timestamp = timestamp + self.changed() self.set_no_show_all(False) self.show_all() + + def set_last_incoming_timestamp(self, timestamp): + if timestamp > self._last_incoming_timestamp: + self._last_incoming_timestamp = timestamp ===================================== gajim/gtk/conversation/view.py ===================================== @@ -243,17 +243,24 @@ def add_message(self, if message.type == 'chat': self._message_id_row_map[message_id] = message + + if kind == 'incoming': + self._read_marker_row.set_last_incoming_timestamp( + message.timestamp) if marker is not None and marker == 'displayed': self.set_read_marker(message_id) + self._insert_message(message) def _insert_message(self, message): self.add(message) self._add_date_row(message.timestamp) self._check_for_merge(message) + if message.kind == 'incoming': if message.timestamp > self._read_marker_row.timestamp: self._read_marker_row.hide() + GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d81a63c2e9b79f25547ee4d2a666ec4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/1d81a63c2e9b79f25547ee4d2a666ec4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ConversationView: Show read marker row when loading from DB
by Daniel Brötzmann (＠wurstsalat) 30 Oct '21

30 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6fcd96b2 by wurstsalat at 2021-10-30T19:11:12+02:00 ConversationView: Show read marker row when loading from DB - - - - - 3674f117 by wurstsalat at 2021-10-30T19:13:56+02:00 ChatStack: Reset ConversationView when switching Control - - - - - 3 changed files: - gajim/gtk/chat_stack.py - gajim/gtk/controls/base.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/gtk/chat_stack.py ===================================== @@ -46,6 +46,7 @@ def __init__(self): self.show_all() self._controls = {} + self._active_control = None def get_control(self, account, jid): try: @@ -96,6 +97,10 @@ def remove_chat(self, account, jid): def show_chat(self, account, jid): self.set_visible_child_name(f'{account}:{jid}') control = self.get_control(account, jid) + if control != self._active_control: + if self._active_control is not None: + self._active_control.reset_view() + self._active_control = control GLib.idle_add(control.focus) def clear(self): ===================================== gajim/gtk/controls/base.py ===================================== @@ -1107,7 +1107,10 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - if self._scrolled_view.get_lower_complete(): + chat_active = app.window.is_chat_active( + self.account, self.contact.jid) + + if self._scrolled_view.get_lower_complete() and chat_active: self.conversation_view.add_message( text, kind, @@ -1141,8 +1144,6 @@ def add_message(self, self._notify(name, text, tim) # Send chat marker if we’re actively following the chat - chat_active = app.window.is_chat_active( - self.account, self.contact.jid) if chat_active and self._scrolled_view.get_autoscroll(): app.window.mark_as_read(self.account, self.contact.jid) @@ -1279,6 +1280,9 @@ def set_control_active(self, state): self._client.get_module('Chatstate').set_chatstate( self.contact, Chatstate.INACTIVE) + def reset_view(self): + self.conversation_view.clear() + def get_autoscroll(self): return self._scrolled_view.get_autoscroll() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -117,6 +117,8 @@ def unlock(self): def clear(self): for row in self.get_children()[2:]: + if row.type == 'read_marker': + continue self.remove(row) self._reset_conversation_view() @@ -240,8 +242,9 @@ def add_message(self, log_line_id=log_line_id) if message.type == 'chat': - self._message_id_row_map[message.message_id] = message - + self._message_id_row_map[message_id] = message + if marker is not None and marker == 'displayed': + self.set_read_marker(message_id) self._insert_message(message) def _insert_message(self, message): @@ -249,7 +252,8 @@ def _insert_message(self, message): self._add_date_row(message.timestamp) self._check_for_merge(message) if message.kind == 'incoming': - self.set_read_marker(None) + if message.timestamp > self._read_marker_row.timestamp: + self._read_marker_row.hide() GLib.idle_add(message.queue_resize) def _add_date_row(self, timestamp): @@ -407,7 +411,6 @@ def update_call_rows(self): def set_read_marker(self, id_): if id_ is None: - self._read_marker_row.hide() return row = self._get_row_by_message_id(id_) @@ -417,6 +420,9 @@ def set_read_marker(self, id_): row.set_displayed() timestamp = row.timestamp + timedelta(microseconds=1) + if self._read_marker_row.timestamp > timestamp: + return + self._read_marker_row.set_timestamp(timestamp) def update_avatars(self): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d54031adadeb7f8de39e2bb9067fe4c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/d54031adadeb7f8de39e2bb9067fe4c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 3 commits: Rework Password dialog
by Daniel Brötzmann (＠wurstsalat) 29 Oct '21

29 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c22d4db5 by wurstsalat at 2021-10-30T01:25:38+02:00 Rework Password dialog - - - - - 68ac048b by André Apitzsch at 2021-10-30T01:25:41+02:00 KEYRING_AVAILABLE: Only depend on selected backend Passwords can only be stored if the selected backend is recommended. - - - - - d54031ad by André Apitzsch at 2021-10-30T01:25:41+02:00 Enable "save password" only if password is storable - - - - - 9 changed files: - gajim/common/passwords.py - − gajim/data/gui/passphrase_dialog.ui - + gajim/data/gui/password_dialog.ui - gajim/gtk/accounts.py - gajim/gtk/const.py - gajim/gtk/dialogs.py - gajim/gtk/features.py - + gajim/gtk/password_dialog.py - gajim/gui_interface.py Changes: ===================================== gajim/common/passwords.py ===================================== @@ -37,8 +37,7 @@ keyring_backend = keyring.get_keyring() log.info('Select %s backend', keyring_backend) -KEYRING_AVAILABLE = any(keyring.core.recommended(backend) - for backend in backends) +KEYRING_AVAILABLE = keyring.core.recommended(keyring_backend) class SecretPasswordStorage: ===================================== gajim/data/gui/passphrase_dialog.ui deleted ===================================== @@ -1,162 +0,0 @@ -<?xml version="1.0" encoding="UTF-8"?> - -<interface> - <requires lib="gtk+" version="3.20"/> - <object class="GtkDialog" id="passphrase_dialog"> - <property name="can_focus">False</property> - <property name="border_width">18</property> - <property name="title" translatable="yes">Passphrase</property> - <property name="resizable">False</property> - <property name="type_hint">dialog</property> - <signal name="destroy" handler="on_passphrase_dialog_destroy" swapped="no"/> - <child> - <placeholder/> - </child> - <child internal-child="vbox"> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child internal-child="action_area"> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="cancel_button"> - <property name="label" translatable="yes">_Cancel</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="ok_button"> - <property name="label" translatable="yes">_OK</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="can_default">True</property> - <property name="has_default">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="pack_type">end</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="spacing">18</property> - <child> - <object class="GtkImage"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">dialog-password-symbolic</property> - <property name="icon_size">6</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="orientation">vertical</property> - <property name="spacing">6</property> - <child> - <object class="GtkLabel" id="message_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_bottom">6</property> - <property name="wrap">True</property> - <property name="max_width_chars">40</property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkEntry" id="passphrase_entry"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="has_focus">True</property> - <property name="visibility">False</property> - <property name="activates_default">True</property> - <property name="input_purpose">password</property> - <property name="input_hints">GTK_INPUT_HINT_NO_SPELLCHECK | GTK_INPUT_HINT_NONE</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkCheckButton" id="save_passphrase_checkbutton"> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="receives_default">False</property> - <property name="use_underline">True</property> - <property name="draw_indicator">True</property> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">True</property> - <property name="position">0</property> - </packing> - </child> - </object> - </child> - <action-widgets> - <action-widget response="-6">cancel_button</action-widget> - <action-widget response="-5">ok_button</action-widget> - </action-widgets> - </object> -</interface> ===================================== gajim/data/gui/password_dialog.ui ===================================== @@ -0,0 +1,158 @@ +<?xml version="1.0" encoding="UTF-8"?> + +<interface> + <requires lib="gtk+" version="3.24"/> + <object class="GtkBox" id="pass_box"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="halign">center</property> + <property name="border-width">18</property> + <property name="orientation">vertical</property> + <property name="spacing">6</property> + <child> + <object class="GtkLabel" id="header"> + <property name="name">header</property> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-bottom">6</property> + <property name="wrap">True</property> + <property name="max-width-chars">30</property> + <style> + <class name="large-header"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="message_label"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="justify">center</property> + <property name="wrap">True</property> + <property name="max-width-chars">30</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">1</property> + </packing> + </child> + <child> + <object class="GtkImage"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="icon-name">dialog-password-symbolic</property> + <property name="icon_size">6</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">2</property> + </packing> + </child> + <child> + <object class="GtkEntry" id="pass_entry"> + <property name="width-request">200</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="has-focus">True</property> + <property name="visibility">False</property> + <property name="activates-default">True</property> + <property name="input-purpose">password</property> + <property name="input-hints">GTK_INPUT_HINT_NO_SPELLCHECK | GTK_INPUT_HINT_NONE</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> + <child> + <object class="GtkCheckButton" id="save_pass_checkbutton"> + <property name="label" translatable="yes">Save Password</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="no-show-all">True</property> + <property name="halign">start</property> + <property name="use-underline">True</property> + <property name="draw-indicator">True</property> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">4</property> + </packing> + </child> + <child> + <object class="GtkBox"> + <property name="visible">True</property> + <property name="can-focus">False</property> + <property name="margin-top">12</property> + <property name="spacing">6</property> + <child> + <object class="GtkButton" id="cancel_button"> + <property name="label" translatable="yes">_Cancel</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_cancel" swapped="no"/> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">0</property> + </packing> + </child> + <child> + <object class="GtkButton" id="ok_button"> + <property name="label" translatable="yes">_Login</property> + <property name="visible">True</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_ok" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">1</property> + </packing> + </child> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="pack-type">end</property> + <property name="position">5</property> + </packing> + </child> + <child> + <object class="GtkLabel" id="keyring_hint"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes">Install a keyring to store passwords on your system.</property> + <property name="wrap">True</property> + <property name="max-width-chars">30</property> + <property name="xalign">0</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">6</property> + </packing> + </child> + </object> +</interface> ===================================== gajim/gtk/accounts.py ===================================== @@ -1021,7 +1021,8 @@ def __init__(self, account, parent): bind='account::savepass'), Setting(SettingKind.SWITCH, _('Save Password'), - SettingType.ACCOUNT_CONFIG, 'savepass'), + SettingType.ACCOUNT_CONFIG, 'savepass', + enabled_func=lambda: not app.settings.get('use_keyring') or passwords.KEYRING_AVAILABLE), Setting(SettingKind.CHANGEPASSWORD, _('Change Password'), SettingType.DIALOG, callback=self.on_password_change, ===================================== gajim/gtk/const.py ===================================== @@ -141,4 +141,5 @@ def __str__(self): 'ServiceRegistration': 'gajim.gui.service_registration', 'SynchronizeAccounts': 'gajim.gui.synchronize_accounts', 'AdhocMUC': 'gajim.gui.adhoc_muc', + 'PasswordDialog': 'gajim.gui.password_dialog', } ===================================== gajim/gtk/dialogs.py ===================================== @@ -15,7 +15,6 @@ from datetime import datetime from collections import namedtuple -from gi.repository import GLib from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GdkPixbuf @@ -138,7 +137,7 @@ def popup(self): """ Show dialog """ - vb = self.get_children()[0].get_children()[0] # Give focus to top vbox + vb = self.get_children()[0].get_children()[0] # Give focus to top vbox # vb.set_flags(Gtk.CAN_FOCUS) vb.grab_focus() self.show_all() @@ -295,65 +294,6 @@ def _on_copy_cert_info_button_clicked(self, _widget): self._clipboard.set_text(clipboard_text, -1) -class PassphraseDialog: - """ - Class for Passphrase dialog - """ - def __init__(self, titletext, labeltext, checkbuttontext=None, - ok_handler=None, cancel_handler=None, transient_for=None): - self._ui = get_builder('passphrase_dialog.ui') - self.window = self._ui.get_object('passphrase_dialog') - self.passphrase = -1 - self.window.set_title(titletext) - self._ui.message_label.set_text(labeltext) - - self._ok = False - - self.cancel_handler = cancel_handler - self.ok_handler = ok_handler - self._ui.ok_button.connect('clicked', self.on_okbutton_clicked) - self._ui.cancel_button.connect('clicked', self.on_cancelbutton_clicked) - - self._ui.connect_signals(self) - if transient_for is None: - transient_for = app.app.get_active_window() - self.window.set_transient_for(transient_for) - self.window.show_all() - - self.check = bool(checkbuttontext) - if self._ui.save_passphrase_checkbutton: - self._ui.save_passphrase_checkbutton.set_label(checkbuttontext) - else: - self._ui.save_passphrase_checkbutton.hide() - - def on_okbutton_clicked(self, _widget): - if not self.ok_handler: - return - - passph = self._ui.passphrase_entry.get_text() - - if self.check: - checked = self._ui.save_passphrase_checkbutton.get_active() - else: - checked = False - - self._ok = True - - self.window.destroy() - - if isinstance(self.ok_handler, tuple): - self.ok_handler[0](passph, checked, *self.ok_handler[1:]) - else: - self.ok_handler(passph, checked) - - def on_cancelbutton_clicked(self, _widget): - self.window.destroy() - - def on_passphrase_dialog_destroy(self, _widget): - if self.cancel_handler and not self._ok: - self.cancel_handler() - - class ConfirmationDialog(Gtk.MessageDialog): def __init__(self, title, text, sec_text, buttons, modal=True, transient_for=None): ===================================== gajim/gtk/features.py ===================================== @@ -157,9 +157,8 @@ def _get_features(self): @staticmethod def _some_keyring_available(): - import keyring - backends = keyring.backend.get_all_keyring() - return any(keyring.core.recommended(backend) for backend in backends) + from gajim.common import passwords + return passwords.KEYRING_AVAILABLE @staticmethod def _idle_available(): ===================================== gajim/gtk/password_dialog.py ===================================== @@ -0,0 +1,113 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +import logging + +from gi.repository import Gtk +from gi.repository import Gdk + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.passwords import save_password +from gajim.common.passwords import KEYRING_AVAILABLE + +from .util import get_builder + +log = logging.getLogger('gajim.gui.pass_dialog') + + +class PasswordDialog(Gtk.ApplicationWindow): + def __init__(self, account, event): + Gtk.ApplicationWindow.__init__(self) + self.set_application(app.app) + self.set_type_hint(Gdk.WindowTypeHint.DIALOG) + self.set_position(Gtk.WindowPosition.CENTER) + self.set_default_size(400, -1) + self.set_show_menubar(False) + self.set_name('PasswordDialog') + self.set_title(_('Password Required')) + + self._ui = get_builder('password_dialog.ui') + self.add(self._ui.pass_box) + + self.account = account + self._client = app.get_client(account) + self.event = event + + self.connect('key-press-event', self._on_key_press) + self._ui.connect_signals(self) + self.show_all() + self._ui.ok_button.grab_default() + + self._process_event() + + def _on_key_press(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() + + def _process_event(self): + own_jid = self._client.get_own_jid().bare + account_name = app.settings.get_account_setting( + self.account, 'name') + + if self.event.name == 'password-required': + self._ui.header.set_text(_('Password Required')) + self._ui.message_label.set_text( + _('Please enter your password for\n' + '%(jid)s\n(Account: %(account)s)') % { + 'jid': own_jid, + 'account': account_name}) + self._ui.save_pass_checkbutton.show() + self._ui.save_pass_checkbutton.set_sensitive( + not app.settings.get('use_keyring') or KEYRING_AVAILABLE) + if not KEYRING_AVAILABLE: + self._ui.keyring_hint.show() + + if self.event.name == 'client-cert-passphrase': + self._ui.header.set_text(_('Certificate Password Required')) + self._ui.message_label.set_text( + _('Please enter your certificate password for ' + '%(jid)s (%(account)s)') % { + 'jid': own_jid, + 'account': account_name}) + + def _on_ok(self, _button): + password = self._ui.pass_entry.get_text() + + if self.event.name == 'password-required': + app.settings.set_account_setting( + self.account, + 'savepass', + self._ui.save_pass_checkbutton.get_active()) + save_password(self.account, password) + self.event.on_password(password) + self.destroy() + + if self.event.name == 'client-cert-passphrase': + self.event.conn.on_client_cert_passphrase( + password, + self.event.con, + self.event.port, + self.event.secure_tuple) + self.destroy() + + def _on_cancel(self, _button): + if self.event.name == 'client-cert-passphrase': + self.event.conn.on_client_cert_passphrase( + '', + self.event.con, + self.event.port, + self.event.secure_tuple) + + self.destroy() ===================================== gajim/gui_interface.py ===================================== @@ -86,7 +86,6 @@ from gajim.gui.dialogs import InformationDialog from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import InputDialog -from gajim.gui.dialogs import PassphraseDialog from gajim.gui.filechoosers import FileChooserDialog from gajim.gui.filetransfer import FileTransfersWindow from gajim.gui.main import MainWindow @@ -103,8 +102,6 @@ def __init__(self): app.interface = self app.thread_interface = ThreadInterface - self._passphrase_dialogs = {} - self.handlers = {} self.avatar_storage = AvatarStorage() @@ -330,47 +327,11 @@ def _response(_account, answer): @staticmethod def handle_event_client_cert_passphrase(event): - def _on_ok(passphrase, _checked): - event.conn.on_client_cert_passphrase( - passphrase, - event.con, - event.port, - event.secure_tuple) - - def _on_cancel(): - event.conn.on_client_cert_passphrase( - '', - event.con, - event.port, - event.secure_tuple) - - PassphraseDialog(_('Certificate Passphrase Required'), - _('Enter the certificate passphrase for ' - 'account %s') % event.conn.name, - ok_handler=_on_ok, - cancel_handler=_on_cancel) - - def handle_event_password_required(self, event): - # ('PASSWORD_REQUIRED', account, None) - account = event.conn.name - if account in self._passphrase_dialogs: - return - text = _('Enter your password for account %s') % account - - def _on_ok(passphrase, save): - app.settings.set_account_setting(account, 'savepass', save) - passwords.save_password(account, passphrase) - event.on_password(passphrase) - del self._passphrase_dialogs[account] - - def _on_cancel(): - del self._passphrase_dialogs[account] - - self._passphrase_dialogs[account] = PassphraseDialog( - _('Password Required'), - text, _('Save password'), - ok_handler=_on_ok, - cancel_handler=_on_cancel) + open_window('PasswordDialog', account=event.conn.name, event=event) + + @staticmethod + def handle_event_password_required(event): + open_window('PasswordDialog', account=event.conn.name, event=event) @staticmethod def handle_event_zc_name_conflict(event): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5e9d207fdf31a1e9f3cc8111f6c27de… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/5e9d207fdf31a1e9f3cc8111f6c27de… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 4 commits: CSS: Remove row backdrop transition (performance)
by Daniel Brötzmann (＠wurstsalat) 28 Oct '21

28 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 3245e591 by wurstsalat at 2021-10-28T23:49:48+02:00 CSS: Remove row backdrop transition (performance) - - - - - 8c792a98 by wurstsalat at 2021-10-28T23:50:08+02:00 StatusIcon: Remove superfluous show_all - - - - - 0957fd57 by wurstsalat at 2021-10-29T00:19:54+02:00 ChatList: Use MAM timestamp for MAM messages - - - - - 5e9d207f by wurstsalat at 2021-10-29T00:21:51+02:00 ChatList: Don't use idle_add for set_message_text - - - - - 3 changed files: - gajim/data/style/gajim.css - gajim/gtk/chat_list.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -40,6 +40,8 @@ .message-input-focus { border-radius: 4px; } +row:backdrop { transition: none; } + .conversation-row:hover button { opacity: 1; } ===================================== gajim/gtk/chat_list.py ===================================== @@ -326,9 +326,11 @@ def _on_message_received(self, event): row = self._chats.get((event.account, event.jid)) nick = self._get_nick_for_received_message(event) row.set_nick(nick) - row.set_timestamp(event.properties.timestamp) - GLib.idle_add( - row.set_message_text, event.msgtxt, event.additional_data) + if event.name == 'mam-message-received': + row.set_timestamp(event.properties.mam.timestamp) + else: + row.set_timestamp(event.properties.timestamp) + row.set_message_text(event.msgtxt, event.additional_data) self._add_unread(row, event.properties) self.invalidate_sort() @@ -349,8 +351,7 @@ def _on_message_sent(self, event): # Set timestamp if it's None (outgoing MUC messages) row.set_timestamp(event.timestamp or time.time()) - GLib.idle_add( - row.set_message_text, event.message, event.additional_data) + row.set_message_text(event.message, event.additional_data) self.invalidate_sort() @staticmethod @@ -437,8 +438,7 @@ 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: - GLib.idle_add( - self.set_message_text, line.message, line.additional_data) + 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:')) ===================================== gajim/gtk/status_icon.py ===================================== @@ -233,7 +233,6 @@ def _on_activate(self, *args): app.window.hide() return - app.window.show_all() if not app.window.get_property('visible'): # Window was minimized restore_main_window_position() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/451cf7d5c1a2848d0dd0566abceb9b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/451cf7d5c1a2848d0dd0566abceb9b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Fix display bug and clean up code
by Daniel Brötzmann (＠wurstsalat) 27 Oct '21

27 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: b2d87914 by wtas at 2021-10-28T00:27:33+02:00 Fix display bug and clean up code - - - - - 451cf7d5 by wtas at 2021-10-28T00:28:25+02:00 SearchView: Implement search filters - - - - - 4 changed files: - gajim/common/const.py - gajim/common/storage/archive.py - gajim/data/gui/search_view.ui - gajim/gtk/search_view.py Changes: ===================================== gajim/common/const.py ===================================== @@ -1237,6 +1237,64 @@ def is_active(self): ) +FILE_CATEGORIES = { + 'img': [ + 'jpg', + 'jpeg', + 'jpe', + 'jif', + 'jfif', + 'jfi', + 'png', + 'gif', + 'webp', + 'tiff', + 'tif', + 'psd', + 'raw', + 'arw', + 'cr2', + 'nrw', + 'k25', + 'bmp', + 'dib', + 'heif', + 'heic', + 'ind', + 'indd', + 'indt', + 'jp2', + 'j2k', + 'jpf', + 'jpx', + 'jpm', + 'mj2', + 'svg', + 'svgz', + 'ai' + ], + 'video': [ + 'webm', + 'mpg', + 'mp2', + 'mpeg', + 'mpe', + 'mpv', + 'ogg', + 'mp4', + 'm4p', + 'm4v', + 'avi', + 'wmv', + 'mov', + 'qt', + 'flv', + 'swf', + 'avchd' + ], +} + + TRUST_SYMBOL_DATA = { Trust.UNTRUSTED: ('dialog-error-symbolic', _('Untrusted'), ===================================== gajim/common/storage/archive.py ===================================== @@ -39,7 +39,6 @@ from gajim.common.storage.base import SqliteStorage from gajim.common.storage.base import timeit - CURRENT_USER_VERSION = 6 ARCHIVE_SQL_STATEMENT = ''' @@ -78,7 +77,6 @@ PRAGMA user_version=%s; ''' % CURRENT_USER_VERSION - log = logging.getLogger('gajim.c.storage.archive') @@ -563,7 +561,8 @@ def get_messages_for_date(self, account, jid, date): tuple(jids) + (date_ts, delta_ts)).fetchall() @timeit - def search_log(self, account, jid, query, date=None): + def search_log(self, account, jid, query, from_users=None, before=None, + after=None): """ Search the conversation log for messages containing the `query` string. @@ -573,12 +572,15 @@ def search_log(self, account, jid, query, date=None): :param account: The account - :param jid: The jid for which we request the conversation + :param jid: The jid for which we request the conversation - :param query: A search string + :param query: A search string - :param date: datetime.datetime instance - example: datetime.datetime(year, month, day) + :param from_users: A list of usernames or None + + :param before: A datetime.datetime instance or None + + :param after: A datetime.datetime instance or None returns a list of namedtuples """ @@ -587,52 +589,97 @@ def search_log(self, account, jid, query, date=None): kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) - if date: - delta = datetime.timedelta( - hours=23, minutes=59, seconds=59, microseconds=999999) + if before is None: + before_ts = datetime.datetime.now().timestamp() + else: + before_ts = before.timestamp() + + if after is None: + after_ts = datetime.datetime(1900, 1, 1).timestamp() + else: + after_ts = after.timestamp() - between = ''' - AND time BETWEEN {start} AND {end} - '''.format(start=date.timestamp(), - end=(date + delta).timestamp()) + if from_users is None: + users_query_string = '' + else: + users_query_string = 'AND UPPER(contact_name) IN (?)' sql = ''' - SELECT contact_name, time, kind, show, message, subject, - additional_data, log_line_id - FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) - AND message LIKE like(?) {date_search} - AND kind NOT IN ({kinds}) - ORDER BY time DESC, log_line_id - '''.format(jids=', '.join('?' * len(jids)), - date_search=between if date else '', - kinds=', '.join(kinds)) - - return self._con.execute(sql, tuple(jids) + (query,)).fetchall() + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND message LIKE like(?) + AND kind NOT IN ({kinds}) + {users_query} + AND time BETWEEN ? AND ? + ORDER BY time DESC, log_line_id + '''.format(jids=', '.join('?' * len(jids)), + kinds=', '.join(kinds), + users_query=users_query_string) + + if from_users is None: + return self._con.execute( + sql, tuple(jids) + (query, after_ts, before_ts)).fetchall() + else: + users = ','.join([user.upper() for user in from_users]) + return self._con.execute(sql, tuple(jids) + ( + query, users, after_ts, before_ts)).fetchall() @timeit - def search_all_logs(self, query): + def search_all_logs(self, query, from_users=None, before=None, after=None): """ Search all conversation logs for messages containing the `query` string. - :param query: A search string + :param query: A search string + + :param from_users: A list of usernames or None + + :param before: A datetime.datetime instance or None + + :param after: A datetime.datetime instance or None returns a list of namedtuples """ account_ids = self.get_active_account_ids() kinds = map(str, [KindConstant.STATUS, KindConstant.GCSTATUS]) + + if before is None: + before_ts = datetime.datetime.now().timestamp() + else: + before_ts = before.timestamp() + + if after is None: + after_ts = datetime.datetime(1900, 1, 1).timestamp() + else: + after_ts = after.timestamp() + + if from_users is None: + users_query_string = '' + else: + users_query_string = 'AND UPPER(contact_name) IN (?)' + sql = ''' - SELECT account_id, jid_id, contact_name, time, kind, show, message, - subject, additional_data, log_line_id - FROM logs WHERE message LIKE like(?) - AND account_id IN ({account_ids}) - AND kind NOT IN ({kinds}) - ORDER BY time DESC, log_line_id - '''.format(account_ids=', '.join(map(str, account_ids)), - kinds=', '.join(kinds)) - - return self._con.execute(sql, (query,)).fetchall() + SELECT account_id, jid_id, contact_name, time, kind, show, message, + subject, additional_data, log_line_id + FROM logs WHERE message LIKE like(?) + AND account_id IN ({account_ids}) + AND kind NOT IN ({kinds}) + {users_query} + AND time BETWEEN ? AND ? + ORDER BY time DESC, log_line_id + '''.format(account_ids=', '.join(map(str, account_ids)), + kinds=', '.join(kinds), + users_query=users_query_string) + + if from_users is None: + return self._con.execute( + sql, (query, after_ts, before_ts)).fetchall() + else: + users = ','.join([user.upper() for user in from_users]) + return self._con.execute( + sql, (query, users, after_ts, before_ts)).fetchall() @timeit def get_days_with_logs(self, account, jid, year, month): ===================================== gajim/data/gui/search_view.ui ===================================== @@ -206,6 +206,23 @@ <property name="position">2</property> </packing> </child> + <child> + <object class="GtkLabel" id="date_hint"> + <property name="can-focus">False</property> + <property name="no-show-all">True</property> + <property name="label" translatable="yes">Please use yyyy-mm-dd</property> + <property name="wrap">True</property> + <property name="max-width-chars">22</property> + <style> + <class name="dim-label"/> + </style> + </object> + <packing> + <property name="expand">False</property> + <property name="fill">True</property> + <property name="position">3</property> + </packing> + </child> <child> <object class="GtkSeparator"> <property name="visible">True</property> @@ -214,7 +231,7 @@ <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="position">3</property> + <property name="position">4</property> </packing> </child> <child> @@ -280,7 +297,7 @@ <packing> <property name="expand">True</property> <property name="fill">True</property> - <property name="position">4</property> + <property name="position">5</property> </packing> </child> <style> ===================================== gajim/gtk/search_view.py ===================================== @@ -11,11 +11,11 @@ # # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. - +import datetime import logging import time +import re -from gi.repository import Gdk from gi.repository import GObject from gi.repository import Gtk @@ -23,6 +23,7 @@ from gajim.common import ged from gajim.common.const import AvatarSize from gajim.common.const import KindConstant +from gajim.common.const import FILE_CATEGORIES from gajim.common.i18n import _ from gajim.common.styling import process @@ -33,7 +34,6 @@ class SearchView(Gtk.Box): - __gsignals__ = { 'hide-search': ( GObject.SignalFlags.RUN_FIRST, @@ -97,23 +97,118 @@ def _clear_results(self): def _on_search(self, entry): self._clear_results() + self._ui.date_hint.hide() text = entry.get_text() - if text == '': + if not text: return + # from:user + # This works only for MUC, because contact_name is not + # available for single contacts in logs.db. + text, from_filters = self._strip_filters(text, 'from') + + # before:date + text, before_filters = self._strip_filters(text, 'before') + if before_filters is not None: + try: + before_filters = min([datetime.datetime.fromisoformat(date) for + date in before_filters]) + except ValueError: + self._ui.date_hint.show() + return + + # after:date + text, after_filters = self._strip_filters(text, 'after') + if after_filters is not None: + try: + after_filters = min([datetime.datetime.fromisoformat(date) for + date in after_filters]) + # if only the day is specified, we want to look after the + # end of that day. + # if precision is increased,we do want to look during the + # day as well. + if after_filters.hour == after_filters.minute == 0: + after_filters += datetime.timedelta(days=1) + except ValueError: + self._ui.date_hint.show() + return + + # has:'file'|'img'|'video'|filetype + text, has_filters = self._strip_filters(text, 'has') + everywhere = self._ui.search_checkbutton.get_active() context = self._account is not None and self._jid is not None if not context or everywhere: self._scope = 'everywhere' - self._results = app.storage.archive.search_all_logs(text) + self._results = app.storage.archive.search_all_logs( + text, + from_users=from_filters, + before=before_filters, + after=after_filters) else: self._scope = 'contact' self._results = app.storage.archive.search_log( - self._account, self._jid, text) + self._account, + self._jid, + text, + from_users=from_filters, + before=before_filters, + after=after_filters) + + if has_filters is not None: + filetypes = [] + for filetype in has_filters: + filetypes.append(FILE_CATEGORIES.get(filetype, filetype)) + + filetypes = self._flatten(filetypes) + self._filter_results_for_files(filetypes) + self._add_counter() self._add_results() + def _filter_results_for_files(self, filetypes): + if 'file' in filetypes: + results = [] + for result in self._results: + if result.additional_data.get_value('gajim', 'oob_url'): + results.append(result) + self._results = results + else: + results = [] + for result in self._results: + url = result.additional_data.get_value('gajim', 'oob_url') + if url is None: + continue + extension = str(url).rsplit('.', maxsplit=1)[-1] + if extension in filetypes: + results.append(result) + self._results = results + + @staticmethod + def _strip_filters(text, filter_name): + filters = [] + start = 0 + new_text = '' + for search_filter in re.finditer(filter_name + r':(\S+)\s?', text): + end, new_start = search_filter.span() + new_text += text[start:end] + filters.append(search_filter.group(1)) + start = new_start + new_text += text[start:] + return new_text, filters or None + + @staticmethod + def _flatten(to_flatten): + nlist = [] + for element in to_flatten: + if isinstance(element, list): + for sub_element in element: + nlist.append(sub_element) + else: + nlist.append(element) + return nlist + def _add_counter(self): results_count = len(self._results) if results_count: @@ -121,10 +216,7 @@ def _add_counter(self): def _add_results(self): accounts = self._get_accounts() - count = 1 - for msg in self._results: - if count == 25: - return + for msg in self._results[:25]: if self._scope == 'everywhere': result_row = ResultRow( msg, @@ -134,8 +226,7 @@ def _add_results(self): result_row = ResultRow(msg, self._account, self._jid) self._ui.results_listbox.add(result_row) - self._results.pop(0) - count += 1 + self._results = self._results[25:] def _on_edge_reached(self, _scrolledwin, pos): if pos != Gtk.PositionType.BOTTOM: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a205d11bc70e7d9fb2f9c2546a70c08… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a205d11bc70e7d9fb2f9c2546a70c08… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits