Daniel Brötzmann pushed to branch mainwindow at gajim / gajim
Commits:
5241c4ea by wurstsalat at 2021-07-05T22:07:49+02:00
MessageRow: Simplify nick colors
- - - - -
2 changed files:
- gajim/gtk/conversation/rows/base.py
- gajim/gtk/conversation/rows/message.py
Changes:
=====================================
gajim/gtk/conversation/rows/base.py
=====================================
@@ -74,26 +74,16 @@ def create_timestamp_widget(timestamp: datetime) ->
Gtk.Label:
return label
@staticmethod
- def create_name_widget(name: str, kind: str,
- is_groupchat: bool) -> Gtk.Label:
+ def create_name_widget(name: str, is_self: bool) -> Gtk.Label:
label = Gtk.Label()
label.set_selectable(True)
label.get_style_context().add_class('conversation-nickname')
+ label.set_markup(GLib.markup_escape_text(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}">{name}</span>')
+ if is_self:
+ label.get_style_context().add_class('gajim-outgoing-nickname')
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)
+ label.get_style_context().add_class('gajim-incoming-nickname')
return label
=====================================
gajim/gtk/conversation/rows/message.py
=====================================
@@ -87,13 +87,17 @@ def __init__(self,
self._message_widget = MessageWidget(account)
self._message_widget.add_content(result)
if self._is_groupchat:
- self_contact = self._contact.get_self()
- if self_contact.name != name:
+ if self._contact.get_self().name != name:
self._check_for_highlight(result)
+ if self._is_groupchat:
+ is_self = name == self._contact.get_self().name
+ else:
+ is_self = kind == 'outgoing'
+ name_widget = self.create_name_widget(name, is_self)
+
self._meta_box = Gtk.Box(spacing=6)
self._meta_box.set_hexpand(True)
- name_widget = self.create_name_widget(name, kind, self._is_groupchat)
self._meta_box.pack_start(name_widget, False, True, 0)
timestamp_label = self.create_timestamp_widget(self.timestamp)
timestamp_label.set_margin_start(6)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5241c4ea271889a938e38255ef229462a369d237
--
View it on GitLab:
https://dev.gajim.org/gajim/gajim/-/commit/5241c4ea271889a938e38255ef229462a369d237
You're receiving this email because of your account on dev.gajim.org.
_______________________________________________
Commits mailing list
[email protected]
https://lists.gajim.org/cgi-bin/listinfo/commits
