Stellarium

Merge lp:~registry/stellarium/socis2015 into lp:stellarium

socis2015
Merge into trunk

Proposed by Alexander Wolf on 2016-06-04

Status:	Merged
Merged at revision:	8441
Proposed branch:	lp:~registry/stellarium/socis2015
Merge into:	lp:stellarium
Diff against target:	72667 lines (+65875/-1760) 236 files modified CMakeLists.txt (+28/-9) cmake/Doxyfile.cmake (+8/-5) data/CMakeLists.txt (+5/-2) data/gui/normalStyle.css (+1/-1) doc/DoxygenLayout.xml (+1/-1) doc/doxygen.css (+2/-1) doc/mainpage.doxygen (+3/-3) doc/plugIns.doxygen (+1/-0) guide/plg_interfaces.tex (+95/-1) plugins/ArchaeoLines/src/ArchaeoLines.cpp (+27/-10) plugins/ArchaeoLines/src/ArchaeoLines.hpp (+23/-14) plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp (+8/-1) plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp (+1/-0) plugins/Oculars/src/Oculars.cpp (+57/-82) plugins/Oculars/src/Oculars.hpp (+15/-1) plugins/Oculars/src/gui/OcularsGuiPanel.cpp (+115/-132) plugins/RemoteControl/CMakeLists.txt (+46/-0) plugins/RemoteControl/COPYING (+340/-0) plugins/RemoteControl/RemoteControl.qrc (+6/-0) plugins/RemoteControl/doc/qtwebapp.doxygen (+35/-0) plugins/RemoteControl/doc/remoteControl.doxygen (+61/-0) plugins/RemoteControl/doc/remoteControlApi.doxygen (+461/-0) plugins/RemoteControl/doc/remoteControlWeb.doxygen (+564/-0) plugins/RemoteControl/src/APIController.cpp (+141/-0) plugins/RemoteControl/src/APIController.hpp (+64/-0) plugins/RemoteControl/src/AbstractAPIService.cpp (+159/-0) plugins/RemoteControl/src/AbstractAPIService.hpp (+160/-0) plugins/RemoteControl/src/CMakeLists.txt (+78/-0) plugins/RemoteControl/src/LocationSearchService.cpp (+104/-0) plugins/RemoteControl/src/LocationSearchService.hpp (+58/-0) plugins/RemoteControl/src/LocationService.cpp (+258/-0) plugins/RemoteControl/src/LocationService.hpp (+56/-0) plugins/RemoteControl/src/MainService.cpp (+622/-0) plugins/RemoteControl/src/MainService.hpp (+122/-0) plugins/RemoteControl/src/ObjectService.cpp (+216/-0) plugins/RemoteControl/src/ObjectService.hpp (+67/-0) plugins/RemoteControl/src/RemoteControl.cpp (+288/-0) plugins/RemoteControl/src/RemoteControl.hpp (+179/-0) plugins/RemoteControl/src/RequestHandler.cpp (+222/-0) plugins/RemoteControl/src/RequestHandler.hpp (+88/-0) plugins/RemoteControl/src/ScriptService.cpp (+169/-0) plugins/RemoteControl/src/ScriptService.hpp (+52/-0) plugins/RemoteControl/src/SimbadService.cpp (+193/-0) plugins/RemoteControl/src/SimbadService.hpp (+53/-0) plugins/RemoteControl/src/StelActionService.cpp (+115/-0) plugins/RemoteControl/src/StelActionService.hpp (+54/-0) plugins/RemoteControl/src/StelPropertyService.cpp (+113/-0) plugins/RemoteControl/src/StelPropertyService.hpp (+50/-0) plugins/RemoteControl/src/ViewService.cpp (+201/-0) plugins/RemoteControl/src/ViewService.hpp (+51/-0) plugins/RemoteControl/src/gui/RemoteControlDialog.cpp (+182/-0) plugins/RemoteControl/src/gui/RemoteControlDialog.hpp (+61/-0) plugins/RemoteControl/src/gui/remoteControlDialog.ui (+323/-0) plugins/RemoteControl/src/qtwebapp/copyright.txt (+11/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandler.cpp (+295/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandler.h (+146/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandlerpool.cpp (+137/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpconnectionhandlerpool.h (+119/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpcookie.cpp (+243/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpcookie.h (+112/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpglobal.cpp (+7/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpglobal.h (+30/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httplistener.cpp (+90/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httplistener.h (+113/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequest.cpp (+553/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequest.h (+235/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequesthandler.cpp (+21/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httprequesthandler.h (+50/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.cpp (+202/-0) plugins/RemoteControl/src/qtwebapp/httpserver/httpresponse.h (+163/-0) plugins/RemoteControl/src/qtwebapp/httpserver/staticfilecontroller.cpp (+185/-0) plugins/RemoteControl/src/qtwebapp/httpserver/staticfilecontroller.h (+117/-0) plugins/RemoteControl/src/qtwebapp/lgpl-3.0.txt (+165/-0) plugins/RemoteControl/src/qtwebapp/readme.txt (+7/-0) plugins/RemoteControl/src/qtwebapp/templateengine/template.cpp (+295/-0) plugins/RemoteControl/src/qtwebapp/templateengine/template.h (+187/-0) plugins/RemoteControl/src/qtwebapp/templateengine/templateglobal.h (+24/-0) plugins/RemoteControl/util/update_translationdata.py (+42/-0) plugins/RemoteControl/webroot/dejavusans-webfont.svg (+6922/-0) plugins/RemoteControl/webroot/dejavusansmono-webfont.svg (+3318/-0) plugins/RemoteControl/webroot/external/jquery-ui.css (+1225/-0) plugins/RemoteControl/webroot/iframestyle.css (+54/-0) plugins/RemoteControl/webroot/index.html (+496/-0) plugins/RemoteControl/webroot/js/api/actions.js (+142/-0) plugins/RemoteControl/webroot/js/api/flags.js (+54/-0) plugins/RemoteControl/webroot/js/api/location.js (+172/-0) plugins/RemoteControl/webroot/js/api/properties.js (+161/-0) plugins/RemoteControl/webroot/js/api/remotecontrol.js (+205/-0) plugins/RemoteControl/webroot/js/api/scripts.js (+63/-0) plugins/RemoteControl/webroot/js/api/search.js (+174/-0) plugins/RemoteControl/webroot/js/api/time.js (+377/-0) plugins/RemoteControl/webroot/js/api/trunc.js (+8/-0) plugins/RemoteControl/webroot/js/api/updatequeue.js (+40/-0) plugins/RemoteControl/webroot/js/api/viewcontrol.js (+131/-0) plugins/RemoteControl/webroot/js/api/viewoptions.js (+85/-0) plugins/RemoteControl/webroot/js/globalize.js (+1586/-0) plugins/RemoteControl/webroot/js/jquery-1.11.3.js (+10351/-0) plugins/RemoteControl/webroot/js/jquery-ui.js (+16617/-0) plugins/RemoteControl/webroot/js/jquery.ui.touch-punch.js (+180/-0) plugins/RemoteControl/webroot/js/main.js (+31/-0) plugins/RemoteControl/webroot/js/plugins/archaeolines.js (+7/-0) plugins/RemoteControl/webroot/js/require.js (+2103/-0) plugins/RemoteControl/webroot/js/settings.js (+22/-0) plugins/RemoteControl/webroot/js/translationdata.js (+33/-0) plugins/RemoteControl/webroot/js/ui/actions.js (+84/-0) plugins/RemoteControl/webroot/js/ui/combobox.js (+148/-0) plugins/RemoteControl/webroot/js/ui/jqueryuifixes.js (+162/-0) plugins/RemoteControl/webroot/js/ui/location.js (+237/-0) plugins/RemoteControl/webroot/js/ui/mainui.js (+334/-0) plugins/RemoteControl/webroot/js/ui/scripts.js (+90/-0) plugins/RemoteControl/webroot/js/ui/search.js (+267/-0) plugins/RemoteControl/webroot/js/ui/time.js (+223/-0) plugins/RemoteControl/webroot/js/ui/viewcontrol.js (+88/-0) plugins/RemoteControl/webroot/js/ui/viewoptions.js (+132/-0) plugins/RemoteControl/webroot/style.css (+889/-0) plugins/RemoteControl/webroot/style_tablet7in.css (+161/-0) plugins/RemoteControl/webroot/tablet7in.html (+690/-0) plugins/RemoteControl/webroot/translate_files (+17/-0) plugins/RemoteSync/CMakeLists.txt (+20/-0) plugins/RemoteSync/RemoteSync.qrc (+6/-0) plugins/RemoteSync/src/CMakeLists.txt (+43/-0) plugins/RemoteSync/src/RemoteSync.cpp (+276/-0) plugins/RemoteSync/src/RemoteSync.hpp (+159/-0) plugins/RemoteSync/src/SyncClient.cpp (+185/-0) plugins/RemoteSync/src/SyncClient.hpp (+71/-0) plugins/RemoteSync/src/SyncClientHandlers.cpp (+243/-0) plugins/RemoteSync/src/SyncClientHandlers.hpp (+89/-0) plugins/RemoteSync/src/SyncMessages.cpp (+171/-0) plugins/RemoteSync/src/SyncMessages.hpp (+127/-0) plugins/RemoteSync/src/SyncProtocol.cpp (+227/-0) plugins/RemoteSync/src/SyncProtocol.hpp (+191/-0) plugins/RemoteSync/src/SyncServer.cpp (+294/-0) plugins/RemoteSync/src/SyncServer.hpp (+86/-0) plugins/RemoteSync/src/SyncServerEventSenders.cpp (+104/-0) plugins/RemoteSync/src/SyncServerEventSenders.hpp (+131/-0) plugins/RemoteSync/src/SyncServerHandlers.cpp (+105/-0) plugins/RemoteSync/src/SyncServerHandlers.hpp (+61/-0) plugins/RemoteSync/src/gui/RemoteSyncDialog.cpp (+207/-0) plugins/RemoteSync/src/gui/RemoteSyncDialog.hpp (+60/-0) plugins/RemoteSync/src/gui/remoteSyncDialog.ui (+373/-0) plugins/Scenery3d/src/Scenery3d.cpp (+4/-2) plugins/TextUserInterface/src/TextUserInterface.cpp (+6/-14) plugins/TextUserInterface/src/TextUserInterface.hpp (+0/-1) po/CMakeLists.txt (+3/-0) po/stellarium-remotecontrol/CMakeLists.txt (+73/-0) po/stellarium-remotecontrol/POTFILES.in (+23/-0) po/stellarium-remotecontrol/en.po (+325/-0) po/stellarium-remotecontrol/stellarium-remotecontrol-js.pot (+128/-0) po/stellarium-remotecontrol/stellarium-remotecontrol.pot (+600/-0) scripts/tests/real_time.ssc (+2/-2) src/CLIProcessor.cpp (+6/-1) src/CMakeLists.txt (+19/-0) src/StelLogger.cpp (+11/-0) src/StelLogger.hpp (+2/-0) src/StelMainView.cpp (+23/-5) src/core/SimbadSearcher.cpp (+20/-2) src/core/SimbadSearcher.hpp (+4/-1) src/core/StelActionMgr.cpp (+64/-54) src/core/StelActionMgr.hpp (+84/-37) src/core/StelApp.cpp (+19/-12) src/core/StelApp.hpp (+7/-4) src/core/StelAudioMgr.cpp (+52/-0) src/core/StelAudioMgr.hpp (+12/-0) src/core/StelCore.cpp (+108/-7) src/core/StelCore.hpp (+58/-10) src/core/StelLocation.cpp (+6/-0) src/core/StelLocation.hpp (+7/-0) src/core/StelLocationMgr.cpp (+34/-26) src/core/StelLocationMgr.hpp (+28/-29) src/core/StelModule.cpp (+6/-1) src/core/StelModule.hpp (+16/-3) src/core/StelModuleMgr.cpp (+4/-0) src/core/StelMovementMgr.cpp (+150/-33) src/core/StelMovementMgr.hpp (+74/-18) src/core/StelObject.cpp (+3/-1) src/core/StelObject.hpp (+8/-3) src/core/StelObjectModule.hpp (+1/-0) src/core/StelObjectType.hpp (+2/-0) src/core/StelObserver.cpp (+5/-3) src/core/StelObserver.hpp (+9/-1) src/core/StelProjector.cpp (+1/-0) src/core/StelProjector.hpp (+6/-3) src/core/StelProjectorClasses.cpp (+28/-17) src/core/StelPropertyMgr.cpp (+225/-0) src/core/StelPropertyMgr.hpp (+318/-0) src/core/StelRegionObject.hpp (+8/-6) src/core/StelSkyCultureMgr.cpp (+44/-1) src/core/StelSkyCultureMgr.hpp (+20/-1) src/core/StelSkyDrawer.cpp (+25/-20) src/core/StelSkyDrawer.hpp (+83/-27) src/core/StelTranslator.cpp (+5/-0) src/core/StelTranslator.hpp (+8/-0) src/core/StelUtils.cpp (+15/-5) src/core/StelUtils.hpp (+2/-2) src/core/VecMath.hpp (+16/-0) src/core/modules/Constellation.cpp (+3/-2) src/core/modules/Constellation.hpp (+3/-0) src/core/modules/ConstellationMgr.cpp (+66/-25) src/core/modules/ConstellationMgr.hpp (+43/-13) src/core/modules/LabelMgr.cpp (+4/-1) src/core/modules/LandscapeMgr.cpp (+50/-18) src/core/modules/LandscapeMgr.hpp (+80/-15) src/core/modules/MilkyWay.cpp (+1/-1) src/core/modules/MilkyWay.hpp (+8/-2) src/core/modules/Nebula.hpp (+9/-8) src/core/modules/NebulaMgr.cpp (+31/-16) src/core/modules/NebulaMgr.hpp (+58/-14) src/core/modules/SolarSystem.cpp (+34/-10) src/core/modules/SolarSystem.hpp (+55/-6) src/core/modules/SporadicMeteorMgr.cpp (+5/-2) src/core/modules/StarMgr.cpp (+1/-1) src/core/modules/StarMgr.hpp (+10/-5) src/core/modules/ZodiacalLight.cpp (+1/-0) src/core/modules/ZodiacalLight.hpp (+126/-120) src/gui/AtmosphereDialog.cpp (+3/-10) src/gui/ConfigurationDialog.cpp (+12/-27) src/gui/LocationDialog.cpp (+25/-40) src/gui/LocationDialog.hpp (+9/-0) src/gui/ScriptConsole.cpp (+24/-60) src/gui/ScriptConsole.hpp (+2/-0) src/gui/SearchDialog.cpp (+8/-34) src/gui/SearchDialog.hpp (+49/-6) src/gui/StelDialog.cpp (+405/-220) src/gui/StelDialog.hpp (+56/-5) src/gui/StelDialog_p.hpp (+110/-0) src/gui/StelGuiItems.hpp (+10/-3) src/gui/ViewDialog.cpp (+242/-388) src/gui/ViewDialog.hpp (+15/-18) src/gui/configurationDialog.ui (+5/-1) src/gui/viewDialog.ui (+6/-3) src/scripting/ScreenImageMgr.cpp (+8/-6) src/scripting/ScreenImageMgr.hpp (+5/-2) src/scripting/StelMainScriptAPI.cpp (+36/-13) src/scripting/StelMainScriptAPI.hpp (+37/-4) src/scripting/StelScriptMgr.cpp (+95/-26) src/scripting/StelScriptMgr.hpp (+56/-20)
To merge this branch:	bzr merge lp:~registry/stellarium/socis2015
Related bugs:	Link a bug report
Related blueprints:	Convert objects to use Qt properties (Medium)

Reviewer	Date Requested	Status
Fabien Chéreau	2016-06-04	Approve on 2016-06-13
gzotti	2016-06-04	Approve on 2016-06-04
Review via email: mp+296492@code.launchpad.net

This proposal supersedes a proposal from 2016-05-11.

Commit message

Merging SoCiS2015 branch: StelProperty system, RemoteControl and preliminary RemoteSync plugin.

Description of the change

This branch introduces a new way how objects distribute changes in their properties: the StelProperty system. (Based on a proper use of the QT_PROPERTY mechanism.) This allows better interaction between several ways to switch settings, not only triggering (via StelAction) but also distributing other data.

The reason for this is its second contribution: RemoteControl plugin. A web interface which allows a presenter in front of a screen to switch almost all things from a handheld tablet (or other computer) with a decent web browser (via JavaScript). Or just start a script via wget or curl per cronjob. The StelProperty system is used to automatically propagate changes into all connected GUIs. This system has now worked flawlessly for several weeks in a big museum installation.

Yet another plugin, RemoteSync, has not been completed so far. I still propose merging this branch now, because StelProperty is working well and should be used in future development, and also RemoteControl is working well and ready for a first release with V0.15.0. Both plugins will become better over time. For now, I recommend deactivating RemoteSync from default builds, it does not otherwise disturb.

Revision history for this message

Fabien Chéreau (xalioth) wrote on 2016-05-17: Posted in a previous version of this proposal

Hi Florian, Georg,

thanks, that's huge amount of work that you did! I haven't checked the code in a (too) long time, so it took me time to sort out your changes from the ones of the trunk!
General comment: the code is very clean and very well documented, thanks! That's really professional work :)

Comments on the StelProperty:
- I understand the need for StelProperty/StelPropertyMgr for scripting and more generally GUI/remote controller etc... it is definitely something missing from the current trunk
- I am not quite sure about creating a new StelProperty class though, as it doesn't seem brings much more than the regular Qt property. If you would adopt the convention used in QtScript of designing a property by the qobjectname.propertyname you may more or less be able to avoid it I think. The property manager would then simply manage the collection of QObject containing the properties to expose and you could use a more standard approach, which will match the scripting language API. There is somehow a merge to do with the existing scripting API.
- Also I'm a bit concerned with the partial duplication of features with StelAction, or at least the additional complexity to grasp the difference and when to use which. Did you consider forcing StelAction to use a StelProperty/QProperty and remove the other kind of binding to functions? I think it would make sense.

On the RemoteControl plugin:
- it would be good to move all related data inside the plugin folder instead of keeping them in data/ (i.e. move data/webroot stuff in the plguing/RemoteControl/ folder)
- did you double check all third parties libraries licenses?
- this plugin should also not be activated by default for security reasons (I didn't check if it's the case)

review: Needs Fixing

Revision history for this message

Florian Schaukowitsch (fschauk) wrote on 2016-05-18: Posted in a previous version of this proposal

Download full text (3.5 KiB)

Hello Fabien,
thanks for the kind words!

To adress your issues:
StelProperty:
- Directly using the modules is an interesting idea. This would still retain the StelPropertyMgr as the central access point, having readProperty(QString id) and writeProperty(QString id,QVariant value) methods, and something like connectToPropertyChanged(QString id, QObject* target, QString slot) or similar? A disadvantage would probably be that some string manipulation and lookup must be used each time, for finding out the object name and property name, but we can probably avoid most of this by putting all QMetaProperties of an object in a global QMap when it is registered -- assuming object names never change. Still, in a class using this, the property ID would need to be specified each time, instead of using a single StelProperty reference.
There could be a method that registers arbitrary QObjects, but maybe we could register all StelModule subclasses automatically. Maybe there are some properties that you do not want exposed, what to do about those? Nevertheless, this system seems to be worth testing out. I probably can retain the other added API as-is (StelDialog, RemoteControl).

- My consideration was that a StelAction is mainly a wrapper for an UI operation, which can be assigned hotkeys, etc. This only seems to make sense for boolean or argument-less actions, assigning an hotkey to an Q_PROPERTY of arbitrary type would be a bit strange? StelProperty on the other hand is more of an development/power-user tool to directly access internals of the various classes, and reacting to changes of these properties if desired. Actually, I have modified StelAction to use a StelProperty when possible, meaning when bound to a boolean Q_PROPERTY with a NOTIFY event, it internally creates and uses a StelProperty with the same name as the action. I still think that it makes sense to retain at least the direct connection to an argumentless slot somehow, to enable actions that have no inherent "state". I found the variant with a slot(bool) to be a bit weird because the StelAction has to track the current "state" itself, which could possibly lead to discrepencies if the slot is called directly elsewhere. Nevertheless, I think this variant is not really used that much, and introducing a boolean property for these cases should not be hard.

RemoteControl:
- In the source tree, the webroot folder could be easily moved to the plugin folder. Do you still want to move it to 'share/${PACKAGE}/data/webroot' for the installation, or is there a better folder? I think there is no "modules" folder in the installation directory, or is there? The web server does not use StelFileMgr internally (for performance/consistency reasons), therefore I think adding an webroot override path to the configuration file, so that users can replace the interface without it being overridden by app updates, should also work. Or should a webroot folder in '~/.stellarium/data' (or maybe '~/.stellarium/modules/RemoteControl/webroot') automatically be used?

- The only new library used is Stefan Fring's QtWebApp (http://stefanfrings.de/qtwebapp/index-en.html), which is licensed under the LGPL (no version...

Hi,

see me replies inline

On Thu, May 19, 2016 at 12:31 AM, Florian Schaukowitsch <
florian.schaukowitsch@student.tuwien.ac.at> wrote:

> Hello Fabien,
> thanks for the kind words!
>
> To adress your issues:
> StelProperty:
>  - Directly using the modules is an interesting idea. This would still
> retain the StelPropertyMgr as the central access point, having
> readProperty(QString id) and writeProperty(QString id,QVariant value)
> methods, and something like connectToPropertyChanged(QString id, QObject*
> target, QString slot) or similar? A disadvantage would probably be that
> some string manipulation and lookup must be used each time, for finding out
> the object name and property name, but we can probably avoid most of this
> by putting all QMetaProperties of an object in a global QMap when it is
> registered -- assuming object names never change. Still, in a class using
> this, the property ID would need to be specified each time, instead of
> using a single StelProperty reference.
>

Yes there are drawbacks, but somehow this was already done for
QtScript/QML, which allow access to QObjects by names.

>  There could be a method that registers arbitrary QObjects, but maybe we
> could register all StelModule subclasses automatically. Maybe there are
> some properties that you do not want exposed, what to do about those?

We should check if there are. But we could also probably just assume that
the preliminary goal of using Qproperties on a value is precisely to expose
it to script/GUI/remote control

> Nevertheless, this system seems to be worth testing out. I probably can
> retain the other added API as-is (StelDialog, RemoteControl).
>

yes, excepted a properties renaming, this should not be different from the
point of view of the external user of the API

>  - My consideration was that a StelAction is mainly a wrapper for an UI
> operation, which can be assigned hotkeys, etc. This only seems to make
> sense for boolean or argument-less actions, assigning an hotkey to an
> Q_PROPERTY of arbitrary type would be a bit strange? StelProperty on the
> other hand is more of an development/power-user tool to directly access
> internals of the various classes, and reacting to changes of these
> properties if desired. Actually, I have modified StelAction to use a
> StelProperty when possible, meaning when bound to a boolean Q_PROPERTY with
> a NOTIFY event, it internally creates and uses a StelProperty with the same
> name as the action. I still think that it makes sense to retain at least
> the direct connection to an argumentless slot somehow, to enable actions
> that have no inherent "state". I found the variant with a slot(bool) to be
> a bit weird because the StelAction has to track the current "state" itself,
> which could possibly lead to discrepencies if the slot is called directly
> elsewhere. Nevertheless, I think this variant is not really used that much,
> and introducing a boolean property for these cases should not be hard.
>

OK, I didn't look in enough details to conclude on that so please do as you
think is the best. Just try to refactor and simplify other parts of the
code if possible, even if you remove not much used features. As I always
say, for an open source project, keeping the code simple is more important
that the number of features, because complicated code just kills motivation
of new developers!

> RemoteControl:
>  - In the source tree, the webroot folder could be easily moved to the
> plugin folder. Do you still want to move it to
> 'share/${PACKAGE}/data/webroot' for the installation, or is there a better
> folder? I think there is no "modules" folder in the installation directory,
> or is there? The web server does not use StelFileMgr internally (for
> performance/consistency reasons), therefore I think adding an webroot
> override path to the configuration file, so that users can replace the
> interface without it being overridden by app updates, should also work. Or
> should a webroot folder in '~/.stellarium/data' (or maybe
> '~/.stellarium/modules/RemoteControl/webroot') automatically be used?
>

Do as you prefer.

>
>  - The only new library used is Stefan Fring's QtWebApp (
> http://stefanfrings.de/qtwebapp/index-en.html), which is licensed under
> the LGPL (no version specified, so any can be chosen as far as I know). I
> have modified it slightly to interface it better with Stellarium, and
> removed some unneeded files. The library and author is named in the doxygen
> doc and the plugin's "About" information. I think this should suffice?
>

OK, seems fine.

>  - I did not add the plugin to the default_config.ini, so it should not be
> loaded. I also think that it should remain off by default.
>

OK.

> --
>
> https://code.launchpad.net/~stellarium-socis/stellarium/socis2015/+merge/294410
> You are reviewing the proposed merge of
> lp:~stellarium-socis/stellarium/socis2015 into lp:stellarium.
>

Revision history for this message

Florian Schaukowitsch (fschauk) wrote on 2016-06-03: Posted in a previous version of this proposal

Sorry for the delay, I was sick for a few days and then I somehow managed to mess up my Qt installation so hard that even a reinstall could not fix it :P

I tried out a few things. The StelPropertyMgr can now register arbitrary QObjects and their properties. All StelModules are automatically registered (in StelModuleMgr::registerModule), also the StelSkyCultureMgr, StelSkyDrawer and StelCore are manually registered for now.

The properties can now be accessed with a "<objectName>.<propertyName>" ID, like in QtScript. The properties are put into a QMap when registered, no dynamic lookup/string manipulation is done (meaning the QObject name of an object should stay the same during runtime, but it does for all our classes). The StelProperty class itself is still retained, I think this is the best coding style and has less overhead than the alternatives. Normaly, you don't even need to use the class itself, if you are a StelModule developer you now don't have to do *anything special at all* to provide access to your properties through the StelProperty system. The connectIntProperty/connectDoubleProperty... methods in StelDialog hide all the complexity for GUI connections.

I removed the support for bool slots from StelAction, the Oculars plugin seems to be the only place this was used. StelAction now has basically 2 modes:
- connection to a bool Q_PROPERTY - the property is also registered as StelProperty with the ID of the action, a NOTIFY signal is recommended but not required
- connection to an argumentless slot, which I still think is a valid use-case
I don't think we should split this up further or combine it with StelProperty somehow because of the different uses these classes should have.

I am quite happy now with the current system, what do you think?

Revision history for this message

gzotti (georg-zotti) wrote on 2016-06-04: Posted in a previous version of this proposal

Looks very good IMHO, thank you!
Fabien?

review: Needs Resubmitting

lp:~registry/stellarium/socis2015 updated on 2016-06-04

7781. By Alexander Wolf on 2016-06-04: A small fix for translations support
7782. By Alexander Wolf on 2016-06-04: A small fix for cmake

Revision history for this message

gzotti (georg-zotti) wrote on 2016-06-04:

Well, I resubmitted the Merge, so what else can I say? A small merge conflict should be cleaned up during the merge.

review: Approve

lp:~registry/stellarium/socis2015 updated on 2016-06-12

7783. By gzotti on 2016-06-06: removed useless files
7784. By Alexander Wolf on 2016-06-12: sync with trunk; avoid conflicts
7785. By Alexander Wolf on 2016-06-12: added changes for Miller projection

Revision history for this message

Fabien Chéreau (xalioth) wrote on 2016-06-13:

Hi Florian, thanks! I think we can merge now, sorry for the slow reaction..

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk

The diff has been truncated for viewing.

Subscribers

People subscribed via source and target branches

to all changes:

Alexander Wolf

Antonio Alonzi

Fabien Chéreau

Florian Schaukowitsch

Ivan Marti-Vidal

Luca Bicego

Marcos Cardinot

Matthew Gates

Registry Administrators

Tanmoy Saha

ThomasM

Youssif Ghantous Filho

holger

kutaibaa akraa

treaves

අනුරාධ Jayathilaka

to status/vote changes:

Norbert Mezei

 === modified file 'CMakeLists.txt'
 --- CMakeLists.txt	2016-06-05 07:56:01 +0000
 +++ CMakeLists.txt	2016-06-12 13:59:22 +0000
@@ -18,9 +18,15 @@
  ########### Project name ###########
  PROJECT(Stellarium)
--SET(STELLARIUM_MAJOR "0")
--SET(STELLARIUM_MINOR "14")
--SET(STELLARIUM_PATCH "90")
++# Use integer versions instead of strings for easier handling if required
++SET(STELLARIUM_MAJOR 0)
++SET(STELLARIUM_MINOR 14)
++SET(STELLARIUM_PATCH 90)
++ADD_DEFINITIONS(
++-DSTELLARIUM_MAJOR=${STELLARIUM_MAJOR}
++-DSTELLARIUM_MINOR=${STELLARIUM_MINOR}
++-DSTELLARIUM_PATCH=${STELLARIUM_PATCH}
++)
  SET(VERSION "${STELLARIUM_MAJOR}.${STELLARIUM_MINOR}.${STELLARIUM_PATCH}")
  SET(PACKAGE stellarium)
  SET(COPYRIGHT_YEARS "2000-2016")
@@ -174,7 +180,7 @@
  SET(STELLARIUM_PLUGINS) # Global list of all the plugins.
  MACRO(ADD_PLUGIN NAME DEFAULT)
       STRING(TOUPPER ${NAME} NAME_UP)
--     SET(USE_PLUGIN_${NAME_UP} ${DEFAULT} CACHE BOOL "Define wheter the ${NAME} plugin should be created.")
++     SET(USE_PLUGIN_${NAME_UP} ${DEFAULT} CACHE BOOL "Define whether the ${NAME} plugin should be created.")
       SET(STELLARIUM_PLUGINS ${STELLARIUM_PLUGINS} ${NAME})
  ENDMACRO()
@@ -197,6 +203,9 @@
  ADD_PLUGIN(PointerCoordinates 1)
  ADD_PLUGIN(Pulsars 1)
  ADD_PLUGIN(Quasars 1)
++# SOCIS 2015:
++ADD_PLUGIN(RemoteControl 1)
++ADD_PLUGIN(RemoteSync 0)
  ADD_PLUGIN(Satellites 1)
  ADD_PLUGIN(Scenery3d 1)
  ADD_PLUGIN(SolarSystemEditor 1)
@@ -461,9 +470,9 @@
      SET(CPACK_PACKAGE_VENDOR "Stellarium's team")
      SET(CPACK_PACKAGE_DESCRIPTION_FILE "${CMAKE_CURRENT_SOURCE_DIR}/README")
      SET(CPACK_RESOURCE_FILE_LICENSE "${CMAKE_CURRENT_SOURCE_DIR}/COPYING")
--    SET(CPACK_PACKAGE_VERSION_MAJOR ${STELLARIUM_MAJOR})
--    SET(CPACK_PACKAGE_VERSION_MINOR ${STELLARIUM_MINOR})
--    SET(CPACK_PACKAGE_VERSION_PATCH ${STELLARIUM_PATCH})
++    SET(CPACK_PACKAGE_VERSION_MAJOR "${STELLARIUM_MAJOR}")
++    SET(CPACK_PACKAGE_VERSION_MINOR "${STELLARIUM_MINOR}")
++    SET(CPACK_PACKAGE_VERSION_PATCH "${STELLARIUM_PATCH}")
      SET(CPACK_PACKAGE_INSTALL_DIRECTORY "stellarium")
      SET(CPACK_SOURCE_PACKAGE_FILE_NAME "stellarium-${VERSION}")
      SET(CPACK_SOURCE_GENERATOR "TGZ")
@@ -517,8 +526,18 @@
  ENDIF()
  ########### Generate doxygen doc ###############
--CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
--ADD_CUSTOM_TARGET(apidoc doxygen ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generate the doxygen documentation into the doc directory.")
++FIND_PACKAGE(Doxygen)
++IF(DOXYGEN_FOUND)
++    IF(DOXYGEN_DOT_FOUND)
++        SET(HAVE_DOT "YES")
++        SET(DOT_PATH ${DOXYGEN_DOT_PATH})
++    ELSE()
++        SET(HAVE_DOT "NO")
++        SET(DOT_PATH "")
++    ENDIF()
++    CONFIGURE_FILE(${PROJECT_SOURCE_DIR}/cmake/Doxyfile.cmake ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile @ONLY)
++    ADD_CUSTOM_TARGET(apidoc ${DOXYGEN_EXECUTABLE} ${CMAKE_CURRENT_BINARY_DIR}/Doxyfile WORKING_DIRECTORY ${CMAKE_CURRENT_BINARY_DIR} COMMENT "Generate the doxygen documentation into the doc directory.")
++ENDIF()
  ##################### Generate translation copying script ######################
  IF(WIN32)
 === modified file 'cmake/Doxyfile.cmake'
 --- cmake/Doxyfile.cmake	2016-04-21 07:15:21 +0000
 +++ cmake/Doxyfile.cmake	2016-06-12 13:59:22 +0000
@@ -150,7 +150,7 @@
  # shortest path that makes the file name unique will be used
  # The default value is: YES.
--FULL_PATH_NAMES        = NO
++FULL_PATH_NAMES        = YES
  # The STRIP_FROM_PATH tag can be used to strip a user-defined part of the path.
  # Stripping is only done if one of the specified strings matches the left-hand
@@ -2026,6 +2026,9 @@
  # run, you must also specify the path to the tagfile here.
  TAGFILES               = qt.tag=http://doc.qt.io/qt-5/
++                         qtcore.tags=http://doc.qt.io/qt-5/ \
++                         qtgui.tags=http://doc.qt.io/qt-5/ \
++                         qtwidgets.tags=http://doc.qt.io/qt-5/
  # When a file name is specified after GENERATE_TAGFILE, doxygen will create a
  # tag file that is based on the input files it reads. See section "Linking to
@@ -2101,7 +2104,7 @@
  # set to NO
  # The default value is: YES.
--HAVE_DOT               = NO
++HAVE_DOT               = @HAVE_DOT@
  # The DOT_NUM_THREADS specifies the number of dot invocations doxygen is allowed
  # to run in parallel. When set to 0 doxygen will base this on the number of
@@ -2143,7 +2146,7 @@
  # The default value is: YES.
  # This tag requires that the tag HAVE_DOT is set to YES.
--CLASS_GRAPH            = NO
++CLASS_GRAPH            = YES
  # If the COLLABORATION_GRAPH tag is set to YES then doxygen will generate a
  # graph for each documented class showing the direct and indirect implementation
@@ -2152,7 +2155,7 @@
  # The default value is: YES.
  # This tag requires that the tag HAVE_DOT is set to YES.
--COLLABORATION_GRAPH    = NO
++COLLABORATION_GRAPH    = YES
  # If the GROUP_GRAPHS tag is set to YES then doxygen will generate a graph for
  # groups, showing the direct groups dependencies.
@@ -2275,7 +2278,7 @@
  # found. If left blank, it is assumed the dot tool can be found in the path.
  # This tag requires that the tag HAVE_DOT is set to YES.
--DOT_PATH               =
++DOT_PATH               = "@DOT_PATH@"
  # The DOTFILE_DIRS tag can be used to specify one or more directories that
  # contain dot files that are included in the documentation (see the \dotfile
 === modified file 'data/CMakeLists.txt'
 --- data/CMakeLists.txt	2016-05-29 09:27:35 +0000
 +++ data/CMakeLists.txt	2016-06-12 13:59:22 +0000
@@ -53,13 +53,16 @@
  ENDIF()
  # install Scenery3d shaders
++IF(USE_PLUGIN_SCENERY3D)
  INSTALL(DIRECTORY shaders/ DESTINATION share/${PACKAGE}/data/shaders FILES_MATCHING
--	PATTERN "s3d_*.vert" PATTERN "s3d_*.geom" PATTERN "s3d_*.frag")
--
++	PATTERN "s3d_*.vert"
++	PATTERN "s3d_*.geom"
++	PATTERN "s3d_*.frag")
  # install Scenery3D docs for Windows
  IF(WIN32)
  	INSTALL(FILES ../plugins/Scenery3d/doc/Scenery3d.pdf DESTINATION share/${PACKAGE}/data)
  ENDIF(WIN32)
++ENDIF()
  IF (BUILD_FOR_MAEMO)
  	INSTALL(FILES maemo/stellarium.desktop DESTINATION /usr/share/applications/hildon)
 === modified file 'data/gui/normalStyle.css'
 --- data/gui/normalStyle.css	2015-08-18 06:29:08 +0000
 +++ data/gui/normalStyle.css	2016-06-12 13:59:22 +0000
@@ -149,7 +149,7 @@
  	font-size: 12px;
+ }
--QLineEdit[enabled="false"] {
++QLineEdit:disabled {
  	background: rgb(90, 90, 90);
+ }
 === modified file 'doc/DoxygenLayout.xml'
 --- doc/DoxygenLayout.xml	2014-06-22 14:08:40 +0000
 +++ doc/DoxygenLayout.xml	2016-06-12 13:59:22 +0000
@@ -18,7 +18,7 @@
      <tab type="user" url="@ref scripting" visible="yes" title="Scripting" intro=""/>
      <tab type="user" url="@ref plugins" visible="yes" title="Plugins" intro=""/>
      <tab type="user" url="@ref fileStructure" visible="yes" title="File Structure" intro=""/>
--    <tab type="files" visible="no" title="">
++    <tab type="files" visible="yes" title="">
        <tab type="filelist" visible="yes" title="" intro=""/>
        <tab type="globals" visible="yes" title="" intro=""/>
      </tab>
 === modified file 'doc/doxygen.css'
 --- doc/doxygen.css	2015-06-08 20:08:26 +0000
 +++ doc/doxygen.css	2016-06-12 13:59:22 +0000
@@ -1193,7 +1193,8 @@
          float: right;
          height: auto;
          margin: 0 20px 10px 10px;
--        width: 200px;
++        min-width: 200px;
++        max-width: 400px;
+ }
  div.toc li {
 === modified file 'doc/mainpage.doxygen'
 --- doc/mainpage.doxygen	2016-02-25 17:31:00 +0000
 +++ doc/mainpage.doxygen	2016-06-12 13:59:22 +0000
@@ -32,9 +32,9 @@
  <ul>
  <li>the main loop and main widget classes @em StelMainWindow and @em StelMainGraphicsView. Those classes have a single instance which is created at startup by the main() function. They perform various tasks such as the creation of the main program window and openGL context, the creation of the stellarium core, the creation of the GUI. After initialization, they manage user's input event propagation and event loop. There are heavily based on %Qt features.</li>
  <li>the core which provides a number of generic services and features to the other components. The main class is the StelApp singleton class which is used everywhere in the code to access other elements. It is the StelApp instance which creates all the main core services and modules at initialization. Example services are OpenGL textures management with the StelTextureMgr, font management with the StelFontMgr, sky images management (images which have a fixed position in the sky) with the StelSkyImageMgr etc.. Two especially important manager classes (the ones with the "Mgr" suffix) are the StelModuleMgr and StelCore classes: the first one manages the collection of StelModule instances which are registered in the program (see next point for more info on what a StelModule is). The second one provides performance critical features for rendering various elements using openGL, or for computing coordinate transformation and other mathematical services.</li>
--<li>a collection of StelModule instances which display the main elements of the program such as planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many components of Stellarium derive from the StelModule class, it is possible for the main loop to treat them generically by calling their standard methods such StelModule::update() and StelModule::draw() at each program iteration. It also allows other program components to access them by name. StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating @ref plugins.</li>
--<li>the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are rendered directly in the openGL window. Users actions trigger signals which are connected to core and StelModules slots.</li>
--<li>the script engine (StelScriptMgr) allows scripts to calls slots from the core and StelModules slots.</li>
++<li>a collection of StelModule instances which display the main elements of the program such as planets and stars. Each StelModule should be registered to the StelModuleMgr. Because many components of Stellarium derive from the StelModule class, it is possible for the main loop to treat them generically by calling their standard methods such StelModule::update() and StelModule::draw() at each program iteration. It also allows other program components to access them by name. StelProperty can be used to access all defined static properties (see the [Qt property system](https://doc.qt.io/qt-5/properties.html) for more information) of all registered StelModule instances. StelModule can also be loaded dynamically by Stellarium, which is the standard way of creating @ref plugins. StelAction instances can be used to define actions that can be triggered by the user through UI controls or key combinations.</li>
++<li>the Graphical User Interface (StelGui). It is based on styled %Qt widgets which are rendered directly in the openGL window. Users actions can trigger signals which are connected to core and StelModules slots. Many UI controls can also be directly connected to StelAction and/or StelProperty instances to reduce the amount of boilerplate code required to link UI changes to the back-end modules and vice-versa.</li>
++<li>the script engine (StelScriptMgr) allows user scripts based on QtScript (a JavaScript dialect) to access properties and calls slots from the core and StelModule instances.</li>
  </ul>
  @image html stellarium-architecture.png
 === modified file 'doc/plugIns.doxygen'
 --- doc/plugIns.doxygen	2016-04-21 06:48:03 +0000
 +++ doc/plugIns.doxygen	2016-06-12 13:59:22 +0000
@@ -65,6 +65,7 @@
   - @ref meteorShowers
   - @ref pointerCoordinates
   - @ref archaeoLines
++ - @ref remoteControl
  You can find some untechnical details on our wiki [Plugins](http://www.stellarium.org/wiki/index.php/Plugins) page.
 === added file 'guide/pictures/remote.png'
 Binary files guide/pictures/remote.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote.png	2016-06-12 13:59:22 +0000 differ
 === added file 'guide/pictures/remote_web.png'
 Binary files guide/pictures/remote_web.png	1970-01-01 00:00:00 +0000 and guide/pictures/remote_web.png	2016-06-12 13:59:22 +0000 differ
 === modified file 'guide/plg_interfaces.tex'
 --- guide/plg_interfaces.tex	2016-05-05 23:42:27 +0000
 +++ guide/plg_interfaces.tex	2016-06-12 13:59:22 +0000
@@ -373,7 +373,101 @@
  \section{Remote Control}
  \label{sec:plugin:RemoteControl}
--[This will come as user documentation from SoCiS2015 work]
++The Remote Control plugin was developed in 2015 during the
++\href{http://sophia.estec.esa.int/socis/}{ESA Summer of Code in Space}
++initiative. It enables the user to control Stellarium through an external web
++interface using a standard web browser like Firefox or Chrome, instead of using
++the main GUI. This works on the same computer Stellarium runs as well as over
++the network. Even more, multiple "remote controls" can access the same
++Stellarium instance at the same time, without getting in the way of each other.
++Much of the functionality the main interface provides is already available
++through it, and it is still getting extended.
++
++The plugin may be useful for presentation scenarios, hiding the GUI from the
++audience and allowing the presenter to change settings on a separate monitor
++without showing distracting dialog windows. It also allows to start and stop
++scripts remotely. Because the web interface can be customized (or completely
++replaced) with some knowledge of HTML, CSS and JavaScript, another possibility
++is a kiosk mode, where untrusted users can execute a variety of predefined
++actions (like starting recorded tours) without having access to all Stellarium
++settings. The web API can also be accessed directly (without using a browser
++and the HTML interface), allowing control of Stellarium with external programs
++and scripts using HTTP calls like with the tools \file{wget} and \file{curl}.
++
++\subsection{Using the plugin}
++\label{sec:plugins:RemoteControl:using}
++
++\begin{figure}[h]
++\centering\includegraphics[width=\columnwidth]{remote_web}
++\caption{The default remote control web interface}
++\end{figure}
++
++After enabling the plugin, you can set it up through the configuration dialog.
++When ``Enable automatically on startup'' is checked (it is by default), the web
++server is automatically started whenever Stellarium starts. You can also
++manually start/stop the server using the ``Server enabled'' checkbox and the
++button \includegraphics[scale=0.5]{remote} in the toolbar.
++
++The plugin starts a HTTP server on the specified port. The default port is
++8090, so you can try to reach the remote control after enabling it by starting
++a browser on the same computer and entering \url{http://localhost:8090} in the
++address bar. When trying to access the remote control from another computer,
++you need the IP address or the hostname of the server on which Stellarium runs.
++The plugin shows the locally detected address, but depending on your network or
++if you need external access you might need to use a different one
++--- contact your network administrator if you need help with that.
++
++The access to the remote control may optionally be restricted with a simple
++password.
++
++\textbf{Warning:} \emph{currently no network encryption is used, meaning that
++an attacker having access to your network can easily find out the password by
++waiting for a user entering it. Access from the Internet to the
++plugin should generally be restricted, except if countermeasures such as VPN
++usage are taken! If you are in a home network using NAT (network access
++translation), this should be enough for basic security except if port
++forwarding or a DMZ is configured.}
++
++If you are familiar with the main Stellarium interface, you should easily find
++your way around the web interface. Tabs at the top allow access to
++different settings and controls. The remote control automatically uses the
++same language as set in the main program.
++
++The contents of the various tabs:
++\begin{description}
++\item[Main] Contains the time controls and most of the buttons of the
++main bottom toolbar. An additional control allows moving the view like when
++dragging the mouse or using the arrow keys in Stellarium, and a slider enables
++the changing of the field of view. There are also buttons to quickly execute
++time jumps using the commonly used astronomical time intervals.
++\item[Selection] Allows searching and selecting objects like in \autoref{sec:gui:search}.
++SIMBAD search is also supported. Quick select buttons are available for the
++primary solar system objects. It also displays the information text for current
++selection.
++\item[Sky] Settings related to the sky display as shown in the ``View'' dialog
++as shown in \autoref{sec:gui:view:sky}.
++\item[DSO] The deep-sky object catalog, filter and display settings like in
++\autoref{sec:gui:view:markings}.
++\item[Landscape] Changing and configuring the background landscape, see
++\autoref{sec:gui:view:landscape}
++\item[Actions and scripts] Lists all registered actions, and allows starting
++and stopping of scripts (\autoref{ch:scripting}). If there is no button for the
++action you want in another tab, you can find all actions which can be
++configured as a keyboard shortcut (\autoref{sec:gui:configuration}) here.
++\item[Location] Allows changing the location, like in
++\autoref{sec:gui:location}. Custom location saving is currently not
++supported.
++\item[Projection] Switch the projection method used, like \autoref{sec:gui:view:markings}.
++\end{description}
++
++\subsection{Developer information}
++\label{sec:plugins:RemoteControl:developer}
++
++If you are a developer and would like to add functionality to the Remote
++Control API, customize the web interface or access the API through another
++program, further information can be found in the
++\href{http://stellarium.org/doc-plugins/head/}{plugin's developer
++documentation}.
  % \newpage
 === modified file 'plugins/ArchaeoLines/src/ArchaeoLines.cpp'
 --- plugins/ArchaeoLines/src/ArchaeoLines.cpp	2015-12-29 13:15:57 +0000
 +++ plugins/ArchaeoLines/src/ArchaeoLines.cpp	2016-06-12 13:59:22 +0000
@@ -89,7 +89,7 @@
  	objMgr=GETSTELMODULE(StelObjectMgr);
  	Q_ASSERT(objMgr);
--	// optimize readabiity so that each upper line of the lunistice doubles is labeled.
++	// optimize readability so that each upper line of the lunistice doubles is labeled.
  	equinoxLine = new ArchaeoLine(ArchaeoLine::Equinox, 0.0);
  	northernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, 23.50);
  	southernSolsticeLine = new ArchaeoLine(ArchaeoLine::Solstices, -23.50);
@@ -116,6 +116,7 @@
  	configDialog = new ArchaeoLinesDialog();
  	conf = StelApp::getInstance().getSettings();
++
+ }
  ArchaeoLines::~ArchaeoLines()
@@ -188,7 +189,8 @@
  	StelApp& app = StelApp::getInstance();
  	// Create action for enable/disable & hook up signals
--	addAction("actionShow_Archaeo_Lines", N_("ArchaeoLines"), N_("ArchaeoLines"), "enabled", "Ctrl+U");
++	QString section=N_("ArchaeoLines");
++	addAction("actionShow_Archaeo_Lines", section, N_("ArchaeoLines"), "enabled", "Ctrl+U");
  	// Add a toolbar button
  	try
@@ -208,6 +210,16 @@
+ 	{
  		qWarning() << "WARNING: unable to create toolbar button for ArchaeoLines plugin: " << e.what();
+ 	}
++	addAction("actionAL_showEquinoxLine",          section, N_("Show Line for Equinox"),            "flagShowEquinox"         ); // No Shortcuts configured.
++	addAction("actionAL_showSolsticeLines",        section, N_("Show Line for Solstices"),          "flagShowSolstices"       ); // No Shortcuts configured.
++	addAction("actionAL_showCrossquarterLines",    section, N_("Show Line for Crossquarter"),       "flagShowCrossquarters"   ); // No Shortcuts configured.
++	addAction("actionAL_showMajorStandstillLines", section, N_("Show Line for Major Standstill"),   "flagShowMajorStandstills"); // No Shortcuts configured.
++	addAction("actionAL_showMinorStandstillLines", section, N_("Show Line for Minor Standstill"),   "flagShowMinorStandstills"); // No Shortcuts configured.
++	addAction("actionAL_showZenithPassageLine",    section, N_("Show Line for Zenith Passage"),     "flagShowZenithPassage"   ); // No Shortcuts configured.
++	addAction("actionAL_showNadirPassageLine",     section, N_("Show Line for Nadir Passage"),      "flagShowNadirPassage"    ); // No Shortcuts configured.
++	addAction("actionAL_showSelectedObjectLine",   section, N_("Show Line for Selected Object"),    "flagShowSelectedObject"  ); // No Shortcuts configured.
++	addAction("actionAL_showCurrentSunLine",       section, N_("Show Line for Current Sun"),        "flagShowCurrentSun"      ); // No Shortcuts configured.
++	addAction("actionAL_showCurrentMoonLine",      section, N_("Show Line for Current Moon"),       "flagShowCurrentMoon"     ); // No Shortcuts configured.
+ }
  void ArchaeoLines::update(double deltaTime)
@@ -450,7 +462,7 @@
  	// indicators for current declinations (those move fast over days...)
  	showCurrentSun(conf->value("ArchaeoLines/show_current_sun", true).toBool());
  	showCurrentMoon(conf->value("ArchaeoLines/show_current_moon", true).toBool());
--	showCurrentPlanet(conf->value("ArchaeoLines/show_current_planet", "none").toString());
++	showCurrentPlanetNamed(conf->value("ArchaeoLines/show_current_planet", "none").toString());
  	enableArchaeoLines(conf->value("ArchaeoLines/enable_at_startup", false).toBool());
+ }
@@ -526,15 +538,20 @@
  void ArchaeoLines::showCurrentPlanet(ArchaeoLine::Line l)
+ {
--	enumShowCurrentPlanet=l;
--	const char *planetStrings[]={"none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
--
--	conf->setValue("ArchaeoLines/show_current_planet", planetStrings[l-ArchaeoLine::CurrentPlanetNone]);
--	currentPlanetLine->setLineType(enumShowCurrentPlanet);
--	currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
++	if(l!=enumShowCurrentPlanet)
++	{
++		enumShowCurrentPlanet=l;
++		const char *planetStrings[]={"none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn"};
++
++		conf->setValue("ArchaeoLines/show_current_planet", planetStrings[l-ArchaeoLine::CurrentPlanetNone]);
++		currentPlanetLine->setLineType(enumShowCurrentPlanet);
++		currentPlanetLine->setDisplayed(enumShowCurrentPlanet != ArchaeoLine::CurrentPlanetNone);
++
++		emit currentPlanetChanged(l);
++	}
+ }
--void ArchaeoLines::showCurrentPlanet(QString planet)
++void ArchaeoLines::showCurrentPlanetNamed(QString planet)
+ {
  	if (planet=="none")
  		enumShowCurrentPlanet=ArchaeoLine::CurrentPlanetNone;
 === modified file 'plugins/ArchaeoLines/src/ArchaeoLines.hpp'
 --- plugins/ArchaeoLines/src/ArchaeoLines.hpp	2015-08-03 13:17:06 +0000
 +++ plugins/ArchaeoLines/src/ArchaeoLines.hpp	2016-06-12 13:59:22 +0000
@@ -77,6 +77,10 @@
  	Q_OBJECT
  	Q_PROPERTY(Vec3f color READ getColor WRITE setColor)
  	Q_PROPERTY(bool flagLabel READ isLabelVisible WRITE setLabelVisible)
++
++	//Need to register Enum with Qt to be able to use it as Q_PROPERTY
++	//or in signals/slots
++	Q_ENUMS(Line)
  public:
  	enum Line {
  		Equinox,
@@ -174,7 +178,8 @@
  				WRITE showCurrentMoon)
  	Q_PROPERTY(ArchaeoLine::Line enumShowCurrentPlanet
  				READ    whichCurrentPlanetDisplayed
--				WRITE showCurrentPlanet)
++				WRITE showCurrentPlanet
++				NOTIFY currentPlanetChanged)
  public:
  	ArchaeoLines();
@@ -190,19 +195,7 @@
  	virtual double getCallOrder(StelModuleActionName actionName) const;
  	virtual void handleKeys(class QKeyEvent* event){event->setAccepted(false);}
  	virtual bool configureGui(bool show=true);
--	bool isEnabled() const {return flagShowArchaeoLines;}
  	bool isDmsFormat() const { return flagUseDmsFormat; } // NOT SURE IF USEFUL
--	bool isEquinoxDisplayed() const {return flagShowEquinox;}
--	bool isSolsticesDisplayed() const {return flagShowSolstices;}
--	bool isCrossquartersDisplayed() const {return flagShowCrossquarters;}
--	bool isMajorStandstillsDisplayed() const {return flagShowMajorStandstills;}
--	bool isMinorStandstillsDisplayed() const {return flagShowMinorStandstills;}
--	bool isZenithPassageDisplayed() const {return flagShowZenithPassage;}
--	bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
--	bool isSelectedObjectDisplayed() const {return flagShowSelectedObject;}
--	bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
--	bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
--	ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumShowCurrentPlanet;}
  	//! Restore the plug-in's settings to the default state.
  	//! Replace the plug-in's settings in Stellarium's configuration file
@@ -217,11 +210,27 @@
  	//! @see restoreDefaultSettings()
  	void loadSettings();
++signals:
++	void currentPlanetChanged(ArchaeoLine::Line l); // meaningful only CurrentPlanetNone...CurrentPlanetSaturn.
  public slots:
  	void enableArchaeoLines(bool b);
  	//void useDmsFormat(bool b);
++	bool isEnabled() const {return flagShowArchaeoLines;}
++	bool isEquinoxDisplayed() const {return flagShowEquinox;}
++	bool isSolsticesDisplayed() const {return flagShowSolstices;}
++	bool isCrossquartersDisplayed() const {return flagShowCrossquarters;}
++	bool isMajorStandstillsDisplayed() const {return flagShowMajorStandstills;}
++	bool isMinorStandstillsDisplayed() const {return flagShowMinorStandstills;}
++	bool isZenithPassageDisplayed() const {return flagShowZenithPassage;}
++	bool isNadirPassageDisplayed() const {return flagShowNadirPassage;}
++	bool isSelectedObjectDisplayed() const {return flagShowSelectedObject;}
++	bool isCurrentSunDisplayed() const {return flagShowCurrentSun;}
++	bool isCurrentMoonDisplayed() const {return flagShowCurrentMoon;}
++	ArchaeoLine::Line whichCurrentPlanetDisplayed() const {return enumShowCurrentPlanet;}
++
++
  	void showEquinox(bool b);
  	void showSolstices(bool b);
  	void showCrossquarters(bool b);
@@ -233,7 +242,7 @@
  	void showCurrentSun(bool b);
  	void showCurrentMoon(bool b);
  	void showCurrentPlanet(ArchaeoLine::Line l); // Allowed values for l: CurrentPlanetNone...CurrentPlanetSaturn.
--	void showCurrentPlanet(QString planet); // Allowed values for planet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
++	void showCurrentPlanetNamed(QString planet); // Allowed values for planet: "none", "Mercury", "Venus", "Mars", "Jupiter", "Saturn".
  	// called by the dialog GUI, converts GUI's QColor (0..255) to Stellarium's Vec3f float color.
  	void setLineColor(ArchaeoLine::Line whichLine, QColor color);
 === modified file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp'
 --- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	2016-01-22 11:05:08 +0000
 +++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.cpp	2016-06-12 13:59:22 +0000
@@ -90,7 +90,8 @@
  	ui->currentMoonCheckBox->setChecked(al->isCurrentMoonDisplayed());
  	connect(ui->currentMoonCheckBox, SIGNAL(toggled(bool)), al, SLOT(showCurrentMoon(bool)));
  	// Planet ComboBox requires special handling!
--	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
++	setCurrentPlanetFromApp();
++	connect(al, SIGNAL(currentPlanetChanged(ArchaeoLine::Line)), this, SLOT(setCurrentPlanetFromApp()));
  	connect(ui->currentPlanetComboBox, SIGNAL(currentIndexChanged(int)), this, SLOT(setCurrentPlanetFromGUI(int)));
  	equinoxColor         = al->getLineColor(ArchaeoLine::Equinox);
@@ -177,6 +178,12 @@
  	al->showCurrentPlanet((ArchaeoLine::Line) (ArchaeoLine::CurrentPlanetNone+index));
+ }
++void ArchaeoLinesDialog::setCurrentPlanetFromApp()
++{
++	Q_ASSERT(al);
++	ui->currentPlanetComboBox->setCurrentIndex(al->whichCurrentPlanetDisplayed()-ArchaeoLine::CurrentPlanetNone);
++}
++
  void ArchaeoLinesDialog::setAboutHtml(void)
+ {
 === modified file 'plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp'
 --- plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	2015-05-30 19:56:47 +0000
 +++ plugins/ArchaeoLines/src/gui/ArchaeoLinesDialog.hpp	2016-06-12 13:59:22 +0000
@@ -103,6 +103,7 @@
  	void resetArchaeoLinesSettings();
  	//! setting planet requires a small function to link Combobox indices to line IDs.
  	void setCurrentPlanetFromGUI(int index);
++	void setCurrentPlanetFromApp();
  };
 === modified file 'plugins/Oculars/src/Oculars.cpp'
 --- plugins/Oculars/src/Oculars.cpp	2016-06-11 17:54:59 +0000
 +++ plugins/Oculars/src/Oculars.cpp	2016-06-12 13:59:22 +0000
@@ -126,7 +126,7 @@
  	flagMoonScale(false),
  	maxEyepieceAngle(0.0),
  	requireSelection(true),
--	flagLimitMagnitude(false),
++	flagLimitMagnitude(false),
  	useMaxEyepieceAngle(true),
  	guiPanelEnabled(false),
  	flagDecimalDegrees(false),
@@ -258,7 +258,7 @@
  		lens->writeToSettings(settings, index);
  		index++;
+ 	}
--
++
  	settings->setValue("ocular_count", oculars.count());
  	settings->setValue("telescope_count", telescopes.count());
  	settings->setValue("ccd_count", ccds.count());
@@ -283,22 +283,22 @@
  		if (selectedCCDIndex > ccds.count())
+ 		{
  			qWarning() << "Oculars: the selected sensor index of "
--								 << selectedCCDIndex << " is greater than the sensor count of "
--								 << ccds.count() << ". Module disabled!";
++				   << selectedCCDIndex << " is greater than the sensor count of "
++				   << ccds.count() << ". Module disabled!";
  			ready = false;
+ 		}
  		if (selectedOcularIndex > oculars.count())
+ 		{
  			qWarning() << "Oculars: the selected ocular index of "
--								 << selectedOcularIndex << " is greater than the ocular count of "
--								 << oculars.count() << ". Module disabled!";
++				   << selectedOcularIndex << " is greater than the ocular count of "
++				   << oculars.count() << ". Module disabled!";
  			ready = false;
+ 		}
  		else if (selectedTelescopeIndex > telescopes.count())
+ 		{
  			qWarning() << "Oculars: the selected telescope index of "
--								 << selectedTelescopeIndex << " is greater than the telescope count of "
--								 << telescopes.count() << ". Module disabled!";
++				   << selectedTelescopeIndex << " is greater than the telescope count of "
++				   << telescopes.count() << ". Module disabled!";
  			ready = false;
+ 		}
@@ -785,7 +785,7 @@
+ 		}
+ 	}
  	guiPanelEnabled = enable;
--	settings->setValue("enable_control_panel", enable);
++	settings->setValue("enable_control_panel", enable);
  	settings->sync();
+ }
@@ -833,7 +833,7 @@
  	if (oculars.isEmpty())
+ 	{
  		selectedOcularIndex = -1;
--		actionShowOcular->setChecked(false);
++		enableOcular(false);
+ 	}
  	else
+ 	{
@@ -847,8 +847,8 @@
  	if (telescopes.isEmpty())
+ 	{
  		selectedTelescopeIndex = -1;
--		actionShowOcular->setChecked(false);
--		actionShowSensor->setChecked(false);
++		enableOcular(false);
++		toggleCCD(false);
+ 	}
  	else
+ 	{
@@ -862,7 +862,7 @@
  	if (ccds.isEmpty())
+ 	{
  		selectedCCDIndex = -1;
--		actionShowSensor->setChecked(false);
++		toggleCCD(false);
+ 	}
  	else
+ 	{
@@ -895,8 +895,7 @@
  		// Close the sensor view if it's displayed
  		if (flagShowCCD)
+ 		{
--			if (actionShowSensor->isChecked())
--				actionShowSensor->setChecked(false);
++			toggleCCD(false);
  			flagShowCCD = false;
  			selectedCCDIndex = -1;
+ 		}
@@ -904,8 +903,7 @@
  		// Close the Telrad sight if it's displayed
  		if (flagShowTelrad)
+ 		{
--			if (actionShowTelrad->isChecked())
--				actionShowTelrad->setChecked(false);
++			toggleTelrad(false);
+ 		}
  		// Check to ensure that we have enough oculars & telescopes, as they may have been edited in the config dialog
@@ -954,10 +952,6 @@
  			usageMessageLabelID = labelManager->labelScreen(labelText, xPosition, yPosition,
  									true, font.pixelSize(), tcolor);
+ 		}
--		// we didn't accept the new status - make sure the toolbar button reflects this
--		disconnect(actionShowOcular, SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
--		actionShowOcular->setChecked(false);
--		connect(actionShowOcular, SIGNAL(toggled(bool)), this, SLOT(enableOcular(bool)));
+ 	}
  	else
+ 	{
@@ -972,6 +966,8 @@
  				guiPanel->showOcularGui();
+ 		}
+ 	}
++
++	emit enableOcularChanged(flagShowOculars);
+ }
  void Oculars::decrementCCDIndex()
@@ -1363,14 +1359,10 @@
  		flagShowCCD = false;
  		selectedCCDIndex = -1;
  		show = false;
--		if (actionShowSensor->isChecked())
--		{
--			actionShowSensor->setChecked(false);
--		}
+ 	}
  	StelCore *core = StelApp::getInstance().getCore();
--	StelMovementMgr *movementManager = core->getMovementMgr();
++	StelMovementMgr *movementManager = core->getMovementMgr();
  	StelSkyDrawer *skyManager = core->getSkyDrawer();
  	skyManager->setAbsoluteStarScale(absoluteStarScale);
  	if (show)
@@ -1378,18 +1370,10 @@
  		initialFOV = movementManager->getCurrentFov();
  		//Mutually exclusive with the ocular mode
  		hideUsageMessageIfDisplayed();
--		if (flagShowOculars)
--		{
--			if (actionShowOcular->isChecked())
--			{
--				actionShowOcular->setChecked(false);
--			}
--		}
++		enableOcular(false);
  		if (flagShowTelrad) {
--			if (actionShowTelrad->isChecked()) {
--				actionShowTelrad->setChecked(false);
--			}
++			toggleTelrad(false);
+ 		}
  		if (selectedTelescopeIndex < 0)
@@ -1402,6 +1386,7 @@
+ 		}
  		flagShowCCD = true;
  		setScreenFOVForCCD();
++
  		// Change relative scale for stars
  		// TODO: Finding experimental value for better rendering
  		skyManager->setRelativeStarScale(0.6);
@@ -1417,7 +1402,7 @@
  		skyManager->setRelativeStarScale(relativeStarScale);
  		movementManager->setFlagTracking(false);
--		//Zoom out
++		//Zoom out
  		if (getFlagInitFovUsage())
  			movementManager->zoomTo(movementManager->getInitFov());
  		else
@@ -1434,51 +1419,42 @@
  			guiPanel->foldGui();
+ 		}
+ 	}
++
++	emit enableCCDChanged(flagShowCCD);
+ }
  void Oculars::toggleCCD()
+ {
--	if (flagShowCCD)
--	{
--		toggleCCD(false);
--	}
--	else
--	{
--		toggleCCD(true);
--	}
++	toggleCCD(!flagShowCCD);
+ }
  void Oculars::toggleCrosshairs(bool show)
+ {
--	if (show && flagShowOculars)
--	{
--		flagShowCrosshairs = true;
--	}
--	else
--	{
--		flagShowCrosshairs = false;
++	if(show != flagShowCrosshairs)
++	{
++		flagShowCrosshairs = show;
++		emit enableCrosshairsChanged(show);
+ 	}
+ }
  void Oculars::toggleTelrad(bool show)
+ {
--	if (show)
++	if(show!=flagShowTelrad)
+ 	{
--		hideUsageMessageIfDisplayed();
--		if (actionShowOcular->isChecked())
--			actionShowOcular->setChecked(false);
--		if (actionShowSensor->isChecked())
--			actionShowSensor->setChecked(false);
++		if (show)
++		{
++			hideUsageMessageIfDisplayed();
++			enableOcular(false);
++			toggleCCD(false);
++		}
++		flagShowTelrad = show;
++		emit enableTelradChanged(flagShowTelrad);
+ 	}
--	flagShowTelrad = show;
+ }
  void Oculars::toggleTelrad()
+ {
--	if (flagShowTelrad)
--		toggleTelrad(false);
--	else
--		toggleTelrad(true);
++	toggleTelrad(!flagShowTelrad);
+ }
  /* ****************************************************************************************************************** */
@@ -1493,8 +1469,7 @@
  	Q_ASSERT(gui);
  	QString ocularsGroup = N_("Oculars");
--	actionShowOcular = addAction("actionShow_Ocular", ocularsGroup, N_("Ocular view"), "enableOcular(bool)", "Ctrl+O");
--	actionShowOcular->setChecked(flagShowOculars);
++	actionShowOcular = addAction("actionShow_Ocular", ocularsGroup, N_("Ocular view"), "enableOcular", "Ctrl+O");
  	// Make a toolbar button
  	try
+ 	{
@@ -1510,9 +1485,9 @@
+ 	}
  	actionMenu = addAction("actionShow_Ocular_Menu", ocularsGroup, N_("Oculars popup menu"), "displayPopupMenu()", "Alt+O");
--	actionShowCrosshairs = addAction("actionShow_Ocular_Crosshairs", ocularsGroup, N_("Show crosshairs"), "toggleCrosshairs(bool)", "Alt+C");
--	actionShowSensor = addAction("actionShow_Sensor", ocularsGroup, N_("Image sensor frame"), "toggleCCD(bool)");
--	actionShowTelrad = addAction("actionShow_Telrad", ocularsGroup, N_("Telrad sight"), "toggleTelrad(bool)", "Ctrl+B");
++	actionShowCrosshairs = addAction("actionShow_Ocular_Crosshairs", ocularsGroup, N_("Show crosshairs"), "enableCrosshairs", "Alt+C");
++	actionShowSensor = addAction("actionShow_Sensor", ocularsGroup, N_("Image sensor frame"), "enableCCD");
++	actionShowTelrad = addAction("actionShow_Telrad", ocularsGroup, N_("Telrad sight"), "enableTelrad", "Ctrl+B");
  	actionConfiguration = addAction("actionOpen_Oculars_Configuration", ocularsGroup, N_("Oculars plugin configuration"), ocularDialog, "visible");
  	// Select next telescope via keyboard
  	addAction("actionShow_Telescope_Increment", ocularsGroup, N_("Select next telescope"), "incrementTelescopeIndex()", "");
@@ -1556,11 +1531,11 @@
  void Oculars::paintCCDBounds()
+ {
--	StelCore *core = StelApp::getInstance().getCore();
++	StelCore *core = StelApp::getInstance().getCore();
  	StelProjector::StelProjectorParams params = core->getCurrentStelProjectorParams();
  	Lens *lens = selectedLensIndex >=0  ? lense[selectedLensIndex] : NULL;
--	const StelProjectorP projector = core->getProjection(StelCore::FrameEquinoxEqu);
++	const StelProjectorP projector = core->getProjection(StelCore::FrameEquinoxEqu);
  	double screenFOV = params.fov;
  	// draw sensor rectangle
@@ -1648,9 +1623,9 @@
  					//painter.setColor(0.60f, 0.20f, 0.20f, .5f);
  					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
--							   params.viewportCenter[1] * params.devicePixelsPerPixel, in_oag_r);
++							params.viewportCenter[1] * params.devicePixelsPerPixel, in_oag_r);
  					painter.drawCircle(params.viewportCenter[0] * params.devicePixelsPerPixel,
--							   params.viewportCenter[1] * params.devicePixelsPerPixel, out_oag_r);
++							params.viewportCenter[1] * params.devicePixelsPerPixel, out_oag_r);
  					QTransform oag_transform = QTransform().translate(params.viewportCenter[0] * params.devicePixelsPerPixel,
  							params.viewportCenter[1] * params.devicePixelsPerPixel).rotate(-(ccd->chipRotAngle() + polarAngle + ccd->prismPosAngle()));
@@ -1786,8 +1761,8 @@
  		reticleTexture->getDimensions(textureWidth, textureHeight);
  		painter.drawSprite2dMode(params.viewportXywh[2] / 2 * params.devicePixelsPerPixel,
--					 params.viewportXywh[3] / 2 * params.devicePixelsPerPixel,
--					 inner, reticleRotation);
++				params.viewportXywh[3] / 2 * params.devicePixelsPerPixel,
++				inner, reticleRotation);
+ 	}
  	if (oculars[selectedOcularIndex]->hasPermanentCrosshair())
@@ -1845,7 +1820,7 @@
  void Oculars::paintText(const StelCore* core)
+ {
  	const StelProjectorP prj = core->getProjection(StelCore::FrameAltAz);
--	StelPainter painter(prj);
++	StelPainter painter(prj);
  	// Get the current instruments
  	CCD *ccd = NULL;
@@ -1922,7 +1897,7 @@
  			QString ocularFOVLabel = QString(q_("Ocular aFOV: %1")).arg(ocularFov);
  			painter.drawText(xPosition, yPosition, ocularFOVLabel);
  			yPosition-=lineHeight;
--
++
  			QString lensNumberLabel;
  			// Barlow and Shapley lens
  			if (lens != NULL) // it's null if lens is not selected (lens index = -1)
@@ -1943,7 +1918,7 @@
+ 			}
  			painter.drawText(xPosition, yPosition, lensNumberLabel);
  			yPosition-=lineHeight;
--
++
  			// The telescope
  			QString telescopeString = "";
  			QString magString = "";
@@ -2014,7 +1989,7 @@
  					.arg(name);
+ 		}
  		// The telescope
--		QString telescopeNumberLabel;
++		QString telescopeNumberLabel;
  		if (telescopeName.isEmpty())
+ 		{
  			telescopeNumberLabel = QString(q_("Telescope #%1"))
@@ -2051,7 +2026,7 @@
  		if (!src.copy(ocularIniPath))
+ 		{
  			qWarning() << "Oculars::validateIniFile cannot copy default_ocular.ini resource to [non-existing] "
--										+ ocularIniPath;
++				      + ocularIniPath;
+ 		}
  		else
+ 		{
@@ -2256,7 +2231,7 @@
+ 		}
  		telescope = telescopes[selectedTelescopeIndex];
  		core->setFlipHorz(telescope->isHFlipped());
--		core->setFlipVert(telescope->isVFlipped());
++		core->setFlipVert(telescope->isVFlipped());
+ 	}
  	// Change relative and absolute scales for stars
@@ -2308,7 +2283,7 @@
  QMenu* Oculars::addLensSubmenu(QMenu* parent)
+ {
  	Q_ASSERT(parent);
--
++
  	QMenu *submenu = new QMenu(q_("&Lens"), parent);
  	submenu->addAction(q_("&Previous lens"), this, SLOT(decrementLensIndex()));
  	submenu->addAction(q_("&Next lens"), this, SLOT(incrementLensIndex()));
@@ -2371,7 +2346,7 @@
  void Oculars::setFlagDecimalDegrees(const bool b)
+ {
  	flagDecimalDegrees = b;
--	settings->setValue("use_decimal_degrees", b);
++	settings->setValue("use_decimal_degrees", b);
  	settings->sync();
+ }
 === modified file 'plugins/Oculars/src/Oculars.hpp'
 --- plugins/Oculars/src/Oculars.hpp	2016-06-11 17:54:59 +0000
 +++ plugins/Oculars/src/Oculars.hpp	2016-06-12 13:59:22 +0000
@@ -75,6 +75,12 @@
  class Oculars : public StelModule
+ {
  	Q_OBJECT
++
++	Q_PROPERTY(bool enableOcular READ getEnableOcular WRITE enableOcular NOTIFY enableOcularChanged)
++	Q_PROPERTY(bool enableCrosshairs READ getEnableCrosshairs WRITE toggleCrosshairs NOTIFY enableCrosshairsChanged)
++	Q_PROPERTY(bool enableCCD READ getEnableCCD WRITE toggleCCD NOTIFY enableCCDChanged)
++	Q_PROPERTY(bool enableTelrad READ getEnableTelrad WRITE toggleTelrad NOTIFY enableTelradChanged)
++
  	//BM: Temporary, until the GUI is finalized and some other method of getting
  	//info from the main class is implemented.
  	friend class OcularsGuiPanel;
@@ -119,6 +125,7 @@
  	//! This method is called with we detect that our hot key is pressed.  It handles
  	//! determining if we should do anything - based on a selected object.
  	void enableOcular(bool b);
++	bool getEnableOcular() const { return flagShowOculars; }
  	void incrementCCDIndex();
  	void incrementOcularIndex();
  	void incrementTelescopeIndex();
@@ -133,9 +140,12 @@
  	void toggleCCD(bool show);
  	//! Toggles the sensor frame overlay (overloaded for blind switching).
  	void toggleCCD();
++	bool getEnableCCD() const { return flagShowCCD; }
  	void toggleCrosshairs(bool show = true);
++	bool getEnableCrosshairs() const { return flagShowCrosshairs; }
  	//! Toggles the Telrad sight overlay.
  	void toggleTelrad(bool show);
++	bool getEnableTelrad() const { return flagShowTelrad; }
  	//! Toggles the Telrad sight overlay (overloaded for blind switching).
  	void toggleTelrad();
  	void enableGuiPanel(bool enable = true);
@@ -156,6 +166,10 @@
  	bool getFlagUseSemiTransparency(void) const;
  signals:
++	void enableOcularChanged(bool value);
++	void enableCrosshairsChanged(bool value);
++	void enableCCDChanged(bool value);
++	void enableTelradChanged(bool value);
  	void selectedCCDChanged();
  	void selectedOcularChanged();
  	void selectedTelescopeChanged();
@@ -166,7 +180,7 @@
  	void instrumentChanged();
  	void determineMaxEyepieceAngle();
  	void setRequireSelection(bool state);
--	void setScaleImageCircle(bool state);
++	void setScaleImageCircle(bool state);
  	void setScreenFOVForCCD();
  	void retranslateGui();
  	void setStelStyle(const QString& style);
 === modified file 'plugins/Oculars/src/gui/OcularsGuiPanel.cpp'
 --- plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2016-03-04 15:04:20 +0000
 +++ plugins/Oculars/src/gui/OcularsGuiPanel.cpp	2016-06-12 13:59:22 +0000
@@ -37,8 +37,8 @@
  #include <QWidget>
  OcularsGuiPanel::OcularsGuiPanel(Oculars* plugin,
--                                 QGraphicsWidget *parent,
--                                 Qt::WindowFlags wFlags):
++				 QGraphicsWidget *parent,
++				 Qt::WindowFlags wFlags):
  	QGraphicsWidget(parent, wFlags),
  	ocularsPlugin(plugin),
  	parentWidget(parent),
@@ -58,56 +58,49 @@
  	StelApp& stelApp = StelApp::getInstance();
  	Q_ASSERT(ocularsPlugin->actionShowOcular);
  	buttonOcular = new StelButton(buttonBar,
--	                              QPixmap(":/ocular/bt_ocular_on.png"),
--	                              QPixmap(":/ocular/bt_ocular_off.png"),
--	                              QPixmap(),
--	                              ocularsPlugin->actionShowOcular,
--	                              true); //No background
++				      QPixmap(":/ocular/bt_ocular_on.png"),
++				      QPixmap(":/ocular/bt_ocular_off.png"),
++				      QPixmap(),
++				      ocularsPlugin->actionShowOcular,
++				      true); //No background
  	buttonOcular->setToolTip(ocularsPlugin->actionShowOcular->getText());
  	buttonOcular->setParentItem(buttonBar);
--	//Hack to avoid buttonOcular being left "checked" if it has been toggled
--	//without any object selected.
--	disconnect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
--	           ocularsPlugin, SLOT(enableOcular(bool)));
--	connect(ocularsPlugin->actionShowOcular, SIGNAL(toggled(bool)),
--	        ocularsPlugin, SLOT(enableOcular(bool)));
--
  	Q_ASSERT(ocularsPlugin->actionShowCrosshairs);
  	buttonCrosshairs = new StelButton(buttonBar,
--	                                  QPixmap(":/ocular/bt_crosshairs_on.png"),
--	                                  QPixmap(":/ocular/bt_crosshairs_off.png"),
--	                                  QPixmap(),
--	                                  ocularsPlugin->actionShowCrosshairs,
--	                                  true);
++					  QPixmap(":/ocular/bt_crosshairs_on.png"),
++					  QPixmap(":/ocular/bt_crosshairs_off.png"),
++					  QPixmap(),
++					  ocularsPlugin->actionShowCrosshairs,
++					  true);
  	buttonCrosshairs->setToolTip(ocularsPlugin->actionShowCrosshairs->getText());
  	buttonCrosshairs->setVisible(false);
  	Q_ASSERT(ocularsPlugin->actionShowSensor);
  	buttonCcd = new StelButton(buttonBar,
--	                           QPixmap(":/ocular/bt_sensor_on.png"),
--	                           QPixmap(":/ocular/bt_sensor_off.png"),
--	                           QPixmap(),
--	                           ocularsPlugin->actionShowSensor,
--	                           true);
++				   QPixmap(":/ocular/bt_sensor_on.png"),
++				   QPixmap(":/ocular/bt_sensor_off.png"),
++				   QPixmap(),
++				   ocularsPlugin->actionShowSensor,
++				   true);
  	buttonCcd->setToolTip(ocularsPlugin->actionShowSensor->getText());
  	Q_ASSERT(ocularsPlugin->actionShowTelrad);
  	buttonTelrad = new StelButton(buttonBar,
--	                              QPixmap(":/ocular/bt_telrad_on.png"),
--	                              QPixmap(":/ocular/bt_telrad_off.png"),
--	                              QPixmap(),
--	                              ocularsPlugin->actionShowTelrad,
--	                              true);
++				      QPixmap(":/ocular/bt_telrad_on.png"),
++				      QPixmap(":/ocular/bt_telrad_off.png"),
++				      QPixmap(),
++				      ocularsPlugin->actionShowTelrad,
++				      true);
  	buttonTelrad->setToolTip(ocularsPlugin->actionShowTelrad->getText());
  	Q_ASSERT(ocularsPlugin->actionConfiguration);
  	buttonConfiguration = new StelButton(buttonBar,
--	                                     QPixmap(":/ocular/bt_settings_on.png"),
--	                                     QPixmap(":/ocular/bt_settings_off.png"),
--	                                     QPixmap(),
--	                                     ocularsPlugin->actionConfiguration,
--	                                     true);
++					     QPixmap(":/ocular/bt_settings_on.png"),
++					     QPixmap(":/ocular/bt_settings_off.png"),
++					     QPixmap(),
++					     ocularsPlugin->actionConfiguration,
++					     true);
  	buttonConfiguration->setToolTip(ocularsPlugin->actionConfiguration->getText());
  	qreal buttonHeight = buttonOcular->boundingRect().height();
