Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-07-19 17:49:54 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

It's working

Browse source
This commit is contained in:
Zach Fox 2019-08-16 16:00:30 -07:00
parent 4c006c50aa
commit 3de9f44bf3
1 changed files with 137 additions and 53 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

190
interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml
View file

@ -21,7 +21,7 @@ Item {
property int mainTextSize: 18 property int mainTextSize: 18
property int subTextSize: 14 property int subTextSize: 14
property color separatorColor: "#CCCCCC" property color separatorColor: "#CCCCCC"
height: controlsTableColumnLayout.height Layout.preferredHeight: controlsTableColumnLayout.height
// Top separator // Top separator
Rectangle { Rectangle {
@ -43,7 +43,8 @@ Item {
// Bottom separator // Bottom separator
Rectangle { Rectangle {
anchors.bottom: controlsTableColumnLayout.bottom anchors.top: controlsTableColumnLayout.top
anchors.topMargin: controlsTableRoot.height
anchors.left: controlsTableColumnLayout.left anchors.left: controlsTableColumnLayout.left
width: parent.width width: parent.width
height: 1 height: 1
@ -68,11 +69,11 @@ Item {
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
Image { Image {
source: "images/rightClick.svg" source: "images/rightClick.svg"
@ -92,9 +93,15 @@ Item {
} }
} }
// Spacer
Item {
width: controlsTableRoot.rowPadding
height: parent.height
}
Row { Row {
width: controlsTableRoot.column2Width width: controlsTableRoot.column2Width
height: controlsTableRoot.rowHeight height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
@ -110,7 +117,7 @@ Item {
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Right-click and drag to look around" text: "Right-click and drag to look around"
width: parent.width - cameraText.width - parent.spacing width: parent.width - cameraText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -121,17 +128,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "W / ↑" text: "W / ↑"
@ -154,13 +168,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Walk Forward" text: "Walk Forward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -168,17 +182,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "S / ↓" text: "S / ↓"
@ -201,13 +222,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Walk Backward" text: "Walk Backward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -215,17 +236,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "A / ←" text: "A / ←"
@ -248,13 +276,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Turn Left" text: "Turn Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -262,17 +290,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "A / →" text: "A / →"
@ -295,13 +330,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Turn Right" text: "Turn Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -309,17 +344,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Q" text: "Q"
@ -342,13 +384,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Sidestep Left" text: "Sidestep Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -356,17 +398,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "E" text: "E"
@ -389,13 +438,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Sidestep Right" text: "Sidestep Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -403,17 +452,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Shift" text: "Shift"
@ -436,12 +492,12 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
Row { Row {
width: controlsTableRoot.column2Width width: controlsTableRoot.column2Width
height: controlsTableRoot.rowHeight height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
@ -457,7 +513,7 @@ Item {
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Example: Shift + W" text: "Example: Shift + W"
width: parent.width - runText.width - parent.spacing width: parent.width - runText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -468,17 +524,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Space" text: "Space"
@ -501,12 +564,12 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
Row { Row {
width: controlsTableRoot.column2Width width: controlsTableRoot.column2Width
height: controlsTableRoot.rowHeight height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
@ -522,7 +585,7 @@ Item {
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "Stand Up only while seated" text: "Stand Up only while seated"
width: parent.width - jumpText.width - parent.spacing width: parent.width - jumpText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -533,17 +596,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "1" text: "1"
@ -566,13 +636,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "1st Person View" text: "1st Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize
@ -580,17 +650,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "2" text: "2"
@ -613,12 +690,12 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
Row { Row {
width: controlsTableRoot.column2Width width: controlsTableRoot.column2Width
height: controlsTableRoot.rowHeight height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
@ -634,7 +711,7 @@ Item {
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "See your own avatar" text: "See your own avatar"
width: parent.width - mirrorText.width - parent.spacing width: parent.width - mirrorText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
@ -645,17 +722,24 @@ Item {
} }
} }
// Bottom separator
Rectangle {
Layout.preferredWidth: parent.width
Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor
}
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
Item { Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: controlsTableRoot.rowHeight height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "3" text: "3"
@ -678,13 +762,13 @@ Item {
// Spacer // Spacer
Item { Item {
width: controlsTableRoot.rowPadding width: controlsTableRoot.rowPadding
height: controlsTableRoot.rowHeight height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.GraphikRegular {
text: "3rd Person View" text: "3rd Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: controlsTableRoot.rowHeight height: parent.height
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
size: controlsTableRoot.mainTextSize size: controlsTableRoot.mainTextSize