← Back to branch summary

~petr-kubanek/stellarium/stellarium

~petr-kubanek/stellarium/stellarium

« back to all changes in this revision

Viewing changes to plugins/TextUserInterface/src/TextUserInterface.hpp

Committer: Georg Zotti
Date: 2017-05-16 11:21:44 UTC
mfrom: (8454.1.100 SoCiS2016)
Revision ID: georg.zotti@univie.ac.at-20170516112144-mckvrgf8acksrghd

Merge-in SoCiS2016: Irregular solar system objects, RemoteSync plugin, Scenery3D improvements. Big merge, and raises Qt requirement to Qt5.4.

files added:
data/shaders/planet.frag

data/shaders/planet.vert

models

models/1682q1halley_MLfix.obj

models/243ida.png

models/243ida_MLfix.obj

models/243ida_MLfix.obj.mtl

models/4vesta.png

models/4vesta_21_MLfix.obj

models/4vesta_21_MLfix.obj.mtl

models/951gaspra.png

models/951gaspra_21_MLfix.obj

models/951gaspra_21_MLfix.obj.mtl

models/951gaspra_MLfix.obj

models/951gaspra_MLfix.obj.mtl

models/CMakeLists.txt

models/blender

models/blender/m1phobos.blend

models/blender/m2deimos.blend

models/hyperion.png

models/j5amalthea.png

models/j5amalthea_MLfix.obj

models/j5amalthea_MLfix.obj.mtl

models/m1phobos.mtl

models/m1phobos.obj.gz

models/m1phobos.png

models/m2deimos.mtl

models/m2deimos.obj.gz

models/m2deimos.png

models/n7larissa_MLfix.obj

models/n7larissa_MLfix.obj.mtl

models/n8proteus.png

models/n8proteus_MLfix.obj

models/n8proteus_MLfix.obj.mtl

models/s10janus.png

models/s10janus_MLfix.obj

models/s10janus_MLfix.obj.mtl

models/s11epimetheus.png

models/s11epimetheus_MLfix.obj

models/s11epimetheus_MLfix.obj.mtl

models/s16prometheus.png

models/s16prometheus_MLfix.obj

models/s16prometheus_MLfix.obj.mtl

models/s17pandora_MLfix.obj

models/s17pandora_MLfix.obj.mtl

models/s7hyperion_21_MLfix.obj

models/s7hyperion_21_MLfix.obj.mtl

plugins/RemoteControl/include

plugins/RemoteControl/include/RemoteControlServiceInterface.hpp

plugins/RemoteControl/webroot/images/joypad-active.png

plugins/RemoteControl/webroot/images/joypad-hover.png

plugins/RemoteControl/webroot/images/joypad.png

plugins/RemoteControl/webroot/js/plugins/scenery3d.js

plugins/RemoteControl/webroot/js/ui/joystickqueue.js

plugins/Scenery3d/src/S3DScene.cpp

plugins/Scenery3d/src/S3DScene.hpp

plugins/Scenery3d/src/Scenery3dRemoteControlService.cpp

plugins/Scenery3d/src/Scenery3dRemoteControlService.hpp

src/core/GeomMath.cpp

src/core/GeomMath.hpp

src/core/StelOBJ.cpp

src/core/StelOBJ.hpp

src/core/StelOpenGLArray.cpp

src/core/StelOpenGLArray.hpp

textures/gray10.png

textures/gray25.png

files removed:
plugins/RemoteControl/webroot/js/plugins/archaeolines.js

plugins/Scenery3d/src/AABB.cpp

plugins/Scenery3d/src/AABB.hpp

plugins/Scenery3d/src/Line.cpp

plugins/Scenery3d/src/Line.hpp

plugins/Scenery3d/src/OBJ.cpp

plugins/Scenery3d/src/OBJ.hpp

files renamed:
plugins/Scenery3d/src/Scenery3d.cpp => plugins/Scenery3d/src/S3DRenderer.cpp

plugins/Scenery3d/src/Scenery3d.hpp => plugins/Scenery3d/src/S3DRenderer.hpp

plugins/Scenery3d/src/Scenery3dMgr.cpp => plugins/Scenery3d/src/Scenery3d.cpp

plugins/Scenery3d/src/Scenery3dMgr.hpp => plugins/Scenery3d/src/Scenery3d.hpp

files modified:
CMakeLists.txt

cmake/default_config.ini.cmake

data/CMakeLists.txt

data/ssystem.ini

plugins/AngleMeasure/src/AngleMeasure.hpp

plugins/ArchaeoLines/src/ArchaeoLines.hpp

plugins/CompassMarks/src/CompassMarks.hpp

plugins/EquationOfTime/src/EquationOfTime.hpp

plugins/Exoplanets/src/Exoplanet.cpp

plugins/Exoplanets/src/Exoplanet.hpp

plugins/Exoplanets/src/Exoplanets.cpp

plugins/Exoplanets/src/Exoplanets.hpp

plugins/FOV/src/FOV.hpp

plugins/HelloStelModule/src/HelloStelModule.hpp

