diff --git a/gajim/common/config.py b/gajim/common/config.py index d71629aba45331f30dd6f30424633837231031aa..63ead1963f0c54b7cd0847ea096340bfe03fab60 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 86e7232f2e8b319a6304d1aa72f6b92db4f4ad28..8e7165c36d501b9b77ac44dddfbb15fdc8983a92 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)