@@ -179,73 +172,63 @@
  	QPixmap naOff(":/graphicGui/btTimeForward-off.png");
  	QPixmap nextArrowOff = naOff.scaledToHeight(scale, Qt::SmoothTransformation);
--	StelAction* defaultAction = new StelAction(this);
--	defaultAction->setCheckable(false);
  	prevOcularButton = new StelButton(ocularControls,
--	                                  prevArrow,
--	                                  prevArrowOff,
--	                                  QPixmap(),
--	                                  defaultAction);
++					  prevArrow,
++					  prevArrowOff,
++					  QPixmap());
  	prevOcularButton->setToolTip(q_("Previous ocular"));
  	nextOcularButton = new StelButton(ocularControls,
--	                                  nextArrow,
--	                                  nextArrowOff,
--	                                  QPixmap(),
--	                                  defaultAction);
++					  nextArrow,
++					  nextArrowOff,
++					  QPixmap());
  	nextOcularButton->setToolTip(q_("Next ocular"));
  	prevLensButton = new StelButton(lensControls,
--                                      prevArrow,
--                                      prevArrowOff,
--                                      QPixmap(),
--                                      defaultAction);
++					prevArrow,
++					prevArrowOff,
++					QPixmap());
  	prevLensButton->setToolTip(q_("Previous lens"));
  	nextLensButton = new StelButton(lensControls,
--                                      nextArrow,
--                                      nextArrowOff,
--                                      QPixmap(),
--                                      defaultAction);
++					nextArrow,
++					nextArrowOff,
++					QPixmap());
  	nextLensButton->setToolTip(q_("Next lens"));
  	prevCcdButton = new StelButton(ccdControls,
--	                               prevArrow,
--	                               prevArrowOff,
--	                               QPixmap(),
--	                               defaultAction);
++				       prevArrow,
++				       prevArrowOff,
++				       QPixmap());
  	prevCcdButton->setToolTip(q_("Previous CCD frame"));
  	nextCcdButton = new StelButton(ccdControls,
--	                               nextArrow,
--	                               nextArrowOff,
--	                               QPixmap(),
--	                               defaultAction);
++				       nextArrow,
++				       nextArrowOff,
++				       QPixmap());
  	nextCcdButton->setToolTip(q_("Next CCD frame"));
  	prevTelescopeButton = new StelButton(telescopeControls,
--	                                     prevArrow,
--	                                     prevArrowOff,
--	                                     QPixmap(),
--	                                     defaultAction);
++					     prevArrow,
++					     prevArrowOff,
++					     QPixmap());
  	prevTelescopeButton->setToolTip(q_("Previous telescope"));
  	nextTelescopeButton = new StelButton(telescopeControls,
--	                                     nextArrow,
--	                                     nextArrowOff,
--	                                     QPixmap(),
--	                                     defaultAction);
++					     nextArrow,
++					     nextArrowOff,
++					     QPixmap());
  	nextTelescopeButton->setToolTip(q_("Next telescope"));
  	connect(nextOcularButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(incrementOcularIndex()));
