Fixes: NB#162781, DUI chaining support should provide an option to not terminate the process when closing the child window

RevBy: Holger Schröder
Details:
Close current window instead of quitting application.
Adjust tests.

3 files changed, 14 insertions, 10 deletions

diff --git a/examples/chaining/chainingexampleapp2/imageviewer.cpp b/examples/chaining/chainingexampleapp2/imageviewer.cpp
index 846d9245..27be761d 100644
--- a/examples/chaining/chainingexampleapp2/imageviewer.cpp
+++ b/examples/chaining/chainingexampleapp2/imageviewer.cpp
@@ -6,11 +6,12 @@
 #include <MButton>
 #include <MApplication>
 #include <MApplicationWindow>
+#include <MApplicationPage>
+#include <MSceneWindow>
 #include <MApplicationIfProxy>
 
-ImageViewer::ImageViewer( MButton *button )
+ImageViewer::ImageViewer()
 {
-    this->button = button;
 }
 
 ImageViewer::~ImageViewer()
@@ -22,10 +23,16 @@ bool ImageViewer::showImage(const QString &uri, const QStringList &uriList)
     qDebug() << __PRETTY_FUNCTION__;
     Q_UNUSED( uriList );
 
-    MApplication *mApp = MApplication::instance();
-    mApp->activeWindow()->raise();
+    MApplicationWindow *mWin = new MApplicationWindow();
+    mWin->setObjectName( "MApplicationWindow#2" );
+    mWin->setAttribute( Qt::WA_DeleteOnClose, true );
 
-    button->setText( uri );
+    MApplicationPage *p = new MApplicationPage();
+    mWin->show();
+    p->appear( mWin, MSceneWindow::DestroyWhenDone );
+
+    MButton *b = new MButton( p->centralWidget() );
+    b->setText( uriList[0] );
 
     return true;
 }
diff --git a/examples/chaining/chainingexampleapp2/imageviewer.h b/examples/chaining/chainingexampleapp2/imageviewer.h
index 66c46ca4..b5043a09 100644
--- a/examples/chaining/chainingexampleapp2/imageviewer.h
+++ b/examples/chaining/chainingexampleapp2/imageviewer.h
@@ -10,14 +10,11 @@ class ImageViewer: public QObject
     Q_OBJECT
 
 public:
-    ImageViewer( MButton *button );
+    ImageViewer();
     ~ImageViewer();
 
 public slots:
     bool showImage(const QString &uri, const QStringList &uriList);
-
-private:
-    MButton *button;
 };
 
 #endif // IMAGEVIEWER_H
diff --git a/examples/chaining/chainingexampleapp2/main.cpp b/examples/chaining/chainingexampleapp2/main.cpp
index 23188931..ead163df 100644
--- a/examples/chaining/chainingexampleapp2/main.cpp
+++ b/examples/chaining/chainingexampleapp2/main.cpp
@@ -21,7 +21,7 @@ int main(int argc, char** argv)
     MButton b(p.centralWidget());
     b.setText("NO");
 
-    ImageViewer myImageViewer( &b );
+    ImageViewer myImageViewer;
 
     new ChainingExampleInterfaceAdaptor( &myImageViewer );