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

CR Round 1 - thanks Milad

Browse source
This commit is contained in:
Zach Fox 2019-05-14 16:29:03 -07:00
parent f9b51df296
commit e3bec7ef2a
10 changed files with 182 additions and 183 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

22
interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml
View file

@ -15,23 +15,23 @@ import stylesUit 1.0 as HifiStylesUit
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Rectangle { Rectangle {
id: root; id: root
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
} }
property string itemName; property string itemName
property string itemPreviewImageUrl; property string itemPreviewImageUrl
property string itemHref; property string itemHref
property bool standaloneOptimized; property bool standaloneOptimized
property bool standaloneIncompatible; property bool standaloneIncompatible
property bool isCurrentItem; property bool isCurrentItem
property bool isHovering: mouseArea.containsMouse || wearButton.hovered || wearButton.down property bool isHovering: mouseArea.containsMouse || wearButton.hovered || wearButton.down
height: 102; height: 102
width: parent.width; width: parent.width
color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent" color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent"
@ -88,7 +88,7 @@ Rectangle {
} }
SimplifiedControls.Button { SimplifiedControls.Button {
id: wearButton; id: wearButton
visible: MyAvatar.skeletonModelURL !== root.itemHref && root.isHovering visible: MyAvatar.skeletonModelURL !== root.itemHref && root.isHovering
anchors.right: parent.right anchors.right: parent.right
@ -104,7 +104,7 @@ Rectangle {
} }
SimplifiedControls.CheckBox { SimplifiedControls.CheckBox {
id: wornCheckBox; id: wornCheckBox
enabled: false enabled: false
visible: MyAvatar.skeletonModelURL === root.itemHref visible: MyAvatar.skeletonModelURL === root.itemHref
anchors.right: parent.right anchors.right: parent.right

3
interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml
View file

@ -54,7 +54,7 @@ Item {
id: mask id: mask
width: itemPreviewImage.width width: itemPreviewImage.width
height: width height: width
radius: width radius: width / 2
visible: false visible: false
} }
} }
@ -81,7 +81,6 @@ Item {
Item { Item {
id: myDisplayNameContainer id: myDisplayNameContainer
// Size
width: parent.width width: parent.width
height: 42 height: 42
anchors.top: parent.verticalCenter anchors.top: parent.verticalCenter

126
interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml
View file

@ -16,28 +16,28 @@ import TabletScriptingInterface 1.0
import "../simplifiedConstants" as SimplifiedConstants import "../simplifiedConstants" as SimplifiedConstants
Rectangle { Rectangle {
id: micBar; id: micBar
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
} }
readonly property var level: AudioScriptingInterface.inputLevel; readonly property var level: AudioScriptingInterface.inputLevel
readonly property var clipping: AudioScriptingInterface.clipping; readonly property var clipping: AudioScriptingInterface.clipping
property var muted: AudioScriptingInterface.muted; property var muted: AudioScriptingInterface.muted
property var pushToTalk: AudioScriptingInterface.pushToTalk; property var pushToTalk: AudioScriptingInterface.pushToTalk
property var pushingToTalk: AudioScriptingInterface.pushingToTalk; property var pushingToTalk: AudioScriptingInterface.pushingToTalk
readonly property var userSpeakingLevel: 0.4; readonly property var userSpeakingLevel: 0.4
property bool gated: false; property bool gated: false
readonly property string unmutedIcon: "images/mic-unmute-i.svg"; readonly property string unmutedIcon: "images/mic-unmute-i.svg"
readonly property string mutedIcon: "images/mic-mute-i.svg"; readonly property string mutedIcon: "images/mic-mute-i.svg"
readonly property string pushToTalkIcon: "images/mic-ptt-i.svg"; readonly property string pushToTalkIcon: "images/mic-ptt-i.svg"
readonly property string clippingIcon: "images/mic-clip-i.svg"; readonly property string clippingIcon: "images/mic-clip-i.svg"
readonly property string gatedIcon: "images/mic-gate-i.svg"; readonly property string gatedIcon: "images/mic-gate-i.svg"
Connections { Connections {
target: AudioScriptingInterface; target: AudioScriptingInterface
onNoiseGateOpened: { onNoiseGateOpened: {
gated = false; gated = false;
@ -48,10 +48,10 @@ Rectangle {
} }
} }
height: 30; height: 30
width: 34; width: 34
opacity: 0.7; opacity: 0.7
onLevelChanged: { onLevelChanged: {
var rectOpacity = (muted && (level >= userSpeakingLevel)) ? 1.0 : 0.7; var rectOpacity = (muted && (level >= userSpeakingLevel)) ? 1.0 : 0.7;
@ -63,20 +63,20 @@ Rectangle {
micBar.opacity = rectOpacity; micBar.opacity = rectOpacity;
} }
color: "#00000000"; color: "#00000000"
MouseArea { MouseArea {
id: mouseArea; id: mouseArea
anchors { anchors {
left: icon.left; left: icon.left
right: bar.right; right: bar.right
top: icon.top; top: icon.top
bottom: icon.bottom; bottom: icon.bottom
} }
hoverEnabled: true; hoverEnabled: true
scrollGestureEnabled: false; scrollGestureEnabled: false
onClicked: { onClicked: {
if (pushToTalk) { if (pushToTalk) {
return; return;
@ -93,17 +93,17 @@ Rectangle {
} }
QtObject { QtObject {
id: colors; id: colors
readonly property string unmutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.noisy; readonly property string unmutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.noisy
readonly property string gatedColor: "#00BDFF"; readonly property string gatedColor: "#00BDFF"
readonly property string mutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.muted; readonly property string mutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.muted
readonly property string gutter: "#575757"; readonly property string gutter: "#575757"
readonly property string greenStart: "#39A38F"; readonly property string greenStart: "#39A38F"
readonly property string greenEnd: "#1FC6A6"; readonly property string greenEnd: "#1FC6A6"
readonly property string yellow: "#C0C000"; readonly property string yellow: "#C0C000"
readonly property string fill: "#55000000"; readonly property string fill: "#55000000"
readonly property string icon: (muted || clipping) ? mutedColor : gated ? gatedColor : unmutedColor; readonly property string icon: (muted || clipping) ? mutedColor : gated ? gatedColor : unmutedColor
} }
Item { Item {
@ -117,9 +117,9 @@ Rectangle {
anchors.fill: parent anchors.fill: parent
opacity: mouseArea.containsMouse ? 1.0 : 0.7 opacity: mouseArea.containsMouse ? 1.0 : 0.7
Image { Image {
id: image; id: image
source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon : source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon :
clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon; clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon
anchors.fill: parent anchors.fill: parent
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
@ -127,42 +127,42 @@ Rectangle {
ColorOverlay { ColorOverlay {
id: imageOverlay id: imageOverlay
anchors { fill: image } anchors { fill: image }
source: image; source: image
color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon; color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon
} }
} }
} }
Item { Item {
id: bar; id: bar
anchors { anchors {
left: icon.right; left: icon.right
leftMargin: 0; leftMargin: 0
verticalCenter: icon.verticalCenter; verticalCenter: icon.verticalCenter
} }
width: 4; width: 4
height: parent.height; height: parent.height
Rectangle { // base Rectangle { // base
id: baseBar id: baseBar
radius: 4; radius: 4
anchors { fill: parent } anchors { fill: parent }
color: colors.gutter; color: colors.gutter
} }
Rectangle { // mask Rectangle { // mask
id: mask; id: mask
height: micBar.muted ? parent.height : parent.height * level; height: micBar.muted ? parent.height : parent.height * level
color: micBar.muted ? colors.mutedColor : "white" color: micBar.muted ? colors.mutedColor : "white"
width: parent.width; width: parent.width
radius: 5; radius: 5
anchors { anchors {
bottom: parent.bottom; bottom: parent.bottom
bottomMargin: 0; bottomMargin: 0
left: parent.left; left: parent.left
leftMargin: 0; leftMargin: 0
} }
} }
@ -170,21 +170,21 @@ Rectangle {
anchors { fill: mask } anchors { fill: mask }
visible: mask.visible && !micBar.muted visible: mask.visible && !micBar.muted
source: mask source: mask
start: Qt.point(0, 0); start: Qt.point(0, 0)
end: Qt.point(0, bar.height); end: Qt.point(0, bar.height)
rotation: 180 rotation: 180
gradient: Gradient { gradient: Gradient {
GradientStop { GradientStop {
position: 0.0; position: 0.0
color: colors.greenStart; color: colors.greenStart
} }
GradientStop { GradientStop {
position: 0.5; position: 0.5
color: colors.greenEnd; color: colors.greenEnd
} }
GradientStop { GradientStop {
position: 1.0; position: 1.0
color: colors.yellow; color: colors.yellow
} }
} }
} }

52
interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml
View file

@ -16,12 +16,12 @@ import stylesUit 1.0 as HifiStylesUit
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
Flickable { Flickable {
id: root; id: root
contentWidth: parent.width; contentWidth: parent.width
contentHeight: audioColumnLayout.height; contentHeight: audioColumnLayout.height
topMargin: 16 topMargin: 16
bottomMargin: 16 bottomMargin: 16
clip: true; clip: true
function changePeakValuesEnabled(enabled) { function changePeakValuesEnabled(enabled) {
if (!enabled) { if (!enabled) {
@ -216,15 +216,15 @@ Flickable {
ButtonGroup { id: inputDeviceButtonGroup } ButtonGroup { id: inputDeviceButtonGroup }
ListView { ListView {
id: inputDeviceListView; id: inputDeviceListView
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false; interactive: false
height: contentItem.height; height: contentItem.height
spacing: 4; spacing: 4
clip: true; clip: true
model: AudioScriptingInterface.devices.input; model: AudioScriptingInterface.devices.input
delegate: Item { delegate: Item {
width: parent.width width: parent.width
height: inputDeviceCheckbox.height height: inputDeviceCheckbox.height
@ -233,7 +233,7 @@ Flickable {
id: inputDeviceCheckbox id: inputDeviceCheckbox
anchors.left: parent.left anchors.left: parent.left
width: parent.width - inputLevel.width width: parent.width - inputLevel.width
checked: selectedDesktop; checked: selectedDesktop
text: model.devicename text: model.devicename
ButtonGroup.group: inputDeviceButtonGroup ButtonGroup.group: inputDeviceButtonGroup
onClicked: { onClicked: {
@ -247,8 +247,8 @@ Flickable {
showMuted: AudioScriptingInterface.mutedDesktop showMuted: AudioScriptingInterface.mutedDesktop
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
peak: model.peak; peak: model.peak
visible: AudioScriptingInterface.devices.input.peakValuesAvailable; visible: AudioScriptingInterface.devices.input.peakValuesAvailable
} }
} }
} }
@ -271,9 +271,9 @@ Flickable {
Timer { Timer {
id: loopbackTimer id: loopbackTimer
interval: 8000; interval: 8000
running: false; running: false
repeat: false; repeat: false
onTriggered: { onTriggered: {
stopAudioLoopback(); stopAudioLoopback();
} }
@ -326,15 +326,15 @@ Flickable {
ButtonGroup { id: outputDeviceButtonGroup } ButtonGroup { id: outputDeviceButtonGroup }
ListView { ListView {
id: outputDeviceListView; id: outputDeviceListView
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false; interactive: false
height: contentItem.height; height: contentItem.height
spacing: 4; spacing: 4
clip: true; clip: true
model: AudioScriptingInterface.devices.output; model: AudioScriptingInterface.devices.output
delegate: Item { delegate: Item {
width: parent.width width: parent.width
height: outputDeviceCheckbox.height height: outputDeviceCheckbox.height
@ -343,7 +343,7 @@ Flickable {
id: outputDeviceCheckbox id: outputDeviceCheckbox
anchors.left: parent.left anchors.left: parent.left
width: parent.width width: parent.width
checked: selectedDesktop; checked: selectedDesktop
text: model.devicename text: model.devicename
ButtonGroup.group: outputDeviceButtonGroup ButtonGroup.group: outputDeviceButtonGroup
onClicked: { onClicked: {
@ -354,9 +354,9 @@ Flickable {
} }
SimplifiedControls.Button { SimplifiedControls.Button {
property var sound: null; property var sound: null
property var sample: null; property var sample: null
property bool isPlaying: false; property bool isPlaying: false
function createSampleSound() { function createSampleSound() {
sound = ApplicationInterface.getSampleSound(); sound = ApplicationInterface.getSampleSound();
sample = null; sample = null;

12
interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml
View file

@ -15,13 +15,13 @@ import stylesUit 1.0 as HifiStylesUit
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
Flickable { Flickable {
property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on"); property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on")
id: root; id: root
contentWidth: parent.width; contentWidth: parent.width
contentHeight: generalColumnLayout.height; contentHeight: generalColumnLayout.height
topMargin: 16 topMargin: 16
bottomMargin: 16 bottomMargin: 16
clip: true; clip: true
onAvatarNametagModeChanged: { onAvatarNametagModeChanged: {
sendNameTagInfo({method: 'handleAvatarNametagMode', avatarNametagMode: root.avatarNametagMode, source: "SettingsApp.qml"}); sendNameTagInfo({method: 'handleAvatarNametagMode', avatarNametagMode: root.avatarNametagMode, source: "SettingsApp.qml"});
@ -197,7 +197,7 @@ Flickable {
} }
Connections { Connections {
target: Camera; target: Camera
onModeUpdated: { onModeUpdated: {
if (Camera.mode === "first person") { if (Camera.mode === "first person") {

54
interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml
View file

@ -16,12 +16,12 @@ import stylesUit 1.0 as HifiStylesUit
import QtQuick.Layouts 1.3 import QtQuick.Layouts 1.3
Flickable { Flickable {
id: root; id: root
contentWidth: parent.width; contentWidth: parent.width
contentHeight: vrColumnLayout.height; contentHeight: vrColumnLayout.height
topMargin: 16 topMargin: 16
bottomMargin: 16 bottomMargin: 16
clip: true; clip: true
function changePeakValuesEnabled(enabled) { function changePeakValuesEnabled(enabled) {
if (!enabled) { if (!enabled) {
@ -229,15 +229,15 @@ Flickable {
ButtonGroup { id: inputDeviceButtonGroup } ButtonGroup { id: inputDeviceButtonGroup }
ListView { ListView {
id: inputDeviceListView; id: inputDeviceListView
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false; interactive: false
height: contentItem.height; height: contentItem.height
spacing: 4; spacing: 4
clip: true; clip: true
model: AudioScriptingInterface.devices.input; model: AudioScriptingInterface.devices.input
delegate: Item { delegate: Item {
width: parent.width width: parent.width
height: inputDeviceCheckbox.height height: inputDeviceCheckbox.height
@ -246,7 +246,7 @@ Flickable {
id: inputDeviceCheckbox id: inputDeviceCheckbox
anchors.left: parent.left anchors.left: parent.left
width: parent.width - inputLevel.width width: parent.width - inputLevel.width
checked: selectedHMD; checked: selectedHMD
text: model.devicename text: model.devicename
ButtonGroup.group: inputDeviceButtonGroup ButtonGroup.group: inputDeviceButtonGroup
onClicked: { onClicked: {
@ -260,8 +260,8 @@ Flickable {
showMuted: AudioScriptingInterface.mutedHMD showMuted: AudioScriptingInterface.mutedHMD
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
anchors.right: parent.right anchors.right: parent.right
peak: model.peak; peak: model.peak
visible: AudioScriptingInterface.devices.input.peakValuesAvailable; visible: AudioScriptingInterface.devices.input.peakValuesAvailable
} }
} }
} }
@ -284,9 +284,9 @@ Flickable {
Timer { Timer {
id: loopbackTimer id: loopbackTimer
interval: 8000; interval: 8000
running: false; running: false
repeat: false; repeat: false
onTriggered: { onTriggered: {
stopAudioLoopback(); stopAudioLoopback();
} }
@ -339,15 +339,15 @@ Flickable {
ButtonGroup { id: outputDeviceButtonGroup } ButtonGroup { id: outputDeviceButtonGroup }
ListView { ListView {
id: outputDeviceListView; id: outputDeviceListView
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin
interactive: false; interactive: false
height: contentItem.height; height: contentItem.height
spacing: 4; spacing: 4
clip: true; clip: true
model: AudioScriptingInterface.devices.output; model: AudioScriptingInterface.devices.output
delegate: Item { delegate: Item {
width: parent.width width: parent.width
height: outputDeviceCheckbox.height height: outputDeviceCheckbox.height
@ -356,7 +356,7 @@ Flickable {
id: outputDeviceCheckbox id: outputDeviceCheckbox
anchors.left: parent.left anchors.left: parent.left
width: parent.width width: parent.width
checked: selectedDesktop; checked: selectedDesktop
text: model.devicename text: model.devicename
ButtonGroup.group: outputDeviceButtonGroup ButtonGroup.group: outputDeviceButtonGroup
onClicked: { onClicked: {
@ -367,9 +367,9 @@ Flickable {
} }
SimplifiedControls.Button { SimplifiedControls.Button {
property var sound: null; property var sound: null
property var sample: null; property var sample: null
property bool isPlaying: false; property bool isPlaying: false
function createSampleSound() { function createSampleSound() {
sound = ApplicationInterface.getSampleSound(); sound = ApplicationInterface.getSampleSound();
sample = null; sample = null;
@ -412,7 +412,7 @@ Flickable {
height: 32 height: 32
text: isPlaying ? "STOP TESTING" : "TEST YOUR SOUND" text: isPlaying ? "STOP TESTING" : "TEST YOUR SOUND"
onClicked: { onClicked: {
isPlaying ? stopSound() : playSound(); isPlaying ? stopSound() : playSound()
} }
} }
} }

2
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml
View file

@ -64,7 +64,7 @@ Original.Button {
border.color: root.enabled ? simplifiedUI.colors.controls.button.border.enabled : simplifiedUI.colors.controls.button.border.disabled border.color: root.enabled ? simplifiedUI.colors.controls.button.border.enabled : simplifiedUI.colors.controls.button.border.disabled
Item { Item {
clip: true; clip: true
visible: root.enabled visible: root.enabled
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width - parent.border.width * 2 width: parent.width - parent.border.width * 2

8
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml
View file

@ -27,7 +27,7 @@ Original.CheckBox {
property alias checkBoxRadius: checkBoxIndicator.radius property alias checkBoxRadius: checkBoxIndicator.radius
property alias checkSize: innerBox.width property alias checkSize: innerBox.width
property alias checkRadius: innerBox.radius property alias checkRadius: innerBox.radius
property bool wrapLabel: true; property bool wrapLabel: true
property alias labelFontFamily: checkBoxLabel.font.family property alias labelFontFamily: checkBoxLabel.font.family
property alias labelFontSize: checkBoxLabel.font.pixelSize property alias labelFontSize: checkBoxLabel.font.pixelSize
property alias labelFontWeight: checkBoxLabel.font.weight property alias labelFontWeight: checkBoxLabel.font.weight
@ -77,9 +77,9 @@ Original.CheckBox {
id: checkBoxLabel id: checkBoxLabel
text: root.text text: root.text
color: root.color color: root.color
font.family: "Graphik"; font.family: "Graphik"
font.pixelSize: 14; font.pixelSize: 14
font.weight: Font.DemiBold; font.weight: Font.DemiBold
x: 2 x: 2
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
wrapMode: root.wrapLabel ? Text.Wrap : Text.NoWrap wrapMode: root.wrapLabel ? Text.Wrap : Text.NoWrap

84
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/InputPeak.qml
View file

@ -12,88 +12,88 @@ import QtQuick 2.10
import QtGraphicalEffects 1.0 import QtGraphicalEffects 1.0
Item { Item {
property var peak; property var peak
property alias showMuted: status.visible property alias showMuted: status.visible
width: 70; width: 70
height: 8; height: 8
QtObject { QtObject {
id: colors; id: colors
readonly property string unmuted: "#FFF"; readonly property string unmuted: "#FFF"
readonly property string muted: "#E2334D"; readonly property string muted: "#E2334D"
readonly property string gutter: "#575757"; readonly property string gutter: "#575757"
readonly property string greenStart: "#39A38F"; readonly property string greenStart: "#39A38F"
readonly property string greenEnd: "#1FC6A6"; readonly property string greenEnd: "#1FC6A6"
readonly property string yellow: "#C0C000"; readonly property string yellow: "#C0C000"
readonly property string red: colors.muted; readonly property string red: colors.muted
readonly property string fill: "#55000000"; readonly property string fill: "#55000000"
} }
Text { Text {
id: status; id: status
anchors { anchors {
horizontalCenter: parent.horizontalCenter; horizontalCenter: parent.horizontalCenter
verticalCenter: parent.verticalCenter; verticalCenter: parent.verticalCenter
} }
visible: false; visible: false
color: colors.muted; color: colors.muted
text: "MUTED"; text: "MUTED"
font.pointSize: 10; font.pointSize: 10
} }
Item { Item {
id: bar; id: bar
width: parent.width; width: parent.width
height: parent.height; height: parent.height
anchors { fill: parent } anchors { fill: parent }
visible: !status.visible; visible: !status.visible
Rectangle { // base Rectangle { // base
radius: 4; radius: 4
anchors { fill: parent } anchors { fill: parent }
color: colors.gutter; color: colors.gutter
} }
Rectangle { // mask Rectangle { // mask
id: mask; id: mask
width: parent.width * peak; width: parent.width * peak
radius: 5; radius: 5
anchors { anchors {
bottom: parent.bottom; bottom: parent.bottom
bottomMargin: 0; bottomMargin: 0
top: parent.top; top: parent.top
topMargin: 0; topMargin: 0
left: parent.left; left: parent.left
leftMargin: 0; leftMargin: 0
} }
} }
LinearGradient { LinearGradient {
anchors { fill: mask } anchors { fill: mask }
source: mask source: mask
start: Qt.point(0, 0); start: Qt.point(0, 0)
end: Qt.point(bar.width, 0); end: Qt.point(bar.width, 0)
gradient: Gradient { gradient: Gradient {
GradientStop { GradientStop {
position: 0; position: 0
color: colors.greenStart; color: colors.greenStart
} }
GradientStop { GradientStop {
position: 0.5; position: 0.5
color: colors.greenEnd; color: colors.greenEnd
} }
GradientStop { GradientStop {
position: 1; position: 1
color: colors.yellow; color: colors.yellow
} }
} }
} }

2
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml
View file

@ -25,7 +25,7 @@ RadioButton {
property alias labelFontSize: radioButtonLabel.font.pixelSize property alias labelFontSize: radioButtonLabel.font.pixelSize
property int radioButtonRadius: 14 property int radioButtonRadius: 14
property int labelLeftMargin: simplifiedUI.margins.controls.radioButton.labelLeftMargin property int labelLeftMargin: simplifiedUI.margins.controls.radioButton.labelLeftMargin
property bool wrapLabel: true; property bool wrapLabel: true
readonly property int checkSize: Math.max(root.radioButtonRadius - 8, 10) readonly property int checkSize: Math.max(root.radioButtonRadius - 8, 10)
focusPolicy: Qt.ClickFocus focusPolicy: Qt.ClickFocus
hoverEnabled: true hoverEnabled: true