summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2005-04-19 10:11:09 (UTC)
committer mickeyl <mickeyl>2005-04-19 10:11:09 (UTC)
commit9b8dd642c4b135070911c78bb5d31a7add7162ee (patch) (unidiff)
tree1d0ac94b911609605403ef83ceda0f5052757e7a
parent16202ec32c1647b113fd7c06bc652bff32e6d6d2 (diff)
downloadopie-9b8dd642c4b135070911c78bb5d31a7add7162ee.zip
opie-9b8dd642c4b135070911c78bb5d31a7add7162ee.tar.gz
opie-9b8dd642c4b135070911c78bb5d31a7add7162ee.tar.bz2
This patch courtesy Gints Polis:
* gives possibility to enter numerical PIN with dialog buttons for keybordless PDA. * dialog run in full screen mode.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.cc12
-rw-r--r--noncore/net/opietooth/blue-pin/pindlg.h1
-rw-r--r--noncore/net/opietooth/blue-pin/pindlgbase.ui519
3 files changed, 466 insertions, 66 deletions
diff --git a/noncore/net/opietooth/blue-pin/pindlg.cc b/noncore/net/opietooth/blue-pin/pindlg.cc
index e40fe33..3db6095 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.cc
+++ b/noncore/net/opietooth/blue-pin/pindlg.cc
@@ -9,6 +9,7 @@
9#include <qcheckbox.h> 9#include <qcheckbox.h>
10#include <qlabel.h> 10#include <qlabel.h>
11#include <qlineedit.h> 11#include <qlineedit.h>
12#include <qpushbutton.h>
12 13
13/* STD */ 14/* STD */
14#include <stdio.h> 15#include <stdio.h>
@@ -32,7 +33,7 @@ PinDlg::PinDlg(QWidget* parent,
32 { 33 {
33 test( m_mac ); 34 test( m_mac );
34 txtStatus->setText(makeTextFromArgs()); 35 txtStatus->setText(makeTextFromArgs());
35 QPEApplication::showDialog( this , true) ; 36 QPEApplication::showDialog( this , false) ;
36 } 37 }
37} 38}
38 39
@@ -94,6 +95,14 @@ QString PinDlg::makeMacFromArgs()
94 return qApp->argv()[2] ; 95 return qApp->argv()[2] ;
95} 96}
96 97
98void PinDlg::addnum()
99{
100 if( sender()->inherits( "QPushButton") ) {
101 const QPushButton* btn = static_cast<const QPushButton*> (sender());
102 lnePin->setText(lnePin->text() + btn->text());
103 }
104}
105
97void PinDlg::accept() 106void PinDlg::accept()
98{ 107{
99 if ( ckbPin->isChecked() ) 108 if ( ckbPin->isChecked() )
@@ -107,3 +116,4 @@ void PinDlg::accept()
107 qApp->quit(); 116 qApp->quit();
108 ::exit(0); 117 ::exit(0);
109} 118}
119
diff --git a/noncore/net/opietooth/blue-pin/pindlg.h b/noncore/net/opietooth/blue-pin/pindlg.h
index 8623274..1817aa8 100644
--- a/noncore/net/opietooth/blue-pin/pindlg.h
+++ b/noncore/net/opietooth/blue-pin/pindlg.h
@@ -28,6 +28,7 @@ namespace OpieTooth {
28 28
29 protected slots: 29 protected slots:
30 void accept(); 30 void accept();
31 void addnum();
31 32
32 }; 33 };
33}; 34};
diff --git a/noncore/net/opietooth/blue-pin/pindlgbase.ui b/noncore/net/opietooth/blue-pin/pindlgbase.ui
index a79bb49..6586014 100644
--- a/noncore/net/opietooth/blue-pin/pindlgbase.ui
+++ b/noncore/net/opietooth/blue-pin/pindlgbase.ui
@@ -1,6 +1,6 @@
1<!DOCTYPE UI><UI> 1<!DOCTYPE UI><UI>
2<class>PinDlgBase</class> 2<class>PinDlgBase</class>
3<author>zecke</author> 3<author>gints</author>
4<widget> 4<widget>
5 <class>QDialog</class> 5 <class>QDialog</class>
6 <property stdset="1"> 6 <property stdset="1">
@@ -12,45 +12,47 @@
12 <rect> 12 <rect>
13 <x>0</x> 13 <x>0</x>
14 <y>0</y> 14 <y>0</y>
15 <width>267</width> 15 <width>196</width>
16 <height>161</height> 16 <height>175</height>
17 </rect> 17 </rect>
18 </property> 18 </property>
19 <property stdset="1"> 19 <property stdset="1">
20 <name>sizePolicy</name>
21 <sizepolicy>
22 <hsizetype>3</hsizetype>
23 <vsizetype>3</vsizetype>
24 </sizepolicy>
25 </property>
26 <property stdset="1">
20 <name>caption</name> 27 <name>caption</name>
21 <string>Please enter pin</string> 28 <string>Please enter pin</string>
22 </property> 29 </property>
23 <grid>
24 <property stdset="1"> 30 <property stdset="1">
25 <name>margin</name> 31 <name>sizeGripEnabled</name>
26 <number>11</number> 32 <bool>false</bool>
27 </property> 33 </property>
28 <property stdset="1"> 34 <property>
29 <name>spacing</name> 35 <name>layoutMargin</name>
30 <number>6</number>
31 </property> 36 </property>
32 <widget row="0" column="0" > 37 <property>
33 <class>QLabel</class> 38 <name>layoutSpacing</name>
34 <property stdset="1">
35 <name>name</name>
36 <cstring>txtStatus</cstring>
37 </property> 39 </property>
40 <vbox>
38 <property stdset="1"> 41 <property stdset="1">
39 <name>text</name> 42 <name>margin</name>
40 <string></string> 43 <number>5</number>
41 </property> 44 </property>
42 <property stdset="1"> 45 <property stdset="1">
43 <name>textFormat</name> 46 <name>spacing</name>
44 <enum>RichText</enum> 47 <number>2</number>
45 </property> 48 </property>
46 </widget> 49 <widget>
47 <widget row="1" column="0" >
48 <class>QLayoutWidget</class> 50 <class>QLayoutWidget</class>
49 <property stdset="1"> 51 <property stdset="1">
50 <name>name</name> 52 <name>name</name>
51 <cstring>Layout6</cstring> 53 <cstring>Layout9</cstring>
52 </property> 54 </property>
53 <vbox> 55 <hbox>
54 <property stdset="1"> 56 <property stdset="1">
55 <name>margin</name> 57 <name>margin</name>
56 <number>0</number> 58 <number>0</number>
@@ -63,18 +65,46 @@
63 <class>QLabel</class> 65 <class>QLabel</class>
64 <property stdset="1"> 66 <property stdset="1">
65 <name>name</name> 67 <name>name</name>
66 <cstring>TextLabel3</cstring> 68 <cstring>txtStatus</cstring>
69 </property>
70 <property stdset="1">
71 <name>font</name>
72 <font>
73 </font>
67 </property> 74 </property>
68 <property stdset="1"> 75 <property stdset="1">
69 <name>text</name> 76 <name>text</name>
70 <string>Please enter PIN:</string> 77 <string>Enter PIN:</string>
78 </property>
79 </widget>
80 <spacer>
81 <property>
82 <name>name</name>
83 <cstring>Spacer1</cstring>
84 </property>
85 <property stdset="1">
86 <name>orientation</name>
87 <enum>Horizontal</enum>
88 </property>
89 <property stdset="1">
90 <name>sizeType</name>
91 <enum>Expanding</enum>
92 </property>
93 <property>
94 <name>sizeHint</name>
95 <size>
96 <width>20</width>
97 <height>20</height>
98 </size>
71 </property> 99 </property>
100 </spacer>
101 </hbox>
72 </widget> 102 </widget>
73 <widget> 103 <widget>
74 <class>QLayoutWidget</class> 104 <class>QLayoutWidget</class>
75 <property stdset="1"> 105 <property stdset="1">
76 <name>name</name> 106 <name>name</name>
77 <cstring>Layout5</cstring> 107 <cstring>Layout8</cstring>
78 </property> 108 </property>
79 <hbox> 109 <hbox>
80 <property stdset="1"> 110 <property stdset="1">
@@ -85,6 +115,27 @@
85 <name>spacing</name> 115 <name>spacing</name>
86 <number>6</number> 116 <number>6</number>
87 </property> 117 </property>
118 <spacer>
119 <property>
120 <name>name</name>
121 <cstring>Spacer2</cstring>
122 </property>
123 <property stdset="1">
124 <name>orientation</name>
125 <enum>Horizontal</enum>
126 </property>
127 <property stdset="1">
128 <name>sizeType</name>
129 <enum>Expanding</enum>
130 </property>
131 <property>
132 <name>sizeHint</name>
133 <size>
134 <width>20</width>
135 <height>20</height>
136 </size>
137 </property>
138 </spacer>
88 <widget> 139 <widget>
89 <class>QLineEdit</class> 140 <class>QLineEdit</class>
90 <property stdset="1"> 141 <property stdset="1">
@@ -92,14 +143,14 @@
92 <cstring>lnePin</cstring> 143 <cstring>lnePin</cstring>
93 </property> 144 </property>
94 <property stdset="1"> 145 <property stdset="1">
95 <name>echoMode</name> 146 <name>frame</name>
96 <enum>Password</enum> 147 <bool>true</bool>
97 </property> 148 </property>
98 </widget> 149 </widget>
99 <spacer> 150 <spacer>
100 <property> 151 <property>
101 <name>name</name> 152 <name>name</name>
102 <cstring>Spacer4</cstring> 153 <cstring>Spacer3</cstring>
103 </property> 154 </property>
104 <property stdset="1"> 155 <property stdset="1">
105 <name>orientation</name> 156 <name>orientation</name>
@@ -107,18 +158,16 @@
107 </property> 158 </property>
108 <property stdset="1"> 159 <property stdset="1">
109 <name>sizeType</name> 160 <name>sizeType</name>
110 <enum>Fixed</enum> 161 <enum>Expanding</enum>
111 </property> 162 </property>
112 <property> 163 <property>
113 <name>sizeHint</name> 164 <name>sizeHint</name>
114 <size> 165 <size>
115 <width>21</width> 166 <width>20</width>
116 <height>20</height> 167 <height>20</height>
117 </size> 168 </size>
118 </property> 169 </property>
119 </spacer> 170 </spacer>
120 </hbox>
121 </widget>
122 <widget> 171 <widget>
123 <class>QCheckBox</class> 172 <class>QCheckBox</class>
124 <property stdset="1"> 173 <property stdset="1">
@@ -127,16 +176,33 @@
127 </property> 176 </property>
128 <property stdset="1"> 177 <property stdset="1">
129 <name>text</name> 178 <name>text</name>
130 <string>Save pin</string> 179 <string>Save</string>
180 </property>
181 <property stdset="1">
182 <name>checked</name>
183 <bool>true</bool>
131 </property> 184 </property>
132 </widget> 185 </widget>
133 </vbox> 186 </hbox>
134 </widget> 187 </widget>
135 <widget row="2" column="0" > 188 <widget>
136 <class>QLayoutWidget</class> 189 <class>QLayoutWidget</class>
137 <property stdset="1"> 190 <property stdset="1">
138 <name>name</name> 191 <name>name</name>
139 <cstring>Layout7</cstring> 192 <cstring>Layout22</cstring>
193 </property>
194 <property stdset="1">
195 <name>maximumSize</name>
196 <size>
197 <width>32767</width>
198 <height>35</height>
199 </size>
200 </property>
201 <property>
202 <name>layoutMargin</name>
203 </property>
204 <property>
205 <name>layoutSpacing</name>
140 </property> 206 </property>
141 <hbox> 207 <hbox>
142 <property stdset="1"> 208 <property stdset="1">
@@ -145,88 +211,411 @@
145 </property> 211 </property>
146 <property stdset="1"> 212 <property stdset="1">
147 <name>spacing</name> 213 <name>spacing</name>
148 <number>6</number> 214 <number>2</number>
149 </property> 215 </property>
150 <spacer> 216 <widget>
151 <property> 217 <class>QPushButton</class>
218 <property stdset="1">
152 <name>name</name> 219 <name>name</name>
153 <cstring>Spacer1</cstring> 220 <cstring>bt1</cstring>
154 </property> 221 </property>
155 <property stdset="1"> 222 <property stdset="1">
156 <name>orientation</name> 223 <name>maximumSize</name>
157 <enum>Horizontal</enum> 224 <size>
225 <width>60</width>
226 <height>25</height>
227 </size>
158 </property> 228 </property>
159 <property stdset="1"> 229 <property stdset="1">
160 <name>sizeType</name> 230 <name>text</name>
161 <enum>Fixed</enum> 231 <string>1</string>
232 </property>
233 </widget>
234 <widget>
235 <class>QPushButton</class>
236 <property stdset="1">
237 <name>name</name>
238 <cstring>bt2</cstring>
239 </property>
240 <property stdset="1">
241 <name>maximumSize</name>
242 <size>
243 <width>60</width>
244 <height>25</height>
245 </size>
246 </property>
247 <property stdset="1">
248 <name>text</name>
249 <string>2</string>
250 </property>
251 </widget>
252 <widget>
253 <class>QPushButton</class>
254 <property stdset="1">
255 <name>name</name>
256 <cstring>bt3</cstring>
257 </property>
258 <property stdset="1">
259 <name>maximumSize</name>
260 <size>
261 <width>60</width>
262 <height>25</height>
263 </size>
264 </property>
265 <property stdset="1">
266 <name>text</name>
267 <string>3</string>
268 </property>
269 </widget>
270 </hbox>
271 </widget>
272 <widget>
273 <class>QLayoutWidget</class>
274 <property stdset="1">
275 <name>name</name>
276 <cstring>Layout22_2</cstring>
277 </property>
278 <property stdset="1">
279 <name>maximumSize</name>
280 <size>
281 <width>32767</width>
282 <height>35</height>
283 </size>
162 </property> 284 </property>
163 <property> 285 <property>
164 <name>sizeHint</name> 286 <name>layoutSpacing</name>
287 </property>
288 <hbox>
289 <property stdset="1">
290 <name>margin</name>
291 <number>0</number>
292 </property>
293 <property stdset="1">
294 <name>spacing</name>
295 <number>2</number>
296 </property>
297 <widget>
298 <class>QPushButton</class>
299 <property stdset="1">
300 <name>name</name>
301 <cstring>bt4</cstring>
302 </property>
303 <property stdset="1">
304 <name>maximumSize</name>
165 <size> 305 <size>
166 <width>30</width> 306 <width>60</width>
167 <height>20</height> 307 <height>25</height>
168 </size> 308 </size>
169 </property> 309 </property>
170 </spacer> 310 <property stdset="1">
311 <name>text</name>
312 <string>4</string>
313 </property>
314 </widget>
171 <widget> 315 <widget>
172 <class>QPushButton</class> 316 <class>QPushButton</class>
173 <property stdset="1"> 317 <property stdset="1">
174 <name>name</name> 318 <name>name</name>
175 <cstring>PushButton1</cstring> 319 <cstring>bt5</cstring>
320 </property>
321 <property stdset="1">
322 <name>maximumSize</name>
323 <size>
324 <width>60</width>
325 <height>25</height>
326 </size>
176 </property> 327 </property>
177 <property stdset="1"> 328 <property stdset="1">
178 <name>text</name> 329 <name>text</name>
179 <string>&amp;Ok</string> 330 <string>5</string>
180 </property> 331 </property>
181 </widget> 332 </widget>
182 <widget> 333 <widget>
183 <class>QPushButton</class> 334 <class>QPushButton</class>
184 <property stdset="1"> 335 <property stdset="1">
185 <name>name</name> 336 <name>name</name>
186 <cstring>PushButton2</cstring> 337 <cstring>bt6</cstring>
338 </property>
339 <property stdset="1">
340 <name>maximumSize</name>
341 <size>
342 <width>60</width>
343 <height>25</height>
344 </size>
187 </property> 345 </property>
188 <property stdset="1"> 346 <property stdset="1">
189 <name>text</name> 347 <name>text</name>
190 <string>&amp;Cancel</string> 348 <string>6</string>
191 </property> 349 </property>
192 </widget> 350 </widget>
193 <spacer> 351 </hbox>
352 </widget>
353 <widget>
354 <class>QLayoutWidget</class>
355 <property stdset="1">
356 <name>name</name>
357 <cstring>Layout22_2_2</cstring>
358 </property>
359 <property stdset="1">
360 <name>maximumSize</name>
361 <size>
362 <width>32767</width>
363 <height>35</height>
364 </size>
365 </property>
194 <property> 366 <property>
367 <name>layoutSpacing</name>
368 </property>
369 <hbox>
370 <property stdset="1">
371 <name>margin</name>
372 <number>0</number>
373 </property>
374 <property stdset="1">
375 <name>spacing</name>
376 <number>2</number>
377 </property>
378 <widget>
379 <class>QPushButton</class>
380 <property stdset="1">
195 <name>name</name> 381 <name>name</name>
196 <cstring>Spacer2</cstring> 382 <cstring>bt7</cstring>
197 </property> 383 </property>
198 <property stdset="1"> 384 <property stdset="1">
199 <name>orientation</name> 385 <name>maximumSize</name>
200 <enum>Horizontal</enum> 386 <size>
387 <width>60</width>
388 <height>25</height>
389 </size>
201 </property> 390 </property>
202 <property stdset="1"> 391 <property stdset="1">
203 <name>sizeType</name> 392 <name>text</name>
204 <enum>Fixed</enum> 393 <string>7</string>
394 </property>
395 </widget>
396 <widget>
397 <class>QPushButton</class>
398 <property stdset="1">
399 <name>name</name>
400 <cstring>bt8</cstring>
401 </property>
402 <property stdset="1">
403 <name>maximumSize</name>
404 <size>
405 <width>60</width>
406 <height>25</height>
407 </size>
408 </property>
409 <property stdset="1">
410 <name>text</name>
411 <string>8</string>
412 </property>
413 </widget>
414 <widget>
415 <class>QPushButton</class>
416 <property stdset="1">
417 <name>name</name>
418 <cstring>bt9</cstring>
419 </property>
420 <property stdset="1">
421 <name>maximumSize</name>
422 <size>
423 <width>60</width>
424 <height>25</height>
425 </size>
426 </property>
427 <property stdset="1">
428 <name>text</name>
429 <string>9</string>
430 </property>
431 </widget>
432 </hbox>
433 </widget>
434 <widget>
435 <class>QLayoutWidget</class>
436 <property stdset="1">
437 <name>name</name>
438 <cstring>Layout24</cstring>
439 </property>
440 <property stdset="1">
441 <name>maximumSize</name>
442 <size>
443 <width>32767</width>
444 <height>35</height>
445 </size>
205 </property> 446 </property>
206 <property> 447 <property>
207 <name>sizeHint</name> 448 <name>layoutSpacing</name>
449 </property>
450 <hbox>
451 <property stdset="1">
452 <name>margin</name>
453 <number>0</number>
454 </property>
455 <property stdset="1">
456 <name>spacing</name>
457 <number>2</number>
458 </property>
459 <widget>
460 <class>QPushButton</class>
461 <property stdset="1">
462 <name>name</name>
463 <cstring>PushButton1</cstring>
464 </property>
465 <property stdset="1">
466 <name>maximumSize</name>
208 <size> 467 <size>
209 <width>16</width> 468 <width>60</width>
210 <height>20</height> 469 <height>25</height>
211 </size> 470 </size>
212 </property> 471 </property>
213 </spacer> 472 <property stdset="1">
473 <name>text</name>
474 <string>&amp;Ok</string>
475 </property>
476 </widget>
477 <widget>
478 <class>QPushButton</class>
479 <property stdset="1">
480 <name>name</name>
481 <cstring>bt0</cstring>
482 </property>
483 <property stdset="1">
484 <name>sizePolicy</name>
485 <sizepolicy>
486 <hsizetype>1</hsizetype>
487 <vsizetype>1</vsizetype>
488 </sizepolicy>
489 </property>
490 <property stdset="1">
491 <name>maximumSize</name>
492 <size>
493 <width>60</width>
494 <height>25</height>
495 </size>
496 </property>
497 <property stdset="1">
498 <name>text</name>
499 <string>0</string>
500 </property>
501 </widget>
502 <widget>
503 <class>QPushButton</class>
504 <property stdset="1">
505 <name>name</name>
506 <cstring>PushButton2</cstring>
507 </property>
508 <property stdset="1">
509 <name>sizePolicy</name>
510 <sizepolicy>
511 <hsizetype>1</hsizetype>
512 <vsizetype>1</vsizetype>
513 </sizepolicy>
514 </property>
515 <property stdset="1">
516 <name>maximumSize</name>
517 <size>
518 <width>60</width>
519 <height>25</height>
520 </size>
521 </property>
522 <property stdset="1">
523 <name>text</name>
524 <string>&amp;Cancel</string>
525 </property>
526 </widget>
214 </hbox> 527 </hbox>
215 </widget> 528 </widget>
216 </grid> 529 </vbox>
217</widget> 530</widget>
218<connections> 531<connections>
219 <connection> 532 <connection>
533 <sender>PushButton2</sender>
534 <signal>clicked()</signal>
535 <receiver>Form1</receiver>
536 <slot>reject()</slot>
537 </connection>
538 <connection>
220 <sender>PushButton1</sender> 539 <sender>PushButton1</sender>
221 <signal>clicked()</signal> 540 <signal>clicked()</signal>
222 <receiver>Form1</receiver> 541 <receiver>Form1</receiver>
223 <slot>accept()</slot> 542 <slot>accept()</slot>
224 </connection> 543 </connection>
225 <connection> 544 <connection>
226 <sender>PushButton2</sender> 545 <sender>bt0</sender>
227 <signal>clicked()</signal> 546 <signal>clicked()</signal>
228 <receiver>Form1</receiver> 547 <receiver>Form1</receiver>
229 <slot>reject()</slot> 548 <slot>addnum()</slot>
549 </connection>
550 <connection>
551 <sender>bt1</sender>
552 <signal>clicked()</signal>
553 <receiver>Form1</receiver>
554 <slot>addnum()</slot>
555 </connection>
556 <connection>
557 <sender>bt2</sender>
558 <signal>clicked()</signal>
559 <receiver>Form1</receiver>
560 <slot>addnum()</slot>
561 </connection>
562 <connection>
563 <sender>bt3</sender>
564 <signal>clicked()</signal>
565 <receiver>Form1</receiver>
566 <slot>addnum()</slot>
567 </connection>
568 <connection>
569 <sender>bt4</sender>
570 <signal>clicked()</signal>
571 <receiver>Form1</receiver>
572 <slot>addnum()</slot>
573 </connection>
574 <connection>
575 <sender>bt5</sender>
576 <signal>clicked()</signal>
577 <receiver>Form1</receiver>
578 <slot>addnum()</slot>
579 </connection>
580 <connection>
581 <sender>bt6</sender>
582 <signal>clicked()</signal>
583 <receiver>Form1</receiver>
584 <slot>addnum()</slot>
585 </connection>
586 <connection>
587 <sender>bt7</sender>
588 <signal>clicked()</signal>
589 <receiver>Form1</receiver>
590 <slot>addnum()</slot>
591 </connection>
592 <connection>
593 <sender>bt8</sender>
594 <signal>clicked()</signal>
595 <receiver>Form1</receiver>
596 <slot>addnum()</slot>
597 </connection>
598 <connection>
599 <sender>bt9</sender>
600 <signal>clicked()</signal>
601 <receiver>Form1</receiver>
602 <slot>addnum()</slot>
230 </connection> 603 </connection>
604 <slot access="protected">addnum()</slot>
231</connections> 605</connections>
606<tabstops>
607 <tabstop>lnePin</tabstop>
608 <tabstop>PushButton1</tabstop>
609 <tabstop>PushButton2</tabstop>
610 <tabstop>bt1</tabstop>
611 <tabstop>bt2</tabstop>
612 <tabstop>bt3</tabstop>
613 <tabstop>bt4</tabstop>
614 <tabstop>bt5</tabstop>
615 <tabstop>bt6</tabstop>
616 <tabstop>bt7</tabstop>
617 <tabstop>bt8</tabstop>
618 <tabstop>bt9</tabstop>
619 <tabstop>bt0</tabstop>
620</tabstops>
232</UI> 621</UI>