++		ocularsPlugin, SLOT(incrementOcularIndex()));
  	connect(nextCcdButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(incrementCCDIndex()));
++		ocularsPlugin, SLOT(incrementCCDIndex()));
  	connect(nextTelescopeButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(incrementTelescopeIndex()));
++		ocularsPlugin, SLOT(incrementTelescopeIndex()));
  	connect(prevOcularButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(decrementOcularIndex()));
++		ocularsPlugin, SLOT(decrementOcularIndex()));
  	connect(prevCcdButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(decrementCCDIndex()));
++		ocularsPlugin, SLOT(decrementCCDIndex()));
  	connect(prevTelescopeButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(decrementTelescopeIndex()));
++		ocularsPlugin, SLOT(decrementTelescopeIndex()));
  	connect(nextLensButton, SIGNAL(triggered()),
--			ocularsPlugin, SLOT(incrementLensIndex()));
++		ocularsPlugin, SLOT(incrementLensIndex()));
  	connect(prevLensButton, SIGNAL(triggered()),
--			ocularsPlugin, SLOT(decrementLensIndex()));
++		ocularsPlugin, SLOT(decrementLensIndex()));
  	QColor cOn(255, 255, 255);
  	QColor cOff(102, 102, 102);
@@ -256,11 +239,11 @@
  	QPixmap pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
  	QPixmap pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
  	rotateCcdMinus15Button = new StelButton(ccdControls,
--	                                        pOn,
--	                                        pOff,
--	                                        pHover,
--	                                        defaultAction,
--	                                        true);
++						pOn,
++						pOff,
++						pHover,
++						NULL,
++						true);
  	rotateCcdMinus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees counterclockwise"));
  	degrees = QString("-5%1").arg(QChar(0x00B0));
