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 | 4 | ||||
-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 | 30 | ||||
-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, 90 insertions, 64 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,5 +1,3 @@ | |||
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 \ |
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 | |||
@@ -119,4 +119,56 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
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); |
@@ -209,10 +261,10 @@ CalculatorImpl::CalculatorImpl( QWidget * parent, const char * name, | |||
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); |
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 | |||
@@ -74,5 +74,7 @@ class CalculatorImpl : public Calculator | |||
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: |
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 | |||
@@ -22,14 +22,5 @@ | |||
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 | |||
@@ -43,4 +43,5 @@ public: | |||
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 ); |
@@ -68,4 +69,6 @@ public: | |||
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(); |
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,5 +1,3 @@ | |||
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 \ |
@@ -8,5 +6,4 @@ 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 | ||
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 | |||
@@ -22,13 +22,6 @@ | |||
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,4 +1,3 @@ | |||
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 |
@@ -9,6 +8,6 @@ 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 | |||
@@ -10,5 +10,4 @@ | |||
10 | * Requirements: Qt | 10 | * Requirements: Qt |
11 | * | 11 | * |
12 | * $Id$ | ||
13 | * | 12 | * |
14 | ***************************************************************************/ | 13 | ***************************************************************************/ |
@@ -16,24 +15,23 @@ | |||
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 | ||
24 | 23 | struct Layout : QVBox{ | |
25 | int main( int argc, char **argv ) { | 24 | static QString appName() { return QString::fromLatin1("euroconv"); } |
26 | 25 | Layout(QWidget *p, const char* n, WFlags) | |
27 | QPEApplication app( argc, argv ); | 26 | :QVBox(0,"fond" ) |
28 | 27 | { | |
29 | QVBox *layout = new QVBox(0, "fond"); | 28 | LCDDisplay *lcd = new LCDDisplay(this, "lcd"); |
29 | KeyPad *num = new KeyPad(lcd, this, "keypad"); | ||
30 | 30 | ||
31 | LCDDisplay lcd (layout, "lcd"); | 31 | setCaption( QObject::tr("Euroconv") ); |
32 | KeyPad num(&lcd, layout, "keypad"); | 32 | }; |
33 | app.setMainWidget(layout); | 33 | |
34 | layout->setCaption( QObject::tr("Euroconv") ); | 34 | }; |
35 | layout->showMaximized (); | 35 | |
36 | layout->show(); | 36 | OPIE_EXPORT_APP( OApplicationFactory<Layout> ) |
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 | |||
@@ -55,5 +55,5 @@ | |||
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 ) |
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 | |||
@@ -31,5 +31,6 @@ class FormatterApp : public QMainWindow | |||
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 | ||
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,8 +1,6 @@ | |||
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 |
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 | |||
@@ -15,11 +15,5 @@ | |||
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,4 +1,4 @@ | |||
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 |
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,4 +1,4 @@ | |||
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 |