summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--apps/Applications/opie-smb.desktop6
-rw-r--r--core/applets/vmemo/vmemo.h8
-rw-r--r--core/apps/textedit/textedit.cpp58
-rw-r--r--core/pim/datebook/dateentry.ui1230
-rw-r--r--inputmethods/dasher/opie-dasher-english.control2
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.cpp58
-rw-r--r--noncore/applets/volumeapplet2/volumeapplet.h15
-rw-r--r--noncore/apps/advancedfm/advancedfmData.cpp7
-rw-r--r--noncore/apps/advancedfm/advancedfmMenu.cpp38
-rw-r--r--noncore/net/opie-smb/config.in4
-rw-r--r--noncore/net/opie-smb/main.cpp6
-rw-r--r--noncore/net/opie-smb/opie-smb.control12
-rw-r--r--noncore/net/opie-smb/opie-smb.pro18
-rw-r--r--noncore/net/opie-smb/qsmb.cpp402
-rw-r--r--noncore/net/opie-smb/qsmb.h39
-rw-r--r--noncore/net/opie-smb/qsmbbase.cpp146
-rw-r--r--noncore/net/opie-smb/qsmbbase.h62
-rw-r--r--noncore/net/opie-smb/qsmbbase.ui298
-rw-r--r--noncore/settings/netsystemtime/formattabwidget.cpp4
-rw-r--r--noncore/tools/calc2/binary/binary.pro28
-rw-r--r--noncore/tools/calc2/binary/binaryfactory.cpp2
-rw-r--r--noncore/tools/calc2/binary/binaryfactory.h4
-rw-r--r--noncore/tools/calc2/binary/binaryimpl.cpp2
-rw-r--r--noncore/tools/calc2/binary/binaryimpl.h2
-rw-r--r--noncore/tools/calc2/calc.cpp1
-rw-r--r--noncore/tools/calc2/simple/simple.pro22
-rw-r--r--noncore/tools/calc2/simple/simplefactory.cpp2
-rw-r--r--noncore/tools/calc2/simple/simplefactory.h4
-rw-r--r--noncore/tools/calc2/simple/simpleimpl.cpp2
-rw-r--r--noncore/tools/calc2/simple/simpleimpl.h4
-rw-r--r--packages5
-rw-r--r--pics/opie-smb/opie-smb.pngbin0 -> 1833 bytes
32 files changed, 1903 insertions, 588 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]
2Comment=Samba Client Utility
3Exec=opie-smb
4Icon=opie-smb/opie-smb
5Type=Application
6Name=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
@@ -26,31 +26,37 @@
26#include <qlabel.h> 26#include <qlabel.h>
27#include <qtimer.h> 27#include <qtimer.h>
28 28
29class VMemo : public QWidget 29class VMemo : public QWidget
30{ 30{
31 Q_OBJECT 31 Q_OBJECT
32
32public: 33public:
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;
37 int length; 39 int length;
38 QString fileName, errorMsg, date; 40 QString fileName, errorMsg, date;
39 QLabel* msgLabel; 41 QLabel* msgLabel;
40 QTimer *t_timer; 42 QTimer *t_timer;
41bool usingIcon, useADPCM; 43 bool usingIcon, useADPCM;
44
42public slots: 45public 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
50private: 55private:
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();
55 int openWAV(const char *filename); 61 int openWAV(const char *filename);
56 bool fromToggle; 62 bool fromToggle;
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
@@ -904,53 +904,53 @@ bool TextEdit::saveAs() {
904 QString filee = cuFi.fileName(); 904 QString filee = cuFi.fileName();
905 QString dire = cuFi.dirPath(); 905 QString dire = cuFi.dirPath();
906 if(dire==".") 906 if(dire==".")
907 dire = QPEApplication::documentDir(); 907 dire = QPEApplication::documentDir();
908 QString str; 908 QString str;
909 if( !featureAutoSave) { 909 if( !featureAutoSave) {
910 str = OFileDialog::getSaveFileName( 2, 910 str = OFileDialog::getSaveFileName( 2,
911 dire, 911 dire,
912 filee, map); 912 filee, map);
913 } else 913 } else
914 str=currentFileName; 914 str = currentFileName;
915 915
916 if(!str.isEmpty()) { 916 if(!str.isEmpty()) {
917 QString fileNm=str; 917 QString fileNm=str;
918 918
919 odebug << "saving filename "+fileNm << oendl; 919 odebug << "saving filename "+fileNm << oendl;
920 QFileInfo fi(fileNm); 920 QFileInfo fi(fileNm);
921 currentFileName=fi.fileName(); 921 currentFileName=fi.fileName();
922 if(doc) 922 if(doc)
923// QString file = doc->file(); 923// QString file = doc->file();
924// doc->removeFiles(); 924// doc->removeFiles();
925 delete doc; 925 delete doc;
926 DocLnk nf; 926 DocLnk nf;
927 nf.setType("text/plain"); 927 nf.setType("text/plain");
928 nf.setFile( fileNm); 928 nf.setFile( fileNm);
929 doc = new DocLnk(nf); 929 doc = new DocLnk(nf);
930// editor->setText(rt); 930// editor->setText(rt);
931 odebug << "Saving file as "+currentFileName << oendl; 931 odebug << "Saving file as "+currentFileName << oendl;
932 doc->setName( fi.baseName() /*currentFileName*/); 932 doc->setName( fi.baseName() /*currentFileName*/);
933 updateCaption( currentFileName); 933 updateCaption( currentFileName);
934 934
935 FileManager fm; 935 FileManager fm;
936 if ( !fm.saveFile( *doc, rt ) ) { 936 if ( !fm.saveFile( *doc, rt ) ) {
937 QMessageBox::message(tr("Text Edit"),tr("Save Failed")); 937 QMessageBox::message(tr("Text Edit"),tr("Save Failed"));
938 return false; 938 return false;
939 } 939 }
940 940
941 if( filePerms ) { 941 if( filePerms ) {
942 filePermissions *filePerm; 942 filePermissions *filePerm;
943 filePerm = new filePermissions(this, 943 filePerm = new filePermissions(this,
944 tr("Permissions"),true, 944 tr("Permissions"),true,
945 0,(const QString &)fileNm); 945 0,(const QString &)fileNm);
946 QPEApplication::execDialog( filePerm ); 946 QPEApplication::execDialog( filePerm );
947 947
948 if( filePerm) 948 if( filePerm)
949 delete filePerm; 949 delete filePerm;
950 } 950 }
951// } 951// }
952 editor->setEdited( false); 952 editor->setEdited( false);
953 edited1 = false; 953 edited1 = false;
954 edited = false; 954 edited = false;
955 if(caption().left(1)=="*") 955 if(caption().left(1)=="*")
956 setCaption(caption().right(caption().length()-1)); 956 setCaption(caption().right(caption().length()-1));
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
@@ -29,521 +29,767 @@
29 </property> 29 </property>
30 <property stdset="1"> 30 <property stdset="1">
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" >
53 <class>QLabel</class>
54 <property stdset="1">
55 <name>name</name>
56 <cstring>TextLabel2</cstring>
57 </property>
58 <property stdset="1">
59 <name>frameShape</name>
60 <enum>MShape</enum>
61 </property>
62 <property stdset="1">
63 <name>frameShadow</name>
64 <enum>MShadow</enum>
65 </property>
66 <property stdset="1">
67 <name>text</name>
68 <string>Location</string>
69 </property>
70 </widget>
71 <widget row="2" column="0" >
72 <class>QLabel</class>
73 <property stdset="1">
74 <name>name</name>
75 <cstring>TextLabel2_2</cstring>
76 </property>
77 <property stdset="1">
78 <name>text</name>
79 <string>Category</string>
80 </property>
81 <property>
82 <name>buddy</name>
83 <cstring>comboPriority</cstring>
84 </property>
85 </widget>
86 <widget row="0" column="1" rowspan="1" colspan="3" >
87 <class>QComboBox</class>
88 <item>
89 <property>
90 <name>text</name>
91 <string></string>
92 </property>
93 </item>
94 <item>
95 <property>
96 <name>text</name>
97 <string>Meeting</string>
98 </property>
99 </item>
100 <item>
101 <property>
102 <name>text</name>
103 <string>Lunch</string>
104 </property>
105 </item>
106 <item>
107 <property>
108 <name>text</name>
109 <string>Dinner</string>
110 </property>
111 </item>
112 <item>
113 <property>
114 <name>text</name>
115 <string>Travel</string>
116 </property>
117 </item>
118 <property stdset="1">
119 <name>name</name>
120 <cstring>comboDescription</cstring>
121 </property>
122 <property stdset="1">
123 <name>sizePolicy</name>
124 <sizepolicy>
125 <hsizetype>3</hsizetype>
126 <vsizetype>0</vsizetype>
127 </sizepolicy>
128 </property>
129 <property stdset="1">
130 <name>editable</name>
131 <bool>true</bool>
132 </property>
133 <property stdset="1">
134 <name>currentItem</name>
135 <number>0</number>
136 </property>
137 <property stdset="1">
138 <name>duplicatesEnabled</name>
139 <bool>false</bool>
140 </property>
141 </widget>
142 <widget row="0" column="0" > 58 <widget row="0" column="0" >
143 <class>QLabel</class> 59 <class>QLayoutWidget</class>
144 <property stdset="1">
145 <name>name</name>
146 <cstring>TextLabel1</cstring>
147 </property>
148 <property stdset="1">
149 <name>text</name>
150 <string>Description </string>
151 </property>
152 </widget>
153 <widget row="1" column="1" rowspan="1" colspan="3" >
154 <class>QComboBox</class>
155 <item>
156 <property>
157 <name>text</name>
158 <string></string>
159 </property>
160 </item>
161 <item>
162 <property>
163 <name>text</name>
164 <string>Office</string>
165 </property>
166 </item>
167 <item>
168 <property>
169 <name>text</name>
170 <string>Home</string>
171 </property>
172 </item>
173 <property stdset="1">
174 <name>name</name>
175 <cstring>comboLocation</cstring>
176 </property>
177 <property stdset="1">
178 <name>sizePolicy</name>
179 <sizepolicy>
180 <hsizetype>3</hsizetype>
181 <vsizetype>0</vsizetype>
182 </sizepolicy>
183 </property>
184 <property stdset="1">
185 <name>editable</name>
186 <bool>true</bool>
187 </property>
188 <property stdset="1">
189 <name>currentItem</name>
190 <number>0</number>
191 </property>
192 <property stdset="1">
193 <name>duplicatesEnabled</name>
194 <bool>false</bool>
195 </property>
196 </widget>
197 <widget row="2" column="1" rowspan="1" colspan="3" >
198 <class>CategorySelect</class>
199 <property stdset="1">
200 <name>name</name>
201 <cstring>comboCategory</cstring>
202 </property>
203 <property stdset="1">
204 <name>sizePolicy</name>
205 <sizepolicy>
206 <hsizetype>3</hsizetype>
207 <vsizetype>1</vsizetype>
208 </sizepolicy>
209 </property>
210 </widget>
211 <widget row="3" column="0" rowspan="2" colspan="1" >
212 <class>QLabel</class>
213 <property stdset="1">
214 <name>name</name>
215 <cstring>TextLabel3</cstring>
216 </property>
217 <property stdset="1">
218 <name>text</name>
219 <string>Start - End </string>
220 </property>
221 </widget>
222 <widget row="3" column="1" >
223 <class>QPushButton</class>
224 <property stdset="1">
225 <name>name</name>
226 <cstring>buttonStart</cstring>
227 </property>
228 <property stdset="1">
229 <name>minimumSize</name>
230 <size>
231 <width>70</width>
232 <height>0</height>
233 </size>
234 </property>
235 <property stdset="1">
236 <name>maximumSize</name>
237 <size>
238 <width>70</width>
239 <height>32767</height>
240 </size>
241 </property>
242 <property stdset="1">
243 <name>text</name>
244 <string>Jan 02 00</string>
245 </property>
246 </widget>
247 <widget row="4" column="1" >
248 <class>QLineEdit</class>
249 <property stdset="1">
250 <name>name</name>
251 <cstring>comboStart</cstring>
252 </property>
253 <property stdset="1">
254 <name>sizePolicy</name>
255 <sizepolicy>
256 <hsizetype>3</hsizetype>
257 <vsizetype>0</vsizetype>
258 </sizepolicy>
259 </property>
260 <property stdset="1">
261 <name>minimumSize</name>
262 <size>
263 <width>70</width>
264 <height>0</height>
265 </size>
266 </property>
267 <property stdset="1">
268 <name>maximumSize</name>
269 <size>
270 <width>70</width>
271 <height>32767</height>
272 </size>
273 </property>
274 <property stdset="1">
275 <name>alignment</name>
276 <set>AlignHCenter</set>
277 </property>
278 <property>
279 <name>hAlign</name>
280 </property>
281 </widget>
282 <spacer row="3" column="2" rowspan="2" colspan="1" >
283 <property>
284 <name>name</name>
285 <cstring>Spacer1_2</cstring>
286 </property>
287 <property stdset="1">
288 <name>orientation</name>
289 <enum>Horizontal</enum>
290 </property>
291 <property stdset="1">
292 <name>sizeType</name>
293 <enum>Expanding</enum>
294 </property>
295 <property>
296 <name>sizeHint</name>
297 <size>
298 <width>20</width>
299 <height>20</height>
300 </size>
301 </property>
302 </spacer>
303 <widget row="5" column="1" rowspan="1" colspan="3" >
304 <class>TimePicker</class>
305 <property stdset="1">
306 <name>name</name>
307 <cstring>timePickerStart</cstring>
308 </property>
309 <property stdset="1">
310 <name>sizePolicy</name>
311 <sizepolicy>
312 <hsizetype>3</hsizetype>
313 <vsizetype>1</vsizetype>
314 </sizepolicy>
315 </property>
316 </widget>
317 <widget row="3" column="3" >
318 <class>QPushButton</class>
319 <property stdset="1">
320 <name>name</name>
321 <cstring>buttonEnd</cstring>
322 </property>
323 <property stdset="1">
324 <name>minimumSize</name>
325 <size>
326 <width>70</width>
327 <height>0</height>
328 </size>
329 </property>
330 <property stdset="1">
331 <name>maximumSize</name>
332 <size>
333 <width>70</width>
334 <height>32767</height>
335 </size>
336 </property>
337 <property stdset="1">
338 <name>text</name>
339 <string>Jan 02 00</string>
340 </property>
341 </widget>
342 <widget row="4" column="3" >
343 <class>QLineEdit</class>
344 <property stdset="1"> 60 <property stdset="1">
345 <name>name</name> 61 <name>name</name>
346 <cstring>comboEnd</cstring> 62 <cstring>Layout19</cstring>
347 </property> 63 </property>
348 <property stdset="1"> 64 <vbox>
349 <name>sizePolicy</name> 65 <property stdset="1">
350 <sizepolicy> 66 <name>margin</name>
351 <hsizetype>3</hsizetype> 67 <number>0</number>
352 <vsizetype>0</vsizetype>
353 </sizepolicy>
354 </property>
355 <property stdset="1">
356 <name>minimumSize</name>
357 <size>
358 <width>70</width>
359 <height>0</height>
360 </size>
361 </property>
362 <property stdset="1">
363 <name>maximumSize</name>
364 <size>
365 <width>70</width>
366 <height>32767</height>
367 </size>
368 </property>
369 <property stdset="1">
370 <name>alignment</name>
371 <set>AlignHCenter</set>
372 </property>
373 <property>
374 <name>hAlign</name>
375 </property>
376 </widget>
377 <widget row="5" column="0" >
378 <class>QLabel</class>
379 <property stdset="1">
380 <name>name</name>
381 <cstring>TimePickerLabel</cstring>
382 </property>
383 <property stdset="1">
384 <name>text</name>
385 <string>Start time</string>
386 </property>
387 </widget>
388 <widget row="6" column="0" >
389 <class>QCheckBox</class>
390 <property stdset="1">
391 <name>name</name>
392 <cstring>checkAllDay</cstring>
393 </property>
394 <property stdset="1">
395 <name>text</name>
396 <string>All day</string>
397 </property>
398 </widget>
399 <widget row="7" column="0" >
400 <class>QLabel</class>
401 <property stdset="1">
402 <name>name</name>
403 <cstring>TextLabel3_2_2</cstring>
404 </property>
405 <property stdset="1">
406 <name>text</name>
407 <string>Time zone</string>
408 </property>
409 </widget>
410 <widget row="7" column="1" rowspan="1" colspan="3" >
411 <class>TimeZoneSelector</class>
412 <property stdset="1">
413 <name>name</name>
414 <cstring>timezone</cstring>
415 </property>
416 <property stdset="1">
417 <name>sizePolicy</name>
418 <sizepolicy>
419 <hsizetype>3</hsizetype>
420 <vsizetype>1</vsizetype>
421 </sizepolicy>
422 </property>
423 </widget>
424 <widget row="8" column="0" >
425 <class>QCheckBox</class>
426 <property stdset="1">
427 <name>name</name>
428 <cstring>checkAlarm</cstring>
429 </property>
430 <property stdset="1">
431 <name>enabled</name>
432 <bool>true</bool>
433 </property>
434 <property stdset="1">
435 <name>autoMask</name>
436 <bool>false</bool>
437 </property>
438 <property stdset="1">
439 <name>text</name>
440 <string>&amp;Alarm</string>
441 </property>
442 <property stdset="1">
443 <name>checked</name>
444 <bool>false</bool>
445 </property>
446 </widget>
447 <widget row="8" column="1" rowspan="1" colspan="2" >
448 <class>QSpinBox</class>
449 <property stdset="1">
450 <name>name</name>
451 <cstring>spinAlarm</cstring>
452 </property>
453 <property stdset="1">
454 <name>enabled</name>
455 <bool>false</bool>
456 </property>
457 <property stdset="1">
458 <name>suffix</name>
459 <string> minutes</string>
460 </property>
461 <property stdset="1">
462 <name>maxValue</name>
463 <number>180</number>
464 </property>
465 <property stdset="1">
466 <name>minValue</name>
467 <number>0</number>
468 </property>
469 <property stdset="1">
470 <name>lineStep</name>
471 <number>5</number>
472 </property>
473 <property stdset="1">
474 <name>value</name>
475 <number>5</number>
476 </property>
477 </widget>
478 <widget row="8" column="3" >
479 <class>QComboBox</class>
480 <item>
481 <property>
482 <name>text</name>
483 <string>Silent</string>
484 </property> 68 </property>
485 </item> 69 <property stdset="1">
486 <item> 70 <name>spacing</name>
487 <property> 71 <number>6</number>
488 <name>text</name>
489 <string>Loud</string>
490 </property> 72 </property>
491 </item> 73 <widget>
492 <property stdset="1"> 74 <class>QLayoutWidget</class>
493 <name>name</name> 75 <property stdset="1">
494 <cstring>comboSound</cstring> 76 <name>name</name>
495 </property> 77 <cstring>Layout1</cstring>
496 <property stdset="1"> 78 </property>
497 <name>enabled</name> 79 <hbox>
498 <bool>false</bool> 80 <property stdset="1">
499 </property> 81 <name>margin</name>
500 </widget> 82 <number>0</number>
501 <widget row="9" column="0" > 83 </property>
502 <class>QLabel</class> 84 <property stdset="1">
503 <property stdset="1"> 85 <name>spacing</name>
504 <name>name</name> 86 <number>6</number>
505 <cstring>lblRepeat</cstring> 87 </property>
506 </property> 88 <widget>
507 <property stdset="1"> 89 <class>QLabel</class>
508 <name>text</name> 90 <property stdset="1">
509 <string>Repeat</string> 91 <name>name</name>
510 </property> 92 <cstring>TextLabel1</cstring>
511 </widget> 93 </property>
512 <widget row="9" column="1" rowspan="1" colspan="3" > 94 <property stdset="1">
513 <class>QToolButton</class> 95 <name>text</name>
514 <property stdset="1"> 96 <string>Description </string>
515 <name>name</name> 97 </property>
516 <cstring>cmdRepeat</cstring> 98 </widget>
517 </property> 99 <widget>
518 <property stdset="1"> 100 <class>QComboBox</class>
519 <name>sizePolicy</name> 101 <item>
520 <sizepolicy> 102 <property>
521 <hsizetype>3</hsizetype> 103 <name>text</name>
522 <vsizetype>0</vsizetype> 104 <string></string>
523 </sizepolicy> 105 </property>
524 </property> 106 </item>
525 <property stdset="1"> 107 <item>
526 <name>focusPolicy</name> 108 <property>
527 <enum>TabFocus</enum> 109 <name>text</name>
528 </property> 110 <string>Meeting</string>
529 <property stdset="1"> 111 </property>
530 <name>text</name> 112 </item>
531 <string>No Repeat...</string> 113 <item>
532 </property> 114 <property>
533 </widget> 115 <name>text</name>
534 <widget row="10" column="0" rowspan="1" colspan="4" > 116 <string>Lunch</string>
535 <class>QToolButton</class> 117 </property>
536 <property stdset="1"> 118 </item>
537 <name>name</name> 119 <item>
538 <cstring>editNote</cstring> 120 <property>
539 </property> 121 <name>text</name>
540 <property stdset="1"> 122 <string>Dinner</string>
541 <name>text</name> 123 </property>
542 <string>Note...</string> 124 </item>
543 </property> 125 <item>
126 <property>
127 <name>text</name>
128 <string>Travel</string>
129 </property>
130 </item>
131 <property stdset="1">
132 <name>name</name>
133 <cstring>comboDescription</cstring>
134 </property>
135 <property stdset="1">
136 <name>sizePolicy</name>
137 <sizepolicy>
138 <hsizetype>3</hsizetype>
139 <vsizetype>0</vsizetype>
140 </sizepolicy>
141 </property>
142 <property stdset="1">
143 <name>editable</name>
144 <bool>true</bool>
145 </property>
146 <property stdset="1">
147 <name>currentItem</name>
148 <number>0</number>
149 </property>
150 <property stdset="1">
151 <name>duplicatesEnabled</name>
152 <bool>false</bool>
153 </property>
154 </widget>
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>
173 <class>QLabel</class>
174 <property stdset="1">
175 <name>name</name>
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>
185 </property>
186 <property stdset="1">
187 <name>text</name>
188 <string>Location</string>
189 </property>
190 </widget>
191 <widget>
192 <class>QComboBox</class>
193 <item>
194 <property>
195 <name>text</name>
196 <string></string>
197 </property>
198 </item>
199 <item>
200 <property>
201 <name>text</name>
202 <string>Office</string>
203 </property>
204 </item>
205 <item>
206 <property>
207 <name>text</name>
208 <string>Home</string>
209 </property>
210 </item>
211 <property stdset="1">
212 <name>name</name>
213 <cstring>comboLocation</cstring>
214 </property>
215 <property stdset="1">
216 <name>sizePolicy</name>
217 <sizepolicy>
218 <hsizetype>3</hsizetype>
219 <vsizetype>0</vsizetype>
220 </sizepolicy>
221 </property>
222 <property stdset="1">
223 <name>editable</name>
224 <bool>true</bool>
225 </property>
226 <property stdset="1">
227 <name>currentItem</name>
228 <number>0</number>
229 </property>
230 <property stdset="1">
231 <name>duplicatesEnabled</name>
232 <bool>false</bool>
233 </property>
234 </widget>
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>
268 <class>CategorySelect</class>
269 <property stdset="1">
270 <name>name</name>
271 <cstring>comboCategory</cstring>
272 </property>
273 <property stdset="1">
274 <name>sizePolicy</name>
275 <sizepolicy>
276 <hsizetype>3</hsizetype>
277 <vsizetype>1</vsizetype>
278 </sizepolicy>
279 </property>
280 </widget>
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>
314 <class>QLabel</class>
315 <property stdset="1">
316 <name>name</name>
317 <cstring>TextLabel3</cstring>
318 </property>
319 <property stdset="1">
320 <name>text</name>
321 <string>Start - End </string>
322 </property>
323 </widget>
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>
342 <class>QPushButton</class>
343 <property stdset="1">
344 <name>name</name>
345 <cstring>buttonStart</cstring>
346 </property>
347 <property stdset="1">
348 <name>minimumSize</name>
349 <size>
350 <width>70</width>
351 <height>0</height>
352 </size>
353 </property>
354 <property stdset="1">
355 <name>maximumSize</name>
356 <size>
357 <width>70</width>
358 <height>32767</height>
359 </size>
360 </property>
361 <property stdset="1">
362 <name>text</name>
363 <string>Jan 02 00</string>
364 </property>
365 </widget>
366 <widget>
367 <class>QLineEdit</class>
368 <property stdset="1">
369 <name>name</name>
370 <cstring>comboStart</cstring>
371 </property>
372 <property stdset="1">
373 <name>sizePolicy</name>
374 <sizepolicy>
375 <hsizetype>3</hsizetype>
376 <vsizetype>0</vsizetype>
377 </sizepolicy>
378 </property>
379 <property stdset="1">
380 <name>minimumSize</name>
381 <size>
382 <width>70</width>
383 <height>0</height>
384 </size>
385 </property>
386 <property stdset="1">
387 <name>maximumSize</name>
388 <size>
389 <width>70</width>
390 <height>32767</height>
391 </size>
392 </property>
393 <property stdset="1">
394 <name>alignment</name>
395 <set>AlignHCenter</set>
396 </property>
397 <property>
398 <name>hAlign</name>
399 </property>
400 </widget>
401 </vbox>
402 </widget>
403 <spacer>
404 <property>
405 <name>name</name>
406 <cstring>Spacer12</cstring>
407 </property>
408 <property stdset="1">
409 <name>orientation</name>
410 <enum>Horizontal</enum>
411 </property>
412 <property stdset="1">
413 <name>sizeType</name>
414 <enum>Expanding</enum>
415 </property>
416 <property>
417 <name>sizeHint</name>
418 <size>
419 <width>20</width>
420 <height>20</height>
421 </size>
422 </property>
423 </spacer>
424 <widget>
425 <class>QLayoutWidget</class>
426 <property stdset="1">
427 <name>name</name>
428 <cstring>Layout5</cstring>
429 </property>
430 <vbox>
431 <property stdset="1">
432 <name>margin</name>
433 <number>0</number>
434 </property>
435 <property stdset="1">
436 <name>spacing</name>
437 <number>6</number>
438 </property>
439 <widget>
440 <class>QPushButton</class>
441 <property stdset="1">
442 <name>name</name>
443 <cstring>buttonEnd</cstring>
444 </property>
445 <property stdset="1">
446 <name>minimumSize</name>
447 <size>
448 <width>70</width>
449 <height>0</height>
450 </size>
451 </property>
452 <property stdset="1">
453 <name>maximumSize</name>
454 <size>
455 <width>70</width>
456 <height>32767</height>
457 </size>
458 </property>
459 <property stdset="1">
460 <name>text</name>
461 <string>Jan 02 00</string>
462 </property>
463 </widget>
464 <widget>
465 <class>QLineEdit</class>
466 <property stdset="1">
467 <name>name</name>
468 <cstring>comboEnd</cstring>
469 </property>
470 <property stdset="1">
471 <name>sizePolicy</name>
472 <sizepolicy>
473 <hsizetype>3</hsizetype>
474 <vsizetype>0</vsizetype>
475 </sizepolicy>
476 </property>
477 <property stdset="1">
478 <name>minimumSize</name>
479 <size>
480 <width>70</width>
481 <height>0</height>
482 </size>
483 </property>
484 <property stdset="1">
485 <name>maximumSize</name>
486 <size>
487 <width>70</width>
488 <height>32767</height>
489 </size>
490 </property>
491 <property stdset="1">
492 <name>alignment</name>
493 <set>AlignHCenter</set>
494 </property>
495 <property>
496 <name>hAlign</name>
497 </property>
498 </widget>
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>
519 <class>QLabel</class>
520 <property stdset="1">
521 <name>name</name>
522 <cstring>TimePickerLabel</cstring>
523 </property>
524 <property stdset="1">
525 <name>text</name>
526 <string>Start time</string>
527 </property>
528 </widget>
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>
546 <class>QCheckBox</class>
547 <property stdset="1">
548 <name>name</name>
549 <cstring>checkAllDay</cstring>
550 </property>
551 <property stdset="1">
552 <name>text</name>
553 <string>All day</string>
554 </property>
555 </widget>
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>
572 <class>QLabel</class>
573 <property stdset="1">
574 <name>name</name>
575 <cstring>TextLabel3_2_2</cstring>
576 </property>
577 <property stdset="1">
578 <name>text</name>
579 <string>Time zone</string>
580 </property>
581 </widget>
582 <widget>
583 <class>TimeZoneSelector</class>
584 <property stdset="1">
585 <name>name</name>
586 <cstring>timezone</cstring>
587 </property>
588 <property stdset="1">
589 <name>sizePolicy</name>
590 <sizepolicy>
591 <hsizetype>3</hsizetype>
592 <vsizetype>1</vsizetype>
593 </sizepolicy>
594 </property>
595 </widget>
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>
617 <class>QCheckBox</class>
618 <property stdset="1">
619 <name>name</name>
620 <cstring>checkAlarm</cstring>
621 </property>
622 <property stdset="1">
623 <name>enabled</name>
624 <bool>true</bool>
625 </property>
626 <property stdset="1">
627 <name>autoMask</name>
628 <bool>false</bool>
629 </property>
630 <property stdset="1">
631 <name>text</name>
632 <string>&amp;Alarm</string>
633 </property>
634 <property stdset="1">
635 <name>checked</name>
636 <bool>false</bool>
637 </property>
638 </widget>
639 <widget>
640 <class>QSpinBox</class>
641 <property stdset="1">
642 <name>name</name>
643 <cstring>spinAlarm</cstring>
644 </property>
645 <property stdset="1">
646 <name>enabled</name>
647 <bool>false</bool>
648 </property>
649 <property stdset="1">
650 <name>suffix</name>
651 <string></string>
652 </property>
653 <property stdset="1">
654 <name>maxValue</name>
655 <number>180</number>
656 </property>
657 <property stdset="1">
658 <name>minValue</name>
659 <number>0</number>
660 </property>
661 <property stdset="1">
662 <name>lineStep</name>
663 <number>1</number>
664 </property>
665 <property stdset="1">
666 <name>value</name>
667 <number>5</number>
668 </property>
669 </widget>
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>
704 <class>QComboBox</class>
705 <item>
706 <property>
707 <name>text</name>
708 <string>Silent</string>
709 </property>
710 </item>
711 <item>
712 <property>
713 <name>text</name>
714 <string>Loud</string>
715 </property>
716 </item>
717 <property stdset="1">
718 <name>name</name>
719 <cstring>comboSound</cstring>
720 </property>
721 <property stdset="1">
722 <name>enabled</name>
723 <bool>false</bool>
724 </property>
725 </widget>
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>
744 <class>QLabel</class>
745 <property stdset="1">
746 <name>name</name>
747 <cstring>lblRepeat</cstring>
748 </property>
749 <property stdset="1">
750 <name>text</name>
751 <string>Repeat</string>
752 </property>
753 </widget>
754 <widget>
755 <class>QToolButton</class>
756 <property stdset="1">
757 <name>name</name>
758 <cstring>cmdRepeat</cstring>
759 </property>
760 <property stdset="1">
761 <name>sizePolicy</name>
762 <sizepolicy>
763 <hsizetype>3</hsizetype>
764 <vsizetype>0</vsizetype>
765 </sizepolicy>
766 </property>
767 <property stdset="1">
768 <name>focusPolicy</name>
769 <enum>TabFocus</enum>
770 </property>
771 <property stdset="1">
772 <name>text</name>
773 <string>No Repeat...</string>
774 </property>
775 </widget>
776 </hbox>
777 </widget>
778 <widget>
779 <class>QToolButton</class>
780 <property stdset="1">
781 <name>name</name>
782 <cstring>editNote</cstring>
783 </property>
784 <property stdset="1">
785 <name>text</name>
786 <string>Note...</string>
787 </property>
788 </widget>
789 </vbox>
544 </widget> 790 </widget>
545 </grid> 791 </grid>
546</widget> 792</widget>
547<customwidgets> 793<customwidgets>
548 <customwidget> 794 <customwidget>
549 <class>TimeZoneSelector</class> 795 <class>TimeZoneSelector</class>
@@ -644,12 +890,18 @@
644 <connection> 890 <connection>
645 <sender>checkAllDay</sender> 891 <sender>checkAllDay</sender>
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 &amp; )</slot> 902 <slot access="public">endDateChanged( const QString &amp; )</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 &amp; )</slot> 904 <slot access="public">endTimeChanged( const QString &amp; )</slot>
653 <slot access="public">slotRepeat()</slot> 905 <slot access="public">slotRepeat()</slot>
654 <slot access="public">slotWait( int )</slot> 906 <slot access="public">slotWait( int )</slot>
655 <slot access="public">startDateChanged( const QString &amp; )</slot> 907 <slot access="public">startDateChanged( const QString &amp; )</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
@@ -2,11 +2,11 @@ Package: opie-dasher-english
2Files: share/dasher/training_english_GB.txt 2Files: share/dasher/training_english_GB.txt
3Priority: optional 3Priority: optional
4Section: opie/inputmethods 4Section: opie/inputmethods
5Maintainer: Matthew Garrett <mjg59@srcf.ucam.org> 5Maintainer: Matthew Garrett <mjg59@srcf.ucam.org>
6Architecture: arm 6Architecture: arm
7Version: $QPE_VERSION$EXTRAVERSION 7Version: $QPE_VERSION$EXTRAVERSION
8Depends: opie-dasher 8Depends: opie-dasher libexpat0
9Description: Dasher text input method 9Description: 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
@@ -35,12 +35,13 @@ _;:, .> :=|. This program is free software; you can
35#include <opie2/otaskbarapplet.h> 35#include <opie2/otaskbarapplet.h>
36#include <opie2/osoundsystem.h> 36#include <opie2/osoundsystem.h>
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
42using namespace Opie::Core; 43using namespace Opie::Core;
43using namespace Opie::MM; 44using namespace Opie::MM;
44using namespace Opie::Ui; 45using namespace Opie::Ui;
45 46
46/* QT */ 47/* QT */
@@ -85,35 +86,49 @@ VolumeAppletControl::VolumeAppletControl( OTaskbarApplet* parent, const char* na
85 86
86void VolumeAppletControl::build() 87void 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 }
106 111
107} 112}
108 113
109 114
110VolumeAppletControl::~VolumeAppletControl() 115VolumeAppletControl::~VolumeAppletControl()
111{ 116{
112} 117}
113 118
119int VolumeAppletControl::volPercent ( ) const
120{
121 return m_vol_percent;
122}
123
124bool VolumeAppletControl::volMuted ( ) const
125{
126 return m_vol_muted;
127}
128
114 129
115void VolumeAppletControl::showEvent( QShowEvent* e ) 130void VolumeAppletControl::showEvent( QShowEvent* e )
116{ 131{
117 odebug << "showEvent" << oendl; 132 odebug << "showEvent" << oendl;
118 QWidget::showEvent( e ); 133 QWidget::showEvent( e );
119} 134}
@@ -123,24 +138,25 @@ void VolumeAppletControl::hideEvent( QHideEvent* e )
123{ 138{
124 odebug << "hideEvent" << oendl; 139 odebug << "hideEvent" << oendl;
125 QWidget::hideEvent( e ); 140 QWidget::hideEvent( e );
126} 141}
127 142
128 143
129QSize 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
135VolumeApplet::VolumeApplet( QWidget *parent, const char *name ) 151VolumeApplet::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
145VolumeApplet::~VolumeApplet() 161VolumeApplet::~VolumeApplet()
146{ 162{
@@ -152,14 +168,36 @@ int VolumeApplet::position()
152 return 4; 168 return 4;
153} 169}
154 170
155 171
156void VolumeApplet::paintEvent( QPaintEvent* ) 172void 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
163void VolumeApplet::mousePressEvent( QMouseEvent* ) 201void VolumeApplet::mousePressEvent( QMouseEvent* )
164{ 202{
165 if ( !_control->isVisible() ) 203 if ( !_control->isVisible() )
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
@@ -29,21 +29,23 @@
29*/ 29*/
30 30
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
40namespace Opie 42namespace 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}
45class QLabel; 47class QLabel;
46class QSlider; 48class QSlider;
47class QShowEvent; 49class QShowEvent;
48class QHideEvent; 50class QHideEvent;
49class QGridLayout; 51class QGridLayout;
@@ -66,23 +68,30 @@ class Channel : public QVBox
66 68
67class VolumeAppletControl : public QFrame 69class 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:
76 virtual void showEvent( QShowEvent* ); 85 virtual void showEvent( QShowEvent* );
77 virtual void hideEvent( QHideEvent* ); 86 virtual void hideEvent( QHideEvent* );
78 void build(); 87 void build();
79 88
80 private: 89 private:
90
81 QGridLayout* l; 91 QGridLayout* l;
82
83}; 92};
84 93
85 94
86class VolumeApplet : public Opie::Ui::OTaskbarApplet 95class VolumeApplet : public Opie::Ui::OTaskbarApplet
87{ 96{
88 public: 97 public:
@@ -93,11 +102,11 @@ class VolumeApplet : public Opie::Ui::OTaskbarApplet
93 protected: 102 protected:
94 virtual void paintEvent( QPaintEvent* ); 103 virtual void paintEvent( QPaintEvent* );
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
@@ -19,12 +19,13 @@
19#include <qpe/qpeapplication.h> 19#include <qpe/qpeapplication.h>
20#include <qpe/menubutton.h> 20#include <qpe/menubutton.h>
21using namespace Opie::Core; 21using namespace Opie::Core;
22using namespace Opie::Ui; 22using 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>
29#include <qtoolbutton.h> 30#include <qtoolbutton.h>
30#include <qlineedit.h> 31#include <qlineedit.h>
@@ -34,13 +35,17 @@ using namespace Opie::Ui;
34#include <sys/utsname.h> 35#include <sys/utsname.h>
35 36
36void AdvancedFm::init() { 37void AdvancedFm::init() {
37 b = false; 38 b = false;
38 setCaption( tr( "AdvancedFm" ) ); 39 setCaption( tr( "AdvancedFm" ) );
39 40
40 QVBoxLayout *layout = new QVBoxLayout( this ); 41// QFrame* frame = new QFrame(this);
42// setCentralWidget(frame);
43// QVBoxLayout *layout = new QVBoxLayout( frame );
44
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
44 QMenuBar *menuBar = new QMenuBar(this); 49 QMenuBar *menuBar = new QMenuBar(this);
45 menuBar->setMargin( 0 ); // squeeze 50 menuBar->setMargin( 0 ); // squeeze
46 fileMenu = new QPopupMenu( this ); 51 fileMenu = new QPopupMenu( this );
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
@@ -650,25 +650,39 @@ void AdvancedFm::runCommandStd() {
650 qApp->processEvents(); 650 qApp->processEvents();
651 startProcess( (const QString)fileDlg->LineEdit1->text().latin1()); 651 startProcess( (const QString)fileDlg->LineEdit1->text().latin1());
652 } 652 }
653} 653}
654 654
655void AdvancedFm::fileStatus() { 655void 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 Output *outDlg;
665 outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
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 }
664 681
665 Output *outDlg; 682 qApp->processEvents();
666 outDlg = new Output( command, this, tr("AdvancedFm Output"), true);
667 QPEApplication::execDialog( outDlg );
668 qApp->processEvents();
669} 683}
670 684
671 685
672void AdvancedFm::mkDir() { 686void AdvancedFm::mkDir() {
673 makeDir(); 687 makeDir();
674} 688}
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>
3using namespace Opie::Core;
4OPIE_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 @@
1Package: smbclient
2Version: 1.0
3Architecture: arm
4Arch: arm
5Maintainer: Kurt Korbatits (support@midget.net.au)
6Section: Network
7Priority: optional
8Description: Gui front end for samba utilities.
9Source:
10Depends: 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
5INCLUDEPATH += $(OPIEDIR)/include
6DEPENDPATH += $(OPIEDIR)/include
7DESTDIR = $(OPIEDIR)/bin
8LIBS += -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
18include( $(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>
25using namespace Opie::Core;
26
27
28Qsmb::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
49Qsmb::~Qsmb()
50{
51}
52
53void Qsmb::clear()
54{
55 if (scanning) return;
56 ListViewScan->clear();
57 TextViewOutput->setText("");
58 top_element = NULL;
59}
60
61void Qsmb::scanClicked()
62{
63 if (scanning) return;
64 pthread_create(&tpid, NULL, runit, (void *)this);
65}
66
67void 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
78void* runit(void* arg)
79{
80 Qsmb* caller = (Qsmb*)arg;
81 caller->scan();
82 return(0);
83}
84
85void* runitm(void* arg)
86{
87 Qsmb* caller = (Qsmb*)arg;
88 caller->DoIt();
89 return(0);
90}
91
92void 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
186void 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
277void 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
13class Qsmb : public FormQPESMBBase
14{
15 Q_OBJECT
16
17public:
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
24private:
25 QListViewItem *top_element;
26 QComboBox *hosts;
27 pthread_t tpid;
28 bool scanning;
29
30public slots:
31 void clear();
32 void scanClicked();
33 void hostSelected(int);
34 void DoItClicked();
35};
36void* runit(void *arg);
37void* 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 */
29FormQPESMBBase::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 */
142FormQPESMBBase::~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>
14class QVBoxLayout;
15class QHBoxLayout;
16class QGridLayout;
17class QCheckBox;
18class QComboBox;
19class QLabel;
20class QLineEdit;
21class QListView;
22class QListViewItem;
23class QPushButton;
24class QTabWidget;
25class QTextView;
26
27class FormQPESMBBase : public QWidget
28{
29 Q_OBJECT
30
31public:
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
53protected:
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>&amp;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>&amp;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>&amp;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
@@ -67,19 +67,19 @@ FormatTabWidget::FormatTabWidget( QWidget *parent )
67 67
68 // 12/24 hour selector 68 // 12/24 hour selector
69 layout->addWidget( new QLabel( tr( "12/24 hour" ), container ), 1, 0 ); 69 layout->addWidget( new QLabel( tr( "12/24 hour" ), container ), 1, 0 );
70 cbAmpm = new QComboBox( container ); 70 cbAmpm = new QComboBox( container );
71 cbAmpm->insertItem( tr( "24 hour" ), 0 ); 71 cbAmpm->insertItem( tr( "24 hour" ), 0 );
72 cbAmpm->insertItem( tr( "12 hour" ), 1 ); 72 cbAmpm->insertItem( tr( "12 hour" ), 1 );
73 connect( cbAmpm, SIGNAL(activated(int)), this, SIGNAL(show12HourTime(int)) ); 73 connect( cbAmpm, SIGNAL(activated( int)), this, SIGNAL(show12HourTime( int)) );
74 layout->addWidget( cbAmpm, 1, 1 ); 74 layout->addWidget( cbAmpm, 1, 1 );
75 75
76 // Date format selector 76 // Date format selector
77 layout->addWidget( new QLabel( tr( "Date format" ), container ), 2, 0 ); 77 layout->addWidget( new QLabel( tr( "Date format" ), container ), 2, 0 );
78 cbDateFormat = new QComboBox( container ); 78 cbDateFormat = new QComboBox( container );
79 connect( cbDateFormat, SIGNAL(activated(int)), this, SLOT(slotDateFormatChanged(int)) ); 79 connect( cbDateFormat, SIGNAL(activated( int)), this, SLOT(slotDateFormatChanged( int)) );
80 layout->addWidget( cbDateFormat, 2, 1 ); 80 layout->addWidget( cbDateFormat, 2, 1 );
81 81
82 // Week starts on selector 82 // Week starts on selector
83 layout->addWidget( new QLabel( tr( "Weeks start on" ), container ), 3, 0 ); 83 layout->addWidget( new QLabel( tr( "Weeks start on" ), container ), 3, 0 );
84 cbWeekStart = new QComboBox( container ); 84 cbWeekStart = new QComboBox( container );
85 cbWeekStart->insertItem( tr( "Sunday" ), 0 ); 85 cbWeekStart->insertItem( tr( "Sunday" ), 0 );
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 1TEMPLATE = lib
2#CONFIG -= moc 2CONFIG += qt
3#CONFIG += qt 3INTERFACES += binary.ui
4## Input 4HEADERS = binaryimpl.h \
5#INTERFACES += binary.ui 5 binaryfactory.h
6#HEADERS = binaryimpl.h \ 6SOURCES = binaryimpl.cpp \
7 # binaryfactory.h 7 binaryfactory.cpp
8#SOURCES = binaryimpl.cpp \ 8INCLUDEPATH += $(OPIEDIR)/include \
9 # binaryfactory.cpp 9 $(OPIEDIR)/calc2
10#INCLUDEPATH += $(OPIEDIR)/include \ 10DEPENDPATH += $(OPIEDIR)/include
11 # $(OPIEDIR)/calc2 11DESTDIR = $(OPIEDIR)/plugins/calculator
12#DEPENDPATH += $(OPIEDIR)/include 12TARGET = binary
13#DESTDIR = $(OPIEDIR)/plugins/calculator 13
14#TARGET = binary
15#
16 14
17include( $(OPIEDIR)/include.pro ) 15include( $(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
@@ -19,13 +19,13 @@
19** not clear to you. 19** not clear to you.
20** 20**
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
27QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) { 27QWidget *BinaryInterface::getPlugin ( Engine *e, QWidget *parent ) {
28 if ( !input ) 28 if ( !input )
29 input = new FormBinaryImpl ( e, parent ); 29 input = new FormBinaryImpl ( e, parent );
30 return input; 30 return input;
31} 31}
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
@@ -19,14 +19,14 @@
19**********************************************************************/ 19**********************************************************************/
20 20
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
28class BinaryInterface : public CalcInterface 28class BinaryInterface : public CalcInterface
29{ 29{
30public: 30public:
31 BinaryInterface(){input = 0;}; 31 BinaryInterface(){input = 0;};
32 virtual ~BinaryInterface(){}; 32 virtual ~BinaryInterface(){};
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
@@ -16,13 +16,13 @@
16** Contact info@trolltech.com if any conditions of this licensing are 16** Contact info@trolltech.com if any conditions of this licensing are
17** not clear to you. 17** not clear to you.
18** 18**
19**********************************************************************/ 19**********************************************************************/
20 20
21#include "binaryimpl.h" 21#include "binaryimpl.h"
22#include <instruction.h> 22#include "../instruction.h"
23 23
24class iXOR : public Instruction { 24class iXOR : public Instruction {
25public: 25public:
26 iXOR():Instruction(){}; 26 iXOR():Instruction(){};
27 ~iXOR(){}; 27 ~iXOR(){};
28 Data eval(Data num) { 28 Data eval(Data num) {
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
@@ -18,13 +18,13 @@
18** 18**
19**********************************************************************/ 19**********************************************************************/
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
26class FormBinaryImpl : public FormBinary { 26class FormBinaryImpl : public FormBinary {
27Q_OBJECT 27Q_OBJECT
28public: 28public:
29 FormBinaryImpl(Engine *e,QWidget *p) : FormBinary (p,"Binary") { 29 FormBinaryImpl(Engine *e,QWidget *p) : FormBinary (p,"Binary") {
30 engine = e; 30 engine = e;
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
@@ -65,13 +65,12 @@ LCD->setSegmentStyle(QLCDNumber::Filled);
65 QStringList list = dir.entryList (); 65 QStringList list = dir.entryList ();
66 66
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) ==
76 QS_OK) { 75 QS_OK) {
77 plugin.library = lib; 76 plugin.library = lib;
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 1TEMPLATE = lib
2#CONFIG -= moc 2CONFIG += qt
3#CONFIG += qt 3INTERFACES += simple.ui
4## Input 4HEADERS = simpleimpl.h simplefactory.h stdinstructions.h
5#INTERFACES += simple.ui 5SOURCES = simpleimpl.cpp simplefactory.cpp
6#HEADERS = simpleimpl.h simplefactory.h stdinstructions.h 6INCLUDEPATH += $(OPIEDIR)/include \
7#SOURCES = simpleimpl.cpp simplefactory.cpp 7 $(OPIEDIR)/calc2
8#INCLUDEPATH += $(OPIEDIR)/include \ 8DEPENDPATH += $(OPIEDIR)/include
9 # $(OPIEDIR)/calc2 9DESTDIR = $(OPIEDIR)/plugins/calculator
10#DEPENDPATH += $(OPIEDIR)/include 10
11#DESTDIR = $(OPIEDIR)/plugins/calculator
12#
13 11
14include( $(OPIEDIR)/include.pro ) 12include( $(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
@@ -19,13 +19,13 @@
19** not clear to you. 19** not clear to you.
20** 20**
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
27QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) { 27QWidget *SimpleInterface::getPlugin ( Engine *e, QWidget *parent ) {
28 if ( !input ) 28 if ( !input )
29 input = new FormSimpleImpl ( e, parent ); 29 input = new FormSimpleImpl ( e, parent );
30 return input; 30 return input;
31} 31}
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
@@ -19,14 +19,14 @@
19**********************************************************************/ 19**********************************************************************/
20 20
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
28class SimpleInterface : public CalcInterface 28class SimpleInterface : public CalcInterface
29{ 29{
30public: 30public:
31 SimpleInterface(){input = 0;}; 31 SimpleInterface(){input = 0;};
32 virtual ~SimpleInterface(){}; 32 virtual ~SimpleInterface(){};
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
@@ -19,13 +19,13 @@
19**********************************************************************/ 19**********************************************************************/
20 20
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
27void FormSimpleImpl::CEClicked() { 27void FormSimpleImpl::CEClicked() {
28 engine->hardReset(); 28 engine->hardReset();
29} 29}
30 30
31void FormSimpleImpl::MCClicked() { 31void FormSimpleImpl::MCClicked() {
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
@@ -22,14 +22,14 @@
22#define STANDARDIMPL_H 22#define STANDARDIMPL_H
23 23
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
31class FormSimpleImpl:public FormSimple { 31class FormSimpleImpl:public FormSimple {
32Q_OBJECT 32Q_OBJECT
33public: 33public:
34 FormSimpleImpl (Engine *e, QWidget * parent = 0, const char *name = 0) 34 FormSimpleImpl (Engine *e, QWidget * parent = 0, const char *name = 0)
35 :FormSimple (parent, name) {engine = e;engine->setRepresentation(rDouble);}; 35 :FormSimple (parent, name) {engine = e;engine->setRepresentation(rDouble);};
diff --git a/packages b/packages
index 433bd06..86dcab4 100644
--- a/packages
+++ b/packages
@@ -14,13 +14,15 @@ CONFIG_BIGSCREEN_EXAMPLE unsupported/libopie/big-screen/example ospli
14 CONFIG_BINARY noncore/tools/calc2/binarybinary.pro 14 CONFIG_BINARY noncore/tools/calc2/binarybinary.pro
15 CONFIG_BLUE-PIN noncore/net/opietooth/blue-pinblue-pin.pro 15 CONFIG_BLUE-PIN noncore/net/opietooth/blue-pinblue-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
25 CONFIG_CHECKBOOK noncore/apps/checkbookcheckbook.pro 27 CONFIG_CHECKBOOK noncore/apps/checkbookcheckbook.pro
26 CONFIG_CITYTIME core/settings/citytimecitytime.pro 28 CONFIG_CITYTIME core/settings/citytimecitytime.pro
@@ -167,12 +169,13 @@ CONFIG_OPIEPLAYER3 noncore/multimedia/opieplayer3 opieplayer3.pro
167 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro 169 CONFIG_OPIEPLAYER core/multimedia/opieplayeropieplayer.pro
168 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.pro 170 CONFIG_OPIE-RDESKTOP noncore/net/opierdesktopopierdesktop.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
177 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro 180 CONFIG_OPIE-WRITE noncore/apps/opie-writeopie-write.pro
178 CONFIG_OSEARCH core/pim/osearchosearch.pro 181 CONFIG_OSEARCH core/pim/osearchosearch.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