hal: Branch 'master' - 2 commits
David Zeuthen
david at kemper.freedesktop.org
Mon Mar 5 11:39:46 PST 2007
tools/device-manager/hal-device-manager.glade | 400 ++++++++++++++++----------
1 files changed, 249 insertions(+), 151 deletions(-)
New commits:
diff-tree f1a782ba96ce5a555c606170c23792ab31e6980c (from parents)
Merge: fb66e4beb50c06ae082dff53a6e312da1fd83af0 12972f5cda4ef153e4aa70dc910c2e893bd7b712
Author: David Zeuthen <davidz at redhat.com>
Date: Mon Mar 5 14:39:32 2007 -0500
Merge branch 'master' of ssh://david@git.freedesktop.org/git/hal
diff-tree fb66e4beb50c06ae082dff53a6e312da1fd83af0 (from e8275a44406339dfe5bd8550698c280bc6d8e173)
Author: William Jon McCann <mccann at jhu.edu>
Date: Mon Mar 5 14:39:16 2007 -0500
sizing fixes for device manager
Was using the device manager to debug some stuff today and noticed
that it hardcodes the size of all the label widgets and uses
inconsistent alignment. Here's the fix.
diff --git a/tools/device-manager/hal-device-manager.glade b/tools/device-manager/hal-device-manager.glade
index bbf6714..5a84ae7 100644
--- a/tools/device-manager/hal-device-manager.glade
+++ b/tools/device-manager/hal-device-manager.glade
@@ -21,6 +21,8 @@
<property name="skip_pager_hint">False</property>
<property name="type_hint">GDK_WINDOW_TYPE_HINT_NORMAL</property>
<property name="gravity">GDK_GRAVITY_NORTH_WEST</property>
+ <property name="focus_on_map">True</property>
+ <property name="urgency_hint">False</property>
<property name="enable_layout_config">True</property>
<signal name="delete_event" handler="on_quit_activate" last_modification_time="Wed, 21 May 2003 18:23:07 GMT"/>
@@ -37,6 +39,8 @@
<child>
<widget class="GtkMenuBar" id="menubar1">
<property name="visible">True</property>
+ <property name="pack_direction">GTK_PACK_DIRECTION_LTR</property>
+ <property name="child_pack_direction">GTK_PACK_DIRECTION_LTR</property>
<child>
<widget class="GtkMenuItem" id="file1">
@@ -135,6 +139,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -166,8 +173,6 @@
<child>
<widget class="GtkLabel" id="label10">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Vendor:</b></property>
<property name="use_underline">False</property>
@@ -175,10 +180,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -192,8 +201,6 @@
<child>
<widget class="GtkLabel" id="label9">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Device:</b></property>
<property name="use_underline">False</property>
@@ -201,10 +208,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -218,8 +229,6 @@
<child>
<widget class="GtkLabel" id="ns_device_name">
- <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>
@@ -232,6 +241,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -245,8 +258,6 @@
<child>
<widget class="GtkLabel" id="label18">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Bus Type:</b></property>
<property name="use_underline">False</property>
@@ -254,10 +265,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -271,8 +286,6 @@
<child>
<widget class="GtkLabel" id="ns_device_status">
- <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>
@@ -285,6 +298,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -298,8 +315,6 @@
<child>
<widget class="GtkLabel" id="ns_device_bus">
- <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>
@@ -312,6 +327,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -325,8 +344,6 @@
<child>
<widget class="GtkLabel" id="label19">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Device Type:</b></property>
<property name="use_underline">False</property>
@@ -334,10 +351,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -351,8 +372,6 @@
<child>
<widget class="GtkLabel" id="ns_device_category">
- <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>
@@ -365,6 +384,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -392,6 +415,10 @@
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -405,8 +432,6 @@
<child>
<widget class="GtkLabel" id="ns_device_vendor">
- <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>
@@ -419,6 +444,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -438,10 +467,14 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -455,8 +488,6 @@
<child>
<widget class="GtkLabel" id="label8">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Status:</b></property>
<property name="use_underline">False</property>
@@ -464,10 +495,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -538,6 +573,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -556,8 +595,6 @@
<child>
<widget class="GtkLabel" id="label23">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Bandwidth:</b></property>
<property name="use_underline">False</property>
@@ -565,10 +602,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -582,8 +623,6 @@
<child>
<widget class="GtkLabel" id="label25">
- <property name="width_request">108</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Vendor:</b></property>
<property name="use_underline">False</property>
@@ -591,10 +630,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -608,8 +651,6 @@
<child>
<widget class="GtkLabel" id="label26">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Product:</b></property>
<property name="use_underline">False</property>
@@ -617,10 +658,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -634,8 +679,6 @@
<child>
<widget class="GtkLabel" id="label27">
- <property name="width_request">84</property>
- <property name="height_request">16</property>
<property name="visible">True</property>
<property name="label" translatable="yes"><b>Revision:</b></property>
<property name="use_underline">False</property>
@@ -643,10 +686,14 @@
<property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -660,8 +707,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_version">
- <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>
@@ -674,6 +719,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -686,8 +735,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_bandwidth">
- <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>
@@ -700,6 +747,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -713,8 +764,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_maxpower">
- <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>
@@ -727,6 +776,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -740,8 +793,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_man_id">
- <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>
@@ -754,6 +805,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -767,8 +822,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_prod_id">
- <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>
@@ -781,6 +834,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -794,8 +851,6 @@
<child>
<widget class="GtkLabel" id="ns_usb_rev">
- <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>
@@ -808,6 +863,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">1</property>
@@ -848,10 +907,14 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -872,10 +935,14 @@
<property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">False</property>
<property name="selectable">False</property>
- <property name="xalign">1</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="left_attach">0</property>
@@ -906,6 +973,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -923,175 +994,189 @@
<property name="column_spacing">6</property>
<child>
- <widget class="GtkLabel" id="label33">
- <property name="width_request">108</property>
- <property name="height_request">16</property>
+ <widget class="GtkHBox" id="hbox4">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Vendor:</b></property>
+ <property name="homogeneous">False</property>
+ <property name="spacing">0</property>
+
+ <child>
+ <placeholder/>
+ </child>
+ </widget>
+ <packing>
+ <property name="left_attach">0</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">2</property>
+ <property name="bottom_attach">3</property>
+ <property name="x_options">fill</property>
+ <property name="y_options">fill</property>
+ </packing>
+ </child>
+
+ <child>
+ <widget class="GtkLabel" id="ns_pci_man_id">
+ <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_RIGHT</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="selectable">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
- <property name="x_options"></property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label38">
- <property name="width_request">108</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="ns_pci_prod_id">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>OEM Product:</b></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_RIGHT</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="selectable">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">4</property>
- <property name="bottom_attach">5</property>
- <property name="x_options"></property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
+ <property name="top_attach">1</property>
+ <property name="bottom_attach">2</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label37">
- <property name="width_request">108</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="ns_pci_subsys_man_id">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>OEM Vendor:</b></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_RIGHT</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="selectable">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
+ <property name="left_attach">1</property>
+ <property name="right_attach">2</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
- <property name="x_options"></property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="label34">
- <property name="width_request">108</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="ns_pci_subsys_prod_id">
<property name="visible">True</property>
- <property name="label" translatable="yes"><b>Product:</b></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_RIGHT</property>
+ <property name="justify">GTK_JUSTIFY_LEFT</property>
<property name="wrap">True</property>
- <property name="selectable">False</property>
- <property name="xalign">0.5</property>
+ <property name="selectable">True</property>
+ <property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">0</property>
- <property name="right_attach">1</property>
- <property name="top_attach">1</property>
- <property name="bottom_attach">2</property>
- <property name="x_options"></property>
- <property name="y_options"></property>
- </packing>
- </child>
-
- <child>
- <widget class="GtkHBox" id="hbox4">
- <property name="visible">True</property>
- <property name="homogeneous">False</property>
- <property name="spacing">0</property>
-
- <child>
- <placeholder/>
- </child>
- </widget>
- <packing>
- <property name="left_attach">0</property>
+ <property name="left_attach">1</property>
<property name="right_attach">2</property>
- <property name="top_attach">2</property>
- <property name="bottom_attach">3</property>
+ <property name="top_attach">4</property>
+ <property name="bottom_attach">5</property>
<property name="x_options">fill</property>
- <property name="y_options">fill</property>
+ <property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ns_pci_man_id">
- <property name="width_request">250</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="label33">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Manufacturer ID</property>
+ <property name="label" translatable="yes"><b>Vendor:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
- <property name="selectable">True</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">0</property>
<property name="bottom_attach">1</property>
+ <property name="x_options">fill</property>
<property name="y_options"></property>
</packing>
</child>
<child>
- <widget class="GtkLabel" id="ns_pci_prod_id">
- <property name="width_request">250</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="label34">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">Product ID</property>
+ <property name="label" translatable="yes"><b>Product:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
- <property name="selectable">True</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">1</property>
<property name="bottom_attach">2</property>
<property name="x_options">fill</property>
@@ -1100,25 +1185,26 @@
</child>
<child>
- <widget class="GtkLabel" id="ns_pci_subsys_man_id">
- <property name="width_request">250</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="label37">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">OEM Manufacturer ID</property>
+ <property name="label" translatable="yes"><b>OEM Vendor:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
- <property name="selectable">True</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">3</property>
<property name="bottom_attach">4</property>
<property name="x_options">fill</property>
@@ -1127,25 +1213,26 @@
</child>
<child>
- <widget class="GtkLabel" id="ns_pci_subsys_prod_id">
- <property name="width_request">250</property>
- <property name="height_request">16</property>
+ <widget class="GtkLabel" id="label38">
<property name="visible">True</property>
- <property name="can_focus">True</property>
- <property name="label" translatable="yes">OEM Product ID</property>
+ <property name="label" translatable="yes"><b>OEM Product:</b></property>
<property name="use_underline">False</property>
<property name="use_markup">True</property>
- <property name="justify">GTK_JUSTIFY_LEFT</property>
+ <property name="justify">GTK_JUSTIFY_RIGHT</property>
<property name="wrap">True</property>
- <property name="selectable">True</property>
+ <property name="selectable">False</property>
<property name="xalign">0</property>
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
- <property name="left_attach">1</property>
- <property name="right_attach">2</property>
+ <property name="left_attach">0</property>
+ <property name="right_attach">1</property>
<property name="top_attach">4</property>
<property name="bottom_attach">5</property>
<property name="x_options">fill</property>
@@ -1172,6 +1259,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
@@ -1195,6 +1286,9 @@
<property name="rules_hint">False</property>
<property name="reorderable">False</property>
<property name="enable_search">True</property>
+ <property name="fixed_height_mode">False</property>
+ <property name="hover_selection">False</property>
+ <property name="hover_expand">False</property>
</widget>
</child>
</widget>
@@ -1217,6 +1311,10 @@
<property name="yalign">0.5</property>
<property name="xpad">0</property>
<property name="ypad">0</property>
+ <property name="ellipsize">PANGO_ELLIPSIZE_NONE</property>
+ <property name="width_chars">-1</property>
+ <property name="single_line_mode">False</property>
+ <property name="angle">0</property>
</widget>
<packing>
<property name="type">tab</property>
More information about the hal-commit
mailing list