summaryrefslogtreecommitdiff
Unidiff
Diffstat (more/less context) (ignore whitespace changes)
-rw-r--r--noncore/graphics/drawpad/drawpad.cpp13
1 files changed, 5 insertions, 8 deletions
diff --git a/noncore/graphics/drawpad/drawpad.cpp b/noncore/graphics/drawpad/drawpad.cpp
index 71c9695..139c752 100644
--- a/noncore/graphics/drawpad/drawpad.cpp
+++ b/noncore/graphics/drawpad/drawpad.cpp
@@ -36,10 +36,11 @@
36#include <qpe/applnk.h> 36#include <qpe/applnk.h>
37#include <qpe/config.h> 37#include <qpe/config.h>
38#include <qpe/global.h> 38#include <qpe/global.h>
39#include <qmenubar.h>
40#include <qpe/qpetoolbar.h> 39#include <qpe/qpetoolbar.h>
41#include <qpe/resource.h> 40#include <qpe/resource.h>
41#include <qpe/qpeapplication.h>
42 42
43#include <qmenubar.h>
43#include <qaction.h> 44#include <qaction.h>
44#include <qfile.h> 45#include <qfile.h>
45#include <qmessagebox.h> 46#include <qmessagebox.h>
@@ -601,9 +602,7 @@ void DrawPad::importPage()
601{ 602{
602 ImportDialog importDialog(this); 603 ImportDialog importDialog(this);
603 604
604 importDialog.showMaximized(); 605 if ( QPEApplication::execDialog( &importDialog ) == QDialog::Accepted ) {
605
606 if (importDialog.exec() == QDialog::Accepted) {
607 const DocLnk* docLnk = importDialog.selected(); 606 const DocLnk* docLnk = importDialog.selected();
608 607
609 if (docLnk) { 608 if (docLnk) {
@@ -617,9 +616,7 @@ void DrawPad::exportPage()
617{ 616{
618 ExportDialog exportDialog(m_pDrawPadCanvas->pagePosition(), m_pDrawPadCanvas->pageCount(), this); 617 ExportDialog exportDialog(m_pDrawPadCanvas->pagePosition(), m_pDrawPadCanvas->pageCount(), this);
619 618
620 exportDialog.showMaximized(); 619 if ( QPEApplication::execDialog( &exportDialog ) == QDialog::Accepted ) {
621
622 if (exportDialog.exec() == QDialog::Accepted) {
623 m_pDrawPadCanvas->exportPage(exportDialog.selectedFromPage(), exportDialog.selectedToPage(), 620 m_pDrawPadCanvas->exportPage(exportDialog.selectedFromPage(), exportDialog.selectedToPage(),
624 exportDialog.selectedName(), exportDialog.selectedFormat()); 621 exportDialog.selectedName(), exportDialog.selectedFormat());
625 } 622 }
@@ -629,7 +626,7 @@ void DrawPad::thumbnailView()
629{ 626{
630 ThumbnailView thumbnailView(this, m_pDrawPadCanvas, this); 627 ThumbnailView thumbnailView(this, m_pDrawPadCanvas, this);
631 628
632 thumbnailView.showMaximized(); 629 QPEApplication::showWidget( &thumbnailView );
633 thumbnailView.exec(); 630 thumbnailView.exec();
634} 631}
635 632