Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 33 |
1 files changed, 15 insertions, 18 deletions
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 | |||
@@ -14,7 +14,6 @@ | |||
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 | ||
@@ -373,34 +372,32 @@ void DrawPadCanvas::deleteAll() | |||
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() |