First step in integrating HCIDUMP

1 files changed, 324 insertions, 76 deletions

diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
index 5584cd9..6005504 100644
--- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
+++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui
@@ -13,4 +13,4 @@
             <y>0</y>
-            <width>240</width>
-            <height>385</height>
+            <width>228</width>
+            <height>347</height>
         </rect>
@@ -21,6 +21,12 @@
     </property>
-    <grid>
+    <property>
+        <name>layoutMargin</name>
+    </property>
+    <property>
+        <name>layoutSpacing</name>
+    </property>
+    <vbox>
         <property stdset="1">
             <name>margin</name>
-            <number>11</number>
+            <number>5</number>
         </property>
@@ -28,5 +34,26 @@
             <name>spacing</name>
-            <number>6</number>
+            <number>0</number>
+        </property>
+        <spacer>
+            <property>
+                <name>name</name>
+                <cstring>Spacer20</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>
-        <widget row="7"  column="0"  rowspan="1"  colspan="5" >
+        </spacer>
+        <widget>
             <class>QLayoutWidget</class>
@@ -34,3 +61,3 @@
                 <name>name</name>
-                <cstring>Layout4</cstring>
+                <cstring>Layout7</cstring>
             </property>
@@ -45,2 +72,13 @@
                 </property>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>ManageLocalHW_But</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Local Bluetooth hardware</string>
+                    </property>
+                </widget>
                 <spacer>
@@ -48,3 +86,3 @@
                         <name>name</name>
-                        <cstring>Spacer4_2</cstring>
+                        <cstring>Spacer9_2</cstring>
                     </property>
@@ -66,16 +104,41 @@
                 </spacer>
+            </hbox>
+        </widget>
                 <widget>
-                    <class>QCheckBox</class>
+            <class>QLayoutWidget</class>
                     <property stdset="1">
                         <name>name</name>
-                        <cstring>MustBeEnabled_CB</cstring>
+                <cstring>Layout2</cstring>
                     </property>
+            <hbox>
                     <property stdset="1">
-                        <name>text</name>
-                        <string>Bluetooth Enabled</string>
+                    <name>margin</name>
+                    <number>0</number>
                     </property>
-                </widget>
-            </hbox>
-        </widget>
-        <widget row="3"  column="2" >
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
             <class>QLabel</class>
@@ -83,3 +146,3 @@
                 <name>name</name>
-                <cstring>TextLabel5</cstring>
+                        <cstring>TextLabel1</cstring>
             </property>
@@ -88,3 +151,3 @@
                 <sizepolicy>
-                    <hsizetype>0</hsizetype>
+                            <hsizetype>7</hsizetype>
                     <vsizetype>1</vsizetype>
@@ -94,9 +157,18 @@
                 <name>text</name>
-                <string>Use device :</string>
+                        <string>Select to manage your local Bluetooth hardware</string>
+                    </property>
+                    <property stdset="1">
+                        <name>alignment</name>
+                        <set>WordBreak|AlignVCenter|AlignLeft</set>
+                    </property>
+                    <property>
+                        <name>wordwrap</name>
             </property>
         </widget>
-        <spacer row="4"  column="0" >
+            </hbox>
+        </widget>
+        <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer7</cstring>
+                <cstring>Spacer20_2</cstring>
             </property>
@@ -104,3 +176,3 @@
                 <name>orientation</name>
-                <enum>Horizontal</enum>
+                <enum>Vertical</enum>
             </property>
@@ -108,3 +180,3 @@
                 <name>sizeType</name>
-                <enum>Fixed</enum>
+                <enum>Expanding</enum>
             </property>
@@ -118,6 +190,32 @@
         </spacer>
-        <spacer row="1"  column="0" >
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout8</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Scan_But</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Scan Neighbourhood</string>
+                    </property>
+                </widget>
+                <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer7_2</cstring>
+                        <cstring>Spacer9</cstring>
             </property>
@@ -129,3 +227,3 @@
                 <name>sizeType</name>
-                <enum>Fixed</enum>
+                        <enum>Expanding</enum>
             </property>
@@ -139,6 +237,23 @@
         </spacer>
-        <spacer row="6"  column="0" >
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout5</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer7_3</cstring>
+                        <cstring>Spacer4</cstring>
             </property>
@@ -150,3 +265,3 @@
                 <name>sizeType</name>
-                <enum>Fixed</enum>
+                        <enum>Expanding</enum>
             </property>
@@ -160,3 +275,3 @@
         </spacer>
-        <widget row="1"  column="1"  rowspan="1"  colspan="4" >
+                <widget>
             <class>QLabel</class>
@@ -164,3 +279,3 @@
                 <name>name</name>
-                <cstring>TextLabel1</cstring>
+                        <cstring>TextLabel5</cstring>
             </property>
@@ -169,3 +284,3 @@
                 <sizepolicy>
-                    <hsizetype>7</hsizetype>
+                            <hsizetype>0</hsizetype>
                     <vsizetype>1</vsizetype>
@@ -175,13 +290,58 @@
                 <name>text</name>
-                <string>Select to manage your local Bluetooth hardware</string>
+                        <string>Use device :</string>
             </property>
+                </widget>
+                <widget>
+                    <class>QComboBox</class>
             <property stdset="1">
-                <name>alignment</name>
-                <set>WordBreak|AlignVCenter|AlignLeft</set>
+                        <name>name</name>
+                        <cstring>DeviceList_CB</cstring>
             </property>
-            <property>
-                <name>wordwrap</name>
+                    <property stdset="1">
+                        <name>sizePolicy</name>
+                        <sizepolicy>
+                            <hsizetype>7</hsizetype>
+                            <vsizetype>0</vsizetype>
+                        </sizepolicy>
             </property>
         </widget>
