mirror of
https://github.com/overte-org/overte.git
synced 2025-08-06 16:36:54 +02:00
Add Graphics preferences to Tablet. Use TabletComboBox instead of desktop ComboBox for Tablet preferences
This commit is contained in:
parent
2cc723762c
commit
d70943dd6c
4 changed files with 102 additions and 2 deletions
|
@ -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: "Graphics Settings"
|
||||||
|
objectName: "TabletGraphicsPreferences"
|
||||||
|
width: parent.width
|
||||||
|
height: parent.height
|
||||||
|
showCategories: ["Graphics"]
|
||||||
|
}
|
||||||
|
}
|
|
@ -80,7 +80,7 @@ Preference {
|
||||||
property var sliderBuilder: Component { SliderPreference { } }
|
property var sliderBuilder: Component { SliderPreference { } }
|
||||||
property var avatarBuilder: Component { AvatarPreference { } }
|
property var avatarBuilder: Component { AvatarPreference { } }
|
||||||
property var buttonBuilder: Component { ButtonPreference { } }
|
property var buttonBuilder: Component { ButtonPreference { } }
|
||||||
property var comboBoxBuilder: Component { ComboBoxPreference { } }
|
property var comboBoxBuilder: Component { TabletComboBoxPreference { } }
|
||||||
property var preferences: []
|
property var preferences: []
|
||||||
property int checkBoxCount: 0
|
property int checkBoxCount: 0
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,65 @@
|
||||||
|
//
|
||||||
|
// ComboBoxPreference.qml
|
||||||
|
//
|
||||||
|
// Created by Bradley Austin Davis on 18 Jan 2016
|
||||||
|
// Copyright 2016 High Fidelity, Inc.
|
||||||
|
//
|
||||||
|
// Distributed under the Apache License, Version 2.0.
|
||||||
|
// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html
|
||||||
|
//
|
||||||
|
|
||||||
|
import QtQuick 2.5
|
||||||
|
|
||||||
|
import QtQuick.Controls 1.4
|
||||||
|
import QtQuick.Controls.Styles 1.4
|
||||||
|
import "../../../../controls-uit" as HiFiControls
|
||||||
|
import "../../../../styles-uit"
|
||||||
|
|
||||||
|
Preference {
|
||||||
|
id: root
|
||||||
|
height: control.height + hifi.dimensions.controlInterlineHeight
|
||||||
|
|
||||||
|
Component.onCompleted: {
|
||||||
|
dataComboBox.currentIndex = dataComboBox.comboBox.find(preference.value);
|
||||||
|
}
|
||||||
|
|
||||||
|
function save() {
|
||||||
|
preference.value = dataComboBox.currentText;
|
||||||
|
preference.save();
|
||||||
|
}
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: control
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
right: parent.right
|
||||||
|
bottom: parent.bottom
|
||||||
|
}
|
||||||
|
height: Math.max(labelText.height, dataComboBox.controlHeight)
|
||||||
|
|
||||||
|
HiFiControls.Label {
|
||||||
|
id: labelText
|
||||||
|
text: root.label + ":"
|
||||||
|
colorScheme: hifi.colorSchemes.dark
|
||||||
|
anchors {
|
||||||
|
left: parent.left
|
||||||
|
right: dataComboBox.left
|
||||||
|
rightMargin: hifi.dimensions.labelPadding
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
horizontalAlignment: Text.AlignRight
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HiFiControls.TabletComboBox {
|
||||||
|
id: dataComboBox
|
||||||
|
model: preference.items
|
||||||
|
width: 150
|
||||||
|
anchors {
|
||||||
|
right: parent.right
|
||||||
|
verticalCenter: parent.verticalCenter
|
||||||
|
}
|
||||||
|
colorScheme: hifi.colorSchemes.dark
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
|
@ -329,7 +329,8 @@ Menu::Menu() {
|
||||||
// Developer > Graphics...
|
// Developer > Graphics...
|
||||||
action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
|
action = addActionToQMenuAndActionHash(developerMenu, "Graphics...");
|
||||||
connect(action, &QAction::triggered, [] {
|
connect(action, &QAction::triggered, [] {
|
||||||
DependencyManager::get<OffscreenUi>()->toggle(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"), "GraphicsPreferencesDialog");
|
qApp->showDialog(QString("hifi/dialogs/GraphicsPreferencesDialog.qml"),
|
||||||
|
QString("../../hifi/tablet/TabletGraphicsPreferences.qml"), "GraphicsPreferencesDialog");
|
||||||
});
|
});
|
||||||
|
|
||||||
// Developer > Render >>>
|
// Developer > Render >>>
|
||||||
|
|
Loading…
Reference in a new issue