author | wimpie <wimpie> | 2005-01-05 02:42:18 (UTC) |
---|---|---|
committer | wimpie <wimpie> | 2005-01-05 02:42:18 (UTC) |
commit | bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e (patch) (side-by-side diff) | |
tree | ec61a57a8ace5c74e6cae46a676f40d849f4b9b1 /noncore/settings | |
parent | 2f343aab63dd30e97a893e3691501cdd55114e82 (diff) | |
download | opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.zip opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.tar.gz opie-bf65cf9aeb5dddcc4b0c0d702afd748d97e95d5e.tar.bz2 |
Slightly better layout for OTMainGUI.
Fixed segfault bug in disconnectNotify call (signal string could be NULL)
-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 @@ -169,5 +169,5 @@ 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 ++; } @@ -175,5 +175,5 @@ 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 @@ -12,6 +12,6 @@ <x>0</x> <y>0</y> - <width>228</width> - <height>347</height> + <width>257</width> + <height>296</height> </rect> </property> @@ -29,5 +29,5 @@ <property stdset="1"> <name>margin</name> - <number>5</number> + <number>3</number> </property> <property stdset="1"> @@ -105,4 +105,25 @@ </hbox> </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> <class>QLayoutWidget</class> @@ -238,9 +259,30 @@ </hbox> </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> <class>QLayoutWidget</class> <property stdset="1"> <name>name</name> - <cstring>Layout5</cstring> + <cstring>Layout10</cstring> </property> <hbox> @@ -256,5 +298,5 @@ <property> <name>name</name> - <cstring>Spacer4</cstring> + <cstring>Spacer7_2</cstring> </property> <property stdset="1"> @@ -264,5 +306,5 @@ <property stdset="1"> <name>sizeType</name> - <enum>Expanding</enum> + <enum>Fixed</enum> </property> <property> @@ -275,22 +317,19 @@ </spacer> <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> <property stdset="1"> @@ -306,25 +345,8 @@ </property> </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> <property stdset="1"> @@ -334,5 +356,5 @@ <property stdset="1"> <name>sizeType</name> - <enum>Fixed</enum> + <enum>Expanding</enum> </property> <property> @@ -344,5 +366,5 @@ </property> </spacer> - <widget> + <widget row="1" column="0" rowspan="1" colspan="3" > <class>QLabel</class> <property stdset="1"> @@ -369,4 +391,24 @@ </property> </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> </widget> @@ -441,4 +483,25 @@ </hbox> </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> <class>QLayoutWidget</class> @@ -551,25 +614,4 @@ </property> </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> <class>QCheckBox</class> |