Merge pull request #9864 from vladest/tablet-ui-lod-settings

Add LOD settings to Tablet UI
This commit is contained in:
Seth Alves 2017-03-13 08:59:40 -08:00 committed by GitHub
commit 4f71a5b234
2 changed files with 36 additions and 1 deletions

View file

@ -0,0 +1,34 @@
import QtQuick 2.5
import Qt.labs.settings 1.0
import "tabletWindows"
import "../../dialogs"
import QtQuick.Controls 1.4
import QtQuick.Controls.Styles 1.4
import QtGraphicalEffects 1.0
StackView {
id: profileRoot
initialItem: root
objectName: "stack"
property var eventBridge;
signal sendToScript(var message);
function pushSource(path) {
editRoot.push(Qt.reslovedUrl(path));
}
function popSource() {
}
TabletPreferencesDialog {
id: root
property string title: "LOD Settings"
objectName: "TabletLodPreferences"
width: parent.width
height: parent.height
showCategories: ["Level of Detail Tuning"]
}
}

View file

@ -308,7 +308,8 @@ Menu::Menu() {
// Settings > LOD...
action = addActionToQMenuAndActionHash(settingsMenu, "LOD...");
connect(action, &QAction::triggered, [] {
DependencyManager::get<OffscreenUi>()->toggle(QString("hifi/dialogs/LodPreferencesDialog.qml"), "LodPreferencesDialog");
qApp->showDialog(QString("hifi/dialogs/LodPreferencesDialog.qml"),
QString("../../hifi/tablet/TabletLodPreferences.qml"), "LodPreferencesDialog");
});
// Settings > Control with Speech [advanced]