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
@@ -25,35 +25,35 @@
25#include "newpagedialog.h" 25#include "newpagedialog.h"
26#include "page.h" 26#include "page.h"
27#include "pageinformationdialog.h" 27#include "pageinformationdialog.h"
28#include "pointtool.h" 28#include "pointtool.h"
29#include "rectangletool.h" 29#include "rectangletool.h"
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>
38#include <qpe/qpetoolbar.h> 38#include <qpe/qpetoolbar.h>
39#include <qpe/resource.h> 39#include <qpe/resource.h>
40#include <qpe/qpeapplication.h> 40#include <qpe/qpeapplication.h>
41 41
42#include <qmenubar.h> 42#include <qmenubar.h>
43#include <qaction.h> 43#include <qaction.h>
44#include <qfile.h> 44#include <qfile.h>
45#include <qmessagebox.h> 45#include <qmessagebox.h>
46#include <qspinbox.h> 46#include <qspinbox.h>
47#include <qtoolbutton.h> 47#include <qtoolbutton.h>
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
55 55
56 m_pDrawPadCanvas = new DrawPadCanvas(this, this); 56 m_pDrawPadCanvas = new DrawPadCanvas(this, this);
57 57
58 connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView())); 58 connect(m_pDrawPadCanvas, SIGNAL(pagesChanged()), this, SLOT(updateView()));
59 59
@@ -250,30 +250,30 @@ DrawPad::DrawPad(QWidget* parent, const char* name, WFlags fl )
250 m_pPenWidthSpinBox->setValue(1); 250 m_pPenWidthSpinBox->setValue(1);
251 m_pPenWidthSpinBox->setFocusPolicy(QWidget::NoFocus); 251 m_pPenWidthSpinBox->setFocusPolicy(QWidget::NoFocus);
252 QWhatsThis::add( m_pPenWidthSpinBox, tr( "Click here to select the width of the drawing pen." ) ); 252 QWhatsThis::add( m_pPenWidthSpinBox, tr( "Click here to select the width of the drawing pen." ) );
253 253
254 m_pPenColorToolButton = new QToolButton(drawParametersToolBar); 254 m_pPenColorToolButton = new QToolButton(drawParametersToolBar);
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"));
262 m_pPenColorToolButton->setPopup(penColorPopupMenu); 262 m_pPenColorToolButton->setPopup(penColorPopupMenu);
263 m_pPenColorToolButton->setPopupDelay(0); 263 m_pPenColorToolButton->setPopupDelay(0);
264 264
265 changePenColor(Qt::black); 265 changePenColor(Qt::black);
266 266
267 m_pBrushColorToolButton = new QToolButton(drawParametersToolBar); 267 m_pBrushColorToolButton = new QToolButton(drawParametersToolBar);
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"));
275 m_pBrushColorToolButton->setPopup(brushColorPopupMenu); 275 m_pBrushColorToolButton->setPopup(brushColorPopupMenu);
276 m_pBrushColorToolButton->setPopupDelay(0); 276 m_pBrushColorToolButton->setPopupDelay(0);
277 277
278 changeBrushColor(Qt::white); 278 changeBrushColor(Qt::white);
279 279
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
@@ -10,17 +10,16 @@
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 * * 11 * *
12 ***************************************************************************/ 12 ***************************************************************************/
13 13
14#ifndef DRAWPAD_H 14#ifndef DRAWPAD_H
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;
22class Tool; 21class Tool;
23 22
24class QAction; 23class QAction;
25class QColor; 24class QColor;
26class QSpinBox; 25class QSpinBox;
@@ -57,17 +56,17 @@ private slots:
57 void setFilledEllipseTool(); 56 void setFilledEllipseTool();
58 void setTextTool(); 57 void setTextTool();
59 void setFillTool(); 58 void setFillTool();
60 void setEraseTool(); 59 void setEraseTool();
61 60
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();
69 void importPage(); 68 void importPage();
70 void exportPage(); 69 void exportPage();
71 void thumbnailView(); 70 void thumbnailView();
72 void pageInformation(); 71 void pageInformation();
73 72
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
@@ -35,13 +35,13 @@ SOURCES = drawpad.cpp \
35 pointtool.cpp \ 35 pointtool.cpp \
36 rectangletool.cpp \ 36 rectangletool.cpp \
37 shapetool.cpp \ 37 shapetool.cpp \
38 texttool.cpp \ 38 texttool.cpp \
39 thumbnailview.cpp \ 39 thumbnailview.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
47include ( $(OPIEDIR)/include.pro ) 47include ( $(OPIEDIR)/include.pro )
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
@@ -8,17 +8,17 @@
8 * it under the terms of the GNU General Public License as published by * 8 * it under the terms of the GNU General Public License as published by *
9 * the Free Software Foundation; either version 2 of the License, or * 9 * the Free Software Foundation; either version 2 of the License, or *
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 * * 11 * *
12 ***************************************************************************/ 12 ***************************************************************************/
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>
20#include <qimage.h> 20#include <qimage.h>
21#include <qlabel.h> 21#include <qlabel.h>
22#include <qlayout.h> 22#include <qlayout.h>
23#include <qlineedit.h> 23#include <qlineedit.h>
24#include <qradiobutton.h> 24#include <qradiobutton.h>
@@ -61,18 +61,18 @@ ExportDialog::ExportDialog(uint pageAt, uint pageCount, QWidget* parent, const c
61 QLabel* formatLabel = new QLabel(tr("Format:"), exportGroupBox); 61 QLabel* formatLabel = new QLabel(tr("Format:"), exportGroupBox);
62 62
63 m_pNameLineEdit = new QLineEdit(exportGroupBox); 63 m_pNameLineEdit = new QLineEdit(exportGroupBox);
64 64
65 m_pFormatComboBox = new QComboBox(exportGroupBox); 65 m_pFormatComboBox = new QComboBox(exportGroupBox);
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 );
74 74
75 QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); 75 QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4);
76 selectionButtonGroup->layout()->setSpacing(4); 76 selectionButtonGroup->layout()->setSpacing(4);
77 exportGroupBox->layout()->setSpacing(4); 77 exportGroupBox->layout()->setSpacing(4);
78 QGridLayout* selectionLayout = new QGridLayout(selectionButtonGroup->layout(), 2, 2); 78 QGridLayout* selectionLayout = new QGridLayout(selectionButtonGroup->layout(), 2, 2);
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
@@ -8,33 +8,33 @@
8 * it under the terms of the GNU General Public License as published by * 8 * it under the terms of the GNU General Public License as published by *
9 * the Free Software Foundation; either version 2 of the License, or * 9 * the Free Software Foundation; either version 2 of the License, or *
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 * * 11 * *
12 ***************************************************************************/ 12 ***************************************************************************/
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>
20#include <qlabel.h> 20#include <qlabel.h>
21#include <qlayout.h> 21#include <qlayout.h>
22#include <qpushbutton.h> 22#include <qpushbutton.h>
23 23
24ImportDialog::ImportDialog(QWidget* parent, const char* name) 24ImportDialog::ImportDialog(QWidget* parent, const char* name)
25 : QDialog(parent, name, true) 25 : QDialog(parent, name, true)
26{ 26{
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 );
36 connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged())); 36 connect(m_pFileSelector, SIGNAL(fileSelected(const DocLnk&)), this, SLOT(fileChanged()));
37 37
38 m_pPreviewLabel = new QLabel(this); 38 m_pPreviewLabel = new QLabel(this);
39 m_pPreviewLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken); 39 m_pPreviewLabel->setFrameStyle(QFrame::Panel | QFrame::Sunken);
40 m_pPreviewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter); 40 m_pPreviewLabel->setAlignment(Qt::AlignHCenter | Qt::AlignVCenter);
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
@@ -9,37 +9,38 @@
9 * the Free Software Foundation; either version 2 of the License, or * 9 * the Free Software Foundation; either version 2 of the License, or *
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 * * 11 * *
12 ***************************************************************************/ 12 ***************************************************************************/
13 13
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:
30 ImportDialog(QWidget* parent = 0, const char* name = 0); 31 ImportDialog(QWidget* parent = 0, const char* name = 0);
31 ~ImportDialog(); 32 ~ImportDialog();
32 33
33 const DocLnk* selected(); 34 const DocLnk* selected();
34 35
35private slots: 36private slots:
36 void fileChanged(); 37 void fileChanged();
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};
44 45
45#endif // IMPORTDIALOG_H 46#endif // IMPORTDIALOG_H
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
@@ -8,11 +8,11 @@
8 * it under the terms of the GNU General Public License as published by * 8 * it under the terms of the GNU General Public License as published by *
9 * the Free Software Foundation; either version 2 of the License, or * 9 * the Free Software Foundation; either version 2 of the License, or *
10 * (at your option) any later version. * 10 * (at your option) any later version. *
11 * * 11 * *
12 ***************************************************************************/ 12 ***************************************************************************/
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
@@ -1,12 +1,12 @@
1Package: opie-drawpad 1Package: opie-drawpad
2Files: plugins/application/libdrawpad.so* bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad 2Files: plugins/application/libdrawpad.so* bin/drawpad apps/1Pim/drawpad.desktop pics/drawpad
3Priority: optional 3Priority: 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
11 project, an alternative to the standard Zaurus environment. 11 project, an alternative to the standard Zaurus environment.
12Version: $QPE_VERSION$EXTRAVERSION 12Version: $QPE_VERSION$EXTRAVERSION