summaryrefslogtreecommitdiff
authormickeyl <mickeyl>2003-10-27 20:18:36 (UTC)
committer mickeyl <mickeyl>2003-10-27 20:18:36 (UTC)
commitb367c7a9a97082419832c62d879c1ed2c80b8249 (patch) (unidiff)
tree556d9beed9056aec911734c6bbc365a61ec251a4
parent951d1d4125a80dc814f95d2956853bf53ca52e9a (diff)
downloadopie-b367c7a9a97082419832c62d879c1ed2c80b8249.zip
opie-b367c7a9a97082419832c62d879c1ed2c80b8249.tar.gz
opie-b367c7a9a97082419832c62d879c1ed2c80b8249.tar.bz2
merge noncore/graphics/*
Note: qpdf is still not quicklaunch-able. I recommend not wasting time to convert it but look @ qpdf2 instead.
Diffstat (more/less context) (show whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp3
-rw-r--r--noncore/graphics/drawpad/drawpad.h4
-rw-r--r--noncore/graphics/drawpad/drawpad.pro7
-rw-r--r--noncore/graphics/drawpad/main.cpp12
4 files changed, 9 insertions, 17 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index aac6bc1..ac08e15 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -49,7 +49,7 @@
49#include <qtooltip.h> 49#include <qtooltip.h>
50#include <qwhatsthis.h> 50#include <qwhatsthis.h>
51 51
52DrawPad::DrawPad(QWidget* parent, const char* name) 52DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
53 : QMainWindow(parent, name, WStyle_ContextHelp) 53 : QMainWindow(parent, name, WStyle_ContextHelp)
54{ 54{
55 // init members 55 // init members
@@ -278,6 +278,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name)
278 278
279 changeBrushColor(Qt::white); 279 changeBrushColor(Qt::white);
280 280
281 finishStartup();
281} 282}
282 283
283 284
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index 2cae700..48d5225 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -32,9 +32,11 @@ class DrawPad : public QMainWindow
32 Q_OBJECT 32 Q_OBJECT
33 33
34public: 34public:
35 DrawPad(QWidget* parent = 0, const char* name = 0); 35 DrawPad(QWidget* parent = 0, const char* name = 0, WFlags fl = 0);
36 ~DrawPad(); 36 ~DrawPad();
37 37
38 static QString appName() { return QString::fromLatin1("drawpad"); }
39
38 Tool* tool() { return m_pTool; } 40 Tool* tool() { return m_pTool; }
39 QPen pen() { return m_pen; } 41 QPen pen() { return m_pen; }
40 QBrush brush() { return m_brush; } 42 QBrush brush() { return m_brush; }
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index bfe6ac4..03cf7aa 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -1,5 +1,4 @@
1 TEMPLATE= app 1 CONFIG = qt warn_on release quick-app
2 CONFIG = qt warn_on release
3 HEADERS = drawpad.h \ 2 HEADERS = drawpad.h \
4 drawpadcanvas.h \ 3 drawpadcanvas.h \
5 ellipsetool.h \ 4 ellipsetool.h \
@@ -42,7 +41,7 @@ SOURCES = drawpad.cpp \
42 INCLUDEPATH+= $(OPIEDIR)/include 41 INCLUDEPATH+= $(OPIEDIR)/include
43 DEPENDPATH+= $(OPIEDIR)/include 42 DEPENDPATH+= $(OPIEDIR)/include
44 LIBS += -lqpe -lopie 43 LIBS += -lqpe -lopie
45 DESTDIR = $(OPIEDIR)/bin 44
46 TARGET = drawpad 45 TARGET = drawpad
47 46
48TRANSLATIONS = ../../../i18n/de/drawpad.ts \ 47TRANSLATIONS = ../../../i18n/de/drawpad.ts \
@@ -64,6 +63,4 @@ TRANSLATIONS = ../../../i18n/de/drawpad.ts \
64 ../../../i18n/it/drawpad.ts \ 63 ../../../i18n/it/drawpad.ts \
65 ../../../i18n/zh_TW/drawpad.ts 64 ../../../i18n/zh_TW/drawpad.ts
66 65
67
68
69include ( $(OPIEDIR)/include.pro ) 66include ( $(OPIEDIR)/include.pro )
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp
index 12f8084..87bc621 100644
--- a/noncore/graphics/drawpad/main.cpp
+++ b/noncore/graphics/drawpad/main.cpp
@@ -14,14 +14,6 @@
14#include "drawpad.h" 14#include "drawpad.h"
15 15
16#include <qpe/qpeapplication.h> 16#include <qpe/qpeapplication.h>
17#include <opie/oapplicationfactory.h>
17 18
18int main(int argc, char **argv) 19OPIE_EXPORT_APP( OApplicationFactory<DrawPad> )
19{
20 QPEApplication a(argc, argv);
21
22 DrawPad mw; // = new DrawPad();;
23 a.showMainWidget(&mw );
24 mw.finishStartup();
25
26 return a.exec();
27}