improved desktop UI

[mardrone] / mardrone / main.cpp

diff --git a/mardrone/main.cpp b/mardrone/main.cpp
index 84f709d..bab92ef 100644 (file)
--- a/mardrone/main.cpp
+++ b/mardrone/main.cpp
@@ -35,9 +35,14 @@
 #include "joystick.h"
 #include "qdeclarativetoucharea.h"
 #include <QList>
 #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);
 

+
+
+

 // MacOSX sdl hack so that SDL won't hijack main
 #undef main
 
 // MacOSX sdl hack so that SDL won't hijack main
 #undef main
 

@@ -66,7 +71,7 @@ int main(int argc, char *argv[])
 #ifdef QT_IOS
     QString activeUi=mardroneSettings->value("activeUI","ardrone_plainqml.qml").toString();
 #else
 #ifdef QT_IOS
     QString activeUi=mardroneSettings->value("activeUI","ardrone_plainqml.qml").toString();
 #else

-    QString activeUi=mardroneSettings->value("activeUI","ardrone_android.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 activeUi=mardroneSettings->value("activeUI","ardrone_desktop.qml").toString();
 #endif
     qDebug() << "activeUI=" << activeUi;

@@ -76,9 +81,11 @@ int main(int argc, char *argv[])
         setDefault=true;
     };
 
         setDefault=true;
     };
 

-    QDeclarativeView window;
+ //   QDeclarativeView window;
+    QmlAppViewer window;

     window.rootContext()->setContextProperty("MArdrone",window.window());
     QObject::connect((QObject*)window.engine(), SIGNAL(quit()), &app, SLOT(quit()));
     window.rootContext()->setContextProperty("MArdrone",window.window());
     QObject::connect((QObject*)window.engine(), SIGNAL(quit()), &app, SLOT(quit()));

+

     // Check available UI's
     window.engine()->addImportPath(":/gauges/");
     window.engine()->addImportPath("qrc:");
     // Check available UI's
     window.engine()->addImportPath(":/gauges/");
     window.engine()->addImportPath("qrc:");

@@ -113,6 +120,7 @@ int main(int argc, char *argv[])
         if((screenGeometry.height()<=800) && (screenGeometry.width()<=1024)) window.window()->showFullScreen();
         else window.window()->show();
     }
         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();
 }
 
     return app.exec();
 }
 

@@ -177,3 +185,4 @@ QString selectQmlMain(QStringList importPaths,QString cmdParam,QString activeUI,
     if(!validUi) activeUI=((uiListElement*)uiList.get(0))->file();
   return(activeUI);
 }
     if(!validUi) activeUI=((uiListElement*)uiList.get(0))->file();
   return(activeUI);
 }

+