-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 84 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpad.h | 3 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpad.pro | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 29 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.h | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/erasetool.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/filltool.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/pointtool.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/shapetool.cpp | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/texttool.cpp | 79 | ||||
-rw-r--r-- | noncore/graphics/drawpad/texttool.h | 46 |
11 files changed, 218 insertions, 35 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 1375792..7e6fc53 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -28,2 +28,3 @@ | |||
28 | #include "rectangletool.h" | 28 | #include "rectangletool.h" |
29 | #include "texttool.h" | ||
29 | 30 | ||
@@ -131,11 +132,17 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
131 | 132 | ||
132 | m_pPointToolAction = new QAction(tr("Draw Point"), Resource::loadIconSet("drawpad/point.png"), QString::null, 0, this); | 133 | m_pLineToolButton = new QToolButton(drawModeToolBar); |
133 | m_pPointToolAction->setToggleAction(true); | 134 | m_pLineToolButton->setToggleButton(true); |
135 | |||
136 | QPopupMenu* linePopupMenu = new QPopupMenu(m_pLineToolButton); | ||
137 | |||
138 | m_pPointToolAction = new QAction(tr("Draw Point"), Resource::loadIconSet("drawpad/point.png"), "", 0, this); | ||
134 | connect(m_pPointToolAction, SIGNAL(activated()), this, SLOT(setPointTool())); | 139 | connect(m_pPointToolAction, SIGNAL(activated()), this, SLOT(setPointTool())); |
135 | m_pPointToolAction->addTo(drawModeToolBar); | 140 | m_pPointToolAction->addTo(linePopupMenu); |
136 | 141 | ||
137 | m_pLineToolAction = new QAction(tr("Draw Line"), Resource::loadIconSet("drawpad/line.png"), QString::null, 0, this); | 142 | m_pLineToolAction = new QAction(tr("Draw Line"), Resource::loadIconSet("drawpad/line.png"), "", 0, this); |
138 | m_pLineToolAction->setToggleAction(true); | ||
139 | connect(m_pLineToolAction, SIGNAL(activated()), this, SLOT(setLineTool())); | 143 | connect(m_pLineToolAction, SIGNAL(activated()), this, SLOT(setLineTool())); |
140 | m_pLineToolAction->addTo(drawModeToolBar); | 144 | m_pLineToolAction->addTo(linePopupMenu); |
145 | |||
146 | m_pLineToolButton->setPopup(linePopupMenu); | ||
147 | m_pLineToolButton->setPopupDelay(0); | ||
141 | 148 | ||
@@ -173,2 +180,7 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
173 | 180 | ||
181 | m_pTextToolAction = new QAction(tr("Insert Text"), Resource::loadIconSet("drawpad/text.png"), QString::null, 0, this); | ||
182 | m_pTextToolAction->setToggleAction(true); | ||
183 | connect(m_pTextToolAction, SIGNAL(activated()), this, SLOT(setTextTool())); | ||
184 | m_pTextToolAction->addTo(drawModeToolBar); | ||
185 | |||
174 | m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadIconSet("drawpad/fill.png"), QString::null, 0, this); | 186 | m_pFillToolAction = new QAction(tr("Fill Region"), Resource::loadIconSet("drawpad/fill.png"), QString::null, 0, this); |
@@ -275,6 +287,12 @@ void DrawPad::setPointTool() | |||
275 | 287 | ||
276 | m_pPointToolAction->setOn(true); | 288 | m_pLineToolButton->setIconSet(m_pPointToolAction->iconSet()); |
277 | m_pLineToolAction->setOn(false); | 289 | QToolTip::add(m_pLineToolButton, m_pPointToolAction->text()); |
290 | |||
291 | disconnect(m_pLineToolButton, SIGNAL(clicked()), 0, 0); | ||
292 | connect(m_pLineToolButton, SIGNAL(clicked()), m_pPointToolAction, SIGNAL(activated())); | ||
293 | |||
294 | m_pLineToolButton->setOn(true); | ||
278 | m_pRectangleToolButton->setOn(false); | 295 | m_pRectangleToolButton->setOn(false); |
279 | m_pEllipseToolButton->setOn(false); | 296 | m_pEllipseToolButton->setOn(false); |
297 | m_pTextToolAction->setOn(false); | ||
280 | m_pFillToolAction->setOn(false); | 298 | m_pFillToolAction->setOn(false); |
@@ -291,6 +309,12 @@ void DrawPad::setLineTool() | |||
291 | 309 | ||
292 | m_pPointToolAction->setOn(false); | 310 | m_pLineToolButton->setIconSet(m_pLineToolAction->iconSet()); |
293 | m_pLineToolAction->setOn(true); | 311 | QToolTip::add(m_pLineToolButton, m_pLineToolAction->text()); |
312 | |||
313 | disconnect(m_pLineToolButton, SIGNAL(clicked()), 0, 0); | ||
314 | connect(m_pLineToolButton, SIGNAL(clicked()), m_pLineToolAction, SIGNAL(activated())); | ||
315 | |||
316 | m_pLineToolButton->setOn(true); | ||
294 | m_pRectangleToolButton->setOn(false); | 317 | m_pRectangleToolButton->setOn(false); |
295 | m_pEllipseToolButton->setOn(false); | 318 | m_pEllipseToolButton->setOn(false); |
319 | m_pTextToolAction->setOn(false); | ||
296 | m_pFillToolAction->setOn(false); | 320 | m_pFillToolAction->setOn(false); |
@@ -313,6 +337,6 @@ void DrawPad::setRectangleTool() | |||
313 | 337 | ||
314 | m_pPointToolAction->setOn(false); | 338 | m_pLineToolButton->setOn(false); |
315 | m_pLineToolAction->setOn(false); | ||
316 | m_pRectangleToolButton->setOn(true); | 339 | m_pRectangleToolButton->setOn(true); |
317 | m_pEllipseToolButton->setOn(false); | 340 | m_pEllipseToolButton->setOn(false); |
341 | m_pTextToolAction->setOn(false); | ||
318 | m_pFillToolAction->setOn(false); | 342 | m_pFillToolAction->setOn(false); |
@@ -335,6 +359,6 @@ void DrawPad::setFilledRectangleTool() | |||
335 | 359 | ||
336 | m_pPointToolAction->setOn(false); | 360 | m_pLineToolButton->setOn(false); |
337 | m_pLineToolAction->setOn(false); | ||
338 | m_pRectangleToolButton->setOn(true); | 361 | m_pRectangleToolButton->setOn(true); |
339 | m_pEllipseToolButton->setOn(false); | 362 | m_pEllipseToolButton->setOn(false); |
363 | m_pTextToolAction->setOn(false); | ||
340 | m_pFillToolAction->setOn(false); | 364 | m_pFillToolAction->setOn(false); |
@@ -357,6 +381,6 @@ void DrawPad::setEllipseTool() | |||
357 | 381 | ||
358 | m_pPointToolAction->setOn(false); | 382 | m_pLineToolButton->setOn(false); |
359 | m_pLineToolAction->setOn(false); | ||
360 | m_pRectangleToolButton->setOn(false); | 383 | m_pRectangleToolButton->setOn(false); |
361 | m_pEllipseToolButton->setOn(true); | 384 | m_pEllipseToolButton->setOn(true); |
385 | m_pTextToolAction->setOn(false); | ||
362 | m_pFillToolAction->setOn(false); | 386 | m_pFillToolAction->setOn(false); |
@@ -379,6 +403,22 @@ void DrawPad::setFilledEllipseTool() | |||
379 | 403 | ||
380 | m_pPointToolAction->setOn(false); | 404 | m_pLineToolButton->setOn(false); |
381 | m_pLineToolAction->setOn(false); | ||
382 | m_pRectangleToolButton->setOn(false); | 405 | m_pRectangleToolButton->setOn(false); |
383 | m_pEllipseToolButton->setOn(true); | 406 | m_pEllipseToolButton->setOn(true); |
407 | m_pTextToolAction->setOn(false); | ||
408 | m_pFillToolAction->setOn(false); | ||
409 | m_pEraseToolAction->setOn(false); | ||
410 | } | ||
411 | |||
412 | void DrawPad::setTextTool() | ||
413 | { | ||
414 | if (m_pTool) { | ||
415 | delete m_pTool; | ||
416 | } | ||
417 | |||
418 | m_pTool = new TextTool(this, m_pDrawPadCanvas); | ||
419 | |||
420 | m_pLineToolButton->setOn(false); | ||
421 | m_pRectangleToolButton->setOn(false); | ||
422 | m_pEllipseToolButton->setOn(false); | ||
423 | m_pTextToolAction->setOn(true); | ||
384 | m_pFillToolAction->setOn(false); | 424 | m_pFillToolAction->setOn(false); |
@@ -395,6 +435,6 @@ void DrawPad::setFillTool() | |||
395 | 435 | ||
396 | m_pPointToolAction->setOn(false); | 436 | m_pLineToolButton->setOn(false); |
397 | m_pLineToolAction->setOn(false); | ||
398 | m_pRectangleToolButton->setOn(false); | 437 | m_pRectangleToolButton->setOn(false); |
399 | m_pEllipseToolButton->setOn(false); | 438 | m_pEllipseToolButton->setOn(false); |
439 | m_pTextToolAction->setOn(false); | ||
400 | m_pFillToolAction->setOn(true); | 440 | m_pFillToolAction->setOn(true); |
@@ -411,6 +451,6 @@ void DrawPad::setEraseTool() | |||
411 | 451 | ||
412 | m_pPointToolAction->setOn(false); | 452 | m_pLineToolButton->setOn(false); |
413 | m_pLineToolAction->setOn(false); | ||
414 | m_pRectangleToolButton->setOn(false); | 453 | m_pRectangleToolButton->setOn(false); |
415 | m_pEllipseToolButton->setOn(false); | 454 | m_pEllipseToolButton->setOn(false); |
455 | m_pTextToolAction->setOn(false); | ||
416 | m_pFillToolAction->setOn(false); | 456 | m_pFillToolAction->setOn(false); |
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h index 62a73c9..e4fd831 100644 --- a/noncore/graphics/drawpad/drawpad.h +++ b/noncore/graphics/drawpad/drawpad.h | |||
@@ -47,2 +47,3 @@ private slots: | |||
47 | void setFilledEllipseTool(); | 47 | void setFilledEllipseTool(); |
48 | void setTextTool(); | ||
48 | void setFillTool(); | 49 | void setFillTool(); |
@@ -84,2 +85,3 @@ private: | |||
84 | QAction* m_pFilledEllipseToolAction; | 85 | QAction* m_pFilledEllipseToolAction; |
86 | QAction* m_pTextToolAction; | ||
85 | QAction* m_pFillToolAction; | 87 | QAction* m_pFillToolAction; |
@@ -87,2 +89,3 @@ private: | |||
87 | 89 | ||
90 | QToolButton* m_pLineToolButton; | ||
88 | QToolButton* m_pRectangleToolButton; | 91 | QToolButton* m_pRectangleToolButton; |
diff --git a/noncore/graphics/drawpad/drawpad.pro b/noncore/graphics/drawpad/drawpad.pro index fce0701..00eb00d 100644 --- a/noncore/graphics/drawpad/drawpad.pro +++ b/noncore/graphics/drawpad/drawpad.pro | |||
@@ -18,2 +18,3 @@ HEADERS = colordialog.h \ | |||
18 | shapetool.h \ | 18 | shapetool.h \ |
19 | texttool.h \ | ||
19 | tool.h | 20 | tool.h |
@@ -36,2 +37,3 @@ SOURCES = colordialog.cpp \ | |||
36 | shapetool.cpp \ | 37 | shapetool.cpp \ |
38 | texttool.cpp \ | ||
37 | tool.cpp | 39 | tool.cpp |
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index db6288f..b39a633 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -330,2 +330,18 @@ uint DrawPadCanvas::pageCount() | |||
330 | 330 | ||
331 | void DrawPadCanvas::backupPage() | ||
332 | { | ||
333 | QPixmap* currentBackup = m_pageBackups.current(); | ||
334 | while (m_pageBackups.last() != currentBackup) { | ||
335 | m_pageBackups.removeLast(); | ||
336 | } | ||
337 | |||
338 | while (m_pageBackups.count() >= (5 + 1)) { | ||
339 | m_pageBackups.removeFirst(); | ||
340 | } | ||
341 | |||
342 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); | ||
343 | |||
344 | emit pageBackupsChanged(); | ||
345 | } | ||
346 | |||
331 | void DrawPadCanvas::deleteAll() | 347 | void DrawPadCanvas::deleteAll() |
@@ -515,15 +531,2 @@ void DrawPadCanvas::contentsMouseReleaseEvent(QMouseEvent* e) | |||
515 | m_pDrawPad->tool()->mouseReleaseEvent(e); | 531 | m_pDrawPad->tool()->mouseReleaseEvent(e); |
516 | |||
517 | QPixmap* currentBackup = m_pageBackups.current(); | ||
518 | while (m_pageBackups.last() != currentBackup) { | ||
519 | m_pageBackups.removeLast(); | ||
520 | } | ||
521 | |||
522 | while (m_pageBackups.count() >= (5 + 1)) { | ||
523 | m_pageBackups.removeFirst(); | ||
524 | } | ||
525 | |||
526 | m_pageBackups.append(new QPixmap(*(m_pages.current()))); | ||
527 | |||
528 | emit pageBackupsChanged(); | ||
529 | } | 532 | } |
diff --git a/noncore/graphics/drawpad/drawpadcanvas.h b/noncore/graphics/drawpad/drawpadcanvas.h index a1a9466..e05ce8a 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.h +++ b/noncore/graphics/drawpad/drawpadcanvas.h | |||
@@ -50,2 +50,4 @@ public: | |||
50 | 50 | ||
51 | void backupPage(); | ||
52 | |||
51 | public slots: | 53 | public slots: |
diff --git a/noncore/graphics/drawpad/erasetool.cpp b/noncore/graphics/drawpad/erasetool.cpp index d37c901..828994b 100644 --- a/noncore/graphics/drawpad/erasetool.cpp +++ b/noncore/graphics/drawpad/erasetool.cpp | |||
@@ -43,2 +43,4 @@ void EraseTool::mouseReleaseEvent(QMouseEvent* e) | |||
43 | m_mousePressed = false; | 43 | m_mousePressed = false; |
44 | |||
45 | m_pDrawPadCanvas->backupPage(); | ||
44 | } | 46 | } |
diff --git a/noncore/graphics/drawpad/filltool.cpp b/noncore/graphics/drawpad/filltool.cpp index 3297d21..004da02 100644 --- a/noncore/graphics/drawpad/filltool.cpp +++ b/noncore/graphics/drawpad/filltool.cpp | |||
@@ -44,2 +44,4 @@ void FillTool::mousePressEvent(QMouseEvent* e) | |||
44 | m_pDrawPadCanvas->viewport()->update(); | 44 | m_pDrawPadCanvas->viewport()->update(); |
45 | |||
46 | m_pDrawPadCanvas->backupPage(); | ||
45 | } | 47 | } |
diff --git a/noncore/graphics/drawpad/pointtool.cpp b/noncore/graphics/drawpad/pointtool.cpp index 5661b03..e281284 100644 --- a/noncore/graphics/drawpad/pointtool.cpp +++ b/noncore/graphics/drawpad/pointtool.cpp | |||
@@ -43,2 +43,4 @@ void PointTool::mouseReleaseEvent(QMouseEvent* e) | |||
43 | m_mousePressed = false; | 43 | m_mousePressed = false; |
44 | |||
45 | m_pDrawPadCanvas->backupPage(); | ||
44 | } | 46 | } |
diff --git a/noncore/graphics/drawpad/shapetool.cpp b/noncore/graphics/drawpad/shapetool.cpp index 3c99370..bc5d9c0 100644 --- a/noncore/graphics/drawpad/shapetool.cpp +++ b/noncore/graphics/drawpad/shapetool.cpp | |||
@@ -63,2 +63,4 @@ void ShapeTool::mouseReleaseEvent(QMouseEvent* e) | |||
63 | m_mousePressed = false; | 63 | m_mousePressed = false; |
64 | |||
65 | m_pDrawPadCanvas->backupPage(); | ||
64 | } | 66 | } |
diff --git a/noncore/graphics/drawpad/texttool.cpp b/noncore/graphics/drawpad/texttool.cpp new file mode 100644 index 0000000..37b4801 --- a/dev/null +++ b/noncore/graphics/drawpad/texttool.cpp | |||
@@ -0,0 +1,79 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * DrawPad - a drawing program for Opie Environment * | ||
4 | * * | ||
5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * | ||
6 | * * | ||
7 | * This program is free software; you can redistribute it and/or modify * | ||
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 * | ||
10 | * (at your option) any later version. * | ||
11 | * * | ||
12 | ***************************************************************************/ | ||
13 | |||
14 | #include "texttool.h" | ||
15 | |||
16 | #include "drawpad.h" | ||
17 | #include "drawpadcanvas.h" | ||
18 | |||
19 | #include <qlayout.h> | ||
20 | #include <qlineedit.h> | ||
21 | #include <qpainter.h> | ||
22 | #include <qpixmap.h> | ||
23 | |||
24 | TextToolDialog::TextToolDialog(QWidget* parent, const char* name) | ||
25 | : QDialog(parent, name, true) | ||
26 | { | ||
27 | setCaption(tr("Insert Text")); | ||
28 | |||
29 | m_pLineEdit = new QLineEdit(this); | ||
30 | |||
31 | QVBoxLayout* mainLayout = new QVBoxLayout(this, 4, 4); | ||
32 | |||
33 | mainLayout->addWidget(m_pLineEdit); | ||
34 | } | ||
35 | |||
36 | TextToolDialog::~TextToolDialog() | ||
37 | { | ||
38 | } | ||
39 | |||
40 | QString TextToolDialog::text() | ||
41 | { | ||
42 | return m_pLineEdit->text(); | ||
43 | } | ||
44 | |||
45 | TextTool::TextTool(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas) | ||
46 | : Tool(drawPad, drawPadCanvas) | ||
47 | { | ||
48 | } | ||
49 | |||
50 | TextTool::~TextTool() | ||
51 | { | ||
52 | } | ||
53 | |||
54 | void TextTool::mousePressEvent(QMouseEvent* e) | ||
55 | { | ||
56 | TextToolDialog textToolDialog(m_pDrawPad); | ||
57 | |||
58 | if (textToolDialog.exec() == QDialog::Accepted && !textToolDialog.text().isEmpty()) { | ||
59 | QPainter painter; | ||
60 | painter.begin(m_pDrawPadCanvas->currentPage()); | ||
61 | painter.setPen(m_pDrawPad->pen()); | ||
62 | painter.drawText(e->x(), e->y(), textToolDialog.text()); | ||
63 | painter.end(); | ||
64 | |||
65 | m_pDrawPadCanvas->viewport()->update(); | ||
66 | |||
67 | m_pDrawPadCanvas->backupPage(); | ||
68 | } | ||
69 | } | ||
70 | |||
71 | void TextTool::mouseReleaseEvent(QMouseEvent* e) | ||
72 | { | ||
73 | Q_UNUSED(e) | ||
74 | } | ||
75 | |||
76 | void TextTool::mouseMoveEvent(QMouseEvent* e) | ||
77 | { | ||
78 | Q_UNUSED(e) | ||
79 | } | ||
diff --git a/noncore/graphics/drawpad/texttool.h b/noncore/graphics/drawpad/texttool.h new file mode 100644 index 0000000..3187675 --- a/dev/null +++ b/noncore/graphics/drawpad/texttool.h | |||
@@ -0,0 +1,46 @@ | |||
1 | /*************************************************************************** | ||
2 | * * | ||
3 | * DrawPad - a drawing program for Opie Environment * | ||
4 | * * | ||
5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * | ||
6 | * * | ||
7 | * This program is free software; you can redistribute it and/or modify * | ||
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 * | ||
10 | * (at your option) any later version. * | ||
11 | * * | ||
12 | ***************************************************************************/ | ||
13 | |||
14 | #ifndef TEXTTOOL_H | ||
15 | #define TEXTTOOL_H | ||
16 | |||
17 | #include "tool.h" | ||
18 | |||
19 | #include <qdialog.h> | ||
20 | |||
21 | class QLineEdit; | ||
22 | |||
23 | class TextToolDialog : public QDialog | ||
24 | { | ||
25 | public: | ||
26 | TextToolDialog(QWidget* parent = 0, const char* name = 0); | ||
27 | ~TextToolDialog(); | ||
28 | |||
29 | QString text(); | ||
30 | |||
31 | private: | ||
32 | QLineEdit* m_pLineEdit; | ||
33 | }; | ||
34 | |||
35 | class TextTool : public Tool | ||
36 | { | ||
37 | public: | ||
38 | TextTool(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas); | ||
39 | ~TextTool(); | ||
40 | |||
41 | void mousePressEvent(QMouseEvent* e); | ||
42 | void mouseReleaseEvent(QMouseEvent* e); | ||
43 | void mouseMoveEvent(QMouseEvent* e); | ||
44 | }; | ||
45 | |||
46 | #endif // TEXTTOOL_H | ||