@@ -269,10 +252,10 @@
  	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
  	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
  	rotateCcdMinus5Button = new StelButton(ccdControls,
--	                                       pOn,
--	                                       pOff,
--	                                       pHover,
--					       defaultAction,
++					       pOn,
++					       pOff,
++					       pHover,
++					       NULL,
  					       true);
  	rotateCcdMinus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees counterclockwise"));
@@ -284,8 +267,8 @@
  	rotateCcdMinus1Button = new StelButton(ccdControls,
  					       pOn,
  					       pOff,
--	                                       pHover,
--					       defaultAction,
++					       pHover,
++					       NULL,
  					       true);
  	rotateCcdMinus1Button->setToolTip(q_("Rotate the sensor frame 1 degree counterclockwise"));
@@ -295,10 +278,10 @@
  	pOff = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cOff);
  	pHover = createPixmapFromText(degrees, degreesW, lineHeight, newFont, cHover);
  	resetCcdRotationButton = new StelButton(ccdControls,
--	                                        pOn,
--	                                        pOff,
--	                                        pHover,
--						defaultAction,
++						pOn,
++						pOff,
++						pHover,
++						NULL,
  						true);
  	resetCcdRotationButton->setToolTip(q_("Reset the sensor frame rotation"));
@@ -311,7 +294,7 @@
  					      pOn,
  					      pOff,
  					      pHover,
--					      defaultAction,
++					      NULL,
  					      true);
  	rotateCcdPlus1Button->setToolTip(q_("Rotate the sensor frame 1 degree clockwise"));
@@ -324,7 +307,7 @@
  					      pOn,
  					      pOff,
  					      pHover,
--					      defaultAction,
++					      NULL,
  					      true);
  	rotateCcdPlus5Button->setToolTip(q_("Rotate the sensor frame 5 degrees clockwise"));
@@ -336,8 +319,8 @@
  	rotateCcdPlus15Button = new StelButton(ccdControls,
  					       pOn,
  					       pOff,
--	                                       pHover,
--					       defaultAction,
++					       pHover,
++					       NULL,
  					       true);
  	rotateCcdPlus15Button->setToolTip(q_("Rotate the sensor frame 15 degrees clockwise"));
@@ -350,34 +333,34 @@
  	sm->setMapping(rotateCcdPlus15Button, QString("15"));
  	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
--	        sm, SLOT(map()));
++		sm, SLOT(map()));
  	connect(resetCcdRotationButton, SIGNAL(triggered()),
--	        ocularsPlugin, SLOT(ccdRotationReset()));
++		ocularsPlugin, SLOT(ccdRotationReset()));
  	connect(rotateCcdMinus15Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(rotateCcdMinus5Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(rotateCcdMinus1Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(rotateCcdPlus1Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(rotateCcdPlus5Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(rotateCcdPlus15Button, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(resetCcdRotationButton, SIGNAL(triggered()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	//Set the layout and update the size
@@ -395,7 +378,7 @@
  	//Border/background for the widget
  	borderPath = new QGraphicsPathItem();
--	borderPath->setZValue(100);
++	borderPath->setZValue(100);
  	QBrush borderBrush(QColor::fromRgbF(0.22, 0.22, 0.23, 0.2));
  	borderPath->setBrush(borderBrush);
  	QPen borderPen = QPen(QColor::fromRgbF(0.7,0.7,0.7,0.5));
@@ -405,17 +388,17 @@
  	updatePosition();
  	connect (parentWidget, SIGNAL(geometryChanged()),
--	         this, SLOT(updatePosition()));
++		 this, SLOT(updatePosition()));
  	//Connecting other slots
  	connect(ocularsPlugin, SIGNAL(selectedOcularChanged()),
--	        this, SLOT(updateOcularControls()));
++		this, SLOT(updateOcularControls()));
  	connect(ocularsPlugin, SIGNAL(selectedCCDChanged()),
--	        this, SLOT(updateCcdControls()));
++		this, SLOT(updateCcdControls()));
  	connect(ocularsPlugin, SIGNAL(selectedTelescopeChanged()),
--	        this, SLOT(updateTelescopeControls()));
++		this, SLOT(updateTelescopeControls()));
  	connect(ocularsPlugin, SIGNAL(selectedLensChanged()),
--            this, SLOT(updateTelescopeControls()));
++		this, SLOT(updateTelescopeControls()));
  	//Night mode
  	connect(&stelApp, SIGNAL(colorSchemeChanged(const QString&)),
@@ -479,7 +462,7 @@
  	QPointF verticalBorderStart = geometry().topLeft();
  	QPointF horizontalBorderEnd = geometry().bottomRight();
  	QPointF cornerArcStart(verticalBorderStart.x(),
--	                       horizontalBorderEnd.y() - cornerRadius);
++			       horizontalBorderEnd.y() - cornerRadius);
  	newBorderPath.moveTo(verticalBorderStart);
  	newBorderPath.lineTo(cornerArcStart);
  	newBorderPath.arcTo(cornerArcStart.x(), cornerArcStart.y(), cornerRadius, cornerRadius, 180, 90);
@@ -552,7 +535,7 @@
  		QString apparentFovString = QString::number(apparentFov);
  		apparentFovString.append(QChar(0x00B0));// Degree sign
  		QString apparentFovLabel = QString(q_("Ocular aFOV: %1"))
--					   .arg(apparentFovString);
++				.arg(apparentFovString);
  		fieldOcularAfov->setPlainText(apparentFovLabel);
  		fieldOcularAfov->setToolTip(q_("Apparent field of view of the ocular"));
  		fieldOcularAfov->setPos(posX, posY);
@@ -637,8 +620,8 @@
  	//Get the name
  	int index = ocularsPlugin->selectedCCDIndex;
--	CCD* ccd = ocularsPlugin->ccds[index];
--	Q_ASSERT(ccd);
++	CCD* ccd = ocularsPlugin->ccds[index];
++	Q_ASSERT(ccd);
  	QString name = ccd->name();
  	QString fullName;
  	if (name.isEmpty())
@@ -801,7 +784,7 @@
  			posY = 0.;
  			widgetHeight = 0.;
--			fieldMagnification->setToolTip(q_("Magnification provided by these binoculars"));
++			fieldMagnification->setToolTip(q_("Magnification provided by these binoculars"));
  			fieldFov->setToolTip(q_("Actual field of view provided by these binoculars"));
  			fieldExitPupil->setToolTip(q_("Exit pupil provided by these binoculars"));
+ 		}
@@ -811,15 +794,15 @@
  			nextTelescopeButton->setVisible(true);
  			fieldTelescopeName->setVisible(true);
--			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/lens/telescope combination"));
++			fieldMagnification->setToolTip(q_("Magnification provided by this ocular/lens/telescope combination"));
  			fieldFov->setToolTip(q_("Actual field of view provided by this ocular/lens/telescope combination"));
  			fieldExitPupil->setToolTip(q_("Exit pupil provided by this ocular/lens/telescope combination"));
+ 		}
  		//WTF? Rounding?
  		double magnification = ((int)(ocular->magnification(telescope, lens) * 10.0)) / 10.0;
--		QString magnificationString = QString::number(magnification);
--		magnificationString.append(QChar(0x00D7));
++		QString magnificationString = QString::number(magnification);
++		magnificationString.append(QChar(0x00D7));
  		QString magnificationLabel = QString(q_("Magnification: %1")).arg(magnificationString);
  		fieldMagnification->setPlainText(magnificationLabel);
  		fieldMagnification->setPos(posX, posY);
@@ -963,7 +946,7 @@
  void OcularsGuiPanel::updateMainButtonsPositions()
+ {
  	Q_ASSERT(buttonOcular);
--	Q_ASSERT(buttonCrosshairs);
++	Q_ASSERT(buttonCrosshairs);
  	Q_ASSERT(buttonCcd);
  	Q_ASSERT(buttonTelrad);
  	Q_ASSERT(buttonConfiguration);
@@ -984,7 +967,7 @@
+ 	{
  		qreal parentWidth = buttonOcular->parentItem()->boundingRect().width();
  		int nGaps = n - 1;//n buttons have n-1 gaps
--        spacing = qRound((parentWidth-width)/nGaps);
++		spacing = qRound((parentWidth-width)/nGaps);
+ 	}
  	buttonOcular->setPos(posX, posY);
  	posX += buttonOcular->getButtonPixmapWidth() + spacing;
@@ -1067,11 +1050,11 @@
+ }
  QPixmap OcularsGuiPanel::createPixmapFromText(const QString& text,
--                                              int width,
--                                              int height,
--                                              const QFont& font,
--                                              const QColor& textColor,
--                                              const QColor& backgroundColor)
++					      int width,
++					      int height,
++					      const QFont& font,
++					      const QColor& textColor,
++					      const QColor& backgroundColor)
+ {
  	if (width <= 0 || height <=0) {
  		return QPixmap();
@@ -1088,8 +1071,8 @@
  	painter.setFont(font);
  	painter.setPen(QPen(textColor));
  	painter.drawText(0, 0, width, height,
--	                 Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine,
--	                 text);
++			 Qt::AlignHCenter | Qt::AlignVCenter | Qt::TextSingleLine,
++			 text);
  	return pixmap;
+ }
 === added directory 'plugins/RemoteControl'
 === added file 'plugins/RemoteControl/CMakeLists.txt'
 --- plugins/RemoteControl/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/CMakeLists.txt	2016-06-12 13:59:22 +0000
@@ -0,0 +1,46 @@
++# This is the cmake config file for the RemoteControl plugin
++SET(REMOTECONTROL_VERSION "0.0.1")
++ADD_DEFINITIONS(-DREMOTECONTROL_VERSION="${REMOTECONTROL_VERSION}")
++SET(REMOTECONTROL_WEBROOT_PATH "${CMAKE_CURRENT_SOURCE_DIR}/webroot/")
++ADD_DEFINITIONS(-DREMOTECONTROL_WEBROOT_PATH="${REMOTECONTROL_WEBROOT_PATH}")
++
++ADD_SUBDIRECTORY( src )
++
++# Custom target for updating the translationdata.js
++find_package(PythonInterp)
++
++if(PYTHON_EXECUTABLE)
++	add_custom_target(RemoteControl-update-translationdata
++		COMMAND ${PYTHON_EXECUTABLE} util/update_translationdata.py
++		${PROJECT_SOURCE_DIR}/po/stellarium-remotecontrol/stellarium-remotecontrol-js.pot ${REMOTECONTROL_WEBROOT_PATH}/js/translationdata.js
++		WORKING_DIRECTORY ${CMAKE_CURRENT_SOURCE_DIR}
++		COMMENT "Updating RemoteControl translation data"
++		VERBATIM
++		)
++
++	add_dependencies(RemoteControl-update-translationdata generate-pot-stellarium-remotecontrol-js)
++endif()
++
++IF(APPLE)
++    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/Library/Application\ Support/Stellarium)
++ElSE(APPLE)
++    SET(CMAKE_INSTALL_PREFIX $ENV{HOME}/.stellarium)
++ENDIF(APPLE)
++INSTALL(FILES DESTINATION "modules/RemoteControl")
++
++
++########### install files ###############
++# install webroot
++INSTALL(DIRECTORY ${REMOTECONTROL_WEBROOT_PATH} DESTINATION share/${PACKAGE}/webroot FILES_MATCHING
++	PATTERN "*.png"
++	PATTERN "*.gif"
++	PATTERN "*.html"
++	PATTERN "*.js"
++	PATTERN "*.css"
++	PATTERN "*.eot"
++	PATTERN "*.svg"
++	PATTERN "*.ttf"
++	PATTERN "*.woff"
++	PATTERN "*.woff2"
++	PATTERN "translate_files"
++	PATTERN "*.ico")
 \ No newline at end of file
 === added file 'plugins/RemoteControl/COPYING'
 --- plugins/RemoteControl/COPYING	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/COPYING	2016-06-12 13:59:22 +0000
