Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-04-29 22:42:42 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

adjust settings layout according to mockups, update style9

Browse source
This commit is contained in:
Alexander Ivash 2018-05-18 03:47:09 +03:00
parent b7614684de
commit 6efcea2c27
3 changed files with 28 additions and 17 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

5
interface/resources/qml/controls-uit/RadioButton.qml
View file

@ -25,6 +25,8 @@ Original.RadioButton {
property int colorScheme: hifi.colorSchemes.light property int colorScheme: hifi.colorSchemes.light
readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light readonly property bool isLightColorScheme: colorScheme == hifi.colorSchemes.light
property real letterSpacing: 1
property int fontSize: hifi.fontSizes.inputLabel
property int boxSize: defaultBoxSize property int boxSize: defaultBoxSize
property real scaleFactor: boxSize / defaultBoxSize property real scaleFactor: boxSize / defaultBoxSize
@ -81,7 +83,8 @@ Original.RadioButton {
contentItem: RalewaySemiBold { contentItem: RalewaySemiBold {
text: radioButton.text text: radioButton.text
size: hifi.fontSizes.inputLabel size: radioButton.fontSize
font.letterSpacing: letterSpacing
color: isLightColorScheme ? hifi.colors.lightGray : hifi.colors.lightGrayText color: isLightColorScheme ? hifi.colors.lightGray : hifi.colors.lightGrayText
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter

37
interface/resources/qml/hifi/avatarapp/Settings.qml
View file

@ -74,8 +74,7 @@ Rectangle {
spacing: 17 spacing: 17
RalewaySemiBold { TextStyle9 {
size: 14;
text: "Avatar Scale" text: "Avatar Scale"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
@ -170,11 +169,10 @@ Rectangle {
columns: 3 columns: 3
RalewaySemiBold { TextStyle9 {
Layout.row: 0 Layout.row: 0
Layout.column: 0 Layout.column: 0
size: 14;
text: "Dominant Hand" text: "Dominant Hand"
} }
@ -187,13 +185,15 @@ Rectangle {
Layout.row: 0 Layout.row: 0
Layout.column: 1 Layout.column: 1
Layout.leftMargin: -18 Layout.leftMargin: -40
ButtonGroup.group: leftRight ButtonGroup.group: leftRight
checked: true checked: true
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
text: "Left hand" fontSize: 17
letterSpacing: 1.4
text: "Left"
boxSize: 20 boxSize: 20
} }
@ -202,18 +202,21 @@ Rectangle {
Layout.row: 0 Layout.row: 0
Layout.column: 2 Layout.column: 2
Layout.rightMargin: 20
ButtonGroup.group: leftRight ButtonGroup.group: leftRight
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
text: "Right hand" fontSize: 17
letterSpacing: 1.4
text: "Right"
boxSize: 20 boxSize: 20
} }
RalewaySemiBold { TextStyle9 {
Layout.row: 1 Layout.row: 1
Layout.column: 0 Layout.column: 0
size: 14;
text: "Avatar Collisions" text: "Avatar Collisions"
} }
@ -226,10 +229,12 @@ Rectangle {
Layout.row: 1 Layout.row: 1
Layout.column: 1 Layout.column: 1
Layout.leftMargin: -18 Layout.leftMargin: -40
ButtonGroup.group: onOff ButtonGroup.group: onOff
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
checked: true checked: true
text: "ON" text: "ON"
@ -245,8 +250,12 @@ Rectangle {
Layout.row: 1 Layout.row: 1
Layout.column: 2 Layout.column: 2
Layout.rightMargin: 20
ButtonGroup.group: onOff ButtonGroup.group: onOff
colorScheme: hifi.colorSchemes.light colorScheme: hifi.colorSchemes.light
fontSize: 17
letterSpacing: 1.4
text: "OFF" text: "OFF"
boxSize: 20 boxSize: 20
@ -262,8 +271,7 @@ Rectangle {
spacing: 4 spacing: 4
RalewaySemiBold { TextStyle9 {
size: 14;
text: "Avatar Animation JSON" text: "Avatar Animation JSON"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@ -271,6 +279,7 @@ Rectangle {
InputTextStyle4 { InputTextStyle4 {
id: avatarAnimationUrlInputText id: avatarAnimationUrlInputText
font.pixelSize: 17
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
placeholderText: 'user\\file\\dir' placeholderText: 'user\\file\\dir'
@ -286,8 +295,7 @@ Rectangle {
spacing: 4 spacing: 4
RalewaySemiBold { TextStyle9 {
size: 14;
text: "Avatar collision sound URL (optional)" text: "Avatar collision sound URL (optional)"
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
@ -295,6 +303,7 @@ Rectangle {
InputTextStyle4 { InputTextStyle4 {
id: avatarCollisionSoundUrlInputText id: avatarCollisionSoundUrlInputText
font.pixelSize: 17
anchors.left: parent.left anchors.left: parent.left
anchors.right: parent.right anchors.right: parent.right
placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-' placeholderText: 'https://hifi-public.s3.amazonaws.com/sounds/Collisions-'

3
interface/resources/qml/hifi/avatarapp/TextStyle9.qml
View file

@ -2,6 +2,5 @@ import "../../controls" as HifiControls
import "../../styles-uit" import "../../styles-uit"
RalewaySemiBold { RalewaySemiBold {
size: 14; size: 17;
font.letterSpacing: 1.1
} }