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

Replace Graphik with Fira Sans

Browse source
This commit is contained in:
Dale Glass 2022-08-07 14:01:42 +02:00
parent b10123400f
commit 1332d9d35e
30 changed files with 217 additions and 217 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

18
interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml
View file

@ -143,7 +143,7 @@ Rectangle {
anchors.rightMargin: 26 anchors.rightMargin: 26
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "Stand out from the crowd!" text: "Stand out from the crowd!"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -154,7 +154,7 @@ Rectangle {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Create your custom avatar." text: "Create your custom avatar."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -185,7 +185,7 @@ Rectangle {
fillMode: Image.PreserveAspectFit fillMode: Image.PreserveAspectFit
} }
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "Scan for Mobile App" text: "Scan for Mobile App"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -216,7 +216,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.rightMargin: 24 anchors.rightMargin: 24
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: yourAvatarsTitle id: yourAvatarsTitle
text: "Your Avatars" text: "Your Avatars"
anchors.top: parent.top anchors.top: parent.top
@ -225,7 +225,7 @@ Rectangle {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
size: 22 size: 22
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: yourAvatarsSubtitle id: yourAvatarsSubtitle
text: "These are the avatars that you've created and uploaded via the Avatar Creator." text: "These are the avatars that you've created and uploaded via the Avatar Creator."
width: parent.width width: parent.width
@ -274,7 +274,7 @@ Rectangle {
anchors.right: parent.right anchors.right: parent.right
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
visible: !emptyInventoryContainer.visible visible: !emptyInventoryContainer.visible
AnimatedImage { AnimatedImage {
visible: !(inventoryContentsList.visible || errorText.visible) visible: !(inventoryContentsList.visible || errorText.visible)
anchors.centerIn: parent anchors.centerIn: parent
@ -301,14 +301,14 @@ Rectangle {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: errorText id: errorText
text: "" text: ""
visible: text !== "" visible: text !== ""
anchors.fill: parent anchors.fill: parent
size: 22 size: 22
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
wrapMode: Text.Wrap wrapMode: Text.Wrap
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
} }
@ -337,7 +337,7 @@ Rectangle {
return; return;
} }
} }
root.avatarPreviewUrl = "../../images/defaultAvatar.svg"; root.avatarPreviewUrl = "../../images/defaultAvatar.svg";
} }

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

