From ec2339190f5dc3dd4d43a1dc9327f38d13d488c5 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Daniel=20Br=C3=B6tzmann?= <mailtrash@posteo.de>
Date: Fri, 10 Jan 2020 18:23:07 +0100
Subject: [PATCH] GCTooltip: Remove affiliation coloring
---
gajim/common/config.py | 4 ----
gajim/gtk/tooltips.py | 24 ++----------------------
2 files changed, 2 insertions(+), 26 deletions(-)
diff --git a/gajim/common/config.py b/gajim/common/config.py
index d71629aba4..63ead1963f 100644
--- a/gajim/common/config.py
+++ b/gajim/common/config.py
@@ -180,10 +180,6 @@ class Config:
'tooltip_status_busy_color': [opt_color, '#F57900'],
'tooltip_status_na_color': [opt_color, '#CC0000'],
'tooltip_status_offline_color': [opt_color, '#555753'],
- 'tooltip_affiliation_none_color': [opt_color, '#555753'],
- 'tooltip_affiliation_member_color': [opt_color, '#73D216'],
- 'tooltip_affiliation_administrator_color': [opt_color, '#F57900'],
- 'tooltip_affiliation_owner_color': [opt_color, '#CC0000'],
'tooltip_account_name_color': [opt_color, '#888A85'],
'tooltip_idle_color': [opt_color, '#888A85'],
'notification_preview_message': [opt_bool, True, _('Preview new messages in notification popup?')],
diff --git a/gajim/gtk/tooltips.py b/gajim/gtk/tooltips.py
index 86e7232f2e..8e7165c36d 100644
--- a/gajim/gtk/tooltips.py
+++ b/gajim/gtk/tooltips.py
@@ -220,8 +220,7 @@ def _populate_grid(self, contact):
uf_affiliation = \
_('%(owner_or_admin_or_member)s of this group chat') \
% {'owner_or_admin_or_member': uf_affiliation}
- uf_affiliation = self.colorize_affiliation(uf_affiliation)
- self._ui.affiliation.set_markup(uf_affiliation)
+ self._ui.affiliation.set_text(uf_affiliation)
self._ui.affiliation.show()
# Avatar
@@ -238,29 +237,10 @@ def _populate_grid(self, contact):
app.plugin_manager.gui_extension_point(
'gc_tooltip_populate', self, contact, self._ui.tooltip_grid)
- @staticmethod
- def colorize_affiliation(affiliation):
- """
- Color the affiliation of a MUC participant inside the tooltip by
- it's semantics. Color palette is the Tango.
- """
- formatted = "<span foreground='%s'>%s</span>"
- color = None
- if affiliation.startswith(Q_("?Group Chat Contact Affiliation:None")):
- color = app.config.get('tooltip_affiliation_none_color')
- elif affiliation.startswith(_("Member")):
- color = app.config.get('tooltip_affiliation_member_color')
- elif affiliation.startswith(_("Administrator")):
- color = app.config.get('tooltip_affiliation_administrator_color')
- elif affiliation.startswith(_("Owner")):
- color = app.config.get('tooltip_affiliation_owner_color')
- if color:
- affiliation = formatted % (color, affiliation)
- return affiliation
-
def destroy(self):
self._ui.tooltip_grid.destroy()
+
class RosterTooltip(StatusTable):
def __init__(self):
StatusTable.__init__(self)
--
GitLab