Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][mainwindow] SingleMessageWindow: Rewrite
by Daniel Brötzmann 28 Mar '21

28 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: 6b288ff1 by wurstsalat at 2021-03-28T20:26:40+02:00 SingleMessageWindow: Rewrite - - - - - 6 changed files: - gajim/app_actions.py - gajim/common/helpers.py - gajim/data/gui/single_message_window.ui - gajim/gtk/single_message.py - gajim/gtk/statusicon.py - gajim/roster_window.py Changes: ===================================== gajim/app_actions.py ===================================== @@ -24,7 +24,6 @@ from gajim import dialogs from gajim.gui.dialogs import ShortcutsWindow -from gajim.gui.single_message import SingleMessageWindow from gajim.gui.about import AboutDialog from gajim.gui.history import HistoryWindow from gajim.gui.discovery import ServiceDiscoveryWindow @@ -88,7 +87,7 @@ def on_send_server_message(_action, param): account = param.get_string() server = app.settings.get_account_setting(account, 'hostname') server += '/announce/online' - SingleMessageWindow(account, server, 'send') + open_window('SingleMessageWindow', account=account, recipients=server) def on_service_disco(_action, param): @@ -118,7 +117,7 @@ def on_add_contact(_action, param): def on_single_message(_action, param): account = param.get_string() - open_window('SingleMessageWindow', account=account, action='send') + open_window('SingleMessageWindow', account=account) def on_merge_accounts(action, param): @@ -190,14 +189,14 @@ def on_set_motd(_action, param): account = param.get_string() server = app.settings.get_account_setting(account, 'hostname') server += '/announce/motd' - SingleMessageWindow(account, server, 'send') + open_window('SingleMessageWindow', account=account, recipients=server) def on_update_motd(_action, param): account = param.get_string() server = app.settings.get_account_setting(account, 'hostname') server += '/announce/motd/update' - SingleMessageWindow(account, server, 'send') + open_window('SingleMessageWindow', account=account, recipients=server) def on_delete_motd(_action, param): ===================================== gajim/common/helpers.py ===================================== @@ -442,28 +442,19 @@ def get_account_status(account): status = reduce_chars_newlines(account['status_line'], 100, 1) return status + def get_contact_dict_for_account(account): """ - Create a dict of jid, nick -> contact with all contacts of account. - + Creates a dict of jid -> contact with all contacts of account Can be used for completion lists """ contacts_dict = {} - for jid in app.contacts.get_jid_list(account): - contact = app.contacts.get_contact_with_highest_priority(account, jid) - contacts_dict[jid] = contact - name = contact.name - if name in contacts_dict: - contact1 = contacts_dict[name] - del contacts_dict[name] - contacts_dict['%s (%s)' % (name, contact1.jid)] = contact1 - contacts_dict['%s (%s)' % (name, jid)] = contact - elif contact.name: - if contact.name == app.get_nick_from_jid(jid): - del contacts_dict[jid] - contacts_dict[name] = contact + client = app.get_client(account) + for contact in client.get_module('Roster').iter_contacts(): + contacts_dict[str(contact.jid)] = contact return contacts_dict + def play_sound(event): if not app.settings.get('sounds_on'): return ===================================== gajim/data/gui/single_message_window.ui ===================================== @@ -1,145 +1,123 @@ <?xml version="1.0" encoding="UTF-8"?> - + <interface> - <requires lib="gtk+" version="3.22"/> - <object class="GtkImage" id="image1"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-reply-sender-symbolic</property> - </object> - <object class="GtkImage" id="image2"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-send-symbolic</property> - </object> - <object class="GtkImage" id="image3"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">mail-send-symbolic</property> - </object> - <object class="GtkImage" id="image4"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="icon_name">user-info-symbolic</property> - </object> + <requires lib="gtk+" version="3.24"/> <object class="GtkBox" id="box"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="border_width">18</property> + <property name="can-focus">False</property> <property name="orientation">vertical</property> + <property name="spacing">12</property> <child> - <object class="GtkGrid" id="send_grid"> +  + <object class="GtkGrid" id="message_grid"> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> + <property name="can-focus">False</property> + <property name="row-spacing">6</property> + <property name="column-spacing">12</property> <child> - <object class="GtkLabel" id="to_label"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">_To</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">to_entry</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">recipients_entry</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkEntry" id="to_entry"> + <object class="GtkEntry" id="recipients_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="hexpand">True</property> - <property name="placeholder_text" translatable="yes">user(a)example.org</property> + <property name="placeholder-text" translatable="yes">user(a)example.org</property> + <signal name="changed" handler="_on_changed" swapped="no"/> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> + <property name="left-attach">1</property> + <property name="top-attach">0</property> </packing> </child> <child> - <object class="GtkLabel" id="subject_label"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Su_bject</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">subject_entry</property> - <property name="single_line_mode">True</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">subject_entry</property> + <property name="single-line-mode">True</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> + <property name="left-attach">0</property> + <property name="top-attach">1</property> </packing> </child> <child> <object class="GtkEntry" id="subject_entry"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="placeholder_text" translatable="yes">Type the subject here...</property> - <property name="show_emoji_icon">True</property> + <property name="can-focus">True</property> + <property name="placeholder-text" translatable="yes">Type the subject here...</property> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - <property name="width">2</property> + <property name="left-attach">1</property> + <property name="top-attach">1</property> </packing> </child> <child> - <object class="GtkLabel" id="message_label_send"> + <object class="GtkLabel"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">_Message</property> - <property name="use_underline">True</property> - <property name="mnemonic_widget">message_textview</property> + <property name="use-underline">True</property> + <property name="mnemonic-widget">message_textview</property> <style> <class name="dim-label"/> </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> + <property name="left-attach">0</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkScrolledWindow" id="message_scrolledwindow"> - <property name="height_request">100</property> + <property name="height-request">100</property> <property name="visible">True</property> - <property name="can_focus">True</property> + <property name="can-focus">True</property> <property name="vexpand">True</property> - <property name="shadow_type">in</property> + <property name="shadow-type">in</property> <child> <object class="GtkTextView" id="message_textview"> <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="wrap_mode">word-char</property> - <property name="left_margin">6</property> - <property name="right_margin">6</property> - <property name="top_margin">6</property> - <property name="bottom_margin">6</property> + <property name="can-focus">True</property> + <property name="wrap-mode">word-char</property> + <property name="left-margin">6</property> + <property name="right-margin">6</property> + <property name="top-margin">6</property> + <property name="bottom-margin">6</property> </object> </child> </object> <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - <property name="width">2</property> + <property name="left-attach">1</property> + <property name="top-attach">2</property> </packing> </child> <child> <object class="GtkLabel" id="count_chars_label"> <property name="visible">True</property> - <property name="can_focus">False</property> + <property name="can-focus">False</property> <property name="halign">end</property> <property name="label" translatable="yes">Characters typed: 0</property> <style> @@ -147,24 +125,9 @@ </style> </object> <packing> - <property name="left_attach">0</property> - <property name="top_attach">3</property> - <property name="width">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="show_contact_info_button"> - <property name="visible">True</property> - <property name="sensitive">False</property> - <property name="can_focus">True</property> - <property name="receives_default">True</property> - <property name="tooltip_text" translatable="yes">Query Contact Info</property> - <property name="image">image4</property> - <signal name="clicked" handler="_on_contact_info_clicked" swapped="no"/> - </object> - <packing> - <property name="left_attach">2</property> - <property name="top_attach">0</property> + <property name="left-attach">0</property> + <property name="top-attach">3</property> + <property name="width">2</property> </packing> </child> </object> @@ -175,205 +138,29 @@ </packing> </child> <child> - <object class="GtkGrid" id="received_grid"> + <object class="GtkButton" id="send_button"> + <property name="label" translatable="yes">_Send</property> <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="no_show_all">True</property> - <property name="row_spacing">6</property> - <property name="column_spacing">12</property> - <child> - <object class="GtkLabel" id="from_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">_From</property> - <property name="use_underline">True</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subject_from_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Subject</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="from_entry_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><user(a)example.org></property> - <property name="xalign">0</property> - <style> - <class name="bold"/> - </style> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">0</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="subject_from_entry_label"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="label"><from Subject></property> - <property name="wrap">True</property> - <property name="max_width_chars">50</property> - <property name="xalign">0</property> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">1</property> - </packing> - </child> - <child> - <object class="GtkScrolledWindow" id="conversation_scrolledwindow"> - <property name="height_request">100</property> - <property name="visible">True</property> - <property name="can_focus">True</property> - <property name="hexpand">True</property> - <property name="vexpand">True</property> - <property name="shadow_type">in</property> - <child> - <placeholder/> - </child> - </object> - <packing> - <property name="left_attach">1</property> - <property name="top_attach">2</property> - </packing> - </child> - <child> - <object class="GtkLabel" id="message_label_received"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="halign">end</property> - <property name="label" translatable="yes">Message</property> - <style> - <class name="dim-label"/> - </style> - </object> - <packing> - <property name="left_attach">0</property> - <property name="top_attach">2</property> - </packing> - </child> - </object> - <packing> - <property name="expand">True</property> - <property name="fill">True</property> - <property name="position">1</property> - </packing> - </child> - <child> - <object class="GtkButtonBox"> - <property name="visible">True</property> - <property name="can_focus">False</property> - <property name="margin_top">12</property> - <property name="spacing">12</property> - <property name="layout_style">end</property> - <child> - <object class="GtkButton" id="close_button"> - <property name="label">_Close</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="no_show_all">True</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_close_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">0</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_button"> - <property name="label" translatable="yes">Sen_d</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="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Send message</property> - <property name="image">image2</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_send_clicked" swapped="no"/> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">2</property> - </packing> - </child> - <child> - <object class="GtkButton" id="reply_button"> - <property name="label" translatable="yes">_Reply</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="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Reply to this message</property> - <property name="image">image1</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_reply_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">3</property> - </packing> - </child> - <child> - <object class="GtkButton" id="send_and_close_button"> - <property name="label" translatable="yes">_Send & Close</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="no_show_all">True</property> - <property name="tooltip_text" translatable="yes">Send message and close window</property> - <property name="image">image3</property> - <property name="use_underline">True</property> - <signal name="clicked" handler="_on_send_and_close_clicked" swapped="no"/> - <style> - <class name="suggested-action"/> - </style> - </object> - <packing> - <property name="expand">False</property> - <property name="fill">False</property> - <property name="position">4</property> - </packing> - </child> + <property name="sensitive">False</property> + <property name="can-focus">True</property> + <property name="can-default">True</property> + <property name="receives-default">False</property> + <property name="tooltip-text" translatable="yes">Send message and close window</property> + <property name="halign">end</property> + <property name="use-underline">True</property> + <signal name="clicked" handler="_on_send_clicked" swapped="no"/> + <style> + <class name="suggested-action"/> + </style> </object> <packing> <property name="expand">False</property> <property name="fill">True</property> - <property name="padding">6</property> - <property name="position">4</property> + <property name="position">1</property> </packing> </child> + <style> + <class name="padding-18"/> + </style> </object> </interface> ===================================== gajim/gtk/single_message.py ===================================== @@ -12,76 +12,56 @@ # You should have received a copy of the GNU General Public License # along with Gajim. If not, see <http://www.gnu.org/licenses/>. -from typing import List # pylint: disable=unused-import - from gi.repository import Gdk -from gi.repository import GLib from gi.repository import Gtk -from gajim import vcard from gajim.common import app -from gajim.common import helpers +from gajim.common.helpers import get_contact_dict_for_account +from gajim.common.helpers import validate_jid from gajim.common.i18n import _ from gajim.common.structs import OutgoingMessage -from gajim.conversation_textview import ConversationTextview - from .dialogs import ErrorDialog from .util import get_builder -from .util import get_icon_name from .util import get_completion_liststore -from .util import move_window -from .util import resize_window +from .util import get_icon_name if app.is_installed('GSPELL'): from gi.repository import Gspell # pylint: disable=ungrouped-imports class SingleMessageWindow(Gtk.ApplicationWindow): - """ - SingleMessageWindow can send or show a received singled message depending on - action argument which can be 'send' or 'receive' - """ - def __init__(self, account, to='', action='', from_whom='', subject='', - message='', resource='', session=None): + def __init__(self, account, recipients=None): Gtk.ApplicationWindow.__init__(self) self.set_application(app.app) self.set_position(Gtk.WindowPosition.CENTER) self.set_show_menubar(False) - self.set_title(_('Send Single Message')) - self.set_name('SendSingleMessageWindow') + self.set_size_request(500, -1) + self.set_name('SingleMessageWindow') + self.account = account - self._action = action + self._client = app.get_client(account) + self._recipients = recipients + self._completion_dict = {} - self._subject = subject - self._message = message - self._to = to - self._from_whom = from_whom - self._resource = resource - self._session = session + if len(app.connections) > 1: + title = _('Single Message (%s)') % self.account + else: + title = _('Single Message') + self.set_title(title) self._ui = get_builder('single_message_window.ui') - self._message_tv_buffer = self._ui.message_textview.get_buffer() - self._conversation_textview = ConversationTextview( - account, used_in_history_window=True) - self._conversation_textview.tv.show() - self._conversation_textview.tv.set_left_margin(6) - self._conversation_textview.tv.set_right_margin(6) - self._conversation_textview.tv.set_top_margin(6) - self._conversation_textview.tv.set_bottom_margin(6) - self._ui.conversation_scrolledwindow.add( - self._conversation_textview.tv) + self._message_buffer = self._ui.message_textview.get_buffer() + self._message_buffer.connect('changed', self._update_char_counter) - self._message_tv_buffer.connect('changed', self._update_char_counter) - if isinstance(to, list): - jid = ', '.join([i[0].jid for i in to]) - self._ui.to_entry.set_text(jid) - else: - self._ui.to_entry.set_text(to) + if isinstance(recipients, list): + jids = ', '.join([contact.jid for contact in recipients]) + self._ui.recipients_entry.set_text(jids) + elif recipients is not None: + self._ui.recipients_entry.set_text(recipients) if (app.settings.get('use_speller') and - app.is_installed('GSPELL') and - action == 'send'): + app.is_installed('GSPELL')): lang = app.settings.get('speller_language') gspell_lang = Gspell.language_lookup(lang) if gspell_lang is None: @@ -94,245 +74,72 @@ def __init__(self, account, to='', action='', from_whom='', subject='', spell_view.set_inline_spell_checking(True) spell_view.set_enable_language_menu(True) - self._prepare_widgets_for(self._action) - - # set_text(None) raises TypeError exception - if self._subject is None: - self._subject = _('(No subject)') - self._ui.subject_entry.set_text(self._subject) - self._ui.subject_from_entry_label.set_text(self._subject) - - if to == '': - liststore = get_completion_liststore(self._ui.to_entry) - self._completion_dict = helpers.get_contact_dict_for_account( - account) - keys = sorted(self._completion_dict.keys()) - for jid in keys: - contact = self._completion_dict[jid] - status_icon = get_icon_name(contact.show) - liststore.append((status_icon, jid)) - else: - self._completion_dict = {} + liststore = get_completion_liststore(self._ui.recipients_entry) + self._completion_dict = get_contact_dict_for_account(account) + for jid, contact in self._completion_dict.items(): + icon_name = get_icon_name(contact.show.value) + liststore.append((icon_name, jid)) self.add(self._ui.box) - self.connect('delete-event', self._on_delete) - self.connect('destroy', self._on_destroy) - self.connect('key-press-event', self._on_key_press_event) + if self._recipients is not None: + self._ui.message_textview.grab_focus() - self._ui.to_entry.connect('changed', self._on_to_entry_changed) + self.connect('key-press-event', self._on_key_press_event) self._ui.connect_signals(self) - # get window position and size from config - resize_window(self, - app.settings.get('single-msg-width'), - app.settings.get('single-msg-height')) - move_window(self, - app.settings.get('single-msg-x-position'), - app.settings.get('single-msg-y-position')) - self.show_all() - def _set_cursor_to_end(self): - end_iter = self._message_tv_buffer.get_end_iter() - self._message_tv_buffer.place_cursor(end_iter) - - def _save_position(self): - # save the window size and position - x_pos, y_pos = self.get_position() - app.settings.set('single-msg-x-position', x_pos) - app.settings.set('single-msg-y-position', y_pos) - width, height = self.get_size() - app.settings.set('single-msg-width', width) - app.settings.set('single-msg-height', height) - - def _on_to_entry_changed(self, _widget): - entry = self._ui.to_entry.get_text() - is_empty = bool(not entry == '' and not ',' in entry) - self._ui.show_contact_info_button.set_sensitive(is_empty) - - def _prepare_widgets_for(self, action): - if len(app.connections) > 1: - if action == 'send': - title = _('Single Message using account %s') % self.account - else: - title = _('Single Message in account %s') % self.account - else: - title = _('Single Message') - - if action == 'send': # prepare UI for Sending - title = _('Send %s') % title - self._ui.send_button.show() - self._ui.send_and_close_button.show() - self._ui.reply_button.hide() - self._ui.close_button.hide() - - self._ui.send_grid.show() - self._ui.received_grid.hide() - - if self._message: # we come from a reply? - self._ui.show_contact_info_button.set_sensitive(True) - self._ui.message_textview.grab_focus() - self._message_tv_buffer.set_text(self._message) - GLib.idle_add(self._set_cursor_to_end) - else: # we write a new message (not from reply) - if self._to: # do we already have jid? - self._ui.subject_entry.grab_focus() - - elif action == 'receive': # prepare UI for Receiving - title = _('Received %s') % title - self._ui.reply_button.show() - self._ui.close_button.show() - self._ui.send_button.hide() - self._ui.send_and_close_button.hide() - self._ui.reply_button.grab_focus() - - self._ui.received_grid.show() - self._ui.send_grid.hide() - - if self._message: - self._conversation_textview.print_real_text(self._message) - fjid = self._from_whom - if self._resource: - fjid += '/' + self._resource - self._ui.from_entry_label.set_text(fjid) + def _on_key_press_event(self, _widget, event): + if event.keyval == Gdk.KEY_Escape: + self.destroy() - self.set_title(title) + def _on_changed(self, *args): + recipients = self._ui.recipients_entry.get_text() + begin, end = self._message_buffer.get_bounds() + message = self._message_buffer.get_text(begin, end, True) + self._ui.send_button.set_sensitive(recipients and message) def _update_char_counter(self, _widget): - characters_no = self._message_tv_buffer.get_char_count() + characters_no = self._message_buffer.get_char_count() self._ui.count_chars_label.set_text( _('Characters typed: %s') % str(characters_no)) + self._on_changed() - def _send_single_message(self): + def _on_send_clicked(self, _widget): if not app.account_is_available(self.account): - # if offline or connecting - ErrorDialog(_('Connection not available'), + ErrorDialog(_('Not Connected'), _('Please make sure you are connected with "%s".') % self.account) - return True - if isinstance(self._to, list): - sender_list = [] - for i in self._to: - if i[0].resource: - sender_list.append(i[0].jid + '/' + i[0].resource) - else: - sender_list.append(i[0].jid) - else: - sender_list = [j.strip() for j - in self._ui.to_entry.get_text().split(',')] + return + jids = self._ui.recipients_entry.get_text() subject = self._ui.subject_entry.get_text() - begin, end = self._message_tv_buffer.get_bounds() - message = self._message_tv_buffer.get_text(begin, end, True) + begin, end = self._message_buffer.get_bounds() + message = self._message_buffer.get_text(begin, end, True) recipient_list = [] - - for to_whom_jid in sender_list: - if to_whom_jid in self._completion_dict: - to_whom_jid = self._completion_dict[to_whom_jid].jid + for jid in jids.split(','): try: - to_whom_jid = helpers.parse_jid(to_whom_jid) - except helpers.InvalidFormat: + jid = validate_jid(jid.strip()) + except ValueError as err: ErrorDialog( - _('Invalid XMPP Address'), - _('It is not possible to send a message to %s, this ' - 'XMPP Address is not valid.') % to_whom_jid) - return True - - if '/announce/' in to_whom_jid: - con = app.connections[self.account] - con.get_module('Announce').set_announce( - to_whom_jid, subject, message) + _('Cannot Send Message'), + _('XMPP Address "%(jid)s" is invalid.\n%(error)s') % { + 'jid': jid, 'error': err}) + return + + if '/announce/' in str(jid): + self._client.get_module('Announce').set_announce( + jid, subject, message) continue - recipient_list.append(to_whom_jid) + recipient_list.append(jid) message = OutgoingMessage(account=self.account, contact=None, message=message, type_='normal', subject=subject) - con = app.connections[self.account] - con.send_messages(recipient_list, message) - - self._ui.subject_entry.set_text('') # we sent ok, clear the subject - self._message_tv_buffer.set_text('') # we sent ok, clear the textview - return False - - def _on_destroy(self, _widget): - contact = app.contacts.get_contact_with_highest_priority( - self.account, self._from_whom) - if not contact: - # Groupchat is maybe already destroyed - return - controls = app.interface.minimized_controls[self.account] - events = app.events.get_nb_roster_events(self.account, - self._from_whom, - types=['chat', 'normal']) - if (contact.is_groupchat and - self._from_whom not in controls and - self._action == 'receive' and - events == 0): - app.interface.roster.remove_groupchat(self._from_whom, self.account) - - def _on_delete(self, *args): - self._save_position() - - def _on_contact_info_clicked(self, _widget): - """ - Ask for vCard - """ - entry = self._ui.to_entry.get_text().strip() - - keys = sorted(self._completion_dict.keys()) - for key in keys: - contact = self._completion_dict[key] - if entry in key: - entry = contact.jid - break - - if entry in app.interface.instances[self.account]['infos']: - app.interface.instances[self.account]['infos'][entry].\ - window.present() - else: - contact = app.contacts.create_contact(jid=entry, - account=self.account) - app.interface.instances[self.account]['infos'][entry] = \ - vcard.VcardWindow(contact, self.account) - # Remove xmpp page - app.interface.instances[self.account]['infos'][entry].xml.\ - get_object('information_notebook').remove_page(0) - - def _on_close_clicked(self, _widget): - self._save_position() - self.destroy() - - def _on_send_clicked(self, _widget): - self._send_single_message() - - def _on_reply_clicked(self, _widget): - # we create a new blank window to send and we preset RE: and to jid - self._subject = _('RE: %s') % self._subject - self._message = _('%s wrote:\n') % self._from_whom + self._message - # add > at the beginning of each line - self._message = self._message.replace('\n', '\n> ') + '\n\n' + self._client.send_messages(recipient_list, message) self.destroy() - SingleMessageWindow(self.account, - to=self._from_whom, - action='send', - from_whom=self._from_whom, - subject=self._subject, - message=self._message, - session=self._session) - - def _on_send_and_close_clicked(self, _widget): - if self._send_single_message(): - return - self._save_position() - self.destroy() - - def _on_key_press_event(self, _widget, event): - if event.keyval == Gdk.KEY_Escape: # ESCAPE - self._save_position() - self.destroy() ===================================== gajim/gtk/statusicon.py ===================================== @@ -33,7 +33,6 @@ from .util import get_icon_name from .util import restore_roster_position from .util import open_window -from .single_message import SingleMessageWindow class StatusIcon: @@ -150,7 +149,7 @@ def set_img(self, *args): @staticmethod def _on_single_message(_widget, account): - SingleMessageWindow(account, action='send') + open_window('SingleMessageWindow', account=account) @staticmethod def _on_new_chat(_widget): ===================================== gajim/roster_window.py ===================================== @@ -67,7 +67,6 @@ from gajim.gui.dialogs import ErrorDialog from gajim.gui.dialogs import InputDialog from gajim.gui.dialogs import InformationDialog -from gajim.gui.single_message import SingleMessageWindow from gajim.gui.add_contact import AddNewContactWindow from gajim.gui.service_registration import ServiceRegistration from gajim.gui.discovery import ServiceDiscoveryWindow @@ -1877,9 +1876,10 @@ def open_event(self, account, jid, event): ft = app.interface.instances['file_transfers'] event = app.events.get_first_event(account, jid, event.type_) if event.type_ == 'normal': - SingleMessageWindow(account, jid, - action='receive', from_whom=jid, subject=event.subject, - message=event.message, resource=event.resource) + # TODO: Should be displayed as normal chat message + # SingleMessageWindow(account, jid, + # action='receive', from_whom=jid, subject=event.subject, + # message=event.message, resource=event.resource) app.events.remove_events(account, jid, event) return True @@ -2670,17 +2670,17 @@ def on_disconnect(self, widget, jid, account): ctrl.leave() self.remove_groupchat(jid, account) - def on_send_single_message_menuitem_activate(self, widget, account, + def on_send_single_message_menuitem_activate(self, _widget, account, contact=None): if contact is None: - SingleMessageWindow(account, action='send') + open_window('SingleMessageWindow', account=account) elif isinstance(contact, list): - SingleMessageWindow(account, contact, 'send') + open_window('SingleMessageWindow', account=account, + recipients=contact) else: jid = contact.jid - if contact.jid == app.get_jid_from_account(account): - jid += '/' + contact.resource - SingleMessageWindow(account, jid, 'send') + open_window('SingleMessageWindow', account=account, + recipients=jid) def on_send_file_menuitem_activate(self, widget, contact, account, resource=None): View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b288ff16bbfaf2d23bb15c978b4c18d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6b288ff16bbfaf2d23bb15c978b4c18d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 210 commits: Blocking: Adapt to nbxmpp changes
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 48619565 by lovetox at 2021-03-06T20:57:12+01:00 Blocking: Adapt to nbxmpp changes - - - - - a72b39b1 by André Apitzsch at 2021-03-13T08:06:46+01:00 Only convert domain name to ASCII IDNA is about domain name only, so ignore username, password and port. Fixes #10010. - - - - - 9df1cbcd by Daniel Brötzmann at 2021-03-16T11:15:35+01:00 Profile: Add translation hints for menu entries - - - - - 6f25997b by Daniel Brötzmann at 2021-03-16T11:17:07+01:00 DOAP: Add XEP-0106 - - - - - acc254fe by lovetox at 2021-03-18T21:31:10+01:00 Blocking: Convert JID to string - - - - - e7a02bd1 by lovetox at 2021-03-20T16:03:04+01:00 Roster: Handle missing avatar_sha Fixes #10428 - - - - - d7732dfa by Daniel Brötzmann at 2021-03-25T21:09:05+01:00 MessageInputTextView: Remove custom placeholder - - - - - fadc7596 by Daniel Brötzmann at 2021-03-25T21:09:09+01:00 MessageInputTextView: Add focus borders - - - - - 4e6a0ade by Daniel Brötzmann at 2021-03-26T16:37:07+01:00 MessageInputTextView: Improve style - - - - - b94cf37b by Ruslan Makhmatkhanov at 2021-03-28T14:34:23+02:00 Mention FreeBSD package in README - - - - - 3d01c77a by Ruslan Makhmatkhanov at 2021-03-28T14:37:44+02:00 Replace Windows line endings with Unix ones This change allows package maintainers to remove the dos2unix dependency in Gajim’s FreeBSD port. - - - - - 0c14e46d by lovetox at 2021-03-28T19:19:11+02:00 Start - - - - - a59e42d3 by lovetox at 2021-03-28T19:19:11+02:00 Disable CI - - - - - 266446b7 by lovetox at 2021-03-28T19:19:11+02:00 Really disable CI - - - - - c65b167d by lovetox at 2021-03-28T19:19:11+02:00 Add Workspace settings API - - - - - c33fd895 by lovetox at 2021-03-28T19:19:11+02:00 Store and Open chats - - - - - 71e6b7c6 by lovetox at 2021-03-28T19:19:11+02:00 Add remove_chat() - - - - - 1ce778cf by lovetox at 2021-03-28T19:19:11+02:00 Account Side Bar - - - - - 4a01f80e by lovetox at 2021-03-28T19:19:11+02:00 Add Workspace Side Bar - - - - - 5a48fe41 by wurstsalat at 2021-03-28T19:19:11+02:00 ChatList: Add basic elements - - - - - cb6fdef3 by wurstsalat at 2021-03-28T19:19:11+02:00 ChatListStack: Add Start Chat - - - - - 724fba90 by wurstsalat at 2021-03-28T19:19:11+02:00 Add basic Sidebar styling - - - - - 6a913c98 by wurstsalat at 2021-03-28T19:19:11+02:00 Improve styling for Sidebar and ChatList - - - - - 4379af41 by lovetox at 2021-03-28T19:19:11+02:00 Store chatlist on remove - - - - - d31e1864 by lovetox at 2021-03-28T19:19:11+02:00 Add/Remove Workspaces - - - - - 16566a5c by lovetox at 2021-03-28T19:19:11+02:00 Allow to add chats to different workspaces - - - - - 4eb1b483 by lovetox at 2021-03-28T19:19:11+02:00 Add transparent backgrounds - - - - - 1314bf20 by wurstsalat at 2021-03-28T19:19:11+02:00 AccountSideBar: Improve styling - - - - - 8bf6a475 by wurstsalat at 2021-03-28T19:19:11+02:00 WorkspaceSidebar: Improve styling - - - - - ce9ac984 by lovetox at 2021-03-28T19:19:11+02:00 Improve left sidebar - - - - - aaef8fc4 by lovetox at 2021-03-28T19:19:11+02:00 css - - - - - 0ada1e0d by lovetox at 2021-03-28T19:19:11+02:00 Dont fail when account is disabled - - - - - c0cf7a9d by lovetox at 2021-03-28T19:19:11+02:00 CSS - - - - - 3a7218b1 by wurstsalat at 2021-03-28T19:19:11+02:00 AvatarSelector: Add Load Image button - - - - - 1e2c885f by Daniel Brötzmann at 2021-03-28T19:19:11+02:00 Workspace: Add Workspace edit dialog - - - - - a0fd48dc by wurstsalat at 2021-03-28T19:19:11+02:00 Workspace: Add title and editing functionality - - - - - 4bba349d by wurstsalat at 2021-03-28T19:19:11+02:00 MainWindow: Add Paned for chat list and chat controls - - - - - fdd14817 by lovetox at 2021-03-28T19:19:11+02:00 Store type for open chats - - - - - 4afce1a5 by lovetox at 2021-03-28T19:19:11+02:00 Store workspace dialog settings - - - - - 6df401c7 by lovetox at 2021-03-28T19:19:11+02:00 Fix adding new Workspace - - - - - f55c7f17 by lovetox at 2021-03-28T19:19:11+02:00 Fix some selection bugs - - - - - 5c19b64e by Daniel Brötzmann at 2021-03-28T19:19:11+02:00 ChatListStack: Wrap in ScrolledWindow - - - - - 90e62b9b by lovetox at 2021-03-28T19:19:11+02:00 Move scrolled window into gui xml - - - - - e6305a4a by lovetox at 2021-03-28T19:19:11+02:00 sytle chatlist - - - - - 67c0b560 by wurstsalat at 2021-03-28T19:19:11+02:00 ChatList: Styling - - - - - 4b951f49 by wurstsalat at 2021-03-28T19:19:11+02:00 MainWindow: Styling - - - - - b4ae8d8a by wurstsalat at 2021-03-28T19:19:11+02:00 Accounts: Add basic account page - - - - - e8e8a98c by lovetox at 2021-03-28T19:19:11+02:00 Refactor Groupchats - - - - - 87748ecb by lovetox at 2021-03-28T19:19:11+02:00 Start Chat: Destroy after joining MUC - - - - - cfd85fbf by lovetox at 2021-03-28T19:21:11+02:00 Disable Roster - - - - - a0ed7192 by lovetox at 2021-03-28T19:21:11+02:00 Make quit work - - - - - 5212773f by lovetox at 2021-03-28T19:21:11+02:00 Stuff - - - - - 5103d0ac by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Add friendly timestamps - - - - - 86448078 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Unread counter styling - - - - - 94bf7b02 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Group chat avatars and message lines - - - - - a6048270 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 Paned: Improve ChatList resizing - - - - - 7f80b2c5 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Use groupchat name, improve ellipsizing - - - - - 9a3fd000 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Add group chat nicks - - - - - eaa9dbcd by lovetox at 2021-03-28T19:21:11+02:00 Remove unread_messages table - - - - - 794fb45f by lovetox at 2021-03-28T19:21:11+02:00 add unread cache - - - - - 903b7b6a by lovetox at 2021-03-28T19:21:11+02:00 Add notifications - - - - - 8aa98c72 by lovetox at 2021-03-28T19:21:11+02:00 Fix notifications - - - - - 464009c5 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Move ui to glade file - - - - - 705ff5c2 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Add RosterTooltip - - - - - e8fe1548 by lovetox at 2021-03-28T19:21:11+02:00 Move event handling to main - - - - - a973b9fc by lovetox at 2021-03-28T19:21:11+02:00 Fix some events - - - - - 3610c735 by lovetox at 2021-03-28T19:21:11+02:00 Reset unread counter - - - - - dc1e6d7b by lovetox at 2021-03-28T19:21:11+02:00 Fix more events - - - - - c492c75e by wurstsalat at 2021-03-28T19:21:11+02:00 WorkspaceSidebar: Add unread counter - - - - - e93c59bf by lovetox at 2021-03-28T19:21:11+02:00 Unread count improv - - - - - aeb5484f by lovetox at 2021-03-28T19:21:11+02:00 Add unread count to workspace - - - - - 40d36964 by lovetox at 2021-03-28T19:21:11+02:00 Dont allow chats to be opened multiple times - - - - - 76f2abd2 by lovetox at 2021-03-28T19:21:11+02:00 Don’t notify on messages from ourself - - - - - 7c173faf by lovetox at 2021-03-28T19:21:11+02:00 Use consistent jid attribute - - - - - bc78c8e4 by lovetox at 2021-03-28T19:21:11+02:00 Fix some events - - - - - e01631c4 by lovetox at 2021-03-28T19:21:11+02:00 Handle presence - - - - - e3682a7f by lovetox at 2021-03-28T19:21:11+02:00 Sort with activity - - - - - 6b159777 by lovetox at 2021-03-28T19:21:11+02:00 Save handle position - - - - - c2f596b5 by lovetox at 2021-03-28T19:21:11+02:00 Connect Menu actions - - - - - 1f2fcd8b by lovetox at 2021-03-28T19:21:11+02:00 Bring back more actions - - - - - a190a870 by lovetox at 2021-03-28T19:21:11+02:00 Fix transients - - - - - 573f81fd by lovetox at 2021-03-28T19:21:11+02:00 Make Private Chat work - - - - - 41b160bc by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Add avatar and name for PMs - - - - - ae3bc08e by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Show indicator for group chats - - - - - d3e914c3 by lovetox at 2021-03-28T19:21:11+02:00 New Contacts - - - - - cda5fcbb by wurstsalat at 2021-03-28T19:21:11+02:00 Add Workspace menu - - - - - 641f3778 by wurstsalat at 2021-03-28T19:21:11+02:00 WorkspaceSidebar: Add drag and drop - - - - - c3e3bbf0 by wurstsalat at 2021-03-28T19:21:11+02:00 Add update_workspace method - - - - - 926f9d46 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Set message nick, process message-sent event - - - - - 50a3e9d2 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Update time, improve close button - - - - - fcd263bc by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Add chatstate icon - - - - - 62fa95f1 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Improve chatstate icon - - - - - 1dcec3c7 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Add context menu and pinning - - - - - 51a9fc22 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Add basic list headers - - - - - c8667259 by wurstsalat at 2021-03-28T19:21:11+02:00 WorkspaceSidebar: Improve item highlighting - - - - - a8d62194 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Add move to workspace feature - - - - - edabe1a7 by wurstsalat at 2021-03-28T19:21:11+02:00 ChatList: Add placeholder - - - - - 7d6a815a by wurstsalat at 2021-03-28T19:21:11+02:00 Various improvements - - - - - 53f3260e by wurstsalat at 2021-03-28T19:21:11+02:00 ChatListStack: Fix moving group chats - - - - - 35a08ab2 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 Store pinned chats - - - - - e36e7dc3 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Improve sorting - - - - - 8b352894 by wurstsalat at 2021-03-28T19:21:11+02:00 WorkspaceDialog: Improvements - - - - - 77cc03f0 by lovetox at 2021-03-28T19:21:11+02:00 Make contacts module work - - - - - 9868ce7b by lovetox at 2021-03-28T19:21:11+02:00 further contacts - - - - - c5e18a74 by lovetox at 2021-03-28T19:21:11+02:00 Roster: add iter_contacts() - - - - - 4a0b13da by lovetox at 2021-03-28T19:21:11+02:00 Fix receipt processing - - - - - 25205042 by lovetox at 2021-03-28T19:21:11+02:00 Fix subscription check - - - - - 67b144f3 by lovetox at 2021-03-28T19:21:11+02:00 Chatlist: Remove tooltip - - - - - e4af019d by lovetox at 2021-03-28T19:21:11+02:00 Destroy roster correctly - - - - - 2d2ca7a1 by lovetox at 2021-03-28T19:21:11+02:00 Move finalize check to app module - - - - - 617e102c by lovetox at 2021-03-28T19:21:11+02:00 Settings: Add json encoder/decoder - - - - - 4ac55d40 by lovetox at 2021-03-28T19:21:11+02:00 Fix MUC rejoins - - - - - 93c1ac2b by lovetox at 2021-03-28T19:21:11+02:00 Refactor roster request code - - - - - 8ff4c0a6 by lovetox at 2021-03-28T19:21:11+02:00 Contacts: Fix access to roster attr - - - - - d82581f9 by lovetox at 2021-03-28T19:21:11+02:00 Add room-left signal - - - - - 71d79bef by lovetox at 2021-03-28T19:21:11+02:00 Fix muc user avatar update - - - - - 5826dc75 by lovetox at 2021-03-28T19:21:11+02:00 Fix private chat - - - - - c9528af9 by lovetox at 2021-03-28T19:21:11+02:00 Remove unused imports - - - - - 73c8f038 by lovetox at 2021-03-28T19:21:11+02:00 Remove unused events and methods - - - - - d08c3097 by lovetox at 2021-03-28T19:21:11+02:00 Fix status selector - - - - - 74827641 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 Profile: Fix missing client - - - - - afb510d1 by lovetox at 2021-03-28T19:21:11+02:00 Refactor Avatar clipping - - - - - 39d78c68 by lovetox at 2021-03-28T19:21:11+02:00 Groupchat: Restore got_disconnected() - - - - - 5bf69ac0 by wurstsalat at 2021-03-28T19:21:11+02:00 Workspaces: Fix menu, store moved chats - - - - - 8904994b by wurstsalat at 2021-03-28T19:21:11+02:00 AccountPage: Add basic roster - - - - - 7fa3b911 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Improvements - - - - - 79b60486 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 Improve AccountPage and Roster - - - - - 91aa4979 by Daniel Brötzmann at 2021-03-28T19:21:11+02:00 ChatList: Improve popover menu - - - - - 1371657e by lovetox at 2021-03-28T19:21:11+02:00 Fix Filter - - - - - 09016f97 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Add actions - - - - - 6f87c49e by lovetox at 2021-03-28T19:21:11+02:00 AddContact: Refactor - - - - - 2575e8f9 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Add filter menu, connect search - - - - - 2bc98dc1 by lovetox at 2021-03-28T19:21:11+02:00 Work on Roster - - - - - 173603ab by lovetox at 2021-03-28T19:21:11+02:00 Roster: Add events - - - - - f8fdf9bb by lovetox at 2021-03-28T19:21:11+02:00 Roster: Refactor - - - - - d7c1fe9f by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Implement filtering - - - - - c1ff8f0e by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Rename menu handlers - - - - - d5c70252 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Implement middle mouse click - - - - - 1597b3d0 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Open chat when activating row - - - - - 3fccf8fc by lovetox at 2021-03-28T19:21:11+02:00 Dont show empty groups when filtering - - - - - 21d9ae68 by wurstsalat at 2021-03-28T19:21:11+02:00 Roster: Implement drag and drop - - - - - 00466bbb by lovetox at 2021-03-28T19:21:11+02:00 Add high performance option for big rosters - - - - - 9777b547 by lovetox at 2021-03-28T19:21:11+02:00 JSONEncoder/Decoder: handle set - - - - - 5b35f615 by lovetox at 2021-03-28T19:21:11+02:00 Roster: add group methods - - - - - 2e4b041e by lovetox at 2021-03-28T19:21:11+02:00 Make dnd functional - - - - - 0011509b by lovetox at 2021-03-28T19:21:11+02:00 Roster: Fix removing contact - - - - - 52888fa0 by lovetox at 2021-03-28T19:24:11+02:00 Refactor Blocking - - - - - 92c4d728 by lovetox at 2021-03-28T19:24:12+02:00 Roster: Refactor - - - - - 13561a5f by lovetox at 2021-03-28T19:24:12+02:00 Roster: Fix reset - - - - - 64ccd866 by lovetox at 2021-03-28T19:24:12+02:00 Remove unused import - - - - - 8f99dfbc by lovetox at 2021-03-28T19:24:12+02:00 Fix leaving muc - - - - - bca3e1ef by lovetox at 2021-03-28T19:24:12+02:00 Add more leak checks - - - - - 9bb3dbd5 by lovetox at 2021-03-28T19:24:12+02:00 Save workspace order - - - - - 869dc48f by lovetox at 2021-03-28T19:24:12+02:00 Fix saving MUC avatar - - - - - d0f38cc5 by lovetox at 2021-03-28T19:24:12+02:00 MUC refactor Get rid of manager - - - - - 39b6899c by lovetox at 2021-03-28T19:24:12+02:00 Add methods for accessing resources - - - - - 99937979 by lovetox at 2021-03-28T19:24:12+02:00 Add get_show_circle() - - - - - d11cd81c by lovetox at 2021-03-28T19:24:12+02:00 Raise cache size - - - - - e883ceee by wurstsalat at 2021-03-28T19:24:12+02:00 Tooltips: Remove NotificationAreaTooltip - - - - - 224e1f7d by wurstsalat at 2021-03-28T19:24:12+02:00 Tooltips: Refactor - - - - - 0da31725 by wurstsalat at 2021-03-28T19:24:12+02:00 RosterTooltip: Add idle time - - - - - 3e2c6df6 by wurstsalat at 2021-03-28T19:24:12+02:00 RosterTooltip: Remove old idle time remnant - - - - - 7356b9a5 by wurstsalat at 2021-03-28T19:24:12+02:00 ChatList: Add Start Chat placeholder - - - - - 0d27c2c7 by wurstsalat at 2021-03-28T19:24:12+02:00 Tooltips: Reduce icon sizes - - - - - 2773a69d by wurstsalat at 2021-03-28T19:24:12+02:00 ChatList: Increase list header spacing - - - - - 595f411b by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 Main: Use popover menu - - - - - 4105ad58 by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 WorkspaceSidebar: Improve Add button styling - - - - - a6d3c24d by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 AccountSidebar: Improve icons - - - - - 51dfe4e6 by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 Improve style for account identifier bar - - - - - a73fab6a by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 WorkspaceSidebar: Add name to tooltip - - - - - c400a0c1 by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 ChatList: Improve headers - - - - - 38725232 by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 AccountPage: Add avatar and profile button - - - - - 265d25bb by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 ChatList: Implement Add to roster menu entry - - - - - 743cb41a by wurstsalat at 2021-03-28T19:24:12+02:00 StatusSelector: Use 'show circles' for icons - - - - - d63b476f by lovetox at 2021-03-28T19:24:12+02:00 Fix add to contact list - - - - - d808e798 by lovetox at 2021-03-28T19:24:12+02:00 Remove module mock - - - - - 37088591 by wurstsalat at 2021-03-28T19:24:12+02:00 WorkspaceSidebar: Attempt to fix icon position - - - - - 43ae6357 by lovetox at 2021-03-28T19:24:12+02:00 Fix GC menu - - - - - ee26ab2b by lovetox at 2021-03-28T19:24:12+02:00 add get_groups() - - - - - f20653dd by lovetox at 2021-03-28T19:24:12+02:00 more group functions - - - - - 024fe1d8 by lovetox at 2021-03-28T19:24:12+02:00 fix rename group - - - - - dccd42de by Daniel Brötzmann at 2021-03-28T19:24:12+02:00 Rework ContactInfo dialog - - - - - 6fc3298d by wurstsalat at 2021-03-28T19:24:12+02:00 Fix sending files from ChatControl menu - - - - - e9040064 by wurstsalat at 2021-03-28T19:24:12+02:00 ContactInfo: Handle timeout correctly - - - - - 9b5f0607 by wurstsalat at 2021-03-28T20:17:07+02:00 Chat Controls: Simplify usage of client - - - - - 4963f241 by wurstsalat at 2021-03-28T20:17:07+02:00 GroupChatInvite: Adapt to new contacts API - - - - - fe107c65 by lovetox at 2021-03-28T20:17:07+02:00 Simplify code - - - - - a7fd7c3c by lovetox at 2021-03-28T20:17:07+02:00 Get correct path - - - - - df55583b by lovetox at 2021-03-28T20:17:07+02:00 App: Force GC before checking if object is finalized - - - - - 9174804a by lovetox at 2021-03-28T20:17:07+02:00 Refactor EntityTime - - - - - aa9423b3 by lovetox at 2021-03-28T20:17:07+02:00 Refactor ContactInfo - - - - - 2692ff96 by lovetox at 2021-03-28T20:17:07+02:00 show chat stack page on select=True - - - - - 9e5f1a52 by wurstsalat at 2021-03-28T20:17:07+02:00 Add SubscriptionManager - - - - - 93973823 by lovetox at 2021-03-28T20:17:07+02:00 Remove obsolete methods - - - - - bf36774c by lovetox at 2021-03-28T20:17:07+02:00 Fix PresenceShow comparison - - - - - c06724ec by wurstsalat at 2021-03-28T20:17:07+02:00 ContactInfo: Adapt to contacts who are not in roster - - - - - ce810ae7 by wurstsalat at 2021-03-28T20:17:07+02:00 NotificationManager: Show unsubscribed event - - - - - 1996b079 by lovetox at 2021-03-28T20:17:07+02:00 Set allow_reply_func - - - - - ba1138b1 by lovetox at 2021-03-28T20:17:07+02:00 Convert JID - - - - - 7cfe15c7 by wurstsalat at 2021-03-28T20:17:07+02:00 GroupChatInvitation: Fix accepting invitation - - - - - 64d45566 by wurstsalat at 2021-03-28T20:17:07+02:00 AccountPage: Handle muc invite/decline - - - - - 27995cb5 by lovetox at 2021-03-28T20:17:07+02:00 Refactor Presence module - - - - - 14f3dd3b by wurstsalat at 2021-03-28T20:17:07+02:00 NotificationManager: Improve display - - - - - 5c0aff01 by Daniel Brötzmann at 2021-03-28T20:17:07+02:00 CSS: Remove obsolete style - - - - - 3dd49743 by wurstsalat at 2021-03-28T20:18:08+02:00 New ConversationView - - - - - 4b0c4908 by wurstsalat at 2021-03-28T20:18:08+02:00 ConversationTextview: Fix vertical size allocation - - - - - b97c4a60 by wurstsalat at 2021-03-28T20:18:08+02:00 ConversationView: Remove additional nickname characters - - - - - 0ad1a769 by lovetox at 2021-03-28T20:18:55+02:00 Lower hight of conversation rows - - - - - d7010ac8 by wurstsalat at 2021-03-28T20:18:55+02:00 Add new feather-more-horizontal-symbolic icons - - - - - 9dbf99f7 by lovetox at 2021-03-28T20:18:55+02:00 Better padding - - - - - 28 changed files: - − .gitlab-ci.yml - README.md - data/gajim.doap - gajim/app_actions.py - gajim/application.py - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/middleware.py - gajim/common/app.py - gajim/common/client.py - gajim/common/connection_handlers_events.py - gajim/common/const.py - gajim/common/contacts.py - gajim/common/helpers.py - gajim/common/modules/__init__.py - gajim/common/modules/base.py - gajim/common/modules/blocking.py - gajim/common/modules/bookmarks.py - gajim/common/modules/caps.py - gajim/common/modules/chat_markers.py - gajim/common/modules/chatstates.py - + gajim/common/modules/contacts.py - gajim/common/modules/discovery.py - gajim/common/modules/entity_time.py - gajim/common/modules/httpupload.py - gajim/common/modules/last_activity.py - gajim/common/modules/mam.py - gajim/common/modules/message.py The diff was not included because it is too large. View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f356401b8b02340d43599058f84d40c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f356401b8b02340d43599058f84d40c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Better padding
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: f356401b by lovetox at 2021-03-28T18:16:32+02:00 Better padding - - - - - 2 changed files: - gajim/data/style/gajim.css - gajim/gtk/conversation_view.py Changes: ===================================== gajim/data/style/gajim.css ===================================== @@ -36,8 +36,11 @@ } .conversation-row { - padding: 2px 3px 3px 6px; + padding: 10px 3px 4px 6px; } + +.merged { padding-top: 1px;} + .conversation-row grid textview { background: transparent; } ===================================== gajim/gtk/conversation_view.py ===================================== @@ -871,11 +871,13 @@ def update_avatar(self, avatar): def set_merged(self, merged): if merged: + self.get_style_context().add_class('merged') self._avatar_surface.set_no_show_all(True) self._avatar_surface.hide() self._meta_box.set_no_show_all(True) self._meta_box.hide() else: + self.get_style_context().remove_class('merged') self._avatar_surface.set_no_show_all(False) self._avatar_surface.show() self._meta_box.set_no_show_all(False) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f356401b8b02340d43599058f84d40c3… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/f356401b8b02340d43599058f84d40c3… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Add new feather-more-horizontal-symbolic icons
by Daniel Brötzmann 28 Mar '21

