hal/tools/device-manager Makefile.am, 1.2, 1.3 Representation.py, 1.6, 1.7 hal-computer.png, NONE, 1.1

[David Zeuthen]

Update of /cvs/hal/hal/tools/device-manager
In directory pdx:/tmp/cvs-serv27646/tools/device-manager

Modified Files:
	Makefile.am Representation.py 
Added Files:
	hal-computer.png 
Log Message:
2004-07-22  David Zeuthen  <david at fubar.dk>

	Patch from Kay Sievers <kay.sievers at vrfy.org>

	* tools/device-manager/hal-computer.png: New file
	
	* tools/device-manager/Representation.py: Use hal-computer.png

	* tools/device-manager/Makefile.am (dist_devicemanager_DATA): Add
	hal-computer.png

2004-07-22  David Zeuthen  <david at fubar.dk>

	* libhal/libhal.[ch]: Fixup documentation so doxygen no longer
	complains



Index: Makefile.am
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Makefile.am,v
retrieving revision 1.2
retrieving revision 1.3
diff -u -d -r1.2 -r1.3
--- Makefile.am	22 Dec 2003 14:07:48 -0000	1.2
+++ Makefile.am	22 Jul 2004 00:31:45 -0000	1.3
@@ -22,6 +22,7 @@
                        hal-camera.png        hal-network.png       \
                        hal-cat-cardbus.png   hal-unknown.png       \
                        hal-cat-keyboard.png  hal-video.png         \
+                       hal-computer.png                            \
                        hal-device-manager.glade
 
 # symlink into $(bindir) for convenience

Index: Representation.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Representation.py,v
retrieving revision 1.6
retrieving revision 1.7
diff -u -d -r1.6 -r1.7
--- Representation.py	22 Apr 2004 21:52:06 -0000	1.6
+++ Representation.py	22 Jul 2004 00:31:45 -0000	1.7
@@ -22,6 +22,7 @@
     def __init__(self):
         """Init the class and load neccessary resources."""
         self.icons = {}
+        self.icons["computer"] = self.load_and_scale_icon(Const.DATADIR + "/hal-computer.png")
         self.icons["bus_pci"] = self.load_and_scale_icon(Const.DATADIR + "/hal-bus-pci.png")
         self.icons["bus_usb"] = self.load_and_scale_icon(Const.DATADIR + "/hal-bus-usb.png")
         self.icons["abstract"] = self.load_and_scale_icon(Const.DATADIR + "/hal-abstract.png");
@@ -38,13 +39,17 @@
         self.icons["audio"] = self.load_and_scale_icon(Const.DATADIR + "/hal-audio.png")
         self.icons["camera"] = self.load_and_scale_icon(Const.DATADIR + "/hal-camera.png")
 
-        
+
     def get_icon(self, device):
         """Given a Device object return an icon to display"""
 
         # Default to abstract icon
         icon = self.icons["abstract"]
-            
+
+        product = device.properties["info.product"]
+        if product=="Computer":
+            return self.icons["computer"]
+
         # First look at bus type, every device got Bus property
         bus = device.properties["info.bus"]
         if bus=="usb":

--- NEW FILE: hal-computer.png ---
‰PNG


(¿ÚõŠAâ£ŠEÕ ªxF
½ïðá6JKÓcêcMÔ
ªac
ΞŒúò&8žyä?xôB`„?–.]"So€ßc¹‡Q|ÅD}?&”T
ŒPEÕGxíëlC“8<.}
ÆYã¨ág¿ÿKÿ×åe娀¿DšÀÓ¾‚DÎ?ÇÊ+ª/5Wf°téRº»»§Æ
¢àŽ•Ø!|ôå—_ÖÖÖV=yòä-ÙZtG»ººÂJtG€k´ (hlläøñãx®K__
öïߟ7_YYɁ(++§¼¼œ9sæðî»þ	¾±ûyî釣X@	ðå•+W¾÷Ê+¯9s€óçÏS]]=¡sii)W¯^ðýŠŠ
úûû©ªªâÒ¥KY÷kjjhlÜà|ðÁ‡«@¦¿s‹IÆnf}}ý_·nÝZv×]wÑÝÝÍ•+Wèíí%•J!"ôôôN§Éd2ˆÈˆgÇq²®“Ï…°î¾mÛDyÎ[–ÅâÅ‹©««Kõôô¬>yòäo€Ì¿E øcKKK}]]]´bÒá([¢TçU÷ ¨hòû—ÆEIÂ]»d‹7ž’'òjj at U:::hhhØ<~öÐýaÝ,?}ú4'Nœø\ó
Ær`Ӑãý8œ_u¿+ –%*"yfÕÙC/d!  à@…‰Ä¶ä)•ÃÇÃ}ÌÜÚÇêJžúÞŠ™w/œuùwï¥åùçŸ/¼sٝôžéµÝ+®ñ®{æÁûçÏ}ü±º¢g²§+h´×/u¼èZV>Ä%Í7~ôwn)<À+¿÷EvìØAccãp2NÅ¢-ÑBýr×Öa¿ÐèÍT>n`