Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-08-09 14:09:01 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

TabletComboBoxPreference.qml not needed anymore

Browse source
This commit is contained in:
Vladyslav Stelmakhovskyi 2017-03-14 15:53:41 +01:00
parent ee7dd458ca
commit 0accce5337
2 changed files with 1 additions and 66 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
interface/resources/qml/hifi/tablet/tabletWindows/preferences/Section.qml
View file

@ -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 { TabletComboBoxPreference { } } property var comboBoxBuilder: Component { ComboBoxPreference { } }
property var preferences: [] property var preferences: []
property int checkBoxCount: 0 property int checkBoxCount: 0

65
interface/resources/qml/hifi/tablet/tabletWindows/preferences/TabletComboBoxPreference.qml
View file

@ -1,65 +0,0 @@
//
// 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
}
}
}