From ea10dc176a4bcb8c732a866e226a5ff1cae862a2 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 29 May 2018 17:38:02 -0700
Subject: [PATCH 1/2] adding back reload scripts
---
interface/src/AboutUtil.cpp | 16 ++++++++--------
interface/src/AboutUtil.h | 19 ++++++++-----------
interface/src/Application.cpp | 8 +++++++-
3 files changed, 23 insertions(+), 20 deletions(-)
diff --git a/interface/src/AboutUtil.cpp b/interface/src/AboutUtil.cpp
index 5179897443..43b4ac1ff4 100644
--- a/interface/src/AboutUtil.cpp
+++ b/interface/src/AboutUtil.cpp
@@ -20,9 +20,9 @@
#include <OffscreenQmlDialog.h>
AboutUtil::AboutUtil(QObject *parent) : QObject(parent) {
- QLocale locale_;
- m_DateConverted = QDate::fromString(BuildInfo::BUILD_TIME, "dd/MM/yyyy").
- toString(locale_.dateFormat(QLocale::ShortFormat));
+ QLocale locale;
+ _dateConverted = QDate::fromString(BuildInfo::BUILD_TIME, "dd/MM/yyyy").
+ toString(locale.dateFormat(QLocale::ShortFormat));
}
AboutUtil *AboutUtil::getInstance()
@@ -31,17 +31,17 @@ AboutUtil *AboutUtil::getInstance()
return &instance;
}
-QString AboutUtil::buildDate() const
+QString AboutUtil::getBuildDate() const
{
- return m_DateConverted;
+ return _dateConverted;
}
-QString AboutUtil::buildVersion() const
+QString AboutUtil::getBuildVersion() const
{
return BuildInfo::VERSION;
}
-QString AboutUtil::qtVersion() const
+QString AboutUtil::getQtVersion() const
{
return qVersion();
}
@@ -49,7 +49,7 @@ QString AboutUtil::qtVersion() const
void AboutUtil::openUrl(const QString& url) const {
auto tabletScriptingInterface = DependencyManager::get<TabletScriptingInterface>();
- auto tablet = dynamic_cast<TabletProxy*>(tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system"));
+ auto tablet = tabletScriptingInterface->getTablet("com.highfidelity.interface.tablet.system");
auto hmd = DependencyManager::get<HMDScriptingInterface>();
auto offscreenUi = DependencyManager::get<OffscreenUi>();
diff --git a/interface/src/AboutUtil.h b/interface/src/AboutUtil.h
index 9b65b887b9..06c04cc9df 100644
--- a/interface/src/AboutUtil.h
+++ b/interface/src/AboutUtil.h
@@ -16,27 +16,24 @@
#include <QObject>
class AboutUtil : public QObject {
-
Q_OBJECT
- Q_PROPERTY(QString buildDate READ buildDate CONSTANT)
- Q_PROPERTY(QString buildVersion READ buildVersion CONSTANT)
- Q_PROPERTY(QString qtVersion READ qtVersion CONSTANT)
-
- AboutUtil(QObject* parent = nullptr);
+ Q_PROPERTY(QString buildDate READ getBuildDate CONSTANT)
+ Q_PROPERTY(QString buildVersion READ getBuildVersion CONSTANT)
+ Q_PROPERTY(QString qtVersion READ getQtVersion CONSTANT)
public:
static AboutUtil* getInstance();
~AboutUtil() {}
- QString buildDate() const;
- QString buildVersion() const;
- QString qtVersion() const;
+ QString getBuildDate() const;
+ QString getBuildVersion() const;
+ QString getQtVersion() const;
public slots:
void openUrl(const QString &url) const;
private:
-
- QString m_DateConverted;
+ AboutUtil(QObject* parent = nullptr);
+ QString _dateConverted;
};
#endif // hifi_AboutUtil_h
diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp
index c8559f660f..d5e67579b7 100644
--- a/interface/src/Application.cpp
+++ b/interface/src/Application.cpp
@@ -3642,7 +3642,6 @@ void Application::keyPressEvent(QKeyEvent* event) {
_keysPressed.insert(event->key());
_controllerScriptingInterface->emitKeyPressEvent(event); // send events to any registered scripts
-
// if one of our scripts have asked to capture this event, then stop processing it
if (_controllerScriptingInterface->isKeyCaptured(event)) {
return;
@@ -3727,6 +3726,13 @@ void Application::keyPressEvent(QKeyEvent* event) {
}
break;
+ case Qt::Key_R:
+ if (isMeta && !event->isAutoRepeat()) {
+ DependencyManager::get<ScriptEngines>()->reloadAllScripts();
+ DependencyManager::get<OffscreenUi>()->clearCache();
+ }
+ break;
+
case Qt::Key_Asterisk:
Menu::getInstance()->triggerOption(MenuOption::DefaultSkybox);
break;
From 543a721a11f238e6b857ee45d44a64b545f18924 Mon Sep 17 00:00:00 2001
From: Dante Ruiz <danteruiz102@gmail.com>
Date: Tue, 29 May 2018 17:55:42 -0700
Subject: [PATCH 2/2] fix headers
---
interface/src/AboutUtil.cpp | 20 +++++++++-----------
1 file changed, 9 insertions(+), 11 deletions(-)
diff --git a/interface/src/AboutUtil.cpp b/interface/src/AboutUtil.cpp
index 43b4ac1ff4..634e52b481 100644
--- a/interface/src/AboutUtil.cpp
+++ b/interface/src/AboutUtil.cpp
@@ -8,16 +8,18 @@
// Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
//
+
+#include "AboutUtil.h"
#include <QDate>
#include <QLocale>
-#include "AboutUtil.h"
-#include "BuildInfo.h"
#include <ui/TabletScriptingInterface.h>
+#include <OffscreenQmlDialog.h>
+
+#include "BuildInfo.h"
#include "DependencyManager.h"
#include "scripting/HMDScriptingInterface.h"
#include "Application.h"
-#include <OffscreenQmlDialog.h>
AboutUtil::AboutUtil(QObject *parent) : QObject(parent) {
QLocale locale;
@@ -25,24 +27,20 @@ AboutUtil::AboutUtil(QObject *parent) : QObject(parent) {
toString(locale.dateFormat(QLocale::ShortFormat));
}
-AboutUtil *AboutUtil::getInstance()
-{
+AboutUtil *AboutUtil::getInstance() {
static AboutUtil instance;
return &instance;
}
-QString AboutUtil::getBuildDate() const
-{
+QString AboutUtil::getBuildDate() const {
return _dateConverted;
}
-QString AboutUtil::getBuildVersion() const
-{
+QString AboutUtil::getBuildVersion() const {
return BuildInfo::VERSION;
}
-QString AboutUtil::getQtVersion() const
-{
+QString AboutUtil::getQtVersion() const {
return qVersion();
}