28 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: df0eac90 by wurstsalat at 2021-03-28T18:03:41+02:00 Add new feather-more-horizontal-symbolic icons - - - - - 3 changed files: - + gajim/data/icons/hicolor/16x16/devices/feather-more-horizontal-symbolic.symbolic.png - + gajim/data/icons/hicolor/32x32/devices/feather-more-horizontal-symbolic.symbolic.png - gajim/data/icons/hicolor/scalable/devices/feather-more-horizontal-symbolic.svg Changes: ===================================== gajim/data/icons/hicolor/16x16/devices/feather-more-horizontal-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/16x16/devices/feather-more-horizontal-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/32x32/devices/feather-more-horizontal-symbolic.symbolic.png ===================================== Binary files /dev/null and b/gajim/data/icons/hicolor/32x32/devices/feather-more-horizontal-symbolic.symbolic.png differ ===================================== gajim/data/icons/hicolor/scalable/devices/feather-more-horizontal-symbolic.svg ===================================== @@ -1 +1,68 @@ -<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal"><circle cx="12" cy="12" r="1"></circle><circle cx="19" cy="12" r="1"></circle><circle cx="5" cy="12" r="1"></circle></svg> \ No newline at end of file +<?xml version="1.0" encoding="UTF-8" standalone="no"?> +<svg + xmlns:dc="http://purl.org/dc/elements/1.1/" + xmlns:cc="http://creativecommons.org/ns#" + xmlns:rdf="http://www.w3.org/1999/02/22-rdf-syntax-ns#" + xmlns:svg="http://www.w3.org/2000/svg" + xmlns="http://www.w3.org/2000/svg" + xmlns:sodipodi="http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd" + xmlns:inkscape="http://www.inkscape.org/namespaces/inkscape" + width="16" + height="16" + viewBox="0 0 24 24" + fill="none" + stroke="currentColor" + stroke-width="2" + stroke-linecap="round" + stroke-linejoin="round" + class="feather feather-more-horizontal" + version="1.1" + id="svg8" + sodipodi:docname="feather-more-horizontal-symbolic.svg" + inkscape:version="1.0.2 (e86c870879, 2021-01-15)"> + <metadata + id="metadata14"> + <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> + <defs + id="defs12" /> + <sodipodi:namedview + pagecolor="#ffffff" + bordercolor="#666666" + borderopacity="1" + objecttolerance="10" + gridtolerance="10" + guidetolerance="10" + inkscape:pageopacity="0" + inkscape:pageshadow="2" + inkscape:window-width="1920" + inkscape:window-height="998" + id="namedview10" + showgrid="false" + inkscape:zoom="51.4375" + inkscape:cx="8" + inkscape:cy="8" + inkscape:window-x="0" + inkscape:window-y="0" + inkscape:window-maximized="1" + inkscape:current-layer="svg8" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 12 10 C 10.907275 10 10 10.907275 10 12 C 10 13.092725 10.907275 14 12 14 C 13.092725 14 14 13.092725 14 12 C 14 10.907275 13.092725 10 12 10 z " + id="circle2" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 19 10 C 17.907275 10 17 10.907275 17 12 C 17 13.092725 17.907275 14 19 14 C 20.092725 14 21 13.092725 21 12 C 21 10.907275 20.092725 10 19 10 z " + id="circle4" /> + <path + style="color:#000000;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;font-size:medium;line-height:normal;font-family:sans-serif;font-variant-ligatures:normal;font-variant-position:normal;font-variant-caps:normal;font-variant-numeric:normal;font-variant-alternates:normal;font-variant-east-asian:normal;font-feature-settings:normal;font-variation-settings:normal;text-indent:0;text-align:start;text-decoration:none;text-decoration-line:none;text-decoration-style:solid;text-decoration-color:#000000;letter-spacing:normal;word-spacing:normal;text-transform:none;writing-mode:lr-tb;direction:ltr;text-orientation:mixed;dominant-baseline:auto;baseline-shift:baseline;text-anchor:start;white-space:normal;shape-padding:0;shape-margin:0;inline-size:0;clip-rule:nonzero;display:inline;overflow:visible;visibility:visible;isolation:auto;mix-blend-mode:normal;color-interpolation:sRGB;color-interpolation-filters:linearRGB;solid-color:#000000;solid-opacity:1;vector-effect:none;fill:#000000;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-linecap:butt;stroke-linejoin:miter;stroke-miterlimit:4;stroke-dasharray:none;stroke-dashoffset:0;stroke-opacity:1;color-rendering:auto;image-rendering:auto;shape-rendering:auto;text-rendering:auto;enable-background:accumulate;stop-color:#000000;stop-opacity:1;opacity:1" + d="M 5 10 C 3.9072751 10 3 10.907275 3 12 C 3 13.092725 3.9072751 14 5 14 C 6.0927249 14 7 13.092725 7 12 C 7 10.907275 6.0927249 10 5 10 z " + id="circle6" /> +</svg> View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df0eac90ebe8a29092d23180273bc546… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/df0eac90ebe8a29092d23180273bc546… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Lower hight of conversation rows
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: c8eb3529 by lovetox at 2021-03-28T17:45:24+02:00 Lower hight of conversation rows - - - - - 3 changed files: - + gajim/data/icons/hicolor/scalable/devices/feather-more-horizontal-symbolic.svg - gajim/data/style/gajim.css - gajim/gtk/conversation_view.py Changes: ===================================== gajim/data/icons/hicolor/scalable/devices/feather-more-horizontal-symbolic.svg ===================================== @@ -0,0 +1 @@ +<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 24 24" fill="none" stroke="currentColor" stroke-width="2" stroke-linecap="round" stroke-linejoin="round" class="feather feather-more-horizontal"><circle cx="12" cy="12" r="1"></circle><circle cx="19" cy="12" r="1"></circle><circle cx="5" cy="12" r="1"></circle></svg> \ No newline at end of file ===================================== gajim/data/style/gajim.css ===================================== @@ -31,8 +31,12 @@ .chatcontrol-separator {margin-bottom: 5px;} +.conversation-row:hover button { + opacity: 1; +} + .conversation-row { - padding: 6px 3px 6px 6px; + padding: 2px 3px 3px 6px; } .conversation-row grid textview { background: transparent; @@ -691,3 +695,31 @@ popover.combo scrollbar.vertical { } messagedialog.confirmation-dialog > box { margin-top: 18px; } + + +.conversation-more-button { + padding-top: 0px; + padding-bottom:0px; + min-height: 16px; + opacity: 0; + transition: none; + border: none;} + +.conversation-more-button:checked { + opacity: 1; + background-image: none; +} + +.conversation-more-button:active { + background-image: none; +} + +.conversation-more-button:hover { + border: none; + transition: none; + -gtk-icon-effect: none; + -gtk-icon-shadow: none; + background-image: none; + text-shadow: none; + box-shadow: none; +} ===================================== gajim/gtk/conversation_view.py ===================================== @@ -41,6 +41,7 @@ from .util import format_fingerprint from .util import scroll_to_end from .util import text_to_color +from .util import get_cursor log = logging.getLogger('gajim.gui.conversation_view') @@ -707,7 +708,6 @@ def __init__(self, self._corrections = [] self._has_receipt = marker == 'received' self._has_displayed = marker == 'displayed' - self._button_icon = None if is_groupchat: if other_text_tags and 'marked' in other_text_tags: @@ -767,52 +767,12 @@ def __init__(self, bottom_box = Gtk.Box(spacing=6) bottom_box.add(self.textview) - bottom_box.add(self._create_more_button()) + bottom_box.add(MoreMenuButton(self)) self.grid.attach(avatar_placeholder, 0, 0, 1, 2) self.grid.attach(self._meta_box, 1, 0, 1, 1) self.grid.attach(bottom_box, 1, 1, 1, 1) - def _create_more_button(self): - more_button = Gtk.MenuButton() - more_button.connect( - 'enter-notify-event', self._on_more_button_enter) - more_button.connect( - 'leave-notify-event', self._on_more_button_leave) - more_button.set_valign(Gtk.Align.START) - more_button.set_halign(Gtk.Align.END) - self._button_icon = Gtk.Image.new_from_icon_name( - 'view-more-symbolic', Gtk.IconSize.BUTTON) - self._button_icon.set_no_show_all(True) - more_button.add(self._button_icon) - more_button.set_relief(Gtk.ReliefStyle.NONE) - - menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) - menu_box.get_style_context().add_class('padding-6') - - quote_button = Gtk.ModelButton() - quote_button.set_halign(Gtk.Align.START) - quote_button.connect('clicked', self._on_quote_message) - quote_button.set_label(_('Quote…')) - quote_button.set_image(Gtk.Image.new_from_icon_name( - 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) - menu_box.add(quote_button) - - copy_button = Gtk.ModelButton() - copy_button.set_halign(Gtk.Align.START) - copy_button.connect('clicked', self._on_copy_message) - copy_button.set_label(_('Copy')) - copy_button.set_image(Gtk.Image.new_from_icon_name( - 'edit-copy-symbolic', Gtk.IconSize.MENU)) - menu_box.add(copy_button) - - menu_box.show_all() - - popover = Gtk.PopoverMenu() - popover.add(menu_box) - more_button.set_popover(popover) - return more_button - def _on_copy_message(self, _widget): timestamp = self.timestamp.strftime('%x, %X') clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) @@ -822,13 +782,6 @@ def _on_copy_message(self, _widget): def _on_quote_message(self, _widget): self.get_parent().on_quote(self.textview.get_text()) - def _on_more_button_enter(self, _widget, _event): - self._button_icon.show() - - def _on_more_button_leave(self, widget, _event): - if not widget.get_active(): - self._button_icon.hide() - def _get_encryption_image(self, additional_data, encryption_enabled=None): details = self._get_encryption_details(additional_data) if details is None: @@ -971,3 +924,50 @@ def set_error_icon_visible(self, visible): def set_error_tooltip(self, text): self._error_image.set_tooltip_markup(text) + + +class MoreMenuButton(Gtk.MenuButton): + def __init__(self, row): + Gtk.MenuButton.__init__(self) + + self.connect_after('realize', self._on_realize) + + self.set_valign(Gtk.Align.START) + self.set_halign(Gtk.Align.END) + self.set_relief(Gtk.ReliefStyle.NONE) + image = Gtk.Image.new_from_icon_name( + 'feather-more-horizontal-symbolic', Gtk.IconSize.BUTTON) + self.add(image) + + self._create_popover(row) + + self.get_style_context().add_class('conversation-more-button') + + def _create_popover(self, row): + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + menu_box.get_style_context().add_class('padding-6') + + quote_button = Gtk.ModelButton() + quote_button.set_halign(Gtk.Align.START) + quote_button.connect('clicked', row._on_quote_message) + quote_button.set_label(_('Quote…')) + quote_button.set_image(Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + menu_box.add(quote_button) + + copy_button = Gtk.ModelButton() + copy_button.set_halign(Gtk.Align.START) + copy_button.connect('clicked', row._on_copy_message) + copy_button.set_label(_('Copy')) + copy_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-copy-symbolic', Gtk.IconSize.MENU)) + menu_box.add(copy_button) + + menu_box.show_all() + + popover = Gtk.PopoverMenu() + popover.add(menu_box) + self.set_popover(popover) + + def _on_realize(self, *args): + self.get_window().set_cursor(get_cursor('pointer')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8eb3529f74ca2b0b9e3cf55882596e2… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/c8eb3529f74ca2b0b9e3cf55882596e2… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: ConversationTextview: Fix vertical size allocation
by Daniel Brötzmann 28 Mar '21

