diff --git a/.cproject b/.cproject
deleted file mode 100644
index 43f9902..0000000
--- a/.cproject
+++ /dev/null
@@ -1,148 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- mingw32-make
-
- release
- false
- false
- true
-
-
- mingw32-make
-
- debug
- false
- false
- true
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/.gitignore b/.gitignore
index ef46a13..ddd3a43 100644
--- a/.gitignore
+++ b/.gitignore
@@ -30,4 +30,13 @@ user_config.pri
*.ncb
*.vcproj
-*.sln
\ No newline at end of file
+*.sln
+*.sln
+*.vcproj
+*.user
+*.ncb
+*.idb
+*.project
+*.cproject
+*.sln
+*.suo
\ No newline at end of file
diff --git a/.project b/.project
deleted file mode 100644
index fc9b8c2..0000000
--- a/.project
+++ /dev/null
@@ -1,88 +0,0 @@
-
-
- qgroundcontrol
-
-
-
-
-
- com.trolltech.qtcppproject.QtMakefileGenerator
-
-
-
-
- org.eclipse.cdt.make.core.makeBuilder
- clean,full,incremental,
-
-
- org.eclipse.cdt.core.errorOutputParser
- org.eclipse.cdt.core.GASErrorParser;org.eclipse.cdt.core.GCCErrorParser;org.eclipse.cdt.core.GLDErrorParser;org.eclipse.cdt.core.GmakeErrorParser;org.eclipse.cdt.core.VCErrorParser;org.eclipse.cdt.core.CWDLocator;org.eclipse.cdt.core.MakeErrorParser;
-
-
- org.eclipse.cdt.make.core.append_environment
- true
-
-
- org.eclipse.cdt.make.core.build.arguments
-
-
-
- org.eclipse.cdt.make.core.build.command
- mingw32-make
-
-
- org.eclipse.cdt.make.core.build.target.auto
- debug
-
-
- org.eclipse.cdt.make.core.build.target.clean
- clean
-
-
- org.eclipse.cdt.make.core.build.target.inc
- debug
-
-
- org.eclipse.cdt.make.core.enableAutoBuild
- false
-
-
- org.eclipse.cdt.make.core.enableCleanBuild
- true
-
-
- org.eclipse.cdt.make.core.enableFullBuild
- true
-
-
- org.eclipse.cdt.make.core.enabledIncrementalBuild
- true
-
-
- org.eclipse.cdt.make.core.environment
- QMAKESPEC=win32-g++|PATH=C:\\Qt\\2010.04\\qt\\bin;${env_var:PATH}|
-
-
- org.eclipse.cdt.make.core.stopOnError
- false
-
-
- org.eclipse.cdt.make.core.useDefaultBuildCmd
- false
-
-
-
-
- org.eclipse.cdt.make.core.ScannerConfigBuilder
-
-
-
-
-
- org.eclipse.cdt.core.cnature
- org.eclipse.cdt.core.ccnature
- org.eclipse.cdt.make.core.makeNature
- org.eclipse.cdt.make.core.ScannerConfigNature
- com.trolltech.qtcppproject.QtNature
-
-
diff --git a/qgroundcontrol.pri b/qgroundcontrol.pri
index 5cda7d8..302ab2d 100644
--- a/qgroundcontrol.pri
+++ b/qgroundcontrol.pri
@@ -333,10 +333,10 @@ exists($$BASEDIR/lib/osgEarth123) {
TARGETDIR_WIN = $$replace(TARGETDIR,"/","\\")
debug {
- QMAKE_POST_LINK += && copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
- QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\" /S /E /Y
- QMAKE_POST_LINK += && xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\" /S /E /Y
- QMAKE_POST_LINK += && copy /Y \"$$BASEDIR\\images\\earth.html $$TARGETDIR_WIN\\debug\"
+ QMAKE_POST_LINK += ; copy /Y \"$$BASEDIR_WIN\\lib\\sdl\\win32\\SDL.dll\" \"$$TARGETDIR_WIN\\debug\\SDL.dll\"
+ QMAKE_POST_LINK += ; xcopy \"$$BASEDIR_WIN\\audio\" \"$$TARGETDIR_WIN\\debug\\audio\" /S /E /Y
+ QMAKE_POST_LINK += ; xcopy \"$$BASEDIR_WIN\\models\" \"$$TARGETDIR_WIN\\debug\\models\" /S /E /Y
+ QMAKE_POST_LINK += ; copy /Y \"$$BASEDIR\\images\\earth.html $$TARGETDIR_WIN\\debug\"
}
release {
diff --git a/src/ui/map3D/QGCGoogleEarthView.cc b/src/ui/map3D/QGCGoogleEarthView.cc
index 8bc3516..c73fec7 100644
--- a/src/ui/map3D/QGCGoogleEarthView.cc
+++ b/src/ui/map3D/QGCGoogleEarthView.cc
@@ -1,5 +1,7 @@
#include
#include
+#include
+#include
#include
@@ -42,6 +44,10 @@ QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) :
ui->webViewLayout->addWidget(webViewMac);
#endif
+#ifdef _MSC_VER
+ ui->webViewLayout->addWidget(webViewWin);
+#endif
+
#if ((defined Q_OS_MAC) | (defined _MSC_VER))
connect(UASManager::instance(), SIGNAL(activeUASSet(UASInterface*)), this, SLOT(setActiveUAS(UASInterface*)));
connect(updateTimer, SIGNAL(timeout()), this, SLOT(updateState()));
@@ -59,6 +65,11 @@ QGCGoogleEarthView::QGCGoogleEarthView(QWidget *parent) :
// Get list of available 3D models
// Load HTML file
+ #ifdef _MSC_VER
+ webViewWin->dynamicCall("GoHome()");
+ webViewWin->dynamicCall("Navigate(const QString&)", QApplication::applicationDirPath() + "/earth.html");
+ qDebug() << QDir::cleanPath(QApplication::applicationDirPath() + "/earth.html").replace('/', "\\");
+#endif
// Parse for model links
@@ -107,7 +118,8 @@ void QGCGoogleEarthView::show()
#endif
#ifdef _MSC_VER
- //webViewWin->load(QUrl("earth.html"));
+ webViewWin->dynamicCall("GoHome()");
+ webViewWin->dynamicCall("Navigate(const QString&)", "http://pixhawk.ethz.ch");
#endif
webViewInitialized = true;
}
diff --git a/src/ui/map3D/QGCGoogleEarthView.h b/src/ui/map3D/QGCGoogleEarthView.h
index c083045..e414ccd 100644
--- a/src/ui/map3D/QGCGoogleEarthView.h
+++ b/src/ui/map3D/QGCGoogleEarthView.h
@@ -20,6 +20,8 @@ public:
QGCWebAxWidget(QWidget* parent = 0, Qt::WindowFlags f = 0)
: QAxWidget(parent, f)
{
+ // Set web browser control
+ setControl("{8856F961-340A-11D0-A96B-00C04FD705A2}");
}
protected:
virtual bool translateKeyEvent(int message, int keycode) const