Set lock_image from icon name instead of filepath

Fixes #8673
This commit is contained in:
Philipp Hörist 2017-09-22 16:44:07 +02:00
parent b60fe02680
commit 9785f31415
2 changed files with 10 additions and 10 deletions

View File

@ -856,18 +856,18 @@ class ChatControl(ChatControlBase):
self._show_lock_image(**encryption_state) self._show_lock_image(**encryption_state)
def _show_lock_image(self, visible, enc_type='', def _show_lock_image(self, visible, enc_type='', authenticated=False):
authenticated=False):
""" """
Set lock icon visibility and create tooltip Set lock icon visibility and create tooltip
""" """
if authenticated: if authenticated:
authenticated_string = _('and authenticated') authenticated_string = _('and authenticated')
img_path = gtkgui_helpers.get_icon_path('security-high') self.lock_image.set_from_icon_name(
'security-high', Gtk.IconSize.MENU)
else: else:
authenticated_string = _('and NOT authenticated') authenticated_string = _('and NOT authenticated')
img_path = gtkgui_helpers.get_icon_path('security-low') self.lock_image.set_from_icon_name(
self.lock_image.set_from_file(img_path) 'security-low', Gtk.IconSize.MENU)
tooltip = _('%(type)s encryption is active %(authenticated)s.') % {'type': enc_type, 'authenticated': authenticated_string} tooltip = _('%(type)s encryption is active %(authenticated)s.') % {'type': enc_type, 'authenticated': authenticated_string}

View File

@ -785,18 +785,18 @@ class GroupchatControl(ChatControlBase):
self._show_lock_image(**encryption_state) self._show_lock_image(**encryption_state)
def _show_lock_image(self, visible, enc_type='', def _show_lock_image(self, visible, enc_type='', authenticated=False):
authenticated=False):
""" """
Set lock icon visibility and create tooltip Set lock icon visibility and create tooltip
""" """
if authenticated: if authenticated:
authenticated_string = _('and authenticated') authenticated_string = _('and authenticated')
img_path = gtkgui_helpers.get_icon_path('security-high') self.lock_image.set_from_icon_name(
'security-high', Gtk.IconSize.MENU)
else: else:
authenticated_string = _('and NOT authenticated') authenticated_string = _('and NOT authenticated')
img_path = gtkgui_helpers.get_icon_path('security-low') self.lock_image.set_from_icon_name(
self.lock_image.set_from_file(img_path) 'security-low', Gtk.IconSize.MENU)
tooltip = _('%(type)s encryption is active %(authenticated)s.') % { tooltip = _('%(type)s encryption is active %(authenticated)s.') % {
'type': enc_type, 'authenticated': authenticated_string} 'type': enc_type, 'authenticated': authenticated_string}