28 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: c56dce99 by wurstsalat at 2021-03-28T16:45:41+02:00 ConversationTextview: Fix vertical size allocation - - - - - 8b27e0c3 by wurstsalat at 2021-03-28T16:50:00+02:00 ConversationView: Remove additional nickname characters - - - - - 2 changed files: - gajim/gtk/conversation_textview.py - gajim/gtk/conversation_view.py Changes: ===================================== gajim/gtk/conversation_textview.py ===================================== @@ -15,6 +15,7 @@ import logging from urllib.parse import quote +from gi.repository import GLib from gi.repository import GObject from gi.repository import Gtk from gi.repository import Pango @@ -210,6 +211,11 @@ def print_text(self, text, other_text_tags=None, kind=None, graphics=True, self.parse_formatting( text, text_tags, graphics=graphics, additional_data=additional_data) + # Queue a widget resize after the Textview has been populated. + # This prevents for example large allocations of vertial space (blank + # space after the text) for messages containing many line breaks. + GLib.idle_add(self.queue_resize) + def parse_formatting(self, text, text_tags, graphics=True, additional_data=None): ''' ===================================== gajim/gtk/conversation_view.py ===================================== @@ -556,16 +556,12 @@ def create_name_widget(name: str, kind: str, label.set_selectable(True) label.get_style_context().add_class('conversation-nickname') - # TODO: Maybe set default for 'after_nickname' to empty string - before_name = from_one_line(app.settings.get('before_nickname')) - after_name = from_one_line(app.settings.get('after_nickname')) - new_name = f'{before_name}{GLib.markup_escape_text(name)}{after_name}' - + name = GLib.markup_escape_text(name) if is_groupchat: rgba = Gdk.RGBA(*text_to_color(name)) nick_color = convert_rgba_to_hex(rgba) label.set_markup( - f'<span foreground="{nick_color}">{new_name}</span>') + f'<span foreground="{nick_color}">{name}</span>') else: if kind in ('incoming', 'incoming_queue'): label.get_style_context().add_class( @@ -573,7 +569,7 @@ def create_name_widget(name: str, kind: str, elif kind == 'outgoing': label.get_style_context().add_class( 'gajim-outgoing-nickname') - label.set_markup(new_name) + label.set_markup(name) return label View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7e9c7934f7a5c1d61e13eed2f0464d… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7e9c7934f7a5c1d61e13eed2f0464d… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: Mention FreeBSD package in README
by Daniel Brötzmann 28 Mar '21

28 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: b94cf37b by Ruslan Makhmatkhanov at 2021-03-28T14:34:23+02:00 Mention FreeBSD package in README - - - - - 3d01c77a by Ruslan Makhmatkhanov at 2021-03-28T14:37:44+02:00 Replace Windows line endings with Unix ones This change allows package maintainers to remove the dos2unix dependency in Gajim’s FreeBSD port. - - - - - 2 changed files: - README.md - gajim/plugins/plugins_i18n.py Changes: ===================================== README.md ===================================== @@ -43,6 +43,7 @@ #### Packages - [Debian](https://packages.debian.org/stable/gajim) - [Fedora](https://apps.fedoraproject.org/packages/gajim) - [Ubuntu](https://packages.ubuntu.com/gajim) +- [FreeBSD](https://www.freshports.org/net-im/gajim/) #### Flatpak ===================================== gajim/plugins/plugins_i18n.py ===================================== @@ -1,42 +1,42 @@ -# Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com> -# -# 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 locale -import gettext -from pathlib import Path - -from gajim.common import configpaths - -DOMAIN = 'gajim_plugins' -try: - plugin_user_dir = configpaths.get('PLUGINS_USER') -except KeyError: - # This allows to import the module for tests - print('No plugin translation path available') - plugin_user_dir = Path.cwd() - - -# python 3.7 gettext module does not support Path objects -plugins_locale_dir = str(plugin_user_dir / 'locale') - -try: - t = gettext.translation(DOMAIN, plugins_locale_dir) - _ = t.gettext -except OSError: - _ = gettext.gettext - -if hasattr(locale, 'bindtextdomain'): - locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore +# Copyright (C) 2010-2011 Denis Fomin <fominde AT gmail.com> +# +# 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 locale +import gettext +from pathlib import Path + +from gajim.common import configpaths + +DOMAIN = 'gajim_plugins' +try: + plugin_user_dir = configpaths.get('PLUGINS_USER') +except KeyError: + # This allows to import the module for tests + print('No plugin translation path available') + plugin_user_dir = Path.cwd() + + +# python 3.7 gettext module does not support Path objects +plugins_locale_dir = str(plugin_user_dir / 'locale') + +try: + t = gettext.translation(DOMAIN, plugins_locale_dir) + _ = t.gettext +except OSError: + _ = gettext.gettext + +if hasattr(locale, 'bindtextdomain'): + locale.bindtextdomain(DOMAIN, plugins_locale_dir) # type: ignore View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4e6a0ade1952975de67b0b10487420b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/4e6a0ade1952975de67b0b10487420b… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] New ConversationView
by Daniel Brötzmann 26 Mar '21

26 Mar '21

Daniel Brötzmann pushed to branch mainwindow at gajim / gajim Commits: e7e9c793 by wurstsalat at 2021-03-26T18:49:37+01:00 New ConversationView - - - - - 12 changed files: - gajim/chat_control.py - gajim/chat_control_base.py - gajim/command_system/implementation/middleware.py - gajim/common/const.py - gajim/common/storage/archive.py - gajim/data/gui/chat_control.ui - gajim/data/gui/groupchat_control.ui - gajim/data/style/gajim-dark.css - gajim/data/style/gajim.css - gajim/groupchat_control.py - + gajim/gtk/conversation_textview.py - + gajim/gtk/conversation_view.py Changes: ===================================== gajim/chat_control.py ===================================== @@ -209,8 +209,6 @@ def __init__(self, parent_win, jid, acct, session, resource=None): gui_menu_builder.get_encryption_menu( self.control_id, self._type, self.account == 'Local')) self.set_encryption_menu_icon() - # restore previous conversation - self.restore_conversation() self.msg_textview.grab_focus() # PluginSystem: adding GUI extension point for this ChatControl @@ -562,7 +560,7 @@ def _on_message_received(self, event): additional_data=event.additional_data) def _on_message_error(self, event): - self.conv_textview.show_error(event.message_id, event.error) + self.conversation_view.show_error(event.message_id, event.error) def _on_message_sent(self, event): if not event.message: @@ -589,10 +587,10 @@ def _on_message_sent(self, event): additional_data=event.additional_data) def _on_receipt_received(self, event): - self.conv_textview.show_receipt(event.receipt_id) + self.conversation_view.show_receipt(event.receipt_id) def _on_displayed_received(self, event): - self.conv_textview.show_displayed(event.marker_id) + self.conversation_view.set_read_marker(event.marker_id) def _nec_ping(self, event): if self.contact != event.contact: @@ -1177,62 +1175,6 @@ def _on_drag_data_received(self, widget, context, x, y, selection, [self.contact.jid], [dropped_jid]) - def restore_conversation(self): - jid = self.contact.jid - # number of messages that are in queue and are already logged, we want - # to avoid duplication - pending = len(app.events.get_events(self.account, jid, ['chat', 'pm'])) - if self.resource: - pending += len(app.events.get_events(self.account, - self.contact.get_full_jid(), - ['chat', 'pm'])) - - rows = app.storage.archive.get_last_conversation_lines( - self.account, jid, pending) - - local_old_kind = None - self.conv_textview.just_cleared = True - for row in rows: # time, kind, message, subject, additional_data - msg = row.message - additional_data = row.additional_data - if not msg: # message is empty, we don't print it - continue - if row.kind in (KindConstant.CHAT_MSG_SENT, - KindConstant.SINGLE_MSG_SENT): - kind = 'outgoing' - name = self.get_our_nick() - elif row.kind in (KindConstant.SINGLE_MSG_RECV, - KindConstant.CHAT_MSG_RECV): - kind = 'incoming' - name = self.contact.name - elif row.kind == KindConstant.ERROR: - kind = 'status' - name = self.contact.name - - tim = float(row.time) - - if row.subject: - msg = _('Subject: %(subject)s\n%(message)s') % \ - {'subject': row.subject, 'message': msg} - ChatControlBase.add_message(self, - msg, - kind, - name, - tim, - restored=True, - old_kind=local_old_kind, - additional_data=additional_data, - message_id=row.message_id, - marker=row.marker, - error=row.error) - if (row.message.startswith('/me ') or - row.message.startswith('/me\n')): - local_old_kind = None - else: - local_old_kind = kind - if rows: - self.conv_textview.print_empty_line() - def _on_convert_to_gc_menuitem_activate(self, _widget): """ User wants to invite some friends to chat ===================================== gajim/chat_control_base.py ===================================== @@ -25,6 +25,7 @@ import os import sys +import datetime import time import uuid import tempfile @@ -43,12 +44,12 @@ from gajim.common.i18n import _ from gajim.common.nec import EventHelper from gajim.common.helpers import AdditionalDataDict +from gajim.common.const import KindConstant from gajim.common.structs import OutgoingMessage from gajim import gtkgui_helpers -from gajim.conversation_textview import ConversationTextview - +from gajim.gui.conversation_view import ConversationView from gajim.gui.dialogs import DialogButton from gajim.gui.dialogs import ConfirmationDialog from gajim.gui.dialogs import PastePreviewDialog @@ -93,7 +94,7 @@ ################################################################################ class ChatControlBase(ChatCommandProcessor, CommandTools, EventHelper): """ - A base class containing a banner, ConversationTextview, MessageInputTextView + A base class containing a banner, ConversationView, MessageInputTextView """ _type = None # type: ControlType @@ -164,14 +165,16 @@ def __init__(self, parent_win, widget_name, jid, acct, Gdk.DragAction.COPY | Gdk.DragAction.MOVE) self.xml.overlay.drag_dest_set_target_list(dst_targets) - # Create textviews and connect signals - self.conv_textview = ConversationTextview(self.account) - - id_ = self.conv_textview.connect('quote', self.on_quote) - self.handlers[id_] = self.conv_textview - - self.conv_textview.tv.connect('key-press-event', - self._on_conv_textview_key_press_event) + # Create ConversationView and connect signals + self.conversation_view = ConversationView(self.account, self.contact) + id_ = self.conversation_view.connect('quote', self.on_quote) + self.handlers[id_] = self.conversation_view + id_ = self.conversation_view.connect( + 'load-history', self._on_load_history) + self.handlers[id_] = self.conversation_view + id_ = self.conversation_view.connect( + 'key-press-event', self._on_conversation_view_key_press) + self.handlers[id_] = self.conversation_view # This is a workaround: as soon as a line break occurs in Gtk.TextView # with word-char wrapping enabled, a hyphen character is automatically @@ -183,10 +186,18 @@ def __init__(self, parent_win, widget_name, jid, acct, hscrollbar = self.xml.conversation_scrolledwindow.get_hscrollbar() hscrollbar.hide() - self.xml.conversation_scrolledwindow.add(self.conv_textview.tv) - widget = self.xml.conversation_scrolledwindow.get_vadjustment() - widget.connect('changed', self.on_conversation_vadjustment_changed) + self.xml.conversation_scrolledwindow.add(self.conversation_view) + self._scrolled_old_upper = None + self._scrolled_old_value = None + self._scrolled_previous_value = 0 + + self._fetching_history = False + self._initial_fetch_done = False + vadjustment = self.xml.conversation_scrolledwindow.get_vadjustment() + vadjustment.connect( + 'changed', self._on_conversation_vadjustment_changed) + vadjustment.connect('value-changed', self._on_scroll_value_changed) vscrollbar = self.xml.conversation_scrolledwindow.get_vscrollbar() vscrollbar.connect('button-release-event', self._on_scrollbar_button_release) @@ -233,7 +244,6 @@ def __init__(self, parent_win, widget_name, jid, acct, # Attach speller self.set_speller() - self.conv_textview.tv.show() # For XEP-0172 self.user_nick = None @@ -251,7 +261,7 @@ def __init__(self, parent_win, widget_name, jid, acct, self.handlers[id_] = parent_win.window self.encryption = self.get_encryption_state() - self.conv_textview.encryption_enabled = self.encryption is not None + self.conversation_view.encryption_enabled = self.encryption is not None # PluginSystem: adding GUI extension point for ChatControlBase # instance object (also subclasses, eg. ChatControl or GroupchatControl) @@ -280,7 +290,7 @@ def process_event(self, event): method_name = f'_on_{method_name}' getattr(self, method_name)(event) - def _on_conv_textview_key_press_event(self, textview, event): + def _on_conversation_view_key_press(self, _listbox, event): if event.get_state() & Gdk.ModifierType.SHIFT_MASK: if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): return Gdk.EVENT_PROPAGATE @@ -292,12 +302,13 @@ def _on_conv_textview_key_press_event(self, textview, event): # focused). return Gdk.EVENT_PROPAGATE - if event.get_state() & COPY_MODIFIER: - # Don’t reroute the event if it is META + c and the - # textview has a selection - if event.hardware_keycode in KEYCODES_KEY_C: - if textview.get_buffer().props.has_selection: - return Gdk.EVENT_PROPAGATE + # if event.get_state() & COPY_MODIFIER: + # TODO + # # Don’t reroute the event if it is META + c and the + # # textview has a selection + # if event.hardware_keycode in KEYCODES_KEY_C: + # if textview.get_buffer().props.has_selection: + # return Gdk.EVENT_PROPAGATE if not self.msg_textview.get_sensitive(): # If the input textview is not sensitive it can’t get the focus. @@ -513,7 +524,7 @@ def delegate_action(self, action): return Gdk.EVENT_STOP if action == 'clear-chat': - self.conv_textview.clear() + self.conversation_view.clear() return Gdk.EVENT_STOP if action == 'delete-line': @@ -613,7 +624,7 @@ def _on_authentication_button_clicked(self, _button): def set_encryption_state(self, encryption): self.encryption = encryption - self.conv_textview.encryption_enabled = encryption is not None + self.conversation_view.encryption_enabled = encryption is not None self.contact.settings.set('encryption', self.encryption or '') def get_encryption_state(self): @@ -698,8 +709,7 @@ def shutdown(self): self.handlers[i].disconnect(i) self.handlers.clear() - self.conv_textview.del_handlers() - del self.conv_textview + del self.conversation_view del self.msg_textview del self.msg_scrolledwindow @@ -853,7 +863,7 @@ def _on_message_textview_key_press_event(self, textview, event): return True if event.keyval in (Gdk.KEY_Page_Down, Gdk.KEY_Page_Up): - self.conv_textview.tv.event(event) + self.conversation_view.event(event) self._on_scroll(None, event.keyval) return True @@ -1097,11 +1107,11 @@ def save_message(self, message, msg_type): self.received_history_pos = pos def add_info_message(self, text, message_id=None): - self.conv_textview.print_conversation_line( + self.conversation_view.add_message( text, 'info', '', None, message_id=message_id, graphics=False) def add_status_message(self, text): - self.conv_textview.print_conversation_line( + self.conversation_view.add_message( text, 'status', '', None) def add_message(self, @@ -1129,9 +1139,8 @@ def add_message(self, """ jid = self.contact.jid full_jid = self.get_full_jid() - textview = self.conv_textview end = False - if self.conv_textview.autoscroll or kind == 'outgoing': + if self.conversation_view.autoscroll or kind == 'outgoing': end = True if other_tags_for_name is None: @@ -1143,21 +1152,18 @@ def add_message(self, if additional_data is None: additional_data = AdditionalDataDict() - textview.print_conversation_line(text, - kind, - name, - tim, - other_tags_for_name, - other_tags_for_time, - other_tags_for_text, - subject, - old_kind, - displaymarking=displaymarking, - message_id=message_id, - correct_id=correct_id, - additional_data=additional_data, - marker=marker, - error=error) + self.conversation_view.add_message( + text, + kind, + name, + tim, + other_text_tags=other_tags_for_text, + display_marking=displaymarking, + message_id=message_id, + correct_id=correct_id, + additional_data=additional_data, + marker=marker, + error=error) if restored: return @@ -1301,7 +1307,7 @@ def _style_changed(self, *args): self.update_tags() def update_tags(self): - self.conv_textview.update_tags() + self.conversation_view.update_text_tags() @staticmethod def clear(tv): @@ -1372,7 +1378,7 @@ def set_control_active(self, state): if state: self.set_emoticon_popover() jid = self.contact.jid - if self.conv_textview.autoscroll: + if self.conversation_view.autoscroll: # we are at the end type_ = [f'printed_{self._type}'] if self._type.is_groupchat: @@ -1401,14 +1407,73 @@ def set_control_active(self, state): self.contact, Chatstate.INACTIVE) def scroll_to_end(self, force=False): - self.conv_textview.scroll_to_end(force) + self.conversation_view.scroll_to_end(force) + + def _on_load_history(self, _button, lines): + self.fetch_n_lines_history(lines) + + def fetch_n_lines_history(self, n_lines): + if self._fetching_history: + return + + timestamp_end = self.conversation_view.first_message_timestamp + if not timestamp_end: + timestamp_end = datetime.datetime.now() + self._fetching_history = True + adjustment = self.xml.conversation_scrolledwindow.get_vadjustment() + + # Store these values so we can restore scroll position later + self._scrolled_old_upper = adjustment.get_upper() + self._scrolled_old_value = adjustment.get_value() + + if self.is_groupchat: + messages = app.storage.archive.get_conversation_muc_before( + self.account, + self.contact.jid, + timestamp_end, + n_lines) + else: + messages = app.storage.archive.get_conversation_before( + self.account, + self.contact.jid, + timestamp_end, + n_lines) + + for msg in messages: + if not msg: + continue + kind = 'status' + contact_name = msg.contact_name + if msg.kind in ( + KindConstant.SINGLE_MSG_RECV, KindConstant.CHAT_MSG_RECV): + kind = 'incoming' + contact_name = self.contact.name + elif msg.kind == KindConstant.GC_MSG: + kind = 'incoming' + elif msg.kind in ( + KindConstant.SINGLE_MSG_SENT, KindConstant.CHAT_MSG_SENT): + kind = 'outgoing' + contact_name = self.get_our_nick() + if not msg.message: + continue + self.conversation_view.add_message( + msg.message, + kind, + contact_name, + msg.time, + subject=msg.subject, + additional_data=msg.additional_data, + message_id=msg.message_id, + marker=msg.marker, + error=msg.error, + history=True) def _on_edge_reached(self, _scrolledwindow, pos): if pos != Gtk.PositionType.BOTTOM: return # Remove all events and set autoscroll True app.log('autoscroll').info('Autoscroll enabled') - self.conv_textview.autoscroll = True + self.conversation_view.autoscroll = True if self.resource: jid = self.contact.get_full_jid() else: @@ -1437,13 +1502,44 @@ def _on_edge_reached(self, _scrolledwindow, pos): self._type) self.last_msg_id = None + def _on_edge_overshot(self, _scrolledwindow, pos): + # Fetch messages if we scroll against the top + if pos != Gtk.PositionType.TOP: + return + self.fetch_n_lines_history(30) + + def _on_scroll_value_changed(self, adjustment): + if self.conversation_view.clearing or self._fetching_history: + return + + value = adjustment.get_value() + previous_value = self._scrolled_previous_value + self._scrolled_previous_value = value + + if value >= previous_value: + return + + # Fetch messages before we reach the top + if value <= int(0.1 * adjustment.get_upper()): + self.fetch_n_lines_history(10) + + def _on_scroll_realize(self, _widget): + # Initial message fetching when ChatControl is first opened + if not self._initial_fetch_done: + self._initial_fetch_done = True + restore_lines = app.settings.get('restore_lines') + if restore_lines <= 0: + return + self.fetch_n_lines_history(restore_lines) + def _on_scrollbar_button_release(self, scrollbar, event): if event.get_button()[1] != 1: # We want only to catch the left mouse button return + if not at_the_end(scrollbar.get_parent()): app.log('autoscroll').info('Autoscroll disabled') - self.conv_textview.autoscroll = False + self.conversation_view.autoscroll = False def has_focus(self): if self.parent_win: @@ -1453,12 +1549,12 @@ def has_focus(self): return False def _on_scroll(self, widget, event): - if not self.conv_textview.autoscroll: + if not self.conversation_view.autoscroll: # autoscroll is already disabled return if widget is None: - # call from _conv_textview_key_press_event() + # call from _on_conversation_view_key_press() # SHIFT + Gdk.KEY_Page_Up if event != Gdk.KEY_Page_Up: return @@ -1490,10 +1586,18 @@ def _on_scroll(self, widget, event): adjustment = self.xml.conversation_scrolledwindow.get_vadjustment() if adjustment.get_upper() != adjustment.get_page_size(): app.log('autoscroll').info('Autoscroll disabled') - self.conv_textview.autoscroll = False + self.conversation_view.autoscroll = False - def on_conversation_vadjustment_changed(self, _adjustment): + def _on_conversation_vadjustment_changed(self, adjustment): self.scroll_to_end() + if self._fetching_history: + # Make sure the scroll position is kept + new_upper = adjustment.get_upper() + diff = new_upper - self._scrolled_old_upper + new_value = diff + self._scrolled_old_value + adjustment.set_value(new_value) + self._fetching_history = False + return def scroll_messages(self, direction, msg_buf, msg_type): if msg_type == 'sent': @@ -1550,7 +1654,7 @@ def got_connected(self): def got_disconnected(self): self.msg_textview.set_sensitive(False) self.msg_textview.set_editable(False) - self.conv_textview.tv.grab_focus() + self.conversation_view.grab_focus() self.update_toolbar() ===================================== gajim/command_system/implementation/middleware.py ===================================== @@ -33,7 +33,7 @@ from traceback import print_exc -from gi.repository import Pango +# from gi.repository import Pango from gajim.common import app from gajim.common.i18n import _ @@ -117,29 +117,33 @@ def __init__(self): self.install_tags() def install_tags(self): - buffer_ = self.conv_textview.tv.get_buffer() + # TODO implement this in ConversationView + # buffer_ = self.conv_textview.tv.get_buffer() - name = "Monospace" - font = Pango.FontDescription(name) + # 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_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") + # 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") + # 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) + # 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"): """ ===================================== gajim/common/const.py ===================================== @@ -1049,6 +1049,7 @@ def is_active(self): 'iris.xpcs:', 'iris.lwz:', 'ldap://', + 'mailto:', 'mid:', 'modem:', 'msrp://', @@ -1081,6 +1082,7 @@ def is_active(self): 'vemmi://', 'xmlrpc.beep://', 'xmlrpc.beeps://', + 'xmpp:', 'z39.50r://', 'z39.50s://', 'about:', @@ -1107,6 +1109,22 @@ def is_active(self): } +TRUST_SYMBOL_DATA = { + Trust.UNTRUSTED: ('dialog-error-symbolic', + _('Untrusted'), + 'error-color'), + Trust.UNDECIDED: ('security-low-symbolic', + _('Trust Not Decided'), + 'warning-color'), + Trust.BLIND: ('security-medium-symbolic', + _('Unverified'), + 'encrypted-color'), + Trust.VERIFIED: ('security-high-symbolic', + _('Verified'), + 'encrypted-color') +} + + THRESHOLD_OPTIONS = { -1: _('No Sync'), 1: _('1 Day'), ===================================== gajim/common/storage/archive.py ===================================== @@ -321,72 +321,72 @@ def convert_show_values_to_db_api_values(show): return None @timeit - def load_groupchat_messages(self, account, jid): - account_id = self.get_account_id(account, type_=JIDConstant.ROOM_TYPE) + def get_conversation_before(self, account, jid, end_timestamp, n_lines): + """ + Load n_lines lines of conversation with jid before end_timestamp - sql = ''' - SELECT time, contact_name, message, additional_data, message_id - FROM logs NATURAL JOIN jids WHERE jid = ? - AND account_id = ? AND kind = ? - ORDER BY time DESC, log_line_id DESC LIMIT ?''' + :param account: The account - messages = self._con.execute( - sql, (jid, account_id, KindConstant.GC_MSG, 50)).fetchall() + :param jid: The jid for which we request the conversation - messages.reverse() - return messages + :param end_timestamp: end timestamp / datetime.datetime instance - @timeit - def get_last_conversation_lines(self, account, jid, pending): + returns a list of namedtuples """ - Get recent messages - - Pending messages are already in queue to be printed when the - ChatControl is opened, so we don’t want to request those messages. - How many messages are requested depends on the 'restore_lines' - config value. How far back in time messages are requested depends on - _get_timeout(). - - :param account: The account + jids = self._get_family_jids(account, jid) + account_id = self.get_account_id(account) - :param jid: The jid from which we request the conversation lines + sql = ''' + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id, message_id, + error as "error [common_error]", + marker as "marker [marker]" + FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} + AND time < ? + ORDER BY time DESC, log_line_id DESC + LIMIT ? + '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id) - :param pending: How many messages are currently pending so we don’t - request those messages + return self._con.execute( + sql, + tuple(jids) + (end_timestamp.timestamp(), n_lines)).fetchall() - returns a list of namedtuples + @timeit + def get_conversation_muc_before(self, account, jid, end_timestamp, + n_lines): """ + Load n_lines lines of conversation with jid before end_timestamp + + :param account: The account - restore = app.settings.get('restore_lines') - if restore <= 0: - return [] + :param jid: The jid for which we request the conversation - kinds = map(str, [KindConstant.SINGLE_MSG_RECV, - KindConstant.SINGLE_MSG_SENT, - KindConstant.CHAT_MSG_RECV, - KindConstant.CHAT_MSG_SENT, - KindConstant.ERROR]) + :param end_timestamp: end timestamp / datetime.datetime instance + returns a list of namedtuples + """ jids = self._get_family_jids(account, jid) - account_id = self.get_account_id(account) + # TODO: this does not load messages correctly when account_id is set + # account_id = self.get_account_id(account, type_=JIDConstant.ROOM_TYPE) sql = ''' - SELECT time, kind, message, error as "error [common_error]", - subject, additional_data, marker as "marker [marker]", - message_id + SELECT contact_name, time, kind, show, message, subject, + additional_data, log_line_id, message_id, + error as "error [common_error]", + marker as "marker [marker]" FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) - AND account_id = {account_id} AND kind IN ({kinds}) - AND time > get_timeout() - ORDER BY time DESC, log_line_id DESC LIMIT ? OFFSET ? + AND kind = {kind} + AND time < ? + ORDER BY time DESC, log_line_id DESC + LIMIT ? '''.format(jids=', '.join('?' * len(jids)), - account_id=account_id, - kinds=', '.join(kinds)) - - messages = self._con.execute( - sql, tuple(jids) + (restore, pending)).fetchall() + kind=KindConstant.GC_MSG) - messages.reverse() - return messages + return self._con.execute( + sql, + tuple(jids) + (end_timestamp.timestamp(), n_lines)).fetchall() @timeit def get_last_conversation_line(self, account, jid): ===================================== gajim/data/gui/chat_control.ui ===================================== @@ -623,7 +623,9 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> + <signal name="edge-overshot" handler="_on_edge_overshot" swapped="no"/> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="realize" handler="_on_scroll_realize" swapped="no"/> <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> ===================================== gajim/data/gui/groupchat_control.ui ===================================== @@ -263,7 +263,9 @@ <property name="can_focus">True</property> <property name="shadow_type">in</property> <property name="overlay_scrolling">False</property> + <signal name="edge-overshot" handler="_on_edge_overshot" swapped="no"/> <signal name="edge-reached" handler="_on_edge_reached" swapped="no"/> + <signal name="realize" handler="_on_scroll_realize" swapped="no"/> <signal name="scroll-event" handler="_on_scroll" swapped="no"/> <child> <placeholder/> ===================================== gajim/data/style/gajim-dark.css ===================================== @@ -17,3 +17,14 @@ infobar.error > revealer > box { color: #FCE5D5; background-color: #D64937; } + +/* ConversationView */ +.conversation-mention-highlight { + background-color: rgb(251, 151, 97); +} +.conversation-mention-highlight:hover { + background-color: rgb(251, 151, 97); +} +.conversation-mention-highlight grid textview text { + background-color: rgb(251, 151, 97); +} ===================================== gajim/data/style/gajim.css ===================================== @@ -31,6 +31,38 @@ .chatcontrol-separator {margin-bottom: 5px;} +.conversation-row { + padding: 6px 3px 6px 6px; +} +.conversation-row grid textview { + background: transparent; +} +.conversation-row grid textview text { + background: transparent; +} +.conversation-mention-highlight { + background-color: rgb(255, 215, 194); +} +.conversation-system-row { + padding: 18px; +} +.conversation-date-row { + padding: 12px; +} +.conversation-meta { + color: @insensitive_fg_color; + font-size: small; +} +.conversation-read-marker { + color: @insensitive_fg_color; + font-size: small; + font-style: italic; +} +.conversation-nickname { + font-size: small; + font-weight: bold; +} + .link-button { min-height: 0px; } /* Main Window */ ===================================== gajim/groupchat_control.py ===================================== @@ -211,7 +211,6 @@ def __init__(self, parent_win, jid, muc_data, acct): # PluginSystem: adding GUI extension point for this GroupchatControl # instance object app.plugin_manager.gui_extension_point('groupchat_control', self) - self._restore_conversation() def _connect_contact_signals(self): self.contact.multi_connect({ @@ -249,6 +248,8 @@ def _on_muc_state_changed(self, _contact, _signal_name): self.xml.formattings_button.set_sensitive(True) + self.conversation_view.update_avatars() + self.update_actions() elif state == MUCJoinedState.NOT_JOINED: @@ -416,25 +417,6 @@ def remove_actions(self): for action in actions: self.parent_win.window.remove_action(f'{action}{self.control_id}') - def _restore_conversation(self): - rows = app.storage.archive.load_groupchat_messages( - self.account, self.contact.jid) - - for row in rows: - other_tags_for_name = ['muc_nickname_color_%s' % row.contact_name] - ChatControlBase.add_message(self, - row.message, - 'incoming', - row.contact_name, - float(row.time), - other_tags_for_name=other_tags_for_name, - message_id=row.message_id, - restored=True, - additional_data=row.additional_data) - - if rows: - self.conv_textview.print_empty_line() - def _is_subject_change_allowed(self): contact = self.contact.get_resource(self.nick) if contact.affiliation in (Affiliation.OWNER, Affiliation.ADMIN): @@ -787,7 +769,7 @@ def add_message(self, text, contact='', tim=None, self._nick_completion.record_message(contact, highlight) - self.check_focus_out_line() + # self.check_focus_out_line() ChatControlBase.add_message(self, text, @@ -844,7 +826,7 @@ def check_focus_out_line(self): if app.window.is_chat_active(self.account, self.room_jid): return - self.conv_textview.show_focus_out_line() + # self.conv_textview.show_focus_out_line() def needs_visual_notification(self, text): """ @@ -1038,11 +1020,12 @@ def _on_user_nickname_changed(self, _contact, _signal_name, user_contact, proper self.add_info_message(message) - 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] + # 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, @@ -1346,7 +1329,7 @@ def send_message(self, message, xhtml=None, process_commands=True): self.msg_textview.grab_focus() def _on_message_error(self, event): - self.conv_textview.show_error(event.message_id, event.error) + self.conversation_view.show_error(event.message_id, event.error) def shutdown(self, reason=None): app.settings.disconnect_signals(self) @@ -1419,12 +1402,12 @@ def _close_control(self, reason=None): # self.parent_win.remove_tab(self, None, reason=reason, force=True) def set_control_active(self, state): - self.conv_textview.allow_focus_out_line = True + # self.conv_textview.allow_focus_out_line = True self.attention_flag = False ChatControlBase.set_control_active(self, state) - if not state: - # add the focus-out line to the tab we are leaving - self.check_focus_out_line() + # if not state: + # # add the focus-out line to the tab we are leaving + # self.check_focus_out_line() # Sending active to undo unread state self.parent_win.redraw_tab(self, 'active') ===================================== gajim/gtk/conversation_textview.py ===================================== @@ -0,0 +1,608 @@ +# 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 urllib.parse import quote + +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common import i18n +from gajim.common.const import StyleAttr +from gajim.common.const import URI_SCHEMES +from gajim.common.helpers import AdditionalDataDict +from gajim.common.helpers import open_uri +from gajim.common.helpers import puny_encode_url +from gajim.common.helpers import reduce_chars_newlines +from gajim.common.i18n import _ +from gajim.common.regex import STH_AT_STH_DOT_STH_REGEX +from gajim.common.regex import BASIC_REGEX +from gajim.common.regex import LINK_REGEX +from gajim.common.regex import EMOT_AND_BASIC_REGEX +from gajim.common.regex import EMOT_AND_LINK_REGEX + +from .htmltextview import HtmlTextView +from .emoji_data import emoji_pixbufs +from .emoji_data import is_emoji +from .emoji_data import get_emoji_pixbuf +from .util import get_cursor + +log = logging.getLogger('gajim.gui.conversation_view') + + +class ConversationTextview(HtmlTextView): + + __gsignals__ = { + 'quote': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ), + } + + def __init__(self, account, history_mode=False): + HtmlTextView.__init__(self, account) + self.set_hexpand(True) + self.set_vexpand(True) + self.set_margin_start(0) + self.set_margin_end(0) + self.set_border_width(0) + self.set_left_margin(0) + self.set_right_margin(0) + + self._history_mode = history_mode + + self.handlers = {} + + id_ = self.connect('query-tooltip', self._query_tooltip) + self.handlers[id_] = self + id_ = self.connect('button-press-event', self._on_button_press) + self.handlers[id_] = self + id_ = self.connect('populate-popup', self._on_populate_popup) + self.handlers[id_] = self + + # Used for changing the mouse pointer when hovering clickable URIs + self._cursor_changed = False + + # Keeps text selections for quoting and search actions + self._selected_text = '' + + self.get_style_context().add_class('gajim-conversation-font') + + buffer_ = self.get_buffer() + + self.tag_in = buffer_.create_tag('incoming') + color = app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR) + self.tag_in.set_property('foreground', color) + desc = app.css_config.get_font('.gajim-incoming-nickname') + self.tag_in.set_property('font-desc', desc) + + self.tag_out = buffer_.create_tag('outgoing') + color = app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR) + self.tag_out.set_property('foreground', color) + desc = app.css_config.get_font('.gajim-outgoing-nickname') + self.tag_out.set_property('font-desc', desc) + + self.tag_status = buffer_.create_tag('status') + color = app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR) + self.tag_status.set_property('foreground', color) + desc = app.css_config.get_font('.gajim-status-message') + self.tag_status.set_property('font-desc', desc) + + tag_in_text = buffer_.create_tag('incomingtxt') + color = app.css_config.get_value( + '.gajim-incoming-message-text', StyleAttr.COLOR) + if color: + tag_in_text.set_property('foreground', color) + desc = app.css_config.get_font('.gajim-incoming-message-text') + tag_in_text.set_property('font-desc', desc) + + tag_out_text = buffer_.create_tag('outgoingtxt') + color = app.css_config.get_value( + '.gajim-outgoing-message-text', StyleAttr.COLOR) + if color: + tag_out_text.set_property('foreground', color) + desc = app.css_config.get_font('.gajim-outgoing-message-text') + tag_out_text.set_property('font-desc', desc) + + self.tag_marked = buffer_.create_tag('marked') + color = app.css_config.get_value( + '.gajim-highlight-message', StyleAttr.COLOR) + self.tag_marked.set_property('foreground', color) + self.tag_marked.set_property('weight', Pango.Weight.BOLD) + + tag = buffer_.create_tag('small') + tag.set_property('scale', 0.8333333333333) + + tag = buffer_.create_tag('bold') + tag.set_property('weight', Pango.Weight.BOLD) + + tag = buffer_.create_tag('italic') + tag.set_property('style', Pango.Style.ITALIC) + + tag = buffer_.create_tag('strikethrough') + tag.set_property('strikethrough', True) + + self.create_tags() + + self.connect('destroy', self._on_destroy) + + def _on_destroy(self, *args): + super()._on_destroy() + for i in self.handlers: + if self.handlers[i].handler_is_connected(i): + self.handlers[i].disconnect(i) + self.handlers.clear() + + def update_text_tags(self): + self.tag_in.set_property('foreground', app.css_config.get_value( + '.gajim-incoming-nickname', StyleAttr.COLOR)) + self.tag_out.set_property('foreground', app.css_config.get_value( + '.gajim-outgoing-nickname', StyleAttr.COLOR)) + self.tag_status.set_property('foreground', app.css_config.get_value( + '.gajim-status-message', StyleAttr.COLOR)) + self.tag_marked.set_property('foreground', app.css_config.get_value( + '.gajim-highlight-message', StyleAttr.COLOR)) + self.update_tags() + + def clear(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + buffer_.delete(start, end) + + def get_text(self): + buffer_ = self.get_buffer() + start, end = buffer_.get_bounds() + return buffer_.get_text(start, end, False) + + def print_text(self, text, other_text_tags=None, kind=None, graphics=True, + name=None, additional_data=None): + if additional_data is None: + additional_data = AdditionalDataDict() + + # Print XHTML if present + xhtml = additional_data.get_value('gajim', 'xhtml', False) + if xhtml and app.settings.get('show_xhtml'): + try: + if (name and (text.startswith('/me ') or + text.startswith('/me\n'))): + xhtml = xhtml.replace('/me', '<i>* %s</i>' % (name,), 1) + self.display_html( + xhtml, self, self) + return + except Exception as err: + log.debug('Error processing xhtml: %s', err) + log.debug('with |%s|', xhtml) + + text_tags = [] + if other_text_tags: + text_tags = other_text_tags[:] # create a new list + + if (kind == 'status' or + text.startswith('/me') or text.startswith('/me\n')): + text_tags.append(kind) + + if name and (text.startswith('/me ') or text.startswith('/me\n')): + text = '* ' + name + text[3:] + text_tags.append('italic') + + if kind in ('incoming', 'incoming_queue'): + text_tags.append('incomingtxt') + elif kind == 'outgoing': + text_tags.append('outgoingtxt') + + self.parse_formatting( + text, text_tags, graphics=graphics, additional_data=additional_data) + + def parse_formatting(self, text, text_tags, graphics=True, + additional_data=None): + ''' + Parses message formatting (Emojis, URIs, Styles). + A regex is used for text matching. Each text fragment gets + passed to apply_formatting(), where respective TextTags are added. + Unformatted text (no match) will be passed through unaltered. + ''' + if not text: + return + + if text_tags is None: + text_tags = [] + + buffer_ = self.get_buffer() + + if text_tags: + insert_tags_func = buffer_.insert_with_tags_by_name + else: + insert_tags_func = buffer_.insert + + # TODO: Adapt HtmlHandler.handle_specials() + # detect_and_print_special_text() is used by + # HtmlHandler.handle_specials() and uses Gtk.TextTag objects, + # not strings + if text_tags and isinstance(text_tags[0], Gtk.TextTag): + insert_tags_func = buffer_.insert_with_tags + + # TODO: Plugin system GUI extension point + # self.plugin_modified = False + # app.plugin_manager.extension_point('print_real_text', self, + # text, text_tags, graphics, additional_data) + # if self.plugin_modified: + # return + + # Add XEP-0066 Out of Band text to the end + oob_url = additional_data.get_value('gajim', 'oob_url') + if oob_url is not None: + oob_desc = additional_data.get_value('gajim', 'oob_desc', 'URL:') + if oob_url != text: + text += f'\n{oob_desc} {oob_url}' + + if app.settings.get('emoticons_theme') and graphics: + # Match for Emojis & URIs + if app.settings.get('ascii_formatting'): + regex = EMOT_AND_BASIC_REGEX + else: + regex = EMOT_AND_LINK_REGEX + else: + if app.settings.get('ascii_formatting'): + # Match for URIs + mail + formatting + regex = BASIC_REGEX + else: + # Match only for URIs + formatting + regex = LINK_REGEX + + iterator = regex.finditer(text) + end_iter = buffer_.get_end_iter() + # TODO: Evaluate limit + # Too many fragments (emoticons, LaTeX formulas, etc) + # may cause Gajim to freeze (see #5129). + # We impose an arbitrary limit of 100 fragments per message. + fragment_limit = 100 + index = 0 + for match in iterator: + start, end = match.span() + fragment = text[start:end] + if start > index: + text_before_fragment = text[index:start] + end_iter = buffer_.get_end_iter() + if text_tags: + insert_tags_func( + end_iter, text_before_fragment, *text_tags) + else: + buffer_.insert(end_iter, text_before_fragment) + index = end + + self.apply_formatting(fragment, + text_tags, + graphics=graphics, + additional_data=additional_data) + fragment_limit += 1 + if fragment_limit <= 0: + break + + # Add remaining text after last match + insert_tags_func(buffer_.get_end_iter(), text[index:], *text_tags) + + def apply_formatting(self, fragment, text_tags, graphics=True, + additional_data=None): + # TODO: Plugin system GUI extension point + # self.plugin_modified = False + # app.plugin_manager.extension_point('print_special_text', self, + # fragment, text_tags, graphics, additional_data) + # if self.plugin_modified: + # return + + tags = [] + buffer_ = self.get_buffer() + ttt = buffer_.get_tag_table() + + # Detect XHTML-IM link + is_xhtml_uri = False + tags_ = [ + (ttt.lookup(t) if isinstance(t, str) else t) for t in text_tags] + for tag in tags_: + is_xhtml_uri = getattr(tag, 'href', False) + if is_xhtml_uri: + break + + # Check if we accept this as an uri + is_valid_uri = fragment.startswith(tuple(URI_SCHEMES)) + + end_iter = buffer_.get_end_iter() + + theme = app.settings.get('emoticons_theme') + show_emojis = theme and theme != 'font' + + # XEP-0393 Message Styling + # * = bold + # _ = italic + # ~ = strikethrough + show_formatting_chars = app.settings.get( + 'show_ascii_formatting_chars') + + if show_emojis and graphics and is_emoji(fragment): + # it's an emoticon + if emoji_pixbufs.complete: + # only search for the pixbuf if we are sure + # that loading is completed + pixbuf = get_emoji_pixbuf(fragment) + if pixbuf is None: + buffer_.insert(end_iter, fragment) + else: + pixbuf = pixbuf.copy() + anchor = buffer_.create_child_anchor(end_iter) + anchor.plaintext = fragment + img = Gtk.Image.new_from_pixbuf(pixbuf) + img.show() + self.add_child_at_anchor(img, anchor) + else: + # Set marks and save them so we can replace emojis + # once the loading is complete + start_mark = buffer_.create_mark(None, end_iter, True) + buffer_.insert(end_iter, fragment) + end_mark = buffer_.create_mark(None, end_iter, True) + emoji_pixbufs.append_marks( + self, start_mark, end_mark, fragment) + elif (fragment.startswith('www.') or + fragment.startswith('ftp.') or + is_valid_uri and not is_xhtml_uri): + tags.append('url') + elif fragment.startswith('mailto:') and not is_xhtml_uri: + tags.append('mail') + elif fragment.startswith('xmpp:') and not is_xhtml_uri: + tags.append('xmpp') + elif STH_AT_STH_DOT_STH_REGEX.match(fragment) and not is_xhtml_uri: + # JID or E-Mail + tags.append('sth_at_sth') + elif fragment.startswith('*'): + tags.append('bold') + if (fragment[1] == '~' and fragment[-2] == '~' and + len(fragment) > 4): + tags.append('strikethrough') + if not show_formatting_chars: + fragment = fragment[2:-2] + elif (fragment[1] == '_' and fragment[-2] == '_' and + len(fragment) > 4): + tags.append('italic') + if not show_formatting_chars: + fragment = fragment[2:-2] + else: + if not show_formatting_chars: + fragment = fragment[1:-1] + elif fragment.startswith('~'): + tags.append('strikethrough') + if (fragment[1] == '*' and fragment[-2] == '*' and + len(fragment) > 4): + tags.append('bold') + if not show_formatting_chars: + fragment = fragment[2:-2] + elif (fragment[1] == '_' and fragment[-2] == '_' and + len(fragment) > 4): + tags.append('italic') + if not show_formatting_chars: + fragment = fragment[2:-2] + else: + if not show_formatting_chars: + fragment = fragment[1:-1] + elif fragment.startswith('_'): + tags.append('italic') + if (fragment[1] == '*' and fragment[-2] == '*' and + len(fragment) > 4): + tags.append('bold') + if not show_formatting_chars: + fragment = fragment[2:-2] + elif (fragment[1] == '~' and fragment[-2] == '~' and + len(fragment) > 4): + tags.append('strikethrough') + if not show_formatting_chars: + fragment = fragment[2:-2] + else: + if not show_formatting_chars: + fragment = fragment[1:-1] + else: + insert_tags_func = buffer_.insert_with_tags_by_name + if text_tags and isinstance(text_tags[0], Gtk.TextTag): + insert_tags_func = buffer_.insert_with_tags + if text_tags: + insert_tags_func(end_iter, fragment, *text_tags) + else: + buffer_.insert(end_iter, fragment) + + if tags: + all_tags = tags[:] + all_tags += text_tags + # convert all names to TextTag + all_tags = [ + (ttt.lookup(t) if isinstance(t, str) else t) for t in all_tags] + buffer_.insert_with_tags(end_iter, fragment, *all_tags) + if 'url' in tags: + puny_text = puny_encode_url(fragment) + if puny_text != fragment: + puny_tags = [] + if not puny_text: + puny_text = _('Invalid URL') + puny_tags = [(ttt.lookup(t) if isinstance( + t, str) else t) for t in puny_tags] + puny_tags += text_tags + buffer_.insert_with_tags( + end_iter, " (%s)" % puny_text, *puny_tags) + + def _query_tooltip(self, widget, x_pos, y_pos, _keyboard_mode, tooltip): + window = widget.get_window(Gtk.TextWindowType.TEXT) + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, x_pos, y_pos) + + iter_ = self.get_iter_at_position(x_pos, y_pos)[1] + for tag in iter_.get_tags(): + tag_name = tag.get_property('name') + if getattr(tag, 'is_anchor', False): + text = getattr(tag, 'title', False) + if text: + if len(text) > 50: + text = reduce_chars_newlines(text, 47, 1) + tooltip.set_text(text) + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return True + if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): + window.set_cursor(get_cursor('pointer')) + self._cursor_changed = True + return False + + if self._cursor_changed: + window.set_cursor(get_cursor('text')) + self._cursor_changed = False + return False + + def _on_button_press(self, _widget, event): + ''' + We don’t open the standard context menu when receiving + a click on tagged text. + If it’s untagged text, check if something is selected + ''' + self._selected_text = '' + + if event.button != 3: + # If it’s not a right click + return False + + x_pos, y_pos = self.window_to_buffer_coords( + Gtk.TextWindowType.TEXT, + int(event.x), + int(event.y)) + iter_ = self.get_iter_at_location(x_pos, y_pos) + if isinstance(iter_, tuple): + iter_ = iter_[1] + tags = iter_.get_tags() + + if tags: + # A tagged text fragment has been clicked + for tag in tags: + tag_name = tag.get_property('name') + if tag_name in ('url', 'mail', 'xmpp', 'sth_at_sth'): + # Block regular context menu + return True + + # Check if there is a selection and make it available for + # _on_populate_popup + buffer_ = self.get_buffer() + return_val = buffer_.get_selection_bounds() + if return_val: + # Something has been selected, get the text + start_sel, finish_sel = return_val[0], return_val[1] + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + elif iter_.get_char() and ord(iter_.get_char()) > 31: + # Clicked on a word, take whole word for selection + start_sel = iter_.copy() + if not start_sel.starts_word(): + start_sel.backward_word_start() + finish_sel = iter_.copy() + if not finish_sel.ends_word(): + finish_sel.forward_word_end() + self._selected_text = buffer_.get_text( + start_sel, finish_sel, True) + return False + + def _on_populate_popup(self, _textview, menu): + ''' + Overrides the default context menu. + If text is selected, a submenu with actions on the selection is added. + (see _on_button_press) + ''' + if not self._selected_text: + menu.show_all() + return + + if not self._history_mode: + item = Gtk.MenuItem.new_with_mnemonic(_('_Quote')) + id_ = item.connect('activate', self._on_quote) + self.handlers[id_] = item + menu.prepend(item) + + selected_text_short = reduce_chars_newlines( + self._selected_text, 25, 2) + item = Gtk.MenuItem.new_with_mnemonic( + _('_Actions for "%s"') % selected_text_short) + menu.prepend(item) + submenu = Gtk.Menu() + item.set_submenu(submenu) + uri_text = quote(self._selected_text.encode('utf-8')) + + if app.settings.get('always_english_wikipedia'): + uri = (f'https://en.wikipedia.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wikipedia.org/' + f'wiki/Special:Search?search={uri_text}') + item = Gtk.MenuItem.new_with_mnemonic(_('Read _Wikipedia Article')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic( + _('Look it up in _Dictionary')) + dict_link = app.settings.get('dictionary_url') + if dict_link == 'WIKTIONARY': + # Default is wikitionary.org + if app.settings.get('always_english_wiktionary'): + uri = (f'https://en.wiktionary.org/wiki/' + f'Special:Search?search={uri_text}') + else: + uri = (f'https://{i18n.get_short_lang_code()}.wiktionary.org/' + f'wiki/Special:Search?search={uri_text}') + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + else: + if dict_link.find('%s') == -1: + # There has to be a '%s' in the url if it’s not WIKTIONARY + item = Gtk.MenuItem.new_with_label( + _('Dictionary URL is missing a "%s"')) + item.set_sensitive(False) + else: + uri = dict_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + search_link = app.settings.get('search_engine') + if search_link.find('%s') == -1: + # There has to be a '%s' in the url + item = Gtk.MenuItem.new_with_label( + _('Web Search URL is missing a "%s"')) + item.set_sensitive(False) + else: + item = Gtk.MenuItem.new_with_mnemonic(_('Web _Search for it')) + uri = search_link % uri_text + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + item = Gtk.MenuItem.new_with_mnemonic(_('Open as _Link')) + id_ = item.connect('activate', self._visit_uri, uri) + self.handlers[id_] = item + submenu.append(item) + + menu.show_all() + + def _on_quote(self, _widget): + self.emit('quote', self._selected_text) + + @staticmethod + def _visit_uri(_widget, uri): + open_uri(uri) ===================================== gajim/gtk/conversation_view.py ===================================== @@ -0,0 +1,977 @@ +# 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 +import time + +from bisect import bisect_left +from bisect import bisect_right +from collections import deque +from datetime import datetime +from datetime import timedelta + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import GObject +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.const import TRUST_SYMBOL_DATA +from gajim.common.helpers import from_one_line +from gajim.common.helpers import reduce_chars_newlines +from gajim.common.helpers import to_user_string +from gajim.common.i18n import _ +from gajim.common.i18n import Q_ + +from .conversation_textview import ConversationTextview +from .util import convert_rgba_to_hex +from .util import format_fingerprint +from .util import scroll_to_end +from .util import text_to_color + +log = logging.getLogger('gajim.gui.conversation_view') + + +class ConversationView(Gtk.ListBox): + + __gsignals__ = { + 'quote': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ), + 'load-history': ( + GObject.SignalFlags.RUN_LAST | GObject.SignalFlags.ACTION, + None, + (str, ) + ) + } + + def __init__(self, account, contact, history_mode=False): + Gtk.ListBox.__init__(self) + self.set_selection_mode(Gtk.SelectionMode.NONE) + self._account = account + self._client = app.get_client(account) + self._contact = contact + self._history_mode = history_mode + + self.encryption_enabled = False + self.autoscroll = True + self.clearing = False + + # Both first and last DateRow (datetime) + self._first_date = None + self._last_date = None + + # Keeps track of the number of rows shown in ConversationView + self._row_count = 0 + self._max_row_count = 100 + + # Keeps inserted message IDs to avoid re-inserting the same message + self._message_ids_inserted = {} + + # We keep a sorted array of all the timestamps we've inserted, which + # have a 1-to-1 mapping to the actual child elements of this ListBox + # (*all* rows are included). + # Binary-searching this array enables us to insert a message with a + # discontinuous timestamp (not less than or greater than the first or + # last message timestamp in the list), and insert it at the correct + # place in the ListBox. + self._timestamps_inserted = deque() + + # Stores the timestamp of the first *chat* row inserted + # (not a system row or date row) + self.first_message_timestamp = None + + # Last incoming chat message timestamp (used for ReadMarkerRows) + self._last_incoming_timestamp = datetime.fromtimestamp(0) + + # Insert the very first row, containing the scroll hint and load button + self.add(ScrollHintRow(self._account)) + self._timestamps_inserted.append(datetime.fromtimestamp(0)) + + def clear(self): + self.clearing = True + for row in self.get_children()[1:]: + self.remove(row) + + GLib.idle_add(self._reset_conversation_view) + + def _reset_conversation_view(self): + self._first_date = None + self._last_date = None + self._message_ids_inserted.clear() + self.first_message_timestamp = None + self._last_incoming_timestamp = datetime.fromtimestamp(0) + self._timestamps_inserted.clear() + self._row_count = 0 + self.clearing = False + + def add_message(self, + text, + kind, + name, + timestamp, + other_text_tags=None, + message_id=None, + correct_id=None, + display_marking=None, + additional_data=None, + subject=None, + marker=None, + error=None, + history=False, + graphics=True): + + log.debug( + 'Adding message: %s, %s, %s, %s, message_id: %s, correct_id: %s, ' + 'other_text_tags: %s, display_marking: %s, additional_data: %s, ' + 'subject: %s, marker: %s, error: %s, history: %s, graphics: %s', + text, kind, name, timestamp, message_id, correct_id, + other_text_tags, display_marking, additional_data, subject, + marker, error, history, graphics) + + if message_id: + if message_id in self._message_ids_inserted: + log.warning('Rejecting insertion of duplicate message_id %s', + str(message_id)) + return + self._message_ids_inserted[message_id] = True + + if not timestamp: + timestamp = time.time() + time_ = datetime.fromtimestamp(timestamp) + + if other_text_tags is None: + other_text_tags = [] + + if kind in ('status', 'info') or subject: + message = InfoMessageRow( + self._account, + time_, + text, + other_text_tags, + kind, + subject, + graphics, + history_mode=self._history_mode) + else: + if correct_id: + self.correct_message( + correct_id, + message_id, + text, + other_text_tags, + kind, + name, + additional_data=additional_data) + return + + avatar = self._get_avatar(kind, name) + message = TextMessageRow( + self._account, + message_id, + time_, + kind, + name, + text, + other_text_tags, + avatar, + self._contact.is_groupchat, + additional_data=additional_data, + display_marking=display_marking, + marker=marker, + error=error, + encryption_enabled=self.encryption_enabled, + history_mode=self._history_mode) + + self._insert_message(message, time_, kind, history) + + # Check for maximum message count + if self.autoscroll and self._row_count > self._max_row_count: + self._reduce_message_count() + + def _get_avatar(self, kind, name): + scale = self.get_scale_factor() + if self._contact.is_groupchat: + contact = self._contact.get_resource(name) + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + + if kind == 'outgoing': + contact = self._client.get_module('Contacts').get_contact( + str(self._client.get_own_jid().bare)) + else: + contact = self._contact + + return contact.get_avatar(AvatarSize.ROSTER, scale, add_show=False) + + def _insert_message(self, message, time_, kind, history): + current_date = time_.strftime('%a, %d %b %Y') + + if self._is_out_of_order(time_, history): + insertion_point = bisect_left(self._timestamps_inserted, time_) + date_check_point = min(len( + self._timestamps_inserted) - 1, insertion_point - 1) + date_at_dcp = self._timestamps_inserted[date_check_point].strftime( + '%a, %d %b %Y') + if date_at_dcp != current_date: + associated_timestamp = time_ - timedelta( + hours=time_.hour, + minutes=time_.minute, + seconds=time_.second) + date_row = DateRow( + self._account, current_date, associated_timestamp) + self.insert(date_row, insertion_point) + self._timestamps_inserted.insert( + insertion_point, associated_timestamp) + self._row_count += 1 + insertion_point += 1 + if (kind in ('incoming', 'incoming_queue') and + time_ > self._last_incoming_timestamp): + self._last_incoming_timestamp = time_ + self.insert(message, insertion_point) + self._timestamps_inserted.insert(insertion_point, time_) + current_timestamp = time_ + self._row_count += 1 + elif history: + if current_date != self._first_date: + associated_timestamp = time_ - timedelta( + hours=time_.hour, + minutes=time_.minute, + seconds=time_.second) + date_row = DateRow( + self._account, current_date, associated_timestamp) + self.insert(date_row, 1) + self._timestamps_inserted.insert(1, associated_timestamp) + self._row_count += 1 + self._first_date = current_date + if kind in ('incoming', 'incoming_queue', 'outgoing'): + self.first_message_timestamp = time_ + if (kind in ('incoming', 'incoming_queue') and + time_ > self._last_incoming_timestamp): + self._last_incoming_timestamp = time_ + self.insert(message, 2) + self._timestamps_inserted.insert(2, time_) + if self._last_date is None: + self._last_date = current_date + current_timestamp = time_ + self._row_count += 1 + else: + if current_date != self._last_date: + associated_timestamp = time_ - timedelta( + hours=time_.hour, + minutes=time_.minute, + seconds=time_.second) + date_row = DateRow( + self._account, current_date, associated_timestamp) + self.add(date_row) + self._timestamps_inserted.append(associated_timestamp) + self._row_count += 1 + if self._first_date is None: + self._first_date = current_date + if (kind in ('incoming', 'incoming_queue', 'outgoing') and not + self.first_message_timestamp): + self.first_message_timestamp = time_ + if (kind in ('incoming', 'incoming_queue') and + time_ > self._last_incoming_timestamp): + self._last_incoming_timestamp = time_ + self._last_date = current_date + self.add(message) + self._timestamps_inserted.append(time_) + current_timestamp = time_ + self._row_count += 1 + + if message.type == 'chat': + self._merge_message(current_timestamp) + self._update_read_marker(current_timestamp) + + self.show_all() + + def _is_out_of_order(self, time_: datetime, history: bool) -> bool: + if history: + if self.first_message_timestamp: + return time_ > self.first_message_timestamp + return False + if len(self._timestamps_inserted) > 1: + return time_ < self._timestamps_inserted[-1] + return False + + def _merge_message(self, timestamp): + # 'Merge' message rows if they both meet certain conditions + # (see _is_mergeable). A merged message row does not display any + # avatar or meta info, and makes it look merged with the previous row. + if self._contact.is_groupchat: + return + + current_index = self._timestamps_inserted.index(timestamp) + previous_row = self.get_row_at_index(current_index - 1) + current_row = self.get_row_at_index(current_index) + next_row = self.get_row_at_index(current_index + 1) + if next_row is not None: + if self._is_mergeable(current_row, next_row): + next_row.set_merged(True) + + if self._is_mergeable(current_row, previous_row): + current_row.set_merged(True) + if next_row is not None: + if self._is_mergeable(current_row, next_row): + next_row.set_merged(True) + + @staticmethod + def _is_mergeable(row1, row2): + # TODO: Check for same encryption + timestamp1 = row1.timestamp.strftime('%H:%M') + timestamp2 = row2.timestamp.strftime('%H:%M') + kind1 = row1.kind + kind2 = row2.kind + if timestamp1 == timestamp2 and kind1 == kind2: + return True + return False + + def _reduce_message_count(self): + while self._row_count > self._max_row_count: + # We want to keep relevant DateRows when removing rows + row1 = self.get_row_at_index(1) + row2 = self.get_row_at_index(2) + + if row1.type == row2.type == 'date': + # First two rows are date rows, + # it’s safe to remove the fist row + self.remove(row1) + self._timestamps_inserted.remove(row1.timestamp) + self._first_date = row2.timestamp.strftime('%a, %d %b %Y') + self._row_count -= 1 + continue + + if row1.type == 'date' and row2.type != 'date': + # First one is a date row, keep it and + # remove the second row instead + self.remove(row2) + self._timestamps_inserted.remove(row2.timestamp) + if row2.message_id: + self._message_ids_inserted.pop(row2.message_id) + chat_row = self._get_first_chat_row() + if chat_row is not None: + self.first_message_timestamp = chat_row.timestamp + else: + self.first_message_timestamp = None + self._row_count -= 1 + continue + + if row1.type != 'date': + # Not a date row, safe to remove + self.remove(row1) + self._timestamps_inserted.remove(row1.timestamp) + if row1.message_id: + self._message_ids_inserted.pop(row1.message_id) + if row2.type == 'chat': + self.first_message_timestamp = row2.timestamp + else: + chat_row = self._get_first_chat_row() + if chat_row is not None: + self.first_message_timestamp = chat_row.timestamp + else: + self.first_message_timestamp = None + self._row_count -= 1 + + def _get_row_by_id(self, id_): + for row in self.get_children(): + if row.message_id == id_: + return row + return None + + def _get_first_chat_row(self): + for row in self.get_children(): + if row.type == 'chat': + return row + return None + + def set_read_marker(self, id_): + message_row = self._get_row_by_id(id_) + if message_row is None: + return + + message_row.set_displayed() + self._update_read_marker(message_row.timestamp) + + def _update_read_marker(self, current_timestamp): + marker_shown = False + + for row in self.get_children(): + if row.type == 'read_marker': + # We already have a ReadMarkerRow, decide if we keep it + marker_shown = True + + if self._last_incoming_timestamp > row.timestamp: + # Last incoming message is newer than read marker + self.remove(row) + self._timestamps_inserted.remove(row.timestamp) + marker_shown = False + break + + if self._last_incoming_timestamp > current_timestamp: + # Last incoming message is newer than current message + break + + if current_timestamp > row.timestamp: + # Message is newer than current ReadMarkerRow + current_row = self.get_row_at_index( + self._timestamps_inserted.index(current_timestamp)) + if current_row.has_displayed: + # Current row has a displayed marker, which means + # that the current ReadMarkerRow is out of date + self.remove(row) + self._timestamps_inserted.remove(row.timestamp) + marker_shown = False + break + break + + if self._last_incoming_timestamp >= current_timestamp: + # Don’t add ReadMarkerRow if last incoming message is newer + return + + if marker_shown: + # There is a ReadMarkerRow which has not been removed by previous + # rules, thus it’s the most current one (nothing more to do) + return + + current_row = self.get_row_at_index( + self._timestamps_inserted.index(current_timestamp)) + if current_row.type != 'chat': + return + + if current_row.has_displayed: + # Add a new ReadMarkerRow, if there is a marker for the current row + self._insert_read_marker(current_timestamp) + + def _insert_read_marker(self, timestamp): + insertion_point = bisect_right( + self._timestamps_inserted, timestamp) + read_marker_row = ReadMarkerRow( + self._account, self._contact, timestamp) + self.insert(read_marker_row, insertion_point) + self._timestamps_inserted.insert(insertion_point, timestamp) + + def update_avatars(self): + for row in self.get_children(): + if row.type == 'chat': + avatar = self._get_avatar(row.kind, row.name) + row.update_avatar(avatar) + + def update_text_tags(self): + for row in self.get_children(): + row.update_text_tags() + + def scroll_to_end(self, force=False): + if self.autoscroll or force: + GLib.idle_add(scroll_to_end, self.get_parent().get_parent()) + + def correct_message(self, correct_id, message_id, text, + other_text_tags, kind, name, additional_data=None): + message_row = self._get_row_by_id(correct_id) + if message_row is not None: + message_row.set_correction( + message_id, text, other_text_tags, kind, name, + additional_data=additional_data) + message_row.set_merged(False) + + def show_receipt(self, id_): + message_row = self._get_row_by_id(id_) + if message_row is not None: + message_row.set_receipt() + + def show_error(self, id_, error): + message_row = self._get_row_by_id(id_) + if message_row is not None: + message_row.set_error(to_user_string(error)) + message_row.set_merged(False) + + def on_quote(self, text): + self.emit('quote', text) + + # TODO: focus_out_line for group chats + + +class ConversationRow(Gtk.ListBoxRow): + def __init__(self, account, widget='label', history_mode=False): + Gtk.ListBoxRow.__init__(self) + self.type = '' + self.timestamp = None + self.kind = None + self.name = None + self.message_id = None + self.text = '' + + self.get_style_context().add_class('conversation-row') + + self.grid = Gtk.Grid(row_spacing=3, column_spacing=12) + self.add(self.grid) + + if widget == 'textview': + self.label = None + self.textview = ConversationTextview( + account, history_mode=history_mode) + else: + self.textview = None + self.label = Gtk.Label() + self.label.set_selectable(True) + self.label.set_line_wrap(True) + self.label.set_xalign(0) + self.label.set_line_wrap_mode( + Pango.WrapMode.WORD_CHAR) + + def update_text_tags(self): + if self.textview is not None: + self.textview.update_text_tags() + + @staticmethod + def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: + # TODO: maybe change default to '%H:%M' + time_format = from_one_line(app.settings.get('time_stamp')) + timestamp_formatted = timestamp.strftime(time_format) + label = Gtk.Label(label=timestamp_formatted) + label.set_halign(Gtk.Align.START) + label.set_valign(Gtk.Align.END) + label.get_style_context().add_class('conversation-meta') + label.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %H:%M:%S')) + return label + + @staticmethod + def create_name_widget(name: str, kind: str, + is_groupchat: bool) -> Gtk.Label: + label = Gtk.Label() + label.set_selectable(True) + label.get_style_context().add_class('conversation-nickname') + + # TODO: Maybe set default for 'after_nickname' to empty string + before_name = from_one_line(app.settings.get('before_nickname')) + after_name = from_one_line(app.settings.get('after_nickname')) + new_name = f'{before_name}{GLib.markup_escape_text(name)}{after_name}' + + if is_groupchat: + rgba = Gdk.RGBA(*text_to_color(name)) + nick_color = convert_rgba_to_hex(rgba) + label.set_markup( + f'<span foreground="{nick_color}">{new_name}</span>') + else: + if kind in ('incoming', 'incoming_queue'): + label.get_style_context().add_class( + 'gajim-incoming-nickname') + elif kind == 'outgoing': + label.get_style_context().add_class( + 'gajim-outgoing-nickname') + label.set_markup(new_name) + return label + + +class ScrollHintRow(ConversationRow): + def __init__(self, account): + ConversationRow.__init__(self, account) + self.type = 'system' + self.timestamp = datetime.fromtimestamp(0) + self.get_style_context().add_class('conversation-system-row') + + self._button = Gtk.Button.new_from_icon_name( + 'go-up-symbolic', Gtk.IconSize.BUTTON) + self._button.set_tooltip_text(_('Load more messages')) + self._button.connect('clicked', self._on_load_history) + self.grid.attach(self._button, 0, 0, 1, 1) + + self.label.set_text(_('Scroll up to load more chat history…')) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class( + 'conversation-meta') + self.grid.attach(self.label, 0, 1, 1, 1) + + def _on_load_history(self, _button): + self.get_parent().emit('load-history', 30) + + +class ReadMarkerRow(ConversationRow): + def __init__(self, account, contact, timestamp): + ConversationRow.__init__(self, account) + self.type = 'read_marker' + self.timestamp = timestamp + + text = _('%s has read up to this point') % contact.name + self.label.set_text(text) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class( + 'conversation-read-marker') + self.grid.attach(self.label, 0, 0, 1, 1) + self.show_all() + + +class DateRow(ConversationRow): + def __init__(self, account, date_string, timestamp): + ConversationRow.__init__(self, account) + self.type = 'date' + self.timestamp = timestamp + self.get_style_context().add_class('conversation-date-row') + + self.label.set_text(date_string) + self.label.set_halign(Gtk.Align.CENTER) + self.label.set_hexpand(True) + self.label.get_style_context().add_class( + 'conversation-meta') + self.grid.attach(self.label, 0, 0, 1, 1) + + +class InfoMessageRow(ConversationRow): + def __init__(self, + account, + timestamp, + text, + other_text_tags, + kind, + subject, + graphics, + history_mode=False): + ConversationRow.__init__(self, account, widget='textview', + history_mode=history_mode) + self.type = 'info' + self.timestamp = timestamp + self.kind = kind + + if subject: + subject_title = _('Subject:') + text = (f'{subject_title}\n' + f'{GLib.markup_escape_text(subject)}\n' + f'{GLib.markup_escape_text(text)}') + else: + text = GLib.markup_escape_text(text) + + other_text_tags.append('status') + + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + timestamp_widget = self.create_timestamp_widget(timestamp) + timestamp_widget.set_valign(Gtk.Align.START) + self.grid.attach(timestamp_widget, 2, 0, 1, 1) + + self.textview.set_justification(Gtk.Justification.CENTER) + self.textview.print_text( + text, + other_text_tags=other_text_tags, + kind=kind, + graphics=graphics) + + self.grid.attach(self.textview, 1, 0, 1, 1) + + +class TextMessageRow(ConversationRow): + def __init__(self, + account, + message_id, + timestamp, + kind, + name, + text, + other_text_tags, + avatar, + is_groupchat, + additional_data=None, + display_marking=None, + marker=None, + error=None, + encryption_enabled=False, + history_mode=False): + + # other_tags_for_name contained 'marked', 'bold' and + # 'muc_nickname_color_', which are now derived from + # other_text_tags ('marked') + + # other_tags_for_time were always empty? + + ConversationRow.__init__(self, account, widget='textview', + history_mode=history_mode) + self.type = 'chat' + self.timestamp = timestamp + self.message_id = message_id + self.kind = kind + self.name = name or '' + self.text = text + + self._corrections = [] + self._has_receipt = marker == 'received' + self._has_displayed = marker == 'displayed' + self._button_icon = None + + if is_groupchat: + if other_text_tags and 'marked' in other_text_tags: + self.get_style_context().add_class( + 'conversation-mention-highlight') + + self.textview.connect('quote', self._on_quote_selection) + self.textview.print_text( + text, + other_text_tags=other_text_tags, + kind=kind, + name=name, + additional_data=additional_data) + + self._meta_box = Gtk.Box(spacing=6) + self._meta_box.pack_start( + self.create_name_widget(name, kind, is_groupchat), False, True, 0) + timestamp_label = self.create_timestamp_widget(timestamp) + timestamp_label.set_margin_start(6) + self._meta_box.pack_end(timestamp_label, False, True, 0) + # TODO: implement app.settings.get('print_time') 'always', 'sometimes'? + + if kind in ('incoming', 'incoming_queue', 'outgoing'): + encryption_img = self._get_encryption_image( + additional_data, encryption_enabled) + if encryption_img: + self._meta_box.pack_end(encryption_img, False, True, 0) + + if display_marking: + label_text = GLib.markup_escape_text(display_marking.name) + if label_text: + bgcolor = display_marking.bgcolor + fgcolor = display_marking.fgcolor + label_text = ( + f'<span size="small" bgcolor="{bgcolor}" ' + f'fgcolor="{fgcolor}"><tt>[{label_text}]</tt></span>') + display_marking_label = Gtk.Label() + display_marking_label.set_markup(label_text) + self._meta_box.add(display_marking_label) + + self._message_icons = MessageIcons() + + if error is not None: + self.set_error(to_user_string(error)) + + if marker is not None: + if marker in ('received', 'displayed'): + self.set_receipt() + + self._meta_box.pack_end(self._message_icons, False, True, 0) + + self._avatar_surface = Gtk.Image.new_from_surface(avatar) + avatar_placeholder = Gtk.Box() + avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) + avatar_placeholder.set_valign(Gtk.Align.START) + avatar_placeholder.add(self._avatar_surface) + + bottom_box = Gtk.Box(spacing=6) + bottom_box.add(self.textview) + bottom_box.add(self._create_more_button()) + + self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + self.grid.attach(self._meta_box, 1, 0, 1, 1) + self.grid.attach(bottom_box, 1, 1, 1, 1) + + def _create_more_button(self): + more_button = Gtk.MenuButton() + more_button.connect( + 'enter-notify-event', self._on_more_button_enter) + more_button.connect( + 'leave-notify-event', self._on_more_button_leave) + more_button.set_valign(Gtk.Align.START) + more_button.set_halign(Gtk.Align.END) + self._button_icon = Gtk.Image.new_from_icon_name( + 'view-more-symbolic', Gtk.IconSize.BUTTON) + self._button_icon.set_no_show_all(True) + more_button.add(self._button_icon) + more_button.set_relief(Gtk.ReliefStyle.NONE) + + menu_box = Gtk.Box(orientation=Gtk.Orientation.VERTICAL, spacing=6) + menu_box.get_style_context().add_class('padding-6') + + quote_button = Gtk.ModelButton() + quote_button.set_halign(Gtk.Align.START) + quote_button.connect('clicked', self._on_quote_message) + quote_button.set_label(_('Quote…')) + quote_button.set_image(Gtk.Image.new_from_icon_name( + 'mail-reply-sender-symbolic', Gtk.IconSize.MENU)) + menu_box.add(quote_button) + + copy_button = Gtk.ModelButton() + copy_button.set_halign(Gtk.Align.START) + copy_button.connect('clicked', self._on_copy_message) + copy_button.set_label(_('Copy')) + copy_button.set_image(Gtk.Image.new_from_icon_name( + 'edit-copy-symbolic', Gtk.IconSize.MENU)) + menu_box.add(copy_button) + + menu_box.show_all() + + popover = Gtk.PopoverMenu() + popover.add(menu_box) + more_button.set_popover(popover) + return more_button + + def _on_copy_message(self, _widget): + timestamp = self.timestamp.strftime('%x, %X') + clip = Gtk.Clipboard.get(Gdk.SELECTION_CLIPBOARD) + clip.set_text( + f'{timestamp} - {self.name}: {self.textview.get_text()}', -1) + + def _on_quote_message(self, _widget): + self.get_parent().on_quote(self.textview.get_text()) + + def _on_more_button_enter(self, _widget, _event): + self._button_icon.show() + + def _on_more_button_leave(self, widget, _event): + if not widget.get_active(): + self._button_icon.hide() + + def _get_encryption_image(self, additional_data, encryption_enabled=None): + details = self._get_encryption_details(additional_data) + if details is None: + # Message was not encrypted + if not encryption_enabled: + return None + icon = 'channel-insecure-symbolic' + color = 'unencrypted-color' + tooltip = _('Not encrypted') + else: + name, fingerprint, trust = details + tooltip = _('Encrypted (%s)') % (name) + if trust is None: + # The encryption plugin did not pass trust information + icon = 'channel-secure-symbolic' + color = 'encrypted-color' + else: + icon, trust_tooltip, color = TRUST_SYMBOL_DATA[trust] + tooltip = '%s\n%s' % (tooltip, trust_tooltip) + if fingerprint is not None: + fingerprint = format_fingerprint(fingerprint) + tooltip = '%s\n<tt>%s</tt>' % (tooltip, fingerprint) + + image = Gtk.Image.new_from_icon_name(icon, Gtk.IconSize.MENU) + image.set_tooltip_markup(tooltip) + image.get_style_context().add_class(color) + image.show() + return image + + @staticmethod + def _get_encryption_details(additional_data): + name = additional_data.get_value('encrypted', 'name') + if name is None: + return None + + fingerprint = additional_data.get_value('encrypted', 'fingerprint') + trust = additional_data.get_value('encrypted', 'trust') + return name, fingerprint, trust + + def _on_quote_selection(self, _widget, text): + self.get_parent().on_quote(text) + + @property + def has_receipt(self): + return self._has_receipt + + @property + def has_displayed(self): + return self._has_displayed + + def set_receipt(self): + self._has_receipt = True + self._message_icons.set_receipt_icon_visible(True) + + def set_displayed(self): + self._has_displayed = True + + def set_correction(self, message_id, text, other_text_tags, kind, name, + additional_data=None): + self._corrections.append(self.textview.get_text()) + self.textview.clear() + self._has_receipt = False + self._message_icons.set_receipt_icon_visible(False) + self._message_icons.set_correction_icon_visible(True) + + self.textview.print_text( + text, + other_text_tags=other_text_tags, + kind=kind, + name=name, + additional_data=additional_data) + + corrections = '\n'.join(line for line in self._corrections) + corrections = reduce_chars_newlines( + corrections, max_chars=150, max_lines=10) + self._message_icons.set_correction_tooltip( + _('Message corrected. Original message:\n%s') % corrections) + # Update message_id for this row + self.message_id = message_id + + def set_error(self, tooltip): + self._message_icons.set_error_icon_visible(True) + self._message_icons.set_error_tooltip(tooltip) + + def update_avatar(self, avatar): + self._avatar_surface.set_from_surface(avatar) + + def set_merged(self, merged): + if merged: + self._avatar_surface.set_no_show_all(True) + self._avatar_surface.hide() + self._meta_box.set_no_show_all(True) + self._meta_box.hide() + else: + self._avatar_surface.set_no_show_all(False) + self._avatar_surface.show() + self._meta_box.set_no_show_all(False) + self._meta_box.show() + + +class MessageIcons(Gtk.Box): + def __init__(self): + Gtk.Box.__init__(self, orientation=Gtk.Orientation.HORIZONTAL) + + self._correction_image = Gtk.Image.new_from_icon_name( + 'document-edit-symbolic', Gtk.IconSize.MENU) + self._correction_image.set_no_show_all(True) + self._correction_image.get_style_context().add_class('dim-label') + + self._marker_image = Gtk.Image() + self._marker_image.set_no_show_all(True) + self._marker_image.get_style_context().add_class('dim-label') + + self._error_image = Gtk.Image.new_from_icon_name( + 'dialog-warning-symbolic', Gtk.IconSize.MENU) + self._error_image.get_style_context().add_class('warning-color') + self._error_image.set_no_show_all(True) + + self.add(self._correction_image) + self.add(self._marker_image) + self.add(self._error_image) + self.show_all() + + def set_receipt_icon_visible(self, visible): + if not app.settings.get('positive_184_ack'): + return + self._marker_image.set_visible(visible) + self._marker_image.set_from_icon_name( + 'feather-check-symbolic', Gtk.IconSize.MENU) + self._marker_image.set_tooltip_text(Q_('?Message state:Received')) + + def set_correction_icon_visible(self, visible): + self._correction_image.set_visible(visible) + + def set_correction_tooltip(self, text): + self._correction_image.set_tooltip_markup(text) + + def set_error_icon_visible(self, visible): + self._error_image.set_visible(visible) + + def set_error_tooltip(self, text): + self._error_image.set_tooltip_markup(text) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7e9c7934f7a5c1d61e13eed2f0464dd… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/e7e9c7934f7a5c1d61e13eed2f0464dd… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] MessageInputTextView: Improve style
by Daniel Brötzmann 26 Mar '21

