put a slight bit of sanity into those .ui files

2 files changed, 152 insertions, 235 deletions

diff --git a/noncore/net/opietooth/manager/bluetoothbase.ui b/noncore/net/opietooth/manager/bluetoothbase.ui
index a900212..2d14b8f 100644
--- a/noncore/net/opietooth/manager/bluetoothbase.ui
+++ b/noncore/net/opietooth/manager/bluetoothbase.ui
@@ -8,36 +8,36 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>370</width>
-            <height>328</height>
+            <width>297</width>
+            <height>382</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form1</string>
     </property>
     <property>
         <name>layoutMargin</name>
     </property>
     <property>
         <name>layoutSpacing</name>
     </property>
-    <vbox>
+    <grid>
         <property stdset="1">
             <name>margin</name>
-            <number>11</number>
+            <number>4</number>
         </property>
         <property stdset="1">
             <name>spacing</name>
-            <number>6</number>
+            <number>2</number>
         </property>
-        <widget>
+        <widget row="0"  column="0" >
             <class>QTabWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>Status</cstring>
             </property>
             <property>
@@ -56,13 +56,13 @@
                     <name>title</name>
                     <string>Devices</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>2</number>
+                        <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget>
@@ -112,13 +112,13 @@
                                 <hsizetype>0</hsizetype>
                                 <vsizetype>0</vsizetype>
                             </sizepolicy>
                         </property>
                         <property stdset="1">
                             <name>text</name>
-                            <string>Scan for Devices</string>
+                            <string>&amp;Rescan Devices</string>
                         </property>
                     </widget>
                 </vbox>
             </widget>
             <widget>
                 <class>QWidget</class>
@@ -130,13 +130,13 @@
                     <name>title</name>
                     <string>Connections</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>2</number>
+                        <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget>
@@ -197,217 +197,155 @@
                     <cstring>tab</cstring>
                 </property>
                 <attribute>
                     <name>title</name>
                     <string>Config</string>
                 </attribute>
-                <vbox>
-                    <property stdset="1">
-                        <name>margin</name>
-                        <number>11</number>
-                    </property>
-                    <property stdset="1">
-                        <name>spacing</name>
-                        <number>6</number>
-                    </property>
-                    <widget>
-                        <class>QGroupBox</class>
-                        <property stdset="1">
-                            <name>name</name>
-                            <cstring>GroupBox1</cstring>
-                        </property>
-                        <property stdset="1">
-                            <name>title</name>
-                            <string>Bluetooth Basic Config</string>
-                        </property>
-                        <vbox>
-                            <property stdset="1">
-                                <name>margin</name>
-                                <number>11</number>
-                            </property>
-                            <property stdset="1">
-                                <name>spacing</name>
-                                <number>6</number>
-                            </property>
-                            <widget>
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout7</cstring>
-                                </property>
-                                <hbox>
+                <grid>
                                     <property stdset="1">
                                         <name>margin</name>
-                                        <number>0</number>
+                        <number>4</number>
                                     </property>
                                     <property stdset="1">
                                         <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
-                                        <class>QLayoutWidget</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>Layout6</cstring>
-                                        </property>
-                                        <vbox>
-                                            <property stdset="1">
-                                                <name>margin</name>
-                                                <number>0</number>
-                                            </property>
-                                            <property stdset="1">
-                                                <name>spacing</name>
-                                                <number>6</number>
+                        <number>2</number>
                                             </property>
-                                            <widget>
-                                                <class>QLabel</class>
+                    <widget row="1"  column="0" >
+                        <class>QPushButton</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>deviceNameLabel</cstring>
+                            <cstring>rfcommBindButton</cstring>
                                                 </property>
                                                 <property stdset="1">
                                                     <name>text</name>
-                                                    <string>Device Name</string>
+                            <string>&amp;Edit RFCOMM Bind Table</string>
                                                 </property>
                                             </widget>
