improved desktop UI

[mardrone] / mardrone / main.cpp

diff --git a/mardrone/main.cpp b/mardrone/main.cpp
index 0e28721..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);
 
 // MacOSX sdl hack so that SDL won't hijack main
 #undef main
@@ -62,18 +67,12 @@ int main(int argc, char *argv[])
     uiListModel uiList;
     bool setDefault=false;
 
-    uiList.addUI(new uiListElement("MeeGo","ardrone_harmattan.qml"));
-    uiList.addUI(new uiListElement("Symbian","ardrone_symbian.qml"));
-    uiList.addUI(new uiListElement("Desktop","ardrone_desktop.qml"));
-    uiList.addUI(new uiListElement("PlainQml","ardrone_plainqml.qml"));
-
-
     QSettings *mardroneSettings=new QSettings("katix.org","mardrone");
 #ifdef QT_IOS
     QString activeUi=mardroneSettings->value("activeUI","ardrone_plainqml.qml").toString();
 #else
- //   QString activeUi=mardroneSettings->value("activeUI","ardrone_harmattan.qml").toString();
-    QString activeUi=mardroneSettings->value("activeUI","ardrone_desktop.qml").toString();
+    QString activeUi=mardroneSettings->value("activeUI","ardrone_harmattan.qml").toString();
+//    QString activeUi=mardroneSettings->value("activeUI","ardrone_desktop.qml").toString();
 #endif
     qDebug() << "activeUI=" << activeUi;
     QString qmlmainfile=app.arguments().size()>=2 ? app.arguments()[1]:"";
@@ -82,18 +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("/");
+    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);
-    QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi);
+    QString qmlFile=selectQmlMain(importPath,qmlmainfile,activeUi,uiList);
     if(setDefault) mardroneSettings->setValue("activeUI",qmlFile);
 #ifndef QT_IOS
     qmlFile=QString("qrc:/")+qmlFile;
@@ -112,17 +120,69 @@ 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)
+QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,uiListModel &uiList)
 {
-  QString importPath=importPaths.last();
+  bool haveHarmattan=FALSE;
+  bool haveSymbian=FALSE;
+  bool haveDesktop=FALSE;
+  bool haveAndroid=FALSE;
+  QStringList appQmlFilesFilter;
+  QString uiName;
+  appQmlFilesFilter << "ardrone*.qml";
+  QStringList appQmlFiles;
+  qDebug() << "selectQmlMain importPath=" << importPaths << " ActiveUi=" << activeUI;
   if(cmdParam.contains(".qml")) return cmdParam;
-  if(cmdParam.isEmpty() && !activeUI.isEmpty()) return activeUI;
-  if(cmdParam=="harmattan" || (cmdParam=="" && QFile(importPath+"/com/nokia/meego").exists())) return QString("ardrone_harmattan.qml");
-  if(cmdParam=="symbian" || (cmdParam=="" && QFile(importPath+"/MeeGo/Components").exists())) return QString("ardrone_symbian.qml");
-  if(cmdParam=="desktop" || (cmdParam=="" && QFile(importPath+"/QtDesktop").exists())) return QString("ardrone_desktop.qml");
-   if(cmdParam=="plain") return QString("ardrone_plainqml.qml");
+  if(cmdParam=="plain") activeUI="ardrone_plainqml.qml";
+  if(cmdParam=="harmattan") activeUI="ardrone_harmattan.qml";
+  if(cmdParam=="symbian") activeUI="ardrone_symbian.qml";
+  if(cmdParam=="desktop") activeUI="ardrone_desktop.qml";
+  // Scan supported components
+  for(int i=0;i<importPaths.size();i++) {
+    QString importPath=importPaths[i];
+    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++) {
+    QString importPath=importPaths[i];
+    QDir searchDir(importPath);
+    QStringList qmlFiles=searchDir.entryList(appQmlFilesFilter);
+    qDebug() << qmlFiles;
+    appQmlFiles+=qmlFiles;
+    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")))
+        {
+            QFile qmlFile(importPath+"/"+qmlFiles[j]);
+            if(qmlFile.open(QFile::ReadOnly))
+            {
+                QString firstLine=QString(qmlFile.readLine(100));
+                if(firstLine.contains("// uiName:")) { uiName=firstLine.remove(0,10); }
+                else uiName=qmlFiles[j];
+                if(uiName.endsWith("\n")) uiName.chop(1);
+                qDebug() << importPath+"/"+qmlFiles[j] << uiName;
+                uiList.addUI(new uiListElement(uiName,qmlFiles[j]));
+            }
+        }
+      }
+    }
+    // Check validity of activeUi
+    bool validUi=false;
+    for(int j=0;j<uiList.count();j++) validUi|=(((uiListElement*)uiList.get(j))->file())==activeUI;
+    if(!validUi) activeUI=((uiListElement*)uiList.get(0))->file();
   return(activeUI);
 }
+