Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (show whitespace changes)
| -rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 21 |
1 files changed, 9 insertions, 12 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 @@ #include "drawpadcanvas.h" #include "drawpad.h" -#include "newpagedialog.h" #include "page.h" #include "tool.h" @@ -373,17 +372,10 @@ void DrawPadCanvas::deleteAll() emit pageBackupsChanged(); } -void DrawPadCanvas::newPage() +void DrawPadCanvas::newPage(uint width, uint height, const QColor& color) { - QRect rect = contentsRect(); - - NewPageDialog newPageDialog(rect.width(), rect.height(), m_pDrawPad->pen().color(), - m_pDrawPad->brush().color(), this); - - if (newPageDialog.exec() == QDialog::Accepted) { - m_pages.insert(m_pages.at() + 1, new Page(newPageDialog.selectedWidth(), - newPageDialog.selectedHeight())); - m_pages.current()->fill(newPageDialog.selectedColor()); + m_pages.insert(m_pages.at() + 1, new Page(width, height)); + m_pages.current()->fill(color); m_pageBackups.clear(); m_pageBackups.append(new Page(*(m_pages.current()))); @@ -394,13 +386,18 @@ void DrawPadCanvas::newPage() emit pagesChanged(); emit pageBackupsChanged(); } -} void DrawPadCanvas::clearPage() { m_pages.current()->fill(Qt::white); + m_pageBackups.clear(); + m_pageBackups.append(new Page(*(m_pages.current()))); + + resizeContents(m_pages.current()->width(), m_pages.current()->height()); viewport()->update(); + + emit pageBackupsChanged(); } void DrawPadCanvas::deletePage() |