Commits

commits@gajim.org

17632 discussions

[Git][gajim/gajim][master] imprv: Avatar: Follow modernxmpps suggestions for color generation
by Philipp Hörist (＠lovetox) 10 Oct '22

10 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 59e6de35 by Philipp Hörist at 2022-10-10T22:01:37+02:00 imprv: Avatar: Follow modernxmpps suggestions for color generation Single Chat: Bare JID Private Group Chat: Bare JID Public Group Chat: Resource - - - - - 2 changed files: - gajim/gtk/avatar.py - gajim/gtk/util.py Changes: ===================================== gajim/gtk/avatar.py ===================================== @@ -41,9 +41,9 @@ from .const import DEFAULT_WORKSPACE_COLOR from .emoji_data_gtk import get_emoji_data +from .util import get_contact_color from .util import load_icon_surface from .util import load_pixbuf -from .util import text_to_color from .util import scale_with_ratio from .util import get_css_show_class from .util import convert_rgb_string_to_float @@ -124,12 +124,11 @@ def generate_avatar(letters: str, @lru_cache(maxsize=None) def generate_default_avatar(letter: str, - color_string: str, + color: tuple[float, float, float], size: int, scale: int, style: str = 'circle') -> cairo.ImageSurface: - color = text_to_color(color_string) surface = generate_avatar(letter, color, size, scale) surface = clip(surface, style) surface.set_device_scale(scale, scale) @@ -414,11 +413,10 @@ def get_surface(self, return surface name = contact.name - color_string = str(contact.jid) - + color = get_contact_color(contact) letter = generate_avatar_letter(name) surface = generate_default_avatar( - letter, color_string, size, scale, style=style) + letter, color, size, scale, style=style) if show is not None: surface = add_status_to_avatar(surface, show) self._cache[jid][(size, scale, show)] = surface @@ -457,9 +455,12 @@ def get_muc_surface(self, app.storage.cache.set_muc(jid, 'avatar', None) client = app.get_client(account) + contact = client.get_module('Contacts').get_bare_contact(jid) + name = get_groupchat_name(client, jid) + color = get_contact_color(contact) letter = generate_avatar_letter(name) - surface = generate_default_avatar(letter, str(jid), size, scale, style) + surface = generate_default_avatar(letter, color, size, scale, style) self._cache[jid][(size, scale, None)] = surface return surface ===================================== gajim/gtk/util.py ===================================== @@ -48,12 +48,14 @@ from gajim.common import app from gajim.common import configpaths +from gajim.common import types from gajim.common.i18n import _ from gajim.common.helpers import URL_REGEX from gajim.common.const import LOCATION_DATA from gajim.common.const import Display from gajim.common.const import StyleAttr from gajim.common.ged import EventHelper as CommonEventHelper +from gajim.common.modules.contacts import GroupchatParticipant from gajim.common.styling import PlainBlock from gajim.common.structs import VariantMixin @@ -507,6 +509,19 @@ def text_to_color(text: str) -> tuple[float, float, float]: return nbxmpp.util.text_to_color(text, background) # type: ignore +def get_contact_color(contact: types.ChatContactT + ) -> tuple[float, float, float]: + + if isinstance(contact, GroupchatParticipant): + if contact.room.muc_context in (None, 'public'): + return text_to_color(contact.name) + + if contact.real_jid is not None: + return text_to_color(str(contact.real_jid)) + + return text_to_color(str(contact.jid)) + + def get_color_for_account(account: str) -> str: col_r, col_g, col_b = text_to_color(account) rgba = Gdk.RGBA(red=col_r, green=col_g, blue=col_b) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59e6de350b04cf07516483dcaba76e6c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/59e6de350b04cf07516483dcaba76e6c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Preferences: Move show_chatstate_in_banner to ACE settings
by Daniel Brötzmann (＠wurstsalat) 10 Oct '22

10 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: ca13e02e by wurstsalat at 2022-10-10T20:22:21+02:00 change: Preferences: Move show_chatstate_in_banner to ACE settings - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/preferences.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -685,6 +685,8 @@ class WorkspaceSettings(TypedDict): 'search_engine': '', 'send_on_ctrl_enter': _( 'Send message on Ctrl+Enter and make a new line with Enter.'), + 'show_chatstate_in_banner': _( + 'Show chat state (e.g. "is typing…") next to your contact’s name'), 'stun_server': _('STUN server to use when using Jingle'), 'trayicon_notification_on_events': _( 'Notify of events in the notification area.'), ===================================== gajim/gtk/preferences.py ===================================== @@ -303,12 +303,6 @@ def __init__(self, *args: Any) -> None: 'print_status_in_chats', desc=_('For example: "Julia is now online"')), - Setting(SettingKind.SWITCH, - _('Show Chat State In Banner'), - SettingType.CONFIG, - 'show_chatstate_in_banner', - desc=_('Show the contact’s chat state (e.g. typing) in ' - 'the chats tab’s banner')), ] PreferenceBox.__init__(self, settings) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca13e02e7b25cffb6bc2f0aa9805acc5… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/ca13e02e7b25cffb6bc2f0aa9805acc5… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Remove confirm_paste_image setting
by Philipp Hörist (＠lovetox) 10 Oct '22

