author | kergoth <kergoth> | 2003-08-09 17:00:23 (UTC) |
---|---|---|
committer | kergoth <kergoth> | 2003-08-09 17:00:23 (UTC) |
commit | c33d5ec60361238e50a4a9d6e0eec03e396dce60 (patch) (unidiff) | |
tree | 31c0c85dc4262044db90c7918014bc45265ef420 /noncore/net/opietooth | |
parent | 78c296d534589835801fb6374ac9d43d44b2b1c9 (diff) | |
download | opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.zip opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.tar.gz opie-c33d5ec60361238e50a4a9d6e0eec03e396dce60.tar.bz2 |
Merge from BRANCH_1_0
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.cc | 1 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlg.h | 9 | ||||
-rw-r--r-- | noncore/net/opietooth/blue-pin/pindlgbase.ui | 184 | ||||
-rw-r--r-- | noncore/net/opietooth/manager/bluebase.cpp | 2 |
4 files changed, 138 insertions, 58 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, | |||
22 | txtStatus->setText(status); | 22 | txtStatus->setText(status); |
23 | showMaximized(); | ||
23 | } | 24 | } |
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 @@ | |||
3 | #include <qdialog.h> | 3 | #include <qdialog.h> |
4 | |||
5 | #include "pindlgbase.h" | 4 | #include "pindlgbase.h" |
@@ -7,4 +6,7 @@ | |||
7 | namespace OpieTooth { | 6 | namespace OpieTooth { |
7 | |||
8 | class PinDlg : public PinDlgBase { | 8 | class PinDlg : public PinDlgBase { |
9 | |||
9 | Q_OBJECT | 10 | Q_OBJECT |
11 | |||
10 | public: | 12 | public: |
@@ -17,2 +19,3 @@ namespace OpieTooth { | |||
17 | QString pin() const; | 19 | QString pin() const; |
20 | |||
18 | private: | 21 | private: |
@@ -20,7 +23,7 @@ namespace OpieTooth { | |||
20 | QString m_mac; | 23 | QString m_mac; |
24 | |||
21 | protected slots: | 25 | protected slots: |
22 | void accept(); | 26 | void accept(); |
23 | }; | ||
24 | |||
25 | 27 | ||
26 | }; | 28 | }; |
29 | }; | ||
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 @@ | |||
14 | <y>0</y> | 14 | <y>0</y> |
15 | <width>248</width> | 15 | <width>258</width> |
16 | <height>167</height> | 16 | <height>245</height> |
17 | </rect> | 17 | </rect> |
@@ -22,3 +22,3 @@ | |||
22 | </property> | 22 | </property> |
23 | <grid> | 23 | <vbox> |
24 | <property stdset="1"> | 24 | <property stdset="1"> |
@@ -31,3 +31,39 @@ | |||
31 | </property> | 31 | </property> |
32 | <widget row="0" column="0" > | 32 | <widget> |
33 | <class>QLabel</class> | ||
34 | <property stdset="1"> | ||
35 | <name>name</name> | ||
36 | <cstring>txtStatus</cstring> | ||
37 | </property> | ||
38 | <property stdset="1"> | ||
39 | <name>text</name> | ||
40 | <string></string> | ||
41 | </property> | ||
42 | <property stdset="1"> | ||
43 | <name>textFormat</name> | ||
44 | <enum>RichText</enum> | ||
45 | </property> | ||
46 | </widget> | ||
47 | <spacer> | ||
48 | <property> | ||
49 | <name>name</name> | ||
50 | <cstring>Spacer4_2</cstring> | ||
51 | </property> | ||
52 | <property stdset="1"> | ||
53 | <name>orientation</name> | ||
54 | <enum>Vertical</enum> | ||
55 | </property> | ||
56 | <property stdset="1"> | ||
57 | <name>sizeType</name> | ||
58 | <enum>Expanding</enum> | ||
59 | </property> | ||
60 | <property> | ||
61 | <name>sizeHint</name> | ||
62 | <size> | ||
63 | <width>20</width> | ||
64 | <height>20</height> | ||
65 | </size> | ||
66 | </property> | ||
67 | </spacer> | ||
68 | <widget> | ||
33 | <class>QLayoutWidget</class> | 69 | <class>QLayoutWidget</class> |
@@ -37,3 +73,29 @@ | |||
37 | </property> | 73 | </property> |
38 | <grid> | 74 | <vbox> |
75 | <property stdset="1"> | ||
76 | <name>margin</name> | ||
77 | <number>0</number> | ||
78 | </property> | ||
79 | <property stdset="1"> | ||
80 | <name>spacing</name> | ||
81 | <number>6</number> | ||
82 | </property> | ||
83 | <widget> | ||
84 | <class>QLabel</class> | ||
85 | <property stdset="1"> | ||
86 | <name>name</name> | ||
87 | <cstring>TextLabel3</cstring> | ||
88 | </property> | ||
89 | <property stdset="1"> | ||
90 | <name>text</name> | ||
91 | <string>Please enter PIN:</string> | ||
92 | </property> | ||
93 | </widget> | ||
94 | <widget> | ||
95 | <class>QLayoutWidget</class> | ||
96 | <property stdset="1"> | ||
97 | <name>name</name> | ||
98 | <cstring>Layout5</cstring> | ||
99 | </property> | ||
100 | <hbox> | ||
39 | <property stdset="1"> | 101 | <property stdset="1"> |
@@ -46,3 +108,3 @@ | |||
46 | </property> | 108 | </property> |
47 | <widget row="3" column="0" rowspan="1" colspan="3" > | 109 | <widget> |
48 | <class>QLineEdit</class> | 110 | <class>QLineEdit</class> |
@@ -57,6 +119,6 @@ | |||
57 | </widget> | 119 | </widget> |
58 | <spacer row="5" column="4" > | 120 | <spacer> |
59 | <property> | 121 | <property> |
60 | <name>name</name> | 122 | <name>name</name> |
61 | <cstring>Spacer2</cstring> | 123 | <cstring>Spacer4</cstring> |
62 | </property> | 124 | </property> |
@@ -73,3 +135,3 @@ | |||
73 | <size> | 135 | <size> |
74 | <width>16</width> | 136 | <width>21</width> |
75 | <height>20</height> | 137 | <height>20</height> |
@@ -78,6 +140,21 @@ | |||
78 | </spacer> | 140 | </spacer> |
79 | <spacer row="5" column="0" > | 141 | </hbox> |
142 | </widget> | ||
143 | <widget> | ||
144 | <class>QCheckBox</class> | ||
145 | <property stdset="1"> | ||
146 | <name>name</name> | ||
147 | <cstring>ckbPin</cstring> | ||
148 | </property> | ||
149 | <property stdset="1"> | ||
150 | <name>text</name> | ||
151 | <string>Save pin</string> | ||
152 | </property> | ||
153 | </widget> | ||
154 | </vbox> | ||
155 | </widget> | ||
156 | <spacer> | ||
80 | <property> | 157 | <property> |
81 | <name>name</name> | 158 | <name>name</name> |
82 | <cstring>Spacer1</cstring> | 159 | <cstring>Spacer5</cstring> |
83 | </property> | 160 | </property> |
@@ -85,3 +162,3 @@ | |||
85 | <name>orientation</name> | 162 | <name>orientation</name> |
86 | <enum>Horizontal</enum> | 163 | <enum>Vertical</enum> |
87 | </property> | 164 | </property> |
@@ -89,3 +166,3 @@ | |||
89 | <name>sizeType</name> | 166 | <name>sizeType</name> |
90 | <enum>Fixed</enum> | 167 | <enum>Expanding</enum> |
91 | </property> | 168 | </property> |
@@ -94,3 +171,3 @@ | |||
94 | <size> | 171 | <size> |
95 | <width>30</width> | 172 | <width>20</width> |
96 | <height>20</height> | 173 | <height>20</height> |
@@ -99,6 +176,21 @@ | |||
99 | </spacer> | 176 | </spacer> |
100 | <spacer row="3" column="3" > | 177 | <widget> |
178 | <class>QLayoutWidget</class> | ||
179 | <property stdset="1"> | ||
180 | <name>name</name> | ||
181 | <cstring>Layout7</cstring> | ||
182 | </property> | ||
183 | <hbox> | ||
184 | <property stdset="1"> | ||
185 | <name>margin</name> | ||
186 | <number>0</number> | ||
187 | </property> | ||
188 | <property stdset="1"> | ||
189 | <name>spacing</name> | ||
190 | <number>6</number> | ||
191 | </property> | ||
192 | <spacer> | ||
101 | <property> | 193 | <property> |
102 | <name>name</name> | 194 | <name>name</name> |
103 | <cstring>Spacer4</cstring> | 195 | <cstring>Spacer1</cstring> |
104 | </property> | 196 | </property> |
@@ -115,3 +207,3 @@ | |||
115 | <size> | 207 | <size> |
116 | <width>21</width> | 208 | <width>30</width> |
117 | <height>20</height> | 209 | <height>20</height> |
@@ -120,29 +212,3 @@ | |||
120 | </spacer> | 212 | </spacer> |
121 | <widget row="0" column="0" rowspan="1" colspan="5" > | 213 | <widget> |
122 | <class>QLabel</class> | ||
123 | <property stdset="1"> | ||
124 | <name>name</name> | ||
125 | <cstring>txtStatus</cstring> | ||
126 | </property> | ||
127 | <property stdset="1"> | ||
128 | <name>text</name> | ||
129 | <string></string> | ||
130 | </property> | ||
131 | <property stdset="1"> | ||
132 | <name>textFormat</name> | ||
133 | <enum>RichText</enum> | ||
134 | </property> | ||
135 | </widget> | ||
136 | <widget row="2" column="0" rowspan="1" colspan="5" > | ||
137 | <class>QLabel</class> | ||
138 | <property stdset="1"> | ||
139 | <name>name</name> | ||
140 | <cstring>TextLabel3</cstring> | ||
141 | </property> | ||
142 | <property stdset="1"> | ||
143 | <name>text</name> | ||
144 | <string>Please enter PIN:</string> | ||
145 | </property> | ||
146 | </widget> | ||
147 | <widget row="5" column="1" > | ||
148 | <class>QPushButton</class> | 214 | <class>QPushButton</class> |
@@ -157,3 +223,3 @@ | |||
157 | </widget> | 223 | </widget> |
158 | <widget row="5" column="2" rowspan="1" colspan="2" > | 224 | <widget> |
159 | <class>QPushButton</class> | 225 | <class>QPushButton</class> |
@@ -168,16 +234,26 @@ | |||
168 | </widget> | 234 | </widget> |
169 | <widget row="4" column="0" rowspan="1" colspan="5" > | 235 | <spacer> |
170 | <class>QCheckBox</class> | 236 | <property> |
171 | <property stdset="1"> | ||
172 | <name>name</name> | 237 | <name>name</name> |
173 | <cstring>ckbPin</cstring> | 238 | <cstring>Spacer2</cstring> |
174 | </property> | 239 | </property> |
175 | <property stdset="1"> | 240 | <property stdset="1"> |
176 | <name>text</name> | 241 | <name>orientation</name> |
177 | <string>Save pin</string> | 242 | <enum>Horizontal</enum> |
178 | </property> | 243 | </property> |
244 | <property stdset="1"> | ||
245 | <name>sizeType</name> | ||
246 | <enum>Fixed</enum> | ||
247 | </property> | ||
248 | <property> | ||
249 | <name>sizeHint</name> | ||
250 | <size> | ||
251 | <width>16</width> | ||
252 | <height>20</height> | ||
253 | </size> | ||
254 | </property> | ||
255 | </spacer> | ||
256 | </hbox> | ||
179 | </widget> | 257 | </widget> |
180 | </grid> | 258 | </vbox> |
181 | </widget> | ||
182 | </grid> | ||
183 | </widget> | 259 | </widget> |
diff --git a/noncore/net/opietooth/manager/bluebase.cpp b/noncore/net/opietooth/manager/bluebase.cpp index 935c11a..54808fa 100644 --- a/noncore/net/opietooth/manager/bluebase.cpp +++ b/noncore/net/opietooth/manager/bluebase.cpp | |||
@@ -152,3 +152,3 @@ void BlueBase::writeToHciConfig() { | |||
152 | hciconf.load(); | 152 | hciconf.load(); |
153 | hciconf.setPinHelper( "/bin/QtPalmtop/bin/blue-pin" ); | 153 | hciconf.setPinHelper( "/opt/QtPalmtop/bin/bluepin" ); |
154 | hciconf.setName( m_deviceName ); | 154 | hciconf.setName( m_deviceName ); |