@@ -0,0 +1,340 @@
++		    GNU GENERAL PUBLIC LICENSE
++		       Version 2, June 1991
++
++ Copyright (C) 1989, 1991 Free Software Foundation, Inc.
++ 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
++ Everyone is permitted to copy and distribute verbatim copies
++ of this license document, but changing it is not allowed.
++
++			    Preamble
++
++  The licenses for most software are designed to take away your
++freedom to share and change it.  By contrast, the GNU General Public
++License is intended to guarantee your freedom to share and change free
++software--to make sure the software is free for all its users.  This
++General Public License applies to most of the Free Software
++Foundation's software and to any other program whose authors commit to
++using it.  (Some other Free Software Foundation software is covered by
++the GNU Library General Public License instead.)  You can apply it to
++your programs, too.
++
++  When we speak of free software, we are referring to freedom, not
++price.  Our General Public Licenses are designed to make sure that you
++have the freedom to distribute copies of free software (and charge for
++this service if you wish), that you receive source code or can get it
++if you want it, that you can change the software or use pieces of it
++in new free programs; and that you know you can do these things.
++
++  To protect your rights, we need to make restrictions that forbid
++anyone to deny you these rights or to ask you to surrender the rights.
++These restrictions translate to certain responsibilities for you if you
++distribute copies of the software, or if you modify it.
++
++  For example, if you distribute copies of such a program, whether
++gratis or for a fee, you must give the recipients all the rights that
++you have.  You must make sure that they, too, receive or can get the
++source code.  And you must show them these terms so they know their
++rights.
++
++  We protect your rights with two steps: (1) copyright the software, and
++(2) offer you this license which gives you legal permission to copy,
++distribute and/or modify the software.
++
++  Also, for each author's protection and ours, we want to make certain
++that everyone understands that there is no warranty for this free
++software.  If the software is modified by someone else and passed on, we
++want its recipients to know that what they have is not the original, so
++that any problems introduced by others will not reflect on the original
++authors' reputations.
++
++  Finally, any free program is threatened constantly by software
++patents.  We wish to avoid the danger that redistributors of a free
++program will individually obtain patent licenses, in effect making the
++program proprietary.  To prevent this, we have made it clear that any
++patent must be licensed for everyone's free use or not licensed at all.
++
++  The precise terms and conditions for copying, distribution and
++modification follow.
++
++		    GNU GENERAL PUBLIC LICENSE
++   TERMS AND CONDITIONS FOR COPYING, DISTRIBUTION AND MODIFICATION
++
++  0. This License applies to any program or other work which contains
++a notice placed by the copyright holder saying it may be distributed
++under the terms of this General Public License.  The "Program", below,
++refers to any such program or work, and a "work based on the Program"
++means either the Program or any derivative work under copyright law:
++that is to say, a work containing the Program or a portion of it,
++either verbatim or with modifications and/or translated into another
++language.  (Hereinafter, translation is included without limitation in
++the term "modification".)  Each licensee is addressed as "you".
++
++Activities other than copying, distribution and modification are not
++covered by this License; they are outside its scope.  The act of
++running the Program is not restricted, and the output from the Program
++is covered only if its contents constitute a work based on the
++Program (independent of having been made by running the Program).
++Whether that is true depends on what the Program does.
++
++  1. You may copy and distribute verbatim copies of the Program's
++source code as you receive it, in any medium, provided that you
++conspicuously and appropriately publish on each copy an appropriate
++copyright notice and disclaimer of warranty; keep intact all the
++notices that refer to this License and to the absence of any warranty;
++and give any other recipients of the Program a copy of this License
++along with the Program.
++
++You may charge a fee for the physical act of transferring a copy, and
++you may at your option offer warranty protection in exchange for a fee.
++
++  2. You may modify your copy or copies of the Program or any portion
++of it, thus forming a work based on the Program, and copy and
++distribute such modifications or work under the terms of Section 1
++above, provided that you also meet all of these conditions:
++
++    a) You must cause the modified files to carry prominent notices
++    stating that you changed the files and the date of any change.
++
++    b) You must cause any work that you distribute or publish, that in
++    whole or in part contains or is derived from the Program or any
++    part thereof, to be licensed as a whole at no charge to all third
++    parties under the terms of this License.
++
++    c) If the modified program normally reads commands interactively
++    when run, you must cause it, when started running for such
++    interactive use in the most ordinary way, to print or display an
++    announcement including an appropriate copyright notice and a
++    notice that there is no warranty (or else, saying that you provide
++    a warranty) and that users may redistribute the program under
++    these conditions, and telling the user how to view a copy of this
++    License.  (Exception: if the Program itself is interactive but
++    does not normally print such an announcement, your work based on
++    the Program is not required to print an announcement.)
++
++These requirements apply to the modified work as a whole.  If
++identifiable sections of that work are not derived from the Program,
++and can be reasonably considered independent and separate works in
++themselves, then this License, and its terms, do not apply to those
++sections when you distribute them as separate works.  But when you
++distribute the same sections as part of a whole which is a work based
++on the Program, the distribution of the whole must be on the terms of
++this License, whose permissions for other licensees extend to the
++entire whole, and thus to each and every part regardless of who wrote it.
++
++Thus, it is not the intent of this section to claim rights or contest
++your rights to work written entirely by you; rather, the intent is to
++exercise the right to control the distribution of derivative or
++collective works based on the Program.
++
++In addition, mere aggregation of another work not based on the Program
++with the Program (or with a work based on the Program) on a volume of
++a storage or distribution medium does not bring the other work under
++the scope of this License.
++
++  3. You may copy and distribute the Program (or a work based on it,
++under Section 2) in object code or executable form under the terms of
++Sections 1 and 2 above provided that you also do one of the following:
++
++    a) Accompany it with the complete corresponding machine-readable
++    source code, which must be distributed under the terms of Sections
++    1 and 2 above on a medium customarily used for software interchange; or,
++
++    b) Accompany it with a written offer, valid for at least three
++    years, to give any third party, for a charge no more than your
++    cost of physically performing source distribution, a complete
++    machine-readable copy of the corresponding source code, to be
++    distributed under the terms of Sections 1 and 2 above on a medium
++    customarily used for software interchange; or,
++
++    c) Accompany it with the information you received as to the offer
++    to distribute corresponding source code.  (This alternative is
++    allowed only for noncommercial distribution and only if you
++    received the program in object code or executable form with such
++    an offer, in accord with Subsection b above.)
++
++The source code for a work means the preferred form of the work for
++making modifications to it.  For an executable work, complete source
++code means all the source code for all modules it contains, plus any
++associated interface definition files, plus the scripts used to
++control compilation and installation of the executable.  However, as a
++special exception, the source code distributed need not include
++anything that is normally distributed (in either source or binary
++form) with the major components (compiler, kernel, and so on) of the
++operating system on which the executable runs, unless that component
++itself accompanies the executable.
++
++If distribution of executable or object code is made by offering
++access to copy from a designated place, then offering equivalent
++access to copy the source code from the same place counts as
++distribution of the source code, even though third parties are not
++compelled to copy the source along with the object code.
++
++  4. You may not copy, modify, sublicense, or distribute the Program
++except as expressly provided under this License.  Any attempt
++otherwise to copy, modify, sublicense or distribute the Program is
++void, and will automatically terminate your rights under this License.
++However, parties who have received copies, or rights, from you under
++this License will not have their licenses terminated so long as such
++parties remain in full compliance.
++
++  5. You are not required to accept this License, since you have not
++signed it.  However, nothing else grants you permission to modify or
++distribute the Program or its derivative works.  These actions are
++prohibited by law if you do not accept this License.  Therefore, by
++modifying or distributing the Program (or any work based on the
++Program), you indicate your acceptance of this License to do so, and
++all its terms and conditions for copying, distributing or modifying
++the Program or works based on it.
++
++  6. Each time you redistribute the Program (or any work based on the
++Program), the recipient automatically receives a license from the
++original licensor to copy, distribute or modify the Program subject to
++these terms and conditions.  You may not impose any further
++restrictions on the recipients' exercise of the rights granted herein.
++You are not responsible for enforcing compliance by third parties to
++this License.
++
++  7. If, as a consequence of a court judgment or allegation of patent
++infringement or for any other reason (not limited to patent issues),
++conditions are imposed on you (whether by court order, agreement or
++otherwise) that contradict the conditions of this License, they do not
++excuse you from the conditions of this License.  If you cannot
++distribute so as to satisfy simultaneously your obligations under this
++License and any other pertinent obligations, then as a consequence you
++may not distribute the Program at all.  For example, if a patent
++license would not permit royalty-free redistribution of the Program by
++all those who receive copies directly or indirectly through you, then
++the only way you could satisfy both it and this License would be to
++refrain entirely from distribution of the Program.
++
++If any portion of this section is held invalid or unenforceable under
++any particular circumstance, the balance of the section is intended to
++apply and the section as a whole is intended to apply in other
++circumstances.
++
++It is not the purpose of this section to induce you to infringe any
++patents or other property right claims or to contest validity of any
++such claims; this section has the sole purpose of protecting the
++integrity of the free software distribution system, which is
++implemented by public license practices.  Many people have made
++generous contributions to the wide range of software distributed
++through that system in reliance on consistent application of that
++system; it is up to the author/donor to decide if he or she is willing
++to distribute software through any other system and a licensee cannot
++impose that choice.
++
++This section is intended to make thoroughly clear what is believed to
++be a consequence of the rest of this License.
++
++  8. If the distribution and/or use of the Program is restricted in
++certain countries either by patents or by copyrighted interfaces, the
++original copyright holder who places the Program under this License
++may add an explicit geographical distribution limitation excluding
++those countries, so that distribution is permitted only in or among
++countries not thus excluded.  In such case, this License incorporates
++the limitation as if written in the body of this License.
++
++  9. The Free Software Foundation may publish revised and/or new versions
++of the General Public License from time to time.  Such new versions will
++be similar in spirit to the present version, but may differ in detail to
++address new problems or concerns.
++
++Each version is given a distinguishing version number.  If the Program
++specifies a version number of this License which applies to it and "any
++later version", you have the option of following the terms and conditions
++either of that version or of any later version published by the Free
++Software Foundation.  If the Program does not specify a version number of
++this License, you may choose any version ever published by the Free Software
++Foundation.
++
++  10. If you wish to incorporate parts of the Program into other free
++programs whose distribution conditions are different, write to the author
++to ask for permission.  For software which is copyrighted by the Free
++Software Foundation, write to the Free Software Foundation; we sometimes
++make exceptions for this.  Our decision will be guided by the two goals
++of preserving the free status of all derivatives of our free software and
++of promoting the sharing and reuse of software generally.
++
++			    NO WARRANTY
++
++  11. BECAUSE THE PROGRAM IS LICENSED FREE OF CHARGE, THERE IS NO WARRANTY
++FOR THE PROGRAM, TO THE EXTENT PERMITTED BY APPLICABLE LAW.  EXCEPT WHEN
++OTHERWISE STATED IN WRITING THE COPYRIGHT HOLDERS AND/OR OTHER PARTIES
++PROVIDE THE PROGRAM "AS IS" WITHOUT WARRANTY OF ANY KIND, EITHER EXPRESSED
++OR IMPLIED, INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF
++MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.  THE ENTIRE RISK AS
++TO THE QUALITY AND PERFORMANCE OF THE PROGRAM IS WITH YOU.  SHOULD THE
++PROGRAM PROVE DEFECTIVE, YOU ASSUME THE COST OF ALL NECESSARY SERVICING,
++REPAIR OR CORRECTION.
++
++  12. IN NO EVENT UNLESS REQUIRED BY APPLICABLE LAW OR AGREED TO IN WRITING
++WILL ANY COPYRIGHT HOLDER, OR ANY OTHER PARTY WHO MAY MODIFY AND/OR
++REDISTRIBUTE THE PROGRAM AS PERMITTED ABOVE, BE LIABLE TO YOU FOR DAMAGES,
++INCLUDING ANY GENERAL, SPECIAL, INCIDENTAL OR CONSEQUENTIAL DAMAGES ARISING
++OUT OF THE USE OR INABILITY TO USE THE PROGRAM (INCLUDING BUT NOT LIMITED
++TO LOSS OF DATA OR DATA BEING RENDERED INACCURATE OR LOSSES SUSTAINED BY
++YOU OR THIRD PARTIES OR A FAILURE OF THE PROGRAM TO OPERATE WITH ANY OTHER
++PROGRAMS), EVEN IF SUCH HOLDER OR OTHER PARTY HAS BEEN ADVISED OF THE
++POSSIBILITY OF SUCH DAMAGES.
++
++		     END OF TERMS AND CONDITIONS
++
++	    How to Apply These Terms to Your New Programs
++
++  If you develop a new program, and you want it to be of the greatest
++possible use to the public, the best way to achieve this is to make it
++free software which everyone can redistribute and change under these terms.
++
++  To do so, attach the following notices to the program.  It is safest
++to attach them to the start of each source file to most effectively
++convey the exclusion of warranty; and each file should have at least
++the "copyright" line and a pointer to where the full notice is found.
++
++    <one line to give the program's name and a brief idea of what it does.>
++    Copyright (C) <year>  <name of author>
++
++    This program is free software; you can redistribute it and/or modify
++    it under the terms of the GNU General Public License as published by
++    the Free Software Foundation; either version 2 of the License, or
++    (at your option) any later version.
++
++    This program is distributed in the hope that it will be useful,
++    but WITHOUT ANY WARRANTY; without even the implied warranty of
++    MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++    GNU General Public License for more details.
++
++    You should have received a copy of the GNU General Public License
++    along with this program; if not, write to the Free Software
++    Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA 02110-1335  USA
++
++
++Also add information on how to contact you by electronic and paper mail.
++
++If the program is interactive, make it output a short notice like this
++when it starts in an interactive mode:
++
++    Gnomovision version 69, Copyright (C) year  name of author
++    Gnomovision comes with ABSOLUTELY NO WARRANTY; for details type `show w'.
++    This is free software, and you are welcome to redistribute it
++    under certain conditions; type `show c' for details.
++
++The hypothetical commands `show w' and `show c' should show the appropriate
++parts of the General Public License.  Of course, the commands you use may
++be called something other than `show w' and `show c'; they could even be
++mouse-clicks or menu items--whatever suits your program.
++
++You should also get your employer (if you work as a programmer) or your
++school, if any, to sign a "copyright disclaimer" for the program, if
++necessary.  Here is a sample; alter the names:
++
++  Yoyodyne, Inc., hereby disclaims all copyright interest in the program
++  `Gnomovision' (which makes passes at compilers) written by James Hacker.
++
++  <signature of Ty Coon>, 1 April 1989
++  Ty Coon, President of Vice
++
++This General Public License does not permit incorporating your program into
++proprietary programs.  If your program is a subroutine library, you may
++consider it more useful to permit linking proprietary applications with the
++library.  If this is what you want to do, use the GNU Library General
++Public License instead of this License.
 === added file 'plugins/RemoteControl/RemoteControl.qrc'
 --- plugins/RemoteControl/RemoteControl.qrc	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/RemoteControl.qrc	2016-06-12 13:59:22 +0000
@@ -0,0 +1,6 @@
++<RCC>
++    <qresource prefix="/RemoteControl">
++        <file>resources/bt_remote_off.png</file>
++        <file>resources/bt_remote_on.png</file>
++    </qresource>
++</RCC>
 === added directory 'plugins/RemoteControl/doc'
 === added file 'plugins/RemoteControl/doc/qtwebapp.doxygen'
 --- plugins/RemoteControl/doc/qtwebapp.doxygen	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/doc/qtwebapp.doxygen	2016-06-12 13:59:22 +0000
@@ -0,0 +1,35 @@
++/*
++ * Stellarium
++ * Copyright (C) 2016 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++ */
++
++/*!
++
++@defgroup qtWebApp QtWebApp library
++
++The QtWebApp library is developed by Stefan Frings (http://stefanfrings.de/qtwebapp/index-en.html).
++It is used by the Stellarium \ref remoteControl to provide the HTTP server that serves the plugin's API.
++
++Some changes have been made to the library to fit it better into Stellarium. The main differences are:
++- The settings are no longer specified using QSettings, but with configuration structs (HttpListenerSettings, StaticFileControllerSettings, etc)
++- The template engine supports translating strings at runtime through tags in pseudo-PHP style instead of just different files per language (ITemplateTranslationProvider, Template::translate)
++- The Content-Type detection of the StaticFileController has been extended to use QMimeDatabase, if required.
++
++@author Stefan Frings, Florian Schaukowitsch
++@copyright GNU Lesser General Public License (https://www.gnu.org/licenses/lgpl.html)
++
++*/
 === added file 'plugins/RemoteControl/doc/remoteControl.doxygen'
 --- plugins/RemoteControl/doc/remoteControl.doxygen	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/doc/remoteControl.doxygen	2016-06-12 13:59:22 +0000
@@ -0,0 +1,61 @@
++/*
++ * Stellarium
++ * Copyright (C) 2016 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++ */
++
++/*!
++@defgroup remoteControl Remote Control Plug-in
++@brief Control Stellarium through your web browser! For more information, see @ref remoteControlDoc.
++
++@page remoteControlDoc Remote Control Plug-in documentation
++The %RemoteControl plugin provides a remote control using a webserver interface, usable for single or even synchronized cluster of clients (via the RemoteSync plugin).
++You can simply connect via web browser to a
++configurable port (default: 8090) of your computer. To use it locally, you can use
++http://localhost:8090[/index.html]
++or for a slightly modified GUI which may be better suited for smaller 7inch screens, try
++http://localhost:8090/tablet7in.html.
++Your web browser has to support JavaScript and HTML5 (recommended in 2016: <a href="https://mozilla.org/firefox">Firefox</a>, <a href="https://www.google.com/chrome/">Chrome</a>).
++
++The web data for the interface resides in the <tt>/data/webroot</tt> directory inside the installation directory (<tt>share/stellarium/data/webroot</tt> on Linux), and can be customized with
++some knowledge of HTML, CSS and maybe JavaScript (not necessary for basic functionality, only when more complex additions are required).
++Alternative or derived HTML control GUIs must be placed into the same folder,
++the web server for now cannot read data from the private Stellarium user directory (<tt>~/.stellarium</tt>, <tt>\%APPDATA\%\\stellarium</tt>).
++
++This plugin makes extensive use of the StelProperty system introduced with it. This allows not only to trigger actions,
++but also set QVariant values, which is enough to control many things in the program.
++A few dedicated modules have been implemented closely following the existing GUI for view motion, location setting,
++landscape and skyculture selection, searching objects, etc.
++It is also possible to define interfaces that control plugins, and dynamically show them only when the plugin is enabled.
++
++Because the API is based on simple HTTP calls, it can also be called from command-line clients. For example,
++to execute the script "double_stars.ssc", one could use one of the following lines:
++@code
++wget -q --post-data 'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
++curl --data 'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
++curl -d     'id=double_stars.ssc' http://localhost:8090/api/scripts/run >/dev/null 2>&amp;1
++@endcode
++This allows triggering automatic show setups for museums etc.
++
++The entry point of the plugin is the RemoteControl class.
++- To see how the HTTP API looks like (i.e. if you want to extend it or access it without using the web interface), see @subpage remoteControlApi.
++- To see how the web interface works (i.e. if you want to modify it or add new controls), see @subpage remoteControlWeb.
++
++@author Florian Schaukowitsch, Georg Zotti
++@note This plugin includes parts of the \ref qtWebApp by Stefan Frings, used under the LGPL
++@note This plugin has been developed as project of ESA SoCiS 2015 (http://sophia.estec.esa.int/socis/)
++
++*/
 === added file 'plugins/RemoteControl/doc/remoteControlApi.doxygen'
 --- plugins/RemoteControl/doc/remoteControlApi.doxygen	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/doc/remoteControlApi.doxygen	2016-06-12 13:59:22 +0000
@@ -0,0 +1,461 @@
++/*
++ * Stellarium
++ * Copyright (C) 2016 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++ */
++
++/*!
++
++\page remoteControlApi %RemoteControl plugin HTTP API description
++
++The \ref remoteControl "RemoteControl plugin" provides an HTTP-based interface to Stellarium, implemented on the server-side through implementations of AbstractAPIService.
++The APIController maintains the list of registered services, and dispatches HTTP requests to the right service.
++The API is accessible under the server path `/api/`. For example, if you have the server running on the default port of 8090,
++you can access the operation \ref rcObjectServiceFind of the ObjectService to look for objects with \c moon in their name by accessing
++\code
++http://localhost:8090/api/objects/find?str=moon
++|____________________|___|_______|____|_______|
++          |            |     |      |     |------ Standard HTTP query string for parameters (key=value)
++          |            |     |      |------------ find operation (defined by service)
++          |            |     |------------------- service (e.g. ObjectService)
++          |            |------------------------- API prefix (always /api/)
++          |-------------------------------------- server access (http://host:port)
++\endcode
++
++Instead of the \ref remoteControlWeb "HTTP remote interface" you can also use tools like <a href="https://curl.haxx.se/">cURL</a>
++to access the API remotely. For POST operations, you would use the flag \c -d to pass parameters. For GET operations, you should use
++the additional flag \c -G if parameters are required. Examples:
++@code{.sh}
++# retrieve info about the script "double_stars.ssc" with a GET request
++curl -G -d 'id=double_stars.ssc' http://localhost:8090/api/scripts/info
++# run the script "double_stars.ssc" with a POST request
++curl -d 'id=double_stars.ssc' http://localhost:8090/api/scripts/run
++@endcode
++
++If authentication is enabled (see RemoteControl class), <a href="https://en.wikipedia.org/wiki/Basic_access_authentication">HTTP Basic access authentication</a> is expected, with an empty username.
++HTTPS configuration is currently not implemented, even if the underlying \ref qtWebApp would allow it.
++
++Most operations return data in the <a href="http://www.json.org/">JSON</a> format, allowing it to be easily used in web applications.
++The format of the returned JSON data is described for each operation below.
++Some operations return plain text if only simple data is requested, or to confirm the success of an operation:
++to indicate success "ok" may be returned, in an error case an HTTP error code may be returned together with a string "error: error message" in the response body.
++Other operations may return HTML or even image data, you can check the returned Content-Type header if you are not sure what to expect.
++
++\tableofcontents
++
++\section rcExtendApi Extending the API
++
++The simplest way to expose new data through the API is by using the StelProperty system for a property you want to access.
++In this way, the data is available through the MainService (allowing tracking of changes) and the StelPropertyService (giving a snapshot of current values, metadata information and allowing to change values).
++You do not need to change/implement a new service in any way for this case.
++
++If you want to expose more complex behaviour, you may need to implement your own AbstractAPIService and register it with the APIController.
++\todo Find out how to do this in plugin code
++
++\section rcApiReference API reference
++
++The default services are registered in the RequestHandler::RequestHandler() constructor. They are:
++
++Service               | Path                                                | Description
++--------------------- | --------------------------------------------------- | ------------------------
++MainService           | \ref rcMainService "main"                           | \copybrief MainService
++ObjectService         | \ref rcObjectService "objects"                      | \copybrief ObjectService
++ScriptService         | \ref rcScriptService "scripts"                      | \copybrief ScriptService
++SimbadService         | \ref rcSimbadService "simbad"                       | \copybrief SimbadService
++StelActionService     | \ref rcStelActionService "stelaction"               | \copybrief StelActionService
++StelPropertyService   | \ref rcStelPropertyService "stelproperty"           | \copybrief StelPropertyService
++LocationService       | \ref rcLocationService "location"                   | \copybrief LocationService
++LocationSearchService | \ref rcLocationSearchService "locationsearch"       | \copybrief LocationSearchService
++ViewService           | \ref rcViewService "view"                           | \copybrief ViewService
++
++\subsection rcMainService MainService operations (/api/main/)
++\subsubsection rcMainServiceGET GET operations
++Implemented by MainService::getImpl
++
++\paragraph rcMainServiceStatus status
++Parameters: <tt>[actionId (Number)] [propId (Number)]</tt>\n
++This operation can be polled every few moments to find out if some primary Stellarium state changed. It returns a JSON object with the following format:
++\code{.js}
++{
++    //current location information, see StelLocation
++    location : {
++        name,
++        role,
++        planet,
++        latitude,
++        longitude,
++        altitude,
++        country,
++        state,
++        landscapeKey
++    },
++    //current time information
++    time : {
++        jday,		//current Julian day
++        deltaT,		//current deltaT as determined by the current dT algorithm
++        gmtShift,	//the timezone shift to GMT
++        timeZone,	//the timezone name
++        utc,		//the time in UTC time zone as ISO8601 time string
++        local,		//the time in local time zone as ISO8601 time string
++        isTimeNow,	//if true, the Stellarium time equals the current real-world time
++        timerate	//the current time rate (in secs)
++    },
++    selectioninfo, //string that contains the information of the currently selected object, as returned by StelObject::getInfoString
++    view : {
++        fov		//current FOV
++    },
++
++    //the following is only inserted if an actionId parameter was given
++    //see below for more info
++    actionChanges : {
++        id, //currently valid action id, the interface should update its own id to this value
++        changes : {
++                //a list of boolean actions that changed since the actionId parameter
++                <actionName> : <actionValue>
++        }
++    },
++    //the following is only inserted if an propId parameter was given
++    //see below for more info
++    propertyChanges : {
++        id, //currently valid prop id, the interface should update its own id to this value
++        changes : {
++                //a list of properties that changed since the propId parameter
++                <propName> : <propValue>
++        }
++    }
++}
++\endcode
++
++The \c actionChanges and \c propertyChanges sections allow a remote interface to track boolean StelAction and/or StelProperty changes.
++On the initial poll, you should pass -2 as \p propId and \p actionId. This indicates to the service that you want a full
++list of properties/actions and their current values. When receiving the answer, you should set your local \p propId /\p actionId to the id
++contained in \c actionChanges and \c propertyChanges, and re-send it with the next request as parameter again.
++This allows the MainService to find out which changes must be sent to you (it maintains a queue of action/property changes internally, incrementing
++the ID with each change), and you only have to process the differences instead of everything.
++
++\paragraph rcMainServicePlugins plugins
++Returns the list of all known plugins, as a JSON object of format:
++\code{.js}
++{
++    //list of known plugins, in format:
++    <pluginName> : {
++        loadAtStartup,	//if to load the plugin at startup
++        loaded,		//if the plugin is currently loaded
++        //corresponds to the StelPluginInfo of the plugin
++        info : {
++                authors,
++                contact,
++                description,
++                displayedName,
++                startByDefault,
++                version
++        }
++    }
++}
++\endcode
++
++\subsubsection rcMainServicePOST POST operations
++Implemented by MainService::postImpl
++
++\paragraph rcMainServiceTime time
++Parameters: <tt>time (Number) timerate (Number)</tt>\n
++Sets the current Stellarium simulation time and/or timerate. The \p time parameter defines the current time (Julian day) as passed to StelCore::setJD.
++The \p timerate parameter allows to change the speed at which the simulation time moves (in JDay/sec) as passed to StelCore::setTimeRate.
++
++\paragraph rcMainServiceFocus focus
++Parameters: <tt>[target (String) | position (JSON Number Array of size 3, i.e. Vec3d)]</tt>\n
++Sets the current app focus/selection. If no parameters are given, the current selection is cleared.
++If the \p target parameter was given, the object to be selected is looked up by name (first the localized name is tried, then the english name).
++If the \p position parameter is used, it is interpreted as a coordinate in the J2000 frame, and focused using StelMovementMgr::moveToJ2000
++
++\paragraph rcMainServiceMove move
++Parameters: <tt>x (Number) y (Number)</tt>\n
++Allows viewport movement, like using the arrow keys in the main program. This allows interfaces to create a "virtual joystick" to move the view manually.
++This operation defines the intended move direction. \p x and \p y  define the intended
++move speed in azimuth and altitude (i.e. a negative \p x means left). Values of +-1.0 correspond to the same speed as used for the arrow keys.
++This operation works in conjunction with the update() method - until the movement is stopped
++(i.e. \p x and \p y are zero), or no \c move command has been received for a specified time (about a second), the movement is performed in the given directions.
++
++\paragraph rcMainServiceFov fov
++Parameters: <tt>fov (Number)</tt>\n
++Sets the current field-of-view using StelCore::setFov
++
++\subsection rcObjectService ObjectService operations (/api/objects/)
++\subsubsection rcObjectServiceGET GET operations
++Implemented by ObjectService::getImpl
++
++\paragraph rcObjectServiceFind find
++Parameters: <tt>str (String)</tt>\n
++Finds objects which match the search string \p str, which may contain greek/unicode characters like in the SearchDialog.
++Returns a JSON String array of search matches
++
++\paragraph rcObjectServiceInfo info
++Parameters: <tt>[name (String)]</tt>\n
++Returns a HTML info string (StelObject::getInfoString) about the object identified by \p name.
++If no parameter is given, the currently selected object is used.
++
++\paragraph rcObjectServiceListobjecttypes listobjecttypes
++Returns all object types available in the internal catalogs as a JSON array of objects of format
++@code{.js}
++{
++    key,	//the internal key for the object type
++    name,	//the english name of the type
++    name_i18n //the type name in the current language
++}
++@endcode
++
++\paragraph rcObjectServiceListobjectsbytype listobjectsbytype
++Parameters: <tt>type (String) [english (Number)]</tt>\n
++Returns all objects of the specified \p type. If \p english is given and it evaluates to a "true" value, the english names
++will be returned, otherwise the localized names will be returned. Returns a JSON string array.
++
++\subsection rcScriptService ScriptService operations (/api/scripts/)
++\subsubsection rcScriptServiceGET GET operations
++Implemented by ScriptService::getImpl
++
++\paragraph rcScriptServiceList list
++Lists all known script files, as a JSON string array.
++
++\paragraph rcScriptServiceInfo info
++Parameters: <tt>id (String) [html (any type)] </tt>\n
++Returns information about the script identified by \p id.
++If the optional parameter \p html is present (its value is ignored),
++the info is formatted using StelScriptMgr::getHtmlDescription and
++suitable for inclusion into an \c iframe element,
++otherwise this operation returns a JSON object of format:
++@code{.js}
++{
++    id,	//the script ID
++    name,	//the english name of the script
++    name_localized,	//the localized name of the script
++    description,	//the english description of the script
++    description_localized,	//the localized description of the script
++    author,	//the author(s) of the script
++    license	//the license of the script
++}
++@endcode
++
++\paragraph rcScriptServiceStatus status
++Returns the current script status as a JSON object of format:
++@code{.js}
++{
++    scriptIsRunning,	//true if a script is running
++    runningScriptId		//the currently running script ID
++}
++@endcode
++@note The StelScriptMgr also provides a StelProperty \c StelScriptMgr.runningScriptId that
++can be used to find out the active script.
++
++\subsubsection rcScriptServicePOST POST operations
++Implemented by ScriptService::postImpl
++
++\paragraph rcScriptServiceRun run
++Parameters: <tt>id (String)</tt>\n
++Runs the script with the given \p id. Will fail if a script is currently running.
++
++\paragraph rcScriptServiceDirect direct
++Parameters: <tt>code (String) [useIncludes (Bool)]</tt>\n
++Directly executes the given script \p code. If \p useIncludes is given and evaluates to true, the standard
++include folder will be used. Script execution will fail if a script is already running.
++
++\paragraph rcScriptServiceStop stop
++Stops the execution of a running script.
++
++\subsection rcSimbadService SimbadService operations (/api/simbad/)
++\subsubsection rcSimbadServiceGET GET operations
++Implemented by SimbadService::getImpl
++
++\paragraph rcSimbadServiceLookup lookup
++Parameters: <tt>str (String)</tt>\n
++Performs a SIMBAD lookup for the string \p str using the Stellarium-configured server and returns the results as a JSON object of format
++@code{.js}
++{
++    status, //the status of the lookup: either "empty" when nothing was found, "found" when at least 1 result was returned, and "error" if the lookup caused an error
++    status_i18n, //a localized status message for display
++    errorString, //if the status is "error", this contains more information about it
++    results: {
++        names : [
++                //an array of object names
++        ],
++        positions : [
++                //an array of object positions (i.e. first one corresponds to first name, etc.)
++                //format is an array of 3 numbers for each entry, i.e.:
++                [1,2,3],...
++        ]
++    }
++}
++@endcode
++
++\subsection rcStelActionService StelAction operations (/api/stelaction/)
++\subsubsection rcStelActionServiceGET GET operations
++Implemented by StelActionService::getImpl
++
++\paragraph rcStelActionServiceList list
++Lists all registered StelActions, in the format
++@code{.js}
++{
++    //translated StelAction group name
++    <groupName> : [
++        //all StelActions in the group <groupName>
++        <actionName> : {
++                id,	//the ID of the action
++                isCheckable,	//true if the action represents a boolean value
++                isChecked,	//if "isCheckable" is true, shows the current boolean state
++                text	//the translated description of the action
++        }
++    ]
++}
++@endcode
++
++\subsubsection rcStelActionServicePOST POST operations
++Implemented by StelActionService::postImpl
++
++\paragraph rcStelActionServiceDo do
++Parameters: <tt>id (String)</tt>\n
++Triggers or toggles the StelAction specified by \p id. If it was a boolean action, returns the new state of the action (strings "true"/"false").
++
++\subsection rcStelPropertyService StelProperty operations (/api/stelproperty/)
++\subsubsection rcStelPropertyServiceGET GET operations
++Implemented by StelPropertyService::getImpl
++
++\paragraph rcStelPropertyServiceList list
++Lists all registered StelProperties, in the format
++@code{.js}
++{
++    <propId> : {
++        value, //the current value of the StelProperty
++        variantType, //the type string of the "value", as determined by QVariant::typeName
++        typeString, //the type string of the StelProperty, as determined by QMetaProperty::typeName (may not be equal to "variantType")
++        typeEnum, //the enum value of the type of the StelProperty, as determined by StelProperty::getType
++    }
++}
++@endcode
++@note The generic type conversions are done by QJsonValue::fromVariant
++
++\subsubsection rcStelPropertyServicePOST POST operations
++Implemented by StelPropertyService::postImpl
++
++\paragraph rcStelPropertyServiceSet set
++Parameters: <tt>id (String) value (String)</tt>\n
++Sets the StelProperty identified by \p id to the value \p value. The value is converted to the StelProperty type
++using QVariant logic, an error is returned if this is somehow not possible.
++
++\subsection rcLocationService LocationService operations (/api/location/)
++\subsubsection rcLocationServiceGET GET operations
++Implemented by LocationService::getImpl
++
++\paragraph rcLocationServiceList list
++Returns the list of all stored location IDs (keys of StelLocationMgr::getAllMap) as JSON string array
++
++\paragraph rcLocationServiceCountrylist countrylist
++Returns the list of all known countries (StelLocaleMgr::getAllCountryNames), as a JSON array of objects of format
++@code
++{
++    name, //the english country name
++    name_i18n //the localized country name (current language)
++}
++@endcode
++
++\paragraph rcLocationServicePlanetlist planetlist
++Returns the list of all solar system planet names (SolarSystem::getAllPlanetEnglishNames), as a JSON array of objects of format
++@code
++{
++    name, //the english planet
++    name_i18n //the localized planet name (current language)
++}
++@endcode
++
++\paragraph rcLocationServicePlanetimage planetimage
++Parameters: <tt>planet (String)</tt>\n
++Returns the planet texture image for the \p planet (english name)
++
++\subsubsection rcLocationServicePOST POST operations
++Implemented by LocationService::postImpl
++
++\paragraph rcLocationServiceSetlocationfields setlocationfields
++Parameters: <tt>id (String) | ( [latitude (Number)] [longitude (Number)] [altitude (Number)] [name (String)] [country (String)] [planet (String)] )</tt>\n
++Changes and moves to a new location.
++If \p id is given, all other parameters are ignored, and a location is searched from the named locations using StelLocationMgr::locationForString with the \p id.
++Else, the other parameters change the specific field of the current StelLocation.
++
++\subsection rcLocationSearchService LocationSearchService operations (/api/locationsearch/)
++\subsubsection rcLocationSearchServiceGET GET operations
++Implemented by LocationSearchService::getImpl
++
++\paragraph rcLocationSearchServiceSearch search
++Parameters: <tt>term (String)</tt>\n
++Searches the \p term in the list of predefined locations of the StelLocationMgr, and returns a JSON string array of the results.
++
++\paragraph rcLocationSearchServiceNearby nearby
++Parameters: <tt>[planet (String)] [latitude (Number)] [longitude (Number)] [radius (Number)]</tt>\n
++Searches near the location defined by \p planet, \p latitude and \p longitude for predefined locations (inside the given \p radius)
++using StelLocationMgr::pickLocationsNearby, returns a JSON string array.
++
++\subsection rcViewService ViewService operations (/api/view/)
++\subsubsection rcViewServiceGET GET operations
++Implemented by ViewService::getImpl
++
++\paragraph rcViewServiceListlandscape listlandscape
++Lists the installed landscapes as a JSON object of format
++@code{.js}
++{
++    <landscapeId> : <landscapeName>, //maps the landscape id to the translated landscape name
++    ...
++}
++@endcode
++
++\paragraph rcViewServiceLandscapedescription landscapedescription/
++<em>Note that the slash at the end is mandatory!</em>\n
++Provides virtual filesystem access to the current landscape directory.
++The operation can take a longer path in the URL. The remainder is used to access files in the landscape directory.
++If no longer path is given, the current HTML landscape description (as per LandscapeMgr::getCurrentLandscapeHtmlDescription)
++is returned. An example: `landscapedescription/image.png` returns `image.png` from the current landscape directory.
++
++This operation allows to set up an HTML \c iframe or similar for the landscape description, including all images, etc. embedded
++in the HTML description.
++
++\paragraph rcViewServiceListskyculture listskyculture
++Lists the installed sky cultures as a JSON object of format
++@code{.js}
++{
++    <skycultureId> : <skycultureName>, //maps the id to the translated name
++    ...
++}
++@endcode
++
++\paragraph rcViewServiceSkyculturedescription skyculturedescription/
++<em>Note that the slash at the end is mandatory!</em>\n
++Provides virtual filesystem access to the current skyculture directory.
++The operation can take a longer path in the URL. The remainder is used to access files in the skyculture directory.
++If no longer path is given, the current HTML skyculture description (as per StelSkyCultureMgr::getCurrentSkyCultureHtmlDescription)
++is returned. An example: `skyculturedescription/image.png` returns `image.png` from the current skyculture directory.
++
++This operation allows to set up an HTML \c iframe or similar for the skycultures description, including all images, etc. embedded
++in the HTML description.
++
++\paragraph rcViewServiceListprojection listprojection
++Lists the available projection types as a JSON object of format
++@code{.js}
++{
++    <projectionTypeKey> : <projectionName>, //maps the id to the translated name
++    ...
++}
++@endcode
++
++\paragraph rcViewServiceProjectiondescription projectiondescription
++Returns the HTML description of the current projection (StelProjector::getHtmlSummary)
++
++*/
 === added file 'plugins/RemoteControl/doc/remoteControlWeb.doxygen'
 --- plugins/RemoteControl/doc/remoteControlWeb.doxygen	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/doc/remoteControlWeb.doxygen	2016-06-12 13:59:22 +0000
@@ -0,0 +1,564 @@
++/*
++ * Stellarium
++ * Copyright (C) 2016 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
++ */
++
++/*!
++
++\page remoteControlWeb %RemoteControl plugin web interface
++
++\tableofcontents
++
++The \ref remoteControlDoc "RemoteControl plugin", by default, provides a HTML web interface through the same integrated HTTP
++server that serves the \ref remoteControlApi "RemoteControl API". All content found in the <tt>data/webroot</tt> folder is served.
++Note that the \c /api/ path is reserved for the \ref remoteControlApi "HTTP API", and therefore can not be used as a folder.
++The <tt>index.html</tt> file is mapped to the root, so you can access it using http://localhost:8090 with the default port setting
++of 8090. A slightly modified alternative interface (mainly larger buttons for now) for 7" tablets and other touch devices
++is available at http://localhost:8090/tablet7in.html.
++
++A reasonably modern browser is required to access the interface. Some features of <a href="https://developer.mozilla.org/en-US/docs/Web/Guide/HTML/HTML5">HTML5</a>
++and <a href="https://developer.mozilla.org/en/docs/Web/CSS/CSS3">CSS3</a> are used.
++
++The interface heavily relies on <a href="https://jquery.com/">jQuery</a> for easier JavaScript coding. The code is structured into modules,
++and loaded using <a href="http://requirejs.org/">require.js</a>, which automatically resolves dependencies and load order.
++
++\section remoteControlWebStructure File and directory structure
++
++Note that not all files are listed here, only those of special interest.
++
++- webroot/ - root directory
++    - index.html - Default interface, also mapped to the root folder
++    - style.css - Main stylesheet
++    - tablet7in.html - Modified interface for tablet devices
++    - style_tablet7in.css - Additional stylesheet for tablet7in.html
++    - translate_files - Defines which files are passed through StelTranslator, see \ref remoteControlWebTranslation
++    - iframestyle.css - defines the style for internal frames (landscape description, etc.)
++    - /js/ - Contains the JavaScript files required for the interfaces
++        - main.js - This is the configuration file for require.js. Loads \ref rcUiMainui as main module.
++        - settings.js - Contains some configuration options for the web interface
++        - translationdata.js - Auto-generated file containing strings to translate through StelTranslator, see \ref remoteControlWebTranslation
++        - /api/ - Contains .js modules that define the connection to the \ref remoteControlApi "RemoteControl API"
++            - \ref rcApiRemotecontrol
++            - \ref rcApiActions
++            - \ref rcApiFlags
++            - \ref rcApiLocation
++            - \ref rcApiProperties
++            - \ref rcApiScripts
++            - \ref rcApiSearch
++            - \ref rcApiTime
++            - \ref rcApiUpdatequeue
++            - \ref rcApiViewcontrol
++            - \ref rcApiViewoptions
++        - /ui/ - Contains UI-related .js modules which depend on the /api/ .js modules
++            - \ref rcUiMainui
++            - \ref rcUiActions
++            - \ref rcUiCombobox
++            - \ref rcUiJqueryuifixes
++            - \ref rcUiLocation
++            - \ref rcUiScripts
++            - \ref rcUiSearch
++            - \ref rcUiTime
++            - \ref rcUiViewcontrol
++            - \ref rcUiViewoptions
++
++\section remoteControlWebEdit Editing the interface
++
++With knowledge of HTML, CSS and JavaScript (the latter not required for basic modifications), the interface can be customized.
++
++\subsection remoteControlWebBasic Basic extension
++
++When using the standard JavaScript provided, they allow to use pre-defined CSS "marker" classes which do not style the element per-se (i.e. have no entries in the .css files),
++but allow you to add functionality to HTML elements without editing the JavaScript code.
++Some of these classes also allow you to add further attributes to the element
++(usually <a href="https://developer.mozilla.org/en/docs/Web/Guide/HTML/Using_data_attributes">HTML5 data attributes</a>)
++to further customize their behaviour.
++
++\subsubsection remoteControlWebUIClasses UI control classes
++
++Some classes allow generating UI controls that are similar to what you expect for desktop apps. These use <a href="https://jqueryui.com/">jQuery UI</a> with
++some modifications.
++
++\paragraph remoteControlWebUIspinner spinner
++If added to an HTML \c input element, it sets the control up as a numerical Spinner widget (using jQuery UI: https://api.jqueryui.com/spinner/).
++It supports the following optional parameters:
++- \p data-min - Defines the minimum value of the spinner
++- \p data-max - Defines the maximum value of the spinner
++- \p data-step - Defines the desired step size of the spinner, default is 1. May be different from the number format.
++- \p data-numberformat - Defines how the number is formatted, using <a href="https://github.com/jquery/globalize/blob/v0.1.1/README.md#numbers">globalize.js 0.1.1 syntax</a>
++
++The element will emit the custom \c spinuserinput event whenever the value changes (either through the buttons or direct keyboard input).
++An example, showing how a spinner is created and handled:
++\code
++//make a spinner from -50 to 50, always showing 2 decimal points and stepping 0.1 per click
++<input id="myspinner" class="spinner" data-min="-50" data-max="50" data-step="0.1" data-numberformat="n2"/>
++
++//input handling in javascript
++$("#myspinner").on("spinuserinput", function(evt,ui) {
++    //print the new value
++    console.log(ui.value);
++});
++\endcode
++
++\paragraph remoteControlWebUIslider slider
++If added to an HTML \c div element, it sets the control up as a numerical slider widget (using jQuery UI: https://api.jqueryui.com/slider/).
++It supports the following optional parameters:
++- \p data-min - Defines the minimum value of the slider
++- \p data-max - Defines the maximum value of the slider
++- \p data-step - Defines the desired step size of the slider, default is 1. May be different from the number format.
++
++The element will emit the \c slide event when the slider is moved.
++\code
++//make a slider from -50 to 50, stepsize 0.1
++<div id="myslider" class="slider" data-min="-50" data-max="50" data-step="0.1"/>
++
++//input handling in javascript
++$("#myslider").on("slide", function(evt,ui) {
++    //print the new value
++    console.log(ui.value);
++});
++\endcode
++
++\paragraph remoteControlWebUIjquerybutton jquerybutton
++If added to an HTML \c button element, it converts it to a <a href="https://jqueryui.com/button/">jQuery UI button</a>.
++This is mainly a cosmetic operation.
++
++\paragraph remoteControlWebUIselectmenu selectmenu
++If added to an HTML \c select element, it creates a <a href="https://jqueryui.com/selectmenu/">jQuery UI selectmenu</a> from it.
++This allows simple popup selection menus (like a QComboBox).
++
++\subsubsection remoteControlWebProp Special behaviour classes
++These classes allow automatic connection to StelProperty and StelAction elements defined in Stellarium, allowing particularly easy
++extension of the web interface.
++
++\paragraph remoteControlWebstelproperty stelproperty (Connection to StelProperty)
++Allows direct connection of an element to a StelProperty, meaning the element is automatically updated
++whenever the value in Stellarium changes --- regardless of the source of the change: it can come from the main GUI, scripting, or even
++other RemoteControl web interface instances! Together with the \ref remoteControlWebUIClasses listed above, this allows closely and easily recreating
++standard Stellarium interface elements. This is supported for:
++- \c input elements with the \c spinner class (for numerical properties)\n
++    The StelProperty to use is identified by the standard \c input attribute \p name.
++    Updates the \p value property of the \c input when the StelProperty changes, and reacts to \c spinuserinput events to update the property
++
++- \c input elements of type \c checkbox (`<input type="checkbox">` (for boolean properties)\n
++    The StelProperty to use is identified by the standard \c input attribute \p name.
++    Uses the \p checked property and the \c click event.
++
++- \c div elements with the \c slider class (for numerical properties)\n
++    The StelProperty to use is identified by the custom attribute \p data-prop.
++    Connects to the \c slider widget property \p value.
++
++- \c select elements (also supports the optional \c selectmenu classs)\n
++    The StelProperty to use is identified by the standard \c select attribute \p name.
++    Sets the \c option that has the same \p value as the StelProperty value.
++    Useful for single selection out of a list of possibilities.
++
++- \c span elements, for read-only property display with optional number format\n
++    The StelProperty to use is identified by the custom attribute \p data-prop.
++    The value is displayed using the element's text content.
++    The optional \p data-numberformat attribute is used for the number format
++    using [globalize.js 0.1.1 syntax](https://github.com/jquery/globalize/blob/v0.1.1/README.md#numbers)
++
++- \c button or `input[type="button"]` elements, for write-only setting of a StelProperty to a pre-defined value when clicked\n
++    The StelProperty to use is identified by the standard attribute \p name,
++    and the value to set it to is defined by the attribute \p value.
++
++An example, setting up a spinner for the \c MilkyWay.intensity StelProperty:
++\code{.html}
++<!-- this is all that is required, the rest is done automatically -->
++<input class="spinner stelproperty" name="MilkyWay.intensity" data-min="0" data-max="10" data-step="0.1" data-numberformat="n2"/>
++\endcode
++
++Many more examples can be found by studying the `index.html` code.
++
++\paragraph remoteControlWebstelaction stelaction (Connection to StelAction)
++When this class is added to \c button elements or \c input elements of `type="button"` or `type="checkbox"`,
++this connects the control to a StelAction. The action is identified by the \p name attribute.
++If the action is a boolean action (i.e. StelAction::isCheckable is true), checkboxes show the current state of the action,
++and buttons get the \c active CSS class assigned if the action is currently true.
++
++Examples:
++\code{.html}
++<!-- This is how the main bottom button bar is defined -->
++<ul class="ui-corner-all ui-widget-content button32list margin-vertical">
++      <li><button class="stelaction icon32 btConstellationLines" name="actionShow_Constellation_Lines"></button></li>
++      <li><button class="stelaction icon32 btConstellationLabels" name="actionShow_Constellation_Labels"></button></li>
++      <li><button class="stelaction icon32 btConstellationArt" name="actionShow_Constellation_Art"></button></li>
++      <li><button class="stelaction icon32 btEquatorialGrid" name="actionShow_Equatorial_Grid"></button></li>
++      <li><button class="stelaction icon32 btAzimuthalGrid" name="actionShow_Azimuthal_Grid"></button></li>
++      <li><button class="stelaction icon32 btGround" name="actionShow_Ground"></button></li>
++      <li><button class="stelaction icon32 btCardinalPoints" name="actionShow_Cardinal_Points"></button></li>
++      <li><button class="stelaction icon32 btAtmosphere" name="actionShow_Atmosphere"></button></li>
++      <li><button class="stelaction icon32 btNebula" name="actionShow_Nebulas"></button></li>
++      <li><button class="stelaction icon32 btPlanets" name="actionShow_Planets_Labels"></button></li>
++      <li><button class="stelaction icon32 btEquatorialMount" name="actionSwitch_Equatorial_Mount"></button></li>
++      <li><button class="stelaction icon32 btGotoSelectedObject" name="actionSet_Tracking"></button></li>
++      <li><button class="stelaction icon32 btNightView" name="actionShow_Night_Mode"></button></li>
++      <li><button class="stelaction icon32 btFullScreen" name="actionSet_Full_Screen_Global"></button></li>
++</ul>
++
++<!-- This is how to set up checkboxes -->
++<label><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr("Show Solar System objects")?></label>
++<label><input type="checkbox" class="stelaction" name="actionShow_Planets_Hints" /><?= tr("Show planet markers")?></label>
++<label><input type="checkbox" class="stelaction" name="actionShow_Planets_Orbits" /><?= tr("Show planet orbits")?></label>
++\endcode
++
++\paragraph remoteControlWebStelssc stelssc (Direct script execution)
++This class allows you to define buttons that directly execute Stellarium \ref scripting code.
++Supported for \c button and \c input elements of type \p button. The code to execute should be stored inside
++the element's \p value property. If the custom attribute \p data-useincludes attribute is added (with any value),
++the default include folder is added for optional includes, but this is not recommended unless necessary.
++
++An example:
++\code{.html}
++<!-- some buttons which move the view to predefined angles -->
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 0., 3.)">0&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 30., 3.)">30&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 60., 3.)">60&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 90., 3.)">90&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 120., 3.)">120&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 150., 3.)">150&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 180., 3.)">180&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 210., 3.)">210&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 240., 3.)">240&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 270., 3.)">270&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 300., 3.)">300&deg;</button>
++<button type="button" class="stelssc" value="core.moveToAltAzi(0., 330., 3.)">330&deg;</button>
++\endcode
++
++\warning
++The \c stelssc approach has some disadvantages, so try to use it only when necessary:
++- causes a larger overhead for Stellarium internally than other methods provided by the web interface
++- the scripts can't be executed if another script is currently running, an error message will be shown in this case
++    - this also includes the user clicking too fast on any \c stelssc buttons!
++
++\paragraph remoteControlWebStelplugin stelplugin (Plugin-specific sections)
++With the CSS class \c stelplugin, one can create special HTML sections that
++are only shown when a specified [plugin](\ref plugins) is currently loaded by Stellarium.
++If the plugin is not loaded, the whole element and all it's children are removed from the DOM.
++This class can be added to any element. The plugin which is required is defined by the
++\c data-plugin attribute, which should be set to the plugin ID.
++
++The optional \c data-pluginjs attribute can be used to define an additional JavaScript module that is only
++loaded when the plugin is loaded. This can be used to implement additional behaviour through JS, if required.
++It is recommended to put these modules into the `webroot/js/plugins` folder.
++
++An example, defining the plugin panel for the \ref archaeoLines :
++\code
++<div id="vo_archaeolines" class="smallblock stelplugin" data-plugin="ArchaeoLines" data-pluginjs="plugins/archaeolines">
++  <h3><label><input type="checkbox" class="stelaction valign-middle" name="actionShow_Archaeo_Lines"/><?= tr("ArchaeoLines")?></label></h3>
++  <div class="inline-block blocklabel">
++    <label><input type="checkbox" class="stelaction" name="actionAL_showEquinoxLine"/><?= tr("Equinox")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showSolsticeLines"/><?= tr("Solstices")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showCrossquarterLines"/><?= tr("Crossquarters")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showMajorStandstillLines"/><?= tr("Major Standstill")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showMinorStandstillLines"/><?= tr("Minor Standstill")?></label>
++  </div>
++  <div class="inline-block blocklabel">
++    <label><input type="checkbox" class="stelaction" name="actionAL_showZenithPassageLine"/><?= tr("Zenith Passage")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showNadirPassageLine"/><?= tr("Nadir Passage")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showSelectedObjectLine"/><?= tr("Selected Object")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showCurrentSunLine"/><?= tr("Current Sun")?></label>
++    <label><input type="checkbox" class="stelaction" name="actionAL_showCurrentMoonLine"/><?= tr("Current Moon")?></label>
++  </div>
++  <label class="display-block" for="select_ArchaeoLines_enumShowCurrentPlanet"><?= tr("Current Planet:")?></label>
++  <select id="select_ArchaeoLines_enumShowCurrentPlanet" class="selectmenu stelproperty display-block" name="ArchaeoLines.enumShowCurrentPlanet">
++    <option value="10"><?= tr("None")?></option>
++    <option value="11"><?= tr("Mercury")?></option>
++    <option value="12"><?= tr("Venus")?></option>
++    <option value="13"><?= tr("Mars")?></option>
++    <option value="14"><?= tr("Jupiter")?></option>
++    <option value="15"><?= tr("Saturn")?></option>
++  </select>
++</div>
++
++//the contents of plugins/archaeolines.js
++define(["jquery"],function($){
++        "use strict";
++
++        //this is just an example how to use additional dynamically loaded plugin files
++        console.log("Hello, this is a asynchronously loaded plugin javascript file!");
++
++});
++\endcode
++
++\subsection remoteControlWebTranslation Translation information
++
++The interface can be translated using methods similar to the main program.
++All strings in the HTML markup that should be translated can be written
++between pseudo-PHP style tags and the \c tr function to achieve the same effect as the `q_()` macro in C++, like so:
++\code
++<label><input type="checkbox" class="stelaction" name="actionShow_Planets" /><?= tr("Show Solar System objects")?></label>
++\endcode
++
++All files which are listed in the `webroot/translate_files` file will be parsed, and all `<?= tr("----")?>` tags will be
++replaced using the StelTranslator for the current application language.
++
++If you require translated strings through JavaScript, you should use the `tr` method of the \ref rcApiRemotecontrol module,
++which also works similar to the `q_()` macro. There is a special procedure for the JavaScript strings: the target
++\c RemoteControl-update-translationdata should be run whenever new JavaScript strings have been added.
++This updates the file `webroot/js/translationdata.js` with all current `tr()` strings. [Python](https://www.python.org/)
++is required to be installed for this operation.
++
++Like the main program, the strings can be extracted from the HTML/JS code using gettext/xgettext. There are CMake targets for this like
++for the C++ code (\c generate-pot-stellarium-remotecontrol, \c update-po-stellarium-remotecontrol, etc.) and they are also executed
++with the combined targets (\c generate-pot, \c update-po etc.).
++
++\subsection remoteControlJS JavaScript module reference
++
++All interface code is developed using [require.js modules](http://requirejs.org/docs/api.html#define).
++This allows defining the dependencies of each module, as well as easier maintainability.
++Each module should be defined in its own .js file. The module ID corresponds to the .js file name
++without the file extension.
++
++In short, to define a module, wrap it in a \c define call, and optionally add dependencies.
++A basic example (for more ways to do it see the require.js doc):
++\code
++//myawesomemodule.js
++//the IDs of the dependencies are listed in an array as first parameter
++//the second parameter is usually a function which takes the actual instances of the dependencies as a parameter,
++//  in the same order as they are in the array!
++define(["jquery", "api/remotecontrol"], function($,rc) {
++    "use strict"; //it is recommended to use strict mode for each module
++
++    //do something as soon as this module is loaded
++    console.log("my awesome module is being loaded!");
++
++    //do something when the DOM is ready (because that is not guaranteed while the module is first bein loaded!)
++    $(function(){
++        console.log("the document is ready, you can access the elements now!");
++        //access an element and modifiy it
++        $("#myelement").text("hey, this is awesome");
++    });
++
++    //react to the serverDataReceived event of the remotecontrol module
++    $(rc).on("serverDataReceived", function(evt,data) {
++        console.log("Stellarium just sent us new data!");
++        console.log("The current jDay is " + data.time);
++    });
++
++    //provide some public methods that other modules may call
++    return {
++        myAwesomeMethod: function() {
++            console.log("Hello there!");
++        }
++    };
++});
++
++//another module (in another file) can now reference our module as dependency to load it and use its methods
++define(["jquery", "myawesomemodule"],function($, awesome) {
++
++    awesome.myAwesomeMethod(); //prints "Hello there!"
++});
++\endcode
++
++The UI modules can depend on the API modules and other UI modules.
++The API modules can depend on other API modules.
++Circular dependencies should of course be avoided.
++
++\subsubsection rcApiRemotecontrol api/remotecontrol
++
++This is the main API module, with no further dependencies on other API modules.
++
++Its main function is that it provides automatic status updates by periodically polling (by default each second) the
++\c status operation of the MainService. Whenever this poll succeeds, the \c serverDataReceived custom event is emitted,
++with the JSON response of the server as \p data parameter. Other API modules should use this event, and process
++the data in which they are interested.
++It also keeps track of StelAction and StelProperty changes,
++and emits \c stelActionsChanged and/or \c stelPropertiesChanged, if necessary. Note that it does not process them further,
++this is the job of the \ref rcApiActions and \ref rcApiProperties modules, respectively.
++When the connection to the server is lost (i.e. the polling returned an error), the \c serverDataError event is sent.
++
++The other main function is that it provides the \c postCmd method, which is a simple wrapper around an AJAX POST call
++that is intended to be used by other modules to send commands to the server. It also includes the \c tr method used
++for [translating JS strings](\ref remoteControlWebTranslation).
++
++Finally, this module also processes the [plugin-specific sections](\ref remoteControlWebStelplugin) on load.
++
++\subsubsection rcApiActions api/actions
++
++Processes StelAction related events. Whenever it detects that boolean StelAction was changed, it emits two events:
++- A generic event \c stelActionChanged with the \c actionId as a parameter. This can be used when interested in ALL action changes
++    (like for a action list)
++- A specialied event `stelActionChanged:<actionId>` with the \c actionId as part of the event name.
++    This can be used when listening for a specific action only.
++
++On the first load of the interface, it loads a list of all actions (using the ActionService \c list operation) and emits the
++\c actionListLoaded event when this data is available.
++
++To execute/toggle an action, it provides the public \c executeAction method, which just requires the action ID as parameter.
++To find out whether an action is currently checked, use the \c isChecked method.
++
++\subsubsection rcApiFlags api/flags
++
++This is a utility module, which can be used to implement checkboxes for enum flag types, where each checkbox sets a
++specific bit of a single value. The module should be constructed with \c new, the constructor takes the parent element of a list of
++checkboxes (\c input of type checkbox) and a method which is called back when the internal value changes (i.e. the user clicks a checkbox). It provides the
++\c setValue method to set the current value and check the correct checkboxes. The bit value of each \c input should be specified
++as its \p value property, in hexadecimal string format (for example `0x0004`)
++
++\subsubsection rcApiLocation api/location
++
++Module which connects to the LocationService and the LocationSearchService.
++It emits the following events whenever the specified field changed:
++\c planetChanged,\c nameChanged, \c countryChanged, \c altitudeChanged, \c latitudeChanged, \c longitudeChanged, \c positionChanged (emitted when either lat or lon changed)
++
++It also has \c set methods for these fields.
++Furthermore, it provides \c performLocationSearch, which searches the predefined locations for a specific search string,
++and \c performNearbySearch, which searches predefined locations near a given lat/lon on the current planet.
++These methods take a callback parameter to notify the caller of the results.
++The \c setLocationById method can then be used to set the location to a result of these 2 methods.
++
++It also provides a \c loadCountryList and a \c loadPlanetList which load the specified lists and return the results with a callback.
++
++\subsubsection rcApiProperties api/properties
++
++Processes StelProperty related things. Like the \ref rcApiActions module, it emits 2 events when it detects a StelProperty changed:
++- A generic event \c stelPropertyChanged with the \c propertyId as a parameter. This can be used when interested in ALL property changes
++    (like for a list)
++- A specialied event `stelPropertyChanged:<propertyId>` with the \c propertyId as part of the event name.
++    This can be used when listening for a specific property only.
++
++It provides \c getStelProp and \c setStelProp methods which retrieve and set the value of a StelProperty,
++and also a \c setStelPropQueued convenience method to batch multiple fast interface changes (e.g. through a slider or spinner)
++into a single \c setStelProp call which is only executed after a small time has passed with no changes.
++
++It also emits the \c propertyListLoaded event when it first loads the full list of StelProperties with their type information.
++
++\subsubsection rcApiScripts api/scripts
++
++This module handles script execution (i.e. connection to the ScriptService). It provides the following methods:
++- \c loadScriptList - loads the list of all scripts, takes a callback to return this data
++- \c runScript - runs the specified script id
++- \c runDirectScript - directly runs the given script code
++- \c stopScript - stops a currently running script
++
++It also emits the \c activeScriptChanged event whenever it detects that the current script has changed or started/stopped
++
++\subsubsection rcApiSearch api/search
++
++Implements object search functionality, connecting to the ObjectService and the SimbadService. The following methods are provided:
++- \c loadObjectTypes - loads the list of object types, takes a callback
++- \c loadObjectList - loads the list of objects of a specified type, can return english or localized names
++- \c selectObjectByName - selects the object that matches the specified name
++- \c focusPosition - focuses the given coordinate (array of 3 numbers) in the J2000 frame
++- \c performSearch - performs an object lookup in Stellarium's internal catalog and Simbad. In addition to the search string,
++    2 callbacks must be given as parameters: one for the catalog results, and one for the simbad results. If a search is currently running,
++    it is aborted (meaning the callbacks won't be called for the old searches), allowing this method to be repeatedly called while
++    the user is typing. The Simbad search is only started after a small interval without typing, to reduce the overhead of the
++    external web requests.
++
++While a search is running, it emits \c simbadStateChange events to notify the UI of the current state of the lookup.
++
++\subsubsection rcApiTime api/time
++
++Contains time-related functions and conversions, similar to what StelCore does. This module keeps it's own sense of Stellariums current time,
++to provide an updated interface even between the \c status polls of the \ref rcApiRemotecontrol module.
++
++It provides following methods:
++- \c getCurrentTime - calculates the best guess to the current Stellarium simulation time. This depends on the information received with the last \c status poll,
++    the time since the last data was received and the time the last time change was performed
++- \c isRealTimeSpeed - true if the simulation time currently flows at the same rate as the real time (1 sec per sec).
++- \c jdayToDate - converts a jDay (single number) to Day/Month/Year format, this returns a JS object with \p day, \p month, \p year fields instead
++    of a JS Date object because of its limitations.
++- \c jdayToDate - returns the time component of the given jDay, as a JS object with \p hour, \p minute, \p second fields
++- \c dateTimeToJd - converts a time given in Y/M/D-H/MIN/S format to a jDay
++- \c dateTimeForRollover - like StelUtils::changeDateTimeForRollover
++- \c isTimeUpdatePending - if true, there is a time change which has not yet been sent to the server
++- \c increaseTimeRate - increases the Stellarium simulation time rate (like StelCore::increaseTimeSpeed)
++- \c decreaseTimeRate - decreases the Stellarium simulation time rate (like StelCore::decreaseTimeSpeed)
++- \c isRewind - returns true if the time currently flows backwards (at least at -0.99 sec / sec)
++- \c isFastForward - returns true if time currently is flowing faster than real time
++- \c isTimeNow - returns true if the current simulation time is very close to the actual system time
++- \c isTimeStopped - returns true if the simulation time rate is zero
++- \c togglePlayPause - toggles between timerates 0 and 1 sec/sec
++- \c setDateNow - sets the simulation time to the current system time
++- \c setJDay - sets the time to the specified JDay
++- \c setTimeFromTimeObj - sets the time from a "time object", containing both date and time in the following format
++\code
++{
++    date : {
++        year, month, day
++    },
++    time : {
++        hour, minute, second
++    }
++}
++\endcode
++- \c getTimeData - returns the current time data, containing the last response from the server (including timezone info, etc)
++    The event \c timeDataUpdated is sent whenever this changes.
++
++\subsubsection rcApiUpdatequeue api/updatequeue
++
++This implements a simple update queue class that updates the server after a specified interval if the user does nothing else inbetween.
++This is used to limit the rate at which updates are sent to the server. The \c UpdateQueue constructor takes an url and a callback for the result,
++and when the interface needs to send an update, \c enqueue can be called with the data to send.
++
++\subsubsection rcApiViewcontrol api/viewcontrol
++
++Implements the %FOV access and viewport movement methods. Use \c setFOV to set the %FOV, the \c fovChanged event is sent whenever the %FOV changes.
++There are \c moveRight, \c moveUp, \c moveUpRight etc. methods that allow the user to move the viewport. To stop the movement, use \c stopMovement.
++
++\subsubsection rcApiViewoptions api/viewoptions
++
++Implements the loading of the projection, landscape and skyculture lists.
++
++\subsubsection rcUiMainui ui/mainui
++
++This is the main module of the interface. It lists all the other UI modules as a dependency.
++It starts of the update look of the \c rcApiRemotecontrol module, handles the automatic generation
++of the [special controls](\ref remoteControlWebUIClasses) and [connection of StelProperty controls](\ref remoteControlWebstelproperty),
++and performs smooth animation of the time controls. It also keeps track of the current interface tab the user is on, and
++restores it when the page is reloaded.
++
++\subsubsection rcUiActions ui/actions
++
++Implements the action list and the [StelAction buttons and checkboxes](\ref remoteControlWebstelaction).
++
++\subsubsection rcUiCombobox ui/combobox
++
++Implements a custom combobox control, on top of the jQuery UI \c autocomplete control. This is used for example in the location controls.
++
++\subsubsection rcUiJqueryuifixes ui/jqueryuifixes
++
++Includes some fixes to the standard jQuery UI control classes, especially for the spinner, to provide a unified
++change event, prevent non-numeric input and better touch support. This module is automatically loaded whenever other modules
++load the "jquery-ui" module.
++
++\subsubsection rcUiLocation ui/location
++
++Implements the location controls, such as the map which can be clicked and the comboboxes for the current location.
++
++\subsubsection rcUiScripts ui/scripts
++
++Implements the script list and shows the active script.
++
++\subsubsection rcUiSearch ui/search
++
++Implements the object search panel and the quick select buttons.
++
++\subsubsection rcUiTime ui/time
++
++Implements the time controls, the \c updateTimeDisplay method is called repeatedly as an animation by the \ref rcUiMainui module.
++
++\subsubsection rcUiViewcontrol ui/viewcontrol
++
++Implements the %FOV slider and the "virtual joystick" for the viewport movement.
++
++\subsubsection rcUiViewoptions ui/viewoptions
++
++Implements the projection, landscape and skyculture lists, and some minor things related to other view options.
++*/
 === added directory 'plugins/RemoteControl/resources'
 === added file 'plugins/RemoteControl/resources/bt_network_templates.tif'
 Binary files plugins/RemoteControl/resources/bt_network_templates.tif	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_network_templates.tif	2016-06-12 13:59:22 +0000 differ
 === added file 'plugins/RemoteControl/resources/bt_remote_off.png'
 Binary files plugins/RemoteControl/resources/bt_remote_off.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_off.png	2016-06-12 13:59:22 +0000 differ
 === added file 'plugins/RemoteControl/resources/bt_remote_on.png'
 Binary files plugins/RemoteControl/resources/bt_remote_on.png	1970-01-01 00:00:00 +0000 and plugins/RemoteControl/resources/bt_remote_on.png	2016-06-12 13:59:22 +0000 differ
 === added directory 'plugins/RemoteControl/src'
 === added file 'plugins/RemoteControl/src/APIController.cpp'
 --- plugins/RemoteControl/src/APIController.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/APIController.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,141 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "APIController.hpp"
++#include <QJsonDocument>
++
++
++APIController::APIController(int prefixLength, QObject* parent) : HttpRequestHandler(parent), m_prefixLength(prefixLength)
++{
++
++}
++
++APIController::~APIController()
++{
++
++}
++
++void APIController::update(double deltaTime)
++{
++	mutex.lock();
++	foreach(AbstractAPIService* service, m_serviceMap)
++	{
++		service->update(deltaTime);
++	}
++	mutex.unlock();
++}
++
++void APIController::registerService(AbstractAPIService *service)
++{
++	m_serviceMap.insert(service->serviceName(), service);
++}
++
++void APIController::service(HttpRequest &request, HttpResponse &response)
++{
++	//disable caching by default for services
++	response.setHeader("Cache-Control","no-cache");
++	//default content type is text
++	response.setHeader("Content-Type","text/plain");
++
++	//use the raw path here
++	QByteArray path = request.getRawPath();
++	QByteArray pathWithoutPrefix = path.right(path.size()-m_prefixLength);
++
++	int slashIdx = pathWithoutPrefix.indexOf('/');
++
++	QByteArray serviceString = pathWithoutPrefix;
++	QByteArray operation;
++	if(slashIdx>=0)
++	{
++		serviceString = pathWithoutPrefix.mid(0,slashIdx);
++		operation = pathWithoutPrefix.mid(slashIdx+1);
++	}
++
++	//try to find service
++	//the mutex here is to prevent a very strange crash I had, in which sv is an invalid pointer (but m_serviceMap is ok)
++	//probably caused by the foreach loop in update in the main thread?
++	mutex.lock();
++	ServiceMap::iterator it = m_serviceMap.find(serviceString);
++	if(it!=m_serviceMap.end())
++	{
++		AbstractAPIService* sv = *it;
++		mutex.unlock();
++
++		//create the response object
++		APIServiceResponse apiresponse;
++		if(request.getMethod()=="GET")
++		{
++#ifdef FORCE_THREADED_SERVICES
++			apiresponse = sv->get(operation, request.getParameterMap());
++#else
++			if(sv->supportsThreadedOperation())
++			{
++				apiresponse = sv->get(operation, request.getParameterMap());
++			}
++			else
++			{
++				//invoke it in the main thread!
++				QMetaObject::invokeMethod(sv,"get",Qt::BlockingQueuedConnection,
++							  Q_RETURN_ARG(APIServiceResponse, apiresponse),
++							  Q_ARG(QByteArray, operation),
++							  Q_ARG(APIParameters, request.getParameterMap()));
++			}
++#endif
++			apiresponse.applyResponse(&response);
++		}
++		else if (request.getMethod()=="POST")
++		{
++#ifdef FORCE_THREADED_SERVICES
++			apiresponse = sv->post(operation, request.getParameterMap(), request.getBody());
++#else
++			if(sv->supportsThreadedOperation())
++			{
++				apiresponse = sv->post(operation, request.getParameterMap(), request.getBody());
++			}
++			else
++			{
++				QMetaObject::invokeMethod(sv,"post",Qt::BlockingQueuedConnection,
++							  Q_RETURN_ARG(APIServiceResponse, apiresponse),
++							  Q_ARG(QByteArray, operation),
++							  Q_ARG(APIParameters, request.getParameterMap()),
++							  Q_ARG(QByteArray, request.getBody()));
++			}
++#endif
++			apiresponse.applyResponse(&response);
++		}
++		else
++		{
++			response.setStatus(405,"Method Not allowed");
++			QString str(QStringLiteral("Method %1 not allowed for service %2"));
++			response.write(str.arg(QString::fromLatin1(request.getMethod())).arg(QString::fromUtf8(pathWithoutPrefix)).toUtf8(),true);
++		}
++	}
++	else
++	{
++		mutex.unlock();
++		response.setStatus(400,"Bad Request");
++		QString str(QStringLiteral("Unknown service: '%1'\n\nAvailable services:\n").arg(QString::fromUtf8(pathWithoutPrefix)));
++		for(ServiceMap::iterator it = m_serviceMap.begin();it!=m_serviceMap.end();++it)
++		{
++			str.append(QString::fromUtf8(it.key()));
++			str.append("\n");
++		}
++		response.write(str.toUtf8(),true);
++	}
++}
 === added file 'plugins/RemoteControl/src/APIController.hpp'
 --- plugins/RemoteControl/src/APIController.hpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/APIController.hpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,64 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#ifndef APIHANDLER_HPP_
++#define APIHANDLER_HPP_
++
++#include "httpserver/httprequesthandler.h"
++#include "AbstractAPIService.hpp"
++
++#include <QMutex>
++
++//! @ingroup remoteControl
++//! This class handles the API-specific requests and dispatches them to the correct AbstractAPISerice implementation.
++//! Services are registered using registerService().
++//! To see the default services used, see the RequestHandler::RequestHandler constructor.
++class APIController : public HttpRequestHandler
++{
++	Q_OBJECT
++public:
++	//! Constructs an APIController
++	//! @param prefixLength Determines how many characters to strip from the front of the request path
++	//! @param parent passed on to QObject constructor
++	APIController(int prefixLength, QObject* parent = 0);
++	virtual ~APIController();
++
++	//! Should be called each frame from the main thread, like from StelModule::update.
++	//! Passed on to each AbstractAPIService::update method for optional processing.
++	void update(double deltaTime);
++
++	//! Handles an API-specific request. It finds out which AbstractAPIService to use
++	//! depending on the service name (first part of path until slash). An error is returned for invalid requests.
++	//! If a service was found, the request is passed on to its AbstractAPIService::get or AbstractAPIService::post
++	//! method depending on the HTTP request type.
++	//! If AbstractAPIService::supportsThreadedOperation is false, these methods are called in the Stellarium main thread
++	//! using QMetaObject::invokeMethod, otherwise they are directly executed in the current thread (HTTP worker thread).
++	virtual void service(HttpRequest& request, HttpResponse& response);
++
++	//! Registers a service with the APIController.
++	//! The AbstractAPIService::serviceName() determines the request path of the service.
++	void registerService(AbstractAPIService* service);
++private:
++	int m_prefixLength;
++	typedef QMap<QByteArray,AbstractAPIService*> ServiceMap;
++	ServiceMap m_serviceMap;
++	QMutex mutex;
++};
++
++#endif
 === added file 'plugins/RemoteControl/src/AbstractAPIService.cpp'
 --- plugins/RemoteControl/src/AbstractAPIService.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/AbstractAPIService.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,159 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "AbstractAPIService.hpp"
++#include <QJsonDocument>
++
++#include "httpserver/httpresponse.h"
++
++int APIServiceResponse::metaTypeId = qRegisterMetaType<APIServiceResponse>();
++int APIServiceResponse::parametersMetaTypeId = qRegisterMetaType<APIParameters>();
++
++void APIServiceResponse::setHeader(const QByteArray &name, const QByteArray &val)
++{
++	headers.insert(name,val);
++}
++
++void APIServiceResponse::setHeader(const QByteArray &name, const int val)
++{
++	headers.insert(name,QByteArray::number(val));
++}
++
++void APIServiceResponse::setStatus(int status, const QByteArray &text)
++{
++	this->status = status;
++	this->statusText = text;
++}
++
++void APIServiceResponse::applyResponse(HttpResponse *response) const
++{
++	if(status != -1)
++	{
++		response->setStatus(status,statusText);
++	}
++
++	//apply headers
++	response->getHeaders().unite(headers);
++
++	//send response data, if any
++	if(responseData.isEmpty())
++	{
++		response->getHeaders().clear();
++		response->setStatus(500,"Internal Server Error");
++		response->write("Service provided no response",true);
++	}
++	response->write(responseData,true);
++}
++
++void APIServiceResponse::setData(const QByteArray &data)
++{
++	this->responseData = data;
++}
++
++void APIServiceResponse::appendData(const QByteArray &data)
++{
++	this->responseData.append(data);
++}
++
++void APIServiceResponse::writeRequestError(const QByteArray &msg)
++{
++	setStatus(400,"Bad Request");
++	responseData = msg;
++}
++
++void APIServiceResponse::writeJSON(const QJsonDocument &doc)
++{
++#ifdef QT_NO_DEBUG
++	//Use compact JSON format for release builds for smaller files
++	QByteArray data = doc.toJson(QJsonDocument::Compact);
++#else
++	//Use indented JSON format in debug builds for easier human reading
++	QByteArray data = doc.toJson(QJsonDocument::Indented);
++#endif
++	//setHeader("Content-Length",data.size());
++	setHeader("Content-Type","application/json; charset=utf-8");
++	setData(data);
++}
++
++
++void AbstractAPIService::update(double deltaTime)
++{
++	Q_UNUSED(deltaTime);
++}
++
++bool AbstractAPIService::supportsThreadedOperation() const
++{
++	return false;
++}
++
++APIServiceResponse AbstractAPIService::get(const QByteArray &operation, const APIParameters &parameters)
++{
++	APIServiceResponse response;
++	getImpl(operation,parameters,response);
++	return response;
++}
++
++APIServiceResponse AbstractAPIService::post(const QByteArray &operation, const APIParameters &parameters, const QByteArray &data)
++{
++	APIServiceResponse response;
++	postImpl(operation,parameters,data,response);
++	return response;
++}
++
++#ifdef FORCE_THREADED_SERVICES
++const Qt::ConnectionType AbstractAPIService::SERVICE_DEFAULT_INVOKETYPE = Qt::BlockingQueuedConnection;
++#else
++const Qt::ConnectionType AbstractAPIService::SERVICE_DEFAULT_INVOKETYPE = Qt::DirectConnection;
++#endif
++
++void AbstractAPIService::getImpl(const QByteArray& operation, const QMultiMap<QByteArray, QByteArray> &parameters, APIServiceResponse &response)
++{
++	Q_UNUSED(operation);
++	Q_UNUSED(parameters);
++
++	response.setStatus(405,"Method Not allowed");
++	QString str(QStringLiteral("Method GET not allowed for service %2"));
++
++	response.setData(str.arg(QString::fromLatin1(serviceName())).toLatin1());
++}
++
++void AbstractAPIService::postImpl(const QByteArray& operation, const QMultiMap<QByteArray, QByteArray> &parameters, const QByteArray &data, APIServiceResponse &response)
++{
++	Q_UNUSED(operation);
++	Q_UNUSED(parameters);
++	Q_UNUSED(data);
++
++	response.setStatus(405,"Method Not allowed");
++	QString str(QStringLiteral("Method POST not allowed for service %2"));
++	response.setData(str.arg(QString::fromLatin1(serviceName())).toLatin1());
++}
++
++
++QString AbstractAPIService::wrapHtml(QString &text, const QString &title) const
++{
++	const QString head = "<!DOCTYPE HTML PUBLIC \"-//W3C//DTD HTML 4.01 Transitional//EN\" \"http://www.w3.org/TR/html4/loose.dtd\">\n"
++				"<html><head>\n"
++				"<title>" + title + "</title>\n"
++				"<link type=\"text/css\" rel=\"stylesheet\" href=\"/iframestyle.css\">\n"
++				"<base target=\"_blank\">\n"
++				"</head><body>\n";
++	const QString tail = "</body></html>";
++
++	return text.prepend(head).append(tail);
++}
 === added file 'plugins/RemoteControl/src/AbstractAPIService.hpp'
 --- plugins/RemoteControl/src/AbstractAPIService.hpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/AbstractAPIService.hpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,160 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#ifndef ABSTRACTAPISERVICE_HPP_
++#define ABSTRACTAPISERVICE_HPP_
++
++#include <QByteArray>
++#include <QMap>
++#include <QObject>
++
++//Uncomment to force each service to run in the HTTP handling threads themselves, like the initial versions
++//#define FORCE_THREADED_SERVICES
++
++class HttpResponse;
++class APIController;
++
++//! \addtogroup remoteControl
++//! @{
++
++//! Thread-safe version of HttpResponse that can be passed around through QMetaObject::invokeMethod.
++//! It contains the data that will be sent back to the client in the HTTP thread, when control returns to the APIController.
++struct APIServiceResponse
++{
++public:
++	//! Constructs an invalid response
++	APIServiceResponse() : status(-1)
++	{
++
++	}
++
++	//! Sets a specific HTTP header to the specified value
++	void setHeader(const QByteArray& name, const QByteArray& val);
++	//! Shortcut for int header values
++	void setHeader(const QByteArray& name, const int val);
++	//! Sets the HTTP status type and status text
++	void setStatus(int status, const QByteArray& text);
++
++	//! Replaces the current return data
++	void setData(const QByteArray& data);
++	//! Appends to the current return data
++	void appendData(const QByteArray& data);
++
++	//! Sets the HTTP status to 400, and sets the response data to the message
++	void writeRequestError(const QByteArray& msg);
++	//! Sets the Content-Type to "application/json" and serializes the given document
++	//! into JSON text format
++	void writeJSON(const QJsonDocument& doc);
++
++private:
++	int status;
++	QByteArray statusText;
++	QMap<QByteArray,QByteArray> headers;
++	QByteArray responseData;
++
++	//! Applies the data in this APIServiceResponse onto the HttpResponse
++	//! Must be called in the HTTP thread, done by APIController
++	void applyResponse(HttpResponse* response) const;
++
++	static int metaTypeId;
++	static int parametersMetaTypeId;
++	friend class APIController;
++
++};
++
++//! Defines the HTTP request parameters for the service
++typedef QMultiMap<QByteArray, QByteArray> APIParameters;
++
++Q_DECLARE_METATYPE(APIServiceResponse)
++Q_DECLARE_METATYPE(APIParameters)
++
++//! Abstract base class for all \ref remoteControl service implementations. Different implementations of this class are mapped to
++//! different HTTP request paths. For each API request, the APIController finds out which service to use, and calls its get() or post() method.
++class AbstractAPIService : public QObject
++{
++	Q_OBJECT
++public:
++	//! Abstract constructor. The service name is used by the APIController for request path mapping.
++	AbstractAPIService(const QByteArray& serviceName, QObject* parent = 0) : QObject(parent), m_serviceName(serviceName)
++	{
++
++	}
++
++	virtual ~AbstractAPIService() { }
++
++	//! Returns the service name, used for request path mapping by the APIController
++	QByteArray serviceName() { return m_serviceName; }
++
++	//! Return true if the service can safely be run in the HTTP handler thread,
++	//! instead of having to queue it into the Stellarium main thread.
++	//! Default implementation returns false, i.e. no special threading precautions have to be used
++	//! in the get() and post() implementation.
++	//! @warning If the macro \c FORCE_THREADED_SERVICES is set, all services will be run
++	//! in the HTTP threads for testing, and this method will be ignored.
++	virtual bool supportsThreadedOperation() const;
++
++	//! Called in the main thread each frame. Default implementation does nothing.
++	//! Can be used for ongoing actions, for example movement control.
++	virtual void update(double deltaTime);
++
++	//! Wrapper around getImpl(), constructs an APIServiceResponse object for the response and passes it on
++	//! @note The thread this is called in depends on the supportThreadedOperation() return value
++	Q_INVOKABLE APIServiceResponse get(const QByteArray &operation, const APIParameters &parameters);
++	//! Wrapper around postImpl(), constructs an APIServiceResponse object for the response and passes it on
++	//! @note The thread this is called in depends on the supportThreadedOperation() return value
++	Q_INVOKABLE APIServiceResponse post(const QByteArray &operation, const APIParameters &parameters, const QByteArray& data);
++
++protected:
++	//! Subclasses should implement this to define reactions to HTTP GET requests.
++	//! GET requests generally should only query data or program state, and not change it.
++	//! If there is an error with the request, use APIServiceResponse::writeRequestError to notify the client.
++	//! @param operation The operation string of the request (i.e. the part of the request URL after the service name, without parameters)
++	//! @param parameters The extracted service parameters (extracted from the URL)
++	//! @param response The response object, write your response into this
++	//! @note The thread this is called in depends on the supportThreadedOperation() return value
++	virtual void getImpl(const QByteArray& operation, const APIParameters& parameters, APIServiceResponse& response);
++	//! Subclasses should implement this to define reactions to HTTP POST requests.
++	//! POST requests generally should change data or perform some action.
++	//! If there is an error with the request, use APIServiceResponse::writeRequestError to notify the client.
++	//! @param operation The operation string of the request (i.e. the part of the request URL after the service name, without parameters)
++	//! @param parameters The extracted service parameters (extracted from the URL, and form data, if applicable)
++	//! @param data The unmodified data as sent from the client
++	//! @param response The response object, write your response into this
++	//! @note The thread this is called in depends on the supportThreadedOperation() return value
++	virtual void postImpl(const QByteArray& operation, const APIParameters& parameters, const QByteArray& data, APIServiceResponse& response);
++
++	//! This defines the connection type QMetaObject::invokeMethod has to use inside a service: either Qt::DirectConnection for main thread handling, or
++	//! Qt::BlockingQueuedConnection for HTTP thread handling
++	static const Qt::ConnectionType SERVICE_DEFAULT_INVOKETYPE;
++
++	//! Because the HTML descriptions in Stellarium are often not compatible
++	//! with "clean" HTML5 which is used for the main interface,
++	//! this method can be used to explicitely set the doctype
++	//! to 4.01 transitional for better results, and include the stylesheet
++	//! \c iframestyle.css
++	//! @param text The text to wrap with HTML document tags
++	//! @param title The title of the page
++	QString wrapHtml(QString& text, const QString& title) const;
++private:
++	QByteArray m_serviceName;
++};
++
++//! @}
++
++#endif
 === added file 'plugins/RemoteControl/src/CMakeLists.txt'
 --- plugins/RemoteControl/src/CMakeLists.txt	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/CMakeLists.txt	2016-06-12 13:59:22 +0000
@@ -0,0 +1,78 @@
++INCLUDE_DIRECTORIES(. gui qtwebapp)
++LINK_DIRECTORIES(${BUILD_DIR}/src)
++
++SET(QtWebApp_SRCS
++  qtwebapp/httpserver/httpconnectionhandler.cpp
++  qtwebapp/httpserver/httpconnectionhandler.h
++  qtwebapp/httpserver/httpconnectionhandlerpool.cpp
++  qtwebapp/httpserver/httpconnectionhandlerpool.h
++  qtwebapp/httpserver/httpcookie.cpp
++  qtwebapp/httpserver/httpcookie.h
++  qtwebapp/httpserver/httpglobal.cpp
++  qtwebapp/httpserver/httpglobal.h
++  qtwebapp/httpserver/httplistener.cpp
++  qtwebapp/httpserver/httplistener.h
++  qtwebapp/httpserver/httprequest.cpp
++  qtwebapp/httpserver/httprequest.h
++  qtwebapp/httpserver/httprequesthandler.cpp
++  qtwebapp/httpserver/httprequesthandler.h
++  qtwebapp/httpserver/httpresponse.cpp
++  qtwebapp/httpserver/httpresponse.h
++  qtwebapp/httpserver/staticfilecontroller.cpp
++  qtwebapp/httpserver/staticfilecontroller.h
++
++  qtwebapp/templateengine/template.cpp
++  qtwebapp/templateengine/template.h
++  qtwebapp/templateengine/templateglobal.h
++)
++
++SET(RemoteControl_SRCS
++  AbstractAPIService.hpp
++  AbstractAPIService.cpp
++  APIController.hpp
++  APIController.cpp
++  MainService.hpp
++  MainService.cpp
++  ObjectService.hpp
++  ObjectService.cpp
++  LocationService.hpp
++  LocationService.cpp
++  LocationSearchService.hpp
++  LocationSearchService.cpp
++  RemoteControl.hpp
++  RemoteControl.cpp
++  RequestHandler.hpp
++  RequestHandler.cpp
++  ScriptService.hpp
++  ScriptService.cpp
++  SimbadService.hpp
++  SimbadService.cpp
++  StelActionService.hpp
++  StelActionService.cpp
++  StelPropertyService.hpp
++  StelPropertyService.cpp
++  ViewService.hpp
++  ViewService.cpp
++  gui/RemoteControlDialog.hpp
++  gui/RemoteControlDialog.cpp
++)
++
++SET(RemoteControl_UIS
++  gui/remoteControlDialog.ui
++)
++
++QT5_WRAP_UI(RemoteControl_UIS_H ${RemoteControl_UIS})
++
++################# compiles resources files ############
++SET(RemoteControl_RES ../RemoteControl.qrc)
++QT5_ADD_RESOURCES(RemoteControl_RES_CXX ${RemoteControl_RES})
++
++SET(extLinkerOption ${JPEG_LIBRARIES} ${PNG_LIBRARIES} ${OPENGL_LIBRARIES})
++
++ADD_LIBRARY(RemoteControl-static STATIC ${RemoteControl_SRCS} ${RemoteControl_RES_CXX} ${RemoteControl_UIS_H} ${QtWebApp_SRCS})
++QT5_USE_MODULES(RemoteControl-static Core Network Widgets)
++# The library target "RemoteControl-static" has a default OUTPUT_NAME of "RemoteControl-static", so change it.
++SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES OUTPUT_NAME "RemoteControl")
++TARGET_LINK_LIBRARIES(RemoteControl-static ${extLinkerOption})
++SET_TARGET_PROPERTIES(RemoteControl-static PROPERTIES COMPILE_FLAGS "-DQT_STATICPLUGIN")
++ADD_DEPENDENCIES(AllStaticPlugins RemoteControl-static)
 === added file 'plugins/RemoteControl/src/LocationSearchService.cpp'
 --- plugins/RemoteControl/src/LocationSearchService.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/LocationSearchService.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,104 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "LocationSearchService.hpp"
++
++#include "StelApp.hpp"
++#include "StelCore.hpp"
++#include "StelModuleMgr.hpp"
++#include "StelLocationMgr.hpp"
++
++#include <QJsonArray>
++#include <QJsonDocument>
++#include <QJsonObject>
++#include <QRegExp>
++
++LocationSearchService::LocationSearchService(const QByteArray &serviceName, QObject *parent)
++	: AbstractAPIService(serviceName,parent), locMgr(LocationList())
++{
++	//this is run in the main thread
++	connect(&StelApp::getInstance().getLocationMgr(), SIGNAL(locationListChanged()), this, SLOT(mainLocationManagerUpdated()));
++	mainLocationManagerUpdated();
++}
++
++void LocationSearchService::mainLocationManagerUpdated()
++{
++	//this is run in the main thread
++	locMgrMutex.lock();
++	//copy the contents of the location manager
++	locMgr.setLocations(StelApp::getInstance().getLocationMgr().getAll());
++	locMgrMutex.unlock();
++}
++
++void LocationSearchService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
++{
++	if(operation=="search")
++	{
++		//parameter must be named "term" to be compatible with jQuery UI autocomplete without further JS code
++		QString term = QString::fromUtf8(parameters.value("term"));
++
++		if(term.isEmpty())
++		{
++			response.writeRequestError("needs non-empty 'term' parameter");
++			return;
++		}
++
++		//the filtering in the app is provided by QSortFilterProxyModel in the view
++		//we dont have that luxury, but we make sure the filtering happens in the separate HTTP thread
++		locMgrMutex.lock();
++		LocationMap allItems = locMgr.getAllMap();
++		locMgrMutex.unlock();
++
++		QJsonArray results;
++		const QList<QString>& list = allItems.keys();
++
++		//use a regexp in wildcard mode, the app does the same
++		QRegExp exp(term,Qt::CaseInsensitive, QRegExp::Wildcard);
++
++		for(QList<QString>::const_iterator it = list.begin();it!=list.end();++it)
++		{
++			if(it->contains(exp))
++				results.append(*it);
++		}
++
++		response.writeJSON(QJsonDocument(results));
++	}
++	else if(operation=="nearby")
++	{
++		QString sPlanet = QString::fromUtf8(parameters.value("planet"));
++		QString sLatitude = QString::fromUtf8(parameters.value("latitude"));
++		QString sLongitude = QString::fromUtf8(parameters.value("longitude"));
++		QString sRadius = QString::fromUtf8(parameters.value("radius"));
++
++		float latitude = sLatitude.toFloat();
++		float longitude = sLongitude.toFloat();
++		float radius = sRadius.toFloat();
++
++		locMgrMutex.lock();
++		LocationMap results = locMgr.pickLocationsNearby(sPlanet,longitude,latitude,radius);
++		locMgrMutex.unlock();
++
++		response.writeJSON(QJsonDocument(QJsonArray::fromStringList(results.keys())));
++	}
++	else
++	{
++		//TODO some sort of service description?
++		response.writeRequestError("unsupported operation. GET: search,nearby");
++	}
++}
 === added file 'plugins/RemoteControl/src/LocationSearchService.hpp'
 --- plugins/RemoteControl/src/LocationSearchService.hpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/LocationSearchService.hpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,58 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#ifndef LOCATIONSEARCHSERVICE_HPP_
++#define LOCATIONSEARCHSERVICE_HPP_
++
++#include "AbstractAPIService.hpp"
++#include "StelLocationMgr.hpp"
++#include <QMutex>
++
++//! @ingroup remoteControl
++//! Provides predefined location search functionality, using the StelLocationMgr.
++//!
++//! @see \ref rcLocationSearchService, LocationService
++//! @note This service supports threaded operation
++class LocationSearchService : public AbstractAPIService
++{
++	Q_OBJECT
++public:
++	LocationSearchService(const QByteArray& serviceName, QObject* parent = 0);
++
++	virtual ~LocationSearchService() {}
++
++	//! We work on a copy of the StelLocationMgr, to prevent hitches as the web user is typing
++	//! @returns true
++	bool supportsThreadedOperation() const Q_DECL_OVERRIDE { return true; }
++protected:
++	//! @brief Implements the GET method.
++	//! @see \ref rcLocationSearchServiceGET
++	virtual void getImpl(const QByteArray& operation,const APIParameters& parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
++private slots:
++	// connected to the main location manager in the main thread
++	void mainLocationManagerUpdated();
++private:
++	//the location mgr is actually copied to be used in HTTP threads without blocking the main app
++	StelLocationMgr locMgr;
++	QMutex locMgrMutex;
++};
++
++
++
++#endif
 === added file 'plugins/RemoteControl/src/LocationService.cpp'
 --- plugins/RemoteControl/src/LocationService.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/LocationService.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,258 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "LocationService.hpp"
++
++#include "StelApp.hpp"
++#include "StelCore.hpp"
++#include "StelFileMgr.hpp"
++#include "StelModuleMgr.hpp"
++#include "StelLocationMgr.hpp"
++#include "StelLocaleMgr.hpp"
++#include "StelTranslator.hpp"
++#include "SolarSystem.hpp"
++
++#include <QFileInfo>
++#include <QMimeDatabase>
++#include <QJsonArray>
++#include <QJsonDocument>
++#include <QJsonObject>
++#include <QStringListModel>
++
++LocationService::LocationService(const QByteArray &serviceName, QObject *parent) : AbstractAPIService(serviceName,parent)
++{
++	//this is run in the main thread
++	core = StelApp::getInstance().getCore();
++	locMgr = &StelApp::getInstance().getLocationMgr();
++	ssys = GETSTELMODULE(SolarSystem);
++}
++
++void LocationService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
++{
++	if(operation=="list")
++	{
++		//for now, this does not return location objects (which would require a much larger data transfer), but only the location strings
++		//same as in the LocationDialog list
++
++		//TODO not fully thread safe
++		QJsonArray list = QJsonArray::fromStringList(QStringList(locMgr->getAllMap().keys()));
++
++		response.writeJSON(QJsonDocument(list));
++	}
++	else if(operation == "countrylist")
++	{
++		const StelTranslator& trans = *StelTranslator::globalTranslator;
++
++		QStringList allCountries = StelApp::getInstance().getLocaleMgr().getAllCountryNames();
++		QJsonArray list;
++		foreach(QString str, allCountries)
++		{
++			QJsonObject obj;
++			obj.insert("name",str);
++			obj.insert("name_i18n",trans.qtranslate(str));
++			list.append(obj);
++		}
++
++		response.writeJSON(QJsonDocument(list));
++	}
++	else if(operation == "planetlist")
++	{
++		const StelTranslator& trans = StelApp::getInstance().getLocaleMgr().getSkyTranslator();
++
++		QStringList allPlanets = ssys->getAllPlanetEnglishNames();
++		QJsonArray list;
++		foreach(QString str, allPlanets)
++		{
++			QJsonObject obj;
++			obj.insert("name",str);
++			obj.insert("name_i18n",trans.qtranslate(str));
++			list.append(obj);
++		}
++
++		response.writeJSON(QJsonDocument(list));
++	}
++	else if(operation=="planetimage")
++	{
++		//return the image file for the specified planet
++		//logic from LocationDialog
++
++		QString planet = QString::fromUtf8(parameters.value("planet"));
++
++		if(planet.isEmpty())
++		{
++			response.writeRequestError("requires 'planet' parameter");
++			return;
++		}
++
++
++		SolarSystem* ssm = GETSTELMODULE(SolarSystem);
++		PlanetP p = ssm->searchByEnglishName(planet);
++		if (p)
++		{
++			QString path = StelFileMgr::findFile("textures/"+p->getTextMapName());
++			QFile file(path);
++			if (path.isEmpty() || !file.exists())
++			{
++				response.setStatus(404,"not found");
++				response.setData("planet image not available");
++				qWarning() << "ERROR - could not find planet map for " << planet;
++				return;
++			}
++
++			QMimeType mime = QMimeDatabase().mimeTypeForFile(path);
++
++			if(file.open(QIODevice::ReadOnly))
++			{
++				//allow the image to be cached by browser (1 hour)
++				response.setHeader("Cache-Control","max-age="+QByteArray::number(60*60));
++				//response.setHeader("Content-Length",static_cast<int>(file.size()));
++				if(!mime.isDefault())
++				{
++					response.setHeader("Content-Type", mime.name().toLatin1());
++				}
++
++				//load and write data
++				response.setData(file.readAll());
++			}
++			else
++			{
++				response.setStatus(500,"internal server error");
++				response.setData("could not open image file");
++			}
++		}
++		else
++		{
++			response.setStatus(404,"not found");
++			response.setData("planet id not found");
++			qWarning() << "ERROR - could not find planet " << planet;
++			return;
++		}
++	}
++	else
++	{
++		//TODO some sort of service description?
++		response.writeRequestError("unsupported operation. GET: list, countrylist, planetlist, planetimage");
++	}
++}
++
++void LocationService::postImpl(const QByteArray& operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response)
++{
++	Q_UNUSED(data);
++
++	if (operation == "setlocationfields")
++	{
++		QString id = QString::fromUtf8(parameters.value("id"));
++
++		StelLocation loc;
++		if(!id.isEmpty())
++		{
++			//if an id is set, ignore everything else
++			//use an invoke here for reasons
++			QMetaObject::invokeMethod(locMgr,"locationForString",SERVICE_DEFAULT_INVOKETYPE,
++						  Q_RETURN_ARG(StelLocation, loc),
++						  Q_ARG(QString,id));
++
++			if(loc.isValid())
++			{
++				//set location
++				QMetaObject::invokeMethod(core, "moveObserverTo", SERVICE_DEFAULT_INVOKETYPE,
++							  Q_ARG(StelLocation, loc),
++							  Q_ARG(double,0.0) );
++
++				response.setData("ok");
++				return;
++			}
++			else
++			{
++				response.writeRequestError("invalid location id");
++				return;
++			}
++		}
++
++		//copy current loc
++		loc = core->getCurrentLocation();
++
++		//similar to StelScriptMainAPI::setObserverLocation
++		QString sLatitude = QString::fromUtf8(parameters.value("latitude"));
++		QString sLongitude = QString::fromUtf8(parameters.value("longitude"));
++		QString sAltitude = QString::fromUtf8(parameters.value("altitude"));
++
++		QString name = QString::fromUtf8(parameters.value("name"));
++		QString country = QString::fromUtf8(parameters.value("country"));
++		QString planet = QString::fromUtf8(parameters.value("planet"));
++
++		//check each field
++		bool doneSomething = false;
++		bool ok = false;
++		float latitude = sLatitude.toFloat(&ok);
++		if(ok && latitude != loc.latitude)
++		{
++			loc.latitude = latitude;
++			doneSomething = true;
++		}
++		float longitude = sLongitude.toFloat(&ok);
++		if(ok && longitude != loc.longitude)
++		{
++			loc.longitude = longitude;
++			doneSomething = true;
++		}
++		int altitude = sAltitude.toInt(&ok);
++		if(ok && altitude != loc.altitude)
++		{
++			loc.altitude = altitude;
++			doneSomething = true;
++		}
++		if(parameters.contains("name") && name != loc.name)
++		{
++			loc.name = name;
++			doneSomething = true;
++		}
++		if(!country.isEmpty() && country != loc.country)
++		{
++			loc.country = country;
++			doneSomething = true;
++		}
++
++		if(!planet.isEmpty() && loc.planetName != planet)
++		{
++			if(ssys->searchByName(planet))
++			{
++				//set planet
++				loc.planetName = planet;
++				doneSomething = true;
++			}
++		}
++
++		if(doneSomething)
++		{
++			//update the core
++			QMetaObject::invokeMethod(core,"moveObserverTo", SERVICE_DEFAULT_INVOKETYPE,
++						  Q_ARG(StelLocation, loc),
++						  Q_ARG(double, 0.0),
++						  Q_ARG(double, 0.0));
++		}
++
++		response.setData("ok");
++	}
++	else
++	{
++		//TODO some sort of service description?
++		response.writeRequestError("unsupported operation. POST: setlocation, setlocationfields");
++	}
++}
 === added file 'plugins/RemoteControl/src/LocationService.hpp'
 --- plugins/RemoteControl/src/LocationService.hpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/LocationService.hpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,56 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#ifndef LOCATIONSERVICE_HPP_
++#define LOCATIONSERVICE_HPP_
++
++#include "AbstractAPIService.hpp"
++
++class StelCore;
++class StelLocationMgr;
++class SolarSystem;
++
++//! @ingroup remoteControl
++//! Provides methods to look up location-related information, and change the current location
++//!
++//! @see \ref rcLocationService, LocationService
++class LocationService : public AbstractAPIService
++{
++	Q_OBJECT
++public:
++	LocationService(const QByteArray& serviceName, QObject* parent = 0);
++
++	virtual ~LocationService() {}
++
++protected:
++	//! @brief Implements the HTTP GET requests
++	//! @see \ref rcLocationServiceGET
++	virtual void getImpl(const QByteArray& operation,const APIParameters& parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
++	//! @brief Implements the HTTP POST requests
++	//! @see \ref rcLocationServicePOST
++	virtual void postImpl(const QByteArray &operation, const APIParameters& parameters, const QByteArray &data, APIServiceResponse &response) Q_DECL_OVERRIDE;
++private:
++	StelCore* core;
++	StelLocationMgr* locMgr;
++	SolarSystem* ssys;
++};
++
++
++
++#endif
 === added file 'plugins/RemoteControl/src/MainService.cpp'
 --- plugins/RemoteControl/src/MainService.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/MainService.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,622 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "MainService.hpp"
++
++#include "StelApp.hpp"
++#include "StelActionMgr.hpp"
++#include "StelCore.hpp"
++#include "LandscapeMgr.hpp"
++#include "StelLocaleMgr.hpp"
++#include "StelMainView.hpp"
++#include "StelModuleMgr.hpp"
++#include "StelMovementMgr.hpp"
++#include "StelObjectMgr.hpp"
++#include "StelPropertyMgr.hpp"
++#include "StelScriptMgr.hpp"
++#include "StelSkyCultureMgr.hpp"
++#include "StelTranslator.hpp"
++#include "StelUtils.hpp"
++
++#include <QJsonDocument>
++
++
++MainService::MainService(const QByteArray &serviceName, QObject *parent)
++	: AbstractAPIService(serviceName,parent),
++	  moveX(0),moveY(0),lastMoveUpdateTime(0)
++{
++	//100 should be more than enough
++	//this only has to emcompass events that occur between 2 status updates
++	actionCache.setCapacity(100);
++	propCache.setCapacity(100);
++
++	//this is run in the main thread
++	core = StelApp::getInstance().getCore();
++	actionMgr =  StelApp::getInstance().getStelActionManager();
++	lsMgr = GETSTELMODULE(LandscapeMgr);
++	localeMgr = &StelApp::getInstance().getLocaleMgr();
++	objMgr = &StelApp::getInstance().getStelObjectMgr();
++	mvmgr = GETSTELMODULE(StelMovementMgr);
++	propMgr = StelApp::getInstance().getStelPropertyManager();
++	scriptMgr = &StelApp::getInstance().getScriptMgr();
++	skyCulMgr = &StelApp::getInstance().getSkyCultureMgr();
++
++	connect(actionMgr,SIGNAL(actionToggled(QString,bool)),this,SLOT(actionToggled(QString,bool)));
++	connect(propMgr,SIGNAL(stelPropChanged(QString,QVariant)),this,SLOT(propertyChanged(QString,QVariant)));
++
++	Q_ASSERT(this->thread()==objMgr->thread());
++}
++
++void MainService::update(double deltaTime)
++{
++	bool xZero = qFuzzyIsNull(moveX);
++	bool yZero = qFuzzyIsNull(moveY);
++
++	//prevent sudden disconnects from moving endlessly
++	if((QDateTime::currentMSecsSinceEpoch() - lastMoveUpdateTime) > 1000)
++	{
++		if(!xZero || !yZero)
++			qDebug()<<"[MainService] move timeout";
++		moveX = moveY = .0f;
++	}
++
++	//Similar to StelMovementMgr::updateMotion
++
++	if(!xZero || !yZero)
++	{
++		double currentFov = mvmgr->getCurrentFov();
++		// the more it is zoomed, the lower the moving speed is (in angle)
++		double depl=0.00025*deltaTime*1000*currentFov;
++
++		float deltaAz = moveX;
++		float deltaAlt = moveY;
++
++		if (deltaAz<0)
++		{
++			deltaAz = -depl/30;
++			if (deltaAz<-0.2)
++				deltaAz = -0.2;
++		}
++		else
++		{
++			if (deltaAz>0)
++			{
++				deltaAz = (depl/30);
++				if (deltaAz>0.2)
++					deltaAz = 0.2;
++			}
++		}
++
++		if (deltaAlt<0)
++		{
++			deltaAlt = -depl/30;
++			if (deltaAlt<-0.2)
++				deltaAlt = -0.2;
++		}
++		else
++		{
++			if (deltaAlt>0)
++			{
++				deltaAlt = depl/30;
++				if (deltaAlt>0.2)
++					deltaAlt = 0.2;
++			}
++		}
++
++		mvmgr->panView(deltaAz,deltaAlt);
++
++		//this is required to enable maximal fps for smoothness
++		StelMainView::getInstance().thereWasAnEvent();
++	}
++}
++
++void MainService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
++{
++	if(operation=="status")
++	{
++		//a listing of the most common stuff that can change often
++
++		QString sActionId = QString::fromUtf8(parameters.value("actionId"));
++		bool actionOk;
++		int actionId = sActionId.toInt(&actionOk);
++
++		QString sPropId = QString::fromUtf8(parameters.value("propId"));
++		bool propOk;
++		int propId = sPropId.toInt(&propOk);
++
++		QJsonObject obj;
++
++		//// Location
++		const StelLocation& loc = core->getCurrentLocation();
++		{
++			QJsonObject obj2;
++			obj2.insert("name",loc.name);
++			obj2.insert("role",QString(loc.role));
++			obj2.insert("planet",loc.planetName);
++			obj2.insert("latitude",loc.latitude);
++			obj2.insert("longitude",loc.longitude);
++			obj2.insert("altitude",loc.altitude);
++			obj2.insert("country",loc.country);
++			obj2.insert("state",loc.state);
++			obj2.insert("landscapeKey",loc.landscapeKey);
++			obj.insert("location",obj2);
++		}
++
++		//// Time related stuff
++		{
++			double jday = core->getJD();
++			double deltaT = core->getDeltaT() * StelCore::JD_SECOND;
++
++			double gmtShift = localeMgr->getGMTShift(jday) / 24.0;
++
++			QString utcIso = StelUtils::julianDayToISO8601String(jday,true).append('Z');
++			QString localIso = StelUtils::julianDayToISO8601String(jday+gmtShift,true);
++
++			//time zone string
++			QString timeZone = localeMgr->getPrintableTimeZoneLocal(jday);
++
++			QJsonObject obj2;
++			obj2.insert("jday",jday);
++			obj2.insert("deltaT",deltaT);
++			obj2.insert("gmtShift",gmtShift);
++			obj2.insert("timeZone",timeZone);
++			obj2.insert("utc",utcIso);
++			obj2.insert("local",localIso);
++			obj2.insert("isTimeNow",core->getIsTimeNow());
++			obj2.insert("timerate",core->getTimeRate());
++			obj.insert("time",obj2);
++		}
++
++		//// Info about selected object (only primary)
++		{
++			QString infoStr;
++			QMetaObject::invokeMethod(this,"getInfoString",SERVICE_DEFAULT_INVOKETYPE,
++						  Q_RETURN_ARG(QString,infoStr));
++			obj.insert("selectioninfo",infoStr);
++		}
++
++		//// Info about current view
++		{
++			QJsonObject obj2;
++
++			// the aim fov may lie outside the min/max bounds, so constrain it
++			double fov = mvmgr->getAimFov();
++			if(fov < mvmgr->getMinFov())
++				fov = mvmgr->getMinFov();
++			else if (fov>mvmgr->getMaxFov())
++				fov = mvmgr->getMaxFov();
++
++			obj2.insert("fov",fov);
++
++			obj.insert("view",obj2);
++		}
++
++		//// Info about changed actions & props (if requested)
++		{
++			if(actionOk)
++				obj.insert("actionChanges",getActionChangesSinceID(actionId));
++			if(propOk)
++				obj.insert("propertyChanges",getPropertyChangesSinceID(propId));
++		}
++
++		response.writeJSON(QJsonDocument(obj));
++	}
++	else if(operation=="plugins")
++	{
++		// Retrieve list of plugins
++
++		QJsonObject mainObj;
++
++		StelModuleMgr& modMgr = StelApp::getInstance().getModuleMgr();
++		foreach(const StelModuleMgr::PluginDescriptor& desc, modMgr.getPluginsList())
++		{
++			QJsonObject pluginObj,infoObj;
++			pluginObj.insert("loadAtStartup", desc.loadAtStartup);
++			pluginObj.insert("loaded", desc.loaded);
++
++			infoObj.insert("authors", desc.info.authors);
++			infoObj.insert("contact", desc.info.contact);
++			infoObj.insert("description", desc.info.description);
++			infoObj.insert("displayedName", desc.info.displayedName);
++			infoObj.insert("startByDefault", desc.info.startByDefault);
++			infoObj.insert("version", desc.info.version);
++
++			pluginObj.insert("info",infoObj);
++			mainObj.insert(desc.info.id, pluginObj);
++		}
++
++		response.writeJSON(QJsonDocument(mainObj));
++	}
++	else
++	{
++		//TODO some sort of service description?
++		response.writeRequestError("unsupported operation. GET: status, plugins");
++	}
++}
++
++void MainService::postImpl(const QByteArray& operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response)
++{
++	Q_UNUSED(data);
++
++	if(operation == "time")
++	{
++		bool doneSomething = false;
++		bool ok;
++
++		//set the time + timerate
++		{
++			const QByteArray& raw = parameters.value("time");
++			if(!raw.isEmpty())
++			{
++				//parse time and set it
++				double jday = QString(raw).toDouble(&ok);
++				if(ok)
++				{
++					//check for invalid double (NaN, inf...)
++					//this will crash the app if it is allowed
++					if(qIsNaN(jday) || qIsInf(jday))
++					{
++						qWarning()<<"[RemoteControl] Prevented setting invalid time"<<jday<<", does the web interface have a bug?";
++						response.setData("error: invalid time value");
++						return;
++					}
++
++					doneSomething = true;
++					//set new time
++					QMetaObject::invokeMethod(core,"setJD", SERVICE_DEFAULT_INVOKETYPE,
++								  Q_ARG(double,jday));
++				}
++			}
++		}
++		{
++			const QByteArray& raw = parameters.value("timerate");
++			if(!raw.isEmpty())
++			{
++				//parse timerate and set it
++				double rate = QString(raw).toDouble(&ok);
++				if(ok)
++				{
++					doneSomething = true;
++					//set new time rate
++					QMetaObject::invokeMethod(core,"setTimeRate", SERVICE_DEFAULT_INVOKETYPE,
++								  Q_ARG(double,rate));
++				}
++			}
++		}
++
++		if(doneSomething)
++			response.setData("ok");
++		else
++			response.setData("error: invalid parameters, use time/timerate as double values");
++	}
++	else if(operation == "focus")
++	{
++		QString target = QString::fromUtf8(parameters.value("target"));
++
++		//check target string first
++		if(target.isEmpty())
++		{
++			if(parameters.value("position").isEmpty())
++			{
++				//no parameters = clear focus
++				target = "";
++			}
++			else
++			{
++				//parse position
++				QJsonDocument doc = QJsonDocument::fromJson(parameters.value("position"));
++				QJsonArray arr = doc.array();
++				if(arr.size() == 3)
++				{
++					Vec3d pos;
++					pos[0] = arr.at(0).toDouble();
++					pos[1] = arr.at(1).toDouble();
++					pos[2] = arr.at(2).toDouble();
++
++					//deselect and move
++					QMetaObject::invokeMethod(this,"focusPosition", SERVICE_DEFAULT_INVOKETYPE,
++								  Q_ARG(Vec3d,pos));
++					response.setData("ok");
++					return;
++				}
++
++				response.writeRequestError("invalid position format");
++				return;
++			}
++		}
++
++		bool result;
++		QMetaObject::invokeMethod(this,"focusObject",SERVICE_DEFAULT_INVOKETYPE,
++					  Q_RETURN_ARG(bool,result),
++					  Q_ARG(QString,target));
++
++		response.setData(result ? "true" : "false");
++	}
++	else if(operation == "move")
++	{
++		QString xs = QString::fromUtf8(parameters.value("x"));
++		QString ys = QString::fromUtf8(parameters.value("y"));
++
++		bool xOk,yOk;
++		float x = xs.toInt(&xOk);
++		float y = ys.toInt(&yOk);
++
++		if(xOk || yOk)
++		{
++			QMetaObject::invokeMethod(this,"updateMovement", SERVICE_DEFAULT_INVOKETYPE,
++						  Q_ARG(float,x),
++						  Q_ARG(float,y),
++						  Q_ARG(bool,xOk),
++						  Q_ARG(bool,yOk));
++
++			response.setData("ok");
++		}
++		else
++			response.writeRequestError("requires x or y parameter");
++	}
++	else if (operation == "fov")
++	{
++		QString fov = QString::fromUtf8(parameters.value("fov"));
++		bool ok;
++		double dFov = fov.toDouble(&ok);
++
++		if(fov.isEmpty() || !ok)
++		{
++			response.writeRequestError("requires fov parameter");
++			return;
++		}
++
++		QMetaObject::invokeMethod(this,"setFov",SERVICE_DEFAULT_INVOKETYPE,
++					  Q_ARG(double,dFov));
++
++		response.setData("ok");
++	}
++	else
++	{
++		//TODO some sort of service description?
++		response.writeRequestError("unsupported operation. POST: time,focus,move,fov");
++	}
++}
++
++StelObjectP MainService::getSelectedObject()
++{
++	const QList<StelObjectP>& list = objMgr->getSelectedObject();
++	if(list.isEmpty())
++		return StelObjectP();
++	return list.first();
++}
++
++QString MainService::getInfoString()
++{
++	StelObjectP selectedObject = getSelectedObject();
++	if(selectedObject.isNull())
++		return QString();
++	return selectedObject->getInfoString(core,StelObject::AllInfo | StelObject::NoFont);
++}
++
++bool MainService::focusObject(const QString &name)
++{
++	//StelDialog::gotoObject
++
++	//if name is empty, unselect
++	if(name.isEmpty())
++	{
++		objMgr->unSelect();
++		return true;
++	}
++
++	bool result = false;
++	if (objMgr->findAndSelectI18n(name) || objMgr->findAndSelect(name))
++	{
++		const QList<StelObjectP> newSelected = objMgr->getSelectedObject();
++		if (!newSelected.empty())
++		{
++			// Can't point to home planet
++			if (newSelected[0]->getEnglishName()!=core->getCurrentLocation().planetName)
++			{
++				mvmgr->moveToObject(newSelected[0], mvmgr->getAutoMoveDuration());
++				mvmgr->setFlagTracking(true);
++				result = true;
++			}
++			else
++			{
++				objMgr->unSelect();
++			}
++		}
++	}
++	return result;
++}
++
++void MainService::focusPosition(const Vec3d &pos)
++{
++	objMgr->unSelect();
++	mvmgr->moveToJ2000(pos, mvmgr->getAutoMoveDuration());
++}
++
++void MainService::updateMovement(float x, float y, bool xUpdated, bool yUpdated)
++{
++	if(xUpdated)
++	{
++		this->moveX = x;
++	}
++	if(yUpdated)
++	{
++		this->moveY = y;
++	}
++	qint64 curTime = QDateTime::currentMSecsSinceEpoch();
++	//qDebug()<<"updateMove"<<x<<y<<(curTime-lastMoveUpdateTime);
++	lastMoveUpdateTime = curTime;
++}
++
++void MainService::setFov(double fov)
++{
++	//TODO calculate a better move duration here
++	mvmgr->zoomTo(fov,0.25f);
++}
++
++void MainService::actionToggled(const QString &id, bool val)
++{
++	actionMutex.lock();
++	actionCache.append(ActionCacheEntry(id,val));
++	if(!actionCache.areIndexesValid())
++	{
++		//in theory, this can happen, but practically not so much
++		qWarning()<<"Action cache indices invalid";
++		actionCache.clear();
++	}
++	actionMutex.unlock();
++}
++
++void MainService::propertyChanged(const QString &id, const QVariant &val)
++{
++	propMutex.lock();
++	propCache.append(PropertyCacheEntry(id,val));
++	if(!propCache.areIndexesValid())
++	{
++		//in theory, this can happen, but practically not so much
++		qWarning()<<"Property cache indices invalid";
++		propCache.clear();
++	}
++	propMutex.unlock();
++}
++
++QJsonObject MainService::getActionChangesSinceID(int changeId)
++{
++	//changeId is the last id the interface is available
++	//or -2 if the interface just started
++	// -1 means the initial state was set
++
++	QJsonObject obj;
++	QJsonObject changes;
++	int newId = changeId;
++
++
++	actionMutex.lock();
++	if(actionCache.isEmpty())
++	{
++		if(changeId!=-1)
++		{
++			//this is either the initial state (-2) or
++			//something is "broken", probably from an existing web interface that reconnected after restart
++			//force a full reload
++
++			foreach(StelAction* ac, actionMgr->getActionList())
++			{
++				if(ac->isCheckable())
++				{
++					changes.insert(ac->getId(),ac->isChecked());
++				}
++			}
++			newId = -1;
++		}
++	}
++	else
++	{
++		if(changeId > actionCache.lastIndex() || changeId < (actionCache.firstIndex()-1))
++		{
++			//this is either the initial state (-2) or
++			//"broken" state again, force full reload
++			foreach(StelAction* ac, actionMgr->getActionList())
++			{
++				if(ac->isCheckable())
++				{
++					changes.insert(ac->getId(),ac->isChecked());
++				}
++			}
++			newId = actionCache.lastIndex();
++		}
++		else if(changeId < actionCache.lastIndex())
++		{
++			//create a "diff" between changeId to lastIndex
++			for(int i = changeId+1;i<=actionCache.lastIndex();++i)
++			{
++				const ActionCacheEntry& e = actionCache.at(i);
++				changes.insert(e.action,e.val);
++			}
++			newId = actionCache.lastIndex();
++		}
++		//else no changes happened, interface is at current state!
++	}
++	actionMutex.unlock();
++
++	obj.insert("changes",changes);
++	obj.insert("id",newId);
++
++	return obj;
++}
++
++QJsonObject MainService::getPropertyChangesSinceID(int changeId)
++{
++	//changeId is the last id the interface is available
++	//or -2 if the interface just started
++	// -1 means the initial state was set
++	QJsonObject obj;
++	QJsonObject changes;
++	int newId = changeId;
++
++	propMutex.lock();
++	if(propCache.isEmpty())
++	{
++		if(changeId!=-1)
++		{
++			//this is either the initial state (-2) or
++			//something is "broken", probably from an existing web interface that reconnected after restart
++			//force a full reload
++			const StelPropertyMgr::StelPropertyMap& map = propMgr->getPropertyMap();
++			for(StelPropertyMgr::StelPropertyMap::const_iterator it = map.constBegin();
++			    it!=map.constEnd();++it)
++			{
++				changes.insert(it.key(), QJsonValue::fromVariant((*it)->getValue()));
++			}
++			newId = -1;
++		}
++	}
++	else
++	{
++		if(changeId > propCache.lastIndex() || changeId < (propCache.firstIndex()-1))
++		{
++			//this is either the initial state (-2) or
++			//"broken" state again, force full reload
++			const StelPropertyMgr::StelPropertyMap& map = propMgr->getPropertyMap();
++			for(StelPropertyMgr::StelPropertyMap::const_iterator it = map.constBegin();
++			    it!=map.constEnd();++it)
++			{
++				changes.insert(it.key(), QJsonValue::fromVariant((*it)->getValue()));
++			}
++			newId = propCache.lastIndex();
++		}
++		else if(changeId < propCache.lastIndex())
++		{
++			//create a "diff" between changeId to lastIndex
++			for(int i = changeId+1;i<=propCache.lastIndex();++i)
++			{
++				const PropertyCacheEntry& e = propCache.at(i);
++				changes.insert(e.id,QJsonValue::fromVariant(e.val));
++			}
++			newId = propCache.lastIndex();
++		}
++		//else no changes happened, interface is at current state!
++	}
++	propMutex.unlock();
++
++	obj.insert("changes",changes);
++	obj.insert("id",newId);
++
++	return obj;
++}
 === added file 'plugins/RemoteControl/src/MainService.hpp'
 --- plugins/RemoteControl/src/MainService.hpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/MainService.hpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,122 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#ifndef MAINSERVICE_HPP_
++#define MAINSERVICE_HPP_
++
++#include "AbstractAPIService.hpp"
++
++#include "StelObjectType.hpp"
++#include "VecMath.hpp"
++
++#include <QContiguousCache>
++#include <QJsonObject>
++#include <QMutex>
++
++class StelCore;
++class StelActionMgr;
++class LandscapeMgr;
++class StelLocaleMgr;
++class StelMovementMgr;
++class StelObjectMgr;
++class StelPropertyMgr;
++class StelScriptMgr;
++class StelSkyCultureMgr;
++
++//! @ingroup remoteControl
++//! Implements the main API services, including the \c status operation which can be repeatedly polled to find the current state of the main program,
++//! including time, view, location, StelAction and StelProperty state changes, movement, script status ...
++//!
++//! @see @ref rcMainService
++class MainService : public AbstractAPIService
++{
++	Q_OBJECT
++public:
++	MainService(const QByteArray& serviceName, QObject* parent = 0);
++
++	virtual ~MainService() {}
++
++	//! Used to implement move functionality
++	virtual void update(double deltaTime) Q_DECL_OVERRIDE;
++
++protected:
++	//! @brief Implements the GET operations
++	//! @see @ref rcMainServiceGET
++	virtual void getImpl(const QByteArray& operation,const APIParameters &parameters, APIServiceResponse& response) Q_DECL_OVERRIDE;
++	//! @brief Implements the HTTP POST operations
++	//! @see @ref rcMainServicePOST
++	virtual void postImpl(const QByteArray &operation, const APIParameters &parameters, const QByteArray &data, APIServiceResponse &response) Q_DECL_OVERRIDE;
++
++private slots:
++	StelObjectP getSelectedObject();
++
++	//! Returns the info string of the currently selected object
++	QString getInfoString();
++
++	//! Like StelDialog::gotoObject
++	bool focusObject(const QString& name);
++	void focusPosition(const Vec3d& pos);
++
++	void updateMovement(float x, float y, bool xUpdated, bool yUpdated);
++	void setFov(double fov);
++
++	void actionToggled(const QString& id, bool val);
++	void propertyChanged(const QString& id, const QVariant& val);
++
++private:
++	StelCore* core;
++	StelActionMgr* actionMgr;
++	LandscapeMgr* lsMgr;
++	StelLocaleMgr* localeMgr;
++	StelMovementMgr* mvmgr;
++	StelObjectMgr* objMgr;
++	StelPropertyMgr* propMgr;
++	StelScriptMgr* scriptMgr;
++	StelSkyCultureMgr* skyCulMgr;
++
++	float moveX,moveY;
++	qint64 lastMoveUpdateTime;
++
++	struct ActionCacheEntry
++	{
++		ActionCacheEntry(const QString& str,bool val) : action(str),val(val) {}
++		QString action;
++		bool val;
++	};
++
++	//lists the recently toggled actions - this is a pseudo-circular buffer
++	QContiguousCache<ActionCacheEntry> actionCache;
++	QMutex actionMutex;
++	QJsonObject getActionChangesSinceID(int changeId);
++
++	struct PropertyCacheEntry
++	{
++		PropertyCacheEntry(const QString& str, const QVariant& val) : id(str),val(val) {}
++		QString id;
++		QVariant val;
++	};
++	QContiguousCache<PropertyCacheEntry> propCache;
++	QMutex propMutex;
++	QJsonObject getPropertyChangesSinceID(int changeId);
++
++};
++
++
++
++#endif
 === added file 'plugins/RemoteControl/src/ObjectService.cpp'
 --- plugins/RemoteControl/src/ObjectService.cpp	1970-01-01 00:00:00 +0000
 +++ plugins/RemoteControl/src/ObjectService.cpp	2016-06-12 13:59:22 +0000
@@ -0,0 +1,216 @@
++/*
++ * Stellarium Remote Control plugin
++ * Copyright (C) 2015 Florian Schaukowitsch
++ *
++ * This program is free software; you can redistribute it and/or
++ * modify it under the terms of the GNU General Public License
++ * as published by the Free Software Foundation; either version 2
++ * of the License, or (at your option) any later version.
++ *
++ * This program is distributed in the hope that it will be useful,
++ * but WITHOUT ANY WARRANTY; without even the implied warranty of
++ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++ * GNU General Public License for more details.
++ *
++ * You should have received a copy of the GNU General Public License
++ * along with this program; if not, write to the Free Software
++ * Foundation, Inc., 51 Franklin Street, Suite 500, Boston, MA  02110-1335, USA.
++ */
++
++#include "ObjectService.hpp"
++
++#include "SearchDialog.hpp"
++#include "StelApp.hpp"
++#include "StelCore.hpp"
++#include "StelObjectMgr.hpp"
++#include "StelTranslator.hpp"
++
++#include <QEventLoop>
++#include <QJsonArray>
++#include <QJsonDocument>
++#include <QJsonObject>
++#include <QSettings>
++#include <QMutex>
++#include <QThreadPool>
++#include <QRunnable>
++#include <QWaitCondition>
++
++ObjectService::ObjectService(const QByteArray &serviceName, QObject *parent) : AbstractAPIService(serviceName,parent)
++{
++	//this is run in the main thread
++	core = StelApp::getInstance().getCore();
++	objMgr = &StelApp::getInstance().getStelObjectMgr();
++	useStartOfWords = StelApp::getInstance().getSettings()->value("search/flag_start_words", false).toBool();
++}
++
++QStringList ObjectService::performSearch(const QString &text)
++{
++	//perform substitution greek text --> symbol
++	QString greekText = substituteGreek(text);
++
++	QStringList matches;
++	if(greekText != text) {
++		matches = objMgr->listMatchingObjectsI18n(text, 3, useStartOfWords);
++		matches += objMgr->listMatchingObjects(text, 3, useStartOfWords);
++		matches += objMgr->listMatchingObjectsI18n(greekText, (8 - matches.size()), useStartOfWords);
++	} else {
++		//no greek replaced, saves 1 call
++		matches = objMgr->listMatchingObjectsI18n(text, 5, useStartOfWords);
++		matches += objMgr->listMatchingObjects(text, 5, useStartOfWords);
++	}
++
++	return matches;
++}
++
++QString ObjectService::substituteGreek(const QString &text)
++{
++	//use the searchdialog static method for that
++	return SearchDialog::substituteGreek(text);
++}
++
++void ObjectService::getImpl(const QByteArray& operation, const APIParameters &parameters, APIServiceResponse &response)
++{
++	//make sure the object still "lives" in the main Stel thread, even though
++	//we may currently be in the HTTP thread
++	Q_ASSERT(this->thread() == objMgr->thread());
++
++	if(operation=="find")
++	{
++		//this may contain greek or other unicode letters
++		QString str = QString::fromUtf8(parameters.value("str"));
++		str = str.trimmed().toLower();
++
++		if(str.isEmpty())
++		{
++			response.writeRequestError("empty search string");
++			return;
++		}
++
++		//qDebug()<<"Search string"<<str;
++
++		QStringList results;
++		QMetaObject::invokeMethod(this,"performSearch",SERVICE_DEFAULT_INVOKETYPE,
++					  Q_RETURN_ARG(QStringList,results),
++					  Q_ARG(QString,str));
++