diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index 2d94726768..840a2bb69a 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -66,17 +66,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: volumeControlsSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Set your HQ's audio output levels. Change \"People Volume\" to control how loud others sound to you." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - SimplifiedControls.Slider { id: peopleVolume anchors.left: parent.left @@ -149,17 +138,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: micControlsSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "These settings let you configure how you communicate with others in your HQ while in Desktop mode. Push to Talk works like a walkie-talkie!" - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: micControlsSwitchGroup Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin @@ -202,17 +180,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: inputDeviceSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Here are all of the input devices and microphones that we found. Select the one you'd like to use in your HQ while in Desktop mode." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ButtonGroup { id: inputDeviceButtonGroup } ListView { @@ -312,17 +279,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: outputDeviceSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Here are all of the output devices that we found. Select the one you'd like to use in your HQ while in Desktop mode." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ButtonGroup { id: outputDeviceButtonGroup } ListView { diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index cc5fd7118c..cabea8f6d5 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -59,17 +59,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: avatarNameTagsSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Control how nametags appear over other peoples' heads in your HQ. \"Click to View\" allows you to click anyone to see their name." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: avatarNameTagsRadioButtonGroup Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin @@ -117,17 +106,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: performanceSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Modify how this application uses system resources and impacts battery life." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: performanceRadioButtonGroup Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin @@ -163,17 +141,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: cameraSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Change your point of view by selecting either first or third person view. Try scrolling your mouse wheel." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: cameraRadioButtonGroup Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml index cea9fa8318..a462af0722 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml @@ -66,17 +66,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: controlsSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Everyone responds to VR movement differently. Choose the setting that is most comfortable for you. Try using \"Default\" first." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: controlsRadioButtonGroup width: parent.width @@ -162,17 +151,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: micControlsSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "These settings let you configure how you communicate with others in your HQ while in VR mode. Push to Talk works like a walkie-talkie!" - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ColumnLayout { id: micControlsSwitchGroup Layout.topMargin: simplifiedUI.margins.settings.settingsGroupTopMargin @@ -215,17 +193,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: inputDeviceSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Here are all of the input devices and microphones that we found. Select the one you'd like to use in your HQ while in VR mode." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ButtonGroup { id: inputDeviceButtonGroup } ListView { @@ -325,17 +292,6 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { - id: outputDeviceSubtitle - Layout.topMargin: simplifiedUI.margins.settings.subtitleTopMargin - text: "Here are all of the output devices that we found. Select the one you'd like to use in your HQ while in VR mode." - wrapMode: Text.Wrap - Layout.maximumWidth: parent.width - height: paintedHeight - size: 14 - color: simplifiedUI.colors.text.darkGrey - } - ButtonGroup { id: outputDeviceButtonGroup } ListView {