Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-07 01:09:27 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

enabled version check

Browse source
This commit is contained in:
Elisa Lupin-Jimenez 2017-08-18 10:49:40 -07:00
parent 4c28b9f09a
commit 65f876acf3
3 changed files with 5 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/src/scripting/WindowScriptingInterface.cpp
View file

@ -264,8 +264,8 @@ void WindowScriptingInterface::showAssetServer(const QString& upload) {
QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload)); QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
} }
int WindowScriptingInterface::checkVersion() { QString WindowScriptingInterface::checkVersion() {
return QCoreApplication::applicationVersion().toInt(); return QCoreApplication::applicationVersion();
} }
int WindowScriptingInterface::getInnerWidth() { int WindowScriptingInterface::getInnerWidth() {

2
interface/src/scripting/WindowScriptingInterface.h
View file

@ -58,7 +58,7 @@ public slots:
QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); QScriptValue save(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
QScriptValue browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = ""); QScriptValue browseAssets(const QString& title = "", const QString& directory = "", const QString& nameFilter = "");
void showAssetServer(const QString& upload = ""); void showAssetServer(const QString& upload = "");
int checkVersion(); QString checkVersion();
void copyToClipboard(const QString& text); void copyToClipboard(const QString& text);
void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f); void takeSnapshot(bool notify = true, bool includeAnimated = false, float aspectRatio = 0.0f);
void takeSecondaryCameraSnapshot(); void takeSecondaryCameraSnapshot();

4
unpublishedScripts/marketplace/blocks/blocksApp.js
View file

@ -18,10 +18,10 @@
var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg"; var APP_ICON = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/blocks-i.svg";
try { try {
print("Current Interface version: " + Script.checkVersion()); print("Current Interface version: " + Window.checkVersion());
} catch(err) { } catch(err) {
print("Outdated Interface version does not support Blocks"); print("Outdated Interface version does not support Blocks");
APP_URL = null; APP_URL = "https://hifi-content.s3.amazonaws.com/elisalj/blocks/updateToBlocks.html";
} }
var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system"); var tablet = Tablet.getTablet("com.highfidelity.interface.tablet.system");