[kupfer: 55/67] icons: Add the GTK+ icon renderer as an alternative

[Ulrik Sverdrup <usverdrup src gnome org>]

commit 80d1b0f72414899eb401a7da7ef7784fe311538b
Author: Ulrik Sverdrup <ulrik sverdrup gmail com>
Date:   Sat Mar 19 01:53:39 2011 +0100

    icons: Add the GTK+ icon renderer as an alternative
    
    The GTK+ icon theme is the only default alternative.

 kupfer/icons.py                 |   57 +++++++++++++++++++++++++++++++-------
 kupfer/plugin/core/terminals.py |    7 +++++
 kupfer/plugin_support.py        |   13 +++++++-
 3 files changed, 64 insertions(+), 13 deletions(-)
---
diff --git a/kupfer/icons.py b/kupfer/icons.py
index 9a49c16..d65a88b 100644
--- a/kupfer/icons.py
+++ b/kupfer/icons.py
@@ -232,6 +232,47 @@ def _get_icon_for_standard_gicon(gicon, icon_size):
 	print "get_icon_for_gicon, could not load", gicon
 	return None
 
+
+def _setup_icon_renderer(sched):
+	global _IconRenderer
+	from kupfer.core import settings
+	setctl = settings.GetSettingsController()
+	renderer_dict = setctl.get_preferred_alternative('icon_renderer')
+	renderer = renderer_dict.get("renderer")
+	if not renderer:
+		return
+	pretty.print_debug(__name__, "Using", renderer)
+	_IconRenderer = renderer
+
+
+scheduler.GetScheduler().connect("loaded", _setup_icon_renderer)
+
+
+class IconRenderer (object):
+	"""
+	Default GTK+ implementation
+	"""
+	@classmethod
+	def pixbuf_for_name(cls, icon_name, icon_size):
+		try:
+			return _default_theme.load_icon(icon_name, icon_size,
+			                                ICON_LOOKUP_USE_BUILTIN |
+			                                ICON_LOOKUP_FORCE_SIZE)
+		except GError:
+			pass
+
+	@classmethod
+	def pixbuf_for_file(cls, file_path, icon_size):
+		try:
+			icon = gtk.gdk.pixbuf_new_from_file_at_size(file_path, icon_size,
+			                                            icon_size)
+			return icon
+		except GError:
+			pretty.print_exc(__name__)
+
+_IconRenderer = IconRenderer
+
+
 def get_icon_for_name(icon_name, icon_size, icon_names=[]):
 	for i in get_icon(icon_name, icon_size):
 		return i
@@ -240,13 +281,11 @@ def get_icon_for_name(icon_name, icon_size, icon_names=[]):
 	# Try the whole list of given names
 	for load_name in icon_names:
 		try:
-			icon = _default_theme.load_icon(load_name, icon_size, ICON_LOOKUP_USE_BUILTIN | ICON_LOOKUP_FORCE_SIZE)
+			icon = _IconRenderer.pixbuf_for_name(load_name, icon_size)
 			if icon:
 				break
-		except GError, e:
-			icon = None
-		except Exception, e:
-			print "get_icon_for_name, error:", e
+		except Exception:
+			pretty.print_exc(__name__)
 			icon = None
 	else:
 		# if we did not reach 'break' in the loop
@@ -260,14 +299,10 @@ def get_icon_from_file(icon_file, icon_size):
 	# try to load from cache
 	for icon in get_icon(icon_file, icon_size):
 		return icon
-
-	try:
-		icon = pixbuf_new_from_file_at_size(icon_file, icon_size, icon_size)
+	icon = _IconRenderer.pixbuf_for_file(icon_file, icon_size)
+	if icon is not None:
 		store_icon(icon_file, icon_size, icon)
 		return icon
-	except GError, e:
-		print "get_icon_from_file, error:", e
-		return None
 
 def is_good(gicon):
 	"""Return True if it is likely that @gicon will load a visible icon
diff --git a/kupfer/plugin/core/terminals.py b/kupfer/plugin/core/terminals.py
index 3e1c9ca..befe95a 100644
--- a/kupfer/plugin/core/terminals.py
+++ b/kupfer/plugin/core/terminals.py
@@ -1,4 +1,11 @@
 from kupfer import plugin_support
+from kupfer import icons
+
+plugin_support.register_alternative(__name__, 'icon_renderer', 'gtk',
+		**{
+			'name': _("GTK+"),
+			'renderer': icons.IconRenderer,
+		})
 
 plugin_support.register_alternative(__name__, 'terminal', 'gnome-terminal',
 		**{
diff --git a/kupfer/plugin_support.py b/kupfer/plugin_support.py
index db4a929..2fc39f2 100644
--- a/kupfer/plugin_support.py
+++ b/kupfer/plugin_support.py
@@ -199,6 +199,7 @@ def _is_valid_terminal(term_dict):
 		if os.access(exepath, os.R_OK|os.X_OK) and os.path.isfile(exepath):
 			return True
 
+
 _available_alternatives = {
 	"terminal": {
 		"filter": _is_valid_terminal,
@@ -208,12 +209,20 @@ _available_alternatives = {
 			'exearg': str,
 			'desktopid': str,
 			'startup_notify': bool,
-			},
 		},
-	}
+	},
+	"icon_renderer": {
+		"filter": None,
+		"required_keys": {
+			'name': unicode,
+			'renderer': object,
+		},
+	},
+}
 
 _alternatives = {
 	"terminal": {},
+	"icon_renderer": {},
 }