| -rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTGateway.cpp | 4 | ||||
| -rw-r--r-- | noncore/settings/networksettings2/opietooth2/OTMainGUI.ui | 160 |
2 files changed, 103 insertions, 61 deletions
diff --git a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp index 2d13ce9..6531cf6 100644 --- a/noncore/settings/networksettings2/opietooth2/OTGateway.cpp +++ b/noncore/settings/networksettings2/opietooth2/OTGateway.cpp @@ -170,3 +170,3 @@ void OTGateway::SLOT_ShowError( const QString & S ) { void OTGateway::connectNotify( const char * S ) { - if( strcmp( S, "error(const QString&)" ) == 0 ) { + if( S && strcmp( S, "error(const QString&)" ) == 0 ) { ErrorConnectCount ++; @@ -176,3 +176,3 @@ void OTGateway::connectNotify( const char * S ) { void OTGateway::disconnectNotify( const char * S ) { - if( strcmp( S, "error(const QString&)" ) == 0 ) { + if( S && strcmp( S, "error(const QString&)" ) == 0 ) { ErrorConnectCount --; diff --git a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui index 6005504..d9038ae 100644 --- a/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui +++ b/noncore/settings/networksettings2/opietooth2/OTMainGUI.ui @@ -13,4 +13,4 @@ <y>0</y> - <width>228</width> - <height>347</height> + <width>257</width> + <height>296</height> </rect> @@ -30,3 +30,3 @@ <name>margin</name> - <number>5</number> + <number>3</number> </property> @@ -106,2 +106,23 @@ </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer20_3</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> <widget> @@ -239,2 +260,23 @@ </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer20_4</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> <widget> @@ -243,3 +285,3 @@ <name>name</name> - <cstring>Layout5</cstring> + <cstring>Layout10</cstring> </property> @@ -257,3 +299,3 @@ <name>name</name> - <cstring>Spacer4</cstring> + <cstring>Spacer7_2</cstring> </property> @@ -265,3 +307,3 @@ <name>sizeType</name> - <enum>Expanding</enum> + <enum>Fixed</enum> </property> @@ -276,20 +318,17 @@ <widget> - <class>QLabel</class> + <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>TextLabel5</cstring> + <cstring>Layout9</cstring> </property> + <grid> <property stdset="1"> - <name>sizePolicy</name> - <sizepolicy> - <hsizetype>0</hsizetype> - <vsizetype>1</vsizetype> - </sizepolicy> + <name>margin</name> + <number>0</number> </property> <property stdset="1"> - <name>text</name> - <string>Use device :</string> + <name>spacing</name> + <number>6</number> </property> - </widget> - <widget> + <widget row="0" column="1" > <class>QComboBox</class> @@ -307,23 +346,6 @@ </widget> - </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> + <spacer row="0" column="2" > <property> <name>name</name> - <cstring>Spacer7_2</cstring> + <cstring>Spacer16</cstring> </property> @@ -335,3 +357,3 @@ <name>sizeType</name> - <enum>Fixed</enum> + <enum>Expanding</enum> </property> @@ -345,3 +367,3 @@ </spacer> - <widget> + <widget row="1" column="0" rowspan="1" colspan="3" > <class>QLabel</class> @@ -370,2 +392,22 @@ </widget> + <widget row="0" column="0" > + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>TextLabel5</cstring> + </property> + <property stdset="1"> + <name>sizePolicy</name> + <sizepolicy> + <hsizetype>0</hsizetype> + <vsizetype>1</vsizetype> + </sizepolicy> + </property> + <property stdset="1"> + <name>text</name> + <string>Use device :</string> + </property> + </widget> + </grid> + </widget> </hbox> @@ -442,2 +484,23 @@ </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer20_5</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> <widget> @@ -552,23 +615,2 @@ </widget> - <spacer> - <property> - <name>name</name> - <cstring>Spacer4_2</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> <widget> |