plugins/MeteorShowers/src/MeteorShower.cpp

plugins/MeteorShowers/src/MeteorShower.hpp

plugins/MeteorShowers/src/MeteorShowers.cpp

plugins/MeteorShowers/src/MeteorShowers.hpp

plugins/MeteorShowers/src/MeteorShowersMgr.hpp

plugins/NavStars/src/NavStars.hpp

plugins/Novae/src/Nova.cpp

plugins/Novae/src/Nova.hpp

plugins/Novae/src/Novae.cpp

plugins/Novae/src/Novae.hpp

plugins/Observability/src/Observability.hpp

plugins/Oculars/src/Oculars.hpp

plugins/PointerCoordinates/src/PointerCoordinates.hpp

plugins/Pulsars/src/Pulsar.cpp

plugins/Pulsars/src/Pulsar.hpp

plugins/Pulsars/src/Pulsars.cpp

plugins/Pulsars/src/Pulsars.hpp

plugins/Quasars/src/Quasar.cpp

plugins/Quasars/src/Quasar.hpp

plugins/Quasars/src/Quasars.cpp

plugins/Quasars/src/Quasars.hpp

plugins/RemoteControl/CMakeLists.txt

plugins/RemoteControl/doc/remoteControlApi.doxygen

plugins/RemoteControl/src/APIController.cpp

plugins/RemoteControl/src/APIController.hpp

plugins/RemoteControl/src/AbstractAPIService.cpp

plugins/RemoteControl/src/AbstractAPIService.hpp

plugins/RemoteControl/src/CMakeLists.txt

plugins/RemoteControl/src/LocationSearchService.cpp

plugins/RemoteControl/src/LocationSearchService.hpp

plugins/RemoteControl/src/LocationService.cpp

plugins/RemoteControl/src/LocationService.hpp

plugins/RemoteControl/src/MainService.cpp

plugins/RemoteControl/src/MainService.hpp

plugins/RemoteControl/src/ObjectService.cpp

plugins/RemoteControl/src/ObjectService.hpp

plugins/RemoteControl/src/RemoteControl.hpp

plugins/RemoteControl/src/RequestHandler.cpp

plugins/RemoteControl/src/RequestHandler.hpp

plugins/RemoteControl/src/ScriptService.cpp

plugins/RemoteControl/src/ScriptService.hpp

plugins/RemoteControl/src/SimbadService.cpp

plugins/RemoteControl/src/SimbadService.hpp

plugins/RemoteControl/src/StelActionService.cpp

plugins/RemoteControl/src/StelActionService.hpp

plugins/RemoteControl/src/StelPropertyService.cpp

plugins/RemoteControl/src/StelPropertyService.hpp

plugins/RemoteControl/src/ViewService.cpp

plugins/RemoteControl/src/ViewService.hpp

plugins/RemoteControl/webroot/index.html

plugins/RemoteControl/webroot/js/api/remotecontrol.js

plugins/RemoteControl/webroot/js/api/search.js

plugins/RemoteControl/webroot/js/settings.js

plugins/RemoteControl/webroot/js/translationdata.js

plugins/RemoteControl/webroot/js/ui/mainui.js

plugins/RemoteControl/webroot/js/ui/search.js

plugins/RemoteControl/webroot/js/ui/viewcontrol.js

plugins/RemoteControl/webroot/js/ui/viewoptions.js

plugins/RemoteControl/webroot/style.css

plugins/RemoteControl/webroot/tablet7in.html

plugins/RemoteSync/CMakeLists.txt

plugins/RemoteSync/src/RemoteSync.cpp

plugins/RemoteSync/src/RemoteSync.hpp

plugins/RemoteSync/src/SyncClient.cpp

plugins/RemoteSync/src/SyncClient.hpp

plugins/RemoteSync/src/SyncClientHandlers.cpp

plugins/RemoteSync/src/SyncClientHandlers.hpp

plugins/RemoteSync/src/SyncMessages.cpp

plugins/RemoteSync/src/SyncMessages.hpp

plugins/RemoteSync/src/SyncProtocol.cpp

plugins/RemoteSync/src/SyncProtocol.hpp

plugins/RemoteSync/src/SyncServer.cpp

plugins/RemoteSync/src/SyncServer.hpp

plugins/RemoteSync/src/SyncServerEventSenders.cpp

plugins/RemoteSync/src/SyncServerEventSenders.hpp

plugins/RemoteSync/src/SyncServerHandlers.cpp

plugins/RemoteSync/src/SyncServerHandlers.hpp

plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp

plugins/RemoteSync/src/gui/RemoteSyncDialog.hpp

plugins/RemoteSync/src/gui/remoteSyncDialog.ui

plugins/Satellites/src/Satellite.cpp

plugins/Satellites/src/Satellite.hpp

plugins/Satellites/src/Satellites.cpp

plugins/Satellites/src/Satellites.hpp

plugins/Scenery3d/src/CMakeLists.txt

plugins/Scenery3d/src/Frustum.cpp

