History

Merge branch 'master' of https://github.com/highfidelity/hifi into 19561

Thijs Wenker committed 12 years ago

Commit a33c18c2 parents cf1baaf 76a8afa15 files · +322 −31Browse files

Showing the changes to interface/src/Application.cpp (1 of 15 files). Show all

Unified · Split

interface/src/Application.cpp+11−0
@@ -76,6 +76,8 @@ · 75 unmodified lines
7676 #include "scripting/ClipboardScriptingInterface.h"
7777 #include "scripting/MenuScriptingInterface.h"
7878 #include "scripting/SettingsScriptingInterface.h"
79+#include "scripting/WindowScriptingInterface.h"
80+#include "scripting/LocationScriptingInterface.h"
7981
8082 #include "ui/InfoView.h"
8183 #include "ui/Snapshot.h"
@@ -3404,6 +3406,15 @@ ScriptEngine* Application::loadScript(const QString& scriptName, bool loadScript · 3322 unmodified lines
34043406 connect(scriptEngine, SIGNAL(finished(const QString&)), clipboardScriptable, SLOT(deleteLater()));
34053407
34063408 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+
34073418 scriptEngine->registerGlobalObject("Menu", MenuScriptingInterface::getInstance());
34083419 scriptEngine->registerGlobalObject("Settings", SettingsScriptingInterface::getInstance());
34093420 scriptEngine->registerGlobalObject("AudioDevice", AudioDeviceScriptingInterface::getInstance());

Keyboard shortcuts

General

Show keyboard shortcuts
?
Focus the current search
/

Issues and pull requests

Open filters
f

Issues, pull requests and Inbox

Select next item
j↓
Select previous item
k↑
Open selected item
Enter
Dismiss filters or clear selection
Esc

Repository code

Go to file
t