Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all
Unified · Split
| @@ -76,6 +76,8 @@ · 75 unmodified lines | |||
| 76 | #include "scripting/ClipboardScriptingInterface.h" | 76 | #include "scripting/ClipboardScriptingInterface.h" |
| 77 | #include "scripting/MenuScriptingInterface.h" | 77 | #include "scripting/MenuScriptingInterface.h" |
| 78 | #include "scripting/SettingsScriptingInterface.h" | 78 | #include "scripting/SettingsScriptingInterface.h" |
| 79 | #include "scripting/WindowScriptingInterface.h" | ||
| 80 | #include "scripting/LocationScriptingInterface.h" | ||
| 79 | 81 | ||
| 80 | #include "ui/InfoView.h" | 82 | #include "ui/InfoView.h" |
| 81 | #include "ui/Snapshot.h" | 83 | #include "ui/Snapshot.h" |
| @@ -3404,6 +3406,15 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 3322 unmodified lines | |||
| 3404 | connect(scriptEngine, SIGNAL(finished(const QString&)), clipboardScriptable, SLOT(deleteLater())); | 3406 | connect(scriptEngine, SIGNAL(finished(const QString&)), clipboardScriptable, SLOT(deleteLater())); |
| 3405 | 3407 | ||
| 3406 | scriptEngine->registerGlobalObject("Overlays", &_overlays); | 3408 | scriptEngine->registerGlobalObject("Overlays", &_overlays); |
| 3409 | |||
| 3410 | QScriptValue windowValue = scriptEngine->registerGlobalObject("Window", WindowScriptingInterface::getInstance()); | ||
| 3411 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, | ||
| 3412 | LocationScriptingInterface::locationSetter, windowValue); | ||
| 3413 | |||
| 3414 | // register `location` on the global object. | ||
| 3415 | scriptEngine->registerGetterSetter("location", LocationScriptingInterface::locationGetter, | ||
| 3416 | LocationScriptingInterface::locationSetter); | ||
| 3417 | |||
| 3407 | scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance()); | 3418 | scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance()); |
| 3408 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); | 3419 | scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance()); |
| 3409 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); | 3420 | scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance()); |