plugins/Scenery3d/src/Frustum.hpp

plugins/Scenery3d/src/Heightmap.cpp

plugins/Scenery3d/src/Heightmap.hpp

plugins/Scenery3d/src/Plane.hpp

plugins/Scenery3d/src/Polyhedron.cpp

plugins/Scenery3d/src/Polyhedron.hpp

plugins/Scenery3d/src/SceneInfo.cpp

plugins/Scenery3d/src/SceneInfo.hpp

plugins/Scenery3d/src/ShaderManager.cpp

plugins/Scenery3d/src/ShaderManager.hpp

plugins/Scenery3d/src/gui/Scenery3dDialog.cpp

plugins/Scenery3d/src/gui/Scenery3dDialog.hpp

plugins/Scenery3d/src/gui/Scenery3dDialog_p.hpp

plugins/Scenery3d/src/gui/StoredViewDialog.cpp

plugins/Scenery3d/src/gui/StoredViewDialog.hpp

plugins/SimpleDrawLine/src/SimpleDrawLine.hpp

plugins/SolarSystemEditor/src/SolarSystemEditor.hpp

plugins/Supernovae/src/Supernova.cpp

plugins/Supernovae/src/Supernova.hpp

plugins/Supernovae/src/Supernovae.cpp

plugins/Supernovae/src/Supernovae.hpp

plugins/TelescopeControl/src/TelescopeControl.cpp

plugins/TelescopeControl/src/TelescopeControl.hpp

plugins/TelescopeControl/src/clients/TelescopeClient.cpp

plugins/TelescopeControl/src/clients/TelescopeClient.hpp

plugins/TextUserInterface/src/TextUserInterface.hpp

po/stellarium-remotecontrol/POTFILES.in

po/stellarium-remotecontrol/stellarium-remotecontrol.jst

scenery3d/Testscene/Stellarium-Testscene_withGrid_Bump-separateSpheres.mtl

src/CMakeLists.txt

src/StelMainView.cpp

src/StelMainView.hpp

src/core/StelApp.cpp

src/core/StelApp.hpp

src/core/StelCore.cpp

src/core/StelCore.hpp

src/core/StelLocation.cpp

src/core/StelModuleMgr.cpp

src/core/StelModuleMgr.hpp

src/core/StelMovementMgr.cpp

src/core/StelMovementMgr.hpp

src/core/StelObject.hpp

src/core/StelObjectMgr.cpp

src/core/StelObjectMgr.hpp

src/core/StelObjectModule.hpp

src/core/StelObserver.cpp

src/core/StelPainter.cpp

src/core/StelPluginInterface.hpp

src/core/StelPropertyMgr.cpp

src/core/StelPropertyMgr.hpp

src/core/StelSphereGeometry.cpp

src/core/StelTexture.cpp

src/core/StelTexture.hpp

src/core/StelTextureMgr.cpp

src/core/StelTextureMgr.hpp

src/core/StelUtils.cpp

src/core/StelUtils.hpp

src/core/VecMath.hpp

src/core/modules/Asterism.cpp

src/core/modules/Asterism.hpp

src/core/modules/AsterismMgr.cpp

src/core/modules/AsterismMgr.hpp

src/core/modules/Comet.cpp

src/core/modules/Comet.hpp

src/core/modules/Constellation.cpp

src/core/modules/Constellation.hpp

src/core/modules/ConstellationMgr.cpp

src/core/modules/ConstellationMgr.hpp

src/core/modules/CustomObject.cpp

src/core/modules/CustomObject.hpp

src/core/modules/CustomObjectMgr.hpp

src/core/modules/LandscapeMgr.cpp

src/core/modules/MilkyWay.cpp

src/core/modules/MilkyWay.hpp

src/core/modules/MinorPlanet.cpp

src/core/modules/MinorPlanet.hpp

src/core/modules/Nebula.cpp

src/core/modules/Nebula.hpp

src/core/modules/NebulaMgr.hpp

src/core/modules/Planet.cpp

src/core/modules/Planet.hpp

src/core/modules/SolarSystem.cpp

src/core/modules/SolarSystem.hpp

src/core/modules/Star.cpp

src/core/modules/Star.hpp

src/core/modules/StarMgr.cpp

src/core/modules/StarMgr.hpp

src/core/modules/StarWrapper.hpp

src/core/modules/ZodiacalLight.cpp

src/core/modules/ZodiacalLight.hpp

src/gui/ConfigurationDialog.cpp

src/gui/LocationDialog.cpp

src/gui/ViewDialog.cpp

src/gui/viewDialog.ui

src/main.cpp

Show diffs side-by-side

added added

removed removed

plugins/TextUserInterface/src/TextUserInterface.hpp

105

105

public:

106

106

virtual StelModule* getStelModule() const;

107

107

virtual StelPluginInfo getPluginInfo() const;

108

virtual QObjectList getExtensionList() const { return QObjectList(); }

108

109

};

109

110

110

111

#endif /*_TEXTUSERINTERFACE_HPP_*/

Older »