10 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 63e5f254 by Philipp Hörist at 2022-10-10T20:22:12+02:00 change: Remove confirm_paste_image setting Pasting a image in the chat should always be confirmed. - - - - - 3 changed files: - gajim/common/setting_values.py - gajim/gtk/dialogs.py - gajim/gtk/message_actions_box.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -46,7 +46,6 @@ class _ACCOUNT_DEFAULT: 'check_for_update', 'confirm_close_muc', 'confirm_on_window_delete', - 'confirm_paste_image', 'dev_force_bookmark_2', 'dev_use_message_label', 'developer_modus', @@ -184,7 +183,6 @@ class _ACCOUNT_DEFAULT: 'confirm_block': '', 'confirm_close_muc': True, 'confirm_on_window_delete': True, - 'confirm_paste_image': True, 'dark_theme': 2, 'date_timestamp_format': '%x', 'dev_force_bookmark_2': False, @@ -641,7 +639,6 @@ class WorkspaceSettings(TypedDict): 'confirm_close_muc': _('Ask before closing a group chat tab/window.'), 'confirm_on_window_delete': _( 'Ask before quitting when Gajim’s window is closed'), - 'confirm_paste_image': _('Ask before pasting an image.'), 'date_timestamp_format': 'https://docs.python.org/3/library/time.html#time.strftime', # noqa: E501 'dev_force_bookmark_2': _('Force Bookmark 2 usage'), 'dev_use_message_label': '', ===================================== gajim/gtk/dialogs.py ===================================== @@ -335,7 +335,7 @@ def _on_response(self, super()._on_response(_dialog, response) -class PastePreviewDialog(ConfirmationCheckDialog): +class PastePreviewDialog(ConfirmationDialog): def __init__(self, title: str, text: str, @@ -346,14 +346,13 @@ def __init__(self, modal: bool = True, transient_for: Optional[Gtk.Window] = None ) -> None: - ConfirmationCheckDialog.__init__(self, - title, - text, - sec_text, - check_text, - buttons, - transient_for=transient_for, - modal=modal) + ConfirmationDialog.__init__(self, + title, + text, + sec_text, + buttons, + transient_for=transient_for, + modal=modal) preview = Gtk.Image() preview.set_halign(Gtk.Align.CENTER) ===================================== gajim/gtk/message_actions_box.py ===================================== @@ -579,10 +579,6 @@ def _on_paste_clipboard(self, if image is None: return - if not app.settings.get('confirm_paste_image'): - self._paste_event_confirmed(True, image) - return - PastePreviewDialog( _('Paste Image'), _('You are trying to paste an image'), @@ -591,17 +587,14 @@ def _on_paste_clipboard(self, _('_Do not ask me again'), image, [DialogButton.make('Cancel'), - DialogButton.make('Accept', - text=_('_Paste'), - callback=self._paste_event_confirmed, - args=[image])]).show() + DialogButton.make('Accept', + text=_('_Paste'), + callback=self._paste_event_confirmed, + args=[image])]).show() def _paste_event_confirmed(self, - is_checked: bool, image: GdkPixbuf.Pixbuf ) -> None: - if is_checked: - app.settings.set('confirm_paste_image', False) dir_ = tempfile.gettempdir() path = os.path.join(dir_, f'{uuid.uuid4()}.png') View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63e5f254e006685dcc97372190442c34… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/63e5f254e006685dcc97372190442c34… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] change: Remove setting to hide the chat banner
by Philipp Hörist (＠lovetox) 10 Oct '22

