Commits March 2021

commits@gajim.org

1 participants
106 discussions

[Git][gajim/gajim][master] Accounts: Add account switch description
by Daniel Brötzmann 30 Mar '21

30 Mar '21

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 15f73dad by Daniel Brötzmann at 2021-03-30T09:05:46+02:00 Accounts: Add account switch description - - - - - 1 changed file: - gajim/gtk/accounts.py Changes: ===================================== gajim/gtk/accounts.py ===================================== @@ -25,6 +25,7 @@ from gajim.common import app from gajim.common import passwords from gajim.common.i18n import _ +from gajim.common.i18n import Q_ from .dialogs import DialogButton from .dialogs import ConfirmationDialog @@ -482,11 +483,17 @@ def __init__(self, account): Gtk.IconSize.MENU) next_icon.get_style_context().add_class('insensitive-fg-color') + account_enabled = app.settings.get_account_setting( + self._account, 'active') self._switch = Gtk.Switch() - self._switch.set_active( - app.settings.get_account_setting(self._account, 'active')) + self._switch.set_active(account_enabled) self._switch.set_vexpand(False) + self._switch_state_label = Gtk.Label() + self._switch_state_label.set_xalign(1) + self._switch_state_label.set_valign(Gtk.Align.CENTER) + self._set_label(account_enabled) + if (self._account == app.ZEROCONF_ACC_NAME and not app.is_installed('ZEROCONF')): self._switch.set_active(False) @@ -502,6 +509,8 @@ def __init__(self, account): 'state-set', self._on_enable_switch, self._account) box.add(self._switch) + box.add(self._switch_state_label) + box.add(Gtk.Separator()) box.add(self._label) box.add(next_icon) self.add(box) @@ -519,12 +528,18 @@ def update_account_label(self): def enable_account(self, state): self._switch.set_state(state) + self._set_label(state) + + def _set_label(self, active): + text = Q_('?switch:On') if active else Q_('?switch:Off') + self._switch_state_label.set_text(text) def _on_enable_switch(self, switch, state, account): def _disable(): app.connections[account].change_status('offline', 'offline') app.interface.disable_account(account) switch.set_state(state) + self._set_label(state) old_state = app.settings.get_account_setting(account, 'active') if old_state == state: View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15f73dadff5740e1fd74a87ca184fdc8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/15f73dadff5740e1fd74a87ca184fdc8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] Flatpak: Update dependencies
by André 29 Mar '21

29 Mar '21

