X-Git-Url: https://vcs.maemo.org/git/?a=blobdiff_plain;f=mardrone%2Fmain.cpp;fp=mardrone%2Fmain.cpp;h=ce57cd7568612dfe46925a65803b464f1f26b713;hb=71fc016fdd729349858914d16eec0ba6b7f0458b;hp=13356b1e33c166218d4ddfc9fff0dd72d5eee439;hpb=8f3f629260d50245d19c50ebfb07c766b8937c30;p=mardrone

diff --git a/mardrone/main.cpp b/mardrone/main.cpp
index 13356b1..ce57cd7 100644
--- a/mardrone/main.cpp
+++ b/mardrone/main.cpp
@@ -36,7 +36,7 @@
 #include "qdeclarativetoucharea.h"
 #include <QList>
 
-QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI);
+QString selectQmlMain(QStringList inportPaths,QString cmdParam,QString activeUI,uiListModel &uiList);
 
 // MacOSX sdl hack so that SDL won't hijack main
 #undef main
@@ -62,11 +62,11 @@ int main(int argc, char *argv[])
     uiListModel uiList;
     bool setDefault=false;
 
-    uiList.addUI(new uiListElement("MeeGo","ardrone_harmattan.qml"));
+/*    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
@@ -97,7 +97,7 @@ int main(int argc, char *argv[])
     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;
@@ -119,14 +119,48 @@ int main(int argc, char *argv[])
     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;
+  QStringList appQmlFilesFilter;
+  QString uiName;
+  appQmlFilesFilter << "ardrone*.qml";
+  QStringList appQmlFiles;
+          qDebug() << "selectQmlMain importPath=" << importPaths << " ActiveUi=" << activeUI;
+  for(int i=0;i<importPaths.size();i++) {
+    QString importPath=importPaths[i];
+    haveHarmattan|=QFile(importPath+"/com/nokia/meego").exists();
+    haveHarmattan|=QFile(importPath+"/MeeGo/Components").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(appQmlFilesFilter);
+    qDebug() << qmlFiles;
+    appQmlFiles+=qmlFiles;
+    for(int j=0;j<qmlFiles.size();j++) {
+
+        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]));
+        }
+    }
+
   if(cmdParam.contains(".qml")) return cmdParam;
+  if(cmdParam=="plain") return QString("ardrone_plainqml.qml");
   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=="harmattan" || cmdParam=="" ) return QString("ardrone_harmattan.qml");
+  if(cmdParam=="symbian" || cmdParam=="" ) return QString("ardrone_symbian.qml");
+  if(cmdParam=="desktop" || cmdParam=="" ) return QString("ardrone_desktop.qml");
+
   return(activeUI);
 }