From 7489505f998e4fda6266584fd43aee3900b0c315 Mon Sep 17 00:00:00 2001 From: Kasen IO Date: Thu, 26 Dec 2019 22:27:58 -0500 Subject: [PATCH] Updated whitelist info and name to include QML. --- ...tityScriptWhitelist.qml => EntityScriptQMLWhitelist.qml} | 6 ++++-- interface/src/Menu.cpp | 6 ++---- interface/src/Menu.h | 2 +- 3 files changed, 7 insertions(+), 7 deletions(-) rename interface/resources/qml/hifi/dialogs/security/{EntityScriptWhitelist.qml => EntityScriptQMLWhitelist.qml} (95%) diff --git a/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml similarity index 95% rename from interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml rename to interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml index e5c3c10176..aa30b5d014 100644 --- a/interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml +++ b/interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml @@ -1,5 +1,5 @@ // -// ScriptWhitelist.qml +// EntityScriptQMLWhitelist.qml // interface/resources/qml/hifi/dialogs/security // // Created by Kasen IO on 2019.12.05 | realities.dev | kasenvr@gmail.com @@ -145,7 +145,9 @@ Rectangle { https://google.com/ https://bing.com/ https://mydomain.here/ - \nEnsure there are no spaces or whitespace." + \nEnsure there are no spaces or whitespace. + \nFor QML files, you can only whitelist each file individually + ending with '.qml'." // Text size size: 16; // Style diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index b57675fb62..1be67ef188 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -288,13 +288,12 @@ Menu::Menu() { }); // Settings > Entity Script Whitelist - action = addActionToQMenuAndActionHash(settingsMenu, "Entity Script Whitelist"); + action = addActionToQMenuAndActionHash(settingsMenu, "Entity Script / QML Whitelist"); connect(action, &QAction::triggered, [] { auto tablet = DependencyManager::get()->getTablet("com.highfidelity.interface.tablet.system"); auto hmd = DependencyManager::get(); - DependencyManager::get()->clearCache(); - tablet->pushOntoStack("hifi/dialogs/security/EntityScriptWhitelist.qml"); + tablet->pushOntoStack("hifi/dialogs/security/EntityScriptQMLWhitelist.qml"); if (!hmd->getShouldShowTablet()) { hmd->toggleShouldShowTablet(); @@ -772,7 +771,6 @@ Menu::Menu() { // Help > About High Fidelity action = addActionToQMenuAndActionHash(helpMenu, "About High Fidelity"); connect(action, &QAction::triggered, [] { - DependencyManager::get()->clearCache(); qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"), QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog"); }); diff --git a/interface/src/Menu.h b/interface/src/Menu.h index 37b3f971fc..1d6c010a05 100644 --- a/interface/src/Menu.h +++ b/interface/src/Menu.h @@ -181,7 +181,7 @@ namespace MenuOption { const QString RunningScripts = "Running Scripts..."; const QString RunTimingTests = "Run Timing Tests"; const QString ScriptedMotorControl = "Enable Scripted Motor Control"; - const QString EntityScriptWhitelist = "Entity Script Whitelist"; + const QString EntityScriptQMLWhitelist = "Entity Script / QML Whitelist"; const QString ShowTrackedObjects = "Show Tracked Objects"; const QString SelfieCamera = "Selfie"; const QString SendWrongDSConnectVersion = "Send wrong DS connect version";