author | leseb <leseb> | 2002-06-08 16:46:59 (UTC) |
---|---|---|
committer | leseb <leseb> | 2002-06-08 16:46:59 (UTC) |
commit | 0fef046e0668d727df1884422144b26851d7de41 (patch) (unidiff) | |
tree | e25a8838720d1ce0a3e419ddf079f84f1e148588 | |
parent | 571908b989a85d256767dc5b27bccdb717554bb5 (diff) | |
download | opie-0fef046e0668d727df1884422144b26851d7de41.zip opie-0fef046e0668d727df1884422144b26851d7de41.tar.gz opie-0fef046e0668d727df1884422144b26851d7de41.tar.bz2 |
Working version of new page and clear page in thumbnail view
-rw-r--r-- | noncore/graphics/drawpad/drawpad.cpp | 17 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpad.h | 1 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 33 | ||||
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.h | 2 | ||||
-rw-r--r-- | noncore/graphics/drawpad/thumbnailview.cpp | 38 | ||||
-rw-r--r-- | noncore/graphics/drawpad/thumbnailview.h | 7 |
6 files changed, 75 insertions, 23 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp index 58c0d09..ef55268 100644 --- a/noncore/graphics/drawpad/drawpad.cpp +++ b/noncore/graphics/drawpad/drawpad.cpp | |||
@@ -23,4 +23,5 @@ | |||
23 | #include "importdialog.h" | 23 | #include "importdialog.h" |
24 | #include "linetool.h" | 24 | #include "linetool.h" |
25 | #include "newpagedialog.h" | ||
25 | #include "pointtool.h" | 26 | #include "pointtool.h" |
26 | #include "rectangletool.h" | 27 | #include "rectangletool.h" |
@@ -94,5 +95,5 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
94 | 95 | ||
95 | QAction* newPageAction = new QAction(tr("New Page"), Resource::loadIconSet("new"), QString::null, 0, this); | 96 | QAction* newPageAction = new QAction(tr("New Page"), Resource::loadIconSet("new"), QString::null, 0, this); |
96 | connect(newPageAction, SIGNAL(activated()), m_pDrawPadCanvas, SLOT(newPage())); | 97 | connect(newPageAction, SIGNAL(activated()), this, SLOT(newPage())); |
97 | newPageAction->addTo(pageToolBar); | 98 | newPageAction->addTo(pageToolBar); |
98 | 99 | ||
@@ -269,4 +270,16 @@ DrawPad::~DrawPad() | |||
269 | } | 270 | } |
270 | 271 | ||
272 | void DrawPad::newPage() | ||
273 | { | ||
274 | QRect rect = m_pDrawPadCanvas->contentsRect(); | ||
275 | |||
276 | NewPageDialog newPageDialog(rect.width(), rect.height(), m_pen.color(), m_brush.color(), this); | ||
277 | |||
278 | if (newPageDialog.exec() == QDialog::Accepted) { | ||
279 | m_pDrawPadCanvas->newPage(newPageDialog.selectedWidth(), newPageDialog.selectedHeight(), | ||
280 | newPageDialog.selectedColor()); | ||
281 | } | ||
282 | } | ||
283 | |||
271 | void DrawPad::clearPage() | 284 | void DrawPad::clearPage() |
272 | { | 285 | { |
@@ -576,5 +589,5 @@ void DrawPad::exportPage() | |||
576 | void DrawPad::thumbnailView() | 589 | void DrawPad::thumbnailView() |
577 | { | 590 | { |
578 | ThumbnailView thumbnailView(m_pDrawPadCanvas, this); | 591 | ThumbnailView thumbnailView(this, m_pDrawPadCanvas, this); |
579 | 592 | ||
580 | thumbnailView.showMaximized(); | 593 | thumbnailView.showMaximized(); |
diff --git a/noncore/graphics/drawpad/drawpad.h b/noncore/graphics/drawpad/drawpad.h index 01061b4..9a821f6 100644 --- a/noncore/graphics/drawpad/drawpad.h +++ b/noncore/graphics/drawpad/drawpad.h | |||
@@ -40,4 +40,5 @@ public: | |||
40 | 40 | ||
41 | private slots: | 41 | private slots: |
42 | void newPage(); | ||
42 | void clearPage(); | 43 | void clearPage(); |
43 | void deletePage(); | 44 | void deletePage(); |
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 0a1e9a5..c23ee34 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp | |||
@@ -15,5 +15,4 @@ | |||
15 | 15 | ||
16 | #include "drawpad.h" | 16 | #include "drawpad.h" |
17 | #include "newpagedialog.h" | ||
18 | #include "page.h" | 17 | #include "page.h" |
19 | #include "tool.h" | 18 | #include "tool.h" |
@@ -374,25 +373,17 @@ void DrawPadCanvas::deleteAll() | |||
374 | } | 373 | } |
375 | 374 | ||
376 | void DrawPadCanvas::newPage() | 375 | void DrawPadCanvas::newPage(uint width, uint height, const QColor& color) |
377 | { | 376 | { |
378 | QRect rect = contentsRect(); | 377 | m_pages.insert(m_pages.at() + 1, new Page(width, height)); |
378 | m_pages.current()->fill(color); | ||
379 | 379 | ||
380 | NewPageDialog newPageDialog(rect.width(), rect.height(), m_pDrawPad->pen().color(), | 380 | m_pageBackups.clear(); |
381 | m_pDrawPad->brush().color(), this); | 381 | m_pageBackups.append(new Page(*(m_pages.current()))); |
382 | |||
383 | if (newPageDialog.exec() == QDialog::Accepted) { | ||
384 | m_pages.insert(m_pages.at() + 1, new Page(newPageDialog.selectedWidth(), | ||
385 | newPageDialog.selectedHeight())); | ||
386 | m_pages.current()->fill(newPageDialog.selectedColor()); | ||
387 | |||
388 | m_pageBackups.clear(); | ||
389 | m_pageBackups.append(new Page(*(m_pages.current()))); | ||
390 | 382 | ||
391 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 383 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
392 | viewport()->update(); | 384 | viewport()->update(); |
393 | 385 | ||
394 | emit pagesChanged(); | 386 | emit pagesChanged(); |
395 | emit pageBackupsChanged(); | 387 | emit pageBackupsChanged(); |
396 | } | ||
397 | } | 388 | } |
398 | 389 | ||
@@ -401,5 +392,11 @@ void DrawPadCanvas::clearPage() | |||
401 | m_pages.current()->fill(Qt::white); | 392 | m_pages.current()->fill(Qt::white); |
402 | 393 | ||
394 | m_pageBackups.clear(); | ||
395 | m_pageBackups.append(new Page(*(m_pages.current()))); | ||
396 | |||
397 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | ||
403 | viewport()->update(); | 398 | viewport()->update(); |
399 | |||
400 | emit pageBackupsChanged(); | ||
404 | } | 401 | } |
405 | 402 | ||
diff --git a/noncore/graphics/drawpad/drawpadcanvas.h b/noncore/graphics/drawpad/drawpadcanvas.h index cf2d904..d74d425 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.h +++ b/noncore/graphics/drawpad/drawpadcanvas.h | |||
@@ -53,5 +53,5 @@ public: | |||
53 | public slots: | 53 | public slots: |
54 | void deleteAll(); | 54 | void deleteAll(); |
55 | void newPage(); | 55 | void newPage(uint width, uint height, const QColor& color); |
56 | void clearPage(); | 56 | void clearPage(); |
57 | void deletePage(); | 57 | void deletePage(); |
diff --git a/noncore/graphics/drawpad/thumbnailview.cpp b/noncore/graphics/drawpad/thumbnailview.cpp index 476b7b9..08e106d 100644 --- a/noncore/graphics/drawpad/thumbnailview.cpp +++ b/noncore/graphics/drawpad/thumbnailview.cpp | |||
@@ -14,5 +14,7 @@ | |||
14 | #include "thumbnailview.h" | 14 | #include "thumbnailview.h" |
15 | 15 | ||
16 | #include "drawpad.h" | ||
16 | #include "drawpadcanvas.h" | 17 | #include "drawpadcanvas.h" |
18 | #include "newpagedialog.h" | ||
17 | #include "page.h" | 19 | #include "page.h" |
18 | 20 | ||
@@ -144,8 +146,10 @@ Page* PageListView::selected() const | |||
144 | } | 146 | } |
145 | 147 | ||
146 | ThumbnailView::ThumbnailView(DrawPadCanvas* drawPadCanvas, QWidget* parent, const char* name) | 148 | ThumbnailView::ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWidget* parent, const char* name) |
147 | : QWidget(parent, name, Qt::WType_Modal | Qt::WType_TopLevel) | 149 | : QWidget(parent, name, Qt::WType_Modal | Qt::WType_TopLevel) |
148 | { | 150 | { |
149 | inLoop = false; | 151 | inLoop = false; |
152 | |||
153 | m_pDrawPad = drawPad; | ||
150 | m_pDrawPadCanvas = drawPadCanvas; | 154 | m_pDrawPadCanvas = drawPadCanvas; |
151 | 155 | ||
@@ -155,8 +159,10 @@ ThumbnailView::ThumbnailView(DrawPadCanvas* drawPadCanvas, QWidget* parent, cons | |||
155 | newPageButton->setIconSet(Resource::loadIconSet("new")); | 159 | newPageButton->setIconSet(Resource::loadIconSet("new")); |
156 | newPageButton->setAutoRaise(true); | 160 | newPageButton->setAutoRaise(true); |
161 | connect(newPageButton, SIGNAL(clicked()), this, SLOT(newPage())); | ||
157 | 162 | ||
158 | QToolButton* clearPageButton = new QToolButton(this); | 163 | QToolButton* clearPageButton = new QToolButton(this); |
159 | clearPageButton->setIconSet(Resource::loadIconSet("drawpad/clear")); | 164 | clearPageButton->setIconSet(Resource::loadIconSet("drawpad/clear")); |
160 | clearPageButton->setAutoRaise(true); | 165 | clearPageButton->setAutoRaise(true); |
166 | connect(clearPageButton, SIGNAL(clicked()), this, SLOT(clearPage())); | ||
161 | 167 | ||
162 | QToolButton* deletePageButton = new QToolButton(this); | 168 | QToolButton* deletePageButton = new QToolButton(this); |
@@ -215,4 +221,34 @@ void ThumbnailView::exec() | |||
215 | } | 221 | } |
216 | 222 | ||
223 | void ThumbnailView::newPage() | ||
224 | { | ||
225 | QRect rect = m_pDrawPadCanvas->contentsRect(); | ||
226 | |||
227 | NewPageDialog newPageDialog(rect.width(), rect.height(), m_pDrawPad->pen().color(), | ||
228 | m_pDrawPad->brush().color(), this); | ||
229 | |||
230 | if (newPageDialog.exec() == QDialog::Accepted) { | ||
231 | m_pDrawPadCanvas->newPage(newPageDialog.selectedWidth(), newPageDialog.selectedHeight(), | ||
232 | newPageDialog.selectedColor()); | ||
233 | m_pPageListView->updateView(); | ||
234 | } | ||
235 | } | ||
236 | |||
237 | void ThumbnailView::clearPage() | ||
238 | { | ||
239 | QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe selected page?"), | ||
240 | QMessageBox::Information, QMessageBox::Yes, | ||
241 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | ||
242 | QMessageBox::NoButton, this); | ||
243 | |||
244 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | ||
245 | messageBox.setButtonText(QMessageBox::No, tr("No")); | ||
246 | |||
247 | if (messageBox.exec() == QMessageBox::Yes) { | ||
248 | m_pDrawPadCanvas->clearPage(); | ||
249 | m_pPageListView->updateView(); | ||
250 | } | ||
251 | } | ||
252 | |||
217 | void ThumbnailView::deletePage() | 253 | void ThumbnailView::deletePage() |
218 | { | 254 | { |
diff --git a/noncore/graphics/drawpad/thumbnailview.h b/noncore/graphics/drawpad/thumbnailview.h index 9417655..1fdb168 100644 --- a/noncore/graphics/drawpad/thumbnailview.h +++ b/noncore/graphics/drawpad/thumbnailview.h | |||
@@ -18,4 +18,5 @@ | |||
18 | #include <qlistview.h> | 18 | #include <qlistview.h> |
19 | 19 | ||
20 | class DrawPad; | ||
20 | class DrawPadCanvas; | 21 | class DrawPadCanvas; |
21 | class Page; | 22 | class Page; |
@@ -56,5 +57,5 @@ class ThumbnailView : public QWidget | |||
56 | 57 | ||
57 | public: | 58 | public: |
58 | ThumbnailView(DrawPadCanvas* drawPadCanvas, QWidget* parent = 0, const char* name = 0); | 59 | ThumbnailView(DrawPad* drawPad, DrawPadCanvas* drawPadCanvas, QWidget* parent = 0, const char* name = 0); |
59 | ~ThumbnailView(); | 60 | ~ThumbnailView(); |
60 | 61 | ||
@@ -63,4 +64,6 @@ public: | |||
63 | 64 | ||
64 | public slots: | 65 | public slots: |
66 | void newPage(); | ||
67 | void clearPage(); | ||
65 | void deletePage(); | 68 | void deletePage(); |
66 | void changePage(); | 69 | void changePage(); |
@@ -68,4 +71,6 @@ public slots: | |||
68 | private: | 71 | private: |
69 | bool inLoop; | 72 | bool inLoop; |
73 | |||
74 | DrawPad* m_pDrawPad; | ||
70 | DrawPadCanvas* m_pDrawPadCanvas; | 75 | DrawPadCanvas* m_pDrawPadCanvas; |
71 | 76 | ||