author | kergoth <kergoth> | 2003-08-09 17:00:23 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:00:23 (UTC) |
commit | c33d5ec60361238e50a4a9d6e0eec03e396dce60 (patch) (side-by-side diff) | |
tree | 31c0c85dc4262044db90c7918014bc45265ef420 /noncore/net/opietooth/blue-pin | |
parent | 78c296d534589835801fb6374ac9d43d44b2b1c9 (diff) | |
download | opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.zip opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.tar.gz opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.tar.bz2 |
Merge from BRANCH_1_0
Diffstat (limited to 'noncore/net/opietooth/blue-pin') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.cc | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.h | 13 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlgbase.ui | 244 |
3 files changed, 169 insertions, 89 deletions
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc index 54f096e..7d60d6c 100644 --- a/noncore/net/opietooth/blue-pin/pindlg.cc +++ b/noncore/net/opietooth/blue-pin/pindlg.cc @@ -22,2 +22,3 @@ PinDlg::PinDlg( const QString& status, txtStatus->setText(status); + showMaximized(); } diff --git a/noncore/net/opietooth/blue-pin/pindlg.h b/noncore/net/opietooth/blue-pin/pindlg.h index b4f5ff8..5e5a763 100644 --- a/noncore/net/opietooth/blue-pin/pindlg.h +++ b/noncore/net/opietooth/blue-pin/pindlg.h @@ -3,3 +3,2 @@ #include <qdialog.h> - #include "pindlgbase.h" @@ -7,4 +6,7 @@ namespace OpieTooth { + class PinDlg : public PinDlgBase { - Q_OBJECT + + Q_OBJECT + public: @@ -17,2 +19,3 @@ namespace OpieTooth { QString pin() const; + private: @@ -20,7 +23,7 @@ namespace OpieTooth { QString m_mac; -protected slots: - void accept(); - }; + protected slots: + void accept(); + }; }; diff --git a/noncore/net/opietooth/blue-pin/pindlgbase.ui b/noncore/net/opietooth/blue-pin/pindlgbase.ui index 6966a03..889a25e 100644 --- a/noncore/net/opietooth/blue-pin/pindlgbase.ui +++ b/noncore/net/opietooth/blue-pin/pindlgbase.ui @@ -14,4 +14,4 @@ <y>0</y> - <width>248</width> - <height>167</height> + <width>258</width> + <height>245</height> </rect> @@ -22,3 +22,3 @@ </property> - <grid> + <vbox> <property stdset="1"> @@ -31,3 +31,39 @@ </property> - <widget row="0" column="0" > + <widget> + <class>QLabel</class> + <property stdset="1"> + <name>name</name> + <cstring>txtStatus</cstring> + </property> + <property stdset="1"> + <name>text</name> + <string></string> + </property> + <property stdset="1"> + <name>textFormat</name> + <enum>RichText</enum> + </property> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer4_2</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> @@ -37,3 +73,3 @@ </property> - <grid> + <vbox> <property stdset="1"> @@ -46,35 +82,112 @@ </property> - <widget row="3" column="0" rowspan="1" colspan="3" > - <class>QLineEdit</class> + <widget> + <class>QLabel</class> <property stdset="1"> <name>name</name> - <cstring>lnePin</cstring> + <cstring>TextLabel3</cstring> </property> <property stdset="1"> - <name>echoMode</name> - <enum>Password</enum> + <name>text</name> + <string>Please enter PIN:</string> </property> </widget> - <spacer row="5" column="4" > - <property> + <widget> + <class>QLayoutWidget</class> + <property stdset="1"> <name>name</name> - <cstring>Spacer2</cstring> + <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> + <widget> + <class>QLineEdit</class> + <property stdset="1"> + <name>name</name> + <cstring>lnePin</cstring> + </property> + <property stdset="1"> + <name>echoMode</name> + <enum>Password</enum> + </property> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer4</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>21</width> + <height>20</height> + </size> + </property> + </spacer> + </hbox> + </widget> + <widget> + <class>QCheckBox</class> <property stdset="1"> - <name>orientation</name> - <enum>Horizontal</enum> + <name>name</name> + <cstring>ckbPin</cstring> </property> <property stdset="1"> - <name>sizeType</name> - <enum>Fixed</enum> - </property> - <property> - <name>sizeHint</name> - <size> - <width>16</width> - <height>20</height> - </size> + <name>text</name> + <string>Save pin</string> </property> - </spacer> - <spacer row="5" column="0" > + </widget> + </vbox> + </widget> + <spacer> + <property> + <name>name</name> + <cstring>Spacer5</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>Layout7</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> @@ -99,50 +212,3 @@ </spacer> - <spacer row="3" column="3" > - <property> - <name>name</name> - <cstring>Spacer4</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>21</width> - <height>20</height> - </size> - </property> - </spacer> - <widget row="0" column="0" rowspan="1" colspan="5" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>txtStatus</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string></string> - </property> - <property stdset="1"> - <name>textFormat</name> - <enum>RichText</enum> - </property> - </widget> - <widget row="2" column="0" rowspan="1" colspan="5" > - <class>QLabel</class> - <property stdset="1"> - <name>name</name> - <cstring>TextLabel3</cstring> - </property> - <property stdset="1"> - <name>text</name> - <string>Please enter PIN:</string> - </property> - </widget> - <widget row="5" column="1" > + <widget> <class>QPushButton</class> @@ -157,3 +223,3 @@ </widget> - <widget row="5" column="2" rowspan="1" colspan="2" > + <widget> <class>QPushButton</class> @@ -168,16 +234,26 @@ </widget> - <widget row="4" column="0" rowspan="1" colspan="5" > - <class>QCheckBox</class> - <property stdset="1"> + <spacer> + <property> <name>name</name> - <cstring>ckbPin</cstring> + <cstring>Spacer2</cstring> </property> <property stdset="1"> - <name>text</name> - <string>Save pin</string> + <name>orientation</name> + <enum>Horizontal</enum> </property> - </widget> - </grid> + <property stdset="1"> + <name>sizeType</name> + <enum>Fixed</enum> + </property> + <property> + <name>sizeHint</name> + <size> + <width>16</width> + <height>20</height> + </size> + </property> + </spacer> + </hbox> </widget> - </grid> + </vbox> </widget> |