[Pkg-utopia-commits] r63 - in packages/hal/trunk/debian: . patches

[Sjoerd Simons]

Author: sjoerd
Date: 2004-11-06 06:58:32 -0700 (Sat, 06 Nov 2004)
New Revision: 63

Added:
   packages/hal/trunk/debian/patches/device-manager-glade.patch
   packages/hal/trunk/debian/patches/device-manager.patch
Modified:
   packages/hal/trunk/debian/changelog
Log:
Added some h-d-m improvements

Modified: packages/hal/trunk/debian/changelog
===================================================================
--- packages/hal/trunk/debian/changelog	2004-11-06 12:45:41 UTC (rev 62)
+++ packages/hal/trunk/debian/changelog	2004-11-06 13:58:32 UTC (rev 63)
@@ -15,6 +15,10 @@
     Updated. Usage comment=fstabsync as option for fstab-sync mount lines
   * debian/patches/hal-fdi.patch
     Added. Look for user fdi files in /etc/hal/fdi
+  * debian/patches/device-manager.patch
+    Added. Fill the Device type and Capabilities field (Patch from Bryan Clark)
+  * debian/patches/device-manager-glade.patch
+    Added. Improve the appearance of the Device tab in h-d-m 
 
  -- Sjoerd Simons <sjoerd@debian.org>  Tue, 19 Oct 2004 16:59:21 +0200
 

Added: packages/hal/trunk/debian/patches/device-manager-glade.patch
===================================================================
--- packages/hal/trunk/debian/patches/device-manager-glade.patch	2004-11-06 12:45:41 UTC (rev 62)
+++ packages/hal/trunk/debian/patches/device-manager-glade.patch	2004-11-06 13:58:32 UTC (rev 63)
@@ -0,0 +1,55 @@
+Index: tools/device-manager/hal-device-manager.glade
+===================================================================
+RCS file: /cvs/hal/hal/tools/device-manager/hal-device-manager.glade,v
+retrieving revision 1.2
+diff -u -r1.2 hal-device-manager.glade
+--- tools/device-manager/hal-device-manager.glade	4 Jan 2004 17:48:37 -0000	1.2
++++ tools/device-manager/hal-device-manager.glade	6 Nov 2004 13:43:24 -0000
+@@ -173,9 +173,9 @@
+ 		      <property name="use_underline">False</property>
+ 		      <property name="use_markup">True</property>
+ 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-		      <property name="wrap">True</property>
++		      <property name="wrap">False</property>
+ 		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
++		      <property name="xalign">1</property>
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
+@@ -199,9 +199,9 @@
+ 		      <property name="use_underline">False</property>
+ 		      <property name="use_markup">True</property>
+ 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-		      <property name="wrap">True</property>
++		      <property name="wrap">False</property>
+ 		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
++		      <property name="xalign">1</property>
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
+@@ -251,9 +251,9 @@
+ 		      <property name="use_underline">False</property>
+ 		      <property name="use_markup">True</property>
+ 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-		      <property name="wrap">True</property>
++		      <property name="wrap">False</property>
+ 		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
++		      <property name="xalign">1</property>
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>
+@@ -329,9 +329,9 @@
+ 		      <property name="use_underline">False</property>
+ 		      <property name="use_markup">True</property>
+ 		      <property name="justify">GTK_JUSTIFY_RIGHT</property>
+-		      <property name="wrap">True</property>
++		      <property name="wrap">False</property>
+ 		      <property name="selectable">False</property>
+-		      <property name="xalign">0.5</property>
++		      <property name="xalign">1</property>
+ 		      <property name="yalign">0.5</property>
+ 		      <property name="xpad">0</property>
+ 		      <property name="ypad">0</property>

Added: packages/hal/trunk/debian/patches/device-manager.patch
===================================================================
--- packages/hal/trunk/debian/patches/device-manager.patch	2004-11-06 12:45:41 UTC (rev 62)
+++ packages/hal/trunk/debian/patches/device-manager.patch	2004-11-06 13:58:32 UTC (rev 63)
@@ -0,0 +1,27 @@
+Index: tools/device-manager/DeviceManager.py
+===================================================================
+RCS file: /cvs/hal/hal/tools/device-manager/DeviceManager.py,v
+retrieving revision 1.15
+diff -u -r1.15 DeviceManager.py
+--- tools/device-manager/DeviceManager.py	1 Sep 2004 17:38:59 -0000	1.15
++++ tools/device-manager/DeviceManager.py	6 Nov 2004 12:44:24 -0000
+@@ -355,9 +355,16 @@
+             product.set_label("Unknown")
+             vendor.set_label("Unknown")
+ 
+-        # clear category, capabilities
+-        category.set_label("Unknown")
+-        capabilities.set_label("Unknown")
++        # set category, capabilities
++        if device.properties.has_key("info.category"):
++            category.set_label("%s"%device.properties["info.category"])
++        else:
++            category.set_label("Unknown")
++
++        if device.properties.has_key("info.capabilities"):
++            capabilities.set_label("%s"%device.properties["info.capabilities"])
++        else:
++            capabilities.set_label("Unknown")
+ 
+     def update_tab_usb(self, device):
+         """Updates the 'USB' tab given a Device object; may hide it"""