| -rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 3 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/drawpad.h | 4 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/drawpad.pro | 7 | ||||
| -rw-r--r-- | noncore/graphics/drawpad/main.cpp | 12 |
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 @@ -44,17 +44,17 @@ #include <qfile.h> #include <qmessagebox.h> #include <qpainter.h> #include <qspinbox.h> #include <qtoolbutton.h> #include <qtooltip.h> #include <qwhatsthis.h> -DrawPad::DrawPad(QWidget* parent, const char* name) +DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) : QMainWindow(parent, name, WStyle_ContextHelp) { // init members m_pDrawPadCanvas = new DrawPadCanvas(this, this); connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView())); @@ -273,16 +273,17 @@ DrawPad::DrawPad(QWidget* parent, const char* name) connect(brushColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&))); QToolTip::add(m_pBrushColorToolButton, tr("Fill Color")); m_pBrushColorToolButton->setPopup(brushColorPopupMenu); m_pBrushColorToolButton->setPopupDelay(0); changeBrushColor(Qt::white); + finishStartup(); } void DrawPad::finishStartup() { // init pages QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); 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 @@ -27,19 +27,21 @@ class QSpinBox; class QToolButton; class QWidgetStack; class DrawPad : public QMainWindow { Q_OBJECT public: - DrawPad(QWidget* parent = 0, const char* name = 0); + DrawPad(QWidget* parent = 0, const char* name = 0, WFlags fl = 0); ~DrawPad(); + static QString appName() { return QString::fromLatin1("drawpad"); } + Tool* tool() { return m_pTool; } QPen pen() { return m_pen; } QBrush brush() { return m_brush; } bool antiAliasing(); void finishStartup(); private slots: 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,10 +1,9 @@ -TEMPLATE = app -CONFIG = qt warn_on release +CONFIG = qt warn_on release quick-app HEADERS = drawpad.h \ drawpadcanvas.h \ ellipsetool.h \ erasetool.h \ exportdialog.h \ filltool.h \ filledellipsetool.h \ filledrectangletool.h \ @@ -37,17 +36,17 @@ SOURCES = drawpad.cpp \ rectangletool.cpp \ shapetool.cpp \ texttool.cpp \ thumbnailview.cpp \ tool.cpp INCLUDEPATH += $(OPIEDIR)/include DEPENDPATH += $(OPIEDIR)/include LIBS += -lqpe -lopie -DESTDIR = $(OPIEDIR)/bin + TARGET = drawpad TRANSLATIONS = ../../../i18n/de/drawpad.ts \ ../../../i18n/nl/drawpad.ts \ ../../../i18n/da/drawpad.ts \ ../../../i18n/xx/drawpad.ts \ ../../../i18n/en/drawpad.ts \ ../../../i18n/es/drawpad.ts \ @@ -59,11 +58,9 @@ TRANSLATIONS = ../../../i18n/de/drawpad.ts \ ../../../i18n/pl/drawpad.ts \ ../../../i18n/pt/drawpad.ts \ ../../../i18n/pt_BR/drawpad.ts \ ../../../i18n/sl/drawpad.ts \ ../../../i18n/zh_CN/drawpad.ts \ ../../../i18n/it/drawpad.ts \ ../../../i18n/zh_TW/drawpad.ts - - include ( $(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 @@ -9,19 +9,11 @@ * the Free Software Foundation; either version 2 of the License, or * * (at your option) any later version. * * * ***************************************************************************/ #include "drawpad.h" #include <qpe/qpeapplication.h> +#include <opie/oapplicationfactory.h> -int main(int argc, char **argv) -{ - QPEApplication a(argc, argv); - - DrawPad mw; // = new DrawPad();; - a.showMainWidget(&mw ); - mw.finishStartup(); - - return a.exec(); -} +OPIE_EXPORT_APP( OApplicationFactory<DrawPad> ) |