Diffstat (limited to 'noncore/graphics/drawpad/drawpadcanvas.cpp') (more/less context) (ignore whitespace changes)
-rw-r--r-- | noncore/graphics/drawpad/drawpadcanvas.cpp | 75 |
1 files changed, 22 insertions, 53 deletions
diff --git a/noncore/graphics/drawpad/drawpadcanvas.cpp b/noncore/graphics/drawpad/drawpadcanvas.cpp index 79bef35..252f4d5 100644 --- a/noncore/graphics/drawpad/drawpadcanvas.cpp +++ b/noncore/graphics/drawpad/drawpadcanvas.cpp @@ -19,17 +19,16 @@ #include "tool.h" #include <qpe/applnk.h> #include <qpe/filemanager.h> #include <qpe/mimetype.h> #include <qbuffer.h> #include <qimage.h> -#include <qmessagebox.h> #include <qpainter.h> #include <qtextcodec.h> #include <qtextstream.h> #include <qxml.h> #include <zlib.h> class DrawPadCanvasXmlHandler: public QXmlDefaultHandler @@ -341,39 +340,29 @@ void DrawPadCanvas::backupPage() m_pageBackups.append(new Page(*(m_pages.current()))); emit pageBackupsChanged(); } void DrawPadCanvas::deleteAll() { - QMessageBox messageBox(tr("Delete All"), tr("Do you want to delete\nall the pages?"), - QMessageBox::Information, QMessageBox::Yes, - QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, - QMessageBox::NoButton, this); + m_pages.clear(); - messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); - messageBox.setButtonText(QMessageBox::No, tr("No")); - - if (messageBox.exec() == QMessageBox::Yes) { - m_pages.clear(); - - m_pages.append(new Page(contentsRect().size())); - m_pages.current()->fill(Qt::white); + m_pages.append(new Page(contentsRect().size())); + m_pages.current()->fill(Qt::white); - m_pageBackups.clear(); - m_pageBackups.append(new Page(*(m_pages.current()))); + m_pageBackups.clear(); + m_pageBackups.append(new Page(*(m_pages.current()))); - resizeContents(m_pages.current()->width(), m_pages.current()->height()); - viewport()->update(); + resizeContents(m_pages.current()->width(), m_pages.current()->height()); + viewport()->update(); - emit pagesChanged(); - emit pageBackupsChanged(); - } + emit pagesChanged(); + emit pageBackupsChanged(); } void DrawPadCanvas::newPage() { QRect rect = contentsRect(); NewPageDialog newPageDialog(rect.width(), rect.height(), m_pDrawPad->pen().color(), m_pDrawPad->brush().color(), this); @@ -391,58 +380,38 @@ void DrawPadCanvas::newPage() emit pagesChanged(); emit pageBackupsChanged(); } } void DrawPadCanvas::clearPage() { - QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe current page?"), - QMessageBox::Information, QMessageBox::Yes, - QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, - QMessageBox::NoButton, this); - - messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); - messageBox.setButtonText(QMessageBox::No, tr("No")); - - if (messageBox.exec() == QMessageBox::Yes) { - m_pages.current()->fill(Qt::white); + m_pages.current()->fill(Qt::white); - viewport()->update(); - } + viewport()->update(); } void DrawPadCanvas::deletePage() { - QMessageBox messageBox(tr("Delete Page"), tr("Do you want to delete\nthe current page?"), - QMessageBox::Information, QMessageBox::Yes, - QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, - QMessageBox::NoButton, this); - - messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); - messageBox.setButtonText(QMessageBox::No, tr("No")); + m_pages.remove(m_pages.current()); - if (messageBox.exec() == QMessageBox::Yes) { - m_pages.remove(m_pages.current()); - - if (m_pages.isEmpty()) { - m_pages.append(new Page(contentsRect().size())); - m_pages.current()->fill(Qt::white); - } + if (m_pages.isEmpty()) { + m_pages.append(new Page(contentsRect().size())); + m_pages.current()->fill(Qt::white); + } - m_pageBackups.clear(); - m_pageBackups.append(new Page(*(m_pages.current()))); + m_pageBackups.clear(); + m_pageBackups.append(new Page(*(m_pages.current()))); - resizeContents(m_pages.current()->width(), m_pages.current()->height()); - viewport()->update(); + resizeContents(m_pages.current()->width(), m_pages.current()->height()); + viewport()->update(); - emit pagesChanged(); - emit pageBackupsChanged(); - } + emit pagesChanged(); + emit pageBackupsChanged(); } bool DrawPadCanvas::undoEnabled() { return (m_pageBackups.current() != m_pageBackups.getFirst()); } bool DrawPadCanvas::redoEnabled() |