summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/config.in2
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp10
-rw-r--r--noncore/graphics/drawpad/drawpad.h3
-rw-r--r--noncore/graphics/drawpad/drawpad.pro2
-rw-r--r--noncore/graphics/drawpad/exportdialog.cpp6
-rw-r--r--noncore/graphics/drawpad/importdialog.cpp8
-rw-r--r--noncore/graphics/drawpad/importdialog.h7
-rw-r--r--noncore/graphics/drawpad/main.cpp2
-rw-r--r--noncore/graphics/drawpad/opie-drawpad.control2
9 files changed, 21 insertions, 21 deletions
diff --git a/noncore/graphics/drawpad/config.in b/noncore/graphics/drawpad/config.in
index 290a642..3ed03a4 100644
--- a/noncore/graphics/drawpad/config.in
+++ b/noncore/graphics/drawpad/config.in
@@ -1,4 +1,4 @@
1 config DRAWPAD 1 config DRAWPAD
2 boolean "opie-drawpad (take simple notes or draw images)" 2 boolean "opie-drawpad (take simple notes or draw images)"
3 default "y" 3 default "y"
4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE 4 depends ( LIBQPE || LIBQPE-X11 ) && LIBOPIE2CORE && LIBOPIE2UI && LIBQTAUX
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 9f0e27f..55b23cc 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -30,8 +30,8 @@
30#include "texttool.h" 30#include "texttool.h"
31#include "thumbnailview.h" 31#include "thumbnailview.h"
32 32
33#include <opie/colordialog.h> 33#include <opie2/qcolordialog.h>
34#include <opie/colorpopupmenu.h> 34#include <opie2/ocolorpopupmenu.h>
35 35
36#include <qpe/applnk.h> 36#include <qpe/applnk.h>
37#include <qpe/config.h> 37#include <qpe/config.h>
@@ -48,7 +48,7 @@
48#include <qtooltip.h> 48#include <qtooltip.h>
49#include <qwhatsthis.h> 49#include <qwhatsthis.h>
50 50
51DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl ) 51DrawPad::DrawPad(QWidget* parent, const char* name, WFlags /*fl*/ )
52 : QMainWindow(parent, name, WStyle_ContextHelp) 52 : QMainWindow(parent, name, WStyle_ContextHelp)
53{ 53{
54 // init members 54 // init members
@@ -255,7 +255,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
255 m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor")); 255 m_pPenColorToolButton->setPixmap(Resource::loadPixmap("drawpad/pencolor"));
256 QWhatsThis::add( m_pPenColorToolButton, tr( "Click here to select the color used when drawing." ) ); 256 QWhatsThis::add( m_pPenColorToolButton, tr( "Click here to select the color used when drawing." ) );
257 257
258 OColorPopupMenu* penColorPopupMenu = new OColorPopupMenu(Qt::black, m_pPenColorToolButton); 258 Opie::OColorPopupMenu* penColorPopupMenu = new Opie::OColorPopupMenu(Qt::black, m_pPenColorToolButton);
259 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&))); 259 connect(penColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changePenColor(const QColor&)));
260 260
261 QToolTip::add(m_pPenColorToolButton, tr("Pen Color")); 261 QToolTip::add(m_pPenColorToolButton, tr("Pen Color"));
@@ -268,7 +268,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
268 m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor")); 268 m_pBrushColorToolButton->setPixmap(Resource::loadPixmap("drawpad/brushcolor"));
269 QWhatsThis::add( m_pBrushColorToolButton, tr( "Click here to select the color used when filling in areas." ) ); 269 QWhatsThis::add( m_pBrushColorToolButton, tr( "Click here to select the color used when filling in areas." ) );
270 270
271 OColorPopupMenu* brushColorPopupMenu = new OColorPopupMenu(Qt::white, m_pBrushColorToolButton); 271 Opie::OColorPopupMenu* brushColorPopupMenu = new Opie::OColorPopupMenu(Qt::white, m_pBrushColorToolButton);
272 connect(brushColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&))); 272 connect(brushColorPopupMenu, SIGNAL(colorSelected(const QColor&)), this, SLOT(changeBrushColor(const QColor&)));
273 273
274 QToolTip::add(m_pBrushColorToolButton, tr("Fill Color")); 274 QToolTip::add(m_pBrushColorToolButton, tr("Fill Color"));
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h
index 48d5225..8ba6e58 100644
--- a/noncore/graphics/drawpad/drawpad.h
+++ b/noncore/graphics/drawpad/drawpad.h
@@ -15,7 +15,6 @@
15#define DRAWPAD_H 15#define DRAWPAD_H
16 16
17#include <qmainwindow.h> 17#include <qmainwindow.h>
18
19#include <qpen.h> 18#include <qpen.h>
20 19
21class DrawPadCanvas; 20class DrawPadCanvas;
@@ -62,7 +61,7 @@ private slots:
62 void changePenWidth(int value); 61 void changePenWidth(int value);
63 void changePenColor(const QColor& color); 62 void changePenColor(const QColor& color);
64 void changeBrushColor(const QColor& color); 63 void changeBrushColor(const QColor& color);
65 64
66 void updateView(); 65 void updateView();
67 66
68 void deleteAll(); 67 void deleteAll();
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro
index 30b2199..5e6ca6b 100644
--- a/noncore/graphics/drawpad/drawpad.pro
+++ b/noncore/graphics/drawpad/drawpad.pro
@@ -40,7 +40,7 @@ SOURCES = drawpad.cpp \
40 tool.cpp 40 tool.cpp
41 INCLUDEPATH+= $(OPIEDIR)/include 41 INCLUDEPATH+= $(OPIEDIR)/include
42 DEPENDPATH+= $(OPIEDIR)/include 42 DEPENDPATH+= $(OPIEDIR)/include
43 LIBS += -lqpe -lopie 43 LIBS += -lqpe -lopiecore2 -lopieui2 -lqtaux2
44 44
45 TARGET = drawpad 45 TARGET = drawpad
46 46
diff --git a/noncore/graphics/drawpad/exportdialog.cpp b/noncore/graphics/drawpad/exportdialog.cpp
index d63f428..169acef 100644
--- a/noncore/graphics/drawpad/exportdialog.cpp
+++ b/noncore/graphics/drawpad/exportdialog.cpp
@@ -13,7 +13,7 @@
13 13
14#include "exportdialog.h" 14#include "exportdialog.h"
15 15
16#include <opie/ofileselector.h> 16#include <opie2/ofileselector.h>
17 17
18#include <qbuttongroup.h> 18#include <qbuttongroup.h>
19#include <qcombobox.h> 19#include <qcombobox.h>
@@ -66,8 +66,8 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
66 m_pFormatComboBox->insertStrList(QImageIO::outputFormats()); 66 m_pFormatComboBox->insertStrList(QImageIO::outputFormats());
67 67
68 MimeTypes types; types.insert( tr("All Images"), "image/*" ); 68 MimeTypes types; types.insert( tr("All Images"), "image/*" );
69 OFileSelector* fileSelector = new OFileSelector(this, OFileSelector::FileSelector, 69 Opie::OFileSelector* fileSelector = new Opie::OFileSelector(this, Opie::OFileSelector::FileSelector,
70 OFileSelector::Normal, 70 Opie::OFileSelector::Normal,
71 QString::null, QString::null, 71 QString::null, QString::null,
72 types ); 72 types );
73 fileSelector->setNameVisible( false ); 73 fileSelector->setNameVisible( false );
diff --git a/noncore/graphics/drawpad/importdialog.cpp b/noncore/graphics/drawpad/importdialog.cpp
index ce2e7ee..4fc0a0e 100644
--- a/noncore/graphics/drawpad/importdialog.cpp
+++ b/noncore/graphics/drawpad/importdialog.cpp
@@ -13,7 +13,7 @@
13 13
14#include "importdialog.h" 14#include "importdialog.h"
15 15
16#include <opie/ofileselector.h> 16#include <qpe/mimetype.h>
17 17
18#include <qcheckbox.h> 18#include <qcheckbox.h>
19#include <qimage.h> 19#include <qimage.h>
@@ -27,9 +27,9 @@ ImportDialog::ImportDialog(QWidget* parent, const char* name)
27 setCaption(tr("DrawPad - Import")); 27 setCaption(tr("DrawPad - Import"));
28 28
29 MimeTypes types; types.insert( tr("All images"),"image/*" ); 29 MimeTypes types; types.insert( tr("All images"),"image/*" );
30 m_pFileSelector = new OFileSelector(this, 30 m_pFileSelector = new Opie::OFileSelector(this,
31 OFileSelector::FileSelector, 31 Opie::OFileSelector::FileSelector,
32 OFileSelector::Normal, 32 Opie::OFileSelector::Normal,
33 QString::null, 33 QString::null,
34 QString::null, types ); 34 QString::null, types );
35 m_pFileSelector->setNameVisible( false ); 35 m_pFileSelector->setNameVisible( false );
diff --git a/noncore/graphics/drawpad/importdialog.h b/noncore/graphics/drawpad/importdialog.h
index ed655a5..16227d2 100644
--- a/noncore/graphics/drawpad/importdialog.h
+++ b/noncore/graphics/drawpad/importdialog.h
@@ -14,16 +14,17 @@
14#ifndef IMPORTDIALOG_H 14#ifndef IMPORTDIALOG_H
15#define IMPORTDIALOG_H 15#define IMPORTDIALOG_H
16 16
17#include <opie2/ofileselector.h>
18
17#include <qdialog.h> 19#include <qdialog.h>
18 20
19class DocLnk; 21class DocLnk;
20class OFileSelector;
21 22
22class QCheckBox; 23class QCheckBox;
23class QLabel; 24class QLabel;
24 25
25class ImportDialog : public QDialog 26class ImportDialog : public QDialog
26{ 27{
27 Q_OBJECT 28 Q_OBJECT
28 29
29public: 30public:
@@ -37,7 +38,7 @@ private slots:
37 void preview(); 38 void preview();
38 39
39private: 40private:
40 OFileSelector* m_pFileSelector; 41 Opie::OFileSelector* m_pFileSelector;
41 QLabel* m_pPreviewLabel; 42 QLabel* m_pPreviewLabel;
42 QCheckBox* m_pAutomaticPreviewCheckBox; 43 QCheckBox* m_pAutomaticPreviewCheckBox;
43}; 44};
diff --git a/noncore/graphics/drawpad/main.cpp b/noncore/graphics/drawpad/main.cpp
index c87cc0f..a6c666b 100644
--- a/noncore/graphics/drawpad/main.cpp
+++ b/noncore/graphics/drawpad/main.cpp
@@ -13,6 +13,6 @@
13 13
14#include "drawpad.h" 14#include "drawpad.h"
15 15
16#include <opie/oapplicationfactory.h> 16#include <opie2/oapplicationfactory.h>
17 17
18OPIE_EXPORT_APP( OApplicationFactory<DrawPad> ) 18OPIE_EXPORT_APP( OApplicationFactory<DrawPad> )
diff --git a/noncore/graphics/drawpad/opie-drawpad.control b/noncore/graphics/drawpad/opie-drawpad.control
index f0aa0b4..2a403f9 100644
--- a/noncore/graphics/drawpad/opie-drawpad.control
+++ b/noncore/graphics/drawpad/opie-drawpad.control
@@ -4,7 +4,7 @@ Priority: optional
4Section: opie/pim 4Section: opie/pim
5Maintainer: Sébastien Prud'homme <prudhomme@laposte.net> 5Maintainer: Sébastien Prud'homme <prudhomme@laposte.net>
6Architecture: arm 6Architecture: arm
7Depends: task-opie-minimal, libopie1 7Depends: task-opie-minimal, libopiecore2, libopieui2, libqtaux2
8Description: A note taking program with basic draw tools 8Description: A note taking program with basic draw tools
9 DrawPad is an easy note taking program for Zaurus. It can also 9 DrawPad is an easy note taking program for Zaurus. It can also
10 be used to draw simple images. DrawPad was developed for the Opie 10 be used to draw simple images. DrawPad was developed for the Opie