Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-08 16:18:05 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Make tablet general settings dialog naming more consistent with desktop

Browse source
This commit is contained in:
David Rowe 2017-03-02 12:30:36 +13:00
parent 6fafc829e1
commit 9f56d2f6f6
3 changed files with 5 additions and 8 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/dialogs/GeneralPreferencesDialog.qml
View file

@ -1,5 +1,5 @@
// //
// PreferencesDialog.qml // GeneralPreferencesDialog.qml
// //
// Created by Bradley Austin Davis on 24 Jan 2016 // Created by Bradley Austin Davis on 24 Jan 2016
// Copyright 2015 High Fidelity, Inc. // Copyright 2015 High Fidelity, Inc.

9
interface/resources/qml/hifi/tablet/TabletGeneralSettings.qml → interface/resources/qml/hifi/tablet/TabletGeneralPreferences.qml
View file

@ -1,9 +1,8 @@
// //
// TabletGeneralSettings.qml // TabletGeneralPreferences.qml
// scripts/system/
// //
// Created by Dante Ruiz on 9 Feb 2017 // Created by Dante Ruiz on 9 Feb 2017
// Copyright 2016 High Fidelity, Inc. // Copyright 2017 High Fidelity, Inc.
// //
// Distributed under the Apache License, Version 2.0. // Distributed under the Apache License, Version 2.0.
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
@ -34,11 +33,9 @@ StackView {
TabletPreferencesDialog { TabletPreferencesDialog {
id: root id: root
objectName: "GeneralPreferencesDialog" objectName: "TabletGeneralPreferences"
width: parent.width width: parent.width
height: parent.height height: parent.height
showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect"] showCategories: ["UI", "Snapshots", "Scripts", "Privacy", "Octree", "HMD", "Sixense Controllers", "Perception Neuron", "Kinect"]
} }
} }

2
scripts/system/generalSettings.js
View file

@ -18,7 +18,7 @@
var buttonName = "Settings"; var buttonName = "Settings";
var toolBar = null; var toolBar = null;
var tablet = null; var tablet = null;
var settings = "TabletGeneralSettings.qml" var settings = "TabletGeneralPreferences.qml"
function onClicked(){ function onClicked(){
if (tablet) { if (tablet) {
tablet.loadQMLSource(settings); tablet.loadQMLSource(settings);