added child card done and some cleanups

Signed-off-by: ekkes-corner <ekke@ekkes-corner.org>

Author: ekke

src/FileUpload2ODS.cpp

@@ -29,34 +29,37 @@
 using namespace bb::cascades;
 using namespace bb::system;
 
-FileUpload2ODS::FileUpload2ODS(bb::cascades::Application *app)
-: QObject(app), m_invokeManager(new InvokeManager(this))
-{
+FileUpload2ODS::FileUpload2ODS(bb::cascades::Application *app) :
+		QObject(app), m_invokeManager(new InvokeManager(this)) {
 
 	// Register some classes for Filepicker for QML
-		qmlRegisterType<bb::cascades::pickers::FilePicker>("bb.cascades.pickers", 1,
-				0, "FilePicker");
-		qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerMode>(
-				"bb.cascades.pickers", 1, 0, "FilePickerMode", "");
-		qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerSortFlag>(
-				"bb.cascades.pickers", 1, 0, "FilePickerSortFlag", "");
-		qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerSortOrder>(
-				"bb.cascades.pickers", 1, 0, "FilePickerSortOrder", "");
-		qmlRegisterUncreatableType<bb::cascades::pickers::FileType>(
-				"bb.cascades.pickers", 1, 0, "FileType", "");
-		qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerViewMode>(
-				"bb.cascades.pickers", 1, 0, "FilePickerViewMode", "");
+	qmlRegisterType<bb::cascades::pickers::FilePicker>("bb.cascades.pickers", 1,
+			0, "FilePicker");
+	qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerMode>(
+			"bb.cascades.pickers", 1, 0, "FilePickerMode", "");
+	qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerSortFlag>(
+			"bb.cascades.pickers", 1, 0, "FilePickerSortFlag", "");
+	qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerSortOrder>(
+			"bb.cascades.pickers", 1, 0, "FilePickerSortOrder", "");
+	qmlRegisterUncreatableType<bb::cascades::pickers::FileType>(
+			"bb.cascades.pickers", 1, 0, "FileType", "");
+	qmlRegisterUncreatableType<bb::cascades::pickers::FilePickerViewMode>(
+			"bb.cascades.pickers", 1, 0, "FilePickerViewMode", "");
+
+	connect(m_invokeManager,
+			SIGNAL(childCardDone(const bb::system::CardDoneMessage&)), this,
+			SLOT(childCardDone(const bb::system::CardDoneMessage&)));
 
 	// create scene document from main.qml asset
-    // set parent to created document to ensure it exists for the whole application lifetime
-    QmlDocument *qml = QmlDocument::create("asset:///main.qml").parent(this);
+	// set parent to created document to ensure it exists for the whole application lifetime
+	QmlDocument *qml = QmlDocument::create("asset:///main.qml").parent(this);
 
-    qml->setContextProperty("app", this);
+	qml->setContextProperty("app", this);
 
-    // create root object for the UI
-    AbstractPane *root = qml->createRootObject<AbstractPane>();
-    // set created root object as a scene
-    app->setScene(root);
+	// create root object for the UI
+	AbstractPane *root = qml->createRootObject<AbstractPane>();
+	// set created root object as a scene
+	app->setScene(root);
 }
 
 void FileUpload2ODS::invokeBoundODSPreviewer(QString data) {
@@ -73,3 +76,18 @@ void FileUpload2ODS::invokeBoundODSComposer(QString data) {
 	m_invokeManager->invoke(cardRequest);
 }
 
+void FileUpload2ODS::childCardDone(const bb::system::CardDoneMessage &message) {
+	qDebug() << "childCardDone";
+	if (message.reason() == "Success") {
+		qDebug() << "childCardDone with Success " << message.data();
+		return;
+	}
+	if (message.reason() == "Cancel") {
+		qDebug() << "childCardDone with Cancel: " << message.data();
+		return;
+	}
+	// now close the card !
+	qDebug() << "close the card";
+	m_invokeManager->closeChildCard();
+}
+

src/FileUpload2ODS.hpp

@@ -19,6 +19,7 @@
 #include <QObject>
 #include <bb/system/InvokeManager.hpp>
 #include <bb/system/InvokeRequest.hpp>
+#include <bb/system/CardDoneMessage>
 
 namespace bb {
 namespace cascades {
@@ -51,6 +52,11 @@ Q_OBJECT
 	 */
 	Q_INVOKABLE
 	void invokeBoundODSComposer(QString data);
+
+private Q_SLOTS:
+	// This slot updates the status message when the invocation of a card is done
+	void childCardDone(const bb::system::CardDoneMessage&);
+
 private:
 	bb::system::InvokeManager *m_invokeManager;