-        <widget row="4"  column="1"  rowspan="1"  colspan="4" >
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout4</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_2</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
             <class>QLabel</class>
@@ -210,6 +370,8 @@
         </widget>
-        <spacer row="3"  column="0"  rowspan="1"  colspan="2" >
+            </hbox>
+        </widget>
+        <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer4</cstring>
+                <cstring>Spacer20_2_2</cstring>
             </property>
@@ -217,3 +379,3 @@
                 <name>orientation</name>
-                <enum>Horizontal</enum>
+                <enum>Vertical</enum>
             </property>
@@ -231,17 +393,88 @@
         </spacer>
-        <widget row="3"  column="3"  rowspan="1"  colspan="2" >
-            <class>QComboBox</class>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>DeviceList_CB</cstring>
+                <cstring>Layout9</cstring>
             </property>
+            <hbox>
             <property stdset="1">
-                <name>sizePolicy</name>
-                <sizepolicy>
-                    <hsizetype>7</hsizetype>
-                    <vsizetype>0</vsizetype>
-                </sizepolicy>
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <widget>
+                    <class>QPushButton</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>Pairing_But</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Manage Pairing</string>
             </property>
         </widget>
-        <widget row="6"  column="1"  rowspan="1"  colspan="4" >
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer9_3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</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>
+            </hbox>
+        </widget>
+        <widget>
+            <class>QLayoutWidget</class>
+            <property stdset="1">
+                <name>name</name>
+                <cstring>Layout6</cstring>
+            </property>
+            <hbox>
+                <property stdset="1">
+                    <name>margin</name>
+                    <number>0</number>
+                </property>
+                <property stdset="1">
+                    <name>spacing</name>
+                    <number>6</number>
+                </property>
+                <spacer>
+                    <property>
+                        <name>name</name>
+                        <cstring>Spacer7_3</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>orientation</name>
+                        <enum>Horizontal</enum>
+                    </property>
+                    <property stdset="1">
+                        <name>sizeType</name>
+                        <enum>Fixed</enum>
+                    </property>
+                    <property>
+                        <name>sizeHint</name>
+                        <size>
+                            <width>20</width>
+                            <height>20</height>
+                        </size>
+                    </property>
+                </spacer>
+                <widget>
             <class>QLabel</class>
@@ -270,6 +503,8 @@
         </widget>
-        <spacer row="2"  column="4" >
+            </hbox>
+        </widget>
+        <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer5_2</cstring>
+                <cstring>Spacer20_2_2_2</cstring>
             </property>
@@ -277,3 +512,3 @@
                 <name>orientation</name>
-                <enum>Horizontal</enum>
+                <enum>Vertical</enum>
             </property>
@@ -291,29 +526,22 @@
         </spacer>
-        <widget row="2"  column="0"  rowspan="1"  colspan="4" >
-            <class>QPushButton</class>
+        <widget>
+            <class>QLayoutWidget</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>Scan_But</cstring>
-            </property>
-            <property stdset="1">
-                <name>text</name>
-                <string>Scan Neighbourhood</string>
+                <cstring>Layout2</cstring>
             </property>
-        </widget>
-        <widget row="5"  column="0"  rowspan="1"  colspan="4" >
-            <class>QPushButton</class>
+            <hbox>
             <property stdset="1">
-                <name>name</name>
-                <cstring>Pairing_But</cstring>
+                    <name>margin</name>
+                    <number>0</number>
             </property>
             <property stdset="1">
-                <name>text</name>
-                <string>Manage Pairing</string>
+                    <name>spacing</name>
+                    <number>6</number>
             </property>
-        </widget>
-        <widget row="0"  column="0"  rowspan="1"  colspan="4" >
-            <class>QPushButton</class>
+                <widget>
+                    <class>QCheckBox</class>
             <property stdset="1">
                 <name>name</name>
-                <cstring>ManageLocalHW_But</cstring>
+                        <cstring>EnableTracing_CB</cstring>
             </property>
@@ -321,9 +549,9 @@
                 <name>text</name>
-                <string>Local Bluetooth hardware</string>
+                        <string>Trace Bluetooth</string>
             </property>
         </widget>
-        <spacer row="0"  column="4" >
+                <spacer>
             <property>
                 <name>name</name>
-                <cstring>Spacer5_2_2</cstring>
+                        <cstring>Spacer4_2</cstring>
             </property>
@@ -345,3 +573,16 @@
         </spacer>
-    </grid>
+                <widget>
+                    <class>QCheckBox</class>
+                    <property stdset="1">
+                        <name>name</name>
+                        <cstring>MustBeEnabled_CB</cstring>
+                    </property>
+                    <property stdset="1">
+                        <name>text</name>
+                        <string>Bluetooth Enabled</string>
+                    </property>
+                </widget>
+            </hbox>
+        </widget>
+    </vbox>
 </widget>
@@ -372,6 +613,13 @@
     </connection>
+    <connection>
+        <sender>EnableTracing_CB</sender>
+        <signal>toggled(bool)</signal>
+        <receiver>OTMainGUI</receiver>
+        <slot>SLOT_EnableTracing( bool )</slot>
+    </connection>
     <slot access="public">SLOT_EnableBluetooth(bool)</slot>
     <slot access="public">SLOT_Manage()</slot>
-    <slot access="public">SLOT_Scan()</slot>
     <slot access="public">SLOT_Pairing()</slot>
+    <slot access="public">SLOT_Scan()</slot>
+    <slot access="public">SLOT_EnableTracing( bool )</slot>
 </connections>