André pushed to branch master at gajim / gajim Commits: b8690214 by André Apitzsch at 2021-03-29T12:50:51+02:00 Flatpak: Update dependencies - - - - - 1 changed file: - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -1,6 +1,6 @@ app-id: org.gajim.Gajim.Devel runtime: org.gnome.Platform -runtime-version: '3.38' +runtime-version: '40' sdk: org.gnome.Sdk command: gajim-devel tags: @@ -86,8 +86,8 @@ modules: - pip3 install --prefix=/app . sources: - type: archive - url: https://files.pythonhosted.org/packages/66/6a/98e023b3d11537a5521902ac6b50d… - sha256: 1a465cbe98a7fd391d47dce4b8f7e5b921e6cd805ef421d04f5f66ba8f06086c + url: https://files.pythonhosted.org/packages/a8/20/025f59f929bbcaa579704f443a438… + sha256: fd78e5fee591709f32ef6edb9a015b4aa1a5022598e36227500c8f4e02328d9c - name: python3-asn1crypto buildsystem: simple @@ -101,11 +101,11 @@ modules: - name: python3-idna buildsystem: simple build-commands: - - pip3 install --prefix=/app idna-2.10-py2.py3-none-any.whl + - pip3 install --prefix=/app idna-3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/a2/38/928ddce2273eaa564f6f50de91932… - sha256: b97d804b1e9b523befed77c48dacec60e6dcb0b5391d57af6a65a312a90648c0 + url: https://files.pythonhosted.org/packages/29/88/c52aae187d3b128a0f13f36a6c987… + sha256: 5205d03e7bcbb919cc9c19885f9920d622ca52448306f2377daede5cf3faac16 - name: python3-cryptography buildsystem: simple @@ -113,8 +113,8 @@ modules: - python3 setup.py install --prefix=/app sources: - type: archive - url: https://files.pythonhosted.org/packages/b7/82/f7a4ddc1af185936c1e4fa000942f… - sha256: 7e177e4bea2de937a584b13645cab32f25e3d96fc0bc4a4cf99c27dc77682be6 + url: https://files.pythonhosted.org/packages/d4/85/38715448253404186029c575d5598… + sha256: 5a60d3780149e13b7a6ff7ad6526b38846354d11a15e21068e57073e29e19bed - name: python3-pyopenssl buildsystem: simple @@ -146,31 +146,43 @@ modules: - name: python3-secretstorage buildsystem: simple build-commands: - - pip3 install --prefix=/app SecretStorage-3.3.0-py3-none-any.whl + - pip3 install --prefix=/app SecretStorage-3.3.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/63/a2/a6d9099b14eb5dbbb04fb722d2b53… - sha256: 5c36f6537a523ec5f969ef9fad61c98eb9e017bc601d811e53aa25bece64892f + url: https://files.pythonhosted.org/packages/d9/1e/29cd69fdac7391aa51510dfd42aa7… + sha256: 422d82c36172d88d6a0ed5afdec956514b189ddbfb72fefab0c8a1cee4eaf71f - name: python3-zipp buildsystem: simple build-commands: - - pip3 install --prefix=/app zipp-3.4.0-py3-none-any.whl + - pip3 install --prefix=/app zipp-3.4.1-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/41/ad/6a4f1a124b325618a7fb758b885b6… - sha256: 102c24ef8f171fd729d46599845e95c7ab894a4cf45f5de11a44cc7444fb1108 + url: https://files.pythonhosted.org/packages/0f/8c/715c54e9e34c0c4820f616a913a7d… + sha256: 51cb66cc54621609dd593d1787f286ee42a5c0adbb4b29abea5a63edc3e03098 + + # keyring dependency + - name: python3-importlib-metadata + buildsystem: simple + build-commands: + - pip3 install --prefix=/app importlib_metadata-3.9.0-py3-none-any.whl + cleanup: + - /bin + sources: + - type: file + url: https://files.pythonhosted.org/packages/d9/10/191b97506cd4cceb4b860fb5c75b2… + sha256: 6fd684b4c6c7bb36d57e93d57fc244b5ffc08faa1c298bcda3dfbbbf19d7550a - name: python3-keyring buildsystem: simple build-commands: - - pip3 install --prefix=/app keyring-22.0.1-py3-none-any.whl + - pip3 install --prefix=/app keyring-23.0.1-py3-none-any.whl cleanup: - /bin sources: - type: file - url: https://files.pythonhosted.org/packages/96/17/86e1e5b50dc14e5984a661dde2ed3… - sha256: 9f44660a5d4931bdc14c08a1d01ef30b18a7a8147380710d8c9f9531e1f6c3c0 + url: https://files.pythonhosted.org/packages/26/f9/41230ac47f738f1ba66676dc8d3b3… + sha256: 8f607d7d1cc502c43a932a275a56fe47db50271904513a379d39df1af277ac48 - name: python3-css-parser buildsystem: simple @@ -184,11 +196,11 @@ modules: - name: python3-precis_i18n buildsystem: simple build-commands: - - pip3 install --prefix=/app precis_i18n-1.0.2-py3-none-any.whl + - pip3 install --prefix=/app precis_i18n-1.0.3-py3-none-any.whl sources: - type: file - url: https://files.pythonhosted.org/packages/13/f5/3a7485a32dd4422a2a78de744bea4… - sha256: c7d5a1f5667a6e7cb85db0a5a4ec8e1090eaeb6e189e8131a5ee238492d60445 + url: https://files.pythonhosted.org/packages/c1/28/0df691ebe7e28a68b839887ce81be… + sha256: b9a4ff1f2f8c4a762393cb1b80bf4cadfbe861ec299f752068cc42f281322d45 # GSound dependency - name: libcanberra View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8690214dc98a21e1beda89ebe2a8b43… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/b8690214dc98a21e1beda89ebe2a8b43… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] 2 commits: add new timestamp setting
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 298e80a2 by lovetox at 2021-03-28T21:53:19+02:00 add new timestamp setting - - - - - c86decc7 by lovetox at 2021-03-28T23:03:25+02:00 Group conversation code into own module - - - - - 12 changed files: - gajim/chat_control_base.py - gajim/common/setting_values.py - + gajim/gtk/conversation/__init__.py - + gajim/gtk/conversation/rows/__init__.py - + gajim/gtk/conversation/rows/base.py - + gajim/gtk/conversation/rows/date.py - + gajim/gtk/conversation/rows/info.py - + gajim/gtk/conversation/rows/message.py - + gajim/gtk/conversation/rows/read_marker.py - + gajim/gtk/conversation/rows/scroll_hint.py - gajim/gtk/conversation_view.py → gajim/gtk/conversation/view.py - gajim/gui/__init__.py Changes: ===================================== gajim/chat_control_base.py ===================================== @@ -49,7 +49,7 @@ from gajim import gtkgui_helpers -from gajim.gui.conversation_view import ConversationView +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 ===================================== gajim/common/setting_values.py ===================================== @@ -189,6 +189,7 @@ class _ACCOUNT_DEFAULT: 'show_send_message_button': False, 'workspace_order': [], 'chat_handle_position': 350, + 'chat_timestamp_format': '%H:%M', } ACCOUNT_SETTINGS = { @@ -413,6 +414,7 @@ class _ACCOUNT_DEFAULT: 'save-roster-position': _('If enabled, Gajim will save the contact list window position when hiding it, and restore it when showing the contact list window again.'), 'roster_on_the_right': _('Place the contact list on the right in single window mode'), 'time_stamp': _('This option lets you customize the timestamp that is printed in conversation. For example \'[%H:%M] \' will show \'[hour:minute] \'. See python doc on strftime for full documentation (https://docs.python.org/3/library/time.html#time.strftime).'), + 'chat_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', 'before_nickname': _('Characters that are printed before the nickname in conversations.'), 'after_nickname': _('Characters that are printed after the nickname in conversations.'), 'change_roster_title': _('If enabled, Gajim will add * and [n] in contact list window title.'), ===================================== gajim/gtk/conversation/__init__.py ===================================== ===================================== gajim/gtk/conversation/rows/__init__.py ===================================== ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -0,0 +1,139 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from datetime import datetime + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import Gtk +from gi.repository import Pango + +from gajim.common import app +from gajim.common.i18n import _ +from gajim.common.helpers import from_one_line + +from ...conversation_textview import ConversationTextview +from ...util import convert_rgba_to_hex +from ...util import text_to_color +from ...util import wrap_with_event_box + + +class BaseRow(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: + time_format = from_one_line(app.settings.get('chat_timestamp_format')) + 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 - %X')) + 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') + + 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}">{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(name) + return label + + +@wrap_with_event_box +class MoreMenuButton(Gtk.MenuButton): + def __init__(self, row): + Gtk.MenuButton.__init__(self) + + 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) ===================================== gajim/gtk/conversation/rows/date.py ===================================== @@ -0,0 +1,32 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk + +from .base import BaseRow + + +class DateRow(BaseRow): + def __init__(self, account, date_string, timestamp): + BaseRow.__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) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -0,0 +1,64 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common.const import AvatarSize +from gajim.common.i18n import _ + +from .base import BaseRow + + +class InfoMessageRow(BaseRow): + def __init__(self, + account, + timestamp, + text, + other_text_tags, + kind, + subject, + graphics, + history_mode=False): + BaseRow.__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) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -0,0 +1,285 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from gi.repository import Gdk +from gi.repository import GLib +from gi.repository import Gtk + +from gajim.common import app +from gajim.common.const import AvatarSize +from gajim.common.const import TRUST_SYMBOL_DATA +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 .base import BaseRow +from .base import MoreMenuButton +from ...util import format_fingerprint + + +class MessageRow(BaseRow): + 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? + + BaseRow.__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' + + 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(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 _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 _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.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) + 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) ===================================== gajim/gtk/conversation/rows/read_marker.py ===================================== @@ -0,0 +1,35 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + + +from gi.repository import Gtk + +from gajim.common.i18n import _ + +from .base import BaseRow + +class ReadMarkerRow(BaseRow): + def __init__(self, account, contact, timestamp): + BaseRow.__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() ===================================== gajim/gtk/conversation/rows/scroll_hint.py ===================================== @@ -0,0 +1,45 @@ +# This file is part of Gajim. +# +# Gajim is free software; you can redistribute it and/or modify +# it under the terms of the GNU General Public License as published +# by the Free Software Foundation; version 3 only. +# +# Gajim is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU General Public License for more details. +# +# You should have received a copy of the GNU General Public License +# along with Gajim. If not, see <http://www.gnu.org/licenses/>. + +from datetime import datetime + +from gi.repository import Gtk + +from gajim.common.i18n import _ + +from .base import BaseRow + + +class ScrollHintRow(BaseRow): + def __init__(self, account): + BaseRow.__init__(self, account) + self.type = 'system' + self.timestamp = datetime.fromtimestamp(0) + self.get_style_context().add_class('conversation-system-row') + + self._button = Gtk.Button.new_from_icon_name( + 'go-up-symbolic', Gtk.IconSize.BUTTON) + self._button.set_tooltip_text(_('Load more messages')) + self._button.connect('clicked', self._on_load_history) + self.grid.attach(self._button, 0, 0, 1, 1) + + self.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) ===================================== gajim/gtk/conversation_view.py → gajim/gtk/conversation/view.py ===================================== @@ -21,27 +21,21 @@ 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 -from .util import wrap_with_event_box +from .conversation.rows.read_marker import ReadMarkerRow +from .conversation.rows.scroll_hint import ScrollHintRow +from .conversation.rows.message import MessageRow +from .conversation.rows.info import InfoMessageRow +from .conversation.rows.date import DateRow + log = logging.getLogger('gajim.gui.conversation_view') @@ -182,7 +176,7 @@ def add_message(self, return avatar = self._get_avatar(kind, name) - message = TextMessageRow( + message = MessageRow( self._account, message_id, time_, @@ -504,468 +498,3 @@ 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') - - 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}">{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(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' - - 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(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 _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 _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.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) - 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) - - -@wrap_with_event_box -class MoreMenuButton(Gtk.MenuButton): - def __init__(self, row): - Gtk.MenuButton.__init__(self) - - 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) ===================================== gajim/gui/__init__.py ===================================== @@ -28,22 +28,36 @@ def find_spec(self, fullname, _path, _target=None): return spec def _find_module(self, module_name): - module_path = self._path / f'{module_name}.py' + base_path = Path(self._path) + + fallback_base_path = None + if self._fallback_path is not None: + fallback_base_path = Path(self._fallback_path) + + module_path = base_path / module_name + if module_path.is_dir(): + base_path = module_path + if fallback_base_path is not None: + fallback_base_path = fallback_base_path / module_name + + module_name = '__init__' + + module_path = base_path / f'{module_name}.py' if module_path.exists(): return module_path - module_path = self._path / f'{module_name}.pyc' + module_path = base_path / f'{module_name}.pyc' if module_path.exists(): return module_path - if self._fallback_path is None: + if fallback_base_path is None: return None - module_path = self._fallback_path / f'{module_name}.py' + module_path = fallback_base_path / f'{module_name}.py' if module_path.exists(): return module_path - module_path = self._fallback_path / f'{module_name}.pyc' + module_path = fallback_base_path / f'{module_name}.pyc' if module_path.exists(): return module_path View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80bac099bcc5f650e845cccc176bcf1… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/80bac099bcc5f650e845cccc176bcf1… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][mainwindow] Wrap menu button in eventbox
by Philipp Hörist 28 Mar '21

28 Mar '21

Philipp Hörist pushed to branch mainwindow at gajim / gajim Commits: 80bac099 by lovetox at 2021-03-28T21:24:12+02:00 Wrap menu button in eventbox - - - - - 2 changed files: - gajim/gtk/conversation_view.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/conversation_view.py ===================================== @@ -41,7 +41,7 @@ from .util import format_fingerprint from .util import scroll_to_end from .util import text_to_color -from .util import get_cursor +from .util import wrap_with_event_box log = logging.getLogger('gajim.gui.conversation_view') @@ -928,12 +928,11 @@ def set_error_tooltip(self, text): self._error_image.set_tooltip_markup(text) +@wrap_with_event_box 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) @@ -970,6 +969,3 @@ def _create_popover(self, row): popover = Gtk.PopoverMenu() popover.add(menu_box) self.set_popover(popover) - - def _on_realize(self, *args): - self.get_window().set_cursor(get_cursor('pointer')) ===================================== gajim/gtk/util.py ===================================== @@ -884,3 +884,18 @@ def disconnect_cb(*args): def connect_destroy(sender, *args, **kwargs): return _connect_destroy(sender, sender.connect, *args, **kwargs) + + +def wrap_with_event_box(klass): + @wraps(klass) + def klass_wrapper(*args, **kwargs): + widget = klass(*args, **kwargs) + event_box = Gtk.EventBox() + + def _on_realize(*args): + event_box.get_window().set_cursor(get_cursor('pointer')) + + event_box.connect_after('realize', _on_realize) + event_box.add(widget) + return event_box + return klass_wrapper View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80bac099bcc5f650e845cccc176bcf1a… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/80bac099bcc5f650e845cccc176bcf1a… You're receiving this email because of your account on dev.gajim.org.

1 0

[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

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits March 2021