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 | |||
@@ -24,7 +24,6 @@ | |||
24 | 24 | ||
25 | #include <qbuffer.h> | 25 | #include <qbuffer.h> |
26 | #include <qimage.h> | 26 | #include <qimage.h> |
27 | #include <qmessagebox.h> | ||
28 | #include <qpainter.h> | 27 | #include <qpainter.h> |
29 | #include <qtextcodec.h> | 28 | #include <qtextcodec.h> |
30 | #include <qtextstream.h> | 29 | #include <qtextstream.h> |
@@ -346,29 +345,19 @@ void DrawPadCanvas::backupPage() | |||
346 | 345 | ||
347 | void DrawPadCanvas::deleteAll() | 346 | void DrawPadCanvas::deleteAll() |
348 | { | 347 | { |
349 | QMessageBox messageBox(tr("Delete All"), tr("Do you want to delete\nall the pages?"), | 348 | m_pages.clear(); |
350 | QMessageBox::Information, QMessageBox::Yes, | ||
351 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | ||
352 | QMessageBox::NoButton, this); | ||
353 | 349 | ||
354 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | 350 | m_pages.append(new Page(contentsRect().size())); |
355 | messageBox.setButtonText(QMessageBox::No, tr("No")); | 351 | m_pages.current()->fill(Qt::white); |
356 | |||
357 | if (messageBox.exec() == QMessageBox::Yes) { | ||
358 | m_pages.clear(); | ||
359 | |||
360 | m_pages.append(new Page(contentsRect().size())); | ||
361 | m_pages.current()->fill(Qt::white); | ||
362 | 352 | ||
363 | m_pageBackups.clear(); | 353 | m_pageBackups.clear(); |
364 | m_pageBackups.append(new Page(*(m_pages.current()))); | 354 | m_pageBackups.append(new Page(*(m_pages.current()))); |
365 | 355 | ||
366 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 356 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
367 | viewport()->update(); | 357 | viewport()->update(); |
368 | 358 | ||
369 | emit pagesChanged(); | 359 | emit pagesChanged(); |
370 | emit pageBackupsChanged(); | 360 | emit pageBackupsChanged(); |
371 | } | ||
372 | } | 361 | } |
373 | 362 | ||
374 | void DrawPadCanvas::newPage() | 363 | void DrawPadCanvas::newPage() |
@@ -396,48 +385,28 @@ void DrawPadCanvas::newPage() | |||
396 | 385 | ||
397 | void DrawPadCanvas::clearPage() | 386 | void DrawPadCanvas::clearPage() |
398 | { | 387 | { |
399 | QMessageBox messageBox(tr("Clear Page"), tr("Do you want to clear\nthe current page?"), | 388 | m_pages.current()->fill(Qt::white); |
400 | QMessageBox::Information, QMessageBox::Yes, | ||
401 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | ||
402 | QMessageBox::NoButton, this); | ||
403 | |||
404 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | ||
405 | messageBox.setButtonText(QMessageBox::No, tr("No")); | ||
406 | |||
407 | if (messageBox.exec() == QMessageBox::Yes) { | ||
408 | m_pages.current()->fill(Qt::white); | ||
409 | 389 | ||
410 | viewport()->update(); | 390 | viewport()->update(); |
411 | } | ||
412 | } | 391 | } |
413 | 392 | ||
414 | void DrawPadCanvas::deletePage() | 393 | void DrawPadCanvas::deletePage() |
415 | { | 394 | { |
416 | QMessageBox messageBox(tr("Delete Page"), tr("Do you want to delete\nthe current page?"), | 395 | m_pages.remove(m_pages.current()); |
417 | QMessageBox::Information, QMessageBox::Yes, | ||
418 | QMessageBox::No | QMessageBox::Escape | QMessageBox::Default, | ||
419 | QMessageBox::NoButton, this); | ||
420 | |||
421 | messageBox.setButtonText(QMessageBox::Yes, tr("Yes")); | ||
422 | messageBox.setButtonText(QMessageBox::No, tr("No")); | ||
423 | 396 | ||
424 | if (messageBox.exec() == QMessageBox::Yes) { | 397 | if (m_pages.isEmpty()) { |
425 | m_pages.remove(m_pages.current()); | 398 | m_pages.append(new Page(contentsRect().size())); |
426 | 399 | m_pages.current()->fill(Qt::white); | |
427 | if (m_pages.isEmpty()) { | 400 | } |
428 | m_pages.append(new Page(contentsRect().size())); | ||
429 | m_pages.current()->fill(Qt::white); | ||
430 | } | ||
431 | 401 | ||
432 | m_pageBackups.clear(); | 402 | m_pageBackups.clear(); |
433 | m_pageBackups.append(new Page(*(m_pages.current()))); | 403 | m_pageBackups.append(new Page(*(m_pages.current()))); |
434 | 404 | ||
435 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); | 405 | resizeContents(m_pages.current()->width(), m_pages.current()->height()); |
436 | viewport()->update(); | 406 | viewport()->update(); |
437 | 407 | ||
438 | emit pagesChanged(); | 408 | emit pagesChanged(); |
439 | emit pageBackupsChanged(); | 409 | emit pageBackupsChanged(); |
440 | } | ||
441 | } | 410 | } |
442 | 411 | ||
443 | bool DrawPadCanvas::undoEnabled() | 412 | bool DrawPadCanvas::undoEnabled() |