Set enryption icon correctly

This commit is contained in:
Philipp Hörist 2017-10-27 20:46:48 +02:00 committed by Philipp Hörist
parent c983b1f50d
commit 749fcc1b48
3 changed files with 10 additions and 19 deletions

View file

@ -474,17 +474,16 @@ class ChatControlBase(MessageControl, ChatCommandProcessor, CommandTools):
return state return state
def set_encryption_menu_icon(self): def set_encryption_menu_icon(self):
for child in self.encryption_menu.get_children(): image = self.encryption_menu.get_image()
if isinstance(child, Gtk.Image): if image is None:
image = child image = Gtk.Image()
break self.encryption_menu.set_image(image)
if not self.encryption: if not self.encryption:
icon = gtkgui_helpers.get_icon_pixmap( image.set_from_icon_name('channel-insecure-symbolic',
'channel-insecure-symbolic', color=[Color.BLACK]) Gtk.IconSize.MENU)
else: else:
icon = gtkgui_helpers.get_icon_pixmap('channel-secure-symbolic') image.set_from_icon_name('channel-secure-symbolic',
image.set_from_pixbuf(icon) Gtk.IconSize.MENU)
def set_speller(self): def set_speller(self):
if not app.HAVE_SPELL or not app.config.get('use_speller'): if not app.HAVE_SPELL or not app.config.get('use_speller'):

View file

@ -801,11 +801,7 @@ audio-mic-volume-low</property>
<property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="tooltip_text" translatable="yes">Choose an encryption</property>
<property name="relief">none</property> <property name="relief">none</property>
<child> <child>
<object class="GtkImage"> <placeholder/>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">channel-secure-symbolic</property>
</object>
</child> </child>
<style> <style>
<class name="chatcontrol-actionbar-button"/> <class name="chatcontrol-actionbar-button"/>

View file

@ -280,11 +280,7 @@
<property name="tooltip_text" translatable="yes">Choose an encryption</property> <property name="tooltip_text" translatable="yes">Choose an encryption</property>
<property name="relief">none</property> <property name="relief">none</property>
<child> <child>
<object class="GtkImage"> <placeholder/>
<property name="visible">True</property>
<property name="can_focus">False</property>
<property name="icon_name">channel-secure-symbolic</property>
</object>
</child> </child>
<style> <style>
<class name="chatcontrol-actionbar-button"/> <class name="chatcontrol-actionbar-button"/>