Commits October 2021

commits@gajim.org

1 participants
72 discussions

[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

[Git][gajim/gajim][mainwindow] ConversationView: Improve Command Output
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: a205d11b by wurstsalat at 2021-10-27T00:55:27+02:00 ConversationView: Improve Command Output - - - - - 3 changed files: - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/gtk/conversation/rows/command_output.py Changes: ===================================== gajim/data/style/default.css ===================================== @@ -20,10 +20,12 @@ .gajim-call-message { background: rgb(225, 235, 250); } .gajim-command-error { - color: rgb(210, 70, 70); + background-color: rgb(10, 50, 70); + color: rgb(220, 80, 80); } .gajim-command-output { - color: rgb(100, 150, 220); + background-color: rgb(10, 50, 70); + color: rgb(170, 180, 200) } .gajim-mention-highlight { background: rgb(255, 215, 194); ===================================== gajim/data/style/gajim.css ===================================== @@ -74,9 +74,10 @@ .conversation-system-row { .conversation-date-row { padding: 12px; } -.conversation-command-row { - color: rgb(170, 184, 198); - background-color: rgb(7, 34, 76); +.conversation-command-row label { + border-radius: 6px; + padding: 12px; + font-size: small; } .conversation-subject-box, .conversation-call-box { ===================================== gajim/gtk/conversation/rows/command_output.py ===================================== @@ -48,7 +48,7 @@ def __init__(self, account, text, is_error): self._label = SimpleLabel() if is_error: self._label.get_style_context().add_class('gajim-command-error') - else: + else: self._label.get_style_context().add_class('gajim-command-output') self._label.set_markup(markup) self.grid.attach(self._label, 1, 0, 1, 1) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a205d11bc70e7d9fb2f9c2546a70c087… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/a205d11bc70e7d9fb2f9c2546a70c087… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Remove obsolete NotificationEvent
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: ee886a07 by wurstsalat at 2021-10-27T00:30:27+02:00 Remove obsolete NotificationEvent - - - - - 6aacc9c3 by wurstsalat at 2021-10-27T00:42:59+02:00 GroupchatControl: Remove old Contact remnant - - - - - 2 changed files: - gajim/common/connection_handlers_events.py - gajim/gtk/controls/groupchat.py Changes: ===================================== gajim/common/connection_handlers_events.py ===================================== @@ -22,14 +22,10 @@ from nbxmpp.namespaces import Namespace from gajim.common import nec -from gajim.common import helpers from gajim.common import app -from gajim.common import i18n -from gajim.common.i18n import _ from gajim.common.jingle_transport import JingleTransportSocks5 from gajim.common.file_props import FilesProp - log = logging.getLogger('gajim.c.connection_handlers_events') @@ -144,147 +140,6 @@ def generate(self): return True -class NotificationEventOld(nec.NetworkIncomingEvent): - - name = 'notification' - base_network_events = ['gc-message-received', - 'presence-received'] - - def generate(self): - # what's needed to compute output - self.account = self.base_event.conn.name - self.conn = self.base_event.conn - self.jid = '' - self.control = None - self.control_focused = False - self.first_unread = False - - # For output - self.do_sound = False - self.sound_file = '' - self.sound_event = '' # gajim sound played if not sound_file is set - self.show_popup = False - - self.do_popup = False - self.popup_title = '' - self.popup_text = '' - self.popup_event_type = '' - self.popup_msg_type = '' - self.icon_name = None - self.transport_name = None - self.show = None - self.popup_timeout = -1 - - self.do_command = False - self.command = '' - - self.show_in_notification_area = False - self.show_in_roster = False - - self.handle_incoming_pres_event(self.base_event) - return True - - def handle_incoming_msg_event(self, msg_obj): - # TODO: implement attention handling and remove this - - # don't alert for carbon copied messages from ourselves - if msg_obj.properties.is_sent_carbon: - return - - if msg_obj.properties.attention and not app.settings.get( - 'ignore_incoming_attention'): - self.popup_timeout = 0 - self.do_popup = True - else: - self.popup_timeout = app.settings.get('notification_timeout') - - sound = app.settings.get_soundevent_settings('attention_received') - - if msg_obj.properties.attention and not app.settings.get( - 'ignore_incoming_attention') and sound['enabled']: - self.sound_event = 'attention_received' - self.do_sound = True - - def handle_incoming_pres_event(self, pres_obj): - return - # TODO - if app.jid_is_transport(pres_obj.jid): - return True - account = pres_obj.conn.name - client = app.get_client(account) - self.jid = pres_obj.jid - resource = pres_obj.resource or '' - # It isn't an agent - for c in pres_obj.contact_list: - if c.resource == resource: - # we look for other connected resources - continue - if c.show not in ('offline', 'error'): - return True - - # no other resource is connected, let's look in metacontacts - family = app.contacts.get_metacontacts_family(account, self.jid) - for info in family: - acct_ = info['account'] - jid_ = info['jid'] - c_ = app.contacts.get_contact_with_highest_priority(acct_, jid_) - if not c_: - continue - if c_.jid == self.jid: - continue - if c_.show not in ('offline', 'error'): - return True - - if pres_obj.old_show < 2 and pres_obj.new_show > 1: - event = 'contact_connected' - server = app.get_server_from_jid(self.jid) - account_server = account + '/' + server - block_transport = False - if (account_server in app.block_signed_in_notifications and - app.block_signed_in_notifications[account_server]): - block_transport = True - - sound = app.settings.get_soundevent_settings('contact_connected') - if (sound['enabled'] and - not app.block_signed_in_notifications[account] and - not block_transport and helpers.allow_sound_notification( - account, 'contact_connected')): - self.sound_event = event - self.do_sound = True - - elif pres_obj.old_show > 1 and pres_obj.new_show < 2: - event = 'contact_disconnected' - sound = app.settings.get_soundevent_settings( - 'contact_disconnected') - if sound['enabled'] and helpers.allow_sound_notification( - account, event): - self.sound_event = event - self.do_sound = True - # Status change (not connected/disconnected or error (<1)) - elif pres_obj.new_show > 1: - event = 'status_change' - else: - return True - - if app.jid_is_transport(self.jid): - self.transport_name = app.get_transport_name_from_jid(self.jid) - - self.show = pres_obj.show - - self.popup_timeout = app.settings.get('notification_timeout') - - contact = client.get_module('Contacts').get_contact(self.jid) - nick = i18n.direction_mark + contact.name - if event == 'status_change': - self.popup_title = _('%(nick)s Changed Status') % \ - {'nick': nick} - self.popup_text = _('%(nick)s is now %(status)s') % \ - {'nick': nick, 'status': helpers.get_uf_show(pres_obj.show)} - if pres_obj.status: - self.popup_text = self.popup_text + " : " + pres_obj.status - self.popup_event_type = _('Contact Changed Status') - - class InformationEvent(nec.NetworkIncomingEvent): name = 'information' ===================================== gajim/gtk/controls/groupchat.py ===================================== @@ -789,7 +789,7 @@ def _nec_ping(self, event): if self.contact.jid != event.contact.room_jid: return - nick = event.contact.get_shown_name() + nick = event.contact.name if event.name == 'ping-sent': self.add_info_message(_('Ping? (%s)') % nick) elif event.name == 'ping-reply': @@ -884,13 +884,6 @@ def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, self.add_info_message(message) - # TODO: What to do with this? - # tv = self.conv_textview - # if nick in tv.last_received_message_id: - # tv.last_received_message_id[new_nick] = \ - # tv.last_received_message_id[nick] - # del tv.last_received_message_id[nick] - def _on_user_status_show_changed(self, _contact, _signal_name, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8f8c3f710c364316fb6ab31676b6a3d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/8f8c3f710c364316fb6ab31676b6a3d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Fix Command System output
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 8f8c3f71 by wurstsalat at 2021-10-26T23:54:15+02:00 Fix Command System output - - - - - 6 changed files: - gajim/command_system/implementation/middleware.py - gajim/command_system/implementation/standard.py - gajim/data/style/default.css - gajim/data/style/gajim.css - + gajim/gtk/conversation/rows/command_output.py - gajim/gtk/conversation/view.py Changes: ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -114,49 +114,19 @@ class CommandTools: """ def __init__(self): - self.install_tags() + pass - def install_tags(self): - # TODO implement this in ConversationView - # buffer_ = self.conv_textview.tv.get_buffer() - - # name = "Monospace" - # font = Pango.FontDescription(name) - - # command_ok_tag = buffer_.create_tag("command_ok") - # command_ok_tag.set_property("font-desc", font) - # command_ok_tag.set_property("foreground", "#3465A4") - - # command_error_tag = buffer_.create_tag("command_error") - # command_error_tag.set_property("font-desc", font) - # command_error_tag.set_property("foreground", "#F57900") - return - - def shift_line(self): - # buffer_ = self.conv_textview.tv.get_buffer() - # iter_ = buffer_.get_end_iter() - # if iter_.ends_line() and not iter_.is_start(): - # buffer_.insert_with_tags_by_name(iter_, "\n", "eol") - return - - def append_with_tags(self, text, *tags): - # buffer_ = self.conv_textview.tv.get_buffer() - # iter_ = buffer_.get_end_iter() - # buffer_.insert_with_tags_by_name(iter_, text, *tags) - return - - def echo(self, text, tag="command_ok"): + def echo(self, text, is_error=False): """ Print given text to the user, as a regular command output. """ - self.shift_line() - self.append_with_tags(text, tag) + self.conversation_view.add_command_output(text, is_error) def echo_error(self, text): """ Print given text to the user, as an error command output. """ - self.echo(text, "command_error") + self.echo(text, is_error=True) def send(self, text): """ ===================================== gajim/command_system/implementation/standard.py ===================================== @@ -191,7 +191,7 @@ class StandardCommonChatCommands(CommandContainer): @command @doc(_("Clear the text window")) def clear(self): - self.conv_textview.clear() + self.conversation_view.clear() @command @doc(_("Send a ping to the contact")) @@ -272,7 +272,7 @@ class StandardGroupChatCommands(CommandContainer): @command @doc(_("Clear the text window")) def clear(self): - self.conv_textview.clear() + self.conversation_view.clear() @command(raw=True) @doc(_("Change your nickname in a group chat")) @@ -354,7 +354,7 @@ def ban(self, who, reason=''): groupchat_contact = client.get_module('Contacts').get_contact( self.room_jid, groupchat=True) nick_list = groupchat_contact.get_user_nicknames() - if who in nicks: + if who in nick_list: contact = groupchat_contact.get_resource(who) who = contact.jid self.connection.get_module('MUC').set_affiliation( ===================================== gajim/data/style/default.css ===================================== @@ -19,6 +19,12 @@ .gajim-call-message { color: rgb(40, 70, 100); background: rgb(225, 235, 250); } +.gajim-command-error { + color: rgb(210, 70, 70); +} +.gajim-command-output { + color: rgb(100, 150, 220); +} .gajim-mention-highlight { background: rgb(255, 215, 194); } ===================================== gajim/data/style/gajim.css ===================================== @@ -74,6 +74,10 @@ .conversation-system-row { .conversation-date-row { padding: 12px; } +.conversation-command-row { + color: rgb(170, 184, 198); + background-color: rgb(7, 34, 76); +} .conversation-subject-box, .conversation-call-box { border-radius: 6px; ===================================== gajim/gtk/conversation/rows/command_output.py ===================================== @@ -0,0 +1,62 @@ +# 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 time +from datetime import datetime + +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common.const import AvatarSize + +from .widgets import SimpleLabel +from .base import BaseRow + + +class CommandOutputRow(BaseRow): + def __init__(self, account, text, is_error): + BaseRow.__init__(self, account) + + self.type = 'command_output' + timestamp = time.time() + self.timestamp = datetime.fromtimestamp(timestamp) + self.db_timestamp = timestamp + + self.get_style_context().add_class('conversation-command-row') + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + icon = Gtk.Image.new_from_icon_name('utilities-terminal-symbolic', + Gtk.IconSize.LARGE_TOOLBAR) + icon.get_style_context().add_class('dim-label') + avatar_placeholder.add(icon) + self.grid.attach(avatar_placeholder, 0, 0, 1, 1) + + text = GLib.markup_escape_text(text) + markup = f'<tt>{text}</tt>' + self._label = SimpleLabel() + if is_error: + self._label.get_style_context().add_class('gajim-command-error') + else: + self._label.get_style_context().add_class('gajim-command-output') + self._label.set_markup(markup) + self.grid.attach(self._label, 1, 0, 1, 1) + + timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget.set_hexpand(True) + timestamp_widget.set_halign(Gtk.Align.END) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 3, 0, 1, 1) + + self.show_all() ===================================== gajim/gtk/conversation/view.py ===================================== @@ -30,6 +30,7 @@ from .rows.message import MessageRow from .rows.info import InfoMessage from .rows.call import CallRow +from .rows.command_output import CommandOutputRow from .rows.date import DateRow from .rows.file_transfer import FileTransferRow from .rows.file_transfer_jingle import FileTransferJingleRow @@ -198,6 +199,10 @@ def add_call_message(self, timestamp, text, event): event) self._insert_message(call_row) + def add_command_output(self, text, is_error): + command_output_row = CommandOutputRow(self._account, text, is_error) + self._insert_message(command_output_row) + def add_message(self, text, kind, View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f8c3f710c364316fb6ab31676b6a3df… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/8f8c3f710c364316fb6ab31676b6a3df… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Notifications: Allow plugins to suppress notifications
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 870d5e0d by wurstsalat at 2021-10-26T22:06:28+02:00 Notifications: Allow plugins to suppress notifications - - - - - 1 changed file: - gajim/gtk/notification.py Changes: ===================================== gajim/gtk/notification.py ===================================== @@ -121,8 +121,13 @@ def _on_notification(self, event): elif hasattr(event, 'sound'): play_sound(event.sound, event.account) - if not allow_showing_notification(event.account): - return + if hasattr(event, 'show_notification'): + # Allow override here, used by Triggers plugin + if not event.show_notification: + return + else: + if not allow_showing_notification(event.account): + return if hasattr(event, 'notif_detail'): notif_detail = event.notif_detail View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/870d5e0d2f4da4e292e38379bc40fcc4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/870d5e0d2f4da4e292e38379bc40fcc4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: Notification: Use better fallback icon
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: fec01ea3 by wurstsalat at 2021-10-26T19:22:08+02:00 Notification: Use better fallback icon - - - - - 8475d62d by wurstsalat at 2021-10-26T19:22:27+02:00 StatusIcon: Use new icon for pending events - - - - - 3 changed files: - + gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg - gajim/gtk/notification.py - gajim/gtk/status_icon.py Changes: ===================================== gajim/data/icons/hicolor/scalable/status/dcraven-message-new.svg ===================================== @@ -0,0 +1,628 @@ +<?xml version="1.0" encoding="UTF-8" standalone="no"?> + + +<svg + width="32" + height="32" + id="svg5868" + sodipodi:version="0.32" + inkscape:version="1.1.1 (3bf5ae0d25, 2021-09-20)" + sodipodi:docname="dcraven-message-new.svg" + inkscape:output_extension="org.inkscape.output.svg.inkscape" + version="1.0" + inkscape:export-filename="/home/cornelius/Desktop/GAJIM iconset/data/iconsets/dcraven/32x32/message.png" + inkscape:export-xdpi="90" + inkscape:export-ydpi="90" + sodipodi:modified="TRUE" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:xlink="http://www.w3.org/1999/xlink" + xmlns="http://www.w3.org/2000/svg" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:dc="http://purl.org/dc/elements/1.1/"> + <defs + id="defs5870"> + <linearGradient + inkscape:collect="always" + id="linearGradient6166"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop6168" /> + <stop + style="stop-color:#66ba13;stop-opacity:1" + offset="1" + id="stop6170" /> + </linearGradient> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="24.999996" + x2="10.000471" + y1="24.999996" + x1="8.8586321" + id="linearGradient3811" + xlink:href="#linearGradient3805" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="13.072449" + x2="15.5" + y1="0.10591315" + x1="15.5" + id="linearGradient3173" + xlink:href="#linearGradient3167" + inkscape:collect="always" /> + <linearGradient + gradientUnits="userSpaceOnUse" + y2="15.460861" + x2="11.313708" + y1="10.041267" + x1="11.313708" + id="linearGradient3142" + xlink:href="#linearGradient3136" + inkscape:collect="always" /> + <linearGradient + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientTransform="matrix(1,0,0,1.019549,-31.40102,-3.714102)" + gradientUnits="userSpaceOnUse" + id="linearGradient3122" + xlink:href="#linearGradient3124" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.884616,2.431162,6.557698)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3095" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + gradientTransform="matrix(0.876811,0,0,0.937062,2.431162,6.381118)" + y2="38.184418" + x2="19.293913" + y1="14.866997" + x1="19.293913" + gradientUnits="userSpaceOnUse" + id="linearGradient3093" + xlink:href="#linearGradient3058" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3058" + inkscape:collect="always"> + <stop + id="stop3060" + offset="0" + style="stop-color:#fafaf9;stop-opacity:1;" /> + <stop + id="stop3062" + offset="1" + style="stop-color:#ececec;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + id="linearGradient3124"> + <stop + style="stop-color:#fafaf9;stop-opacity:1;" + offset="0" + id="stop3126" /> + <stop + style="stop-color:#d7d7d7;stop-opacity:1" + offset="1" + id="stop3128" /> + </linearGradient> + <linearGradient + id="linearGradient3136" + inkscape:collect="always"> + <stop + id="stop3138" + offset="0" + style="stop-color:#ef2929;stop-opacity:1" /> + <stop + id="stop3140" + offset="1" + style="stop-color:#ba0000;stop-opacity:1" /> + </linearGradient> + <linearGradient + id="linearGradient3167" + inkscape:collect="always"> + <stop + id="stop3169" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3171" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + y2="609.5199" + x2="512.28497" + y1="365.21631" + x1="512.28497" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + gradientUnits="userSpaceOnUse" + id="linearGradient3255" + xlink:href="#linearGradient5048" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5048"> + <stop + id="stop5050" + offset="0" + style="stop-color:black;stop-opacity:0;" /> + <stop + style="stop-color:black;stop-opacity:1;" + offset="0.5" + id="stop5056" /> + <stop + id="stop5052" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="488.07959" + fx="602.65948" + cy="488.07959" + cx="602.65948" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3257" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient5060" + inkscape:collect="always"> + <stop + id="stop5062" + offset="0" + style="stop-color:black;stop-opacity:1;" /> + <stop + id="stop5064" + offset="1" + style="stop-color:black;stop-opacity:0;" /> + </linearGradient> + <radialGradient + r="117.14286" + fy="486.64789" + fx="605.71429" + cy="486.64789" + cx="605.71429" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + gradientUnits="userSpaceOnUse" + id="radialGradient3259" + xlink:href="#linearGradient5060" + inkscape:collect="always" /> + <linearGradient + id="linearGradient3805" + inkscape:collect="always"> + <stop + id="stop3807" + offset="0" + style="stop-color:white;stop-opacity:1;" /> + <stop + id="stop3809" + offset="1" + style="stop-color:white;stop-opacity:0;" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient6126" + gradientUnits="userSpaceOnUse" + x1="15.5" + y1="0.10591315" + x2="15.5" + y2="13.072449" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3136" + id="linearGradient6131" + gradientUnits="userSpaceOnUse" + x1="11.313708" + y1="10.041267" + x2="11.313708" + y2="15.460861" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3805" + id="linearGradient6134" + gradientUnits="userSpaceOnUse" + x1="8.8586321" + y1="24.999996" + x2="10.000471" + y2="24.999996" + gradientTransform="translate(-19.999995,-21)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3124" + id="linearGradient6137" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1,0,0,1.019549,-51.401015,-24.714102)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6142" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.56179943,0,0,0.65507342,2.1758649,5.3084907)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3058" + id="linearGradient6146" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.59108158,0,0,0.61596522,1.4567103,5.2742774)" + x1="19.293913" + y1="14.866997" + x2="19.293913" + y2="38.184418" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5048" + id="linearGradient6152" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(3.659125,0,0,1.892176,-1492.258,-825.6305)" + x1="512.28497" + y1="365.21631" + x2="512.28497" + y2="609.5199" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6154" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(2.746819,0,0,1.900281,-941.7278,-828.6181)" + cx="602.65948" + cy="488.07959" + fx="602.65948" + fy="488.07959" + r="117.14286" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient6156" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(-2.74682,0,0,1.900281,602.2346,-828.6181)" + cx="605.71429" + cy="486.64789" + fx="605.71429" + fy="486.64789" + r="117.14286" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient6166" + id="linearGradient6172" + x1="21.213203" + y1="14.47671" + x2="30.598438" + y2="16.501608" + gradientUnits="userSpaceOnUse" + gradientTransform="translate(0,1)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3122-3" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.587733,0,0,0.453793,18.035612,-0.8400137)" + x1="17.725422" + y1="3.860764" + x2="27.055439" + y2="24.431168" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3223" + id="linearGradient3229" + x1="24.000008" + y1="31.785711" + x2="30.00001" + y2="38.499996" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.514307,0,0,0.531053,19.823682,-9.4929857)" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3223"> + <stop + style="stop-color:#729fcf;stop-opacity:1;" + offset="0" + id="stop3225" /> + <stop + style="stop-color:#396ea7;stop-opacity:1" + offset="1" + id="stop3227" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3957" + x1="16" + y1="2" + x2="32.927006" + y2="31.587952" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.725295,0,0,0.682879,14.70918,-5.7835017)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3118" + x1="24.260687" + y1="2.5335035" + x2="24.832115" + y2="22.012075" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.3305,0,0,0.44295568,21.489561,-6.2673639)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3128" + id="radialGradient3221" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.764705,0,0,0.71453,13.788265,-15.699922)" + cx="21.142859" + cy="22.17857" + fx="21.142859" + fy="22.17857" + r="9" /> + <linearGradient + id="linearGradient3128" + inkscape:collect="always"> + <stop + id="stop3130" + offset="0" + style="stop-color:#fef291;stop-opacity:1" /> + <stop + id="stop3132" + offset="1" + style="stop-color:#edd400;stop-opacity:1" /> + </linearGradient> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient3167" + id="linearGradient3115" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.909689,0,0,0.916448,10.32612,-10.167823)" + x1="16" + y1="2" + x2="38.465416" + y2="42.405006" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3113" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,15.580708,-9.6922277)" /> + <linearGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="linearGradient3116" + x1="15.571428" + y1="29.99917" + x2="15.571428" + y2="42.285942" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(0.721659,0,0,0.722208,14.137391,-9.6922277)" /> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient3103" + id="radialGradient3117" + gradientUnits="userSpaceOnUse" + gradientTransform="matrix(1.451479,0,0,1.326922,2.017389,-23.693285)" + cx="16.488304" + cy="23.537582" + fx="16.488304" + fy="23.537582" + r="19" /> + <linearGradient + inkscape:collect="always" + id="linearGradient3103"> + <stop + style="stop-color:#73d216;stop-opacity:1" + offset="0" + id="stop3105" /> + <stop + style="stop-color:#4e9a06;stop-opacity:1" + offset="1" + id="stop3107" /> + </linearGradient> + <radialGradient + inkscape:collect="always" + xlink:href="#linearGradient5060" + id="radialGradient3127" + cx="23.991123" + cy="44.514973" + fx="23.991123" + fy="44.514973" + r="20.85965" + gradientTransform="matrix(0.663335,0,0,0.11651846,16.39013,16.634124)" + gradientUnits="userSpaceOnUse" /> + </defs> + <sodipodi:namedview + id="base" + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1.0" + inkscape:pageopacity="0.0" + inkscape:pageshadow="2" + inkscape:zoom="15.556349" + inkscape:cx="27.159329" + inkscape:cy="13.820724" + inkscape:current-layer="layer3" + showgrid="true" + inkscape:document-units="px" + inkscape:grid-bbox="true" + inkscape:window-width="1920" + inkscape:window-height="998" + inkscape:window-x="0" + inkscape:window-y="0" + width="32px" + height="32px" + inkscape:pagecheckerboard="0" + inkscape:snap-midpoints="false" + inkscape:window-maximized="1" /> + <metadata + id="metadata5873"> + <rdf:RDF> + <cc:Work + rdf:about=""> + <dc:format>image/svg+xml</dc:format> + <dc:type + rdf:resource="http://purl.org/dc/dcmitype/StillImage" /> + </cc:Work> + </rdf:RDF> + </metadata> + <g + inkscape:groupmode="layer" + id="layer3" + inkscape:label="Layer 2" + style="display:inline"> + <g + id="g1986" + transform="translate(-16.141218,6.6790471)"> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.2;fill:url(#radialGradient3127);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.680165;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3119" + cx="32.304283" + cy="21.820944" + rx="13.836936" + ry="2.4305375" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#radialGradient3117);fill-opacity:1;fill-rule:nonzero;stroke:#4e9a06;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 32.141219,4.8904253 c -7.049193,0 -13.500009,3.835561 -13.500009,6.3188637 0,1.155559 4.584884,0.493656 4.743246,1.507343 l 1.140204,7.919377 c 0,0.757614 0.388002,1.350953 0.889358,1.350953 4.569936,1.213496 9.058209,1.195698 13.431596,0 0.501357,0 0.912162,-0.59334 0.912162,-1.350953 l 1.140204,-7.919377 c 0.210487,-0.853968 4.743247,-0.351784 4.743246,-1.507343 0,-2.4833027 -6.450816,-6.3188637 -13.500007,-6.3188637 z" + id="rect2193" + sodipodi:nodetypes="csccccccsc" /> + <path + style="opacity:0.137778;fill:url(#linearGradient3116);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" + d="m 23.518953,11.97401 c 0.780596,0.05418 2.242934,0.630826 2.886634,0 -1.338424,0.85311 -0.630016,6.411993 -1.288676,9.233943 -0.532636,-3.078224 -0.922989,-8.149915 -1.597958,-9.233943 z" + id="path2203" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3092" + d="m 40.838758,11.97401 c -0.780597,0.05418 -2.242935,0.630826 -2.886634,0 1.338424,0.85311 0.630015,6.411993 1.288675,9.233943 0.532636,-3.078224 0.922989,-8.149915 1.597959,-9.233943 z" + style="opacity:0.137778;fill:url(#linearGradient3113);fill-opacity:1;fill-rule:evenodd;stroke:none;stroke-width:1px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:1" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path2200" + d="m 32.158614,5.8904263 c -6.605188,0 -12.944748,3.963519 -12.494797,5.1944347 0.0621,0.169878 3.538484,-0.554632 4.697025,1.001379 l 0.970742,7.596179 c 0,0.709955 0.05378,1.473666 0.523552,1.473665 4.393355,0.996408 8.581636,0.961641 12.585588,0 0.469778,0 0.54492,-0.556016 0.544921,-1.265968 l 1.020126,-7.701444 C 41.314167,10.78233 44.449242,11.663176 44.550148,10.877165 44.739457,9.4025453 38.763803,5.8904263 32.158614,5.8904263 Z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3115);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:#000000;fill-opacity:0.0593608;fill-rule:nonzero;stroke:#ffffff;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:0.423529;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path2201" + cx="32.141212" + cy="8.8904352" + rx="3.4999976" + ry="3.0000017" /> + <path + style="fill:url(#radialGradient3221);fill-opacity:1;stroke:#c4a000;stroke-width:1;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1" + d="m 32.141204,-5.1095754 c -3.590048,0 -6.499998,2.7209313 -6.499998,6.0735054 0,2.1426933 1.186771,4.0280503 2.982131,5.1094643 1.172036,1.248458 0.650108,0.840347 0.841399,2.370773 0,0.405659 0.354458,0.736858 0.788599,0.736858 1.39175,0.9976727 2.632324,0.8925797 3.775735,0 0.434144,0 0.788603,-0.3312 0.788603,-0.736858 0.227694,-1.498063 -0.101585,-1.307904 0.735074,-2.308082 1.854678,-1.070257 3.088455,-2.98744 3.088455,-5.1721553 0,-3.3525741 -2.909951,-6.0735054 -6.499998,-6.0735054 z" + id="path2159" + sodipodi:nodetypes="csccccccsc" /> + <ellipse + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3118);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:0.345338;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="path3110" + transform="matrix(1,0,-0.46540548,0.88509759,0,0)" + cx="29.068079" + cy="-0.68871218" + rx="1.4021927" + ry="2.2596366" /> + <path + sodipodi:nodetypes="csccccccsc" + id="path3941" + d="m 32.116262,-4.1095724 c -3.023951,0 -5.475048,2.3853009 -5.475048,5.3243292 0,1.8783895 1.092749,3.2467945 2.786018,4.4788535 0.987223,1.094462 0.623644,0.945094 0.698178,2.09035 0,0.35562 0.125492,0.464838 0.491178,0.464838 1.024539,0.871317 2.075143,0.84879 3.059684,-0.02841 0.365688,0 0.399768,-0.159214 0.399768,-0.514834 0.12754,-1.483697 0.198657,-1.305328 0.903386,-2.182131 1.562225,-0.938238 2.611886,-2.393443 2.611886,-4.3086695 0,-2.9390291 -2.451098,-5.3243292 -5.47505,-5.3243292 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3957);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient3229);fill-opacity:1;fill-rule:nonzero;stroke:#3465a4;stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 29.147323,6.4231053 c 0.238053,0.410672 0.240436,0.834421 0.369974,1.944893 0,0.427101 0.344243,0.775541 0.770836,0.775541 1.367536,1.0504037 2.593002,0.9397567 3.716519,0 0.426591,0 0.824866,-0.335073 0.824866,-0.762172 0.146984,-1.036197 0.204956,-1.69938 0.359553,-2.060622 l -1.048792,0.603815 h -3.960042 z" + id="rect3216" + sodipodi:nodetypes="ccccccccc" /> + <path + sodipodi:nodetypes="ccccccc" + id="path3118" + d="m 30.641208,8.0018903 0.03177,0.459128 0.295739,-3.71e-4 c 1.07472,0.727125 1.733875,0.396194 2.366231,-0.003 l 0.2301,-2.87e-4 0.07617,-0.455504 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:nonzero;stroke:url(#linearGradient3122-3);stroke-width:1;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + </g> + <g + id="layer1" + inkscape:label="Layer 1" + inkscape:groupmode="layer" + style="display:inline"> + <g + id="g1669" + transform="translate(0.35734084,-1.1273619)"> + <g + style="display:inline;opacity:0.615721" + transform="matrix(0.01171965,0,0,0.01156799,17.632051,28.016284)" + id="g3197"> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402062;fill:url(#linearGradient6152);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + id="rect3199" + width="1766.8337" + height="459.52847" + x="-1053.1652" + y="-131.86813" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6154);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" + d="m 713.66862,-131.86814 c 0,0 0,461.47139 0,461.47139 141.45436,0.86871 341.96798,-103.39233 341.96788,-230.765396 0,-127.373088 -157.85248,-230.705984 -341.96788,-230.705994 z" + id="path3201" + sodipodi:nodetypes="cccc" /> + <path + sodipodi:nodetypes="cccc" + id="path3203" + d="m -1053.1653,-131.86814 c 0,0 0,461.47139 0,461.47139 -141.4545,0.86871 -341.968,-103.39232 -341.968,-230.765395 0,-127.373086 157.8525,-230.705975 341.968,-230.705995 z" + style="color:#000000;display:inline;overflow:visible;visibility:visible;opacity:0.402;fill:url(#radialGradient6156);fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;stroke-linecap:round;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none" /> + </g> + <rect + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6146);fill-opacity:1;fill-rule:evenodd;stroke:#555753;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + id="rect3056" + width="24.234327" + height="16.015079" + x="3.5254958" + y="13.589798" + rx="1.8042489" + ry="1.7884865" /> + <path + sodipodi:nodetypes="ccc" + id="path3090" + d="M 3.8210368,28.908582 15.369508,19.733056 27.429803,28.777912" + style="fill:none;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-opacity:0.405405" /> + <path + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:url(#linearGradient6142);fill-opacity:1;fill-rule:evenodd;stroke:#888a85;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" + d="m 4.423063,14.479525 10.349206,9.539681 c 0.362537,0.27982 0.761136,0.376115 1.252526,1.69e-4 l 10.837459,-9.394603" + id="path3066" + sodipodi:nodetypes="cccc" /> + <rect + ry="0.87882441" + rx="0.8865695" + y="14.479525" + x="4.4230633" + height="14.235625" + width="22.43919" + id="rect3086" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + <path + sodipodi:nodetypes="cccc" + id="path3790" + d="m 5.3206308,14.479525 9.7804342,8.555689 c 0.564324,-0.02892 0.408905,0.231125 0.860986,-0.114235 l 10.002635,-8.308024" + style="color:#000000;display:inline;overflow:visible;visibility:visible;fill:none;fill-opacity:1;fill-rule:evenodd;stroke:#ffffff;stroke-width:0.893639px;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;marker:none;marker-start:none;marker-mid:none;marker-end:none;enable-background:accumulate" /> + </g> + </g> +</svg> ===================================== gajim/gtk/notification.py ===================================== @@ -133,7 +133,7 @@ def _on_notification(self, event): icon_name = event.icon_name else: icon_name = NOTIFICATION_ICONS.get( - notif_detail, 'mail-message-new') + notif_detail, 'mail-unread') self._issue_notification( event.notif_type, ===================================== gajim/gtk/status_icon.py ===================================== @@ -94,7 +94,7 @@ def show_icon(self): self._status_icon.set_icon_theme_path( str(configpaths.get('ICONS'))) self._status_icon.set_attention_icon_full( - 'mail-unread', 'New Message') + 'dcraven-message-new', 'New Message') self._status_icon.set_status( appindicator.IndicatorStatus.ACTIVE) self._status_icon.set_menu(self._ui.systray_context_menu) @@ -132,11 +132,9 @@ def update_icon(self, *args, count=0): else: self._status_icon.set_visible(True) if count > 0: - icon_name = get_icon_name('event') + icon_name = 'dcraven-message-new' if HAS_INDICATOR: self._status_icon.set_icon_full(icon_name, _('Pending Event')) - self._status_icon.set_status( - appindicator.IndicatorStatus.ATTENTION) else: self._status_icon.set_visible(True) self._status_icon.set_from_icon_name(icon_name) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39ce54aa8855606bc84129258ab0b8c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/39ce54aa8855606bc84129258ab0b8c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 6 commits: ChatList: PM improvements
by Daniel Brötzmann (＠wurstsalat) 26 Oct '21

26 Oct '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 513ee4cc by wurstsalat at 2021-10-26T11:51:36+02:00 ChatList: PM improvements - - - - - e077f502 by wurstsalat at 2021-10-26T11:54:46+02:00 ChatListStack: Fix moving chats - - - - - ef60f0e7 by wurstsalat at 2021-10-26T12:13:59+02:00 ChatList: Fix search for Note to myself - - - - - ded742bb by wurstsalat at 2021-10-26T13:02:08+02:00 Status widgets: Don’t fail on deactivating account - - - - - e506f122 by wurstsalat at 2021-10-26T14:21:42+02:00 ReadMarkerRow: Update on nickname change - - - - - 39ce54aa by wurstsalat at 2021-10-26T18:45:27+02:00 ChatList: Improve sorting - - - - - 6 changed files: - gajim/gtk/chat_list.py - gajim/gtk/chat_list_stack.py - gajim/gtk/conversation/rows/read_marker.py - gajim/gtk/status_message_selector.py - gajim/gtk/status_selector.py - gajim/gui_menu_builder.py Changes: ===================================== gajim/gtk/chat_list.py ===================================== @@ -13,6 +13,7 @@ # along with Gajim. If not, see <http://www.gnu.org/licenses/>. import logging +import time from gi.repository import Gdk from gi.repository import GLib @@ -54,6 +55,10 @@ def __init__(self, workspace_id): self.set_sort_func(self._sort_func) self._set_placeholder() + self._mouseover = False + self.connect('enter-notify-event', self._on_mouse_focus_changed) + self.connect('leave-notify-event', self._on_mouse_focus_changed) + self.register_events([ ('account-enabled', ged.GUI2, self._on_account_changed), ('account-disabled', ged.GUI2, self._on_account_changed), @@ -112,7 +117,7 @@ def _filter_func(self, row): if not self._current_filter_text: return True text = self._current_filter_text.lower() - return text in row.contact.name.lower() + return text in row.contact_name.lower() @staticmethod def _header_func(row, before): @@ -141,19 +146,35 @@ def _header_func(row, before): else: row.header = None - @staticmethod - def _sort_func(row1, row2): + def _sort_func(self, row1, row2): + if self._mouseover: + log.debug('Mouseover active, don’t sort rows') + return 0 + + # Don’t sort pinned rows themselves if row1.is_pinned and row2.is_pinned: - # Don’t move pinned rows to top return 0 + + # Sort pinned rows to top if row1.is_pinned > row2.is_pinned: return -1 if row2.is_pinned > row1.is_pinned: return 1 - if row1.is_recent == row2.is_recent: - return 0 - return -1 if row1.is_recent else 1 + # Sort by timestamp + if row1.timestamp > row2.timestamp: + return -1 + if row2.timestamp > row1.timestamp: + return 1 + + def _on_mouse_focus_changed(self, _widget, event): + if event.type == Gdk.EventType.ENTER_NOTIFY: + self._mouseover = True + + if event.type == Gdk.EventType.LEAVE_NOTIFY: + if event.detail != Gdk.NotifyType.INFERIOR: + # Not hovering a Gtk.ListBoxRow (row is INFERIOR) + self._mouseover = False def _set_placeholder(self): button = Gtk.Button.new_with_label(_('Start Chat')) @@ -309,6 +330,7 @@ def _on_message_received(self, event): GLib.idle_add( row.set_message_text, event.msgtxt, event.additional_data) self._add_unread(row, event.properties) + self.invalidate_sort() def _on_message_sent(self, event): msgtext = event.message @@ -324,9 +346,12 @@ def _on_message_sent(self, event): else: nick = _('Me: ') row.set_nick(nick) - row.set_timestamp(event.timestamp) + + # 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) + self.invalidate_sort() @staticmethod def _get_nick_for_received_message(event): @@ -388,7 +413,8 @@ def __init__(self, workspace_id, account, jid, type_, pinned): self.contact.connect('caps-update', self._on_avatar_update) self.contact.connect('avatar-update', self._on_avatar_update) - self._timestamp = None + self.contact_name = self.contact.name + self.timestamp = 0 self._unread_count = 0 self._pinned = pinned @@ -427,7 +453,7 @@ def __init__(self, workspace_id, account, jid, type_, pinned): 'muc_nick': line.contact_name}) self._ui.nick_label.show() - self._timestamp = line.time + self.timestamp = line.time uf_timestamp = get_uf_relative_time(line.time) self._ui.timestamp_label.set_text(uf_timestamp) @@ -497,11 +523,10 @@ def update_name(self): self._ui.name_label.set_text(f'{self.contact.name} ({muc_name})') return - own_jid = self._client.get_own_jid().bare - if self.jid == own_jid: - self._ui.name_label.set_text(_('Note to myself')) - else: - self._ui.name_label.set_text(self.contact.name) + self.contact_name = self.contact.name + if self.jid == self._client.get_own_jid().bare: + self.contact_name = _('Note to myself') + self._ui.name_label.set_text(self.contact_name) def update_account_identifier(self): account_class = app.css_config.get_dynamic_class(self.account) @@ -552,13 +577,12 @@ def _on_close_button_clicked(self, _button): GLib.Variant('as', [self.account, str(self.jid)])) def set_timestamp(self, timestamp): - self._timestamp = timestamp + self.timestamp = timestamp self.update_time() def update_time(self): - if self._timestamp is not None: - self._ui.timestamp_label.set_text( - get_uf_relative_time(self._timestamp)) + self._ui.timestamp_label.set_text( + get_uf_relative_time(self.timestamp)) def _update_unread(self): if self._unread_count < 1000: ===================================== gajim/gtk/chat_list_stack.py ===================================== @@ -17,6 +17,8 @@ from gi.repository import Gio from gi.repository import GLib +from nbxmpp import JID + from gajim.common import app from gajim.gui.chat_list import ChatList @@ -193,6 +195,7 @@ def _toggle_chat_pinned(self, _action, param): def _move_chat_to_workspace(self, _action, param): new_workspace_id, account, jid = param.unpack() + jid = JID.from_string(jid) current_chatlist = self.get_visible_child() type_ = current_chatlist.get_chat_type(account, jid) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -27,6 +27,8 @@ def __init__(self, account, contact): self.type = 'read_marker' self.timestamp = datetime.fromtimestamp(0) + contact.connect('nickname-update', self._on_nickname_update) + text = _('%s has read up to this point') % contact.name self.label.set_text(text) self.label.set_halign(Gtk.Align.CENTER) @@ -36,6 +38,10 @@ def __init__(self, account, contact): self.grid.attach(self.label, 0, 0, 1, 1) self.set_no_show_all(True) + def _on_nickname_update(self, contact, _signal_name): + text = _('%s has read up to this point') % contact.name + self.label.set_text(text) + def set_timestamp(self, timestamp): self.timestamp = timestamp self.changed() ===================================== gajim/gtk/status_message_selector.py ===================================== @@ -65,6 +65,9 @@ def update(self, *args): if self._account is None: message = get_global_status_message() else: + if self._account not in app.connections: + return client = app.get_client(self._account) message = client.status_message + self._entry.set_text(message) ===================================== gajim/gtk/status_selector.py ===================================== @@ -104,21 +104,19 @@ def _on_change_status(self, button): self.update() def update(self, *args, **kwargs): - # if not app.connections: - # self.hide() - # return - - # self.show() - if self._account is not None: + if self._account is None: + show = get_global_show() + else: + if self._account not in app.connections: + return client = app.get_client(self._account) show = client.status - else: - show = get_global_show() - uf_show = get_uf_show(show) surface = get_show_circle( show, AvatarSize.SHOW_CIRCLE, self.get_scale_factor()) self._current_show_icon.set_from_surface(surface) + + uf_show = get_uf_show(show) if statuses_unified(): self._current_show_icon.set_tooltip_text(_('Status: %s') % uf_show) if not self._compact: ===================================== gajim/gui_menu_builder.py ===================================== @@ -392,8 +392,9 @@ def get_chat_list_row_menu(workspace_id, account, jid, pinned): ] 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 - not is_self_contact): + not is_self_contact and pm_with_jid): menu_items.append(('add-to-roster', _('Add to Contact List…'))) menu = Gio.Menu() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bea23cc5904715385df69dafc2153b2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/bea23cc5904715385df69dafc2153b2… 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 October 2021