diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml index f805786830..7c6ad1b09c 100644 --- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml +++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml @@ -15,23 +15,23 @@ import stylesUit 1.0 as HifiStylesUit import QtGraphicalEffects 1.0 Rectangle { - id: root; + id: root SimplifiedConstants.SimplifiedConstants { id: simplifiedUI } - property string itemName; - property string itemPreviewImageUrl; - property string itemHref; - property bool standaloneOptimized; - property bool standaloneIncompatible; - property bool isCurrentItem; + property string itemName + property string itemPreviewImageUrl + property string itemHref + property bool standaloneOptimized + property bool standaloneIncompatible + property bool isCurrentItem property bool isHovering: mouseArea.containsMouse || wearButton.hovered || wearButton.down - height: 102; - width: parent.width; + height: 102 + width: parent.width color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent" @@ -88,7 +88,7 @@ Rectangle { } SimplifiedControls.Button { - id: wearButton; + id: wearButton visible: MyAvatar.skeletonModelURL !== root.itemHref && root.isHovering anchors.right: parent.right @@ -104,7 +104,7 @@ Rectangle { } SimplifiedControls.CheckBox { - id: wornCheckBox; + id: wornCheckBox enabled: false visible: MyAvatar.skeletonModelURL === root.itemHref anchors.right: parent.right diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml index 71d55ea170..6bf3d34d6f 100644 --- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml +++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml @@ -54,7 +54,7 @@ Item { id: mask width: itemPreviewImage.width height: width - radius: width + radius: width / 2 visible: false } } @@ -81,7 +81,6 @@ Item { Item { id: myDisplayNameContainer - // Size width: parent.width height: 42 anchors.top: parent.verticalCenter diff --git a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml index 4cd5b9a96f..506c2a72bc 100644 --- a/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml +++ b/interface/resources/qml/hifi/simplifiedUI/inputDeviceButton/InputDeviceButton.qml @@ -16,28 +16,28 @@ import TabletScriptingInterface 1.0 import "../simplifiedConstants" as SimplifiedConstants Rectangle { - id: micBar; + id: micBar SimplifiedConstants.SimplifiedConstants { id: simplifiedUI } - readonly property var level: AudioScriptingInterface.inputLevel; - readonly property var clipping: AudioScriptingInterface.clipping; - property var muted: AudioScriptingInterface.muted; - property var pushToTalk: AudioScriptingInterface.pushToTalk; - property var pushingToTalk: AudioScriptingInterface.pushingToTalk; - readonly property var userSpeakingLevel: 0.4; - property bool gated: false; + readonly property var level: AudioScriptingInterface.inputLevel + readonly property var clipping: AudioScriptingInterface.clipping + property var muted: AudioScriptingInterface.muted + property var pushToTalk: AudioScriptingInterface.pushToTalk + property var pushingToTalk: AudioScriptingInterface.pushingToTalk + readonly property var userSpeakingLevel: 0.4 + property bool gated: false - readonly property string unmutedIcon: "images/mic-unmute-i.svg"; - readonly property string mutedIcon: "images/mic-mute-i.svg"; - readonly property string pushToTalkIcon: "images/mic-ptt-i.svg"; - readonly property string clippingIcon: "images/mic-clip-i.svg"; - readonly property string gatedIcon: "images/mic-gate-i.svg"; + readonly property string unmutedIcon: "images/mic-unmute-i.svg" + readonly property string mutedIcon: "images/mic-mute-i.svg" + readonly property string pushToTalkIcon: "images/mic-ptt-i.svg" + readonly property string clippingIcon: "images/mic-clip-i.svg" + readonly property string gatedIcon: "images/mic-gate-i.svg" Connections { - target: AudioScriptingInterface; + target: AudioScriptingInterface onNoiseGateOpened: { gated = false; @@ -48,10 +48,10 @@ Rectangle { } } - height: 30; - width: 34; + height: 30 + width: 34 - opacity: 0.7; + opacity: 0.7 onLevelChanged: { var rectOpacity = (muted && (level >= userSpeakingLevel)) ? 1.0 : 0.7; @@ -63,20 +63,20 @@ Rectangle { micBar.opacity = rectOpacity; } - color: "#00000000"; + color: "#00000000" MouseArea { - id: mouseArea; + id: mouseArea anchors { - left: icon.left; - right: bar.right; - top: icon.top; - bottom: icon.bottom; + left: icon.left + right: bar.right + top: icon.top + bottom: icon.bottom } - hoverEnabled: true; - scrollGestureEnabled: false; + hoverEnabled: true + scrollGestureEnabled: false onClicked: { if (pushToTalk) { return; @@ -93,17 +93,17 @@ Rectangle { } QtObject { - id: colors; + id: colors - readonly property string unmutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.noisy; - readonly property string gatedColor: "#00BDFF"; - readonly property string mutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.muted; - readonly property string gutter: "#575757"; - readonly property string greenStart: "#39A38F"; - readonly property string greenEnd: "#1FC6A6"; - readonly property string yellow: "#C0C000"; - readonly property string fill: "#55000000"; - readonly property string icon: (muted || clipping) ? mutedColor : gated ? gatedColor : unmutedColor; + readonly property string unmutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.noisy + readonly property string gatedColor: "#00BDFF" + readonly property string mutedColor: simplifiedUI.colors.controls.inputVolumeButton.text.muted + readonly property string gutter: "#575757" + readonly property string greenStart: "#39A38F" + readonly property string greenEnd: "#1FC6A6" + readonly property string yellow: "#C0C000" + readonly property string fill: "#55000000" + readonly property string icon: (muted || clipping) ? mutedColor : gated ? gatedColor : unmutedColor } Item { @@ -117,9 +117,9 @@ Rectangle { anchors.fill: parent opacity: mouseArea.containsMouse ? 1.0 : 0.7 Image { - id: image; + id: image source: (pushToTalk) ? pushToTalkIcon : muted ? mutedIcon : - clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon; + clipping ? clippingIcon : gated ? gatedIcon : unmutedIcon anchors.fill: parent fillMode: Image.PreserveAspectFit } @@ -127,42 +127,42 @@ Rectangle { ColorOverlay { id: imageOverlay anchors { fill: image } - source: image; - color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon; + source: image + color: pushToTalk ? (pushingToTalk ? colors.unmutedColor : colors.mutedColor) : colors.icon } } } Item { - id: bar; + id: bar anchors { - left: icon.right; - leftMargin: 0; - verticalCenter: icon.verticalCenter; + left: icon.right + leftMargin: 0 + verticalCenter: icon.verticalCenter } - width: 4; - height: parent.height; + width: 4 + height: parent.height Rectangle { // base id: baseBar - radius: 4; + radius: 4 anchors { fill: parent } - color: colors.gutter; + color: colors.gutter } Rectangle { // mask - id: mask; - height: micBar.muted ? parent.height : parent.height * level; + id: mask + height: micBar.muted ? parent.height : parent.height * level color: micBar.muted ? colors.mutedColor : "white" - width: parent.width; - radius: 5; + width: parent.width + radius: 5 anchors { - bottom: parent.bottom; - bottomMargin: 0; - left: parent.left; - leftMargin: 0; + bottom: parent.bottom + bottomMargin: 0 + left: parent.left + leftMargin: 0 } } @@ -170,21 +170,21 @@ Rectangle { anchors { fill: mask } visible: mask.visible && !micBar.muted source: mask - start: Qt.point(0, 0); - end: Qt.point(0, bar.height); + start: Qt.point(0, 0) + end: Qt.point(0, bar.height) rotation: 180 gradient: Gradient { GradientStop { - position: 0.0; - color: colors.greenStart; + position: 0.0 + color: colors.greenStart } GradientStop { - position: 0.5; - color: colors.greenEnd; + position: 0.5 + color: colors.greenEnd } GradientStop { - position: 1.0; - color: colors.yellow; + position: 1.0 + color: colors.yellow } } } diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index 55d268bdf0..2d94726768 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -16,12 +16,12 @@ import stylesUit 1.0 as HifiStylesUit import QtQuick.Layouts 1.3 Flickable { - id: root; - contentWidth: parent.width; - contentHeight: audioColumnLayout.height; + id: root + contentWidth: parent.width + contentHeight: audioColumnLayout.height topMargin: 16 bottomMargin: 16 - clip: true; + clip: true function changePeakValuesEnabled(enabled) { if (!enabled) { @@ -216,15 +216,15 @@ Flickable { ButtonGroup { id: inputDeviceButtonGroup } ListView { - id: inputDeviceListView; + id: inputDeviceListView anchors.left: parent.left anchors.right: parent.right Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin - interactive: false; - height: contentItem.height; - spacing: 4; - clip: true; - model: AudioScriptingInterface.devices.input; + interactive: false + height: contentItem.height + spacing: 4 + clip: true + model: AudioScriptingInterface.devices.input delegate: Item { width: parent.width height: inputDeviceCheckbox.height @@ -233,7 +233,7 @@ Flickable { id: inputDeviceCheckbox anchors.left: parent.left width: parent.width - inputLevel.width - checked: selectedDesktop; + checked: selectedDesktop text: model.devicename ButtonGroup.group: inputDeviceButtonGroup onClicked: { @@ -247,8 +247,8 @@ Flickable { showMuted: AudioScriptingInterface.mutedDesktop anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - peak: model.peak; - visible: AudioScriptingInterface.devices.input.peakValuesAvailable; + peak: model.peak + visible: AudioScriptingInterface.devices.input.peakValuesAvailable } } } @@ -271,9 +271,9 @@ Flickable { Timer { id: loopbackTimer - interval: 8000; - running: false; - repeat: false; + interval: 8000 + running: false + repeat: false onTriggered: { stopAudioLoopback(); } @@ -326,15 +326,15 @@ Flickable { ButtonGroup { id: outputDeviceButtonGroup } ListView { - id: outputDeviceListView; + id: outputDeviceListView anchors.left: parent.left anchors.right: parent.right Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin - interactive: false; - height: contentItem.height; - spacing: 4; - clip: true; - model: AudioScriptingInterface.devices.output; + interactive: false + height: contentItem.height + spacing: 4 + clip: true + model: AudioScriptingInterface.devices.output delegate: Item { width: parent.width height: outputDeviceCheckbox.height @@ -343,7 +343,7 @@ Flickable { id: outputDeviceCheckbox anchors.left: parent.left width: parent.width - checked: selectedDesktop; + checked: selectedDesktop text: model.devicename ButtonGroup.group: outputDeviceButtonGroup onClicked: { @@ -354,9 +354,9 @@ Flickable { } SimplifiedControls.Button { - property var sound: null; - property var sample: null; - property bool isPlaying: false; + property var sound: null + property var sample: null + property bool isPlaying: false function createSampleSound() { sound = ApplicationInterface.getSampleSound(); sample = null; diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 372db67a43..cc5fd7118c 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -15,13 +15,13 @@ import stylesUit 1.0 as HifiStylesUit import QtQuick.Layouts 1.3 Flickable { - property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on"); - id: root; - contentWidth: parent.width; - contentHeight: generalColumnLayout.height; + property string avatarNametagMode: Settings.getValue("simplifiedNametag/avatarNametagMode", "on") + id: root + contentWidth: parent.width + contentHeight: generalColumnLayout.height topMargin: 16 bottomMargin: 16 - clip: true; + clip: true onAvatarNametagModeChanged: { sendNameTagInfo({method: 'handleAvatarNametagMode', avatarNametagMode: root.avatarNametagMode, source: "SettingsApp.qml"}); @@ -197,7 +197,7 @@ Flickable { } Connections { - target: Camera; + target: Camera onModeUpdated: { if (Camera.mode === "first person") { diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml index cee9fb99d2..cea9fa8318 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml @@ -16,12 +16,12 @@ import stylesUit 1.0 as HifiStylesUit import QtQuick.Layouts 1.3 Flickable { - id: root; - contentWidth: parent.width; - contentHeight: vrColumnLayout.height; + id: root + contentWidth: parent.width + contentHeight: vrColumnLayout.height topMargin: 16 bottomMargin: 16 - clip: true; + clip: true function changePeakValuesEnabled(enabled) { if (!enabled) { @@ -229,15 +229,15 @@ Flickable { ButtonGroup { id: inputDeviceButtonGroup } ListView { - id: inputDeviceListView; + id: inputDeviceListView anchors.left: parent.left anchors.right: parent.right Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin - interactive: false; - height: contentItem.height; - spacing: 4; - clip: true; - model: AudioScriptingInterface.devices.input; + interactive: false + height: contentItem.height + spacing: 4 + clip: true + model: AudioScriptingInterface.devices.input delegate: Item { width: parent.width height: inputDeviceCheckbox.height @@ -246,7 +246,7 @@ Flickable { id: inputDeviceCheckbox anchors.left: parent.left width: parent.width - inputLevel.width - checked: selectedHMD; + checked: selectedHMD text: model.devicename ButtonGroup.group: inputDeviceButtonGroup onClicked: { @@ -260,8 +260,8 @@ Flickable { showMuted: AudioScriptingInterface.mutedHMD anchors.verticalCenter: parent.verticalCenter anchors.right: parent.right - peak: model.peak; - visible: AudioScriptingInterface.devices.input.peakValuesAvailable; + peak: model.peak + visible: AudioScriptingInterface.devices.input.peakValuesAvailable } } } @@ -284,9 +284,9 @@ Flickable { Timer { id: loopbackTimer - interval: 8000; - running: false; - repeat: false; + interval: 8000 + running: false + repeat: false onTriggered: { stopAudioLoopback(); } @@ -339,15 +339,15 @@ Flickable { ButtonGroup { id: outputDeviceButtonGroup } ListView { - id: outputDeviceListView; + id: outputDeviceListView anchors.left: parent.left anchors.right: parent.right Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin - interactive: false; - height: contentItem.height; - spacing: 4; - clip: true; - model: AudioScriptingInterface.devices.output; + interactive: false + height: contentItem.height + spacing: 4 + clip: true + model: AudioScriptingInterface.devices.output delegate: Item { width: parent.width height: outputDeviceCheckbox.height @@ -356,7 +356,7 @@ Flickable { id: outputDeviceCheckbox anchors.left: parent.left width: parent.width - checked: selectedDesktop; + checked: selectedDesktop text: model.devicename ButtonGroup.group: outputDeviceButtonGroup onClicked: { @@ -367,9 +367,9 @@ Flickable { } SimplifiedControls.Button { - property var sound: null; - property var sample: null; - property bool isPlaying: false; + property var sound: null + property var sample: null + property bool isPlaying: false function createSampleSound() { sound = ApplicationInterface.getSampleSound(); sample = null; @@ -412,7 +412,7 @@ Flickable { height: 32 text: isPlaying ? "STOP TESTING" : "TEST YOUR SOUND" onClicked: { - isPlaying ? stopSound() : playSound(); + isPlaying ? stopSound() : playSound() } } } diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml index d719c20178..313daab704 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml @@ -64,7 +64,7 @@ Original.Button { border.color: root.enabled ? simplifiedUI.colors.controls.button.border.enabled : simplifiedUI.colors.controls.button.border.disabled Item { - clip: true; + clip: true visible: root.enabled anchors.centerIn: parent width: parent.width - parent.border.width * 2 diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml index 0d26623ce9..afac03d6b3 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml @@ -27,7 +27,7 @@ Original.CheckBox { property alias checkBoxRadius: checkBoxIndicator.radius property alias checkSize: innerBox.width property alias checkRadius: innerBox.radius - property bool wrapLabel: true; + property bool wrapLabel: true property alias labelFontFamily: checkBoxLabel.font.family property alias labelFontSize: checkBoxLabel.font.pixelSize property alias labelFontWeight: checkBoxLabel.font.weight @@ -77,9 +77,9 @@ Original.CheckBox { id: checkBoxLabel text: root.text color: root.color - font.family: "Graphik"; - font.pixelSize: 14; - font.weight: Font.DemiBold; + font.family: "Graphik" + font.pixelSize: 14 + font.weight: Font.DemiBold x: 2 verticalAlignment: Text.AlignVCenter wrapMode: root.wrapLabel ? Text.Wrap : Text.NoWrap diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/InputPeak.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/InputPeak.qml index 6ad82895df..c8440dc7d6 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/InputPeak.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/InputPeak.qml @@ -12,88 +12,88 @@ import QtQuick 2.10 import QtGraphicalEffects 1.0 Item { - property var peak; + property var peak property alias showMuted: status.visible - width: 70; - height: 8; + width: 70 + height: 8 QtObject { - id: colors; + id: colors - readonly property string unmuted: "#FFF"; - readonly property string muted: "#E2334D"; - readonly property string gutter: "#575757"; - readonly property string greenStart: "#39A38F"; - readonly property string greenEnd: "#1FC6A6"; - readonly property string yellow: "#C0C000"; - readonly property string red: colors.muted; - readonly property string fill: "#55000000"; + readonly property string unmuted: "#FFF" + readonly property string muted: "#E2334D" + readonly property string gutter: "#575757" + readonly property string greenStart: "#39A38F" + readonly property string greenEnd: "#1FC6A6" + readonly property string yellow: "#C0C000" + readonly property string red: colors.muted + readonly property string fill: "#55000000" } Text { - id: status; + id: status anchors { - horizontalCenter: parent.horizontalCenter; - verticalCenter: parent.verticalCenter; + horizontalCenter: parent.horizontalCenter + verticalCenter: parent.verticalCenter } - visible: false; - color: colors.muted; + visible: false + color: colors.muted - text: "MUTED"; - font.pointSize: 10; + text: "MUTED" + font.pointSize: 10 } Item { - id: bar; + id: bar - width: parent.width; - height: parent.height; + width: parent.width + height: parent.height anchors { fill: parent } - visible: !status.visible; + visible: !status.visible Rectangle { // base - radius: 4; + radius: 4 anchors { fill: parent } - color: colors.gutter; + color: colors.gutter } Rectangle { // mask - id: mask; - width: parent.width * peak; - radius: 5; + id: mask + width: parent.width * peak + radius: 5 anchors { - bottom: parent.bottom; - bottomMargin: 0; - top: parent.top; - topMargin: 0; - left: parent.left; - leftMargin: 0; + bottom: parent.bottom + bottomMargin: 0 + top: parent.top + topMargin: 0 + left: parent.left + leftMargin: 0 } } LinearGradient { anchors { fill: mask } source: mask - start: Qt.point(0, 0); - end: Qt.point(bar.width, 0); + start: Qt.point(0, 0) + end: Qt.point(bar.width, 0) gradient: Gradient { GradientStop { - position: 0; - color: colors.greenStart; + position: 0 + color: colors.greenStart } GradientStop { - position: 0.5; - color: colors.greenEnd; + position: 0.5 + color: colors.greenEnd } GradientStop { - position: 1; - color: colors.yellow; + position: 1 + color: colors.yellow } } } diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml index b1e4958f48..59c4fa26e4 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml @@ -25,7 +25,7 @@ RadioButton { property alias labelFontSize: radioButtonLabel.font.pixelSize property int radioButtonRadius: 14 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) focusPolicy: Qt.ClickFocus hoverEnabled: true