Mirrors/overte-thingvellir
3
0
Fork 0
mirror of https://thingvellir.net/git/overte synced 2025-03-27 23:52:03 +01:00
Code Issues Projects Releases Packages Wiki Activity Actions

Updated whitelist info and name to include QML.

Browse source
This commit is contained in:
Kasen IO 2019-12-26 22:27:58 -05:00
parent 683f790fc2
commit 7489505f99
3 changed files with 7 additions and 7 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
interface/resources/qml/hifi/dialogs/security/EntityScriptWhitelist.qml → interface/resources/qml/hifi/dialogs/security/EntityScriptQMLWhitelist.qml
View file

@ -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

6
interface/src/Menu.cpp
View file

@ -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<TabletScriptingInterface>()->getTablet("com.highfidelity.interface.tablet.system");
auto hmd = DependencyManager::get<HMDScriptingInterface>();
DependencyManager::get<OffscreenUi>()->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<OffscreenUi>()->clearCache();
qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"),
QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog");
});

2
interface/src/Menu.h
View file

@ -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";