Merge lp:~alexwolf/stellarium/android-port-gui into lp:~brady.brenot/stellarium/android-port

[Alexander Wolf]

[Brady Brenot (brady.brenot)]

review: Approve

=== modified file 'CMakeLists.txt'
--- CMakeLists.txt	2012-03-17 05:25:18 +0000
+++ CMakeLists.txt	2012-03-22 17:43:24 +0000
@@ -89,8 +89,7 @@
   SET(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -DQT_DEFAULT_TEXTURE_GLYPH_CACHE_WIDTH=1024  -DQT_GL_NO_SCISSOR_TEST")
 
   #configure the mobile GUI plugin. Android defaults:
-  SET(EXTERNAL_GUI_SRC_PATH "../plugins/MobileGui" CACHE PATH "The location of the plugin main directory i.e. the one containing the top level CMakeLists.txt")
-  SET(GUI_MODE External CACHE STRING "Choose the type of GUI to build, options are: Standard, None, External")
+  SET(GUI_MODE Mobile CACHE STRING "Choose the type of GUI to build, options are: Standard, None, External, Mobile")
     
   #force CMAKE to find QT
   SET(NECESSITAS_QT_ROOT "C:/Users/Brady/necessitas/Android/Qt/480" CACHE STRING "Android: Location of necessitas Qt")
@@ -164,7 +163,7 @@
 ENDIF()
 
 
-SET(GUI_MODE Standard CACHE STRING "Choose the type of GUI to build, options are: Standard, None, External")
+SET(GUI_MODE Standard CACHE STRING "Choose the type of GUI to build, options are: Standard, None, External, Mobile")
 SET(OPENGL_MODE Desktop CACHE STRING "Choose the type of openGL to use, options are: Desktop, ES2")
 
 SET(GENERATE_PACKAGE_TARGET 1 CACHE BOOL "Set to 1 or true if you want to have make package target")
@@ -429,6 +428,7 @@
 	${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/
 	${CMAKE_SOURCE_DIR}/src/core/external/glues_stel/source/libtess
 	${CMAKE_SOURCE_DIR}/src/gui
+	${CMAKE_SOURCE_DIR}/src/mobileGui
 	${CMAKE_SOURCE_DIR}/src/scripting
 	${OPENGL_INCLUDE_DIR}
 	${ICONV_INCLUDE_DIR}

=== removed file 'plugins/MobileGui/CMakeLists.txt'
--- plugins/MobileGui/CMakeLists.txt	2012-02-22 06:30:41 +0000
+++ plugins/MobileGui/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,6 +0,0 @@
-# cmake config file for the QML-based MobileGUI plugin
-SET(MOBILEGUI_VERSION "0.0.1")
-
-ADD_SUBDIRECTORY( src )
-
-INSTALL(FILES DESTINATION "modules/AngleMeasure")

=== removed directory 'plugins/MobileGui/src'
=== removed file 'plugins/MobileGui/src/CMakeLists.txt'
--- plugins/MobileGui/src/CMakeLists.txt	2012-03-17 10:12:50 +0000
+++ plugins/MobileGui/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
@@ -1,27 +0,0 @@
-IF(BUILD_DYNAMIC_PLUGINS)
-	message(FATAL_ERROR "Cannot currently build MobileGui as a dynamic plugin.")
-endif()
-
-SET(mobilegui_SRCS
-	MobileGui.hpp
-	MobileGui.cpp
-	systemdisplayinfo.hpp
-	systemdisplayinfo.cpp
-	stelwrapper.hpp
-	stelwrapper.cpp
-	updatesignallingitem.hpp
-	updatesignallingitem.cpp)
-SET(mobilegui_MOC_HDRS
-	MobileGui.hpp
-	systemdisplayinfo.hpp
-	stelwrapper.hpp)
-
-SET(mobilegui_RES qml/qmlResources.qrc)
-QT4_ADD_RESOURCES(mobilegui_RES_CXX ${mobilegui_RES})
-	
-QT4_WRAP_CPP(mobilegui_MOC_SRCS ${mobilegui_MOC_HDRS})
-
-ADD_LIBRARY(ExternalGui STATIC ${mobilegui_SRCS} ${mobilegui_MOC_SRCS} ${mobilegui_RES_CXX})
-TARGET_LINK_LIBRARIES(ExternalGui ${extLinkerOption})
-SET_TARGET_PROPERTIES(ExternalGui PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
-ADD_DEPENDENCIES(AllStaticPlugins ExternalGui)

=== modified file 'src/CMakeLists.txt'
--- src/CMakeLists.txt	2012-03-17 05:25:18 +0000
+++ src/CMakeLists.txt	2012-03-22 17:43:24 +0000
@@ -500,6 +500,34 @@
 	ADD_DEPENDENCIES(AllStaticPlugins StelNoGuiLib)
 ENDIF()
 
+#############################################################################################
+############################# Mobile GUI plugin compilation #################################
+#############################################################################################
+IF (GUI_MODE STREQUAL "Mobile")
+	SET(mobilegui_SRCS
+		mobileGui/MobileGui.hpp
+		mobileGui/MobileGui.cpp
+		mobileGui/SystemDisplayInfo.hpp
+		mobileGui/SystemDisplayInfo.cpp
+		mobileGui/StelWrapper.hpp
+		mobileGui/StelWrapper.cpp
+		mobileGui/UpdateSignallingItem.hpp
+		mobileGui/UpdateSignallingItem.cpp)
+	SET(mobilegui_MOC_HDRS
+		mobileGui/MobileGui.hpp
+		mobileGui/SystemDisplayInfo.hpp
+		mobileGui/StelWrapper.hpp)
+	SET(mobilegui_RES
+		mobileGui/qml/qmlResources.qrc)
+	QT4_ADD_RESOURCES(mobilegui_RES_CXX ${mobilegui_RES})
+	QT4_WRAP_CPP(mobilegui_MOC_SRCS ${mobilegui_MOC_HDRS})
+	ADD_LIBRARY(MobileGuiLib STATIC ${mobilegui_SRCS} ${mobilegui_MOC_SRCS} ${mobilegui_RES_CXX})
+	TARGET_LINK_LIBRARIES(MobileGuiLib ${extLinkerOption})
+	SET_TARGET_PROPERTIES(MobileGuiLib PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
+	SET(STELLARIUM_STATIC_PLUGINS_LIBRARIES ${STELLARIUM_STATIC_PLUGINS_LIBRARIES} ${CMAKE_BINARY_DIR}/src/libMobileGuiLib.a)
+	ADD_DEPENDENCIES(AllStaticPlugins MobileGuiLib)
+ENDIF()
+
 
 #############################################################################################
 ############################# External GUI plugin compilation ###############################

=== renamed directory 'plugins/MobileGui' => 'src/mobileGui'
=== renamed file 'plugins/MobileGui/src/MobileGui.cpp' => 'src/mobileGui/MobileGui.cpp'
--- plugins/MobileGui/src/MobileGui.cpp	2012-03-21 07:47:20 +0000
+++ src/mobileGui/MobileGui.cpp	2012-03-22 17:43:24 +0000
@@ -35,16 +35,16 @@
 #include <QApplication>
 #include <QPoint>
 
-#include "systemdisplayinfo.hpp"
-#include "updatesignallingitem.hpp"
-#include "stelwrapper.hpp"
+#include "SystemDisplayInfo.hpp"
+#include "UpdateSignallingItem.hpp"
+#include "StelWrapper.hpp"
 
-#include "../../../src/core/StelModuleMgr.hpp"
-#include "../../../src/core/StelApp.hpp"
-#include "../../../src/core/StelMovementMgr.hpp"
-#include "../../../src/core/StelAppGraphicsWidget.hpp"
-#include "../../../src/core/StelTranslator.hpp"
-#include "../../../src/core/StelCore.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelApp.hpp"
+#include "StelMovementMgr.hpp"
+#include "StelAppGraphicsWidget.hpp"
+#include "StelTranslator.hpp"
+#include "StelCore.hpp"
 
 StelGuiBase* StelMobileGuiPluginInterface::getStelGuiBase() const
 {

=== renamed file 'plugins/MobileGui/src/MobileGui.hpp' => 'src/mobileGui/MobileGui.hpp'
=== renamed file 'plugins/MobileGui/src/stelwrapper.cpp' => 'src/mobileGui/StelWrapper.cpp'
--- plugins/MobileGui/src/stelwrapper.cpp	2012-03-17 10:12:50 +0000
+++ src/mobileGui/StelWrapper.cpp	2012-03-22 17:43:24 +0000
@@ -1,9 +1,9 @@
-#include "stelwrapper.hpp"
+#include "StelWrapper.hpp"
 
-#include "../../../src/core/StelModuleMgr.hpp"
-#include "../../../src/core/StelApp.hpp"
-#include "../../../src/core/StelObjectMgr.hpp"
-#include "../../../src/core/StelMovementMgr.hpp"
+#include "StelModuleMgr.hpp"
+#include "StelApp.hpp"
+#include "StelObjectMgr.hpp"
+#include "StelMovementMgr.hpp"
 #include "MobileGui.hpp"
 
 StelWrapper::StelWrapper(QObject *parent) :

=== renamed file 'plugins/MobileGui/src/stelwrapper.hpp' => 'src/mobileGui/StelWrapper.hpp'
--- plugins/MobileGui/src/stelwrapper.hpp	2012-03-17 10:12:50 +0000
+++ src/mobileGui/StelWrapper.hpp	2012-03-22 17:43:24 +0000
@@ -2,7 +2,7 @@
 #define STELWRAPPER_HPP
 
 #include <QObject>
-#include "../../../src/core/StelObject.hpp"
+#include "StelObject.hpp"
 
 //! @class Allows QML access to information about the world
 class StelWrapper : public QObject

=== renamed file 'plugins/MobileGui/src/systemdisplayinfo.cpp' => 'src/mobileGui/SystemDisplayInfo.cpp'
--- plugins/MobileGui/src/systemdisplayinfo.cpp	2012-03-04 07:49:21 +0000
+++ src/mobileGui/SystemDisplayInfo.cpp	2012-03-22 17:43:24 +0000
@@ -1,4 +1,4 @@
-#include "systemdisplayinfo.hpp"
+#include "SystemDisplayInfo.hpp"
 
 QTM_USE_NAMESPACE
 

=== renamed file 'plugins/MobileGui/src/systemdisplayinfo.hpp' => 'src/mobileGui/SystemDisplayInfo.hpp'
=== renamed file 'plugins/MobileGui/src/updatesignallingitem.cpp' => 'src/mobileGui/UpdateSignallingItem.cpp'
--- plugins/MobileGui/src/updatesignallingitem.cpp	2012-03-05 09:06:24 +0000
+++ src/mobileGui/UpdateSignallingItem.cpp	2012-03-22 17:43:24 +0000
@@ -1,4 +1,4 @@
-#include "updatesignallingitem.hpp"
+#include "UpdateSignallingItem.hpp"
 #include "MobileGui.hpp"
 
 UpdateSignallingItem::UpdateSignallingItem(QGraphicsItem * parent, MobileGui *gui) :

=== renamed file 'plugins/MobileGui/src/updatesignallingitem.hpp' => 'src/mobileGui/UpdateSignallingItem.hpp'
=== renamed directory 'plugins/MobileGui/src/qml' => 'src/mobileGui/qml'