32 files changed, 1422 insertions, 107 deletions
diff --git a/apps/Applications/opie-smb.desktop b/apps/Applications/opie-smb.desktop new file mode 100644 index 0000000..f3fe239 --- a/dev/null +++ b/apps/Applications/opie-smb.desktop | |||
@@ -0,0 +1,6 @@ | |||
1 | [Desktop Entry] | ||
2 | Comment=Samba Client Utility | ||
3 | Exec=opie-smb | ||
4 | Icon=opie-smb/opie-smb | ||
5 | Type=Application | ||
6 | Name=opie-smb | ||
diff --git a/core/applets/vmemo/vmemo.h b/core/applets/vmemo/vmemo.h index 1bd735f..806fe0e 100644 --- a/core/applets/vmemo/vmemo.h +++ b/core/applets/vmemo/vmemo.h | |||
@@ -28,9 +28,11 @@ | |||
28 | 28 | ||
29 | class VMemo : public QWidget | 29 | class VMemo : public QWidget |
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | |||
32 | public: | 33 | public: |
34 | |||
33 | VMemo( QWidget *parent, const char *name = NULL); | 35 | VMemo( QWidget *parent, const char *name = NULL); |
34 | ~VMemo(); | 36 | ~VMemo(); |
35 | static int position(); | 37 | static int position(); |
36 | QFile track; | 38 | QFile track; |
@@ -38,17 +40,21 @@ public: | |||
38 | QString fileName, errorMsg, date; | 40 | QString fileName, errorMsg, date; |
39 | QLabel* msgLabel; | 41 | QLabel* msgLabel; |
40 | QTimer *t_timer; | 42 | QTimer *t_timer; |
41 | bool usingIcon, useADPCM; | 43 | bool usingIcon, useADPCM; |
44 | |||
42 | public slots: | 45 | public slots: |
46 | |||
43 | bool record(); | 47 | bool record(); |
44 | void mousePressEvent( QMouseEvent * ); | 48 | void mousePressEvent( QMouseEvent * ); |
45 | void mouseReleaseEvent( QMouseEvent * ); | 49 | void mouseReleaseEvent( QMouseEvent * ); |
46 | void receive( const QCString &msg, const QByteArray &data ); | 50 | void receive( const QCString &msg, const QByteArray &data ); |
47 | bool startRecording(); | 51 | bool startRecording(); |
48 | void stopRecording(); | 52 | void stopRecording(); |
49 | void timerBreak(); | 53 | void timerBreak(); |
54 | |||
50 | private: | 55 | private: |
56 | |||
51 | bool useAlerts; | 57 | bool useAlerts; |
52 | void paintEvent( QPaintEvent* ); | 58 | void paintEvent( QPaintEvent* ); |
53 | int setToggleButton(int); | 59 | int setToggleButton(int); |
54 | int openDSP(); | 60 | int openDSP(); |
diff --git a/core/apps/textedit/textedit.cpp b/core/apps/textedit/textedit.cpp index ca760bb..759e440 100644 --- a/core/apps/textedit/textedit.cpp +++ b/core/apps/textedit/textedit.cpp | |||
diff --git a/core/pim/datebook/dateentry.ui b/core/pim/datebook/dateentry.ui index f776911..6e4ada1 100644 --- a/core/pim/datebook/dateentry.ui +++ b/core/pim/datebook/dateentry.ui | |||
@@ -31,60 +31,73 @@ | |||
31 | <name>geometry</name> | 31 | <name>geometry</name> |
32 | <rect> | 32 | <rect> |
33 | <x>0</x> | 33 | <x>0</x> |
34 | <y>0</y> | 34 | <y>0</y> |
35 | <width>242</width> | 35 | <width>286</width> |
36 | <height>339</height> | 36 | <height>396</height> |
37 | </rect> | 37 | </rect> |
38 | </property> | 38 | </property> |
39 | <property stdset="1"> | 39 | <property stdset="1"> |
40 | <name>caption</name> | 40 | <name>caption</name> |
41 | <string>New Event</string> | 41 | <string>New Event</string> |
42 | </property> | 42 | </property> |
43 | <property> | ||
44 | <name>layoutMargin</name> | ||
45 | </property> | ||
46 | <property> | ||
47 | <name>layoutSpacing</name> | ||
48 | </property> | ||
43 | <grid> | 49 | <grid> |
44 | <property stdset="1"> | 50 | <property stdset="1"> |
45 | <name>margin</name> | 51 | <name>margin</name> |
46 | <number>2</number> | 52 | <number>2</number> |
47 | </property> | 53 | </property> |
48 | <property stdset="1"> | 54 | <property stdset="1"> |
49 | <name>spacing</name> | 55 | <name>spacing</name> |
50 | <number>0</number> | 56 | <number>2</number> |
51 | </property> | 57 | </property> |
52 | <widget row="1" column="0" > | 58 | <widget row="0" column="0" > |
53 | <class>QLabel</class> | 59 | <class>QLayoutWidget</class> |
54 | <property stdset="1"> | 60 | <property stdset="1"> |
55 | <name>name</name> | 61 | <name>name</name> |
56 | <cstring>TextLabel2</cstring> | 62 | <cstring>Layout19</cstring> |
57 | </property> | 63 | </property> |
64 | <vbox> | ||
58 | <property stdset="1"> | 65 | <property stdset="1"> |
59 | <name>frameShape</name> | 66 | <name>margin</name> |
60 | <enum>MShape</enum> | 67 | <number>0</number> |
61 | </property> | 68 | </property> |
62 | <property stdset="1"> | 69 | <property stdset="1"> |
63 | <name>frameShadow</name> | 70 | <name>spacing</name> |
64 | <enum>MShadow</enum> | 71 | <number>6</number> |
65 | </property> | 72 | </property> |
73 | <widget> | ||
74 | <class>QLayoutWidget</class> | ||
66 | <property stdset="1"> | 75 | <property stdset="1"> |
67 | <name>text</name> | 76 | <name>name</name> |
68 | <string>Location</string> | 77 | <cstring>Layout1</cstring> |
69 | </property> | 78 | </property> |
70 | </widget> | 79 | <hbox> |
71 | <widget row="2" column="0" > | 80 | <property stdset="1"> |
81 | <name>margin</name> | ||
82 | <number>0</number> | ||
83 | </property> | ||
84 | <property stdset="1"> | ||
85 | <name>spacing</name> | ||
86 | <number>6</number> | ||
87 | </property> | ||
88 | <widget> | ||
72 | <class>QLabel</class> | 89 | <class>QLabel</class> |
73 | <property stdset="1"> | 90 | <property stdset="1"> |
74 | <name>name</name> | 91 | <name>name</name> |
75 | <cstring>TextLabel2_2</cstring> | 92 | <cstring>TextLabel1</cstring> |
76 | </property> | 93 | </property> |
77 | <property stdset="1"> | 94 | <property stdset="1"> |
78 | <name>text</name> | 95 | <name>text</name> |
79 | <string>Category</string> | 96 | <string>Description </string> |
80 | </property> | ||
81 | <property> | ||
82 | <name>buddy</name> | ||
83 | <cstring>comboPriority</cstring> | ||
84 | </property> | 97 | </property> |
85 | </widget> | 98 | </widget> |
86 | <widget row="0" column="1" rowspan="1" colspan="3" > | 99 | <widget> |
87 | <class>QComboBox</class> | 100 | <class>QComboBox</class> |
88 | <item> | 101 | <item> |
89 | <property> | 102 | <property> |
90 | <name>text</name> | 103 | <name>text</name> |
@@ -138,20 +151,45 @@ | |||
138 | <name>duplicatesEnabled</name> | 151 | <name>duplicatesEnabled</name> |
139 | <bool>false</bool> | 152 | <bool>false</bool> |
140 | </property> | 153 | </property> |
141 | </widget> | 154 | </widget> |
142 | <widget row="0" column="0" > | 155 | </hbox> |
156 | </widget> | ||
157 | <widget> | ||
158 | <class>QLayoutWidget</class> | ||
159 | <property stdset="1"> | ||
160 | <name>name</name> | ||
161 | <cstring>Layout2</cstring> | ||
162 | </property> | ||
163 | <hbox> | ||
164 | <property stdset="1"> | ||
165 | <name>margin</name> | ||
166 | <number>0</number> | ||
167 | </property> | ||
168 | <property stdset="1"> | ||
169 | <name>spacing</name> | ||
170 | <number>6</number> | ||
171 | </property> | ||
172 | <widget> | ||
143 | <class>QLabel</class> | 173 | <class>QLabel</class> |
144 | <property stdset="1"> | 174 | <property stdset="1"> |
145 | <name>name</name> | 175 | <name>name</name> |
146 | <cstring>TextLabel1</cstring> | 176 | <cstring>TextLabel2</cstring> |
177 | </property> | ||
178 | <property stdset="1"> | ||
179 | <name>frameShape</name> | ||
180 | <enum>MShape</enum> | ||
181 | </property> | ||
182 | <property stdset="1"> | ||
183 | <name>frameShadow</name> | ||
184 | <enum>MShadow</enum> | ||
147 | </property> | 185 | </property> |
148 | <property stdset="1"> | 186 | <property stdset="1"> |
149 | <name>text</name> | 187 | <name>text</name> |
150 | <string>Description </string> | 188 | <string>Location</string> |
151 | </property> | 189 | </property> |
152 | </widget> | 190 | </widget> |
153 | <widget row="1" column="1" rowspan="1" colspan="3" > | 191 | <widget> |
154 | <class>QComboBox</class> | 192 | <class>QComboBox</class> |
155 | <item> | 193 | <item> |
156 | <property> | 194 | <property> |
157 | <name>text</name> | 195 | <name>text</name> |
@@ -193,9 +231,41 @@ | |||
193 | <name>duplicatesEnabled</name> | 231 | <name>duplicatesEnabled</name> |
194 | <bool>false</bool> | 232 | <bool>false</bool> |
195 | </property> | 233 | </property> |
196 | </widget> | 234 | </widget> |
197 | <widget row="2" column="1" rowspan="1" colspan="3" > | 235 | </hbox> |
236 | </widget> | ||
237 | <widget> | ||
238 | <class>QLayoutWidget</class> | ||
239 | <property stdset="1"> | ||
240 | <name>name</name> | ||
241 | <cstring>Layout3</cstring> | ||
242 | </property> | ||
243 | <hbox> | ||
244 | <property stdset="1"> | ||
245 | <name>margin</name> | ||
246 | <number>0</number> | ||
247 | </property> | ||
248 | <property stdset="1"> | ||
249 | <name>spacing</name> | ||
250 | <number>6</number> | ||
251 | </property> | ||
252 | <widget> | ||
253 | <class>QLabel</class> | ||
254 | <property stdset="1"> | ||
255 | <name>name</name> | ||
256 | <cstring>TextLabel2_2</cstring> | ||
257 | </property> | ||
258 | <property stdset="1"> | ||
259 | <name>text</name> | ||
260 | <string>Category</string> | ||
261 | </property> | ||
262 | <property> | ||
263 | <name>buddy</name> | ||
264 | <cstring>comboPriority</cstring> | ||
265 | </property> | ||
266 | </widget> | ||
267 | <widget> | ||
198 | <class>CategorySelect</class> | 268 | <class>CategorySelect</class> |
199 | <property stdset="1"> | 269 | <property stdset="1"> |
200 | <name>name</name> | 270 | <name>name</name> |
201 | <cstring>comboCategory</cstring> | 271 | <cstring>comboCategory</cstring> |
@@ -207,9 +277,41 @@ | |||
207 | <vsizetype>1</vsizetype> | 277 | <vsizetype>1</vsizetype> |
208 | </sizepolicy> | 278 | </sizepolicy> |
209 | </property> | 279 | </property> |
210 | </widget> | 280 | </widget> |
211 | <widget row="3" column="0" rowspan="2" colspan="1" > | 281 | </hbox> |
282 | </widget> | ||
283 | <widget> | ||
284 | <class>QLayoutWidget</class> | ||
285 | <property stdset="1"> | ||
286 | <name>name</name> | ||
287 | <cstring>Layout18</cstring> | ||
288 | </property> | ||
289 | <hbox> | ||
290 | <property stdset="1"> | ||
291 | <name>margin</name> | ||
292 | <number>0</number> | ||
293 | </property> | ||
294 | <property stdset="1"> | ||
295 | <name>spacing</name> | ||
296 | <number>6</number> | ||
297 | </property> | ||
298 | <widget> | ||
299 | <class>QLayoutWidget</class> | ||
300 | <property stdset="1"> | ||
301 | <name>name</name> | ||
302 | <cstring>Layout17</cstring> | ||
303 | </property> | ||
304 | <vbox> | ||
305 | <property stdset="1"> | ||
306 | <name>margin</name> | ||
307 | <number>0</number> | ||
308 | </property> | ||
309 | <property stdset="1"> | ||
310 | <name>spacing</name> | ||
311 | <number>6</number> | ||
312 | </property> | ||
313 | <widget> | ||
212 | <class>QLabel</class> | 314 | <class>QLabel</class> |
213 | <property stdset="1"> | 315 | <property stdset="1"> |
214 | <name>name</name> | 316 | <name>name</name> |
215 | <cstring>TextLabel3</cstring> | 317 | <cstring>TextLabel3</cstring> |
@@ -218,9 +320,26 @@ | |||
218 | <name>text</name> | 320 | <name>text</name> |
219 | <string>Start - End </string> | 321 | <string>Start - End </string> |
220 | </property> | 322 | </property> |
221 | </widget> | 323 | </widget> |
222 | <widget row="3" column="1" > | 324 | </vbox> |
325 | </widget> | ||
326 | <widget> | ||
327 | <class>QLayoutWidget</class> | ||
328 | <property stdset="1"> | ||
329 | <name>name</name> | ||
330 | <cstring>Layout4</cstring> | ||
331 | </property> | ||
332 | <vbox> | ||
333 | <property stdset="1"> | ||
334 | <name>margin</name> | ||
335 | <number>0</number> | ||
336 | </property> | ||
337 | <property stdset="1"> | ||
338 | <name>spacing</name> | ||
339 | <number>6</number> | ||
340 | </property> | ||
341 | <widget> | ||
223 | <class>QPushButton</class> | 342 | <class>QPushButton</class> |
224 | <property stdset="1"> | 343 | <property stdset="1"> |
225 | <name>name</name> | 344 | <name>name</name> |
226 | <cstring>buttonStart</cstring> | 345 | <cstring>buttonStart</cstring> |
@@ -243,9 +362,9 @@ | |||
243 | <name>text</name> | 362 | <name>text</name> |
244 | <string>Jan 02 00</string> | 363 | <string>Jan 02 00</string> |
245 | </property> | 364 | </property> |
246 | </widget> | 365 | </widget> |
247 | <widget row="4" column="1" > | 366 | <widget> |
248 | <class>QLineEdit</class> | 367 | <class>QLineEdit</class> |
249 | <property stdset="1"> | 368 | <property stdset="1"> |
250 | <name>name</name> | 369 | <name>name</name> |
251 | <cstring>comboStart</cstring> | 370 | <cstring>comboStart</cstring> |
@@ -278,12 +397,14 @@ | |||
278 | <property> | 397 | <property> |
279 | <name>hAlign</name> | 398 | <name>hAlign</name> |
280 | </property> | 399 | </property> |
281 | </widget> | 400 | </widget> |
282 | <spacer row="3" column="2" rowspan="2" colspan="1" > | 401 | </vbox> |
402 | </widget> | ||
403 | <spacer> | ||
283 | <property> | 404 | <property> |
284 | <name>name</name> | 405 | <name>name</name> |
285 | <cstring>Spacer1_2</cstring> | 406 | <cstring>Spacer12</cstring> |
286 | </property> | 407 | </property> |
287 | <property stdset="1"> | 408 | <property stdset="1"> |
288 | <name>orientation</name> | 409 | <name>orientation</name> |
289 | <enum>Horizontal</enum> | 410 | <enum>Horizontal</enum> |
@@ -299,23 +420,24 @@ | |||
299 | <height>20</height> | 420 | <height>20</height> |
300 | </size> | 421 | </size> |
301 | </property> | 422 | </property> |
302 | </spacer> | 423 | </spacer> |
303 | <widget row="5" column="1" rowspan="1" colspan="3" > | 424 | <widget> |
304 | <class>TimePicker</class> | 425 | <class>QLayoutWidget</class> |
305 | <property stdset="1"> | 426 | <property stdset="1"> |
306 | <name>name</name> | 427 | <name>name</name> |
307 | <cstring>timePickerStart</cstring> | 428 | <cstring>Layout5</cstring> |
308 | </property> | 429 | </property> |
430 | <vbox> | ||
309 | <property stdset="1"> | 431 | <property stdset="1"> |
310 | <name>sizePolicy</name> | 432 | <name>margin</name> |
311 | <sizepolicy> | 433 | <number>0</number> |
312 | <hsizetype>3</hsizetype> | ||
313 | <vsizetype>1</vsizetype> | ||
314 | </sizepolicy> | ||
315 | </property> | 434 | </property> |
316 | </widget> | 435 | <property stdset="1"> |
317 | <widget row="3" column="3" > | 436 | <name>spacing</name> |
437 | <number>6</number> | ||
438 | </property> | ||
439 | <widget> | ||
318 | <class>QPushButton</class> | 440 | <class>QPushButton</class> |
319 | <property stdset="1"> | 441 | <property stdset="1"> |
320 | <name>name</name> | 442 | <name>name</name> |
321 | <cstring>buttonEnd</cstring> | 443 | <cstring>buttonEnd</cstring> |
@@ -338,9 +460,9 @@ | |||
338 | <name>text</name> | 460 | <name>text</name> |
339 | <string>Jan 02 00</string> | 461 | <string>Jan 02 00</string> |
340 | </property> | 462 | </property> |
341 | </widget> | 463 | </widget> |
342 | <widget row="4" column="3" > | 464 | <widget> |
343 | <class>QLineEdit</class> | 465 | <class>QLineEdit</class> |
344 | <property stdset="1"> | 466 | <property stdset="1"> |
345 | <name>name</name> | 467 | <name>name</name> |
346 | <cstring>comboEnd</cstring> | 468 | <cstring>comboEnd</cstring> |
@@ -373,9 +495,28 @@ | |||
373 | <property> | 495 | <property> |
374 | <name>hAlign</name> | 496 | <name>hAlign</name> |
375 | </property> | 497 | </property> |
376 | </widget> | 498 | </widget> |
377 | <widget row="5" column="0" > | 499 | </vbox> |
500 | </widget> | ||
501 | </hbox> | ||
502 | </widget> | ||
503 | <widget> | ||
504 | <class>QLayoutWidget</class> | ||
505 | <property stdset="1"> | ||
506 | <name>name</name> | ||
507 | <cstring>Layout7</cstring> | ||
508 | </property> | ||
509 | <hbox> | ||
510 | <property stdset="1"> | ||
511 | <name>margin</name> | ||
512 | <number>0</number> | ||
513 | </property> | ||
514 | <property stdset="1"> | ||
515 | <name>spacing</name> | ||
516 | <number>6</number> | ||
517 | </property> | ||
518 | <widget> | ||
378 | <class>QLabel</class> | 519 | <class>QLabel</class> |
379 | <property stdset="1"> | 520 | <property stdset="1"> |
380 | <name>name</name> | 521 | <name>name</name> |
381 | <cstring>TimePickerLabel</cstring> | 522 | <cstring>TimePickerLabel</cstring> |
@@ -384,9 +525,25 @@ | |||
384 | <name>text</name> | 525 | <name>text</name> |
385 | <string>Start time</string> | 526 | <string>Start time</string> |
386 | </property> | 527 | </property> |
387 | </widget> | 528 | </widget> |
388 | <widget row="6" column="0" > | 529 | <widget> |
530 | <class>TimePicker</class> | ||
531 | <property stdset="1"> | ||
532 | <name>name</name> | ||
533 | <cstring>timePickerStart</cstring> | ||
534 | </property> | ||
535 | <property stdset="1"> | ||
536 | <name>sizePolicy</name> | ||
537 | <sizepolicy> | ||
538 | <hsizetype>3</hsizetype> | ||
539 | <vsizetype>1</vsizetype> | ||
540 | </sizepolicy> | ||
541 | </property> | ||
542 | </widget> | ||
543 | </hbox> | ||
544 | </widget> | ||
545 | <widget> | ||
389 | <class>QCheckBox</class> | 546 | <class>QCheckBox</class> |
390 | <property stdset="1"> | 547 | <property stdset="1"> |
391 | <name>name</name> | 548 | <name>name</name> |
392 | <cstring>checkAllDay</cstring> | 549 | <cstring>checkAllDay</cstring> |
@@ -395,9 +552,24 @@ | |||
395 | <name>text</name> | 552 | <name>text</name> |
396 | <string>All day</string> | 553 | <string>All day</string> |
397 | </property> | 554 | </property> |
398 | </widget> | 555 | </widget> |
399 | <widget row="7" column="0" > | 556 | <widget> |
557 | <class>QLayoutWidget</class> | ||
558 | <property stdset="1"> | ||
559 | <name>name</name> | ||
560 | <cstring>Layout8</cstring> | ||
561 | </property> | ||
562 | <hbox> | ||
563 | <property stdset="1"> | ||
564 | <name>margin</name> | ||
565 | <number>0</number> | ||
566 | </property> | ||
567 | <property stdset="1"> | ||
568 | <name>spacing</name> | ||
569 | <number>6</number> | ||
570 | </property> | ||
571 | <widget> | ||
400 | <class>QLabel</class> | 572 | <class>QLabel</class> |
401 | <property stdset="1"> | 573 | <property stdset="1"> |
402 | <name>name</name> | 574 | <name>name</name> |
403 | <cstring>TextLabel3_2_2</cstring> | 575 | <cstring>TextLabel3_2_2</cstring> |
@@ -406,9 +578,9 @@ | |||
406 | <name>text</name> | 578 | <name>text</name> |
407 | <string>Time zone</string> | 579 | <string>Time zone</string> |
408 | </property> | 580 | </property> |
409 | </widget> | 581 | </widget> |
410 | <widget row="7" column="1" rowspan="1" colspan="3" > | 582 | <widget> |
411 | <class>TimeZoneSelector</class> | 583 | <class>TimeZoneSelector</class> |
412 | <property stdset="1"> | 584 | <property stdset="1"> |
413 | <name>name</name> | 585 | <name>name</name> |
414 | <cstring>timezone</cstring> | 586 | <cstring>timezone</cstring> |
@@ -420,9 +592,29 @@ | |||
420 | <vsizetype>1</vsizetype> | 592 | <vsizetype>1</vsizetype> |
421 | </sizepolicy> | 593 | </sizepolicy> |
422 | </property> | 594 | </property> |
423 | </widget> | 595 | </widget> |
424 | <widget row="8" column="0" > | 596 | </hbox> |
597 | </widget> | ||
598 | <widget> | ||
599 | <class>QLayoutWidget</class> | ||
600 | <property stdset="1"> | ||
601 | <name>name</name> | ||
602 | <cstring>Layout9</cstring> | ||
603 | </property> | ||
604 | <property> | ||
605 | <name>layoutSpacing</name> | ||
606 | </property> | ||
607 | <hbox> | ||
608 | <property stdset="1"> | ||
609 | <name>margin</name> | ||
610 | <number>0</number> | ||
611 | </property> | ||
612 | <property stdset="1"> | ||
613 | <name>spacing</name> | ||
614 | <number>1</number> | ||
615 | </property> | ||
616 | <widget> | ||
425 | <class>QCheckBox</class> | 617 | <class>QCheckBox</class> |
426 | <property stdset="1"> | 618 | <property stdset="1"> |
427 | <name>name</name> | 619 | <name>name</name> |
428 | <cstring>checkAlarm</cstring> | 620 | <cstring>checkAlarm</cstring> |
@@ -443,9 +635,9 @@ | |||
443 | <name>checked</name> | 635 | <name>checked</name> |
444 | <bool>false</bool> | 636 | <bool>false</bool> |
445 | </property> | 637 | </property> |
446 | </widget> | 638 | </widget> |
447 | <widget row="8" column="1" rowspan="1" colspan="2" > | 639 | <widget> |
448 | <class>QSpinBox</class> | 640 | <class>QSpinBox</class> |
449 | <property stdset="1"> | 641 | <property stdset="1"> |
450 | <name>name</name> | 642 | <name>name</name> |
451 | <cstring>spinAlarm</cstring> | 643 | <cstring>spinAlarm</cstring> |
@@ -455,9 +647,9 @@ | |||
455 | <bool>false</bool> | 647 | <bool>false</bool> |
456 | </property> | 648 | </property> |
457 | <property stdset="1"> | 649 | <property stdset="1"> |
458 | <name>suffix</name> | 650 | <name>suffix</name> |
459 | <string> minutes</string> | 651 | <string></string> |
460 | </property> | 652 | </property> |
461 | <property stdset="1"> | 653 | <property stdset="1"> |
462 | <name>maxValue</name> | 654 | <name>maxValue</name> |
463 | <number>180</number> | 655 | <number>180</number> |
@@ -467,16 +659,49 @@ | |||
467 | <number>0</number> | 659 | <number>0</number> |
468 | </property> | 660 | </property> |
469 | <property stdset="1"> | 661 | <property stdset="1"> |
470 | <name>lineStep</name> | 662 | <name>lineStep</name> |
471 | <number>5</number> | 663 | <number>1</number> |
472 | </property> | 664 | </property> |
473 | <property stdset="1"> | 665 | <property stdset="1"> |
474 | <name>value</name> | 666 | <name>value</name> |
475 | <number>5</number> | 667 | <number>5</number> |
476 | </property> | 668 | </property> |
477 | </widget> | 669 | </widget> |
478 | <widget row="8" column="3" > | 670 | <widget> |
671 | <class>QComboBox</class> | ||
672 | <item> | ||
673 | <property> | ||
674 | <name>text</name> | ||
675 | <string>minutes</string> | ||
676 | </property> | ||
677 | </item> | ||
678 | <item> | ||
679 | <property> | ||
680 | <name>text</name> | ||
681 | <string>hours</string> | ||
682 | </property> | ||
683 | </item> | ||
684 | <item> | ||
685 | <property> | ||
686 | <name>text</name> | ||
687 | <string>days</string> | ||
688 | </property> | ||
689 | </item> | ||
690 | <property stdset="1"> | ||
691 | <name>name</name> | ||
692 | <cstring>ComboInterval</cstring> | ||
693 | </property> | ||
694 | <property stdset="1"> | ||
695 | <name>enabled</name> | ||
696 | <bool>false</bool> | ||
697 | </property> | ||
698 | <property stdset="1"> | ||
699 | <name>currentItem</name> | ||
700 | <number>0</number> | ||
701 | </property> | ||
702 | </widget> | ||
703 | <widget> | ||
479 | <class>QComboBox</class> | 704 | <class>QComboBox</class> |
480 | <item> | 705 | <item> |
481 | <property> | 706 | <property> |
482 | <name>text</name> | 707 | <name>text</name> |
@@ -497,9 +722,26 @@ | |||
497 | <name>enabled</name> | 722 | <name>enabled</name> |
498 | <bool>false</bool> | 723 | <bool>false</bool> |
499 | </property> | 724 | </property> |
500 | </widget> | 725 | </widget> |
501 | <widget row="9" column="0" > | 726 | </hbox> |
727 | </widget> | ||
728 | <widget> | ||
729 | <class>QLayoutWidget</class> | ||
730 | <property stdset="1"> | ||
731 | <name>name</name> | ||
732 | <cstring>Layout11</cstring> | ||
733 | </property> | ||
734 | <hbox> | ||
735 | <property stdset="1"> | ||
736 | <name>margin</name> | ||
737 | <number>0</number> | ||
738 | </property> | ||
739 | <property stdset="1"> | ||
740 | <name>spacing</name> | ||
741 | <number>6</number> | ||
742 | </property> | ||
743 | <widget> | ||
502 | <class>QLabel</class> | 744 | <class>QLabel</class> |
503 | <property stdset="1"> | 745 | <property stdset="1"> |
504 | <name>name</name> | 746 | <name>name</name> |
505 | <cstring>lblRepeat</cstring> | 747 | <cstring>lblRepeat</cstring> |
@@ -508,9 +750,9 @@ | |||
508 | <name>text</name> | 750 | <name>text</name> |
509 | <string>Repeat</string> | 751 | <string>Repeat</string> |
510 | </property> | 752 | </property> |
511 | </widget> | 753 | </widget> |
512 | <widget row="9" column="1" rowspan="1" colspan="3" > | 754 | <widget> |
513 | <class>QToolButton</class> | 755 | <class>QToolButton</class> |
514 | <property stdset="1"> | 756 | <property stdset="1"> |
515 | <name>name</name> | 757 | <name>name</name> |
516 | <cstring>cmdRepeat</cstring> | 758 | <cstring>cmdRepeat</cstring> |
@@ -530,9 +772,11 @@ | |||
530 | <name>text</name> | 772 | <name>text</name> |
531 | <string>No Repeat...</string> | 773 | <string>No Repeat...</string> |
532 | </property> | 774 | </property> |
533 | </widget> | 775 | </widget> |
534 | <widget row="10" column="0" rowspan="1" colspan="4" > | 776 | </hbox> |
777 | </widget> | ||
778 | <widget> | ||
535 | <class>QToolButton</class> | 779 | <class>QToolButton</class> |
536 | <property stdset="1"> | 780 | <property stdset="1"> |
537 | <name>name</name> | 781 | <name>name</name> |
538 | <cstring>editNote</cstring> | 782 | <cstring>editNote</cstring> |
@@ -541,8 +785,10 @@ | |||
541 | <name>text</name> | 785 | <name>text</name> |
542 | <string>Note...</string> | 786 | <string>Note...</string> |
543 | </property> | 787 | </property> |
544 | </widget> | 788 | </widget> |
789 | </vbox> | ||
790 | </widget> | ||
545 | </grid> | 791 | </grid> |
546 | </widget> | 792 | </widget> |
547 | <customwidgets> | 793 | <customwidgets> |
548 | <customwidget> | 794 | <customwidget> |
@@ -646,8 +892,14 @@ | |||
646 | <signal>toggled(bool)</signal> | 892 | <signal>toggled(bool)</signal> |
647 | <receiver>comboStart</receiver> | 893 | <receiver>comboStart</receiver> |
648 | <slot>setDisabled(bool)</slot> | 894 | <slot>setDisabled(bool)</slot> |
649 | </connection> | 895 | </connection> |
896 | <connection> | ||
897 | <sender>checkAlarm</sender> | ||
898 | <signal>toggled(bool)</signal> | ||
899 | <receiver>ComboInterval</receiver> | ||
900 | <slot>setEnabled(bool)</slot> | ||
901 | </connection> | ||
650 | <slot access="public">endDateChanged( const QString & )</slot> | 902 | <slot access="public">endDateChanged( const QString & )</slot> |
651 | <slot access="public">endDateChanged( int, int, int )</slot> | 903 | <slot access="public">endDateChanged( int, int, int )</slot> |
652 | <slot access="public">endTimeChanged( const QString & )</slot> | 904 | <slot access="public">endTimeChanged( const QString & )</slot> |
653 | <slot access="public">slotRepeat()</slot> | 905 | <slot access="public">slotRepeat()</slot> |
diff --git a/inputmethods/dasher/opie-dasher-english.control b/inputmethods/dasher/opie-dasher-english.control index 180f121..286b392 100644 --- a/inputmethods/dasher/opie-dasher-english.control +++ b/inputmethods/dasher/opie-dasher-english.control | |||
@@ -4,9 +4,9 @@ Priority: optional | |||
4 | Section: opie/inputmethods | 4 | Section: opie/inputmethods |
5 | Maintainer: Matthew Garrett <mjg59@srcf.ucam.org> | 5 | Maintainer: Matthew Garrett <mjg59@srcf.ucam.org> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: opie-dasher | 8 | Depends: opie-dasher libexpat0 |
9 | Description: Dasher text input method | 9 | Description: Dasher text input method |
10 | Dasher is a novel zooming text entry method that allows significantly faster | 10 | Dasher is a novel zooming text entry method that allows significantly faster |
11 | text entry than traditional methods. This package provides the necessary | 11 | text entry than traditional methods. This package provides the necessary |
12 | data file to allow it to make predictions in English. | 12 | data file to allow it to make predictions in English. |
diff --git a/noncore/applets/volumeapplet2/volumeapplet.cpp b/noncore/applets/volumeapplet2/volumeapplet.cpp index 2f61f48..2122007 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.cpp +++ b/noncore/applets/volumeapplet2/volumeapplet.cpp | |||
@@ -37,8 +37,9 @@ _;:, .> :=|. This program is free software; you can | |||
37 | #include <opie2/oledbox.h> | 37 | #include <opie2/oledbox.h> |
38 | #include <opie2/oresource.h> | 38 | #include <opie2/oresource.h> |
39 | 39 | ||
40 | #include <qpe/applnk.h> | 40 | #include <qpe/applnk.h> |
41 | #include <qpe/qpeapplication.h> | ||
41 | 42 | ||
42 | using namespace Opie::Core; | 43 | using namespace Opie::Core; |
43 | using namespace Opie::MM; | 44 | using namespace Opie::MM; |
44 | using namespace Opie::Ui; | 45 | using namespace Opie::Ui; |
@@ -87,19 +88,23 @@ void VolumeAppletControl::build() | |||
87 | { | 88 | { |
88 | OSoundSystem* sound = OSoundSystem::instance(); | 89 | OSoundSystem* sound = OSoundSystem::instance(); |
89 | OSoundSystem::CardIterator it = sound->iterator(); | 90 | OSoundSystem::CardIterator it = sound->iterator(); |
90 | 91 | ||
91 | OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); | 92 | // OMixerInterface* |
93 | mixer = new OMixerInterface( this, "/dev/mixer" ); | ||
92 | 94 | ||
93 | QStringList channels = mixer->allChannels(); | 95 | QStringList channels = mixer->allChannels(); |
94 | 96 | ||
95 | int x = 0; | 97 | int x = 0; |
96 | // int y = 0; | 98 | // int y = 0; |
97 | 99 | ||
98 | for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) | 100 | for ( QStringList::Iterator it = channels.begin(); it != channels.end(); ++it ) |
99 | { | 101 | { |
100 | odebug << "OSSDEMO: Mixer has channel " << *it << "" << oendl; | 102 | if((*it) == mixer->volume( "Vol")) { |
101 | odebug << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) | 103 | m_vol_percent=mixer->volume( *it ) >> 8; |
104 | } | ||
105 | owarn << "OSSDEMO: Mixer has channel " << *it << "" << oendl; | ||
106 | owarn << "OSSDEMO: +--- volume " << ( mixer->volume( *it ) & 0xff ) | ||
102 | << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; | 107 | << " (left) | " << ( mixer->volume( *it ) >> 8 ) << " (right)" << oendl; |
103 | 108 | ||
104 | l->addWidget( new Channel( mixer, this, *it ), 0, x++, AlignCenter ); | 109 | l->addWidget( new Channel( mixer, this, *it ), 0, x++, AlignCenter ); |
105 | } | 110 | } |
@@ -110,8 +115,18 @@ void VolumeAppletControl::build() | |||
110 | VolumeAppletControl::~VolumeAppletControl() | 115 | VolumeAppletControl::~VolumeAppletControl() |
111 | { | 116 | { |
112 | } | 117 | } |
113 | 118 | ||
119 | int VolumeAppletControl::volPercent ( ) const | ||
120 | { | ||
121 | return m_vol_percent; | ||
122 | } | ||
123 | |||
124 | bool VolumeAppletControl::volMuted ( ) const | ||
125 | { | ||
126 | return m_vol_muted; | ||
127 | } | ||
128 | |||
114 | 129 | ||
115 | void VolumeAppletControl::showEvent( QShowEvent* e ) | 130 | void VolumeAppletControl::showEvent( QShowEvent* e ) |
116 | { | 131 | { |
117 | odebug << "showEvent" << oendl; | 132 | odebug << "showEvent" << oendl; |
@@ -127,18 +142,19 @@ void VolumeAppletControl::hideEvent( QHideEvent* e ) | |||
127 | 142 | ||
128 | 143 | ||
129 | QSize VolumeAppletControl::sizeHint() const | 144 | QSize VolumeAppletControl::sizeHint() const |
130 | { | 145 | { |
131 | return QSize( 200, 200 ); //QFrame::sizeHint(); | 146 | int wd = QPEApplication::desktop()->width(); |
147 | return QSize( wd, 200 ); //QFrame::sizeHint(); | ||
132 | } | 148 | } |
133 | 149 | ||
134 | 150 | ||
135 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) | 151 | VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) |
136 | :OTaskbarApplet( parent, name ) | 152 | :OTaskbarApplet( parent, name ) |
137 | { | 153 | { |
138 | setFixedHeight( AppLnk::smallIconSize() ); | 154 | setFixedHeight( AppLnk::smallIconSize() +4); |
139 | setFixedWidth( AppLnk::smallIconSize() ); | 155 | setFixedWidth( AppLnk::smallIconSize() ); |
140 | _pixmap = Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon ); | 156 | _pixmap = new QPixmap (Opie::Core::OResource::loadPixmap( "volume", Opie::Core::OResource::SmallIcon )); |
141 | _control = new VolumeAppletControl( this, "control" ); | 157 | _control = new VolumeAppletControl( this, "control" ); |
142 | } | 158 | } |
143 | 159 | ||
144 | 160 | ||
@@ -155,9 +171,31 @@ int VolumeApplet::position() | |||
155 | 171 | ||
156 | void VolumeApplet::paintEvent( QPaintEvent* ) | 172 | void VolumeApplet::paintEvent( QPaintEvent* ) |
157 | { | 173 | { |
158 | QPainter p(this); | 174 | QPainter p(this); |
159 | p.drawPixmap(0, 2, _pixmap ); | 175 | |
176 | p. drawPixmap ( (width()- _pixmap->width())/2, QMAX( (height()-4-_pixmap->height() )/2, 1), *_pixmap ); | ||
177 | p. setPen ( darkGray ); | ||
178 | p. drawRect ( 1, height() - 4, width() - 2, 4 ); | ||
179 | |||
180 | OMixerInterface* mixer = new OMixerInterface( this, "/dev/mixer" ); | ||
181 | |||
182 | int volPercent = mixer->volume( "Vol" ) >> 8; | ||
183 | |||
184 | int pixelsWide = volPercent * ( width() - 4 ) / 100; | ||
185 | p. fillRect ( 2, height() - 3, pixelsWide, 2, red ); | ||
186 | p. fillRect ( pixelsWide + 2, height() - 3, width() - 4 - pixelsWide, 2, lightGray ); | ||
187 | |||
188 | // if ( _control-> volMuted ( )) { | ||
189 | // p. setPen ( red ); | ||
190 | // p. drawLine ( 1, 2, width() - 2, height() - 5 ); | ||
191 | // p. drawLine ( 1, 3, width() - 2, height() - 4 ); | ||
192 | // p. drawLine ( width() - 2, 2, 1, height() - 5 ); | ||
193 | // p. drawLine ( width() - 2, 3, 1, height() - 4 ); | ||
194 | // } | ||
195 | |||
196 | // QPainter p(this); | ||
197 | // p.drawPixmap(0, 2, _pixmap ); | ||
160 | } | 198 | } |
161 | 199 | ||
162 | 200 | ||
163 | void VolumeApplet::mousePressEvent( QMouseEvent* ) | 201 | void VolumeApplet::mousePressEvent( QMouseEvent* ) |
diff --git a/noncore/applets/volumeapplet2/volumeapplet.h b/noncore/applets/volumeapplet2/volumeapplet.h index c1f1a3a..953c305 100644 --- a/noncore/applets/volumeapplet2/volumeapplet.h +++ b/noncore/applets/volumeapplet2/volumeapplet.h | |||
@@ -31,17 +31,19 @@ | |||
31 | #ifndef VOLUMEAPPLET_H | 31 | #ifndef VOLUMEAPPLET_H |
32 | #define VOLUMEAPPLET_H | 32 | #define VOLUMEAPPLET_H |
33 | 33 | ||
34 | #include <opie2/otaskbarapplet.h> | 34 | #include <opie2/otaskbarapplet.h> |
35 | #include <opie2/osoundsystem.h> | ||
35 | #include <qframe.h> | 36 | #include <qframe.h> |
36 | #include <qstring.h> | 37 | #include <qstring.h> |
37 | #include <qvbox.h> | 38 | #include <qvbox.h> |
38 | #include <qpixmap.h> | 39 | #include <qpixmap.h> |
40 | //using namespace Opie::MM; | ||
39 | 41 | ||
40 | namespace Opie | 42 | namespace Opie |
41 | { | 43 | { |
42 | namespace Ui { class OLedBox; } | 44 | namespace Ui { class OLedBox; } |
43 | namespace MM { class OMixerInterface; } | 45 | // namespace MM { class OMixerInterface; } |
44 | } | 46 | } |
45 | class QLabel; | 47 | class QLabel; |
46 | class QSlider; | 48 | class QSlider; |
47 | class QShowEvent; | 49 | class QShowEvent; |
@@ -68,8 +70,15 @@ class VolumeAppletControl : public QFrame | |||
68 | { | 70 | { |
69 | public: | 71 | public: |
70 | VolumeAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); | 72 | VolumeAppletControl( Opie::Ui::OTaskbarApplet* parent, const char* name = 0 ); |
71 | ~VolumeAppletControl(); | 73 | ~VolumeAppletControl(); |
74 | bool volMuted() const; | ||
75 | int volPercent() const; | ||
76 | |||
77 | int m_vol_percent; | ||
78 | bool m_vol_muted; | ||
79 | |||
80 | Opie::MM::OMixerInterface* mixer; | ||
72 | 81 | ||
73 | virtual QSize sizeHint() const; | 82 | virtual QSize sizeHint() const; |
74 | 83 | ||
75 | protected: | 84 | protected: |
@@ -77,10 +86,10 @@ class VolumeAppletControl : public QFrame | |||
77 | virtual void hideEvent( QHideEvent* ); | 86 | virtual void hideEvent( QHideEvent* ); |
78 | void build(); | 87 | void build(); |
79 | 88 | ||
80 | private: | 89 | private: |
81 | QGridLayout* l; | ||
82 | 90 | ||
91 | QGridLayout* l; | ||
83 | }; | 92 | }; |
84 | 93 | ||
85 | 94 | ||
86 | class VolumeApplet : public Opie::Ui::OTaskbarApplet | 95 | class VolumeApplet : public Opie::Ui::OTaskbarApplet |
@@ -95,9 +104,9 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet | |||
95 | virtual void mousePressEvent( QMouseEvent* ); | 104 | virtual void mousePressEvent( QMouseEvent* ); |
96 | 105 | ||
97 | private: | 106 | private: |
98 | VolumeAppletControl* _control; | 107 | VolumeAppletControl* _control; |
99 | QPixmap _pixmap; | 108 | QPixmap* _pixmap; |
100 | }; | 109 | }; |
101 | 110 | ||
102 | #endif | 111 | #endif |
103 | 112 | ||
diff --git a/noncore/apps/advancedfm/advancedfmData.cpp b/noncore/apps/advancedfm/advancedfmData.cpp index feda198..95e619b 100644 --- a/noncore/apps/advancedfm/advancedfmData.cpp +++ b/noncore/apps/advancedfm/advancedfmData.cpp | |||
@@ -21,8 +21,9 @@ | |||
21 | using namespace Opie::Core; | 21 | using namespace Opie::Core; |
22 | using namespace Opie::Ui; | 22 | using namespace Opie::Ui; |
23 | 23 | ||
24 | /* QT */ | 24 | /* QT */ |
25 | #include <qframe.h> | ||
25 | #include <qlayout.h> | 26 | #include <qlayout.h> |
26 | #include <qhbox.h> | 27 | #include <qhbox.h> |
27 | #include <qmenubar.h> | 28 | #include <qmenubar.h> |
28 | #include <qcombobox.h> | 29 | #include <qcombobox.h> |
@@ -36,8 +37,12 @@ using namespace Opie::Ui; | |||
36 | void AdvancedFm::init() { | 37 | void AdvancedFm::init() { |
37 | b = false; | 38 | b = false; |
38 | setCaption( tr( "AdvancedFm" ) ); | 39 | setCaption( tr( "AdvancedFm" ) ); |
39 | 40 | ||
41 | // QFrame* frame = new QFrame(this); | ||
42 | // setCentralWidget(frame); | ||
43 | // QVBoxLayout *layout = new QVBoxLayout( frame ); | ||
44 | |||
40 | QVBoxLayout *layout = new QVBoxLayout( this ); | 45 | QVBoxLayout *layout = new QVBoxLayout( this ); |
41 | layout->setSpacing( 2); | 46 | layout->setSpacing( 2); |
42 | layout->setMargin( 0); // squeeze | 47 | layout->setMargin( 0); // squeeze |
43 | 48 | ||
diff --git a/noncore/apps/advancedfm/advancedfmMenu.cpp b/noncore/apps/advancedfm/advancedfmMenu.cpp index 80324eb..ed280aa 100644 --- a/noncore/apps/advancedfm/advancedfmMenu.cpp +++ b/noncore/apps/advancedfm/advancedfmMenu.cpp | |||
@@ -655,17 +655,31 @@ void AdvancedFm::runCommandStd() { | |||
655 | void AdvancedFm::fileStatus() { | 655 | void AdvancedFm::fileStatus() { |
656 | if( !CurrentView()->currentItem()) return; | 656 | if( !CurrentView()->currentItem()) return; |
657 | QString curFile; | 657 | QString curFile; |
658 | curFile = CurrentView()->currentItem()->text(0); | 658 | curFile = CurrentView()->currentItem()->text(0); |
659 | 659 | if(QFileInfo("/usr/bin/stat").exists()) { | |
660 | QStringList command; | 660 | QStringList command; |
661 | command << "/bin/sh"; | 661 | command << "/bin/sh"; |
662 | command << "-c"; | 662 | command << "-c"; |
663 | command << "stat -l "+ curFile; | 663 | command << "stat -l "+ curFile; |
664 | |||
665 | Output *outDlg; | 664 | Output *outDlg; |
666 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); | 665 | outDlg = new Output( command, this, tr("AdvancedFm Output"), true); |
667 | QPEApplication::execDialog( outDlg ); | 666 | QPEApplication::execDialog( outDlg ); |
667 | } else { | ||
668 | /* struct stat buf; | ||
669 | stat( curFile.local8bit(), &buf); | ||
670 | |||
671 | st_dev dev; | ||
672 | st_uid uid; | ||
673 | st_gid gid; | ||
674 | st_size size; | ||
675 | st_atime atime; | ||
676 | st_mtime mtime; | ||
677 | st_ctime ctime; | ||
678 | st_mode mode; | ||
679 | */ | ||
680 | } | ||
681 | |||
668 | qApp->processEvents(); | 682 | qApp->processEvents(); |
669 | } | 683 | } |
670 | 684 | ||
671 | 685 | ||
diff --git a/noncore/net/opie-smb/config.in b/noncore/net/opie-smb/config.in new file mode 100644 index 0000000..4ff78fd --- a/dev/null +++ b/noncore/net/opie-smb/config.in | |||
@@ -0,0 +1,4 @@ | |||
1 | config OPIESMB | ||
2 | boolean "opie-smb (samba front end client for Opie)" | ||
3 | default "n" | ||
4 | depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE | ||
diff --git a/noncore/net/opie-smb/main.cpp b/noncore/net/opie-smb/main.cpp new file mode 100644 index 0000000..5fae972 --- a/dev/null +++ b/noncore/net/opie-smb/main.cpp | |||
@@ -0,0 +1,6 @@ | |||
1 | #include "qsmb.h" | ||
2 | #include <opie2/oapplicationfactory.h> | ||
3 | using namespace Opie::Core; | ||
4 | OPIE_EXPORT_APP( OApplicationFactory<Qsmb> ) | ||
5 | |||
6 | |||
diff --git a/noncore/net/opie-smb/opie-smb.control b/noncore/net/opie-smb/opie-smb.control new file mode 100644 index 0000000..ce5c6bf --- a/dev/null +++ b/noncore/net/opie-smb/opie-smb.control | |||
@@ -0,0 +1,12 @@ | |||
1 | Package: smbclient | ||
2 | Version: 1.0 | ||
3 | Architecture: arm | ||
4 | Arch: arm | ||
5 | Maintainer: Kurt Korbatits (support@midget.net.au) | ||
6 | Section: Network | ||
7 | Priority: optional | ||
8 | Description: Gui front end for samba utilities. | ||
9 | Source: | ||
10 | Depends: smbclient | ||
11 | |||
12 | |||
diff --git a/noncore/net/opie-smb/opie-smb.pro b/noncore/net/opie-smb/opie-smb.pro new file mode 100644 index 0000000..90f9980 --- a/dev/null +++ b/noncore/net/opie-smb/opie-smb.pro | |||
@@ -0,0 +1,18 @@ | |||
1 | TEMPLATE= app | ||
2 | CONFIG += qte warn_on quickapp debug | ||
3 | HEADERS = qsmb.h | ||
4 | SOURCES = main.cpp qsmb.cpp | ||
5 | INCLUDEPATH += $(OPIEDIR)/include | ||
6 | DEPENDPATH += $(OPIEDIR)/include | ||
7 | DESTDIR = $(OPIEDIR)/bin | ||
8 | LIBS += -lqpe -lopiecore2 -lopieui2 -lpthread | ||
9 | |||
10 | # INCLUDEPATH+= $(QPEDIR)/include | ||
11 | # DEPENDPATH+= $(QPEDIR)/include | ||
12 | # LIBS += | ||
13 | |||
14 | INTERFACES= qsmbbase.ui | ||
15 | TARGET = opie-smb | ||
16 | |||
17 | #DEFINES += QT_QWS_NONOPIE | ||
18 | include( $(OPIEDIR)/include.pro ) | ||
diff --git a/noncore/net/opie-smb/qsmb.cpp b/noncore/net/opie-smb/qsmb.cpp new file mode 100644 index 0000000..527ab38 --- a/dev/null +++ b/noncore/net/opie-smb/qsmb.cpp | |||
@@ -0,0 +1,402 @@ | |||
1 | #include "qsmb.h" | ||
2 | #include <qpushbutton.h> | ||
3 | #include <qpe/qpeapplication.h> | ||
4 | |||
5 | #include <string.h> | ||
6 | #include <qstring.h> | ||
7 | #include <qdir.h> | ||
8 | #include <qfileinfo.h> | ||
9 | |||
10 | #include <qlabel.h> | ||
11 | #include <qlineedit.h> | ||
12 | #include <qcombobox.h> | ||
13 | #include <qstringlist.h> | ||
14 | #include <qcheckbox.h> | ||
15 | #include <qtextview.h> | ||
16 | #include <qmessagebox.h> | ||
17 | |||
18 | |||
19 | #include <pthread.h> | ||
20 | #include <signal.h> | ||
21 | #include <ctype.h> | ||
22 | |||
23 | |||
24 | #include <opie2/odebug.h> | ||
25 | using namespace Opie::Core; | ||
26 | |||
27 | |||
28 | Qsmb::Qsmb( QWidget* parent, const char* name, WFlags fl ) | ||
29 | : FormQPESMBBase( parent, name, fl ) | ||
30 | { | ||
31 | connect(CBHost, SIGNAL(activated(int)), this, SLOT(hostSelected(int))); | ||
32 | connect(DoItBtn, SIGNAL(clicked()), this, SLOT(DoItClicked())); | ||
33 | connect(BtnScan, SIGNAL(clicked()), this, SLOT(scanClicked())); | ||
34 | connect(BtnClear, SIGNAL(clicked()), this, SLOT(clear())); | ||
35 | |||
36 | //TODO configurable mount points | ||
37 | if(!QFileInfo("/mnt/samba1").exists()) system("mkdir /mnt/samba1"); | ||
38 | if(!QFileInfo("/mnt/samba2").exists()) system("mkdir /mnt/samba2"); | ||
39 | if(!QFileInfo("/mnt/samba2").exists()) system("mkdir /mnt/samba3"); | ||
40 | |||
41 | mountpt->insertItem("/mnt/samba1",-1); | ||
42 | mountpt->insertItem("/mnt/samba2",-1); | ||
43 | mountpt->insertItem("/mnt/samba3",-1); | ||
44 | |||
45 | top_element = NULL; | ||
46 | scanning = false; | ||
47 | } | ||
48 | |||
49 | Qsmb::~Qsmb() | ||
50 | { | ||
51 | } | ||
52 | |||
53 | void Qsmb::clear() | ||
54 | { | ||
55 | if (scanning) return; | ||
56 | ListViewScan->clear(); | ||
57 | TextViewOutput->setText(""); | ||
58 | top_element = NULL; | ||
59 | } | ||
60 | |||
61 | void Qsmb::scanClicked() | ||
62 | { | ||
63 | if (scanning) return; | ||
64 | pthread_create(&tpid, NULL, runit, (void *)this); | ||
65 | } | ||
66 | |||
67 | void Qsmb::DoItClicked() | ||
68 | { | ||
69 | |||
70 | if(! ListViewScan->selectedItem()) { | ||
71 | QMessageBox::warning(this, tr("Error"),tr("<p>No share selected!</p>")); | ||
72 | return; | ||
73 | } | ||
74 | if (scanning) return; | ||
75 | pthread_create(&tpid, NULL, runitm, (void *)this); | ||
76 | } | ||
77 | |||
78 | void* runit(void* arg) | ||
79 | { | ||
80 | Qsmb* caller = (Qsmb*)arg; | ||
81 | caller->scan(); | ||
82 | return(0); | ||
83 | } | ||
84 | |||
85 | void* runitm(void* arg) | ||
86 | { | ||
87 | Qsmb* caller = (Qsmb*)arg; | ||
88 | caller->DoIt(); | ||
89 | return(0); | ||
90 | } | ||
91 | |||
92 | void Qsmb::scan() | ||
93 | { | ||
94 | int i; | ||
95 | |||
96 | if (scanning) return; | ||
97 | scanning = true; | ||
98 | |||
99 | char match[512], lmhosts[512]; | ||
100 | QString cmd; | ||
101 | char result[256]; | ||
102 | |||
103 | FILE *pipe, *pipe2; | ||
104 | |||
105 | LScan->setText("Scanning..."); | ||
106 | qApp->processEvents(); | ||
107 | |||
108 | cmd = "ifconfig |grep 'addr:'|awk '{print $2}'|awk 'BEGIN{FS=\":\"}{print $2}'|sed 's/\\.[0-9]*$//'|head -n1"; | ||
109 | |||
110 | owarn << "cmd: " << cmd << oendl; | ||
111 | |||
112 | /* run findsmb & read output */ | ||
113 | if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | ||
114 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
115 | TextViewOutput->append(result); | ||
116 | return; | ||
117 | } | ||
118 | while(fgets(result, 256, pipe) != NULL) { | ||
119 | strcpy( match, result); | ||
120 | match[5]='\0'; | ||
121 | break; | ||
122 | } | ||
123 | owarn << "match: " << match << oendl; | ||
124 | |||
125 | cmd = "/usr/bin/findsmb"; | ||
126 | owarn <<"cmd: " << cmd << oendl; | ||
127 | |||
128 | TextViewOutput->append(cmd); | ||
129 | |||
130 | snprintf(lmhosts, 512, "echo '127.0.0.1 localhost'>/etc/samba/lmhosts"); | ||
131 | |||
132 | if ((pipe2 = popen(lmhosts, "r")) == NULL) { | ||
133 | snprintf(result, 256, "Error: Can't run %s", lmhosts); | ||
134 | //TextViewOutput->append(result); | ||
135 | return; | ||
136 | } | ||
137 | |||
138 | /* run command & read output */ | ||
139 | if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | ||
140 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
141 | TextViewOutput->append(result); | ||
142 | return; | ||
143 | } | ||
144 | |||
145 | /* parse output and display in ListViewScan */ | ||
146 | while(fgets(result, 256, pipe) != NULL) { | ||
147 | /* put result into TextViewOutput */ | ||
148 | TextViewOutput->append(result); | ||
149 | |||
150 | if( strstr(result, match) != NULL ) { | ||
151 | char ip_addr[256], host[256], *ptr1; | ||
152 | |||
153 | strcpy( ip_addr, result); | ||
154 | ptr1 = strchr(ip_addr,' '); | ||
155 | strcpy( host, ptr1); | ||
156 | ip_addr[ptr1 - ip_addr]='\0'; | ||
157 | |||
158 | for(i = 0; i < 256; i++) { | ||
159 | if(host[i]!=' ') { | ||
160 | strcpy( host, host + i); | ||
161 | break; | ||
162 | } | ||
163 | } | ||
164 | ptr1 = strchr(host,' '); | ||
165 | host[ptr1 - host] = '\0'; | ||
166 | |||
167 | owarn << "add host: " << host << oendl; | ||
168 | |||
169 | CBHost->insertItem( host, -1); | ||
170 | snprintf( lmhosts, 512, "echo '%s %s'>>/etc/samba/lmhosts", ip_addr,host); | ||
171 | |||
172 | owarn << "lmhosts: " << lmhosts << oendl; | ||
173 | |||
174 | if ((pipe2 = popen(lmhosts, "r")) == NULL) { | ||
175 | snprintf(result, 256, "Error: Can't run %s", lmhosts); | ||
176 | return; | ||
177 | } | ||
178 | } | ||
179 | } | ||
180 | |||
181 | TextViewOutput->append("\n\n============================================\n"); | ||
182 | LScan->setText(""); | ||
183 | scanning = false; | ||
184 | } | ||
185 | |||
186 | void Qsmb::hostSelected(int index) | ||
187 | { | ||
188 | owarn << "hostSelected" << oendl; | ||
189 | int i; | ||
190 | |||
191 | QListViewItem *element; | ||
192 | QListViewItem *parent; | ||
193 | |||
194 | QString text = CBHost->currentText(); | ||
195 | |||
196 | if (scanning) return; | ||
197 | scanning = true; | ||
198 | |||
199 | QString cmd; | ||
200 | char result[256]; | ||
201 | |||
202 | FILE *pipe; | ||
203 | |||
204 | LScan->setText("Scanning..."); | ||
205 | |||
206 | if((const char *)username->text() == '\0') | ||
207 | cmd = "/usr/bin/smbclient -L //"+CBHost->currentText()+" -N 2>&1 |grep Disk"; | ||
208 | else | ||
209 | cmd = "/usr/bin/smbclient -L //"+CBHost->currentText()+" -N -U"+username->text()+":"+password->text()+" 2>&1 |grep Disk"; | ||
210 | |||
211 | for(i = 0; i < 512; i++) { | ||
212 | if(cmd[i]==':') { | ||
213 | cmd[i]='%'; | ||
214 | break; | ||
215 | } | ||
216 | if(cmd[i]=='\0') | ||
217 | break; | ||
218 | } | ||
219 | |||
220 | owarn << "i="<< index << "cmd:" << cmd << oendl; | ||
221 | |||
222 | TextViewOutput->append(cmd); | ||
223 | |||
224 | /* run smbclient & read output */ | ||
225 | if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | ||
226 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
227 | // cmd = "Error: Can't run "+cmd; | ||
228 | TextViewOutput->append(result); | ||
229 | return; | ||
230 | } | ||
231 | |||
232 | /* parse output and display in ListViewScan */ | ||
233 | while(fgets(result, 256, pipe) != NULL) { | ||
234 | /* put result into TextViewOutput */ | ||
235 | TextViewOutput->append(result); | ||
236 | |||
237 | if( strchr(result, '$') == NULL ) { | ||
238 | char share[256], *ptr1; | ||
239 | |||
240 | strcpy(share,result); | ||
241 | ptr1 = strchr(share,' '); | ||
242 | share[ptr1 - share]='\0'; | ||
243 | |||
244 | owarn<< "add share: " << share << oendl; | ||
245 | |||
246 | if(top_element != NULL) { | ||
247 | bool found = false; | ||
248 | element = top_element; | ||
249 | |||
250 | while(element != NULL && !found) { | ||
251 | if(strcmp( element->text(0).ascii(), share)==0) { | ||
252 | parent = element; | ||
253 | found = true; | ||
254 | } | ||
255 | element = element->nextSibling(); | ||
256 | } | ||
257 | |||
258 | if(!found) { | ||
259 | element = new QListViewItem(ListViewScan,share); | ||
260 | element->setOpen(true); | ||
261 | parent=element; | ||
262 | } | ||
263 | } else { | ||
264 | element = new QListViewItem(ListViewScan,share); | ||
265 | element->setOpen(true); | ||
266 | top_element = element; | ||
267 | parent = element; | ||
268 | } | ||
269 | } | ||
270 | } | ||
271 | |||
272 | TextViewOutput->append("\n\n============================================\n"); | ||
273 | LScan->setText(""); | ||
274 | scanning = false; | ||
275 | } | ||
276 | |||
277 | void Qsmb::DoIt() | ||
278 | { | ||
279 | QListViewItem *element; | ||
280 | element = ListViewScan->selectedItem(); | ||
281 | if(!element) { | ||
282 | QMessageBox::warning(this, tr("Error!!"),tr("<p><b>No</b> share selected!!</p>")); | ||
283 | return; | ||
284 | } | ||
285 | |||
286 | if (scanning) return; | ||
287 | scanning = true; | ||
288 | |||
289 | int i; | ||
290 | |||
291 | char share[512]; | ||
292 | QString cmd; | ||
293 | QString cmd2; | ||
294 | char result[256]; | ||
295 | // QString result; | ||
296 | QString text = mountpt->currentText(); | ||
297 | |||
298 | FILE *pipe,*pipe2; | ||
299 | |||
300 | LScan->setText("Mounting..."); | ||
301 | qApp->processEvents(); | ||
302 | |||
303 | cmd = "mkdir -p "+ text; | ||
304 | |||
305 | owarn<<"cmd: "<< cmd << oendl; | ||
306 | |||
307 | /* make sure mount exists! */ | ||
308 | if ((pipe2 = popen(cmd.latin1(), "r")) == NULL) { | ||
309 | |||
310 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
311 | // result = "Error: Can't run " + cmd; | ||
312 | TextViewOutput->append(result); | ||
313 | return; | ||
314 | } | ||
315 | |||
316 | while(fgets(result, 256, pipe2) != NULL) { | ||
317 | /* put result into TextViewOutput */ | ||
318 | TextViewOutput->append(result); | ||
319 | } | ||
320 | |||
321 | |||
322 | strcpy(share,(const char *)element->text(0)); | ||
323 | |||
324 | for(i = 0; i < 256; i++) { | ||
325 | if(isalpha( share[i])) { | ||
326 | strcpy( share, share + i); | ||
327 | break; | ||
328 | } | ||
329 | } | ||
330 | |||
331 | cmd = "/usr/bin/smbmount //"+CBHost->currentText()+"/"+share+" "+mountpt->currentText()+" -U"+username->text()+":"+password->text(); | ||
332 | |||
333 | for(i = 0; i < 512; i++) { | ||
334 | if(cmd[i]==':') { | ||
335 | cmd[i]='%'; | ||
336 | break; | ||
337 | } | ||
338 | if(cmd[i]=='\0') | ||
339 | break; | ||
340 | } | ||
341 | |||
342 | owarn << "cmd: " << cmd << oendl; | ||
343 | TextViewOutput->append(cmd.latin1()); | ||
344 | |||
345 | |||
346 | if(onbootBtn->isChecked()) { | ||
347 | owarn << "Saving Setting permanently..." << oendl; | ||
348 | cmd2 = "echo '" + cmd + "'>/opt/QtPalmtop/etc/samba.env"; | ||
349 | |||
350 | /* run command & read output */ | ||
351 | if ((pipe = popen(cmd2.latin1(), "r")) == NULL) { | ||
352 | |||
353 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
354 | // result = "Error: Can't run "+ cmd; | ||
355 | //TextViewOutput->append(result); | ||
356 | return; | ||
357 | } | ||
358 | /* parse output and display in ListViewScan */ | ||
359 | while(fgets(result, 256, pipe) != NULL) { | ||
360 | /* put result into TextViewOutput */ | ||
361 | //TextViewOutput->append(result); | ||
362 | } | ||
363 | } | ||
364 | |||
365 | /* run command & read output */ | ||
366 | if ((pipe = popen(cmd.latin1(), "r")) == NULL) { | ||
367 | |||
368 | // result = "Error: Can't run "+ cmd; | ||
369 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
370 | |||
371 | TextViewOutput->append(result); | ||
372 | return; | ||
373 | } | ||
374 | |||
375 | /* parse output and display in ListViewScan */ | ||
376 | while(fgets(result, 256, pipe) != NULL) { | ||
377 | /* put result into TextViewOutput */ | ||
378 | TextViewOutput->append(result); | ||
379 | } | ||
380 | TextViewOutput->append("\n\n================CheckMounts==================\n"); | ||
381 | LScan->setText(""); | ||
382 | |||
383 | cmd = "/bin/mount 2>&1"; | ||
384 | owarn << "cmd: " << cmd << oendl; | ||
385 | |||
386 | if ((pipe2 = popen(cmd.latin1(), "r")) == NULL) { | ||
387 | |||
388 | snprintf(result, 256, "Error: Can't run %s", cmd.latin1()); | ||
389 | // result = "Error: Can't run "+ cmd; | ||
390 | |||
391 | TextViewOutput->append(result); | ||
392 | return; | ||
393 | } | ||
394 | /* parse output and display in ListViewScan */ | ||
395 | while(fgets(result, 256, pipe2) != NULL) { | ||
396 | /* put result into TextViewOutput */ | ||
397 | TextViewOutput->append(result); | ||
398 | } | ||
399 | |||
400 | TextViewOutput->append("\n\n============================================\n"); | ||
401 | scanning = false; | ||
402 | } | ||
diff --git a/noncore/net/opie-smb/qsmb.h b/noncore/net/opie-smb/qsmb.h new file mode 100644 index 0000000..8fefe91 --- a/dev/null +++ b/noncore/net/opie-smb/qsmb.h | |||
@@ -0,0 +1,39 @@ | |||
1 | #ifndef QSMB_H | ||
2 | #define QSMB_H | ||
3 | |||
4 | #include "qsmbbase.h" | ||
5 | |||
6 | #include <stdlib.h> | ||
7 | #include <stdlib.h> | ||
8 | #include <stdio.h> | ||
9 | |||
10 | #include <qlistview.h> | ||
11 | #include <pthread.h> | ||
12 | |||
13 | class Qsmb : public FormQPESMBBase | ||
14 | { | ||
15 | Q_OBJECT | ||
16 | |||
17 | public: | ||
18 | static QString appName() { return QString::fromLatin1("opie-smb"); } | ||
19 | Qsmb( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | ||
20 | ~Qsmb(); | ||
21 | void scan(); | ||
22 | void DoIt(); | ||
23 | |||
24 | private: | ||
25 | QListViewItem *top_element; | ||
26 | QComboBox *hosts; | ||
27 | pthread_t tpid; | ||
28 | bool scanning; | ||
29 | |||
30 | public slots: | ||
31 | void clear(); | ||
32 | void scanClicked(); | ||
33 | void hostSelected(int); | ||
34 | void DoItClicked(); | ||
35 | }; | ||
36 | void* runit(void *arg); | ||
37 | void* runitm(void *arg); | ||
38 | |||
39 | #endif // QSMB_H | ||
diff --git a/noncore/net/opie-smb/qsmbbase.cpp b/noncore/net/opie-smb/qsmbbase.cpp new file mode 100644 index 0000000..21cd306 --- a/dev/null +++ b/noncore/net/opie-smb/qsmbbase.cpp | |||
@@ -0,0 +1,146 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form implementation generated from reading ui file 'qsmbbase.ui' | ||
3 | ** | ||
4 | ** Created: Thu Aug 11 19:30:44 2005 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #include "qsmbbase.h" | ||
10 | |||
11 | #include <qcheckbox.h> | ||
12 | #include <qcombobox.h> | ||
13 | #include <qheader.h> | ||
14 | #include <qlabel.h> | ||
15 | #include <qlineedit.h> | ||
16 | #include <qlistview.h> | ||
17 | #include <qpushbutton.h> | ||
18 | #include <qtabwidget.h> | ||
19 | #include <qtextview.h> | ||
20 | #include <qlayout.h> | ||
21 | #include <qvariant.h> | ||
22 | #include <qtooltip.h> | ||
23 | #include <qwhatsthis.h> | ||
24 | |||
25 | /* | ||
26 | * Constructs a FormQPESMBBase which is a child of 'parent', with the | ||
27 | * name 'name' and widget flags set to 'f' | ||
28 | */ | ||
29 | FormQPESMBBase::FormQPESMBBase( QWidget* parent, const char* name, WFlags fl ) | ||
30 | : QWidget( parent, name, fl ) | ||
31 | { | ||
32 | if ( !name ) | ||
33 | setName( "FormQPESMBBase" ); | ||
34 | resize( 254, 352 ); | ||
35 | QFont f( font() ); | ||
36 | setFont( f ); | ||
37 | setCaption( tr( "Opie Smb" ) ); | ||
38 | FormQPESMBBaseLayout = new QGridLayout( this ); | ||
39 | FormQPESMBBaseLayout->setSpacing( 2 ); | ||
40 | FormQPESMBBaseLayout->setMargin( 0 ); | ||
41 | |||
42 | TabWidget2 = new QTabWidget( this, "TabWidget2" ); | ||
43 | |||
44 | tab = new QWidget( TabWidget2, "tab" ); | ||
45 | tabLayout = new QGridLayout( tab ); | ||
46 | tabLayout->setSpacing( 0 ); | ||
47 | tabLayout->setMargin( 2 ); | ||
48 | |||
49 | CBHost = new QComboBox( FALSE, tab, "CBHost" ); | ||
50 | |||
51 | tabLayout->addMultiCellWidget( CBHost, 1, 1, 0, 3 ); | ||
52 | |||
53 | mountpt = new QComboBox( FALSE, tab, "mountpt" ); | ||
54 | |||
55 | tabLayout->addMultiCellWidget( mountpt, 4, 4, 1, 3 ); | ||
56 | |||
57 | LScan = new QLabel( tab, "LScan" ); | ||
58 | LScan->setText( tr( "" ) ); | ||
59 | |||
60 | tabLayout->addWidget( LScan, 0, 3 ); | ||
61 | |||
62 | textLabel1 = new QLabel( tab, "textLabel1" ); | ||
63 | textLabel1->setText( tr( "mount pt:" ) ); | ||
64 | |||
65 | tabLayout->addWidget( textLabel1, 4, 0 ); | ||
66 | |||
67 | ListViewScan = new QListView( tab, "ListViewScan" ); | ||
68 | ListViewScan->addColumn( tr( "Shares" ) ); | ||
69 | |||
70 | tabLayout->addMultiCellWidget( ListViewScan, 2, 2, 0, 3 ); | ||
71 | |||
72 | BtnScan = new QPushButton( tab, "BtnScan" ); | ||
73 | BtnScan->setText( tr( "&Scan" ) ); | ||
74 | |||
75 | tabLayout->addMultiCellWidget( BtnScan, 0, 0, 0, 1 ); | ||
76 | |||
77 | BtnClear = new QPushButton( tab, "BtnClear" ); | ||
78 | BtnClear->setText( tr( "&Clear" ) ); | ||
79 | |||
80 | tabLayout->addWidget( BtnClear, 0, 2 ); | ||
81 | |||
82 | onbootBtn = new QCheckBox( tab, "onbootBtn" ); | ||
83 | onbootBtn->setText( tr( "Reconnect on boot" ) ); | ||
84 | |||
85 | tabLayout->addMultiCellWidget( onbootBtn, 3, 3, 0, 2 ); | ||
86 | |||
87 | DoItBtn = new QPushButton( tab, "DoItBtn" ); | ||
88 | DoItBtn->setText( tr( "&Login" ) ); | ||
89 | |||
90 | tabLayout->addMultiCellWidget( DoItBtn, 5, 5, 0, 1 ); | ||
91 | |||
92 | Layout6 = new QGridLayout; | ||
93 | Layout6->setSpacing( 6 ); | ||
94 | Layout6->setMargin( 0 ); | ||
95 | |||
96 | Layout2 = new QHBoxLayout; | ||
97 | Layout2->setSpacing( 6 ); | ||
98 | Layout2->setMargin( 0 ); | ||
99 | |||
100 | pwdlabel = new QLabel( tab, "pwdlabel" ); | ||
101 | pwdlabel->setText( tr( "password" ) ); | ||
102 | Layout2->addWidget( pwdlabel ); | ||
103 | |||
104 | password = new QLineEdit( tab, "password" ); | ||
105 | Layout2->addWidget( password ); | ||
106 | |||
107 | Layout6->addLayout( Layout2, 1, 0 ); | ||
108 | |||
109 | Layout5 = new QHBoxLayout; | ||
110 | Layout5->setSpacing( 6 ); | ||
111 | Layout5->setMargin( 0 ); | ||
112 | |||
113 | usrlabel = new QLabel( tab, "usrlabel" ); | ||
114 | usrlabel->setText( tr( "username" ) ); | ||
115 | Layout5->addWidget( usrlabel ); | ||
116 | |||
117 | username = new QLineEdit( tab, "username" ); | ||
118 | Layout5->addWidget( username ); | ||
119 | |||
120 | Layout6->addLayout( Layout5, 0, 0 ); | ||
121 | |||
122 | tabLayout->addMultiCellLayout( Layout6, 5, 5, 2, 3 ); | ||
123 | TabWidget2->insertTab( tab, tr( "Scan" ) ); | ||
124 | |||
125 | tab_2 = new QWidget( TabWidget2, "tab_2" ); | ||
126 | tabLayout_2 = new QGridLayout( tab_2 ); | ||
127 | tabLayout_2->setSpacing( 6 ); | ||
128 | tabLayout_2->setMargin( 11 ); | ||
129 | |||
130 | TextViewOutput = new QTextView( tab_2, "TextViewOutput" ); | ||
131 | TextViewOutput->setTextFormat( QTextView::PlainText ); | ||
132 | |||
133 | tabLayout_2->addWidget( TextViewOutput, 0, 0 ); | ||
134 | TabWidget2->insertTab( tab_2, tr( "SMB Output" ) ); | ||
135 | |||
136 | FormQPESMBBaseLayout->addWidget( TabWidget2, 0, 0 ); | ||
137 | } | ||
138 | |||
139 | /* | ||
140 | * Destroys the object and frees any allocated resources | ||
141 | */ | ||
142 | FormQPESMBBase::~FormQPESMBBase() | ||
143 | { | ||
144 | // no need to delete child widgets, Qt does it all for us | ||
145 | } | ||
146 | |||
diff --git a/noncore/net/opie-smb/qsmbbase.h b/noncore/net/opie-smb/qsmbbase.h new file mode 100644 index 0000000..3ee2f57 --- a/dev/null +++ b/noncore/net/opie-smb/qsmbbase.h | |||
@@ -0,0 +1,62 @@ | |||
1 | /**************************************************************************** | ||
2 | ** Form interface generated from reading ui file 'qsmbbase.ui' | ||
3 | ** | ||
4 | ** Created: Thu Aug 11 19:30:41 2005 | ||
5 | ** by: The User Interface Compiler (uic) | ||
6 | ** | ||
7 | ** WARNING! All changes made in this file will be lost! | ||
8 | ****************************************************************************/ | ||
9 | #ifndef FORMQPESMBBASE_H | ||
10 | #define FORMQPESMBBASE_H | ||
11 | |||
12 | #include <qvariant.h> | ||
13 | #include <qwidget.h> | ||
14 | class QVBoxLayout; | ||
15 | class QHBoxLayout; | ||
16 | class QGridLayout; | ||
17 | class QCheckBox; | ||
18 | class QComboBox; | ||
19 | class QLabel; | ||
20 | class QLineEdit; | ||
21 | class QListView; | ||
22 | class QListViewItem; | ||
23 | class QPushButton; | ||
24 | class QTabWidget; | ||
25 | class QTextView; | ||
26 | |||
27 | class FormQPESMBBase : public QWidget | ||
28 | { | ||
29 | Q_OBJECT | ||
30 | |||
31 | public: | ||
32 | FormQPESMBBase( QWidget* parent = 0, const char* name = 0, WFlags fl = 0 ); | ||
33 | ~FormQPESMBBase(); | ||
34 | |||
35 | QTabWidget* TabWidget2; | ||
36 | QWidget* tab; | ||
37 | QComboBox* CBHost; | ||
38 | QComboBox* mountpt; | ||
39 | QLabel* LScan; | ||
40 | QLabel* textLabel1; | ||
41 | QListView* ListViewScan; | ||
42 | QPushButton* BtnScan; | ||
43 | QPushButton* BtnClear; | ||
44 | QCheckBox* onbootBtn; | ||
45 | QPushButton* DoItBtn; | ||
46 | QLabel* pwdlabel; | ||
47 | QLineEdit* password; | ||
48 | QLabel* usrlabel; | ||
49 | QLineEdit* username; | ||
50 | QWidget* tab_2; | ||
51 | QTextView* TextViewOutput; | ||
52 | |||
53 | protected: | ||
54 | QGridLayout* FormQPESMBBaseLayout; | ||
55 | QGridLayout* tabLayout; | ||
56 | QGridLayout* Layout6; | ||
57 | QHBoxLayout* Layout2; | ||
58 | QHBoxLayout* Layout5; | ||
59 | QGridLayout* tabLayout_2; | ||
60 | }; | ||
61 | |||
62 | #endif // FORMQPESMBBASE_H | ||
diff --git a/noncore/net/opie-smb/qsmbbase.ui b/noncore/net/opie-smb/qsmbbase.ui new file mode 100644 index 0000000..35a1aec --- a/dev/null +++ b/noncore/net/opie-smb/qsmbbase.ui | |||
@@ -0,0 +1,298 @@ | |||
1 | <!DOCTYPE UI><UI> | ||
2 | <class>FormQPESMBBase</class> | ||
3 | <widget> | ||
4 | <class>QWidget</class> | ||
5 | <property stdset="1"> | ||
6 | <name>name</name> | ||
7 | <cstring>FormQPESMBBase</cstring> | ||
8 | </property> | ||
9 | <property stdset="1"> | ||
10 | <name>geometry</name> | ||
11 | <rect> | ||
12 | <x>0</x> | ||
13 | <y>0</y> | ||
14 | <width>254</width> | ||
15 | <height>352</height> | ||
16 | </rect> | ||
17 | </property> | ||
18 | <property stdset="1"> | ||
19 | <name>font</name> | ||
20 | <font> | ||
21 | </font> | ||
22 | </property> | ||
23 | <property stdset="1"> | ||
24 | <name>caption</name> | ||
25 | <string>Opie Smb</string> | ||
26 | </property> | ||
27 | <property> | ||
28 | <name>layoutMargin</name> | ||
29 | </property> | ||
30 | <property> | ||
31 | <name>layoutSpacing</name> | ||
32 | </property> | ||
33 | <grid> | ||
34 | <property stdset="1"> | ||
35 | <name>margin</name> | ||
36 | <number>0</number> | ||
37 | </property> | ||
38 | <property stdset="1"> | ||
39 | <name>spacing</name> | ||
40 | <number>2</number> | ||
41 | </property> | ||
42 | <widget row="0" column="0" > | ||
43 | <class>QTabWidget</class> | ||
44 | <property stdset="1"> | ||
45 | <name>name</name> | ||
46 | <cstring>TabWidget2</cstring> | ||
47 | </property> | ||
48 | <property> | ||
49 | <name>layoutMargin</name> | ||
50 | </property> | ||
51 | <property> | ||
52 | <name>layoutSpacing</name> | ||
53 | </property> | ||
54 | <widget> | ||
55 | <class>QWidget</class> | ||
56 | <property stdset="1"> | ||
57 | <name>name</name> | ||
58 | <cstring>tab</cstring> | ||
59 | </property> | ||
60 | <attribute> | ||
61 | <name>title</name> | ||
62 | <string>Scan</string> | ||
63 | </attribute> | ||
64 | <grid> | ||
65 | <property stdset="1"> | ||
66 | <name>margin</name> | ||
67 | <number>2</number> | ||
68 | </property> | ||
69 | <property stdset="1"> | ||
70 | <name>spacing</name> | ||
71 | <number>0</number> | ||
72 | </property> | ||
73 | <widget row="1" column="0" rowspan="1" colspan="4" > | ||
74 | <class>QComboBox</class> | ||
75 | <property stdset="1"> | ||
76 | <name>name</name> | ||
77 | <cstring>CBHost</cstring> | ||
78 | </property> | ||
79 | </widget> | ||
80 | <widget row="4" column="1" rowspan="1" colspan="3" > | ||
81 | <class>QComboBox</class> | ||
82 | <property stdset="1"> | ||
83 | <name>name</name> | ||
84 | <cstring>mountpt</cstring> | ||
85 | </property> | ||
86 | </widget> | ||
87 | <widget row="0" column="3" > | ||
88 | <class>QLabel</class> | ||
89 | <property stdset="1"> | ||
90 | <name>name</name> | ||
91 | <cstring>LScan</cstring> | ||
92 | </property> | ||
93 | <property stdset="1"> | ||
94 | <name>text</name> | ||
95 | <string></string> | ||
96 | </property> | ||
97 | </widget> | ||
98 | <widget row="4" column="0" > | ||
99 | <class>QLabel</class> | ||
100 | <property stdset="1"> | ||
101 | <name>name</name> | ||
102 | <cstring>textLabel1</cstring> | ||
103 | </property> | ||
104 | <property stdset="1"> | ||
105 | <name>text</name> | ||
106 | <string>mount pt:</string> | ||
107 | </property> | ||
108 | </widget> | ||
109 | <widget row="2" column="0" rowspan="1" colspan="4" > | ||
110 | <class>QListView</class> | ||
111 | <column> | ||
112 | <property> | ||
113 | <name>text</name> | ||
114 | <string>Shares</string> | ||
115 | </property> | ||
116 | <property> | ||
117 | <name>clickable</name> | ||
118 | <bool>true</bool> | ||
119 | </property> | ||
120 | <property> | ||
121 | <name>resizeable</name> | ||
122 | <bool>true</bool> | ||
123 | </property> | ||
124 | </column> | ||
125 | <property stdset="1"> | ||
126 | <name>name</name> | ||
127 | <cstring>ListViewScan</cstring> | ||
128 | </property> | ||
129 | </widget> | ||
130 | <widget row="0" column="0" rowspan="1" colspan="2" > | ||
131 | <class>QPushButton</class> | ||
132 | <property stdset="1"> | ||
133 | <name>name</name> | ||
134 | <cstring>BtnScan</cstring> | ||
135 | </property> | ||
136 | <property stdset="1"> | ||
137 | <name>text</name> | ||
138 | <string>&Scan</string> | ||
139 | </property> | ||
140 | </widget> | ||
141 | <widget row="0" column="2" > | ||
142 | <class>QPushButton</class> | ||
143 | <property stdset="1"> | ||
144 | <name>name</name> | ||
145 | <cstring>BtnClear</cstring> | ||
146 | </property> | ||
147 | <property stdset="1"> | ||
148 | <name>text</name> | ||
149 | <string>&Clear</string> | ||
150 | </property> | ||
151 | </widget> | ||
152 | <widget row="3" column="0" rowspan="1" colspan="3" > | ||
153 | <class>QCheckBox</class> | ||
154 | <property stdset="1"> | ||
155 | <name>name</name> | ||
156 | <cstring>onbootBtn</cstring> | ||
157 | </property> | ||
158 | <property stdset="1"> | ||
159 | <name>text</name> | ||
160 | <string>Reconnect on boot</string> | ||
161 | </property> | ||
162 | </widget> | ||
163 | <widget row="5" column="0" rowspan="1" colspan="2" > | ||
164 | <class>QPushButton</class> | ||
165 | <property stdset="1"> | ||
166 | <name>name</name> | ||
167 | <cstring>DoItBtn</cstring> | ||
168 | </property> | ||
169 | <property stdset="1"> | ||
170 | <name>text</name> | ||
171 | <string>&Login</string> | ||
172 | </property> | ||
173 | </widget> | ||
174 | <widget row="5" column="2" rowspan="1" colspan="2" > | ||
175 | <class>QLayoutWidget</class> | ||
176 | <property stdset="1"> | ||
177 | <name>name</name> | ||
178 | <cstring>Layout6</cstring> | ||
179 | </property> | ||
180 | <grid> | ||
181 | <property stdset="1"> | ||
182 | <name>margin</name> | ||
183 | <number>0</number> | ||
184 | </property> | ||
185 | <property stdset="1"> | ||
186 | <name>spacing</name> | ||
187 | <number>6</number> | ||
188 | </property> | ||
189 | <widget row="1" column="0" > | ||
190 | <class>QLayoutWidget</class> | ||
191 | <property stdset="1"> | ||
192 | <name>name</name> | ||
193 | <cstring>Layout2</cstring> | ||
194 | </property> | ||
195 | <hbox> | ||
196 | <property stdset="1"> | ||
197 | <name>margin</name> | ||
198 | <number>0</number> | ||
199 | </property> | ||
200 | <property stdset="1"> | ||
201 | <name>spacing</name> | ||
202 | <number>6</number> | ||
203 | </property> | ||
204 | <widget> | ||
205 | <class>QLabel</class> | ||
206 | <property stdset="1"> | ||
207 | <name>name</name> | ||
208 | <cstring>pwdlabel</cstring> | ||
209 | </property> | ||
210 | <property stdset="1"> | ||
211 | <name>text</name> | ||
212 | <string>password</string> | ||
213 | </property> | ||
214 | </widget> | ||
215 | <widget> | ||
216 | <class>QLineEdit</class> | ||
217 | <property stdset="1"> | ||
218 | <name>name</name> | ||
219 | <cstring>password</cstring> | ||
220 | </property> | ||
221 | </widget> | ||
222 | </hbox> | ||
223 | </widget> | ||
224 | <widget row="0" column="0" > | ||
225 | <class>QLayoutWidget</class> | ||
226 | <property stdset="1"> | ||
227 | <name>name</name> | ||
228 | <cstring>Layout5</cstring> | ||
229 | </property> | ||
230 | <hbox> | ||
231 | <property stdset="1"> | ||
232 | <name>margin</name> | ||
233 | <number>0</number> | ||
234 | </property> | ||
235 | <property stdset="1"> | ||
236 | <name>spacing</name> | ||
237 | <number>6</number> | ||
238 | </property> | ||
239 | <widget> | ||
240 | <class>QLabel</class> | ||
241 | <property stdset="1"> | ||
242 | <name>name</name> | ||
243 | <cstring>usrlabel</cstring> | ||
244 | </property> | ||
245 | <property stdset="1"> | ||
246 | <name>text</name> | ||
247 | <string>username</string> | ||
248 | </property> | ||
249 | </widget> | ||
250 | <widget> | ||
251 | <class>QLineEdit</class> | ||
252 | <property stdset="1"> | ||
253 | <name>name</name> | ||
254 | <cstring>username</cstring> | ||
255 | </property> | ||
256 | </widget> | ||
257 | </hbox> | ||
258 | </widget> | ||
259 | </grid> | ||
260 | </widget> | ||
261 | </grid> | ||
262 | </widget> | ||
263 | <widget> | ||
264 | <class>QWidget</class> | ||
265 | <property stdset="1"> | ||
266 | <name>name</name> | ||
267 | <cstring>tab</cstring> | ||
268 | </property> | ||
269 | <attribute> | ||
270 | <name>title</name> | ||
271 | <string>SMB Output</string> | ||
272 | </attribute> | ||
273 | <grid> | ||
274 | <property stdset="1"> | ||
275 | <name>margin</name> | ||
276 | <number>11</number> | ||
277 | </property> | ||
278 | <property stdset="1"> | ||
279 | <name>spacing</name> | ||
280 | <number>6</number> | ||
281 | </property> | ||
282 | <widget row="0" column="0" > | ||
283 | <class>QTextView</class> | ||
284 | <property stdset="1"> | ||
285 | <name>name</name> | ||
286 | <cstring>TextViewOutput</cstring> | ||
287 | </property> | ||
288 | <property stdset="1"> | ||
289 | <name>textFormat</name> | ||
290 | <enum>PlainText</enum> | ||
291 | </property> | ||
292 | </widget> | ||
293 | </grid> | ||
294 | </widget> | ||
295 | </widget> | ||
296 | </grid> | ||
297 | </widget> | ||
298 | </UI> | ||
diff --git a/noncore/settings/netsystemtime/formattabwidget.cpp b/noncore/settings/netsystemtime/formattabwidget.cpp index 7d01bff..a037881 100644 --- a/noncore/settings/netsystemtime/formattabwidget.cpp +++ b/noncore/settings/netsystemtime/formattabwidget.cpp | |||
diff --git a/noncore/tools/calc2/binary/binary.pro b/noncore/tools/calc2/binary/binary.pro index 1348d00..9cbb0ff 100644 --- a/noncore/tools/calc2/binary/binary.pro +++ b/noncore/tools/calc2/binary/binary.pro | |||
@@ -1,17 +1,15 @@ | |||
1 | #TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | 2 | CONFIG += qt |
3 | #CONFIG += qt | 3 | INTERFACES += binary.ui |
4 | ## Input | 4 | HEADERS = binaryimpl.h \ |
5 | #INTERFACES += binary.ui | 5 | binaryfactory.h |
6 | #HEADERS = binaryimpl.h \ | 6 | SOURCES = binaryimpl.cpp \ |
7 | # binaryfactory.h | 7 | binaryfactory.cpp |
8 | #SOURCES = binaryimpl.cpp \ | 8 | INCLUDEPATH += $(OPIEDIR)/include \ |
9 | # binaryfactory.cpp | 9 | $(OPIEDIR)/calc2 |
10 | #INCLUDEPATH += $(OPIEDIR)/include \ | 10 | DEPENDPATH += $(OPIEDIR)/include |
11 | # $(OPIEDIR)/calc2 | 11 | DESTDIR = $(OPIEDIR)/plugins/calculator |
12 | #DEPENDPATH += $(OPIEDIR)/include | 12 | TARGET = binary |
13 | #DESTDIR = $(OPIEDIR)/plugins/calculator | 13 | |
14 | #TARGET = binary | ||
15 | # | ||
16 | 14 | ||
17 | include( $(OPIEDIR)/include.pro ) | 15 | include( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/calc2/binary/binaryfactory.cpp b/noncore/tools/calc2/binary/binaryfactory.cpp index 110334f..bccc9ca 100644 --- a/noncore/tools/calc2/binary/binaryfactory.cpp +++ b/noncore/tools/calc2/binary/binaryfactory.cpp | |||
@@ -21,9 +21,9 @@ | |||
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #include "binaryfactory.h" | 23 | #include "binaryfactory.h" |
24 | #include "binaryimpl.h" | 24 | #include "binaryimpl.h" |
25 | #include <engine.h> | 25 | #include "../engine.h" |
26 | 26 | ||
27 | QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { | 27 | QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { |
28 | if ( !input ) | 28 | if ( !input ) |
29 | input = new FormBinaryImpl ( e, parent ); | 29 | input = new FormBinaryImpl ( e, parent ); |
diff --git a/noncore/tools/calc2/binary/binaryfactory.h b/noncore/tools/calc2/binary/binaryfactory.h index e015384..237a926 100644 --- a/noncore/tools/calc2/binary/binaryfactory.h +++ b/noncore/tools/calc2/binary/binaryfactory.h | |||
@@ -21,10 +21,10 @@ | |||
21 | #ifndef BINARYIMPL_H | 21 | #ifndef BINARYIMPL_H |
22 | #define BINARYIMPL_H | 22 | #define BINARYIMPL_H |
23 | 23 | ||
24 | #include "binaryimpl.h" | 24 | #include "binaryimpl.h" |
25 | #include <plugininterface.h> | 25 | #include "../plugininterface.h" |
26 | #include <engine.h> | 26 | #include "../engine.h" |
27 | 27 | ||
28 | class BinaryInterface : public CalcInterface | 28 | class BinaryInterface : public CalcInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
diff --git a/noncore/tools/calc2/binary/binaryimpl.cpp b/noncore/tools/calc2/binary/binaryimpl.cpp index ffc56ad..ecbf232 100644 --- a/noncore/tools/calc2/binary/binaryimpl.cpp +++ b/noncore/tools/calc2/binary/binaryimpl.cpp | |||
@@ -18,9 +18,9 @@ | |||
18 | ** | 18 | ** |
19 | **********************************************************************/ | 19 | **********************************************************************/ |
20 | 20 | ||
21 | #include "binaryimpl.h" | 21 | #include "binaryimpl.h" |
22 | #include <instruction.h> | 22 | #include "../instruction.h" |
23 | 23 | ||
24 | class iXOR : public Instruction { | 24 | class iXOR : public Instruction { |
25 | public: | 25 | public: |
26 | iXOR():Instruction(){}; | 26 | iXOR():Instruction(){}; |
diff --git a/noncore/tools/calc2/binary/binaryimpl.h b/noncore/tools/calc2/binary/binaryimpl.h index bf9e3a7..7bf123a 100644 --- a/noncore/tools/calc2/binary/binaryimpl.h +++ b/noncore/tools/calc2/binary/binaryimpl.h | |||
@@ -20,9 +20,9 @@ | |||
20 | #ifndef FORMBINARYINPUTIMPL | 20 | #ifndef FORMBINARYINPUTIMPL |
21 | #define FORMBINARYINPUTIMPL | 21 | #define FORMBINARYINPUTIMPL |
22 | 22 | ||
23 | #include "binary.h" | 23 | #include "binary.h" |
24 | #include <engine.h> | 24 | #include "../engine.h" |
25 | 25 | ||
26 | class FormBinaryImpl : public FormBinary { | 26 | class FormBinaryImpl : public FormBinary { |
27 | Q_OBJECT | 27 | Q_OBJECT |
28 | public: | 28 | public: |
diff --git a/noncore/tools/calc2/calc.cpp b/noncore/tools/calc2/calc.cpp index c7656bf..8c50c2c 100644 --- a/noncore/tools/calc2/calc.cpp +++ b/noncore/tools/calc2/calc.cpp | |||
@@ -67,9 +67,8 @@ LCD->setSegmentStyle(QLCDNumber::Filled); | |||
67 | QStringList::Iterator it; | 67 | QStringList::Iterator it; |
68 | for (it = list.begin (); it != list.end (); ++it) { | 68 | for (it = list.begin (); it != list.end (); ++it) { |
69 | CalcInterface *iface = 0; | 69 | CalcInterface *iface = 0; |
70 | QLibrary *lib = new QLibrary (path + "/" + *it); | 70 | QLibrary *lib = new QLibrary (path + "/" + *it); |
71 | |||
72 | Plugin plugin; | 71 | Plugin plugin; |
73 | plugin.pluginWidget = 0; | 72 | plugin.pluginWidget = 0; |
74 | 73 | ||
75 | if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) == | 74 | if (lib->queryInterface (IID_Calc, (QUnknownInterface **) & iface) == |
diff --git a/noncore/tools/calc2/simple/simple.pro b/noncore/tools/calc2/simple/simple.pro index 2312f99..dde5e7d 100644 --- a/noncore/tools/calc2/simple/simple.pro +++ b/noncore/tools/calc2/simple/simple.pro | |||
@@ -1,14 +1,12 @@ | |||
1 | #TEMPLATE = lib | 1 | TEMPLATE = lib |
2 | #CONFIG -= moc | 2 | CONFIG += qt |
3 | #CONFIG += qt | 3 | INTERFACES += simple.ui |
4 | ## Input | 4 | HEADERS = simpleimpl.h simplefactory.h stdinstructions.h |
5 | #INTERFACES += simple.ui | 5 | SOURCES = simpleimpl.cpp simplefactory.cpp |
6 | #HEADERS = simpleimpl.h simplefactory.h stdinstructions.h | 6 | INCLUDEPATH += $(OPIEDIR)/include \ |
7 | #SOURCES = simpleimpl.cpp simplefactory.cpp | 7 | $(OPIEDIR)/calc2 |
8 | #INCLUDEPATH += $(OPIEDIR)/include \ | 8 | DEPENDPATH += $(OPIEDIR)/include |
9 | # $(OPIEDIR)/calc2 | 9 | DESTDIR = $(OPIEDIR)/plugins/calculator |
10 | #DEPENDPATH += $(OPIEDIR)/include | 10 | |
11 | #DESTDIR = $(OPIEDIR)/plugins/calculator | ||
12 | # | ||
13 | 11 | ||
14 | include( $(OPIEDIR)/include.pro ) | 12 | include( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/calc2/simple/simplefactory.cpp b/noncore/tools/calc2/simple/simplefactory.cpp index 515418f..52b090b 100644 --- a/noncore/tools/calc2/simple/simplefactory.cpp +++ b/noncore/tools/calc2/simple/simplefactory.cpp | |||
@@ -21,9 +21,9 @@ | |||
21 | **********************************************************************/ | 21 | **********************************************************************/ |
22 | 22 | ||
23 | #include "simplefactory.h" | 23 | #include "simplefactory.h" |
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <engine.h> | 25 | #include "../engine.h" |
26 | 26 | ||
27 | QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { | 27 | QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { |
28 | if ( !input ) | 28 | if ( !input ) |
29 | input = new FormSimpleImpl ( e, parent ); | 29 | input = new FormSimpleImpl ( e, parent ); |
diff --git a/noncore/tools/calc2/simple/simplefactory.h b/noncore/tools/calc2/simple/simplefactory.h index e1022fd..460c2b9 100644 --- a/noncore/tools/calc2/simple/simplefactory.h +++ b/noncore/tools/calc2/simple/simplefactory.h | |||
@@ -21,10 +21,10 @@ | |||
21 | #ifndef BINARYIMPL_H | 21 | #ifndef BINARYIMPL_H |
22 | #define BINARYIMPL_H | 22 | #define BINARYIMPL_H |
23 | 23 | ||
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <plugininterface.h> | 25 | #include "../plugininterface.h" |
26 | #include <engine.h> | 26 | #include "../engine.h" |
27 | 27 | ||
28 | class SimpleInterface : public CalcInterface | 28 | class SimpleInterface : public CalcInterface |
29 | { | 29 | { |
30 | public: | 30 | public: |
diff --git a/noncore/tools/calc2/simple/simpleimpl.cpp b/noncore/tools/calc2/simple/simpleimpl.cpp index f71f000..447cbdf 100644 --- a/noncore/tools/calc2/simple/simpleimpl.cpp +++ b/noncore/tools/calc2/simple/simpleimpl.cpp | |||
@@ -21,9 +21,9 @@ | |||
21 | #include <qpushbutton.h> | 21 | #include <qpushbutton.h> |
22 | #include <qlcdnumber.h> | 22 | #include <qlcdnumber.h> |
23 | 23 | ||
24 | #include "simpleimpl.h" | 24 | #include "simpleimpl.h" |
25 | #include <stdinstructions.h> | 25 | #include "../stdinstructions.h" |
26 | 26 | ||
27 | void FormSimpleImpl::CEClicked() { | 27 | void FormSimpleImpl::CEClicked() { |
28 | engine->hardReset(); | 28 | engine->hardReset(); |
29 | } | 29 | } |
diff --git a/noncore/tools/calc2/simple/simpleimpl.h b/noncore/tools/calc2/simple/simpleimpl.h index a2db154..b7b83e2 100644 --- a/noncore/tools/calc2/simple/simpleimpl.h +++ b/noncore/tools/calc2/simple/simpleimpl.h | |||
@@ -24,10 +24,10 @@ | |||
24 | #include <qpe/qmath.h> | 24 | #include <qpe/qmath.h> |
25 | #include <qlcdnumber.h> | 25 | #include <qlcdnumber.h> |
26 | 26 | ||
27 | #include "simple.h" | 27 | #include "simple.h" |
28 | #include "engine.h" | 28 | #include "../engine.h" |
29 | #include "instruction.h" | 29 | #include "../instruction.h" |
30 | 30 | ||
31 | class FormSimpleImpl:public FormSimple { | 31 | class FormSimpleImpl:public FormSimple { |
32 | Q_OBJECT | 32 | Q_OBJECT |
33 | public: | 33 | public: |
@@ -16,9 +16,11 @@ CONFIG_BLUE-PIN noncore/net/opietooth/blue-pin blue-pin.pro | |||
16 | CONFIG_BOUNCE noncore/games/bouncebounce.pro | 16 | CONFIG_BOUNCE noncore/games/bouncebounce.pro |
17 | CONFIG_BRIGHTNESSAPPLET noncore/applets/brightnessappletbrightnessapplet.pro | 17 | CONFIG_BRIGHTNESSAPPLET noncore/applets/brightnessappletbrightnessapplet.pro |
18 | CONFIG_BUTTON-SETTINGS core/settings/buttonbutton.pro | 18 | CONFIG_BUTTON-SETTINGS core/settings/buttonbutton.pro |
19 | CONFIG_BUZZWORD noncore/games/buzzwordbuzzword.pro | 19 | CONFIG_BUZZWORD noncore/games/buzzwordbuzzword.pro |
20 | CONFIG_CALC2 noncore/tools/calc2calc.pro | 20 | CONFIG_CALC2 noncore/tools/calc2calc2.pro |
21 | CONFIG_CALC2-BINARY noncore/tools/calc2/binarybinary.pro | ||
22 | CONFIG_CALC2-SIMPLE noncore/tools/calc2/simplesimple.pro | ||
21 | CONFIG_CALCULATOR noncore/tools/calculatorcalculator.pro | 23 | CONFIG_CALCULATOR noncore/tools/calculatorcalculator.pro |
22 | CONFIG_CALIBRATE core/apps/calibratecalibrate.pro | 24 | CONFIG_CALIBRATE core/apps/calibratecalibrate.pro |
23 | CONFIG_CAMERA noncore/multimedia/cameracamera.pro | 25 | CONFIG_CAMERA noncore/multimedia/cameracamera.pro |
24 | CONFIG_CARDMON core/applets/cardmoncardmon.pro | 26 | CONFIG_CARDMON core/applets/cardmoncardmon.pro |
@@ -169,8 +171,9 @@ CONFIG_OPIE-RDESKTOP noncore/net/opierdesktop opierdesktop.pro | |||
169 | CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro | 171 | CONFIG_OPIE-READER noncore/apps/opie-readeropie-reader.pro |
170 | CONFIG_OPIE-READER-FLITEDYN noncore/apps/opie-reader/FliteDynFliteDyn.pro | 172 | CONFIG_OPIE-READER-FLITEDYN noncore/apps/opie-reader/FliteDynFliteDyn.pro |
171 | CONFIG_OPIE-READER-FLITEDYN16 noncore/apps/opie-reader/FliteDyn16FliteDyn16.pro | 173 | CONFIG_OPIE-READER-FLITEDYN16 noncore/apps/opie-reader/FliteDyn16FliteDyn16.pro |
172 | CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro | 174 | CONFIG_OPIEREC noncore/multimedia/opierecopierec.pro |
175 | CONFIG_OPIESMB noncore/net/opie-smbopie-smb.pro | ||
173 | CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro | 176 | CONFIG_OPIE-SHEET noncore/apps/opie-sheetopie-sheet.pro |
174 | CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro | 177 | CONFIG_OPIE-SH noncore/tools/opie-shopie-sh.pro |
175 | CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro | 178 | CONFIG_OPIETOOTH-APPLET noncore/net/opietooth/appletapplet.pro |
176 | CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro | 179 | CONFIG_OPIETOOTH-MANAGER noncore/net/opietooth/managermanager.pro |
diff --git a/pics/opie-smb/opie-smb.png b/pics/opie-smb/opie-smb.png new file mode 100644 index 0000000..0cf5d67 --- a/dev/null +++ b/pics/opie-smb/opie-smb.png | |||
Binary files differ | |||