-                                            <widget>
-                                                <class>QLabel</class>
+                    <widget row="0"  column="0" >
+                        <class>QGroupBox</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>passkeyLabel</cstring>
+                            <cstring>GroupBox1</cstring>
                                                 </property>
                                                 <property stdset="1">
-                                                    <name>text</name>
-                                                    <string>Default Passkey</string>
+                            <name>title</name>
+                            <string>Bluetooth Basic Config</string>
                                                 </property>
-                                            </widget>
-                                        </vbox>
-                                    </widget>
-                                    <widget>
-                                        <class>QLayoutWidget</class>
-                                        <property stdset="1">
-                                            <name>name</name>
-                                            <cstring>Layout5</cstring>
+                        <property>
+                            <name>layoutMargin</name>
                                         </property>
-                                        <vbox>
+                        <property>
+                            <name>layoutSpacing</name>
+                        </property>
+                        <grid>
                                             <property stdset="1">
                                                 <name>margin</name>
-                                                <number>0</number>
+                                <number>4</number>
                                             </property>
                                             <property stdset="1">
                                                 <name>spacing</name>
-                                                <number>6</number>
-                                            </property>
-                                            <widget>
-                                                <class>QLineEdit</class>
-                                                <property stdset="1">
-                                                    <name>name</name>
-                                                    <cstring>deviceNameLine</cstring>
+                                <number>2</number>
                                                 </property>
-                                            </widget>
-                                            <widget>
-                                                <class>QLineEdit</class>
+                            <widget row="6"  column="0"  rowspan="1"  colspan="2" >
+                                <class>QPushButton</class>
                                                 <property stdset="1">
                                                     <name>name</name>
-                                                    <cstring>passkeyLine</cstring>
+                                    <cstring>configApplyButton</cstring>
                                                 </property>
                                                 <property stdset="1">
-                                                    <name>echoMode</name>
-                                                    <enum>Password</enum>
+                                    <name>text</name>
+                                    <string>Apply</string>
                                                 </property>
                                             </widget>
-                                        </vbox>
-                                    </widget>
-                                </hbox>
-                            </widget>
-                            <widget>
-                                <class>QLayoutWidget</class>
-                                <property stdset="1">
-                                    <name>name</name>
-                                    <cstring>Layout5</cstring>
-                                </property>
-                                <vbox>
-                                    <property stdset="1">
-                                        <name>margin</name>
-                                        <number>0</number>
-                                    </property>
-                                    <property stdset="1">
-                                        <name>spacing</name>
-                                        <number>6</number>
-                                    </property>
-                                    <widget>
+                            <widget row="2"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>authCheckBox</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>enable authentification</string>
                                         </property>
                                     </widget>
-                                    <widget>
+                            <widget row="3"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>cryptCheckBox</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>enable encryption</string>
                                         </property>
                                     </widget>
-                                    <widget>
+                            <widget row="4"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>pagescanCheckBox</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Enable Page scan</string>
                                         </property>
                                     </widget>
-                                    <widget>
+                            <widget row="5"  column="0"  rowspan="1"  colspan="2" >
                                         <class>QCheckBox</class>
                                         <property stdset="1">
                                             <name>name</name>
                                             <cstring>inquiryscanCheckBox</cstring>
                                         </property>
                                         <property stdset="1">
                                             <name>text</name>
                                             <string>Enable Inquiry scan</string>
                                         </property>
                                     </widget>
-                                </vbox>
+                            <widget row="0"  column="0" >
+                                <class>QLabel</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>deviceNameLabel</cstring>
+                                </property>
+                                <property stdset="1">
+                                    <name>text</name>
+                                    <string>Device Name</string>
+                                </property>
                             </widget>
-                            <widget>
-                                <class>QPushButton</class>
+                            <widget row="1"  column="0" >
+                                <class>QLabel</class>
                                 <property stdset="1">
                                     <name>name</name>
-                                    <cstring>configApplyButton</cstring>
+                                    <cstring>passkeyLabel</cstring>
                                 </property>
                                 <property stdset="1">
                                     <name>text</name>