10 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 26805837 by Philipp Hörist at 2022-10-10T20:17:13+02:00 change: Remove setting to hide the chat banner As we place important functionality like hiding the groupchat roster in the banner, hiding it is not an option anymore - - - - - 2 changed files: - gajim/common/setting_values.py - gajim/gtk/chat_banner.py Changes: ===================================== gajim/common/setting_values.py ===================================== @@ -58,8 +58,6 @@ class _ACCOUNT_DEFAULT: 'gc_notify_on_all_messages_public_default', 'gc_print_join_left_default', 'gc_print_status_default', - 'hide_chat_banner', - 'hide_groupchat_banner', 'hide_groupchat_occupants_list', 'ignore_incoming_attention', 'is_window_visible', @@ -209,8 +207,6 @@ class _ACCOUNT_DEFAULT: 'gc_sync_threshold_public_default': 1, 'global_proxy': '', 'groupchat_roster_width': 210, - 'hide_chat_banner': False, - 'hide_groupchat_banner': False, 'hide_groupchat_occupants_list': False, 'ignore_incoming_attention': False, 'is_window_visible': True, @@ -670,8 +666,6 @@ class WorkspaceSettings(TypedDict): 'Character to add after nickname when using nickname completion ' '(tab) in group chat.'), 'groupchat_roster_width': _('Width of group chat roster in pixel'), - 'hide_chat_banner': _('Hides the banner in a 1:1 chat window.'), - 'hide_groupchat_banner': _('Hides the banner in a group chat window.'), 'ignore_incoming_attention': _( 'If enabled, Gajim will ignore incoming attention ' 'requests ("wizz").'), ===================================== gajim/gtk/chat_banner.py ===================================== @@ -71,14 +71,6 @@ def __init__(self) -> None: 'hide_groupchat_occupants_list', self._set_toggle_roster_button_icon) - app.settings.connect_signal( - 'hide_chat_banner', - self._update_hide_banner) - - app.settings.connect_signal( - 'hide_groupchat_banner', - self._update_hide_banner) - self.show_all() def clear(self) -> None: @@ -108,7 +100,6 @@ def switch_contact(self, contact: types.ChatContactT) -> None: self._update_visitor_button() self._update_name_label() self._update_account_badge() - self._update_hide_banner() def _connect_signals(self) -> None: assert self._contact is not None @@ -250,22 +241,6 @@ def _update_roster_button(self) -> None: self._ui.toggle_roster_button.set_visible( isinstance(self._contact, GroupchatContact)) - def _update_hide_banner(self, *args: Any) -> None: - if self._contact is None: - return - - if isinstance(self._contact, GroupchatContact): - hide_banner = app.settings.get('hide_groupchat_banner') - else: - hide_banner = app.settings.get('hide_chat_banner') - - if hide_banner: - self.set_no_show_all(True) - self.hide() - else: - self.set_no_show_all(False) - self.show_all() - def _update_avatar(self) -> None: scale = app.window.get_scale_factor() assert self._contact View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/26805837d2b22b867a01cda4dd7ae8c4… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/26805837d2b22b867a01cda4dd7ae8c4… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] ci: Flatpak: Remove not allowed folder cleanup
by Philipp Hörist (＠lovetox) 09 Oct '22

09 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 2c55d99f by Philipp Hörist at 2022-10-09T23:11:13+02:00 ci: Flatpak: Remove not allowed folder cleanup This is disallowed by flatpaks manifest lint tool - - - - - 2 changed files: - flatpak/org.gajim.Gajim.Devel.yaml - flatpak/org.gajim.Gajim.yaml Changes: ===================================== flatpak/org.gajim.Gajim.Devel.yaml ===================================== @@ -52,7 +52,6 @@ build-options: cleanup: - /include - - /lib/debug - /lib/pkgconfig - /share/gtk-doc - /share/man ===================================== flatpak/org.gajim.Gajim.yaml ===================================== @@ -45,7 +45,6 @@ build-options: cleanup: - /include - - /lib/debug - /lib/pkgconfig - /share/gtk-doc - /share/man View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c55d99ff09f3969c3161ff55be6e2a8… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/2c55d99ff09f3969c3161ff55be6e2a8… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 3 commits: refactor: Move MessageIcons into widget module
by Philipp Hörist (＠lovetox) 09 Oct '22

