Philipp Hörist pushed to branch master at gajim / gajim
Commits:
c5c717dd by Philipp Hörist at 2018-01-29T20:02:30+01:00
Use IconTheme for some icons
- - - - -
3 changed files:
- gajim/dialogs.py
- gajim/groupchat_control.py
- gajim/message_window.py
Changes:
=====================================
gajim/dialogs.py
=====================================
--- a/gajim/dialogs.py
+++ b/gajim/dialogs.py
@@ -1319,7 +1319,7 @@ class AboutDialog(Gtk.AboutDialog):
self.add_credit_section('Thanks', thanks)
self.set_translator_credits(_('translator-credits'))
- self.set_logo(gtkgui_helpers.get_icon_pixmap('org.gajim.Gajim', 128))
+ self.set_logo_icon_name('org.gajim.Gajim')
self.connect(
'response', lambda dialog, *args: Gtk.AboutDialog.do_close(dialog))
=====================================
gajim/groupchat_control.py
=====================================
--- a/gajim/groupchat_control.py
+++ b/gajim/groupchat_control.py
@@ -984,12 +984,11 @@ class GroupchatControl(ChatControlBase):
return (label_str, color)
def get_tab_image(self, count_unread=True):
- # Set tab image (always 16x16)
tab_image = None
if app.gc_connected[self.account][self.room_jid]:
- tab_image = gtkgui_helpers.load_icon('muc_active')
+ tab_image = gtkgui_helpers.get_iconset_name_for('muc-active')
else:
- tab_image = gtkgui_helpers.load_icon('muc_inactive')
+ tab_image = gtkgui_helpers.get_iconset_name_for('muc-inactive')
return tab_image
def update_ui(self):
=====================================
gajim/message_window.py
=====================================
--- a/gajim/message_window.py
+++ b/gajim/message_window.py
@@ -483,13 +483,15 @@ class MessageWindow(object):
pass # keep default icon
elif window_mode == MessageWindowMgr.ONE_MSG_WINDOW_PERTYPE:
if self.type_ == 'gc':
- icon = gtkgui_helpers.load_icon('muc_active')
+ icon = gtkgui_helpers.get_iconset_name_for('muc-active')
else:
# chat, pm
- icon = gtkgui_helpers.load_icon('online')
+ icon = 'org.gajim.Gajim'
if icon:
if isinstance(icon, GdkPixbuf.Pixbuf):
self.window.set_icon(icon)
+ elif isinstance(icon, str):
+ self.window.set_icon_name(icon)
else:
self.window.set_icon(icon.get_pixbuf())
@@ -685,6 +687,8 @@ class MessageWindow(object):
status_img.set_from_animation(tab_img.get_animation())
else:
status_img.set_from_pixbuf(tab_img.get_pixbuf())
+ elif isinstance(tab_img, str):
+ status_img.set_from_icon_name(tab_img, Gtk.IconSize.MENU)
else:
status_img.set_from_surface(tab_img)
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/c5c717ddd17bf681a4d12273e2801849be6a5fa2
---
View it on GitLab:
https://dev.gajim.org/gajim/gajim/commit/c5c717ddd17bf681a4d12273e2801849be6a5fa2
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
