From 73d29ef9971d02e900ddab9a453075d5589dbed1 Mon Sep 17 00:00:00 2001 From: Stephen Boddy Date: Mon, 3 Aug 2015 20:33:10 +0200 Subject: [PATCH] (trunk-1586) Additional windows icon loading works better, and respect the theme changes. --- terminatorlib/layoutlauncher.py | 12 ++++++------ terminatorlib/plugins/custom_commands.py | 14 +++++++------- terminatorlib/prefseditor.py | 12 ++++++------ 3 files changed, 19 insertions(+), 19 deletions(-) diff --git a/terminatorlib/layoutlauncher.py b/terminatorlib/layoutlauncher.py index 13721cb9..a1ddbd49 100755 --- a/terminatorlib/layoutlauncher.py +++ b/terminatorlib/layoutlauncher.py @@ -46,13 +46,13 @@ class LayoutLauncher: self.builder.add_from_string(gladedata) self.window = self.builder.get_object('layoutlauncherwin') - icon_theme = Gtk.IconTheme() - try: - icon = icon_theme.load_icon('terminator-layout', 48, 0) - except (NameError, GObject.GError): - dbg('Unable to load 48px Terminator preferences icon') + icon_theme = Gtk.IconTheme.get_default() + if icon_theme.lookup_icon('terminator-layout', 48, 0): + self.window.set_icon_name('terminator-layout') + else: + dbg('Unable to load Terminator layout launcher icon') icon = self.window.render_icon(Gtk.STOCK_DIALOG_INFO, Gtk.IconSize.BUTTON) - self.window.set_icon(icon) + self.window.set_icon(icon) self.builder.connect_signals(self) self.window.connect('destroy', self.on_destroy_event) diff --git a/terminatorlib/plugins/custom_commands.py b/terminatorlib/plugins/custom_commands.py index 5e676ea5..a5477df2 100755 --- a/terminatorlib/plugins/custom_commands.py +++ b/terminatorlib/plugins/custom_commands.py @@ -71,7 +71,7 @@ class CustomCommandsMenu(plugin.MenuItem): menuitem = Gtk.SeparatorMenuItem() submenu.append(menuitem) - theme = Gtk.IconTheme() + theme = Gtk.IconTheme.get_default() for command in [ self.cmd_list[key] for key in sorted(self.cmd_list.keys()) ] : if not command['enabled']: continue @@ -126,13 +126,13 @@ class CustomCommandsMenu(plugin.MenuItem): ) ) - icon_theme = Gtk.IconTheme() - try: - icon = icon_theme.load_icon('terminator-custom-commands', 48, 0) - except (NameError, GObject.GError): - dbg('Unable to load 48px Terminator preferences icon') + icon_theme = Gtk.IconTheme.get_default() + if icon_theme.lookup_icon('terminator-custom-commands', 48, 0): + dbox.set_icon_name('terminator-custom-commands') + else: + dbg('Unable to load Terminator custom command icon') icon = dbox.render_icon(Gtk.STOCK_DIALOG_INFO, Gtk.IconSize.BUTTON) - dbox.set_icon(icon) + dbox.set_icon(icon) store = Gtk.ListStore(bool, str, str) diff --git a/terminatorlib/prefseditor.py b/terminatorlib/prefseditor.py index b178505a..8d51f982 100755 --- a/terminatorlib/prefseditor.py +++ b/terminatorlib/prefseditor.py @@ -173,13 +173,13 @@ class PrefsEditor: self.builder.add_from_string(gladedata) self.window = self.builder.get_object('prefswin') - icon_theme = Gtk.IconTheme() - try: - icon = icon_theme.load_icon('terminator-preferences', 48, 0) - except (NameError, GObject.GError): - dbg('Unable to load 48px Terminator preferences icon') + icon_theme = Gtk.IconTheme.get_default() + if icon_theme.lookup_icon('terminator-preferences', 48, 0): + self.window.set_icon_name('terminator-preferences') + else: + dbg('Unable to load Terminator preferences icon') icon = self.window.render_icon(Gtk.STOCK_DIALOG_INFO, Gtk.IconSize.BUTTON) - self.window.set_icon(icon) + self.window.set_icon(icon) self.layouteditor = LayoutEditor(self.builder) self.builder.connect_signals(self)