26 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 4e6a0ade by Daniel Brötzmann at 2021-03-26T16:37:07+01:00 MessageInputTextView: Improve style - - - - - 2 changed files: - gajim/chat_control_base.py - gajim/data/style/gajim.css Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -217,6 +217,8 @@ def __init__(self, parent_win, widget_name, contact, acct, 'set_visible') self.msg_scrolledwindow = ScrolledWindow() + self.msg_scrolledwindow.set_margin_start(3) + self.msg_scrolledwindow.set_margin_end(3) self.msg_scrolledwindow.get_style_context().add_class( 'message-input-border') self.msg_scrolledwindow.add(self.msg_textview) ===================================== gajim/data/style/gajim.css ===================================== @@ -31,7 +31,8 @@ .chatcontrol-separator {margin-bottom: 5px;} .message-input-border { - border: 2px solid transparent; + border: 2px solid @theme_unfocused_bg_color; + border-radius: 4px; } .message-input-focus { border: 2px solid @theme_selected_bg_color; View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e6a0ade1952975de67b0b10487420b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/4e6a0ade1952975de67b0b10487420b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: MessageInputTextView: Remove custom placeholder
by Daniel Brötzmann 25 Mar '21

25 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: d7732dfa by Daniel Brötzmann at 2021-03-25T21:09:05+01:00 MessageInputTextView: Remove custom placeholder - - - - - fadc7596 by Daniel Brötzmann at 2021-03-25T21:09:09+01:00 MessageInputTextView: Add focus borders - - - - - 7 changed files: - gajim/chat_control_base.py - gajim/common/modules/chatstates.py - gajim/data/style/default-dark.css - gajim/data/style/default.css - gajim/data/style/gajim.css - gajim/groupchat_control.py - gajim/gtk/message_input.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -203,8 +203,8 @@ def __init__(self, parent_win, widget_name, contact, acct, self._on_message_textview_key_press_event) self.msg_textview.connect('populate-popup', self.on_msg_textview_populate_popup) - self.msg_textview.connect('text-changed', - self._on_message_tv_buffer_changed) + self.msg_textview.get_buffer().connect( + 'changed', self._on_message_tv_buffer_changed) # Send message button self.xml.send_message_button.set_action_name( @@ -217,6 +217,8 @@ def __init__(self, parent_win, widget_name, contact, acct, 'set_visible') self.msg_scrolledwindow = ScrolledWindow() + self.msg_scrolledwindow.get_style_context().add_class( + 'message-input-border') self.msg_scrolledwindow.add(self.msg_textview) self.xml.hbox.pack_start(self.msg_scrolledwindow, True, True, 0) @@ -742,7 +744,6 @@ def on_msg_textview_populate_popup(self, _textview, menu): menu.show_all() def insert_as_quote(self, text: str) -> None: - self.msg_textview.remove_placeholder() text = '> ' + text.replace('\n', '\n> ') + '\n' message_buffer = self.msg_textview.get_buffer() message_buffer.insert_at_cursor(text) @@ -1060,7 +1061,7 @@ def _on_window_motion_notify(self, *args): con.get_module('Chatstate').set_mouse_activity( self.contact, self.msg_textview.has_text()) - def _on_message_tv_buffer_changed(self, textview, textbuffer): + def _on_message_tv_buffer_changed(self, textbuffer): has_text = self.msg_textview.has_text() if self.parent_win is not None: self.parent_win.window.lookup_action( @@ -1072,7 +1073,7 @@ def _on_message_tv_buffer_changed(self, textview, textbuffer): con = app.connections[self.account] con.get_module('Chatstate').set_keyboard_activity(self.contact) - if not textview.has_text(): + if not has_text: con.get_module('Chatstate').set_chatstate_delayed(self.contact, Chatstate.ACTIVE) return @@ -1285,7 +1286,6 @@ def set_emoticon_popover(self): self._on_emoticon_button_clicked) def _on_emoticon_button_clicked(self, _widget): - self.msg_textview.remove_placeholder() # Present GTK emoji chooser (not cross platform compatible) self.msg_textview.emit('insert-emoji') self.xml.emoticons_button.set_property('active', False) ===================================== gajim/common/modules/chatstates.py ===================================== @@ -237,8 +237,8 @@ def get_active_chatstate(self, contact: ContactT) -> Optional[str]: def block_chatstates(self, contact: ContactT, block: bool) -> None: # Block sending chatstates to a contact # Used for example if we cycle through the MUC nick list, which - # produces a lot of text-changed signals from the textview. This - # Would lead to sending ACTIVE -> COMPOSING -> ACTIVE ... + # produces a lot of buffer 'changed' signals from the input textview. + # This would lead to sending ACTIVE -> COMPOSING -> ACTIVE ... if block: self._blocked.append(contact.jid) else: ===================================== gajim/data/style/default-dark.css ===================================== @@ -41,9 +41,6 @@ .gajim-state-paused { color: rgb(20, 210, 160); } -.gajim-message-placeholder { - color: rgb(195, 195, 195); -} .gajim-msg-correcting text { background: rgb(100, 100, 50); } ===================================== gajim/data/style/default.css ===================================== @@ -41,9 +41,6 @@ .gajim-state-paused { color: rgb(20, 160, 120); } -.gajim-message-placeholder { - color: rgb(170, 170, 170); -} .gajim-msg-correcting text { background: rgb(240, 230, 170); } ===================================== gajim/data/style/gajim.css ===================================== @@ -30,6 +30,14 @@ .chatcontrol-separator {margin-bottom: 5px;} +.message-input-border { + border: 2px solid transparent; +} +.message-input-focus { + border: 2px solid @theme_selected_bg_color; + border-radius: 4px; +} + .link-button { min-height: 0px; } /* VCardWindow */ ===================================== gajim/groupchat_control.py ===================================== @@ -1915,7 +1915,6 @@ def _start_private_message(self, nick): return ctrl def append_nick_in_msg_textview(self, _widget, nick): - self.msg_textview.remove_placeholder() message_buffer = self.msg_textview.get_buffer() start_iter, end_iter = message_buffer.get_bounds() cursor_position = message_buffer.get_insert() ===================================== gajim/gtk/message_input.py ===================================== @@ -20,14 +20,11 @@ from gi.repository import Gtk from gi.repository import Gdk from gi.repository import GLib -from gi.repository import GObject from gi.repository import Pango from nbxmpp.modules.misc import build_xhtml_body from gajim.common import app -from gajim.common.i18n import _ -from gajim.common.const import StyleAttr from gajim.common.regex import LINK_REGEX from .util import scroll_to_end @@ -41,12 +38,7 @@ class MessageInputTextView(Gtk.TextView): Class for the message textview (where user writes new messages) for chat/groupchat windows """ - __gsignals__ = { - 'text-changed': (GObject.SignalFlags.RUN_LAST, None, (Gtk.TextBuffer,)) - } - UNDO_LIMIT = 20 - PLACEHOLDER = _('Write a message…') def __init__(self): Gtk.TextView.__init__(self) @@ -70,8 +62,6 @@ def __init__(self): # needed to know if we undid something self.undo_pressed = False - buffer_ = self.get_buffer() - buffer_.connect('changed', self._on_buffer_changed) self._last_text = '' self.begin_tags = {} @@ -80,11 +70,7 @@ def __init__(self): self.fonts_tags = [] self.other_tags = {} - color = app.css_config.get_value( - '.gajim-message-placeholder', StyleAttr.COLOR) - self.placeholder_tag = buffer_.create_tag('placeholder') - self.placeholder_tag.set_property('foreground', color) - + buffer_ = self.get_buffer() self.other_tags['bold'] = buffer_.create_tag('bold') self.other_tags['bold'].set_property('weight', Pango.Weight.BOLD) self.begin_tags['bold'] = '<strong>' @@ -105,10 +91,8 @@ def __init__(self): self.begin_tags['strike'] = strike self.end_tags['strike'] = '</span>' - self.connect('paste-clipboard', self._paste_clipboard) self.connect_after('paste-clipboard', self._after_paste_clipboard) - self.connect('focus-in-event', self._on_grab_focus) - self.connect('grab-focus', self._on_grab_focus) + self.connect('focus-in-event', self._on_focus_in) self.connect('focus-out-event', self._on_focus_out) self.connect('destroy', self._on_destroy) @@ -123,15 +107,15 @@ def _on_destroy(self, *args): None, Gdk.DragAction.DEFAULT) - def _on_buffer_changed(self, *args): - text = self.get_text() - # Because of inserting and removing PLACEHOLDER text - # the signal becomes unreliable when determining if the user - # typed in new text. So we send our own signal depending on if - # there is real new text that is not the PLACEHOLDER - if text != self._last_text: - self.emit('text-changed', self.get_buffer()) - self._last_text = text + def _on_focus_in(self, _widget, _event): + scrolled = self.get_parent() + scrolled.get_style_context().add_class('message-input-focus') + return False + + def _on_focus_out(self, _widget, _event): + scrolled = self.get_parent() + scrolled.get_style_context().remove_class('message-input-focus') + return False def insert_text(self, text): self.get_buffer().insert_at_cursor(text) @@ -148,50 +132,19 @@ def has_text(self): buf = self.get_buffer() start, end = buf.get_bounds() text = buf.get_text(start, end, True) - return text not in (self.PLACEHOLDER, '') + return text != '' def get_text(self): - # gets the text if its not PLACEHOLDER buf = self.get_buffer() start, end = buf.get_bounds() text = self.get_buffer().get_text(start, end, True) - if text == self.PLACEHOLDER: - return '' return text - def is_placeholder(self): - buf = self.get_buffer() - start, end = buf.get_bounds() - text = buf.get_text(start, end, True) - return text == self.PLACEHOLDER - - def remove_placeholder(self): - if self.is_placeholder(): - self.get_buffer().set_text('') - self.toggle_speller(True) - - def _on_grab_focus(self, *args): - self.remove_placeholder() - - def _on_focus_out(self, *args): - buf = self.get_buffer() - start, end = buf.get_bounds() - text = buf.get_text(start, end, True) - if text == '': - buf.insert_with_tags( - start, self.PLACEHOLDER, self.placeholder_tag) - self.toggle_speller(False) - def toggle_speller(self, activate): if app.is_installed('GSPELL') and app.settings.get('use_speller'): spell_view = Gspell.TextView.get_from_gtk_text_view(self) spell_view.set_inline_spell_checking(activate) - @staticmethod - def _paste_clipboard(textview): - if textview.is_placeholder(): - textview.get_buffer().set_text('') - @staticmethod def _after_paste_clipboard(textview): buffer_ = textview.get_buffer() @@ -429,7 +382,6 @@ def replace_char_at_iter(self, iter_, new_char): buffer_.insert(iter_, new_char) def insert_emoji(self, codepoint, pixbuf): - self.remove_placeholder() buffer_ = self.get_buffer() if buffer_.get_char_count(): # buffer contains text View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7a02bd196709a642f7149d6dabda18… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/e7a02bd196709a642f7149d6dabda18… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits