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 | |||
@@ -13,24 +13,25 @@ | |||
13 | 13 | ||
14 | #include "drawpad.h" | 14 | #include "drawpad.h" |
15 | 15 | ||
16 | #include "drawpadcanvas.h" | 16 | #include "drawpadcanvas.h" |
17 | #include "ellipsetool.h" | 17 | #include "ellipsetool.h" |
18 | #include "erasetool.h" | 18 | #include "erasetool.h" |
19 | #include "exportdialog.h" | 19 | #include "exportdialog.h" |
20 | #include "filledellipsetool.h" | 20 | #include "filledellipsetool.h" |
21 | #include "filledrectangletool.h" | 21 | #include "filledrectangletool.h" |
22 | #include "filltool.h" | 22 | #include "filltool.h" |
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" |
27 | #include "texttool.h" | 28 | #include "texttool.h" |
28 | #include "thumbnailview.h" | 29 | #include "thumbnailview.h" |
29 | 30 | ||
30 | #include <opie/colordialog.h> | 31 | #include <opie/colordialog.h> |
31 | #include <opie/colorpopupmenu.h> | 32 | #include <opie/colorpopupmenu.h> |
32 | 33 | ||
33 | #include <qpe/applnk.h> | 34 | #include <qpe/applnk.h> |
34 | #include <qpe/global.h> | 35 | #include <qpe/global.h> |
35 | #include <qpe/qpemenubar.h> | 36 | #include <qpe/qpemenubar.h> |
36 | #include <qpe/qpetoolbar.h> | 37 | #include <qpe/qpetoolbar.h> |
@@ -84,25 +85,25 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
84 | 85 | ||
85 | QAction* thumbnailViewAction = new QAction(tr("Thumbnail View"), tr("Thumbnail View..."), 0, this); | 86 | QAction* thumbnailViewAction = new QAction(tr("Thumbnail View"), tr("Thumbnail View..."), 0, this); |
86 | connect(thumbnailViewAction, SIGNAL(activated()), this, SLOT(thumbnailView())); | 87 | connect(thumbnailViewAction, SIGNAL(activated()), this, SLOT(thumbnailView())); |
87 | thumbnailViewAction->addTo(toolsPopupMenu); | 88 | thumbnailViewAction->addTo(toolsPopupMenu); |
88 | 89 | ||
89 | menuBar->insertItem(tr("Tools"), toolsPopupMenu); | 90 | menuBar->insertItem(tr("Tools"), toolsPopupMenu); |
90 | 91 | ||
91 | // init page toolbar | 92 | // init page toolbar |
92 | 93 | ||
93 | QPEToolBar* pageToolBar = new QPEToolBar(this); | 94 | QPEToolBar* pageToolBar = new QPEToolBar(this); |
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 | ||
99 | QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadIconSet("drawpad/clear"), QString::null, 0, this); | 100 | QAction* clearPageAction = new QAction(tr("Clear Page"), Resource::loadIconSet("drawpad/clear"), QString::null, 0, this); |
100 | connect(clearPageAction, SIGNAL(activated()), this, SLOT(clearPage())); | 101 | connect(clearPageAction, SIGNAL(activated()), this, SLOT(clearPage())); |
101 | clearPageAction->addTo(pageToolBar); | 102 | clearPageAction->addTo(pageToolBar); |
102 | 103 | ||
103 | QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadIconSet("trash"), QString::null, 0, this); | 104 | QAction* deletePageAction = new QAction(tr("Delete Page"), Resource::loadIconSet("trash"), QString::null, 0, this); |
104 | connect(deletePageAction, SIGNAL(activated()), this, SLOT(deletePage())); | 105 | connect(deletePageAction, SIGNAL(activated()), this, SLOT(deletePage())); |
105 | deletePageAction->addTo(pageToolBar); | 106 | deletePageAction->addTo(pageToolBar); |
106 | 107 | ||
107 | QPEToolBar* emptyToolBar = new QPEToolBar(this); | 108 | QPEToolBar* emptyToolBar = new QPEToolBar(this); |
108 | emptyToolBar->setHorizontalStretchable(true); | 109 | emptyToolBar->setHorizontalStretchable(true); |
@@ -259,24 +260,36 @@ DrawPad::DrawPad(QWidget* parent, const char* name) | |||
259 | } | 260 | } |
260 | 261 | ||
261 | DrawPad::~DrawPad() | 262 | DrawPad::~DrawPad() |
262 | { | 263 | { |
263 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); | 264 | QFile file(Global::applicationFileName("drawpad", "drawpad.xml")); |
264 | 265 | ||
265 | if (file.open(IO_WriteOnly)) { | 266 | if (file.open(IO_WriteOnly)) { |
266 | m_pDrawPadCanvas->save(&file); | 267 | m_pDrawPadCanvas->save(&file); |
267 | file.close(); | 268 | file.close(); |
268 | } | 269 | } |
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 | { |
273 | QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe current page?"), | 286 | QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe current page?"), |
274 | QMessageBox::Information, QMessageBox::Yes, | 287 | QMessageBox::Information, QMessageBox::Yes, |
275 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | 288 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, |
276 | QMessageBox::NoButton, this); | 289 | QMessageBox::NoButton, this); |
277 | 290 | ||
278 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | 291 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); |
279 | messageBox.setButtonText(QMessageBox::No, tr("No")); | 292 | messageBox.setButtonText(QMessageBox::No, tr("No")); |
280 | 293 | ||
281 | if (messageBox.exec() == QMessageBox::Yes) { | 294 | if (messageBox.exec() == QMessageBox::Yes) { |
282 | m_pDrawPadCanvas->clearPage(); | 295 | m_pDrawPadCanvas->clearPage(); |
@@ -566,17 +579,17 @@ void DrawPad::exportPage() | |||
566 | ExportDialog exportDialog(m_pDrawPadCanvas->pagePosition(), m_pDrawPadCanvas->pageCount(), this); | 579 | ExportDialog exportDialog(m_pDrawPadCanvas->pagePosition(), m_pDrawPadCanvas->pageCount(), this); |
567 | 580 | ||
568 | exportDialog.showMaximized(); | 581 | exportDialog.showMaximized(); |
569 | 582 | ||
570 | if (exportDialog.exec() == QDialog::Accepted) { | 583 | if (exportDialog.exec() == QDialog::Accepted) { |
571 | m_pDrawPadCanvas->exportPage(exportDialog.selectedFromPage(), exportDialog.selectedToPage(), | 584 | m_pDrawPadCanvas->exportPage(exportDialog.selectedFromPage(), exportDialog.selectedToPage(), |
572 | exportDialog.selectedName(), exportDialog.selectedFormat()); | 585 | exportDialog.selectedName(), exportDialog.selectedFormat()); |
573 | } | 586 | } |
574 | } | 587 | } |
575 | 588 | ||
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(); |
581 | thumbnailView.exec(); | 594 | thumbnailView.exec(); |
582 | } | 595 | } |
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 | |||
@@ -30,24 +30,25 @@ class DrawPad : public QMainWindow | |||
30 | { | 30 | { |
31 | Q_OBJECT | 31 | Q_OBJECT |
32 | 32 | ||
33 | public: | 33 | public: |
34 | DrawPad(QWidget* parent = 0, const char* name = 0); | 34 | DrawPad(QWidget* parent = 0, const char* name = 0); |
35 | ~DrawPad(); | 35 | ~DrawPad(); |
36 | 36 | ||
37 | Tool* tool() { return m_pTool; } | 37 | Tool* tool() { return m_pTool; } |
38 | QPen pen() { return m_pen; } | 38 | QPen pen() { return m_pen; } |
39 | QBrush brush() { return m_brush; } | 39 | QBrush brush() { return m_brush; } |
40 | 40 | ||
41 | private slots: | 41 | private slots: |
42 | void newPage(); | ||
42 | void clearPage(); | 43 | void clearPage(); |
43 | void deletePage(); | 44 | void deletePage(); |
44 | 45 | ||
45 | void setPointTool(); | 46 | void setPointTool(); |
46 | void setLineTool(); | 47 | void setLineTool(); |
47 | void setRectangleTool(); | 48 | void setRectangleTool(); |
48 | void setFilledRectangleTool(); | 49 | void setFilledRectangleTool(); |
49 | void setEllipseTool(); | 50 | void setEllipseTool(); |
50 | void setFilledEllipseTool(); | 51 | void setFilledEllipseTool(); |
51 | void setTextTool(); | 52 | void setTextTool(); |
52 | void setFillTool(); | 53 | void setFillTool(); |
53 | void setEraseTool(); | 54 | void setEraseTool(); |
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 | |||
@@ -5,25 +5,24 @@ | |||
5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * | 5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * |
6 | * * | 6 | * * |
7 | * This program is free software; you can redistribute it and/or modify * | 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 * | 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 "drawpadcanvas.h" | 14 | #include "drawpadcanvas.h" |
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" |
20 | 19 | ||
21 | #include <qpe/applnk.h> | 20 | #include <qpe/applnk.h> |
22 | #include <qpe/filemanager.h> | 21 | #include <qpe/filemanager.h> |
23 | #include <qpe/mimetype.h> | 22 | #include <qpe/mimetype.h> |
24 | 23 | ||
25 | #include <qbuffer.h> | 24 | #include <qbuffer.h> |
26 | #include <qimage.h> | 25 | #include <qimage.h> |
27 | #include <qpainter.h> | 26 | #include <qpainter.h> |
28 | #include <qtextcodec.h> | 27 | #include <qtextcodec.h> |
29 | #include <qtextstream.h> | 28 | #include <qtextstream.h> |
@@ -364,52 +363,50 @@ void DrawPadCanvas::deleteAll() | |||
364 | m_pages.current()->fill(Qt::white); | 363 | m_pages.current()->fill(Qt::white); |
365 | 364 | ||
366 | m_pageBackups.clear(); | 365 | m_pageBackups.clear(); |
367 | m_pageBackups.append(new Page(*(m_pages.current()))); | 366 | m_pageBackups.append(new Page(*(m_pages.current()))); |
368 | 367 | ||
369 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 368 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
370 | viewport()->update(); | 369 | viewport()->update(); |
371 | 370 | ||
372 | emit pagesChanged(); | 371 | emit pagesChanged(); |
373 | emit pageBackupsChanged(); | 372 | emit pageBackupsChanged(); |
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 | ||
399 | void DrawPadCanvas::clearPage() | 390 | void DrawPadCanvas::clearPage() |
400 | { | 391 | { |
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 | ||
406 | void DrawPadCanvas::deletePage() | 403 | void DrawPadCanvas::deletePage() |
407 | { | 404 | { |
408 | m_pages.remove(m_pages.current()); | 405 | m_pages.remove(m_pages.current()); |
409 | 406 | ||
410 | if (m_pages.isEmpty()) { | 407 | if (m_pages.isEmpty()) { |
411 | m_pages.append(new Page(contentsRect().size())); | 408 | m_pages.append(new Page(contentsRect().size())); |
412 | m_pages.current()->fill(Qt::white); | 409 | m_pages.current()->fill(Qt::white); |
413 | } | 410 | } |
414 | 411 | ||
415 | m_pageBackups.clear(); | 412 | m_pageBackups.clear(); |
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 | |||
@@ -43,25 +43,25 @@ public: | |||
43 | bool goNextPageEnabled(); | 43 | bool goNextPageEnabled(); |
44 | 44 | ||
45 | Page* currentPage(); | 45 | Page* currentPage(); |
46 | QList<Page> pages(); | 46 | QList<Page> pages(); |
47 | uint pagePosition(); | 47 | uint pagePosition(); |
48 | uint pageCount(); | 48 | uint pageCount(); |
49 | 49 | ||
50 | void selectPage(Page* page); | 50 | void selectPage(Page* page); |
51 | void backupPage(); | 51 | void backupPage(); |
52 | 52 | ||
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(); |
58 | 58 | ||
59 | void undo(); | 59 | void undo(); |
60 | void redo(); | 60 | void redo(); |
61 | 61 | ||
62 | void goFirstPage(); | 62 | void goFirstPage(); |
63 | void goPreviousPage(); | 63 | void goPreviousPage(); |
64 | void goNextPage(); | 64 | void goNextPage(); |
65 | void goLastPage(); | 65 | void goLastPage(); |
66 | 66 | ||
67 | signals: | 67 | signals: |
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 | |||
@@ -4,25 +4,27 @@ | |||
4 | * * | 4 | * * |
5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * | 5 | * (C) 2002 by S. Prud'homme <prudhomme@laposte.net> * |
6 | * * | 6 | * * |
7 | * This program is free software; you can redistribute it and/or modify * | 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 * | 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 "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 | ||
19 | #include <qpe/resource.h> | 21 | #include <qpe/resource.h> |
20 | 22 | ||
21 | #include <qapplication.h> | 23 | #include <qapplication.h> |
22 | #include <qheader.h> | 24 | #include <qheader.h> |
23 | #include <qimage.h> | 25 | #include <qimage.h> |
24 | #include <qlayout.h> | 26 | #include <qlayout.h> |
25 | #include <qmessagebox.h> | 27 | #include <qmessagebox.h> |
26 | #include <qtoolbutton.h> | 28 | #include <qtoolbutton.h> |
27 | 29 | ||
28 | PageListViewItem::PageListViewItem(Page* page, QListView* parent) | 30 | PageListViewItem::PageListViewItem(Page* page, QListView* parent) |
@@ -134,39 +136,43 @@ Page* PageListView::selected() const | |||
134 | 136 | ||
135 | PageListViewItem* item = (PageListViewItem*)selectedItem(); | 137 | PageListViewItem* item = (PageListViewItem*)selectedItem(); |
136 | 138 | ||
137 | if (item) { | 139 | if (item) { |
138 | page = item->page(); | 140 | page = item->page(); |
139 | } else { | 141 | } else { |
140 | page = NULL; | 142 | page = NULL; |
141 | } | 143 | } |
142 | 144 | ||
143 | return page; | 145 | return page; |
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 | ||
152 | setCaption(tr("Thumbnail")); | 156 | setCaption(tr("Thumbnail")); |
153 | 157 | ||
154 | QToolButton* newPageButton = new QToolButton(this); | 158 | QToolButton* newPageButton = new QToolButton(this); |
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); |
163 | deletePageButton->setIconSet(Resource::loadIconSet("trash")); | 169 | deletePageButton->setIconSet(Resource::loadIconSet("trash")); |
164 | deletePageButton->setAutoRaise(true); | 170 | deletePageButton->setAutoRaise(true); |
165 | connect(deletePageButton, SIGNAL(clicked()), this, SLOT(deletePage())); | 171 | connect(deletePageButton, SIGNAL(clicked()), this, SLOT(deletePage())); |
166 | 172 | ||
167 | QToolButton* movePageUpButton = new QToolButton(this); | 173 | QToolButton* movePageUpButton = new QToolButton(this); |
168 | movePageUpButton->setIconSet(Resource::loadIconSet("up")); | 174 | movePageUpButton->setIconSet(Resource::loadIconSet("up")); |
169 | movePageUpButton->setAutoRaise(true); | 175 | movePageUpButton->setAutoRaise(true); |
170 | 176 | ||
171 | QToolButton* movePageDownButton = new QToolButton(this); | 177 | QToolButton* movePageDownButton = new QToolButton(this); |
172 | movePageDownButton->setIconSet(Resource::loadIconSet("down")); | 178 | movePageDownButton->setIconSet(Resource::loadIconSet("down")); |
@@ -205,24 +211,54 @@ void ThumbnailView::hide() | |||
205 | } | 211 | } |
206 | 212 | ||
207 | void ThumbnailView::exec() | 213 | void ThumbnailView::exec() |
208 | { | 214 | { |
209 | show(); | 215 | show(); |
210 | 216 | ||
211 | if (!inLoop) { | 217 | if (!inLoop) { |
212 | inLoop = true; | 218 | inLoop = true; |
213 | qApp->enter_loop(); | 219 | qApp->enter_loop(); |
214 | } | 220 | } |
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 | { |
219 | QMessageBox messageBox(tr("Delete Page"), tr("Do you want to delete\nthe selected page?"), | 255 | QMessageBox messageBox(tr("Delete Page"), tr("Do you want to delete\nthe selected page?"), |
220 | QMessageBox::Information, QMessageBox::Yes, | 256 | QMessageBox::Information, QMessageBox::Yes, |
221 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | 257 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, |
222 | QMessageBox::NoButton, this); | 258 | QMessageBox::NoButton, this); |
223 | 259 | ||
224 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | 260 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); |
225 | messageBox.setButtonText(QMessageBox::No, tr("No")); | 261 | messageBox.setButtonText(QMessageBox::No, tr("No")); |
226 | 262 | ||
227 | if (messageBox.exec() == QMessageBox::Yes) { | 263 | if (messageBox.exec() == QMessageBox::Yes) { |
228 | m_pDrawPadCanvas->deletePage(); | 264 | m_pDrawPadCanvas->deletePage(); |
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 | |||
@@ -8,24 +8,25 @@ | |||
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 | #ifndef THUMBNAILVIEW_H | 14 | #ifndef THUMBNAILVIEW_H |
15 | #define THUMBNAILVIEW_H | 15 | #define THUMBNAILVIEW_H |
16 | 16 | ||
17 | #include <qwidget.h> | 17 | #include <qwidget.h> |
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; |
22 | 23 | ||
23 | class PageListViewItem : public QListViewItem | 24 | class PageListViewItem : public QListViewItem |
24 | { | 25 | { |
25 | public: | 26 | public: |
26 | PageListViewItem(Page* page, QListView* parent); | 27 | PageListViewItem(Page* page, QListView* parent); |
27 | ~PageListViewItem(); | 28 | ~PageListViewItem(); |
28 | 29 | ||
29 | Page* page() const; | 30 | Page* page() const; |
30 | 31 | ||
31 | private: | 32 | private: |
@@ -46,30 +47,34 @@ public: | |||
46 | protected: | 47 | protected: |
47 | void resizeEvent(QResizeEvent* e); | 48 | void resizeEvent(QResizeEvent* e); |
48 | 49 | ||
49 | private: | 50 | private: |
50 | DrawPadCanvas* m_pDrawPadCanvas; | 51 | DrawPadCanvas* m_pDrawPadCanvas; |
51 | }; | 52 | }; |
52 | 53 | ||
53 | class ThumbnailView : public QWidget | 54 | class ThumbnailView : public QWidget |
54 | { | 55 | { |
55 | Q_OBJECT | 56 | Q_OBJECT |
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 | ||
61 | void hide(); | 62 | void hide(); |
62 | void exec(); | 63 | void exec(); |
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(); |
67 | 70 | ||
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 | ||
72 | PageListView* m_pPageListView; | 77 | PageListView* m_pPageListView; |
73 | }; | 78 | }; |
74 | 79 | ||
75 | #endif // THUMBNAILVIEW_H | 80 | #endif // THUMBNAILVIEW_H |