@ -16,7 +16,7 @@ import QtGraphicalEffects 1.0
Rectangle { Rectangle {
id: root id: root
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
} }
@ -33,7 +33,7 @@ Rectangle {
height: 102 height: 102
width: parent.width width: parent.width
color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent" color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent"
Rectangle { Rectangle {
id: borderMask id: borderMask
@ -75,7 +75,7 @@ Rectangle {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: avatarName id: avatarName
text: root.itemName text: root.itemName
anchors.left: itemPreviewImage.right anchors.left: itemPreviewImage.right

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

@ -69,7 +69,7 @@ Item {
anchors.leftMargin: 21 anchors.leftMargin: 21
anchors.verticalCenter: parent.verticalCenter anchors.verticalCenter: parent.verticalCenter
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: displayNameLabel id: displayNameLabel
text: "Display Name" text: "Display Name"
color: simplifiedUI.colors.text.lightGrey color: simplifiedUI.colors.text.lightGrey

4
interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml
View file

@ -27,7 +27,7 @@ Rectangle {
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
} }
focus: true focus: true
Component.onCompleted: { Component.onCompleted: {
@ -110,7 +110,7 @@ Rectangle {
width: tabTitleText.paintedWidth + 32 width: tabTitleText.paintedWidth + 32
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: tabTitleText id: tabTitleText
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
anchors.fill: parent anchors.fill: parent

40
interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml
View file

@ -65,14 +65,14 @@ Flickable {
anchors.rightMargin: 26 anchors.rightMargin: 26
anchors.top: parent.top anchors.top: parent.top
spacing: 0 spacing: 0
ColumnLayout { ColumnLayout {
id: platformInfoContainer id: platformInfoContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.bottomMargin: 24 Layout.bottomMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "About Your Configuration" text: "About Your Configuration"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 16 Layout.topMargin: 16
@ -83,7 +83,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Use the button below to get a copy to share with us." text: "Use the button below to get a copy to share with us."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.bottomMargin: 8 Layout.bottomMargin: 8
@ -93,7 +93,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Version " + Window.checkVersion() text: "Version " + Window.checkVersion()
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 8 Layout.topMargin: 8
@ -104,7 +104,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "Platform Info" text: "Platform Info"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 8 Layout.topMargin: 8
@ -115,7 +115,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>Computer Vendor/Model:</b>" text: "<b>Computer Vendor/Model:</b>"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -138,7 +138,7 @@ Flickable {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>Profiled Platform Tier:</b> " + PlatformInfo.getTierProfiled() text: "<b>Profiled Platform Tier:</b> " + PlatformInfo.getTierProfiled()
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -147,7 +147,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>OS Type:</b> " + PlatformInfo.getOperatingSystemType() text: "<b>OS Type:</b> " + PlatformInfo.getOperatingSystemType()
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -156,14 +156,14 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>CPU:</b>" text: "<b>CPU:</b>"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
size: 16 size: 16
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
wrapMode: Text.Wrap wrapMode: Text.Wrap
Component.onCompleted: { Component.onCompleted: {
var cpu = JSON.parse(PlatformInfo.getCPU(0)); var cpu = JSON.parse(PlatformInfo.getCPU(0));
var cpuModel = cpu.model; var cpuModel = cpu.model;
@ -175,7 +175,7 @@ Flickable {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b># CPUs:</b> " + PlatformInfo.getNumCPUs() text: "<b># CPUs:</b> " + PlatformInfo.getNumCPUs()
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -184,7 +184,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b># CPU Cores:</b> " + PlatformInfo.getNumLogicalCores() text: "<b># CPU Cores:</b> " + PlatformInfo.getNumLogicalCores()
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -193,7 +193,7 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>RAM:</b> " + PlatformInfo.getTotalSystemMemoryMB() + " MB" text: "<b>RAM:</b> " + PlatformInfo.getTotalSystemMemoryMB() + " MB"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -202,14 +202,14 @@ Flickable {
wrapMode: Text.Wrap wrapMode: Text.Wrap
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>GPU:</b> " text: "<b>GPU:</b> "
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
size: 16 size: 16
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
wrapMode: Text.Wrap wrapMode: Text.Wrap
Component.onCompleted: { Component.onCompleted: {
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU())); var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
var gpuModel = gpu.model; var gpuModel = gpu.model;
@ -221,7 +221,7 @@ Flickable {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>VR Hand Controllers:</b> " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) text: "<b>VR Hand Controllers:</b> " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"))
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -251,7 +251,7 @@ Flickable {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>Audio Input:</b> " + audioInputDevices.selectedInputDeviceName text: "<b>Audio Input:</b> " + audioInputDevices.selectedInputDeviceName
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -282,7 +282,7 @@ Flickable {
} }
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "<b>Audio Output:</b> " + audioOutputDevices.selectedOutputDeviceName text: "<b>Audio Output:</b> " + audioOutputDevices.selectedOutputDeviceName
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -335,7 +335,7 @@ Flickable {
textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n"; textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n";
textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n"; textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n";
textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n"; textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n";
var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU())); var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU()));
var gpuModel = gpu.model; var gpuModel = gpu.model;
if (!gpuModel || gpuModel.length === 0) { if (!gpuModel || gpuModel.length === 0) {
@ -346,7 +346,7 @@ Flickable {
textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) + "\n"; textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) + "\n";
textToCopy += "Audio Input: " + audioInputDevices.selectedInputDeviceName + "\n"; textToCopy += "Audio Input: " + audioInputDevices.selectedInputDeviceName + "\n";
textToCopy += "Audio Output: " + audioOutputDevices.selectedOutputDeviceName + "\n"; textToCopy += "Audio Output: " + audioOutputDevices.selectedOutputDeviceName + "\n";
textToCopy += "\n**All Platform Info**\n"; textToCopy += "\n**All Platform Info**\n";
textToCopy += JSON.stringify(JSON.parse(PlatformInfo.getPlatform()), null, 4); textToCopy += JSON.stringify(JSON.parse(PlatformInfo.getPlatform()), null, 4);

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

@ -22,7 +22,7 @@ Item {
property int subTextSize: 14 property int subTextSize: 14
property color separatorColor: "#CCCCCC" property color separatorColor: "#CCCCCC"
Layout.preferredHeight: controlsTableColumnLayout.height Layout.preferredHeight: controlsTableColumnLayout.height
// Top separator // Top separator
Rectangle { Rectangle {
anchors.top: controlsTableColumnLayout.top anchors.top: controlsTableColumnLayout.top
@ -59,7 +59,7 @@ Item {
height: controlsTableColumnLayout.height height: controlsTableColumnLayout.height
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
ColumnLayout { ColumnLayout {
id: controlsTableColumnLayout id: controlsTableColumnLayout
anchors.left: parent.left anchors.left: parent.left
@ -104,7 +104,7 @@ Item {
height: parent.height height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: cameraText id: cameraText
text: "Camera" text: "Camera"
width: paintedWidth width: paintedWidth
@ -115,7 +115,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Right-click and drag to look around" text: "Right-click and drag to look around"
width: parent.width - cameraText.width - parent.spacing - controlsTableRoot.rowPadding width: parent.width - cameraText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
@ -134,11 +134,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -147,7 +147,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "W / ↑" text: "W / ↑"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -171,7 +171,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Walk Forward" text: "Walk Forward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -188,11 +188,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -201,7 +201,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "S / ↓" text: "S / ↓"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -225,7 +225,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Walk Backward" text: "Walk Backward"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -242,11 +242,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -255,7 +255,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "A / ←" text: "A / ←"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -279,7 +279,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Turn Left" text: "Turn Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -296,11 +296,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -309,7 +309,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "D / →" text: "D / →"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -333,7 +333,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Turn Right" text: "Turn Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -350,11 +350,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -363,7 +363,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Q" text: "Q"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -387,7 +387,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Sidestep Left" text: "Sidestep Left"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -404,11 +404,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -417,7 +417,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "E" text: "E"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -441,7 +441,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Sidestep Right" text: "Sidestep Right"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -458,11 +458,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -471,7 +471,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Shift" text: "Shift"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -500,7 +500,7 @@ Item {
height: parent.height height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: runText id: runText
text: "Hold + Direction to Run" text: "Hold + Direction to Run"
width: paintedWidth width: paintedWidth
@ -511,7 +511,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Example: Shift + W" text: "Example: Shift + W"
width: parent.width - runText.width - parent.spacing - controlsTableRoot.rowPadding width: parent.width - runText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
@ -530,11 +530,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -543,7 +543,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Space" text: "Space"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -572,7 +572,7 @@ Item {
height: parent.height height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: jumpText id: jumpText
text: "Jump / Stand Up" text: "Jump / Stand Up"
width: paintedWidth width: paintedWidth
@ -583,7 +583,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Stand Up only while seated" text: "Stand Up only while seated"
width: parent.width - jumpText.width - parent.spacing - controlsTableRoot.rowPadding width: parent.width - jumpText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
@ -602,11 +602,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -615,7 +615,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "1" text: "1"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -639,7 +639,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "1st Person View" text: "1st Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height
@ -656,11 +656,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -669,7 +669,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "2" text: "2"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -698,7 +698,7 @@ Item {
height: parent.height height: parent.height
spacing: controlsTableRoot.rowPadding spacing: controlsTableRoot.rowPadding
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: selfieText id: selfieText
text: "Selfie" text: "Selfie"
width: paintedWidth width: paintedWidth
@ -709,7 +709,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Look at self" text: "Look at self"
width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding
height: parent.height height: parent.height
@ -728,11 +728,11 @@ Item {
Layout.preferredHeight: 1 Layout.preferredHeight: 1
color: controlsTableRoot.separatorColor color: controlsTableRoot.separatorColor
} }
Row { Row {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: controlsTableRoot.rowHeight Layout.preferredHeight: controlsTableRoot.rowHeight
@ -741,7 +741,7 @@ Item {
width: controlsTableRoot.column1Width width: controlsTableRoot.column1Width
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "3" text: "3"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -765,7 +765,7 @@ Item {
height: parent.height height: parent.height
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "3rd Person View" text: "3rd Person View"
width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2
height: parent.height height: parent.height

4
interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml
View file

@ -57,7 +57,7 @@ Flickable {
anchors.top: parent.top anchors.top: parent.top
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "HQ Controls" text: "HQ Controls"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 16 Layout.topMargin: 16
@ -66,7 +66,7 @@ Flickable {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "You can use the following controls to move your avatar around your HQ:" text: "You can use the following controls to move your avatar around your HQ:"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
wrapMode: Text.Wrap wrapMode: Text.Wrap

8
interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml
View file

@ -51,7 +51,7 @@ Item {
anchors.top: parent.top anchors.top: parent.top
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "FAQ" text: "FAQ"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -60,7 +60,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "You can find answers to all of our frequently asked questions by clicking the button below." text: "You can find answers to all of our frequently asked questions by clicking the button below."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -82,7 +82,7 @@ Item {
} }
} }
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "Having problems with your audio?" text: "Having problems with your audio?"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -91,7 +91,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "Quickly check your audio configuration and make changes to resolve any audio input/output issues." text: "Quickly check your audio configuration and make changes to resolve any audio input/output issues."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight

4
interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml
View file

@ -49,7 +49,7 @@ Item {
anchors.top: parent.top anchors.top: parent.top
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "Support" text: "Support"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight
@ -58,7 +58,7 @@ Item {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "You can quickly get the support that you need by clicking the button below." text: "You can quickly get the support that you need by clicking the button below."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.preferredHeight: paintedHeight Layout.preferredHeight: paintedHeight

6
interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
View file

@ -27,8 +27,8 @@ Rectangle {
SimplifiedConstants.SimplifiedConstants { SimplifiedConstants.SimplifiedConstants {
id: simplifiedUI id: simplifiedUI
} }
focus: true focus: true
Keys.onPressed: { Keys.onPressed: {
if ((event.key == Qt.Key_D) && (event.modifiers & Qt.ControlModifier && event.modifiers & Qt.AltModifier && event.modifiers & Qt.ShiftModifier)) { if ((event.key == Qt.Key_D) && (event.modifiers & Qt.ControlModifier && event.modifiers & Qt.AltModifier && event.modifiers & Qt.ShiftModifier)) {
var currentSetting = Settings.getValue("simplifiedUI/developerModeEnabled", false); var currentSetting = Settings.getValue("simplifiedUI/developerModeEnabled", false);
@ -128,7 +128,7 @@ Rectangle {
width: tabTitleText.paintedWidth + 32 width: tabTitleText.paintedWidth + 32
height: parent.height height: parent.height
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: tabTitleText id: tabTitleText
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
anchors.fill: parent anchors.fill: parent

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

@ -67,14 +67,14 @@ Flickable {
anchors.rightMargin: 26 anchors.rightMargin: 26
anchors.top: parent.top anchors.top: parent.top
spacing: simplifiedUI.margins.settings.spacingBetweenSettings spacing: simplifiedUI.margins.settings.spacingBetweenSettings
ColumnLayout { ColumnLayout {
id: volumeControlsContainer id: volumeControlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
Layout.topMargin: 24 Layout.topMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: volumeControlsTitle id: volumeControlsTitle
text: "Volume Controls" text: "Volume Controls"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -165,13 +165,13 @@ Flickable {
} }
} }
} }
ColumnLayout { ColumnLayout {
id: micControlsContainer id: micControlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: micControlsTitle id: micControlsTitle
text: "Default Mute Controls" text: "Default Mute Controls"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -241,7 +241,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: inputDeviceTitle id: inputDeviceTitle
text: "Which input device?" text: "Which input device?"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -293,7 +293,7 @@ Flickable {
SimplifiedControls.Button { SimplifiedControls.Button {
id: audioLoopbackButton id: audioLoopbackButton
property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho() property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho()
function startAudioLoopback() { function startAudioLoopback() {
if (!audioLoopedBack) { if (!audioLoopedBack) {
audioLoopedBack = true; audioLoopedBack = true;
@ -336,7 +336,7 @@ Flickable {
Layout.bottomMargin: 24 Layout.bottomMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: outputDeviceTitle id: outputDeviceTitle
text: "Which output device?" text: "Which output device?"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width

6
interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml
View file

@ -57,7 +57,7 @@ Flickable {
anchors.rightMargin: 26 anchors.rightMargin: 26
anchors.top: parent.top anchors.top: parent.top
spacing: simplifiedUI.margins.settings.spacingBetweenSettings spacing: simplifiedUI.margins.settings.spacingBetweenSettings
ColumnLayout { ColumnLayout {
id: uiControlsContainer id: uiControlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -65,7 +65,7 @@ Flickable {
Layout.bottomMargin: 24 Layout.bottomMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: uiControlsTitle id: uiControlsTitle
text: "User Interface" text: "User Interface"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -74,7 +74,7 @@ Flickable {
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: uiControlsSubtitle id: uiControlsSubtitle
text: "You'll have to restart Interface after changing either of these settings. If you don't get any Toolbar apps back after restarting, run defaultScripts.js manually." text: "You'll have to restart Interface after changing either of these settings. If you don't get any Toolbar apps back after restarting, run defaultScripts.js manually."
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width

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

@ -69,7 +69,7 @@ Flickable {
Layout.topMargin: 24 Layout.topMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: avatarNameTagsTitle id: avatarNameTagsTitle
text: "Avatar Name Tags" text: "Avatar Name Tags"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -117,7 +117,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: emoteTitle id: emoteTitle
text: "Emote UI" text: "Emote UI"
Layout.maximumWidth: parent.width Layout.maximumWidth: parent.width
@ -140,7 +140,7 @@ Flickable {
onClicked: { onClicked: {
var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true); var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true);
Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting); Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting);
} }
Connections { Connections {
target: Settings target: Settings
@ -160,7 +160,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: performanceTitle id: performanceTitle
text: "Graphics Settings" text: "Graphics Settings"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -217,7 +217,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: cameraTitle id: cameraTitle
text: "Camera View" text: "Camera View"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -258,7 +258,7 @@ Flickable {
Camera.mode = "selfie" Camera.mode = "selfie"
} }
} }
Connections { Connections {
target: Camera target: Camera
@ -289,7 +289,7 @@ Flickable {
Layout.bottomMargin: 24 Layout.bottomMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: logoutText id: logoutText
text: (AccountServices.username === "Unknown user" ? "Log In" : "Logout " + AccountServices.username) text: (AccountServices.username === "Unknown user" ? "Log In" : "Logout " + AccountServices.username)
wrapMode: Text.Wrap wrapMode: Text.Wrap

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

@ -74,7 +74,7 @@ Flickable {
Layout.topMargin: 24 Layout.topMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: controlsTitle id: controlsTitle
text: "VR Movement Controls" text: "VR Movement Controls"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -159,7 +159,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "VR Rotation Mode" text: "VR Rotation Mode"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
height: paintedHeight height: paintedHeight
@ -193,13 +193,13 @@ Flickable {
} }
} }
} }
ColumnLayout { ColumnLayout {
id: micControlsContainer id: micControlsContainer
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: micControlsTitle id: micControlsTitle
text: "Default Mute Controls" text: "Default Mute Controls"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -242,7 +242,7 @@ Flickable {
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: inputDeviceTitle id: inputDeviceTitle
text: "Which input device?" text: "Which input device?"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width
@ -265,7 +265,7 @@ Flickable {
width: parent.width width: parent.width
height: model.type != "desktop" ? inputDeviceCheckbox.height + simplifiedUI.margins.settings.spacingBetweenRadiobuttons : 0 height: model.type != "desktop" ? inputDeviceCheckbox.height + simplifiedUI.margins.settings.spacingBetweenRadiobuttons : 0
visible: model.type != "desktop" visible: model.type != "desktop"
SimplifiedControls.RadioButton { SimplifiedControls.RadioButton {
id: inputDeviceCheckbox id: inputDeviceCheckbox
anchors.left: parent.left anchors.left: parent.left
@ -295,7 +295,7 @@ Flickable {
SimplifiedControls.Button { SimplifiedControls.Button {
id: audioLoopbackButton id: audioLoopbackButton
property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho() property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho()
function startAudioLoopback() { function startAudioLoopback() {
if (!audioLoopedBack) { if (!audioLoopedBack) {
audioLoopedBack = true; audioLoopedBack = true;
@ -338,7 +338,7 @@ Flickable {
Layout.bottomMargin: 24 Layout.bottomMargin: 24
spacing: 0 spacing: 0
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: outputDeviceTitle id: outputDeviceTitle
text: "Which output device?" text: "Which output device?"
Layout.preferredWidth: parent.width Layout.preferredWidth: parent.width

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

@ -72,7 +72,7 @@ Original.Button {
anchors.centerIn: parent anchors.centerIn: parent
width: parent.width - parent.border.width * 2 width: parent.width - parent.border.width * 2
height: parent.height - parent.border.width * 2 height: parent.height - parent.border.width * 2
Rectangle { Rectangle {
z: -1 z: -1
clip: true clip: true
@ -96,9 +96,9 @@ Original.Button {
} }
} }
contentItem: HifiStylesUit.GraphikMedium { contentItem: HifiStylesUit.FiraSansMedium {
id: buttonText id: buttonText
topPadding: -2 // Necessary for proper alignment using Graphik Medium //topPadding: -2 // Necessary for proper alignment using Graphik Medium
wrapMode: Text.Wrap wrapMode: Text.Wrap
color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled
size: simplifiedUI.sizes.controls.button.textSize size: simplifiedUI.sizes.controls.button.textSize

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

@ -77,7 +77,7 @@ Original.CheckBox {
id: checkBoxLabel id: checkBoxLabel
text: root.text text: root.text
color: root.color color: root.color
font.family: "Graphik" font.family: "FiraSans"
font.pixelSize: 14 font.pixelSize: 14
font.weight: Font.DemiBold font.weight: Font.DemiBold
x: 2 x: 2

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

@ -88,7 +88,7 @@ RadioButton {
contentItem: Text { contentItem: Text {
id: radioButtonLabel id: radioButtonLabel
font.pixelSize: 14 font.pixelSize: 14
font.family: "Graphik" font.family: "FiraSans"
font.weight: Font.Normal font.weight: Font.Normal
text: root.text text: root.text
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
@ -98,6 +98,6 @@ RadioButton {
enabled: root.enabled enabled: root.enabled
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
leftPadding: radioButtonIndicator.width + root.labelLeftMargin leftPadding: radioButtonIndicator.width + root.labelLeftMargin
topPadding: -3 // For perfect alignment when using Graphik //topPadding: -3 // For perfect alignment when using Graphik
} }
} }

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

@ -33,7 +33,7 @@ Item {
property alias pressed: sliderControl.pressed property alias pressed: sliderControl.pressed
property real defaultValue: 0.0 property real defaultValue: 0.0
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: sliderText id: sliderText
text: "" text: ""
anchors.right: sliderControl.left anchors.right: sliderControl.left

6
interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml
View file

@ -147,7 +147,7 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: labelOff id: labelOff
text: "" text: ""
size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize
@ -195,7 +195,7 @@ Item {
anchors.top: parent.top anchors.top: parent.top
anchors.bottom: parent.bottom anchors.bottom: parent.bottom
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: labelOn id: labelOn
text: "" text: ""
size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize
@ -230,7 +230,7 @@ Item {
} else { } else {
originalSwitch.checked = true; originalSwitch.checked = true;
} }
root.clicked(); root.clicked();
} }
} }

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

@ -28,7 +28,7 @@ TextField {
property bool blankPlaceholderTextOnFocus: true property bool blankPlaceholderTextOnFocus: true
color: simplifiedUI.colors.text.white color: simplifiedUI.colors.text.white
font.family: "Graphik Medium" font.family: "FiraSans Medium"
font.pixelSize: 22 font.pixelSize: 22
selectionColor: simplifiedUI.colors.text.white selectionColor: simplifiedUI.colors.text.white
selectedTextColor: simplifiedUI.colors.text.darkGrey selectedTextColor: simplifiedUI.colors.text.darkGrey

4
interface/resources/qml/stylesUit/GraphikMedium.qml
View file

@ -1,5 +1,5 @@
// //
// GraphikMedium.qml // FiraSansMedium.qml
// //
// Created by Wayne Chen on 3 May 2019 // Created by Wayne Chen on 3 May 2019
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
@ -16,6 +16,6 @@ Text {
font.pixelSize: size font.pixelSize: size
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.family: "Graphik" font.family: "FiraSans"
font.weight: Font.Medium font.weight: Font.Medium
} }

4
interface/resources/qml/stylesUit/GraphikRegular.qml
View file

@ -1,5 +1,5 @@
// //
// GraphikRegular.qml // FiraSansRegular.qml
// //
// Created by Wayne Chen on 2 May 2019 // Created by Wayne Chen on 2 May 2019
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
@ -16,5 +16,5 @@ Text {
font.pixelSize: size font.pixelSize: size
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.family: "Graphik" font.family: "FiraSans"
} }

4
interface/resources/qml/stylesUit/GraphikSemiBold.qml
View file

@ -1,5 +1,5 @@
// //
// GraphikSemiBold.qml // FiraSansSemiBold.qml
// //
// Created by Wayne Chen on 2 May 2019 // Created by Wayne Chen on 2 May 2019
// Copyright 2019 High Fidelity, Inc. // Copyright 2019 High Fidelity, Inc.
@ -16,6 +16,6 @@ Text {
font.pixelSize: size font.pixelSize: size
verticalAlignment: Text.AlignVCenter verticalAlignment: Text.AlignVCenter
horizontalAlignment: Text.AlignLeft horizontalAlignment: Text.AlignLeft
font.family: "Graphik" font.family: "FiraSans"
font.weight: Font.DemiBold font.weight: Font.DemiBold
} }

6
interface/src/Application.cpp
View file

@ -1096,9 +1096,9 @@ Application::Application(
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf");
QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Medium.ttf");
_window->setWindowTitle("Overte"); _window->setWindowTitle("Overte");
Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us

10
launchers/win32/Launcher.rc
View file

@ -29,12 +29,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US
// TEXTINCLUDE // TEXTINCLUDE
// //
1 TEXTINCLUDE 1 TEXTINCLUDE
BEGIN BEGIN
"resource.h\0" "resource.h\0"
END END
2 TEXTINCLUDE 2 TEXTINCLUDE
BEGIN BEGIN
"#ifndef APSTUDIO_INVOKED\r\n" "#ifndef APSTUDIO_INVOKED\r\n"
"#include ""targetver.h""\r\n" "#include ""targetver.h""\r\n"
@ -44,7 +44,7 @@ BEGIN
"\0" "\0"
END END
3 TEXTINCLUDE 3 TEXTINCLUDE
BEGIN BEGIN
"#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_SPLITTER_RESOURCES\r\n"
"#define _AFX_NO_OLE_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n"
@ -77,9 +77,9 @@ IDR_MAINFRAME ICON "res\\interface.ico"
// BINARY // BINARY
// //
IDR_FONT_REGULAR BINARY "res\\Graphikregular.ttf" IDR_FONT_REGULAR BINARY "res\\FiraSansregular.ttf"
IDR_FONT_BOLD BINARY "res\\Graphikbold.ttf" IDR_FONT_BOLD BINARY "res\\FiraSansbold.ttf"
///////////////////////////////////////////////////////////////////////////// /////////////////////////////////////////////////////////////////////////////

42
launchers/win32/LauncherDlg.cpp
View file

@ -36,8 +36,8 @@ static COLORREF COLOR_LIGHTER_GREY = RGB(230, 230, 230);
static COLORREF COLOR_LIGHT_GREY = RGB(200, 200, 200); static COLORREF COLOR_LIGHT_GREY = RGB(200, 200, 200);
static COLORREF COLOR_BLUE = RGB(50, 160, 200); static COLORREF COLOR_BLUE = RGB(50, 160, 200);
static CString GRAPHIK_REGULAR = _T("Graphik-Regular"); static CString FIRASANS_REGULAR = _T("FiraSans-Regular");
static CString GRAPHIK_SEMIBOLD = _T("Graphik-Semibold"); static CString FIRASANS_SEMIBOLD = _T("FiraSans-SemiBold");
static CString TROUBLE_URL = _T("https://www.highfidelity.com/hq-support"); static CString TROUBLE_URL = _T("https://www.highfidelity.com/hq-support");
static CString TERMS_URL = _T("https://www.highfidelity.com/termsofservice"); static CString TERMS_URL = _T("https://www.highfidelity.com/termsofservice");
@ -91,13 +91,13 @@ BOOL CLauncherDlg::OnInitDialog() {
SetIcon(m_hIcon, FALSE); // Set small icon SetIcon(m_hIcon, FALSE); // Set small icon
CFont editFont; CFont editFont;
if (LauncherUtils::getFont(GRAPHIK_REGULAR, FIELDS_FONT_SIZE, true, editFont)) { if (LauncherUtils::getFont(FIRASANS_REGULAR, FIELDS_FONT_SIZE, true, editFont)) {
m_orgname.SetFont(&editFont); m_orgname.SetFont(&editFont);
m_username.SetFont(&editFont); m_username.SetFont(&editFont);
m_password.SetFont(&editFont); m_password.SetFont(&editFont);
} }
CFont buttonFont; CFont buttonFont;
if (LauncherUtils::getFont(_T("Graphik-Bold"), BUTTON_FONT_SIZE, true, buttonFont)) { if (LauncherUtils::getFont(_T("FiraSans-Bold"), BUTTON_FONT_SIZE, true, buttonFont)) {
m_btnNext.SetFont(&editFont); m_btnNext.SetFont(&editFont);
} }
@ -127,7 +127,7 @@ BOOL CLauncherDlg::OnInitDialog() {
m_pRenderTarget = GetRenderTarget(); m_pRenderTarget = GetRenderTarget();
SetTimer(1, 2, NULL); SetTimer(1, 2, NULL);
return TRUE; return TRUE;
} }
@ -201,7 +201,7 @@ BOOL CLauncherDlg::PreTranslateMessage(MSG* pMsg) {
} }
void CLauncherDlg::setCustomDialog() { void CLauncherDlg::setCustomDialog() {
LONG lStyle = GetWindowLong(GetSafeHwnd(), GWL_STYLE); LONG lStyle = GetWindowLong(GetSafeHwnd(), GWL_STYLE);
lStyle &= ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU); lStyle &= ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU);
SetWindowLong(GetSafeHwnd(), GWL_STYLE, lStyle); SetWindowLong(GetSafeHwnd(), GWL_STYLE, lStyle);
@ -282,8 +282,8 @@ afx_msg void CLauncherDlg::OnNextClicked() {
startProcess(); startProcess();
} else if (_drawStep == DrawStep::DrawError) { } else if (_drawStep == DrawStep::DrawError) {
theApp._manager.restartLauncher(); theApp._manager.restartLauncher();
} else if (_drawStep == DrawStep::DrawLoginLogin || } else if (_drawStep == DrawStep::DrawLoginLogin ||
_drawStep == DrawStep::DrawLoginErrorCred || _drawStep == DrawStep::DrawLoginErrorCred ||
_drawStep == DrawStep::DrawLoginErrorOrg) { _drawStep == DrawStep::DrawLoginErrorOrg) {
CString token; CString token;
CString username, password, orgname; CString username, password, orgname;
@ -377,7 +377,7 @@ void CLauncherDlg::drawProgress(CHwndRenderTarget* pRenderTarget, float progress
return; return;
} else { } else {
progress = min(1.0f, progress); progress = min(1.0f, progress);
} }
CRect winRec; CRect winRec;
float fullHeight = (float)size.height; float fullHeight = (float)size.height;
float halfHeight = 0.5f * (float)size.height; float halfHeight = 0.5f * (float)size.height;
@ -468,7 +468,7 @@ void CLauncherDlg::prepareProcess(DrawStep step) {
m_progress->ShowWindow(SW_SHOW); m_progress->ShowWindow(SW_SHOW);
CString actionText = _T(""); CString actionText = _T("");
CString messageText = _T(""); CString messageText = _T("");
switch (step) { switch (step) {
case DrawStep::DrawProcessSetup: case DrawStep::DrawProcessSetup:
actionText = _T("We're building your virtual HQ"); actionText = _T("We're building your virtual HQ");
@ -515,7 +515,7 @@ BOOL CLauncherDlg::getTextFormat(int resID, TextFormat& formatOut) {
formatOut.isButton = false; formatOut.isButton = false;
formatOut.size = MESSAGE_FONT_SIZE; formatOut.size = MESSAGE_FONT_SIZE;
formatOut.underlined = false; formatOut.underlined = false;
switch (resID) { switch (resID) {
case IDC_VOXEL: case IDC_VOXEL:
case IDD_LAUNCHER_DIALOG: case IDD_LAUNCHER_DIALOG:
@ -568,7 +568,7 @@ HBRUSH CLauncherDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
pDC->SetTextColor(textFormat.color); pDC->SetTextColor(textFormat.color);
pDC->SetBkMode(TRANSPARENT); pDC->SetBkMode(TRANSPARENT);
CFont textFont; CFont textFont;
CString fontFamily = textFormat.isBold ? GRAPHIK_SEMIBOLD : GRAPHIK_REGULAR; CString fontFamily = textFormat.isBold ? FIRASANS_SEMIBOLD : FIRASANS_REGULAR;
if (LauncherUtils::getFont(fontFamily, textFormat.size, textFormat.isBold, textFont)) { if (LauncherUtils::getFont(fontFamily, textFormat.size, textFormat.isBold, textFont)) {
pDC->SelectObject(&textFont); pDC->SelectObject(&textFont);
} }
@ -580,9 +580,9 @@ HBRUSH CLauncherDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor)
CRect lineRect = CRect(rect.left + padding, rect.bottom, rect.right - padding, rect.bottom + borderThick); CRect lineRect = CRect(rect.left + padding, rect.bottom, rect.right - padding, rect.bottom + borderThick);
lineRect.MoveToY(lineRect.bottom + 1); lineRect.MoveToY(lineRect.bottom + 1);
pDC->FillSolidRect(lineRect, COLOR_GREY); pDC->FillSolidRect(lineRect, COLOR_GREY);
} }
} }
return (HBRUSH)GetStockObject(BLACK_BRUSH); return (HBRUSH)GetStockObject(BLACK_BRUSH);
} }
@ -613,7 +613,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.SetTextColor(COLOR_WHITE); dc.SetTextColor(COLOR_WHITE);
CFont buttonFont; CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, BUTTON_FONT_SIZE, true, buttonFont)) { if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, BUTTON_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont); dc.SelectObject(buttonFont);
} }
dc.DrawText(btnName, CRect(rect.left, rect.top + 4, rect.right, rect.bottom - 8), DT_CENTER | DT_VCENTER | DT_SINGLELINE); dc.DrawText(btnName, CRect(rect.left, rect.top + 4, rect.right, rect.bottom - 8), DT_CENTER | DT_VCENTER | DT_SINGLELINE);
@ -622,7 +622,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.FillSolidRect(rect, COLOR_BLACK); dc.FillSolidRect(rect, COLOR_BLACK);
dc.SetTextColor(COLOR_BLUE); dc.SetTextColor(COLOR_BLUE);
CFont buttonFont; CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, TROUBLE_FONT_SIZE, true, buttonFont)) { if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, TROUBLE_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont); dc.SelectObject(buttonFont);
} }
dc.DrawText(_T("Having Trouble"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_CENTER | DT_VCENTER | DT_SINGLELINE); dc.DrawText(_T("Having Trouble"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_CENTER | DT_VCENTER | DT_SINGLELINE);
@ -630,7 +630,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct)
dc.FillSolidRect(rect, COLOR_BLACK); dc.FillSolidRect(rect, COLOR_BLACK);
dc.SetTextColor(COLOR_LIGHT_GREY); dc.SetTextColor(COLOR_LIGHT_GREY);
CFont buttonFont; CFont buttonFont;
if (LauncherUtils::getFont(GRAPHIK_SEMIBOLD, TERMS_FONT_SIZE, true, buttonFont)) { if (LauncherUtils::getFont(FIRASANS_SEMIBOLD, TERMS_FONT_SIZE, true, buttonFont)) {
dc.SelectObject(buttonFont); dc.SelectObject(buttonFont);
} }
dc.DrawText(_T("Terms of Service"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_LEFT | DT_TOP | DT_SINGLELINE); dc.DrawText(_T("Terms of Service"), CRect(rect.left, rect.top, rect.right, rect.bottom), DT_LEFT | DT_TOP | DT_SINGLELINE);
@ -695,7 +695,7 @@ void CLauncherDlg::OnTimer(UINT_PTR nIDEvent) {
if (theApp._manager.willContinueUpdating()) { if (theApp._manager.willContinueUpdating()) {
progress = CONTINUE_UPDATING_GLOBAL_OFFSET * progress; progress = CONTINUE_UPDATING_GLOBAL_OFFSET * progress;
progress = min(progress, CONTINUE_UPDATING_GLOBAL_OFFSET); progress = min(progress, CONTINUE_UPDATING_GLOBAL_OFFSET);
} }
theApp._manager.updateProgress(LauncherManager::ProcessType::Uninstall, progress); theApp._manager.updateProgress(LauncherManager::ProcessType::Uninstall, progress);
_splashStep++; _splashStep++;
} }
@ -836,7 +836,7 @@ void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) {
case DrawStep::DrawProcessFinishUpdate: case DrawStep::DrawProcessFinishUpdate:
case DrawStep::DrawProcessUpdate: case DrawStep::DrawProcessUpdate:
case DrawStep::DrawProcessUninstall: case DrawStep::DrawProcessUninstall:
case DrawStep::DrawProcessSetup: case DrawStep::DrawProcessSetup:
if (!isUpdate) { if (!isUpdate) {
m_voxelRenderTarget->BeginDraw(); m_voxelRenderTarget->BeginDraw();
m_voxelRenderTarget->Clear(D2D1::ColorF(0.0f, 0.0f, 0.0f, 1.0f)); m_voxelRenderTarget->Clear(D2D1::ColorF(0.0f, 0.0f, 0.0f, 1.0f));
@ -847,7 +847,7 @@ void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) {
drawSmallLogo(m_pRenderTarget); drawSmallLogo(m_pRenderTarget);
m_pRenderTarget->EndDraw(); m_pRenderTarget->EndDraw();
RedrawWindow(); RedrawWindow();
} }
m_progressRenderTarget->BeginDraw(); m_progressRenderTarget->BeginDraw();
m_progressRenderTarget->Clear(D2D1::ColorF(0.0f, 0.0f, 0.0f, 1.0f)); m_progressRenderTarget->Clear(D2D1::ColorF(0.0f, 0.0f, 0.0f, 1.0f));
drawProgress(m_progressRenderTarget, 1.0f, D2D1::ColorF(0.2f, 0.2f, 0.2f)); drawProgress(m_progressRenderTarget, 1.0f, D2D1::ColorF(0.2f, 0.2f, 0.2f));
@ -855,7 +855,7 @@ void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) {
m_progressRenderTarget->EndDraw(); m_progressRenderTarget->EndDraw();
m_voxelRenderTarget->BeginDraw(); m_voxelRenderTarget->BeginDraw();
drawVoxel(m_voxelRenderTarget); drawVoxel(m_voxelRenderTarget);
m_voxelRenderTarget->EndDraw(); m_voxelRenderTarget->EndDraw();
break; break;
default: default:
break; break;

8
screenshare/src/styles.css
View file

@ -1,7 +1,7 @@
body { body {
background-color: black; background-color: black;
box-sizing: border-box; box-sizing: border-box;
font-family: "Graphik"; font-family: "FiraSans";
margin: 0px 22px 10px 22px; margin: 0px 22px 10px 22px;
} }
@ -77,8 +77,8 @@ yes:hover + #yes_background {
} }
@font-face { @font-face {
font-family: "Graphik"; font-family: "FiraSans";
src: url("./resources/Graphik-Regular.ttf"); src: url("./resources/FiraSans-Regular.ttf");
} }
#title { #title {
@ -203,7 +203,7 @@ img {
width: 9px; width: 9px;
overflow: scroll; overflow: scroll;
overflow-x: hidden; overflow-x: hidden;
} }
#style-1::-webkit-scrollbar-thumb { #style-1::-webkit-scrollbar-thumb {
background-color: #0198CB; background-color: #0198CB;

32
scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml
View file

@ -22,7 +22,7 @@ Rectangle {
id: root id: root
color: simplifiedUI.colors.darkBackground color: simplifiedUI.colors.darkBackground
anchors.fill: parent anchors.fill: parent
// Used for the indicator picture // Used for the indicator picture
readonly property string emojiBaseURL: "../../resources/images/emojis/512px/" readonly property string emojiBaseURL: "../../resources/images/emojis/512px/"
readonly property string emoji52BaseURL: "../../resources/images/emojis/52px/" readonly property string emoji52BaseURL: "../../resources/images/emojis/52px/"
@ -57,7 +57,7 @@ Rectangle {
emojiSearchTextField.forceActiveFocus(); emojiSearchTextField.forceActiveFocus();
EmojiList.emojiList EmojiList.emojiList
.filter(emoji => { .filter(emoji => {
return emoji.mainCategory === "Smileys & Emotion" || return emoji.mainCategory === "Smileys & Emotion" ||
emoji.mainCategory === "People & Body" || emoji.mainCategory === "People & Body" ||
emoji.mainCategory === "Animals & Nature" || emoji.mainCategory === "Animals & Nature" ||
emoji.mainCategory === "Food & Drink"; emoji.mainCategory === "Food & Drink";
@ -78,7 +78,7 @@ Rectangle {
mainModel.append(item); mainModel.append(item);
filteredModel.append(item); filteredModel.append(item);
}); });
root.currentCode = filteredModel.get(0).code.utf; root.currentCode = filteredModel.get(0).code.utf;
} }
@ -88,7 +88,7 @@ Rectangle {
visible: false visible: false
color: Qt.rgba(0, 0, 0, 0.8) color: Qt.rgba(0, 0, 0, 0.8)
anchors.fill: parent anchors.fill: parent
MouseArea { MouseArea {
hoverEnabled: false hoverEnabled: false
anchors.fill: parent anchors.fill: parent
@ -96,7 +96,7 @@ Rectangle {
popupContainer.visible = false; popupContainer.visible = false;
} }
} }
MouseArea { MouseArea {
hoverEnabled: false hoverEnabled: false
anchors.fill: popupContentContainer anchors.fill: popupContentContainer
@ -117,7 +117,7 @@ Rectangle {
width: 50 width: 50
height: width height: width
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
text: "X" text: "X"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -126,7 +126,7 @@ Rectangle {
opacity: closeButtonMouseArea.containsMouse ? 1.0 : 0.8 opacity: closeButtonMouseArea.containsMouse ? 1.0 : 0.8
size: 22 size: 22
} }
MouseArea { MouseArea {
id: closeButtonMouseArea id: closeButtonMouseArea
hoverEnabled: true hoverEnabled: true
@ -137,7 +137,7 @@ Rectangle {
} }
} }
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: popupHeader1 id: popupHeader1
text: "Emoji Reactions" text: "Emoji Reactions"
anchors.top: parent.top anchors.top: parent.top
@ -154,7 +154,7 @@ Rectangle {
size: 22 size: 22
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: popupText1 id: popupText1
text: "Click an emoji and it will appear above your head!\nUse Emoji Reactions to express yourself without saying a word.\n\n" + text: "Click an emoji and it will appear above your head!\nUse Emoji Reactions to express yourself without saying a word.\n\n" +
"Try using the search bar to search for an emoji directly. You can use your arrow keys to navigate the results." "Try using the search bar to search for an emoji directly. You can use your arrow keys to navigate the results."
@ -172,7 +172,7 @@ Rectangle {
size: 18 size: 18
} }
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: popupHeader2 id: popupHeader2
text: "Attributions" text: "Attributions"
anchors.top: popupText1.bottom anchors.top: popupText1.bottom
@ -188,7 +188,7 @@ Rectangle {
size: 22 size: 22
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
id: popupText2 id: popupText2
textFormat: Text.RichText textFormat: Text.RichText
text: "<style>a:link { color: #FFF; }</style>" + text: "<style>a:link { color: #FFF; }</style>" +
@ -214,7 +214,7 @@ Rectangle {
} }
} }
} }
// If this MouseArea is hit, the user is clicking on an area not handled // If this MouseArea is hit, the user is clicking on an area not handled
// by any other MouseArea // by any other MouseArea
MouseArea { MouseArea {
@ -372,7 +372,7 @@ Rectangle {
width: 22 width: 22
height: width height: width
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
text: "?" text: "?"
anchors.fill: parent anchors.fill: parent
horizontalAlignment: Text.AlignHCenter horizontalAlignment: Text.AlignHCenter
@ -381,7 +381,7 @@ Rectangle {
opacity: attributionMouseArea.containsMouse ? 1.0 : 0.8 opacity: attributionMouseArea.containsMouse ? 1.0 : 0.8
size: 22 size: 22
} }
MouseArea { MouseArea {
id: attributionMouseArea id: attributionMouseArea
hoverEnabled: enabled hoverEnabled: enabled
@ -412,7 +412,7 @@ Rectangle {
propagateComposedEvents: false propagateComposedEvents: false
onEntered: { onEntered: {
grid.currentIndex = index; grid.currentIndex = index;
// don't allow a hover image change of the main emoji image // don't allow a hover image change of the main emoji image
if (root.isSelected) { if (root.isSelected) {
return; return;
} }
@ -459,7 +459,7 @@ Rectangle {
anchors.rightMargin: -grid.anchors.rightMargin + 2 anchors.rightMargin: -grid.anchors.rightMargin + 2
} }
HifiStylesUit.GraphikRegular { HifiStylesUit.FiraSansRegular {
readonly property var cantFindEmojiList: ["😣", "😭", "😖", "😢", "🤔"] readonly property var cantFindEmojiList: ["😣", "😭", "😖", "😢", "🤔"]
onVisibleChanged: { onVisibleChanged: {
if (visible) { if (visible) {

2
scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml
View file

@ -255,7 +255,7 @@ Rectangle {
opacity: 0.8 opacity: 0.8
radius: 4 radius: 4
HifiStylesUit.GraphikSemiBold { HifiStylesUit.FiraSansSemiBold {
id: toolTipText id: toolTipText
anchors.left: parent.left anchors.left: parent.left
anchors.leftMargin: 2 anchors.leftMargin: 2

36
tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css
View file

@ -4,12 +4,12 @@
********************************************************************/ ********************************************************************/
@font-face{ @font-face{
font-family: 'Graphik Semibold'; font-family: 'FiraSans Semibold';
src: url('../fonts/Graphik-SemiBold.otf') format('opentype'); src: url('../fonts/Graphik-SemiBold.otf') format('opentype');
} }
@font-face{ @font-face{
font-family: 'Graphik Regular'; font-family: 'FiraSans Regular';
src: url('../fonts/Graphik-Regular.otf') format('opentype'); src: url('../fonts/Graphik-Regular.otf') format('opentype');
} }
@ -34,12 +34,12 @@ html
body body
{ {
font-family: 'Graphik Regular', 'Proxima Nova', arial, sans-serif; font-family: 'FiraSans Regular', 'Proxima Nova', arial, sans-serif;
font-weight: 400; font-weight: 400;
color: #000000; color: #000000;
letter-spacing: 0.5px; letter-spacing: 0.5px;
font-size: 0.95rem; font-size: 0.95rem;
line-height: 20px; line-height: 20px;
} }
p { p {
@ -59,7 +59,7 @@ section
********************************************************************/ ********************************************************************/
h1, h2, h3, h4 { h1, h2, h3, h4 {
font-family: "Graphik Semibold", Helvetica, sans-serif; font-family: "FiraSans Semibold", Helvetica, sans-serif;
} }
h1 h1
@ -83,7 +83,7 @@ h3
h4 h4
{ {
font-family: 'Graphik Regular'; font-family: 'FiraSans Regular';
font-size: 1.03rem; font-size: 1.03rem;
} }
@ -237,11 +237,11 @@ nav #nav-search {
background-color: #27343B; background-color: #27343B;
color: #FFFFFF; color: #FFFFFF;
text-align: center; text-align: center;
margin-top: 0px; margin-top: 0px;
} }
.nav-header p { .nav-header p {
padding-top: 8px; padding-top: 8px;
} }
.nav-header a { .nav-header a {
@ -251,7 +251,7 @@ nav #nav-search {
} }
nav h3 { nav h3 {
font-family: "Graphik Regular", sans-serif; font-family: "FiraSans Regular", sans-serif;
font-size: 0.9rem; font-size: 0.9rem;
color: #FFFFFF; color: #FFFFFF;
text-transform: uppercase; text-transform: uppercase;
@ -288,11 +288,11 @@ nav ul ul li:first-child
padding-top: 0; padding-top: 0;
} }
nav li nav li
{ {
margin-top: 14px; margin-top: 14px;
} }
nav a:hover { nav a:hover {
font-weight: bold; font-weight: bold;
@ -373,11 +373,11 @@ nav > h2 > a {
.search-input .search-input
{ {
font-family: 'Graphik Regular', sans-serif; font-family: 'FiraSans Regular', sans-serif;
font-size: 90%; font-size: 90%;
border: 1px solid #ddd; border: 1px solid #ddd;
box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06); box-shadow: inset 0 1px 3px rgba(0, 0, 0, 0.06);
border-radius: 0; border-radius: 0;
background: rgba(76,76,76,0.47) !important; background: rgba(76,76,76,0.47) !important;
color: white; color: white;
width: 70%; width: 70%;
@ -429,7 +429,7 @@ header {
padding: 0px 4px; padding: 0px 4px;
} }
.apiLinks .apiLinks
{ {
display: block; display: block;
text-align: center; text-align: center;
@ -459,7 +459,7 @@ header {
color: #999 !important; color: #999 !important;
} }
#main p.availableIn #main p.availableIn
{ {
font-size: 0.8rem; font-size: 0.8rem;
} }