improved desktop UI

[mardrone] / mardrone / main.cpp

diff --git a/mardrone/main.cpp b/mardrone/main.cpp
index 6412934..bab92ef 100644 (file)
--- a/mardrone/main.cpp
+++ b/mardrone/main.cpp
@@ -35,8 +35,13 @@
 #include "joystick.h"
 #include "qdeclarativetoucharea.h"
 #include <QList>
+#include <QObject>
+#include "qmlappviewer.h"
+
+QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI,uiListModel &uiList);
+
+
 
-QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI,uiListModel &uiList,QStringList &uiNames,QStringList &uiFiles);
 
 // MacOSX sdl hack so that SDL won't hijack main
 #undef main
@@ -61,7 +66,6 @@ int main(int argc, char *argv[])
     QUrl *url;
     uiListModel uiList;
     bool setDefault=false;
-    QStringList uiNames,uiFiles;
 
     QSettings *mardroneSettings=new QSettings("katix.org","mardrone");
 #ifdef QT_IOS
@@ -77,25 +81,27 @@ int main(int argc, char *argv[])
         setDefault=true;
     };
 
-    QDeclarativeView window;
+ //   QDeclarativeView window;
+    QmlAppViewer window;
     window.rootContext()->setContextProperty("MArdrone",window.window());
     QObject::connect((QObject*)window.engine(), SIGNAL(quit()), &app, SLOT(quit()));
+
     // Check available UI's
-    window.engine()->addImportPath("qrc:/gauges/");
+    window.engine()->addImportPath(":/gauges/");
     window.engine()->addImportPath("qrc:");
     window.engine()->addImportPath(":");
     window.engine()->addImportPath("gauges");
     window.engine()->addImportPath(".");
 #ifdef Q_OS_ANDROID
-    window.engine()->addImportPath("/imports/");
+    window.engine()->addImportPath("/");
+    window.engine()->addImportPath("/imports");
+    window.engine()->addImportPath("/assets");
     window.engine()->addPluginPath(QDir::homePath()+"/../lib");
 #endif
     qDebug() << "ImportPathList" << window.engine()->importPathList() ;
     QStringList importPath=window.engine()->importPathList();
     window.rootContext()->setContextProperty("uiList",&uiList);
-    window.rootContext()->setContextProperty("uiNames",uiNames);
-    window.rootContext()->setContextProperty("uiFiles",uiFiles);
-    QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi,uiList,uiNames,uiFiles);
+    QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi,uiList);
     if(setDefault) mardroneSettings->setValue("activeUI",qmlFile);
 #ifndef QT_IOS
     qmlFile=QString("qrc:/")+qmlFile;
@@ -114,14 +120,16 @@ int main(int argc, char *argv[])
         if((screenGeometry.height()<=800) && (screenGeometry.width()<=1024)) window.window()->showFullScreen();
         else window.window()->show();
     }
+    QObject::connect(&window, SIGNAL(backKey()), window.rootObject(), SLOT(backKey()));
     return app.exec();
 }
 
-QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,uiListModel &uiList,QStringList &uiNames,QStringList &uiFiles)
+QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,uiListModel &uiList)
 {
   bool haveHarmattan=FALSE;
   bool haveSymbian=FALSE;
   bool haveDesktop=FALSE;
+  bool haveAndroid=FALSE;
   QStringList appQmlFilesFilter;
   QString uiName;
   appQmlFilesFilter << "ardrone*.qml";
@@ -135,10 +143,14 @@ QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,
   // Scan supported components
   for(int i=0;i<importPaths.size();i++) {
     QString importPath=importPaths[i];
-    haveHarmattan|=QFile(importPath+"/com/nokia/meego").exists();
-    haveSymbian|=QFile(importPath+"/com/nokia/symbian.1.1").exists();
-    haveDesktop|=QFile(importPath+"/QtDesktop").exists();
-    qDebug() << importPath << haveHarmattan << haveSymbian << haveDesktop;
+    QDir searchDir(importPath);
+    QStringList qmlFiles=searchDir.entryList();
+    qDebug() << importPath  << qmlFiles;
+    haveHarmattan|=QFile(importPath+"/com/nokia/meego/qmldir").exists();
+    haveSymbian|=QFile(importPath+"/com/nokia/symbian.1.1/qmldir").exists();
+    haveAndroid|=QFile(importPath+"/com/nokia/android.1.1/qmldir").exists();
+    haveDesktop|=QFile(importPath+"/QtDesktop/qmldir").exists();
+    qDebug() << importPath << haveHarmattan << haveSymbian << haveDesktop << haveAndroid ;
   }
   // Scan UI .qml files
   for(int i=0;i<importPaths.size();i++) {
@@ -150,6 +162,7 @@ QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,
     for(int j=0;j<qmlFiles.size();j++) {
         if((qmlFiles[j].contains("harmattan") && haveHarmattan)||
            (qmlFiles[j].contains("symbian") && haveSymbian) ||
+           (qmlFiles[j].contains("android") && haveAndroid) ||
            (qmlFiles[j].contains("desktop") && haveDesktop) ||
            (qmlFiles[j].contains("plainqml")))
         {
@@ -172,3 +185,4 @@ QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,
     if(!validUi) activeUI=((uiListElement*)uiList.get(0))->file();
   return(activeUI);
 }
+