hal/tools/device-manager Const.py.in, 1.11, 1.12 DeviceManager.py, 1.12, 1.13 Representation.py, 1.8, 1.9

[David Zeuthen]

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

Modified Files:
	Const.py.in DeviceManager.py Representation.py 
Log Message:
2004-08-09  David Zeuthen  <david at fubar.dk>

	* doc/spec/Makefile.am (FIGURE_FILES): Added hal-fdi-example3.png

	* doc/spec/hal-spec.xml.in: Added some text about how storage_lun%d.*
	and storage.* properties are merged from the physical device object
	backing the block devices. Included .fdi example with 6in1 reader
	to further clarify this.

	* doc/spec/hal/hal-devices1.png: 
	* doc/spec/hal/hal-fdi-example1.png:
	Updated to show full device tree now that info.virtual is gone.

	* doc/spec/hal/hal-fdi-example2.png: New file

	* doc/spec/hal/hal-fdi-example3.png: New file

2004-08-08  David Zeuthen  <david at fubar.dk>

	* doc/TODO: Remove the TODO entry about support for multiple USB
	interfaces since this is now done

	* hald/linux/usbif_bus_device.c (compute_name_from_if): New function

	* hald/linux/usb_bus_device.c: Rename all usb.* properties to
	usb_device.*

	* hald/linux/usbif_bus_device.c: Rename all usbif.* properties to
	usb.*. Merge usb_device.* properties from parent device. Essentially
	an USB interface is now like an USB device was except that it
	exports properties usb.interface.* to describe the USB interface

	* tools/device-manager/Const.py.in: 
	* tools/device-manager/Representation.py: 
	Handle the s/usb/usb_device/ and s/usbif/usb/ renamings

	* doc/spec/hal-spec.xml.in: Apply a patch from Kay with spelling/
	language/grammar improvements. Also update to reflect the USB
	renaming.

	* hald/linux/usbif_bus_device.c (usbif_device_pre_process): 
	* hald/linux/scsi_host_class_device.c (scsi_host_class_pre_process): 
	* hald/linux/scsi_device_class_device.c 
	(scsi_device_class_pre_process): 
	* hald/linux/macio_bus_device.c (macio_device_pre_process): 
	* hald/linux/ieee1394_node_class_device.c 
	(ieee1394_node_class_pre_process): 
	* hald/linux/ieee1394_host_class_device.c 
	(ieee1394_host_class_pre_process): 
	* hald/linux/ide_host_bus_device.c (ide_host_device_pre_process): 
	* hald/linux/ide_bus_device.c (ide_device_pre_process): 
	* hald/linux/block_class_device.c (block_class_pre_process): 
	Don't set the info.virtual property

2004-08-06  David Zeuthen  <david at fubar.dk>

	* fdi/20freedesktop/canon-digital-ixus-v.fdi: Updated to match spec

	* fdi/20freedesktop/jetflash-mp3-player.fdi: Updated to match spec

	* doc/spec/hal-spec.xml.in: Work in progress

	* hald/linux/pcmcia_socket_class_device.c 
	(pcmcia_socket_class_pre_process): Add property pcmcia_socket.number



Index: Const.py.in
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Const.py.in,v
retrieving revision 1.11
retrieving revision 1.12
diff -u -d -r1.11 -r1.12
--- Const.py.in	24 Jun 2004 21:47:49 -0000	1.11
+++ Const.py.in	9 Aug 2004 18:33:29 -0000	1.12
@@ -17,9 +17,9 @@
 UDI_COLUMN    = 2
 
 BUS_NAMES = {"unknown"       : "Unknown",
-             "usb"           : "USB",
+             "usb_device"    : "USB",
              "platform"      : "Legacy Device",
-             "usbif"         : "USB Interface",
+             "usb"           : "USB Interface",
              "pci"           : "PCI",
              "i2c"           : "I2C",
              "i2c_adapter"   : "I2C Adapter",

Index: DeviceManager.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
retrieving revision 1.12
retrieving revision 1.13
diff -u -d -r1.12 -r1.13
--- DeviceManager.py	2 Aug 2004 21:56:24 -0000	1.12
+++ DeviceManager.py	9 Aug 2004 18:33:29 -0000	1.13
@@ -83,34 +83,24 @@
 
     def add_device_signal_recv (self, udi):
 	self.bus.add_signal_receiver(self.device_changed,
-				     "PropertyAdded",
-				     "org.freedesktop.Hal.Device",
-				     "org.freedesktop.Hal",
-				     udi)
-	self.bus.add_signal_receiver(self.device_changed,
-				     "PropertyRemoved",
+				     "PropertyModified",
 				     "org.freedesktop.Hal.Device",
 				     "org.freedesktop.Hal",
 				     udi)
 	self.bus.add_signal_receiver(self.device_changed,
-				     "PropertyChanged",
+				     "Condition",
 				     "org.freedesktop.Hal.Device",
 				     "org.freedesktop.Hal",
 				     udi)
 
     def remove_device_signal_recv (self, udi):
 	self.bus.remove_signal_receiver(self.device_changed,
-				     "PropertyAdded",
-				     "org.freedesktop.Hal.Device",
-				     "org.freedesktop.Hal",
-				     udi)
-	self.bus.remove_signal_receiver(self.device_changed,
-				     "PropertyRemoved",
+				     "PropertyModified",
 				     "org.freedesktop.Hal.Device",
 				     "org.freedesktop.Hal",
 				     udi)
 	self.bus.remove_signal_receiver(self.device_changed,
-				     "PropertyChanged",
+				     "Condition",
 				     "org.freedesktop.Hal.Device",
 				     "org.freedesktop.Hal",
 				     udi)

Index: Representation.py
===================================================================
RCS file: /cvs/hal/hal/tools/device-manager/Representation.py,v
retrieving revision 1.8
retrieving revision 1.9
diff -u -d -r1.8 -r1.9
--- Representation.py	30 Jul 2004 17:23:18 -0000	1.8
+++ Representation.py	9 Aug 2004 18:33:29 -0000	1.9
@@ -52,7 +52,7 @@
 
         # First look at bus type, every device got Bus property
         bus = device.properties["info.bus"]
-        if bus=="usb":
+        if bus=="usb_device":
             icon = self.icons["bus_usb"]
         elif bus=="pci":
             icon = self.icons["bus_pci"]