-                                    <string>Apply</string>
+                                    <string>Default Passkey</string>
                                 </property>
                             </widget>
-                        </vbox>
+                            <widget row="0"  column="1" >
+                                <class>QLineEdit</class>
+                                <property stdset="1">
+                                    <name>name</name>
+                                    <cstring>deviceNameLine</cstring>
+                                </property>
                     </widget>
-                    <widget>
-                        <class>QPushButton</class>
+                            <widget row="1"  column="1" >
+                                <class>QLineEdit</class>
                         <property stdset="1">
                             <name>name</name>
-                            <cstring>rfcommBindButton</cstring>
+                                    <cstring>passkeyLine</cstring>
                         </property>
                         <property stdset="1">
-                            <name>text</name>
-                            <string>Rfcomm Bind Table</string>
+                                    <name>echoMode</name>
+                                    <enum>Password</enum>
                         </property>
                     </widget>
-                </vbox>
+                        </grid>
+                    </widget>
+                </grid>
             </widget>
             <widget>
                 <class>QWidget</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>tab</cstring>
@@ -416,13 +354,13 @@
                     <name>title</name>
                     <string>Status</string>
                 </attribute>
                 <vbox>
                     <property stdset="1">
                         <name>margin</name>
-                        <number>2</number>
+                        <number>4</number>
                     </property>
                     <property stdset="1">
                         <name>spacing</name>
                         <number>2</number>
                     </property>
                     <widget>
@@ -436,9 +374,9 @@
                             <string>Status Label</string>
                         </property>
                     </widget>
                 </vbox>
             </widget>
         </widget>
-    </vbox>
+    </grid>
 </widget>
 </UI>
diff --git a/noncore/net/opietooth/manager/devicedialog.ui b/noncore/net/opietooth/manager/devicedialog.ui
index e5750ed..2ecfd4c 100644
--- a/noncore/net/opietooth/manager/devicedialog.ui
+++ b/noncore/net/opietooth/manager/devicedialog.ui
@@ -8,86 +8,78 @@
     </property>
     <property stdset="1">
         <name>geometry</name>
         <rect>
             <x>0</x>
             <y>0</y>
-            <width>584</width>
-            <height>480</height>
+            <width>275</width>
+            <height>323</height>
         </rect>
     </property>
     <property stdset="1">
         <name>caption</name>
         <string>Form2</string>
     </property>
-    <widget>
-        <class>QLabel</class>
-        <property stdset="1">
-            <name>name</name>
-            <cstring>TextLabel4</cstring>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
         </property>
+    <grid>
         <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>0</x>
-                <y>0</y>
-                <width>170</width>
-                <height>20</height>
-            </rect>
+            <name>margin</name>
+            <number>6</number>
         </property>
         <property stdset="1">
-            <name>text</name>
-            <string>Devicename</string>
+            <name>spacing</name>
+            <number>3</number>
         </property>
-    </widget>
-    <widget>
+        <widget row="0"  column="0" >
         <class>QTabWidget</class>
         <property stdset="1">
             <name>name</name>
             <cstring>TabWidget7</cstring>
         </property>
-        <property stdset="1">
-            <name>geometry</name>
-            <rect>
-                <x>-10</x>
-                <y>0</y>
-                <width>240</width>
-                <height>320</height>
-            </rect>
+            <property>
+                <name>layoutMargin</name>
+            </property>
+            <property>
+                <name>layoutSpacing</name>
         </property>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Services</string>
             </attribute>
-            <widget>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>4</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>3</number>
+                    </property>
+                    <widget row="1"  column="0" >
                 <class>QPushButton</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>PushButton5</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>50</x>
-                        <y>200</y>
-                        <width>129</width>
-                        <height>31</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>text</name>
-                    <string>change settings</string>
+                            <string>&amp;Apply Changes</string>
                 </property>
             </widget>
-            <widget>
+                    <widget row="0"  column="0" >
                 <class>QListView</class>
                 <column>
                     <property>
                         <name>text</name>
                         <string>active</string>
                     </property>
