summaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
Diffstat (limited to 'tools')
-rw-r--r--tools/device-manager/DeviceManager.py11
-rw-r--r--tools/device-manager/hal-device-manager.glade48
-rw-r--r--tools/device-manager/hal-device-manager.in2
-rw-r--r--tools/hal_set_property.c1
4 files changed, 41 insertions, 21 deletions
diff --git a/tools/device-manager/DeviceManager.py b/tools/device-manager/DeviceManager.py
index 6b9d54c2..b5fec40e 100644
--- a/tools/device-manager/DeviceManager.py
+++ b/tools/device-manager/DeviceManager.py
@@ -465,10 +465,13 @@ class DeviceManager(LibGladeApplication):
cols = prop_tree_view.get_columns()
for cr in cols:
prop_tree_view.remove_column(cr)
-
- column0 = gtk.TreeViewColumn("Key", gtk.CellRendererText(), text=0)
- column1 = gtk.TreeViewColumn("Type", gtk.CellRendererText(), text=1)
- column2 = gtk.TreeViewColumn("Value", gtk.CellRendererText(), text=2)
+
+ cell_renderer = gtk.CellRendererText()
+ cell_renderer.set_property("editable", True)
+
+ column0 = gtk.TreeViewColumn("Key", cell_renderer, text=0)
+ column1 = gtk.TreeViewColumn("Type", cell_renderer, text=1)
+ column2 = gtk.TreeViewColumn("Value", cell_renderer, text=2)
prop_tree_view.append_column(column0)
prop_tree_view.append_column(column1)
prop_tree_view.append_column(column2)
diff --git a/tools/device-manager/hal-device-manager.glade b/tools/device-manager/hal-device-manager.glade
index e691c3fd..bbf6714f 100644
--- a/tools/device-manager/hal-device-manager.glade
+++ b/tools/device-manager/hal-device-manager.glade
@@ -221,12 +221,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Device Name</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -273,12 +274,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Status</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -299,12 +301,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Bus Type</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -351,12 +354,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Device Type</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -377,12 +381,13 @@
<property name="width_request">250</property>
<property name="height_request">96</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Capabilties this might be a pretty long list so blablabla yada yda dyadhsk hdks jdhsk dks hdks hdks</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">0</property>
@@ -403,12 +408,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Device Vendor</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -657,12 +663,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">USB Version</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -682,12 +689,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">USB Bandwidth</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -708,12 +716,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Max Power Drain</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -734,12 +743,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Manufacturer ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -760,12 +770,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Product ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -786,12 +797,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Product Revision</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -1039,12 +1051,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Manufacturer ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -1064,12 +1077,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">Product ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -1090,12 +1104,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">OEM Manufacturer ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
@@ -1116,12 +1131,13 @@
<property name="width_request">250</property>
<property name="height_request">16</property>
<property name="visible">True</property>
+ <property name="can_focus">True</property>
<property name="label" translatable="yes">OEM Product ID</property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
+ <property name="selectable">True</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
diff --git a/tools/device-manager/hal-device-manager.in b/tools/device-manager/hal-device-manager.in
index e7e450f3..42255994 100644
--- a/tools/device-manager/hal-device-manager.in
+++ b/tools/device-manager/hal-device-manager.in
@@ -15,5 +15,7 @@ import LibGladeApplication
from DeviceManager import DeviceManager
gnome.program_init(Const.NAME, Const.VERSION)
++gtk.glade.bindtextdomain('@PACKAGE@', '@DATADIR@/locale')
++gtk.glade.textdomain('@PACKAGE@')
DeviceManager()
gtk.main()
diff --git a/tools/hal_set_property.c b/tools/hal_set_property.c
index 087f5e29..42d7f42e 100644
--- a/tools/hal_set_property.c
+++ b/tools/hal_set_property.c
@@ -88,7 +88,6 @@ usage (int argc, char *argv[])
" --strlist-post Append a string to a list\n"
" --strlist-rem Remove a string from a list\n"
" --remove Indicates that the property should be removed\n"
- " --verbose Be verbose\n"
" --version Show version and exit\n"
" --help Show this information and exit\n"
"\n"