[kupfer: 31/51] grouping: composed icons for grouping leaves

[Ulrik Sverdrup <usverdrup src gnome org>]

commit e420af0f66fc434b5144afd3749240dfd2706f6a
Author: Karol BÄ?dkowski <karol bedkowsk+gh gmail com>
Date:   Sat Jan 9 15:06:16 2010 +0100

    grouping: composed icons for grouping leaves

 kupfer/obj/contacts.py    |    4 ++++
 kupfer/obj/hosts.py       |    2 +-
 kupfer/plugin/gajim.py    |    4 ++++
 kupfer/plugin/putty.py    |    6 +++---
 kupfer/plugin/tsclient.py |   10 +++++-----
 5 files changed, 17 insertions(+), 9 deletions(-)
---
diff --git a/kupfer/obj/contacts.py b/kupfer/obj/contacts.py
index 1ab6b1c..b9de28d 100644
--- a/kupfer/obj/contacts.py
+++ b/kupfer/obj/contacts.py
@@ -10,6 +10,7 @@ for specific slots to be filled.
 """
 import re
 
+from kupfer import icons
 from kupfer.obj.grouping import GroupingLeaf
 
 __author__ = ("Ulrik Sverdrup <ulrik sverdrup gmail com>, "
@@ -66,6 +67,9 @@ class EmailContact (ContactLeaf):
 	def get_description(self):
 		return self.object[EMAIL_KEY]
 
+	def get_gicon(self):
+		return icons.ComposedIcon(ContactLeaf.get_icon_name(self),"stock_mail")
+
 
 class JabberContact (ContactLeaf):
 	''' Minimal class for all Jabber contacts. '''
diff --git a/kupfer/obj/hosts.py b/kupfer/obj/hosts.py
index bbf3c06..8629af2 100644
--- a/kupfer/obj/hosts.py
+++ b/kupfer/obj/hosts.py
@@ -17,6 +17,6 @@ class HostLeaf(GroupingLeaf):
 	grouping_slots = (HOST_NAME_KEY, HOST_ADDRESS_KEY)
 
 	def get_icon_name(self):
-		return "stock_host"
+		return "computer"
 
 
diff --git a/kupfer/plugin/gajim.py b/kupfer/plugin/gajim.py
index be90a97..5494da5 100644
--- a/kupfer/plugin/gajim.py
+++ b/kupfer/plugin/gajim.py
@@ -7,6 +7,7 @@ from kupfer.helplib import dbus_signal_connect_weakly, PicklingHelperMixin
 from kupfer import plugin_support
 from kupfer.obj.grouping import ToplevelGroupingSource
 from kupfer.obj.contacts import ContactLeaf, JabberContact, JABBER_JID_KEY 
+from kupfer import icons
 		
 
 __kupfer_name__ = _("Gajim")
@@ -74,6 +75,9 @@ class GajimContact(JabberContact):
 	def repr_key(self):
 		return "".join((self.object[JABBER_JID_KEY], self.object[GAJIM_ACCOUNT_KEY]))
 
+	def get_gicon(self):
+		return icons.ComposedIcon(JabberContact.get_icon_name(self), "gajim")
+
 
 class AccountStatus(Leaf):
 	pass
diff --git a/kupfer/plugin/putty.py b/kupfer/plugin/putty.py
index 853b09d..96c9361 100644
--- a/kupfer/plugin/putty.py
+++ b/kupfer/plugin/putty.py
@@ -6,7 +6,7 @@ import urllib
 
 from kupfer.objects import Action, AppLeafContentMixin
 from kupfer.helplib import FilesystemWatchMixin, PicklingHelperMixin
-from kupfer import utils
+from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
 from kupfer.obj.hosts import HOST_NAME_KEY, HostLeaf
 
@@ -33,8 +33,8 @@ class PuttySession(HostLeaf):
 	def get_description(self):
 		return self._description
 
-	def get_icon_name(self):
-		return "computer"
+	def get_gicon(self):
+		return icons.ComposedIcon("computer", "putty")
 
 
 class PuttyOpenSession(Action):
diff --git a/kupfer/plugin/tsclient.py b/kupfer/plugin/tsclient.py
index 822c6b1..bd32912 100644
--- a/kupfer/plugin/tsclient.py
+++ b/kupfer/plugin/tsclient.py
@@ -3,9 +3,9 @@ from __future__ import with_statement
 
 import os
 
-from kupfer.objects import Leaf, Action, Source, AppLeafContentMixin
+from kupfer.objects import Action, AppLeafContentMixin
 from kupfer.helplib import FilesystemWatchMixin, PicklingHelperMixin
-from kupfer import utils
+from kupfer import utils, icons
 from kupfer.obj.grouping import ToplevelGroupingSource 
 from kupfer.obj.hosts import HOST_NAME_KEY, HostLeaf
 
@@ -31,8 +31,8 @@ class TsclientSession(HostLeaf):
 	def get_description(self):
 		return self._description
 
-	def get_icon_name(self):
-		return "computer"
+	def get_gicon(self):
+		return icons.ComposedIcon(HostLeaf.get_icon_name(self), "tsclient")
 
 
 class TsclientOpenSession(Action):
@@ -55,7 +55,7 @@ class TsclientOpenSession(Action):
 
 
 class TsclientSessionSource(AppLeafContentMixin, ToplevelGroupingSource,
-		FilesystemWatchMixin):
+		FilesystemWatchMixin, PicklingHelperMixin):
 	''' indexes session saved in tsclient '''
 
 	appleaf_content_id = 'tsclient'