@@ -115,136 +107,123 @@
                     </property>
                 </column>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>ListView1</cstring>
                 </property>
-                <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>10</y>
-                        <width>220</width>
-                        <height>180</height>
-                    </rect>
-                </property>
             </widget>
+                </grid>
         </widget>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Settings</string>
             </attribute>
-            <widget>
-                <class>QLabel</class>
+                <grid>
                 <property stdset="1">
-                    <name>name</name>
-                    <cstring>TextLabel5</cstring>
+                        <name>margin</name>
+                        <number>4</number>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>10</x>
-                        <y>0</y>
-                        <width>110</width>
-                        <height>50</height>
-                    </rect>
+                        <name>spacing</name>
+                        <number>3</number>
                 </property>
-                <property stdset="1">
-                    <name>text</name>
-                    <string>Change device 
-name</string>
-                </property>
-            </widget>
-            <widget>
+                    <widget row="1"  column="0" >
                 <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>TextLabel8</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>8</x>
-                        <y>53</y>
-                        <width>100</width>
-                        <height>40</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>text</name>
-                    <string>Default PIN 
-Code</string>
+                            <string>Default PIN Code</string>
                 </property>
             </widget>
-            <widget>
+                    <widget row="1"  column="1" >
                 <class>QLineEdit</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>LineEdit1</cstring>
+                            <cstring>LineEdit6</cstring>
                 </property>
+                    </widget>
+                    <widget row="0"  column="1" >
+                        <class>QLineEdit</class>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>120</x>
-                        <y>10</y>
-                        <width>110</width>
-                        <height>22</height>
-                    </rect>
+                            <name>name</name>
+                            <cstring>LineEdit1</cstring>
                 </property>
             </widget>
-            <widget>
-                <class>QLineEdit</class>
+                    <widget row="0"  column="0" >
+                        <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
-                    <cstring>LineEdit6</cstring>
+                            <cstring>TextLabel5</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>120</x>
-                        <y>50</y>
-                        <width>110</width>
-                        <height>22</height>
-                    </rect>
+                            <name>text</name>
+                            <string>Change device name</string>
                 </property>
             </widget>
+                    <spacer row="2"  column="0" >
+                        <property>
+                            <name>name</name>
+                            <cstring>Spacer1</cstring>
+                        </property>
+                        <property stdset="1">
+                            <name>orientation</name>
+                            <enum>Vertical</enum>
+                        </property>
+                        <property stdset="1">
+                            <name>sizeType</name>
+                            <enum>Expanding</enum>
+                        </property>
+                        <property>
+                            <name>sizeHint</name>
+                            <size>
+                                <width>20</width>
+                                <height>20</height>
+                            </size>
+                        </property>
+                    </spacer>
+                </grid>
         </widget>
         <widget>
             <class>QWidget</class>
             <property stdset="1">
                 <name>name</name>
                 <cstring>tab</cstring>
             </property>
             <attribute>
                 <name>title</name>
                 <string>Information</string>
             </attribute>
-            <widget>
+                <grid>
+                    <property stdset="1">
+                        <name>margin</name>
+                        <number>4</number>
+                    </property>
+                    <property stdset="1">
+                        <name>spacing</name>
+                        <number>2</number>
+                    </property>
+                    <widget row="0"  column="0" >
                 <class>QLabel</class>
                 <property stdset="1">
                     <name>name</name>
                     <cstring>DeviceInfoLabel</cstring>
                 </property>
                 <property stdset="1">
-                    <name>geometry</name>
-                    <rect>
-                        <x>18</x>
-                        <y>13</y>
-                        <width>210</width>
-                        <height>230</height>
-                    </rect>
-                </property>
-                <property stdset="1">
                     <name>text</name>
                     <string>TextLabel9</string>
                 </property>
             </widget>
+                </grid>
         </widget>
     </widget>
+    </grid>
 </widget>
 </UI>