09 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 4166e403 by Philipp Hörist at 2022-10-09T20:08:35+02:00 refactor: Move MessageIcons into widget module - - - - - 48f48849 by Philipp Hörist at 2022-10-09T20:14:00+02:00 refactor: Move widget settings into MoreMenuButton - - - - - fdc424f5 by Philipp Hörist at 2022-10-09T21:50:11+02:00 refactor: Add AvatarBox Move code related to the avatar image into its own widget - - - - - 2 changed files: - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -44,22 +44,21 @@ from gajim.common.helpers import to_user_string from gajim.common.i18n import _ from gajim.common.i18n import is_rtl_text -from gajim.common.i18n import Q_ from gajim.common.modules.contacts import GroupchatContact from gajim.common.types import ChatContactT from .base import BaseRow +from .widgets import AvatarBox from .widgets import DateTimeLabel from .widgets import NicknameLabel +from .widgets import MessageIcons from .widgets import MoreMenuButton from ..message_widget import MessageWidget from ...dialogs import InputDialog from ...dialogs import DialogButton -from ...menus import get_groupchat_participant_menu from ...preview import PreviewWidget -from ...util import GajimPopover from ...util import format_fingerprint -from ...util import get_cursor + MERGE_TIMEFRAME = timedelta(seconds=120) @@ -179,19 +178,9 @@ def __init__(self, self.set_receipt() self._meta_box.pack_start(self._message_icons, False, True, 0) - avatar = self._get_avatar(kind, name) - self._avatar_image = Gtk.Image.new_from_surface(avatar) - if self._is_groupchat: - avatar_placeholder = Gtk.EventBox() - avatar_placeholder.connect( - 'button-press-event', self._on_avatar_clicked, name) - avatar_placeholder.connect('realize', self._on_realize) - else: - avatar_placeholder = Gtk.Box() - avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) - avatar_placeholder.set_valign(Gtk.Align.START) - avatar_placeholder.add(self._avatar_image) + avatar = self._get_avatar(kind, name) + self._avatar_box = AvatarBox(self._contact, name, avatar) self._bottom_box = Gtk.Box(spacing=6) self._bottom_box.add(self._message_widget) @@ -201,11 +190,9 @@ def __init__(self, self._message_widget.set_direction(Gtk.TextDirection.RTL) more_menu_button = MoreMenuButton(self, self._contact, name) - more_menu_button.set_hexpand(True) - more_menu_button.set_halign(Gtk.Align.END) self._bottom_box.pack_end(more_menu_button, False, True, 0) - self.grid.attach(avatar_placeholder, 0, 0, 1, 2) + self.grid.attach(self._avatar_box, 0, 0, 1, 2) self.grid.attach(self._meta_box, 1, 0, 1, 1) self.grid.attach(self._bottom_box, 1, 1, 1, 1) @@ -268,45 +255,6 @@ def _get_avatar(self, kind: str, name: str) -> Optional[cairo.ImageSurface]: assert not isinstance(avatar, GdkPixbuf.Pixbuf) return avatar - def _on_avatar_clicked(self, - _widget: Gtk.Widget, - event: Gdk.EventButton, - name: str - ) -> int: - if event.type == Gdk.EventType.BUTTON_PRESS: - if event.button == 1: - app.window.activate_action('mention', GLib.Variant('s', name)) - elif event.button == 3: - self._show_participant_menu(name, event) - - return Gdk.EVENT_STOP - - def _show_participant_menu(self, nick: str, event: Gdk.EventButton) -> None: - assert isinstance(self._contact, GroupchatContact) - if not self._contact.is_joined: - return - - self_contact = self._contact.get_self() - assert self_contact is not None - - if nick == self_contact.name: - # Don’t show menu for us - return - - contact = self._contact.get_resource(nick) - menu = get_groupchat_participant_menu(self._contact.account, - self_contact, - contact) - - popover = GajimPopover(menu, relative_to=self, event=event) - popover.popup() - - @staticmethod - def _on_realize(event_box: Gtk.EventBox) -> None: - window = event_box.get_window() - if window is not None: - window.set_cursor(get_cursor('pointer')) - def is_same_sender(self, message: MessageRow) -> bool: return message.name == self.name @@ -487,63 +435,17 @@ def set_error(self, tooltip: str) -> None: def update_avatar(self) -> None: avatar = self._get_avatar(self.kind, self.name) - self._avatar_image.set_from_surface(avatar) + self._avatar_box.set_from_surface(avatar) def set_merged(self, merged: bool) -> None: self._merged = merged if merged: self.get_style_context().add_class('merged') - self._avatar_image.set_no_show_all(True) - self._avatar_image.hide() self._meta_box.set_no_show_all(True) self._meta_box.hide() else: self.get_style_context().remove_class('merged') - self._avatar_image.set_no_show_all(False) - self._avatar_image.show() self._meta_box.set_no_show_all(False) self._meta_box.show() - -class MessageIcons(Gtk.Box): - def __init__(self) -> None: - 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: bool) -> None: - 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: bool) -> None: - self._correction_image.set_visible(visible) - - def set_correction_tooltip(self, text: str) -> None: - self._correction_image.set_tooltip_markup(text) - - def set_error_icon_visible(self, visible: bool) -> None: - self._error_image.set_visible(visible) - - def set_error_tooltip(self, text: str) -> None: - self._error_image.set_tooltip_markup(text) + self._avatar_box.set_merged(merged) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -15,14 +15,18 @@ from __future__ import annotations from typing import TYPE_CHECKING +from typing import Optional from datetime import datetime from gi.repository import Gtk +from gi.repository import Gdk from gi.repository import Pango from gi.repository import GLib +import cairo from gajim.common import app +from gajim.common.const import AvatarSize from gajim.common.i18n import Q_ from gajim.common.helpers import is_retraction_allowed from gajim.common.modules.contacts import GroupchatContact @@ -31,7 +35,10 @@ if TYPE_CHECKING: from .message import MessageRow +from ...menus import get_groupchat_participant_menu from ...util import wrap_with_event_box +from ...util import get_cursor +from ...util import GajimPopover class SimpleLabel(Gtk.Label): @@ -55,6 +62,7 @@ def __init__(self, self.set_valign(Gtk.Align.START) self.set_halign(Gtk.Align.END) self.set_relief(Gtk.ReliefStyle.NONE) + self.set_hexpand(True) self.get_style_context().add_class('conversation-more-button') @@ -196,3 +204,118 @@ def __init__(self, name: str, from_us: bool) -> None: css_class = 'gajim-incoming-nickname' self.get_style_context().add_class(css_class) + + +class MessageIcons(Gtk.Box): + def __init__(self) -> None: + 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: bool) -> None: + 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: bool) -> None: + self._correction_image.set_visible(visible) + + def set_correction_tooltip(self, text: str) -> None: + self._correction_image.set_tooltip_markup(text) + + def set_error_icon_visible(self, visible: bool) -> None: + self._error_image.set_visible(visible) + + def set_error_tooltip(self, text: str) -> None: + self._error_image.set_tooltip_markup(text) + + +class AvatarBox(Gtk.EventBox): + def __init__(self, + contact: ChatContactT, + name: str, + avatar: Optional[cairo.ImageSurface], + ) -> None: + + Gtk.EventBox.__init__(self) + + self.set_size_request(AvatarSize.ROSTER, -1) + self.set_valign(Gtk.Align.START) + + self._contact = contact + + self._image = Gtk.Image.new_from_surface(avatar) + self.add(self._image) + + if self._contact.is_groupchat: + self.connect('realize', self._on_realize) + + self.connect('button-press-event', + self._on_avatar_clicked, name) + + def set_from_surface(self, surface: Optional[cairo.ImageSurface]) -> None: + self._image.set_from_surface(surface) + + def set_merged(self, merged: bool) -> None: + self._image.set_no_show_all(merged) + self._image.set_visible(not merged) + + @staticmethod + def _on_realize(event_box: Gtk.EventBox) -> None: + window = event_box.get_window() + if window is not None: + window.set_cursor(get_cursor('pointer')) + + def _on_avatar_clicked(self, + _widget: Gtk.Widget, + event: Gdk.EventButton, + name: str + ) -> int: + + if event.type == Gdk.EventType.BUTTON_PRESS: + if event.button == 1: + app.window.activate_action('mention', GLib.Variant('s', name)) + elif event.button == 3: + self._show_participant_menu(name, event) + + return Gdk.EVENT_STOP + + def _show_participant_menu(self, nick: str, event: Gdk.EventButton) -> None: + assert isinstance(self._contact, GroupchatContact) + if not self._contact.is_joined: + return + + self_contact = self._contact.get_self() + assert self_contact is not None + + if nick == self_contact.name: + # Don’t show menu for us + return + + contact = self._contact.get_resource(nick) + menu = get_groupchat_participant_menu(self._contact.account, + self_contact, + contact) + + popover = GajimPopover(menu, relative_to=self, event=event) + popover.popup() View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1681cd01f923bd0aa20b26848621ba… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/a1681cd01f923bd0aa20b26848621ba… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Rows: Add NicknameLabel
by Philipp Hörist (＠lovetox) 09 Oct '22

09 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 6d677406 by Philipp Hörist at 2022-10-09T19:42:41+02:00 refactor: Rows: Add NicknameLabel - - - - - a1681cd0 by Philipp Hörist at 2022-10-09T19:44:14+02:00 cfix: DateTimeLabel: Use set_text() Otherwise it will parse markup - - - - - 5 changed files: - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -18,7 +18,6 @@ from datetime import datetime -from gi.repository import GLib from gi.repository import Gtk from gi.repository import Pango @@ -59,21 +58,6 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: def is_merged(self) -> bool: return self._merged - @staticmethod - def create_name_widget(name: str, from_us: bool) -> Gtk.Label: - label = Gtk.Label() - label.set_selectable(True) - label.set_ellipsize(Pango.EllipsizeMode.END) - label.set_valign(Gtk.Align.END) - label.get_style_context().add_class('conversation-nickname') - label.set_markup(GLib.markup_escape_text(name)) - - if from_us: - label.get_style_context().add_class('gajim-outgoing-nickname') - else: - label.get_style_context().add_class('gajim-incoming-nickname') - return label - @staticmethod def __destroy(widget: Gtk.Widget) -> None: app.check_finalize(widget) ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -32,6 +32,7 @@ from gajim.common.storage.archive import ConversationRow from .widgets import DateTimeLabel +from .widgets import NicknameLabel from .widgets import SimpleLabel from .base import BaseRow @@ -138,7 +139,7 @@ def _add_history_call_widget(self) -> None: avatar_image = Gtk.Image.new_from_surface(avatar) self._avatar_placeholder.add(avatar_image) - name_widget = self.create_name_widget(contact.name, is_self) + name_widget = NicknameLabel(contact.name, is_self) name_widget.set_halign(Gtk.Align.START) name_widget.set_valign(Gtk.Align.START) ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -49,6 +49,7 @@ from .base import BaseRow from .widgets import DateTimeLabel +from .widgets import NicknameLabel from ...builder import get_builder from ...util import format_eta @@ -122,7 +123,7 @@ def __init__(self, avatar_image = Gtk.Image.new_from_surface(avatar) avatar_placeholder.add(avatar_image) - name_widget = self.create_name_widget(contact.name, is_self) + name_widget = NicknameLabel(contact.name, is_self) name_widget.set_halign(Gtk.Align.START) name_widget.set_valign(Gtk.Align.START) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -50,6 +50,7 @@ from .base import BaseRow from .widgets import DateTimeLabel +from .widgets import NicknameLabel from .widgets import MoreMenuButton from ..message_widget import MessageWidget from ...dialogs import InputDialog @@ -136,7 +137,7 @@ def __init__(self, if self._contact.jid == self._client.get_own_jid().bare: name = _('Me') - name_widget = self.create_name_widget(name, from_us) + name_widget = NicknameLabel(name, from_us) self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -171,10 +171,28 @@ def __init__(self, timestamp: datetime) -> None: time_format = f'{time_format} - {date_format}' timestamp_formatted = timestamp.strftime(time_format) - self.set_label(timestamp_formatted) + self.set_text(timestamp_formatted) self.set_halign(Gtk.Align.START) self.set_valign(Gtk.Align.END) self.set_margin_start(6) self.set_margin_end(3) self.get_style_context().add_class('conversation-meta') self.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X')) + + +class NicknameLabel(Gtk.Label): + def __init__(self, name: str, from_us: bool) -> None: + Gtk.Label.__init__(self) + + self.set_selectable(True) + self.set_ellipsize(Pango.EllipsizeMode.END) + self.set_valign(Gtk.Align.END) + self.get_style_context().add_class('conversation-nickname') + self.set_text(name) + + if from_us: + css_class = 'gajim-outgoing-nickname' + else: + css_class = 'gajim-incoming-nickname' + + self.get_style_context().add_class(css_class) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f2b86948fae7037ab253ca498f63cdc… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/f2b86948fae7037ab253ca498f63cdc… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] 2 commits: refactor: Archive: Simplify setting earliest timestamp
by Philipp Hörist (＠lovetox) 09 Oct '22

09 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: 659ef014 by Philipp Hörist at 2022-10-09T19:32:26+02:00 refactor: Archive: Simplify setting earliest timestamp - - - - - f2b86948 by Philipp Hörist at 2022-10-09T19:32:26+02:00 refactor: Rows: Add DateTimeLabel - - - - - 12 changed files: - gajim/common/storage/archive.py - gajim/gtk/conversation/rows/base.py - gajim/gtk/conversation/rows/call.py - gajim/gtk/conversation/rows/command_output.py - gajim/gtk/conversation/rows/file_transfer.py - gajim/gtk/conversation/rows/file_transfer_jingle.py - gajim/gtk/conversation/rows/info.py - gajim/gtk/conversation/rows/message.py - gajim/gtk/conversation/rows/muc_join_left.py - gajim/gtk/conversation/rows/muc_subject.py - gajim/gtk/conversation/rows/user_status.py - gajim/gtk/conversation/rows/widgets.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -566,9 +566,8 @@ def search_log(self, else: before_ts = before.timestamp() - if after is None: - after_ts = datetime.datetime(1971, 1, 1).timestamp() - else: + after_ts = 0 + if after is not None: after_ts = after.timestamp() if from_users is None: @@ -644,9 +643,8 @@ def search_all_logs(self, else: before_ts = before.timestamp() - if after is None: - after_ts = datetime.datetime(1971, 1, 1).timestamp() - else: + after_ts = 0 + if after is not None: after_ts = after.timestamp() if from_users is None: ===================================== gajim/gtk/conversation/rows/base.py ===================================== @@ -23,7 +23,6 @@ from gi.repository import Pango from gajim.common import app -from gajim.common.helpers import from_one_line class BaseRow(Gtk.ListBoxRow): @@ -60,23 +59,6 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None: def is_merged(self) -> bool: return self._merged - @staticmethod - def create_timestamp_widget(timestamp: datetime) -> Gtk.Label: - time_format = from_one_line(app.settings.get('chat_timestamp_format')) - if timestamp.date() < datetime.today().date(): - date_format = from_one_line( - app.settings.get('date_timestamp_format')) - time_format = f'{time_format} - {date_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.set_margin_start(6) - label.set_margin_end(3) - 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, from_us: bool) -> Gtk.Label: label = Gtk.Label() ===================================== gajim/gtk/conversation/rows/call.py ===================================== @@ -31,6 +31,7 @@ from gajim.common.jingle_session import JingleSession from gajim.common.storage.archive import ConversationRow +from .widgets import DateTimeLabel from .widgets import SimpleLabel from .base import BaseRow @@ -141,7 +142,7 @@ def _add_history_call_widget(self) -> None: name_widget.set_halign(Gtk.Align.START) name_widget.set_valign(Gtk.Align.START) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) timestamp_widget.set_valign(Gtk.Align.START) ===================================== gajim/gtk/conversation/rows/command_output.py ===================================== @@ -20,6 +20,7 @@ from gajim.common.const import AvatarSize +from .widgets import DateTimeLabel from .widgets import SimpleLabel from .base import BaseRow @@ -43,7 +44,7 @@ def __init__(self, account: str, text: str, is_error: bool) -> None: avatar_placeholder.add(icon) self.grid.attach(avatar_placeholder, 0, 0, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_valign(Gtk.Align.START) timestamp_widget.set_margin_start(0) self.grid.attach(timestamp_widget, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/file_transfer.py ===================================== @@ -27,7 +27,7 @@ from gajim.common.modules.httpupload import HTTPFileTransfer from .base import BaseRow - +from .widgets import DateTimeLabel from ...dialogs import ErrorDialog from ...util import EventHelper from ...builder import get_builder @@ -62,7 +62,7 @@ def __init__(self, account: str, transfer: HTTPFileTransfer) -> None: avatar_placeholder.set_size_request(AvatarSize.ROSTER, -1) self.grid.attach(avatar_placeholder, 0, 0, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) timestamp_widget.set_valign(Gtk.Align.START) self.grid.attach(timestamp_widget, 1, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/file_transfer_jingle.py ===================================== @@ -48,6 +48,7 @@ from gajim.common.storage.archive import ConversationRow from .base import BaseRow +from .widgets import DateTimeLabel from ...builder import get_builder from ...util import format_eta @@ -125,7 +126,7 @@ def __init__(self, name_widget.set_halign(Gtk.Align.START) name_widget.set_valign(Gtk.Align.START) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_hexpand(True) timestamp_widget.set_valign(Gtk.Align.START) ===================================== gajim/gtk/conversation/rows/info.py ===================================== @@ -23,6 +23,7 @@ from gajim.common.const import AvatarSize +from .widgets import DateTimeLabel from .widgets import SimpleLabel from .base import BaseRow @@ -55,7 +56,7 @@ def __init__(self, self._label.set_text(text) self.grid.attach(self._label, 2, 0, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) timestamp_widget.set_valign(Gtk.Align.END) self.grid.attach(timestamp_widget, 3, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/message.py ===================================== @@ -49,6 +49,7 @@ from gajim.common.types import ChatContactT from .base import BaseRow +from .widgets import DateTimeLabel from .widgets import MoreMenuButton from ..message_widget import MessageWidget from ...dialogs import InputDialog @@ -140,7 +141,7 @@ def __init__(self, self._meta_box = Gtk.Box(spacing=6) self._meta_box.set_hexpand(True) self._meta_box.pack_start(name_widget, False, True, 0) - timestamp_label = self.create_timestamp_widget(self.timestamp) + timestamp_label = DateTimeLabel(self.timestamp) self._meta_box.pack_start(timestamp_label, False, True, 0) if additional_data is not None: ===================================== gajim/gtk/conversation/rows/muc_join_left.py ===================================== @@ -23,6 +23,7 @@ from gajim.common.const import AvatarSize from .widgets import SimpleLabel +from .widgets import DateTimeLabel from .base import BaseRow @@ -65,7 +66,7 @@ def __init__(self, self._label.get_style_context().add_class('gajim-status-message') self.grid.attach(self._label, 2, 0, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) timestamp_widget.set_valign(Gtk.Align.FILL) self.grid.attach(timestamp_widget, 3, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/muc_subject.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.i18n import _ from .base import BaseRow +from .widgets import DateTimeLabel from ..message_widget import MessageWidget @@ -79,7 +80,7 @@ def __init__(self, subject_box.add(message_widget) self.grid.attach(subject_box, 1, 0, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_valign(Gtk.Align.START) self.grid.attach(timestamp_widget, 2, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/user_status.py ===================================== @@ -26,6 +26,7 @@ from gajim.common.helpers import get_uf_show from .widgets import SimpleLabel +from .widgets import DateTimeLabel from .base import BaseRow from ..message_widget import MessageWidget from ...avatar import get_show_circle @@ -70,7 +71,7 @@ def __init__(self, message_widget.add_with_styling(status) self.grid.attach(message_widget, 2, 1, 1, 1) - timestamp_widget = self.create_timestamp_widget(self.timestamp) + timestamp_widget = DateTimeLabel(self.timestamp) timestamp_widget.set_halign(Gtk.Align.START) timestamp_widget.set_valign(Gtk.Align.END) self.grid.attach(timestamp_widget, 3, 0, 1, 1) ===================================== gajim/gtk/conversation/rows/widgets.py ===================================== @@ -16,6 +16,8 @@ from typing import TYPE_CHECKING +from datetime import datetime + from gi.repository import Gtk from gi.repository import Pango from gi.repository import GLib @@ -157,3 +159,22 @@ def _create_popover(self, @staticmethod def _on_closed(popover: Gtk.Popover) -> None: GLib.idle_add(popover.destroy) + + +class DateTimeLabel(Gtk.Label): + def __init__(self, timestamp: datetime) -> None: + Gtk.Label.__init__(self) + + time_format = app.settings.get('chat_timestamp_format') + if timestamp.date() < datetime.today().date(): + date_format = app.settings.get('date_timestamp_format') + time_format = f'{time_format} - {date_format}' + timestamp_formatted = timestamp.strftime(time_format) + + self.set_label(timestamp_formatted) + self.set_halign(Gtk.Align.START) + self.set_valign(Gtk.Align.END) + self.set_margin_start(6) + self.set_margin_end(3) + self.get_style_context().add_class('conversation-meta') + self.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ca265f1af0760deb67ed16170335b7… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/compare/6ca265f1af0760deb67ed16170335b7… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] fix: SearchView: Limit displayed results to account_id of contact
by Daniel Brötzmann (＠wurstsalat) 09 Oct '22

09 Oct '22

Daniel Brötzmann pushed to branch master at gajim / gajim Commits: 6ca265f1 by wurstsalat at 2022-10-09T16:27:45+02:00 fix: SearchView: Limit displayed results to account_id of contact - - - - - 1 changed file: - gajim/common/storage/archive.py Changes: ===================================== gajim/common/storage/archive.py ===================================== @@ -527,7 +527,7 @@ def get_conversation_between(self, @timeit def search_log(self, - _account: str, + account: str, jid: JID, query: str, from_users: Optional[list[str]] = None, @@ -555,6 +555,7 @@ def search_log(self, returns a list of namedtuples ''' + account_id = self.get_account_id(account) jids = [jid] kinds = map(str, [KindConstant.STATUS, @@ -579,12 +580,14 @@ def search_log(self, SELECT account_id, jid_id, contact_name, time, kind, show, message, subject, additional_data, log_line_id FROM logs NATURAL JOIN jids WHERE jid IN ({jids}) + AND account_id = {account_id} AND message LIKE like(?) AND kind NOT IN ({kinds}) {users_query} AND time BETWEEN ? AND ? ORDER BY time DESC, log_line_id '''.format(jids=', '.join('?' * len(jids)), + account_id=account_id, kinds=', '.join(kinds), users_query=users_query_string) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ca265f1af0760deb67ed16170335b7c… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/6ca265f1af0760deb67ed16170335b7c… You're receiving this email because of your account on dev.gajim.org.

1 0

[Git][gajim/gajim][master] refactor: Remove usage of utc* datetime methods
by Philipp Hörist (＠lovetox) 09 Oct '22

09 Oct '22

Philipp Hörist pushed to branch master at gajim / gajim Commits: daabc910 by Philipp Hörist at 2022-10-09T14:58:09+02:00 refactor: Remove usage of utc* datetime methods datetime.utcnow() datetime.utcfromtimestamp() These methods are discouraged according to pythons documentation - - - - - 3 changed files: - gajim/common/dbus/location.py - gajim/gtk/filetransfer.py - gajim/gtk/history_sync.py Changes: ===================================== gajim/common/dbus/location.py ===================================== @@ -21,6 +21,7 @@ import logging from datetime import datetime +from datetime import timezone from gi.repository import Gio from gi.repository import GLib @@ -76,7 +77,7 @@ def _on_location_update(self, simple: Geoclue.Simple, *args: Any) -> None: # update data with info we just received self._data = {'lat': lat, 'lon': lon, 'alt': alt, 'accuracy': acc} - self._data['timestamp'] = self._timestamp_to_utc(timestamp) + self._data['timestamp'] = self._timestamp_to_string(timestamp) self._send_location() def _on_client_update(self, @@ -132,6 +133,6 @@ def _send_location(self) -> None: self._emit(info) @staticmethod - def _timestamp_to_utc(timestamp: float) -> str: - time = datetime.utcfromtimestamp(timestamp) - return time.strftime('%Y-%m-%dT%H:%MZ') + def _timestamp_to_string(timestamp: float) -> str: + utc_datetime = datetime.fromtimestamp(timestamp, timezone.utc) + return utc_datetime.strftime('%Y-%m-%dT%H:%MZ') ===================================== gajim/gtk/filetransfer.py ===================================== @@ -28,6 +28,7 @@ from enum import IntEnum from enum import unique from datetime import datetime +from datetime import timezone from gi.repository import Gtk from gi.repository import Gdk @@ -710,7 +711,7 @@ def get_iter_by_sid(self, typ, sid): @staticmethod def __convert_date(epoch: float) -> str: # Converts date-time from seconds from epoch to iso 8601 - dt = datetime.utcfromtimestamp(epoch) + dt = datetime.fromtimestamp(epoch, timezone.utc) return dt.isoformat() + 'Z' def get_send_file_props(self, ===================================== gajim/gtk/history_sync.py ===================================== @@ -20,6 +20,7 @@ import logging from datetime import datetime from datetime import timedelta +from datetime import timezone from gi.repository import Gtk from gi.repository import GLib @@ -55,7 +56,7 @@ def __init__(self, account: str) -> None: self._client = app.get_client(account) self._timedelta: Optional[timedelta] = None - self._now = datetime.utcnow() + self._now = datetime.now(timezone.utc) self._query_id: Optional[str] = None self._start: Optional[datetime] = None self._end: Optional[datetime] = None @@ -69,9 +70,10 @@ def __init__(self, account: str) -> None: if mam_start == ArchiveState.NEVER: self._current_start = self._now elif mam_start == ArchiveState.ALL: - self._current_start = datetime.utcfromtimestamp(0) + self._current_start = datetime.fromtimestamp(0, timezone.utc) else: - self._current_start = datetime.fromtimestamp(mam_start) + self._current_start = datetime.fromtimestamp(mam_start, + timezone.utc) self.add_button('synchronize', _('Synchronize'), 'suggested-action') self.add_button('close', _('Close')) View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/daabc9105ae684214894030d674edf9b… -- View it on GitLab: https://dev.gajim.org/gajim/gajim/-/commit/daabc9105ae684214894030d674edf9b… You're receiving this email because of your account on dev.gajim.org.

1 0

Jump to page:

2026

2025

2024

2023

2022

2021

2020

2019

2018

2017

2016

2015

2014

2013

2012

2011

2010

2009

2008

2007

2006

Commits