History

Merge conflicts

vladest committed 9 years ago

Commit 38295ab2 parents 15f8bc0 06ab8dd245 files · +12579 −6790Browse files

Showing the changes to interface/src/scripting/WindowScriptingInterface.cpp (1 of 245 files). Show all

Unified · Split

interface/src/scripting/WindowScriptingInterface.cpp+8−0
@@ -398,6 +398,10 @@ void WindowScriptingInterface::showAssetServer(const QString& upload) { · 397 unmodified lines
398 QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));398 QMetaObject::invokeMethod(qApp, "showAssetServerWidget", Qt::QueuedConnection, Q_ARG(QString, upload));
399}399}
400 400
401QString WindowScriptingInterface::checkVersion() {
402 return QCoreApplication::applicationVersion();
403}
404
401int WindowScriptingInterface::getInnerWidth() {405int WindowScriptingInterface::getInnerWidth() {
402 return qApp->getWindow()->geometry().width();406 return qApp->getWindow()->geometry().width();
403}407}
@@ -428,6 +432,10 @@ void WindowScriptingInterface::takeSnapshot(bool notify, bool includeAnimated, f · 24 unmodified lines
428 qApp->takeSnapshot(notify, includeAnimated, aspectRatio);432 qApp->takeSnapshot(notify, includeAnimated, aspectRatio);
429}433}
430 434
435void WindowScriptingInterface::takeSecondaryCameraSnapshot() {
436 qApp->takeSecondaryCameraSnapshot();
437}
438
431void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) {439void WindowScriptingInterface::shareSnapshot(const QString& path, const QUrl& href) {
432 qApp->shareSnapshot(path, href);440 qApp->shareSnapshot(path, href);
433}441}