author | mickeyl <mickeyl> | 2003-10-29 16:45:13 (UTC) |
---|---|---|
committer | mickeyl <mickeyl> | 2003-10-29 16:45:13 (UTC) |
commit | e8697a4281f7a265b69e6bf5253383c73a38626b (patch) (unidiff) | |
tree | 040470f8f5c90c0d72ff5f01a272143571842078 /noncore | |
parent | d5d9b307e950d9038215e4d63e64bc9cd5d85352 (diff) | |
download | opie-e8697a4281f7a265b69e6bf5253383c73a38626b.zip opie-e8697a4281f7a265b69e6bf5253383c73a38626b.tar.gz opie-e8697a4281f7a265b69e6bf5253383c73a38626b.tar.bz2 |
merge noncore/tools/*
-rw-r--r-- | noncore/tools/calculator/calculator.pro | 4 | ||||
-rw-r--r-- | noncore/tools/calculator/calculatorimpl.cpp | 56 | ||||
-rw-r--r-- | noncore/tools/calculator/calculatorimpl.h | 2 | ||||
-rw-r--r-- | noncore/tools/calculator/main.cpp | 13 | ||||
-rw-r--r-- | noncore/tools/clock/clock.h | 3 | ||||
-rw-r--r-- | noncore/tools/clock/clock.pro | 5 | ||||
-rw-r--r-- | noncore/tools/clock/main.cpp | 11 | ||||
-rw-r--r-- | noncore/tools/euroconv/euroconv.pro | 5 | ||||
-rw-r--r-- | noncore/tools/euroconv/main.cpp | 26 | ||||
-rw-r--r-- | noncore/tools/formatter/formatter.cpp | 2 | ||||
-rw-r--r-- | noncore/tools/formatter/formatter.h | 3 | ||||
-rw-r--r-- | noncore/tools/formatter/formatter.pro | 4 | ||||
-rw-r--r-- | noncore/tools/formatter/main.cpp | 10 | ||||
-rw-r--r-- | noncore/tools/opie-sh/opie-sh.control | 2 | ||||
-rw-r--r-- | noncore/tools/remote/opie-remote.control | 2 |
15 files changed, 87 insertions, 61 deletions
diff --git a/noncore/tools/calculator/calculator.pro b/noncore/tools/calculator/calculator.pro index 0fe5bb2..8a5fcfe 100644 --- a/noncore/tools/calculator/calculator.pro +++ b/noncore/tools/calculator/calculator.pro | |||
@@ -1,27 +1,25 @@ | |||
1 | DESTDIR = $(OPIEDIR)/bin | 1 | CONFIG = qt warn_on release quick-app |
2 | TEMPLATE= app | ||
3 | CONFIG = qt warn_on release | ||
4 | HEADERS = calculatorimpl.h | 2 | HEADERS = calculatorimpl.h |
5 | SOURCES = calculatorimpl.cpp \ | 3 | SOURCES = calculatorimpl.cpp \ |
6 | main.cpp | 4 | main.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH+= $(OPIEDIR)/include | 6 | DEPENDPATH+= $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | INTERFACES= calculator.ui | 8 | INTERFACES= calculator.ui |
11 | TARGET = calculator | 9 | TARGET = calculator |
12 | 10 | ||
13 | TRANSLATIONS = ../../../i18n/de/calculator.ts \ | 11 | TRANSLATIONS = ../../../i18n/de/calculator.ts \ |
14 | ../../../i18n/nl/calculator.ts \ | 12 | ../../../i18n/nl/calculator.ts \ |
15 | ../../../i18n/xx/calculator.ts \ | 13 | ../../../i18n/xx/calculator.ts \ |
16 | ../../../i18n/en/calculator.ts \ | 14 | ../../../i18n/en/calculator.ts \ |
17 | ../../../i18n/es/calculator.ts \ | 15 | ../../../i18n/es/calculator.ts \ |
18 | ../../../i18n/fr/calculator.ts \ | 16 | ../../../i18n/fr/calculator.ts \ |
19 | ../../../i18n/hu/calculator.ts \ | 17 | ../../../i18n/hu/calculator.ts \ |
20 | ../../../i18n/ja/calculator.ts \ | 18 | ../../../i18n/ja/calculator.ts \ |
21 | ../../../i18n/ko/calculator.ts \ | 19 | ../../../i18n/ko/calculator.ts \ |
22 | ../../../i18n/no/calculator.ts \ | 20 | ../../../i18n/no/calculator.ts \ |
23 | ../../../i18n/pl/calculator.ts \ | 21 | ../../../i18n/pl/calculator.ts \ |
24 | ../../../i18n/pt/calculator.ts \ | 22 | ../../../i18n/pt/calculator.ts \ |
25 | ../../../i18n/pt_BR/calculator.ts \ | 23 | ../../../i18n/pt_BR/calculator.ts \ |
26 | ../../../i18n/sl/calculator.ts \ | 24 | ../../../i18n/sl/calculator.ts \ |
27 | ../../../i18n/zh_CN/calculator.ts \ | 25 | ../../../i18n/zh_CN/calculator.ts \ |
diff --git a/noncore/tools/calculator/calculatorimpl.cpp b/noncore/tools/calculator/calculatorimpl.cpp index 8d11132..163b4da 100644 --- a/noncore/tools/calculator/calculatorimpl.cpp +++ b/noncore/tools/calculator/calculatorimpl.cpp | |||
@@ -97,48 +97,100 @@ static char *xtopowerofy_xpm[] = { | |||
97 | ".#.#.....", | 97 | ".#.#.....", |
98 | "#...#...." | 98 | "#...#...." |
99 | }; | 99 | }; |
100 | 100 | ||
101 | CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | 101 | CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, |
102 | WFlags f ) | 102 | WFlags f ) |
103 | : Calculator( parent, name, f ) | 103 | : Calculator( parent, name, f ) |
104 | { | 104 | { |
105 | // xtopowerofy = Resource::loadPixmap("xtopowerofy"); | 105 | // xtopowerofy = Resource::loadPixmap("xtopowerofy"); |
106 | // ythrootofx = Resource::loadPixmap("ythrootofx"); | 106 | // ythrootofx = Resource::loadPixmap("ythrootofx"); |
107 | // oneoverx = Resource::loadPixmap("oneoverx"); | 107 | // oneoverx = Resource::loadPixmap("oneoverx"); |
108 | 108 | ||
109 | memMark = new QLabel( "m", LCD ); | 109 | memMark = new QLabel( "m", LCD ); |
110 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); | 110 | memMark->setFont( QFont( "helvetica", 12, QFont::Bold, TRUE ) ); |
111 | memMark->resize( 12, 12 ); | 111 | memMark->resize( 12, 12 ); |
112 | memMark->move( 4, 2 ); | 112 | memMark->move( 4, 2 ); |
113 | memMark->hide(); | 113 | memMark->hide(); |
114 | mem = 0; | 114 | mem = 0; |
115 | 115 | ||
116 | PushButtonMR->setEnabled( FALSE ); | 116 | PushButtonMR->setEnabled( FALSE ); |
117 | 117 | ||
118 | current_mode = max_mode = conversion_mode_count = 0; | 118 | current_mode = max_mode = conversion_mode_count = 0; |
119 | last_conversion = -1; | 119 | last_conversion = -1; |
120 | 120 | ||
121 | // translation trick mode - with this stuff parsed in from a file is translatable | ||
122 | QObject::tr("Standard"); | ||
123 | QObject::tr("Weight"); | ||
124 | QObject::tr("Distance"); | ||
125 | QObject::tr("Area"); | ||
126 | QObject::tr("Temperatures"); | ||
127 | QObject::tr("Volume"); | ||
128 | QObject::tr("acres"); | ||
129 | QObject::tr("°C"); | ||
130 | QObject::tr("carats"); | ||
131 | QObject::tr("cm"); | ||
132 | QObject::tr("cu cm"); | ||
133 | QObject::tr("cu ft"); | ||
134 | QObject::tr("cu in"); | ||
135 | QObject::tr("°F"); | ||
136 | QObject::tr("fl oz (US)"); | ||
137 | QObject::tr("ft"); | ||
138 | QObject::tr("g"); | ||
139 | QObject::tr("gal (US)"); | ||
140 | QObject::tr("hectares"); | ||
141 | QObject::tr("in"); | ||
142 | QObject::tr("kg"); | ||
143 | QObject::tr("km"); | ||
144 | QObject::tr("l"); | ||
145 | QObject::tr("lb"); | ||
146 | QObject::tr("Lg tons"); | ||
147 | QObject::tr("m"); | ||
148 | QObject::tr("mg"); | ||
149 | QObject::tr("mi"); | ||
150 | QObject::tr("ml"); | ||
151 | QObject::tr("mm"); | ||
152 | QObject::tr("naut. mi"); | ||
153 | QObject::tr("oz"); | ||
154 | QObject::tr("points"); | ||
155 | QObject::tr("pt"); | ||
156 | QObject::tr("qt"); | ||
157 | QObject::tr("sq cm"); | ||
158 | QObject::tr("sq ft"); | ||
159 | QObject::tr("sq in"); | ||
160 | QObject::tr("sq km"); | ||
161 | QObject::tr("sq m"); | ||
162 | QObject::tr("sq mi"); | ||
163 | QObject::tr("sq mm"); | ||
164 | QObject::tr("sq yd"); | ||
165 | QObject::tr("st"); | ||
166 | QObject::tr("St tons"); | ||
167 | QObject::tr("tblspoon"); | ||
168 | QObject::tr("teaspoons"); | ||
169 | QObject::tr("tonnes"); | ||
170 | QObject::tr("yd"); | ||
171 | |||
172 | |||
121 | //bgr_command.insert( PushButtonFunction); | 173 | //bgr_command.insert( PushButtonFunction); |
122 | bgr_command.insert( PushButtonMPlus); | 174 | bgr_command.insert( PushButtonMPlus); |
123 | bgr_command.insert( PushButtonMR); | 175 | bgr_command.insert( PushButtonMR); |
124 | bgr_command.insert( PushButtonMC); | 176 | bgr_command.insert( PushButtonMC); |
125 | bgr_command.insert( PushButtonCE); | 177 | bgr_command.insert( PushButtonCE); |
126 | connect( &bgr_command, SIGNAL(clicked(int) ), this, SLOT(command_buttons(int))); | 178 | connect( &bgr_command, SIGNAL(clicked(int) ), this, SLOT(command_buttons(int))); |
127 | 179 | ||
128 | bgr_digits.insert(PushButton0); | 180 | bgr_digits.insert(PushButton0); |
129 | bgr_digits.insert(PushButton1); | 181 | bgr_digits.insert(PushButton1); |
130 | bgr_digits.insert(PushButton2); | 182 | bgr_digits.insert(PushButton2); |
131 | bgr_digits.insert(PushButton3); | 183 | bgr_digits.insert(PushButton3); |
132 | bgr_digits.insert(PushButton4); | 184 | bgr_digits.insert(PushButton4); |
133 | bgr_digits.insert(PushButton5); | 185 | bgr_digits.insert(PushButton5); |
134 | bgr_digits.insert(PushButton6); | 186 | bgr_digits.insert(PushButton6); |
135 | bgr_digits.insert(PushButton7); | 187 | bgr_digits.insert(PushButton7); |
136 | bgr_digits.insert(PushButton8); | 188 | bgr_digits.insert(PushButton8); |
137 | bgr_digits.insert(PushButton9); | 189 | bgr_digits.insert(PushButton9); |
138 | connect( &bgr_digits, SIGNAL(clicked(int) ), this, SLOT(enterNumber(int))); | 190 | connect( &bgr_digits, SIGNAL(clicked(int) ), this, SLOT(enterNumber(int))); |
139 | 191 | ||
140 | 192 | ||
141 | bgr_std.insert(PushButtonEquals); | 193 | bgr_std.insert(PushButtonEquals); |
142 | bgr_std.insert(PushButtonDecimal); | 194 | bgr_std.insert(PushButtonDecimal); |
143 | bgr_std.insert(PushButtonAdd); | 195 | bgr_std.insert(PushButtonAdd); |
144 | bgr_std.insert(PushButtonMinus); | 196 | bgr_std.insert(PushButtonMinus); |
@@ -187,54 +239,54 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
187 | } | 239 | } |
188 | else { | 240 | else { |
189 | QString line, line2; | 241 | QString line, line2; |
190 | QTextStream ts(&myfile); | 242 | QTextStream ts(&myfile); |
191 | 243 | ||
192 | // first pass, see how many conversion types there are in order to allocate for them | 244 | // first pass, see how many conversion types there are in order to allocate for them |
193 | while ( ! ts.eof() ) { | 245 | while ( ! ts.eof() ) { |
194 | line = ts.readLine(); | 246 | line = ts.readLine(); |
195 | if ( line.contains ("STARTTYPE" ) ) | 247 | if ( line.contains ("STARTTYPE" ) ) |
196 | conversion_mode_count++; | 248 | conversion_mode_count++; |
197 | } | 249 | } |
198 | 250 | ||
199 | entry_list = new double[conversion_mode_count*func_button_count]; | 251 | entry_list = new double[conversion_mode_count*func_button_count]; |
200 | preoffset_list = new double[conversion_mode_count*func_button_count]; | 252 | preoffset_list = new double[conversion_mode_count*func_button_count]; |
201 | postoffset_list = new double[conversion_mode_count*func_button_count]; | 253 | postoffset_list = new double[conversion_mode_count*func_button_count]; |
202 | myfile.close(); | 254 | myfile.close(); |
203 | myfile.open( IO_Translate | IO_ReadOnly ); | 255 | myfile.open( IO_Translate | IO_ReadOnly ); |
204 | QTextStream ts2(&myfile); | 256 | QTextStream ts2(&myfile); |
205 | 257 | ||
206 | // second pass, read in values | 258 | // second pass, read in values |
207 | int x = 0; | 259 | int x = 0; |
208 | while ( ! ts2.eof() ) { | 260 | while ( ! ts2.eof() ) { |
209 | line = ts2.readLine(); | 261 | line = ts2.readLine(); |
210 | if ( line.contains("STARTTYPE") ) { | 262 | if ( line.contains("STARTTYPE") ) { |
211 | captions << line.remove(0,10); | 263 | captions << tr( line.remove(0,10) ); |
212 | ComboBoxFunction->insertItem(captions.last()); | 264 | ComboBoxFunction->insertItem(captions.last()); |
213 | while ( !line.contains("ENDTYPE") ) { | 265 | while ( !line.contains("ENDTYPE") ) { |
214 | line = ts2.readLine(); | 266 | line = ts2.readLine(); |
215 | if ( line.contains("NAME") ) { | 267 | if ( line.contains("NAME") ) { |
216 | faces << line.remove(0,5); | 268 | faces << tr( line.remove(0,5) ); |
217 | line2 = ts2.readLine(); | 269 | line2 = ts2.readLine(); |
218 | line2.remove(0,6); | 270 | line2.remove(0,6); |
219 | entry_list[x] = line2.toDouble(); | 271 | entry_list[x] = line2.toDouble(); |
220 | line2 = ts2.readLine(); | 272 | line2 = ts2.readLine(); |
221 | line2.remove(0,7); | 273 | line2.remove(0,7); |
222 | preoffset_list[x] = line2.toDouble(); | 274 | preoffset_list[x] = line2.toDouble(); |
223 | line2 = ts2.readLine(); | 275 | line2 = ts2.readLine(); |
224 | line2.remove(0,8); | 276 | line2.remove(0,8); |
225 | postoffset_list[x] = line2.toDouble(); | 277 | postoffset_list[x] = line2.toDouble(); |
226 | x++; | 278 | x++; |
227 | } | 279 | } |
228 | } | 280 | } |
229 | } | 281 | } |
230 | } | 282 | } |
231 | } | 283 | } |
232 | myfile.close(); | 284 | myfile.close(); |
233 | clear(); | 285 | clear(); |
234 | max_mode = pre_conv_modes_count + conversion_mode_count + post_conv_modes_count - 1; | 286 | max_mode = pre_conv_modes_count + conversion_mode_count + post_conv_modes_count - 1; |
235 | display_pixmap_faces(); | 287 | display_pixmap_faces(); |
236 | 288 | ||
237 | qApp->installEventFilter( this ); | 289 | qApp->installEventFilter( this ); |
238 | } | 290 | } |
239 | 291 | ||
240 | bool CalculatorImpl::eventFilter( QObject *o, QEvent *e ) | 292 | bool CalculatorImpl::eventFilter( QObject *o, QEvent *e ) |
diff --git a/noncore/tools/calculator/calculatorimpl.h b/noncore/tools/calculator/calculatorimpl.h index f0180c9..06ec829 100644 --- a/noncore/tools/calculator/calculatorimpl.h +++ b/noncore/tools/calculator/calculatorimpl.h | |||
@@ -53,48 +53,50 @@ enum Operation { | |||
53 | }; | 53 | }; |
54 | 54 | ||
55 | // states | 55 | // states |
56 | #define sStart 0 | 56 | #define sStart 0 |
57 | #define sNewNumber 1 | 57 | #define sNewNumber 1 |
58 | #define sError 2 | 58 | #define sError 2 |
59 | 59 | ||
60 | struct Op | 60 | struct Op |
61 | { | 61 | { |
62 | Op() { number = 0; operation = oNop; } | 62 | Op() { number = 0; operation = oNop; } |
63 | Op( double num, Operation op ) | 63 | Op( double num, Operation op ) |
64 | { number = num; operation = op; } | 64 | { number = num; operation = op; } |
65 | double number; | 65 | double number; |
66 | Operation operation; | 66 | Operation operation; |
67 | }; | 67 | }; |
68 | 68 | ||
69 | class QLabel; | 69 | class QLabel; |
70 | class CalculatorImpl : public Calculator | 70 | class CalculatorImpl : public Calculator |
71 | { | 71 | { |
72 | Q_OBJECT | 72 | Q_OBJECT |
73 | 73 | ||
74 | public: | 74 | public: |
75 | CalculatorImpl( QWidget * parent = 0, const char * name = 0, | 75 | CalculatorImpl( QWidget * parent = 0, const char * name = 0, |
76 | WFlags f = 0 ); | 76 | WFlags f = 0 ); |
77 | static QString appName() { return QString::fromLatin1("calculator"); } | ||
78 | |||
77 | 79 | ||
78 | public slots: | 80 | public slots: |
79 | void command_buttons(int); | 81 | void command_buttons(int); |
80 | void enterNumber(int i); | 82 | void enterNumber(int i); |
81 | void std_buttons(int); | 83 | void std_buttons(int); |
82 | void std_funcs(int); | 84 | void std_funcs(int); |
83 | void do_convert(int); | 85 | void do_convert(int); |
84 | void function_button(int); | 86 | void function_button(int); |
85 | 87 | ||
86 | protected: | 88 | protected: |
87 | virtual bool eventFilter( QObject *o, QEvent *e ); | 89 | virtual bool eventFilter( QObject *o, QEvent *e ); |
88 | 90 | ||
89 | private: | 91 | private: |
90 | void clear(); | 92 | void clear(); |
91 | 93 | ||
92 | void reset_conv(); | 94 | void reset_conv(); |
93 | 95 | ||
94 | void processStack( int op ); | 96 | void processStack( int op ); |
95 | 97 | ||
96 | QValueStack<Op> operationStack; | 98 | QValueStack<Op> operationStack; |
97 | int state; | 99 | int state; |
98 | 100 | ||
99 | double acc, num, mem; | 101 | double acc, num, mem; |
100 | int numDecimals; | 102 | int numDecimals; |
diff --git a/noncore/tools/calculator/main.cpp b/noncore/tools/calculator/main.cpp index 74cd5d3..c4d00b1 100644 --- a/noncore/tools/calculator/main.cpp +++ b/noncore/tools/calculator/main.cpp | |||
@@ -1,35 +1,26 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
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 "calculatorimpl.h" | 21 | #include "calculatorimpl.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char ** argv ) | 26 | OPIE_EXPORT_APP( OApplicationFactory<CalculatorImpl> ) |
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | |||
29 | CalculatorImpl mw; | ||
30 | QPEApplication::setInputMethodHint( &mw, QPEApplication::AlwaysOff ); | ||
31 | mw.setCaption( CalculatorImpl::tr("Calculator") ); | ||
32 | a.showMainWidget( &mw ); | ||
33 | |||
34 | return a.exec(); | ||
35 | } | ||
diff --git a/noncore/tools/clock/clock.h b/noncore/tools/clock/clock.h index fa12b61..00d097d 100644 --- a/noncore/tools/clock/clock.h +++ b/noncore/tools/clock/clock.h | |||
@@ -21,73 +21,76 @@ | |||
21 | #define CLOCK_H | 21 | #define CLOCK_H |
22 | 22 | ||
23 | #include <qdatetime.h> | 23 | #include <qdatetime.h> |
24 | #include <qvbox.h> | 24 | #include <qvbox.h> |
25 | #include <qpixmap.h> | 25 | #include <qpixmap.h> |
26 | 26 | ||
27 | class QLCDNumber; | 27 | class QLCDNumber; |
28 | class QLabel; | 28 | class QLabel; |
29 | class QTimer; | 29 | class QTimer; |
30 | class QRadioButton; | 30 | class QRadioButton; |
31 | class QPushButton; | 31 | class QPushButton; |
32 | class QDateTime; | 32 | class QDateTime; |
33 | 33 | ||
34 | class AnalogClock : public QFrame | 34 | class AnalogClock : public QFrame |
35 | { | 35 | { |
36 | Q_OBJECT | 36 | Q_OBJECT |
37 | 37 | ||
38 | public: | 38 | public: |
39 | AnalogClock( QWidget * parent = 0, const char * name = 0 ); | 39 | AnalogClock( QWidget * parent = 0, const char * name = 0 ); |
40 | 40 | ||
41 | QSizePolicy sizePolicy() const; | 41 | QSizePolicy sizePolicy() const; |
42 | 42 | ||
43 | void display( const QTime& time ); | 43 | void display( const QTime& time ); |
44 | 44 | ||
45 | |||
45 | protected: | 46 | protected: |
46 | void drawContents( QPainter *p ); | 47 | void drawContents( QPainter *p ); |
47 | 48 | ||
48 | private: | 49 | private: |
49 | 50 | ||
50 | QPixmap bg; | 51 | QPixmap bg; |
51 | QTime currTime; | 52 | QTime currTime; |
52 | QTime prevTime; | 53 | QTime prevTime; |
53 | bool clear; | 54 | bool clear; |
54 | 55 | ||
55 | QPoint rotate( QPoint center, QPoint p, int angle ); | 56 | QPoint rotate( QPoint center, QPoint p, int angle ); |
56 | void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 ); | 57 | void drawPointers ( QPainter *, const QRect &r, const QColor &c, const QTime &t, const QTime *t2 = 0 ); |
57 | 58 | ||
58 | }; | 59 | }; |
59 | 60 | ||
60 | class Clock : public QVBox | 61 | class Clock : public QVBox |
61 | { | 62 | { |
62 | Q_OBJECT | 63 | Q_OBJECT |
63 | 64 | ||
64 | public: | 65 | public: |
65 | Clock( QWidget * parent = 0, const char * name = 0, WFlags f=0 ); | 66 | Clock( QWidget * parent = 0, const char * name = 0, WFlags f=0 ); |
66 | ~Clock(); | 67 | ~Clock(); |
67 | QDateTime when; | 68 | QDateTime when; |
68 | bool bSound; | 69 | bool bSound; |
69 | int hour, minute, snoozeTime; | 70 | int hour, minute, snoozeTime; |
71 | static QString appName() { return QString::fromLatin1("clock"); } | ||
72 | |||
70 | private slots: | 73 | private slots: |
71 | void slotSet(); | 74 | void slotSet(); |
72 | void slotReset(); | 75 | void slotReset(); |
73 | void modeSelect(int); | 76 | void modeSelect(int); |
74 | void updateClock(); | 77 | void updateClock(); |
75 | void changeClock( bool ); | 78 | void changeClock( bool ); |
76 | void slotSetAlarm(); | 79 | void slotSetAlarm(); |
77 | void slotSnooze(); | 80 | void slotSnooze(); |
78 | void slotToggleAlarm(); | 81 | void slotToggleAlarm(); |
79 | void alarmOn(); | 82 | void alarmOn(); |
80 | void alarmOff(); | 83 | void alarmOff(); |
81 | void appMessage(const QCString& msg, const QByteArray& data); | 84 | void appMessage(const QCString& msg, const QByteArray& data); |
82 | void timerEvent( QTimerEvent *e ); | 85 | void timerEvent( QTimerEvent *e ); |
83 | void slotAdjustTime(); | 86 | void slotAdjustTime(); |
84 | 87 | ||
85 | void slotStartTimer(); | 88 | void slotStartTimer(); |
86 | void slotStopTimer(); | 89 | void slotStopTimer(); |
87 | void slotResetTimer(); | 90 | void slotResetTimer(); |
88 | void setSwatchMode( int ); | 91 | void setSwatchMode( int ); |
89 | private: | 92 | private: |
90 | bool alarmBool; | 93 | bool alarmBool; |
91 | QTimer *t; | 94 | QTimer *t; |
92 | QLCDNumber *lcd; | 95 | QLCDNumber *lcd; |
93 | QLabel *date; | 96 | QLabel *date; |
diff --git a/noncore/tools/clock/clock.pro b/noncore/tools/clock/clock.pro index 38ce2f8..9890b3a 100644 --- a/noncore/tools/clock/clock.pro +++ b/noncore/tools/clock/clock.pro | |||
@@ -1,33 +1,30 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | DESTDIR = $(OPIEDIR)/bin | ||
4 | HEADERS = clock.h setAlarm.h | 2 | HEADERS = clock.h setAlarm.h |
5 | SOURCES = clock.cpp setAlarm.cpp \ | 3 | SOURCES = clock.cpp setAlarm.cpp \ |
6 | main.cpp | 4 | main.cpp |
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe -lopie -lpthread | 7 | LIBS += -lqpe -lopie -lpthread |
10 | INTERFACES = | ||
11 | TARGET = clock | 8 | TARGET = clock |
12 | 9 | ||
13 | TRANSLATIONS = ../../../i18n/de/clock.ts \ | 10 | TRANSLATIONS = ../../../i18n/de/clock.ts \ |
14 | ../../../i18n/nl/clock.ts \ | 11 | ../../../i18n/nl/clock.ts \ |
15 | ../../../i18n/xx/clock.ts \ | 12 | ../../../i18n/xx/clock.ts \ |
16 | ../../../i18n/en/clock.ts \ | 13 | ../../../i18n/en/clock.ts \ |
17 | ../../../i18n/es/clock.ts \ | 14 | ../../../i18n/es/clock.ts \ |
18 | ../../../i18n/fr/clock.ts \ | 15 | ../../../i18n/fr/clock.ts \ |
19 | ../../../i18n/hu/clock.ts \ | 16 | ../../../i18n/hu/clock.ts \ |
20 | ../../../i18n/ja/clock.ts \ | 17 | ../../../i18n/ja/clock.ts \ |
21 | ../../../i18n/ko/clock.ts \ | 18 | ../../../i18n/ko/clock.ts \ |
22 | ../../../i18n/no/clock.ts \ | 19 | ../../../i18n/no/clock.ts \ |
23 | ../../../i18n/pl/clock.ts \ | 20 | ../../../i18n/pl/clock.ts \ |
24 | ../../../i18n/pt/clock.ts \ | 21 | ../../../i18n/pt/clock.ts \ |
25 | ../../../i18n/pt_BR/clock.ts \ | 22 | ../../../i18n/pt_BR/clock.ts \ |
26 | ../../../i18n/sl/clock.ts \ | 23 | ../../../i18n/sl/clock.ts \ |
27 | ../../../i18n/zh_CN/clock.ts \ | 24 | ../../../i18n/zh_CN/clock.ts \ |
28 | ../../../i18n/zh_TW/clock.ts \ | 25 | ../../../i18n/zh_TW/clock.ts \ |
29 | ../../../i18n/da/clock.ts | 26 | ../../../i18n/da/clock.ts |
30 | 27 | ||
31 | 28 | ||
32 | 29 | ||
33 | include ( $(OPIEDIR)/include.pro ) | 30 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/clock/main.cpp b/noncore/tools/clock/main.cpp index cbfb73b..4a5e523 100644 --- a/noncore/tools/clock/main.cpp +++ b/noncore/tools/clock/main.cpp | |||
@@ -1,34 +1,27 @@ | |||
1 | /********************************************************************** | 1 | /********************************************************************** |
2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. | 2 | ** Copyright (C) 2000 Trolltech AS. All rights reserved. |
3 | ** | 3 | ** |
4 | ** This file is part of Qtopia Environment. | 4 | ** This file is part of Qtopia Environment. |
5 | ** | 5 | ** |
6 | ** This file may be distributed and/or modified under the terms of the | 6 | ** This file may be distributed and/or modified under the terms of the |
7 | ** GNU General Public License version 2 as published by the Free Software | 7 | ** GNU General Public License version 2 as published by the Free Software |
8 | ** Foundation and appearing in the file LICENSE.GPL included in the | 8 | ** Foundation and appearing in the file LICENSE.GPL included in the |
9 | ** packaging of this file. | 9 | ** packaging of this file. |
10 | ** | 10 | ** |
11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE | 11 | ** This file is provided AS IS with NO WARRANTY OF ANY KIND, INCLUDING THE |
12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. | 12 | ** WARRANTY OF DESIGN, MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. |
13 | ** | 13 | ** |
14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. | 14 | ** See http://www.trolltech.com/gpl/ for GPL licensing information. |
15 | ** | 15 | ** |
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 "clock.h" | 21 | #include "clock.h" |
22 | 22 | ||
23 | #include <qpe/qpeapplication.h> | 23 | #include <qpe/qpeapplication.h> |
24 | #include <opie/oapplicationfactory.h> | ||
24 | 25 | ||
25 | int main( int argc, char ** argv ) | ||
26 | { | ||
27 | QPEApplication a( argc, argv ); | ||
28 | 26 | ||
29 | Clock mw; | 27 | OPIE_EXPORT_APP( OApplicationFactory<Clock> ) |
30 | mw.setCaption( Clock::tr("Clock") ); | ||
31 | a.showMainWidget( &mw ); | ||
32 | |||
33 | return a.exec(); | ||
34 | } | ||
diff --git a/noncore/tools/euroconv/euroconv.pro b/noncore/tools/euroconv/euroconv.pro index d817dd3..2b732da 100644 --- a/noncore/tools/euroconv/euroconv.pro +++ b/noncore/tools/euroconv/euroconv.pro | |||
@@ -1,14 +1,13 @@ | |||
1 | TEMPLATE= app | 1 | CONFIG = qt warn_on release quick-app |
2 | CONFIG = qt warn_on release | ||
3 | HEADERS = calcdisplay.h \ | 2 | HEADERS = calcdisplay.h \ |
4 | calckeypad.h | 3 | calckeypad.h |
5 | SOURCES = calcdisplay.cpp \ | 4 | SOURCES = calcdisplay.cpp \ |
6 | calckeypad.cpp \ | 5 | calckeypad.cpp \ |
7 | main.cpp | 6 | main.cpp |
8 | INCLUDEPATH += $(OPIEDIR)/include | 7 | INCLUDEPATH += $(OPIEDIR)/include |
9 | DEPENDPATH += $(OPIEDIR)/include | 8 | DEPENDPATH += $(OPIEDIR)/include |
10 | LIBS += -lqpe -lopie | 9 | LIBS += -lqpe -lopie |
11 | DESTDIR = $(OPIEDIR)/bin | ||
12 | INTERFACES= | 10 | INTERFACES= |
13 | TARGET = euroconv | 11 | TARGET = euroconv |
12 | |||
14 | include ( $(OPIEDIR)/include.pro ) | 13 | include ( $(OPIEDIR)/include.pro ) |
diff --git a/noncore/tools/euroconv/main.cpp b/noncore/tools/euroconv/main.cpp index 7d69535..b765a5e 100644 --- a/noncore/tools/euroconv/main.cpp +++ b/noncore/tools/euroconv/main.cpp | |||
@@ -1,39 +1,37 @@ | |||
1 | /**************************************************************************** | 1 | /**************************************************************************** |
2 | * | 2 | * |
3 | * File: main.cpp | 3 | * File: main.cpp |
4 | * | 4 | * |
5 | * Description: main file for OPIE Euroconv aapp | 5 | * Description: main file for OPIE Euroconv aapp |
6 | * | 6 | * |
7 | * | 7 | * |
8 | * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> | 8 | * Authors: Eric Santonacci <Eric.Santonacci@talc.fr> |
9 | * | 9 | * |
10 | * Requirements: Qt | 10 | * Requirements: Qt |
11 | * | 11 | * |
12 | * $Id$ | ||
13 | * | 12 | * |
14 | ***************************************************************************/ | 13 | ***************************************************************************/ |
15 | 14 | ||
16 | #include <qpe/qpeapplication.h> | 15 | #include <qpe/qpeapplication.h> |
17 | #include <qvbox.h> | 16 | #include <qvbox.h> |
18 | //#include <qapplication.h> | ||
19 | 17 | ||
20 | #include "calcdisplay.h" | 18 | #include "calcdisplay.h" |
21 | #include "calckeypad.h" | 19 | #include "calckeypad.h" |
22 | 20 | ||
21 | #include <opie/oapplicationfactory.h> | ||
23 | 22 | ||
23 | struct Layout : QVBox{ | ||
24 | static QString appName() { return QString::fromLatin1("euroconv"); } | ||
25 | Layout(QWidget *p, const char* n, WFlags) | ||
26 | :QVBox(0,"fond" ) | ||
27 | { | ||
28 | LCDDisplay *lcd = new LCDDisplay(this, "lcd"); | ||
29 | KeyPad *num = new KeyPad(lcd, this, "keypad"); | ||
24 | 30 | ||
25 | int main( int argc, char **argv ) { | 31 | setCaption( QObject::tr("Euroconv") ); |
32 | }; | ||
26 | 33 | ||
27 | QPEApplication app( argc, argv ); | 34 | }; |
28 | 35 | ||
29 | QVBox *layout = new QVBox(0, "fond"); | 36 | OPIE_EXPORT_APP( OApplicationFactory<Layout> ) |
30 | |||
31 | LCDDisplay lcd (layout, "lcd"); | ||
32 | KeyPad num(&lcd, layout, "keypad"); | ||
33 | app.setMainWidget(layout); | ||
34 | layout->setCaption( QObject::tr("Euroconv") ); | ||
35 | layout->showMaximized (); | ||
36 | layout->show(); | ||
37 | return app.exec(); | ||
38 | } | ||
39 | 37 | ||
diff --git a/noncore/tools/formatter/formatter.cpp b/noncore/tools/formatter/formatter.cpp index 49f6355..a8dd11c 100644 --- a/noncore/tools/formatter/formatter.cpp +++ b/noncore/tools/formatter/formatter.cpp | |||
@@ -33,49 +33,49 @@ | |||
33 | #include <qmessagebox.h> | 33 | #include <qmessagebox.h> |
34 | #include <qregexp.h> | 34 | #include <qregexp.h> |
35 | 35 | ||
36 | #include <qlabel.h> | 36 | #include <qlabel.h> |
37 | #include <qlineedit.h> | 37 | #include <qlineedit.h> |
38 | #include <qpushbutton.h> | 38 | #include <qpushbutton.h> |
39 | #include <qtabwidget.h> | 39 | #include <qtabwidget.h> |
40 | #include <qwidget.h> | 40 | #include <qwidget.h> |
41 | #include <qlayout.h> | 41 | #include <qlayout.h> |
42 | #include <qvariant.h> | 42 | #include <qvariant.h> |
43 | 43 | ||
44 | #include <unistd.h> | 44 | #include <unistd.h> |
45 | #include <stdio.h> | 45 | #include <stdio.h> |
46 | #include <stdlib.h> | 46 | #include <stdlib.h> |
47 | #include <sys/vfs.h> | 47 | #include <sys/vfs.h> |
48 | #include <mntent.h> | 48 | #include <mntent.h> |
49 | #include <string.h> | 49 | #include <string.h> |
50 | #include <errno.h> | 50 | #include <errno.h> |
51 | 51 | ||
52 | #define BLANK ' ' | 52 | #define BLANK ' ' |
53 | #define DELIMITER '#' | 53 | #define DELIMITER '#' |
54 | 54 | ||
55 | /* | 55 | /* |
56 | Blah blah blah blah */ | 56 | Blah blah blah blah */ |
57 | FormatterApp::FormatterApp( QWidget* parent, const char* name, bool , WFlags fl ) | 57 | FormatterApp::FormatterApp( QWidget* parent, const char* name, WFlags fl, bool modal ) |
58 | : QMainWindow( parent, name, fl ) | 58 | : QMainWindow( parent, name, fl ) |
59 | // : QDialog( parent, name, modal, fl ) | 59 | // : QDialog( parent, name, modal, fl ) |
60 | { | 60 | { |
61 | if ( !name ) | 61 | if ( !name ) |
62 | setName( "FormatterApp" ); | 62 | setName( "FormatterApp" ); |
63 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); | 63 | connect( qApp,SIGNAL( aboutToQuit()),SLOT( cleanUp()) ); |
64 | 64 | ||
65 | setCaption( tr( "Formatter" ) ); | 65 | setCaption( tr( "Formatter" ) ); |
66 | FormatterAppLayout = new QGridLayout( this ); | 66 | FormatterAppLayout = new QGridLayout( this ); |
67 | FormatterAppLayout->setSpacing( 2); | 67 | FormatterAppLayout->setSpacing( 2); |
68 | FormatterAppLayout->setMargin( 2 ); | 68 | FormatterAppLayout->setMargin( 2 ); |
69 | 69 | ||
70 | TabWidget = new QTabWidget( this, "TabWidget" ); | 70 | TabWidget = new QTabWidget( this, "TabWidget" ); |
71 | 71 | ||
72 | tab = new QWidget( TabWidget, "tab" ); | 72 | tab = new QWidget( TabWidget, "tab" ); |
73 | tabLayout = new QGridLayout( tab ); | 73 | tabLayout = new QGridLayout( tab ); |
74 | tabLayout->setSpacing( 3); | 74 | tabLayout->setSpacing( 3); |
75 | tabLayout->setMargin( 2); | 75 | tabLayout->setMargin( 2); |
76 | 76 | ||
77 | storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" ); | 77 | storageComboBox = new QComboBox( FALSE, tab, "storageComboBox" ); |
78 | storageComboBox->setMaximumWidth(220); | 78 | storageComboBox->setMaximumWidth(220); |
79 | 79 | ||
80 | tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1); | 80 | tabLayout->addMultiCellWidget( storageComboBox, 0, 0, 0, 1); |
81 | 81 | ||
diff --git a/noncore/tools/formatter/formatter.h b/noncore/tools/formatter/formatter.h index 960a68a..faf0b30 100644 --- a/noncore/tools/formatter/formatter.h +++ b/noncore/tools/formatter/formatter.h | |||
@@ -9,49 +9,50 @@ | |||
9 | #ifndef FORMATTERAPP_H | 9 | #ifndef FORMATTERAPP_H |
10 | #define FORMATTERAPP_H | 10 | #define FORMATTERAPP_H |
11 | 11 | ||
12 | #include <qvariant.h> | 12 | #include <qvariant.h> |
13 | //#include <qdialog.h> | 13 | //#include <qdialog.h> |
14 | #include <qmainwindow.h> | 14 | #include <qmainwindow.h> |
15 | 15 | ||
16 | class QVBoxLayout; | 16 | class QVBoxLayout; |
17 | class QHBoxLayout; | 17 | class QHBoxLayout; |
18 | class QGridLayout; | 18 | class QGridLayout; |
19 | class QComboBox; | 19 | class QComboBox; |
20 | class QLabel; | 20 | class QLabel; |
21 | class QLineEdit; | 21 | class QLineEdit; |
22 | class QPushButton; | 22 | class QPushButton; |
23 | class QTabWidget; | 23 | class QTabWidget; |
24 | class QWidget; | 24 | class QWidget; |
25 | class QStringList; | 25 | class QStringList; |
26 | 26 | ||
27 | class FormatterApp : public QMainWindow | 27 | class FormatterApp : public QMainWindow |
28 | //public QDialog | 28 | //public QDialog |
29 | { | 29 | { |
30 | Q_OBJECT | 30 | Q_OBJECT |
31 | 31 | ||
32 | public: | 32 | public: |
33 | FormatterApp( QWidget* parent = 0, const char* name = 0, bool modal = FALSE, WFlags fl = 0 ); | 33 | static QString appName() { return QString::fromLatin1("formatter"); } |
34 | FormatterApp( QWidget* parent = 0, const char* name = 0, WFlags fl = 0, bool modal = FALSE ); | ||
34 | ~FormatterApp(); | 35 | ~FormatterApp(); |
35 | 36 | ||
36 | QTabWidget *TabWidget; | 37 | QTabWidget *TabWidget; |
37 | QWidget *tab, *tab_2;; | 38 | QWidget *tab, *tab_2;; |
38 | QLabel *TextLabel1, *TextLabel2, *TextLabel3, *TextLabel4, *TextLabel5; | 39 | QLabel *TextLabel1, *TextLabel2, *TextLabel3, *TextLabel4, *TextLabel5; |
39 | QComboBox *storageComboBox, *fileSystemsCombo, *deviceComboBox; | 40 | QComboBox *storageComboBox, *fileSystemsCombo, *deviceComboBox; |
40 | QPushButton *formatPushButton, *editPushButton, *fsckButton; | 41 | QPushButton *formatPushButton, *editPushButton, *fsckButton; |
41 | QLineEdit* mountPointLineEdit; | 42 | QLineEdit* mountPointLineEdit; |
42 | QStringList fileSystemTypeList, fsList, deviceList; | 43 | QStringList fileSystemTypeList, fsList, deviceList; |
43 | protected: | 44 | protected: |
44 | QGridLayout *FormatterAppLayout, *tabLayout, *tabLayout_2; | 45 | QGridLayout *FormatterAppLayout, *tabLayout, *tabLayout_2; |
45 | QString getFileSystemType(const QString &); | 46 | QString getFileSystemType(const QString &); |
46 | 47 | ||
47 | void fillCombos(); | 48 | void fillCombos(); |
48 | void parsetab(const QString &); | 49 | void parsetab(const QString &); |
49 | bool doFdisk(); | 50 | bool doFdisk(); |
50 | int formatCheck(const QString &); | 51 | int formatCheck(const QString &); |
51 | int runCommand(const QString &); | 52 | int runCommand(const QString &); |
52 | 53 | ||
53 | protected slots: | 54 | protected slots: |
54 | void cleanUp(); | 55 | void cleanUp(); |
55 | void doFormat(); | 56 | void doFormat(); |
56 | void editFstab(); | 57 | void editFstab(); |
57 | bool doFsck(); | 58 | bool doFsck(); |
diff --git a/noncore/tools/formatter/formatter.pro b/noncore/tools/formatter/formatter.pro index baf6ace..17aab57 100644 --- a/noncore/tools/formatter/formatter.pro +++ b/noncore/tools/formatter/formatter.pro | |||
@@ -1,30 +1,28 @@ | |||
1 | TEMPLATE = app | 1 | CONFIG += qt warn_on release quick-app |
2 | CONFIG += qt warn_on release | ||
3 | HEADERS = formatter.h inputDialog.h output.h | 2 | HEADERS = formatter.h inputDialog.h output.h |
4 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp | 3 | SOURCES = formatter.cpp inputDialog.cpp output.cpp main.cpp |
5 | TARGET = formatter | 4 | TARGET = formatter |
6 | DESTDIR = $(OPIEDIR)/bin | ||
7 | INCLUDEPATH += $(OPIEDIR)/include | 5 | INCLUDEPATH += $(OPIEDIR)/include |
8 | DEPENDPATH += $(OPIEDIR)/include | 6 | DEPENDPATH += $(OPIEDIR)/include |
9 | LIBS += -lqpe | 7 | LIBS += -lqpe |
10 | 8 | ||
11 | TRANSLATIONS = ../../../i18n/de/formatter.ts \ | 9 | TRANSLATIONS = ../../../i18n/de/formatter.ts \ |
12 | ../../../i18n/nl/formatter.ts \ | 10 | ../../../i18n/nl/formatter.ts \ |
13 | ../../../i18n/da/formatter.ts \ | 11 | ../../../i18n/da/formatter.ts \ |
14 | ../../../i18n/xx/formatter.ts \ | 12 | ../../../i18n/xx/formatter.ts \ |
15 | ../../../i18n/en/formatter.ts \ | 13 | ../../../i18n/en/formatter.ts \ |
16 | ../../../i18n/es/formatter.ts \ | 14 | ../../../i18n/es/formatter.ts \ |
17 | ../../../i18n/fr/formatter.ts \ | 15 | ../../../i18n/fr/formatter.ts \ |
18 | ../../../i18n/hu/formatter.ts \ | 16 | ../../../i18n/hu/formatter.ts \ |
19 | ../../../i18n/ja/formatter.ts \ | 17 | ../../../i18n/ja/formatter.ts \ |
20 | ../../../i18n/ko/formatter.ts \ | 18 | ../../../i18n/ko/formatter.ts \ |
21 | ../../../i18n/no/formatter.ts \ | 19 | ../../../i18n/no/formatter.ts \ |
22 | ../../../i18n/pl/formatter.ts \ | 20 | ../../../i18n/pl/formatter.ts \ |
23 | ../../../i18n/pt/formatter.ts \ | 21 | ../../../i18n/pt/formatter.ts \ |
24 | ../../../i18n/pt_BR/formatter.ts \ | 22 | ../../../i18n/pt_BR/formatter.ts \ |
25 | ../../../i18n/sl/formatter.ts \ | 23 | ../../../i18n/sl/formatter.ts \ |
26 | ../../../i18n/zh_CN/formatter.ts \ | 24 | ../../../i18n/zh_CN/formatter.ts \ |
27 | ../../../i18n/zh_TW/formatter.ts | 25 | ../../../i18n/zh_TW/formatter.ts |
28 | 26 | ||
29 | 27 | ||
30 | 28 | ||
diff --git a/noncore/tools/formatter/main.cpp b/noncore/tools/formatter/main.cpp index f67c9f2..6228e55 100644 --- a/noncore/tools/formatter/main.cpp +++ b/noncore/tools/formatter/main.cpp | |||
@@ -1,25 +1,19 @@ | |||
1 | 1 | ||
2 | /*************************************************************************** | 2 | /*************************************************************************** |
3 | main.cpp - description | 3 | main.cpp - description |
4 | ------------------- | 4 | ------------------- |
5 | begin : March 10, 2002 | 5 | begin : March 10, 2002 |
6 | copyright : (C) 2002 by llornkcor | 6 | copyright : (C) 2002 by llornkcor |
7 | email : ljp@llornkcor.com | 7 | email : ljp@llornkcor.com |
8 | * This program is free software; you can redistribute it and/or modify * | 8 | * This program is free software; you can redistribute it and/or modify * |
9 | * it under the terms of the GNU General Public License as published by * | 9 | * it under the terms of the GNU General Public License as published by * |
10 | * the Free Software Foundation; either version 2 of the License, or * | 10 | * the Free Software Foundation; either version 2 of the License, or * |
11 | * (at your option) any later version. * | 11 | * (at your option) any later version. * |
12 | ***************************************************************************/ | 12 | ***************************************************************************/ |
13 | #include <qpe/qpeapplication.h> | 13 | #include <qpe/qpeapplication.h> |
14 | 14 | ||
15 | #include "formatter.h" | 15 | #include "formatter.h" |
16 | 16 | ||
17 | int main(int argc, char *argv[]) | 17 | #include <opie/oapplicationfactory.h> |
18 | { | ||
19 | QPEApplication a(argc, argv); | ||
20 | |||
21 | FormatterApp formatterApp; | ||
22 | a.showMainWidget( &formatterApp); | ||
23 | return a.exec(); | ||
24 | } | ||
25 | 18 | ||
19 | OPIE_EXPORT_APP( OApplicationFactory<FormatterApp> ) | ||
diff --git a/noncore/tools/opie-sh/opie-sh.control b/noncore/tools/opie-sh/opie-sh.control index a5619ce..f03e5ac 100644 --- a/noncore/tools/opie-sh/opie-sh.control +++ b/noncore/tools/opie-sh/opie-sh.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-sh | 1 | Package: opie-sh |
2 | Files: plugins/application/libopie-sh.so* bin/opie-sh bin/opie-sh-howto.sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html | 2 | Files: bin/opie-sh apps/Opie-SH/opie-sh.desktop pics/opie-sh/*.png help/opie-sh/*.html |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: 0.5-$SUB_VERSION | 7 | Version: 0.5-$SUB_VERSION |
8 | Depends: task-opie-minimal | 8 | Depends: task-opie-minimal |
9 | License: GPL | 9 | License: GPL |
10 | Description: a QDialog shell frontend | 10 | Description: a QDialog shell frontend |
11 | A program to let you use various dialogs from the console (or a shell script) | 11 | A program to let you use various dialogs from the console (or a shell script) |
diff --git a/noncore/tools/remote/opie-remote.control b/noncore/tools/remote/opie-remote.control index 78bfbc9..d29bb06 100644 --- a/noncore/tools/remote/opie-remote.control +++ b/noncore/tools/remote/opie-remote.control | |||
@@ -1,11 +1,11 @@ | |||
1 | Package: opie-remote | 1 | Package: opie-remote |
2 | Files: plugins/application/libremote.so* bin/remote apps/Applications/remote.desktop pics/remote/*.png | 2 | Files: bin/remote apps/Applications/remote.desktop pics/remote/*.png |
3 | Priority: optional | 3 | Priority: optional |
4 | Section: opie/applications | 4 | Section: opie/applications |
5 | Maintainer: Thomas Stephens <spiralman@softhome.net> | 5 | Maintainer: Thomas Stephens <spiralman@softhome.net> |
6 | Architecture: arm | 6 | Architecture: arm |
7 | Version: $QPE_VERSION$EXTRAVERSION | 7 | Version: $QPE_VERSION$EXTRAVERSION |
8 | Depends: task-opie-minimal, lirc | 8 | Depends: task-opie-minimal, lirc |
9 | License: GPL | 9 | License: GPL |
10 | Description: a remote control | 10 | Description: a remote control |
11 | A remote control using irda. A frontend to lirc. | 11 | A remote control using irda. A frontend to lirc. |