Philipp Hörist pushed to branch master at gajim / gajim

Commits:

5 changed files:

Changes:

  • gajim/gtk/conversation/rows/base.py
    ... ... @@ -18,7 +18,6 @@
    18 18
    19 19 
     from datetime import datetime
    20 20
    21 
    -from gi.repository import GLib
    22 21 
     from gi.repository import Gtk
    23 22 
     from gi.repository import Pango
    24 23
    ... ... @@ -59,21 +58,6 @@ def __init__(self, account: str, widget: Optional[str] = None) -> None:
    59 58 
         def is_merged(self) -> bool:
    60 59 
             return self._merged
    61 60
    62 
    -    @staticmethod
    63 
    -    def create_name_widget(name: str, from_us: bool) -> Gtk.Label:
    64 
    -        label = Gtk.Label()
    65 
    -        label.set_selectable(True)
    66 
    -        label.set_ellipsize(Pango.EllipsizeMode.END)
    67 
    -        label.set_valign(Gtk.Align.END)
    68 
    -        label.get_style_context().add_class('conversation-nickname')
    69 
    -        label.set_markup(GLib.markup_escape_text(name))
    70 
    -
    71 
    -        if from_us:
    72 
    -            label.get_style_context().add_class('gajim-outgoing-nickname')
    73 
    -        else:
    74 
    -            label.get_style_context().add_class('gajim-incoming-nickname')
    75 
    -        return label
    76 
    -
    77 61 
         @staticmethod
    78 62 
         def __destroy(widget: Gtk.Widget) -> None:
    79 63 
             app.check_finalize(widget)

  • gajim/gtk/conversation/rows/call.py
    ... ... @@ -32,6 +32,7 @@
    32 32 
     from gajim.common.storage.archive import ConversationRow
    33 33
    34 34 
     from .widgets import DateTimeLabel
    35 
    +from .widgets import NicknameLabel
    35 36 
     from .widgets import SimpleLabel
    36 37 
     from .base import BaseRow
    37 38
    ... ... @@ -138,7 +139,7 @@ def _add_history_call_widget(self) -> None:
    138 139 
             avatar_image = Gtk.Image.new_from_surface(avatar)
    139 140 
             self._avatar_placeholder.add(avatar_image)
    140 141
    141 
    -        name_widget = self.create_name_widget(contact.name, is_self)
    142 
    +        name_widget = NicknameLabel(contact.name, is_self)
    142 143 
             name_widget.set_halign(Gtk.Align.START)
    143 144 
             name_widget.set_valign(Gtk.Align.START)
    144 145

  • gajim/gtk/conversation/rows/file_transfer_jingle.py
    ... ... @@ -49,6 +49,7 @@
    49 49
    50 50 
     from .base import BaseRow
    51 51 
     from .widgets import DateTimeLabel
    52 
    +from .widgets import NicknameLabel
    52 53 
     from ...builder import get_builder
    53 54 
     from ...util import format_eta
    54 55
    ... ... @@ -122,7 +123,7 @@ def __init__(self,
    122 123 
             avatar_image = Gtk.Image.new_from_surface(avatar)
    123 124 
             avatar_placeholder.add(avatar_image)
    124 125
    125 
    -        name_widget = self.create_name_widget(contact.name, is_self)
    126 
    +        name_widget = NicknameLabel(contact.name, is_self)
    126 127 
             name_widget.set_halign(Gtk.Align.START)
    127 128 
             name_widget.set_valign(Gtk.Align.START)
    128 129

  • gajim/gtk/conversation/rows/message.py
    ... ... @@ -50,6 +50,7 @@
    50 50
    51 51 
     from .base import BaseRow
    52 52 
     from .widgets import DateTimeLabel
    53 
    +from .widgets import NicknameLabel
    53 54 
     from .widgets import MoreMenuButton
    54 55 
     from ..message_widget import MessageWidget
    55 56 
     from ...dialogs import InputDialog
    ... ... @@ -136,7 +137,7 @@ def __init__(self,
    136 137 
             if self._contact.jid == self._client.get_own_jid().bare:
    137 138 
                 name = _('Me')
    138 139
    139 
    -        name_widget = self.create_name_widget(name, from_us)
    140 
    +        name_widget = NicknameLabel(name, from_us)
    140 141
    141 142 
             self._meta_box = Gtk.Box(spacing=6)
    142 143 
             self._meta_box.set_hexpand(True)

  • gajim/gtk/conversation/rows/widgets.py
    ... ... @@ -171,10 +171,28 @@ def __init__(self, timestamp: datetime) -> None:
    171 171 
                 time_format = f'{time_format} - {date_format}'
    172 172 
             timestamp_formatted = timestamp.strftime(time_format)
    173 173
    174 
    -        self.set_label(timestamp_formatted)
    174 
    +        self.set_text(timestamp_formatted)
    175 175 
             self.set_halign(Gtk.Align.START)
    176 176 
             self.set_valign(Gtk.Align.END)
    177 177 
             self.set_margin_start(6)
    178 178 
             self.set_margin_end(3)
    179 179 
             self.get_style_context().add_class('conversation-meta')
    180 180 
             self.set_tooltip_text(timestamp.strftime('%a, %d %b %Y - %X'))
    181 
    +
    182 
    +
    183 
    +class NicknameLabel(Gtk.Label):
    184 
    +    def __init__(self, name: str, from_us: bool) -> None:
    185 
    +        Gtk.Label.__init__(self)
    186 
    +
    187 
    +        self.set_selectable(True)
    188 
    +        self.set_ellipsize(Pango.EllipsizeMode.END)
    189 
    +        self.set_valign(Gtk.Align.END)
    190 
    +        self.get_style_context().add_class('conversation-nickname')
    191 
    +        self.set_text(name)
    192 
    +
    193 
    +        if from_us:
    194 
    +            css_class = 'gajim-outgoing-nickname'
    195 
    +        else:
    196 
    +            css_class = 'gajim-incoming-nickname'
    197 
    +
    198 
    +        self.get_style_context().add_class(css_class)

    • —
    View it on GitLab.
    You're receiving this email because of your account on dev.gajim.org. Manage all notifications · Help