diff --git a/interface/resources/fonts/FiraSans-Medium.ttf b/interface/resources/fonts/FiraSans-Medium.ttf new file mode 100644 index 0000000000..c454f7393a Binary files /dev/null and b/interface/resources/fonts/FiraSans-Medium.ttf differ diff --git a/interface/resources/fonts/Graphik-Medium.ttf b/interface/resources/fonts/Graphik-Medium.ttf deleted file mode 100644 index 9d766a1d76..0000000000 Binary files a/interface/resources/fonts/Graphik-Medium.ttf and /dev/null differ diff --git a/interface/resources/fonts/Graphik-Regular.ttf b/interface/resources/fonts/Graphik-Regular.ttf deleted file mode 100644 index 001faa7f47..0000000000 Binary files a/interface/resources/fonts/Graphik-Regular.ttf and /dev/null differ diff --git a/interface/resources/fonts/Graphik-Semibold.ttf b/interface/resources/fonts/Graphik-Semibold.ttf deleted file mode 100644 index b0ee02248d..0000000000 Binary files a/interface/resources/fonts/Graphik-Semibold.ttf and /dev/null differ diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml index b99ce92806..af9b4d4291 100644 --- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml +++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/AvatarApp.qml @@ -143,7 +143,7 @@ Rectangle { anchors.rightMargin: 26 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "Stand out from the crowd!" Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -154,7 +154,7 @@ Rectangle { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Create your custom avatar." Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -185,7 +185,7 @@ Rectangle { fillMode: Image.PreserveAspectFit } - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "Scan for Mobile App" Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -216,7 +216,7 @@ Rectangle { anchors.right: parent.right anchors.rightMargin: 24 - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: yourAvatarsTitle text: "Your Avatars" anchors.top: parent.top @@ -225,7 +225,7 @@ Rectangle { color: simplifiedUI.colors.text.white size: 22 } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: yourAvatarsSubtitle text: "These are the avatars that you've created and uploaded via the Avatar Creator." width: parent.width @@ -274,7 +274,7 @@ Rectangle { anchors.right: parent.right anchors.bottom: parent.bottom visible: !emptyInventoryContainer.visible - + AnimatedImage { visible: !(inventoryContentsList.visible || errorText.visible) anchors.centerIn: parent @@ -301,14 +301,14 @@ Rectangle { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: errorText text: "" visible: text !== "" anchors.fill: parent size: 22 color: simplifiedUI.colors.text.white - wrapMode: Text.Wrap + wrapMode: Text.Wrap verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignHCenter } @@ -337,7 +337,7 @@ Rectangle { return; } } - + root.avatarPreviewUrl = "../../images/defaultAvatar.svg"; } diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml index cdfa06190c..a14f5d7bde 100644 --- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml +++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/AvatarAppListDelegate.qml @@ -16,7 +16,7 @@ import QtGraphicalEffects 1.0 Rectangle { id: root - + SimplifiedConstants.SimplifiedConstants { id: simplifiedUI } @@ -33,7 +33,7 @@ Rectangle { height: 102 width: parent.width color: root.isHovering ? simplifiedUI.colors.darkBackgroundHighlight : "transparent" - + Rectangle { id: borderMask @@ -75,7 +75,7 @@ Rectangle { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: avatarName text: root.itemName anchors.left: itemPreviewImage.right diff --git a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml index 0928fe0c7b..e039734e73 100644 --- a/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml +++ b/interface/resources/qml/hifi/simplifiedUI/avatarApp/components/DisplayNameHeader.qml @@ -69,7 +69,7 @@ Item { anchors.leftMargin: 21 anchors.verticalCenter: parent.verticalCenter - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: displayNameLabel text: "Display Name" color: simplifiedUI.colors.text.lightGrey diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml index 0ebbe49963..dbe0180967 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/HelpApp.qml @@ -27,7 +27,7 @@ Rectangle { SimplifiedConstants.SimplifiedConstants { id: simplifiedUI } - + focus: true Component.onCompleted: { @@ -110,7 +110,7 @@ Rectangle { width: tabTitleText.paintedWidth + 32 height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: tabTitleText color: simplifiedUI.colors.text.white anchors.fill: parent diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml index a4a6575d1e..db4cb0f7a5 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/about/HelpAbout.qml @@ -65,14 +65,14 @@ Flickable { anchors.rightMargin: 26 anchors.top: parent.top spacing: 0 - + ColumnLayout { id: platformInfoContainer Layout.preferredWidth: parent.width Layout.bottomMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "About Your Configuration" Layout.preferredWidth: parent.width Layout.topMargin: 16 @@ -83,7 +83,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Use the button below to get a copy to share with us." Layout.preferredWidth: parent.width Layout.bottomMargin: 8 @@ -93,7 +93,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Version " + Window.checkVersion() Layout.preferredWidth: parent.width Layout.topMargin: 8 @@ -104,7 +104,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "Platform Info" Layout.preferredWidth: parent.width Layout.topMargin: 8 @@ -115,7 +115,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Computer Vendor/Model:" Layout.preferredWidth: parent.width height: paintedHeight @@ -138,7 +138,7 @@ Flickable { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() Layout.preferredWidth: parent.width height: paintedHeight @@ -147,7 +147,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "OS Type: " + PlatformInfo.getOperatingSystemType() Layout.preferredWidth: parent.width height: paintedHeight @@ -156,14 +156,14 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "CPU:" Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white wrapMode: Text.Wrap - + Component.onCompleted: { var cpu = JSON.parse(PlatformInfo.getCPU(0)); var cpuModel = cpu.model; @@ -175,7 +175,7 @@ Flickable { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "# CPUs: " + PlatformInfo.getNumCPUs() Layout.preferredWidth: parent.width height: paintedHeight @@ -184,7 +184,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "# CPU Cores: " + PlatformInfo.getNumLogicalCores() Layout.preferredWidth: parent.width height: paintedHeight @@ -193,7 +193,7 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB" Layout.preferredWidth: parent.width height: paintedHeight @@ -202,14 +202,14 @@ Flickable { wrapMode: Text.Wrap } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "GPU: " Layout.preferredWidth: parent.width height: paintedHeight size: 16 color: simplifiedUI.colors.text.white wrapMode: Text.Wrap - + Component.onCompleted: { var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU())); var gpuModel = gpu.model; @@ -221,7 +221,7 @@ Flickable { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) Layout.preferredWidth: parent.width height: paintedHeight @@ -251,7 +251,7 @@ Flickable { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Audio Input: " + audioInputDevices.selectedInputDeviceName Layout.preferredWidth: parent.width height: paintedHeight @@ -282,7 +282,7 @@ Flickable { } } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Audio Output: " + audioOutputDevices.selectedOutputDeviceName Layout.preferredWidth: parent.width height: paintedHeight @@ -335,7 +335,7 @@ Flickable { textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n"; textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n"; textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n"; - + var gpu = JSON.parse(PlatformInfo.getGPU(PlatformInfo.getMasterGPU())); var gpuModel = gpu.model; if (!gpuModel || gpuModel.length === 0) { @@ -346,7 +346,7 @@ Flickable { textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")) + "\n"; textToCopy += "Audio Input: " + audioInputDevices.selectedInputDeviceName + "\n"; textToCopy += "Audio Output: " + audioOutputDevices.selectedOutputDeviceName + "\n"; - + textToCopy += "\n**All Platform Info**\n"; textToCopy += JSON.stringify(JSON.parse(PlatformInfo.getPlatform()), null, 4); diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml index 84b37db31b..f036669846 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/ControlsTable.qml @@ -22,7 +22,7 @@ Item { property int subTextSize: 14 property color separatorColor: "#CCCCCC" Layout.preferredHeight: controlsTableColumnLayout.height - + // Top separator Rectangle { anchors.top: controlsTableColumnLayout.top @@ -59,7 +59,7 @@ Item { height: controlsTableColumnLayout.height color: controlsTableRoot.separatorColor } - + ColumnLayout { id: controlsTableColumnLayout anchors.left: parent.left @@ -104,7 +104,7 @@ Item { height: parent.height spacing: controlsTableRoot.rowPadding - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: cameraText text: "Camera" width: paintedWidth @@ -115,7 +115,7 @@ Item { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Right-click and drag to look around" width: parent.width - cameraText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height @@ -134,11 +134,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -147,7 +147,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "W / ↑" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -171,7 +171,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Walk Forward" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -188,11 +188,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -201,7 +201,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "S / ↓" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -225,7 +225,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Walk Backward" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -242,11 +242,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -255,7 +255,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "A / ←" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -279,7 +279,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Turn Left" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -296,11 +296,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -309,7 +309,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "D / →" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -333,7 +333,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Turn Right" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -350,11 +350,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -363,7 +363,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Q" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -387,7 +387,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Sidestep Left" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -404,11 +404,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -417,7 +417,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "E" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -441,7 +441,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Sidestep Right" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -458,11 +458,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -471,7 +471,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Shift" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -500,7 +500,7 @@ Item { height: parent.height spacing: controlsTableRoot.rowPadding - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: runText text: "Hold + Direction to Run" width: paintedWidth @@ -511,7 +511,7 @@ Item { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Example: Shift + W" width: parent.width - runText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height @@ -530,11 +530,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -543,7 +543,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Space" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -572,7 +572,7 @@ Item { height: parent.height spacing: controlsTableRoot.rowPadding - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: jumpText text: "Jump / Stand Up" width: paintedWidth @@ -583,7 +583,7 @@ Item { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Stand Up only while seated" width: parent.width - jumpText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height @@ -602,11 +602,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -615,7 +615,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "1" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -639,7 +639,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "1st Person View" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height @@ -656,11 +656,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -669,7 +669,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "2" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -698,7 +698,7 @@ Item { height: parent.height spacing: controlsTableRoot.rowPadding - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: selfieText text: "Selfie" width: paintedWidth @@ -709,7 +709,7 @@ Item { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "Look at self" width: parent.width - selfieText.width - parent.spacing - controlsTableRoot.rowPadding height: parent.height @@ -728,11 +728,11 @@ Item { Layout.preferredHeight: 1 color: controlsTableRoot.separatorColor } - - - + + + Row { Layout.preferredWidth: parent.width Layout.preferredHeight: controlsTableRoot.rowHeight @@ -741,7 +741,7 @@ Item { width: controlsTableRoot.column1Width height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "3" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -765,7 +765,7 @@ Item { height: parent.height } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "3rd Person View" width: controlsTableRoot.column2Width - controlsTableRoot.rowPadding * 2 height: parent.height diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml index b4f7bd76c0..884ab52789 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/controls/HelpControls.qml @@ -57,7 +57,7 @@ Flickable { anchors.top: parent.top spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "HQ Controls" Layout.preferredWidth: parent.width Layout.topMargin: 16 @@ -66,7 +66,7 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "You can use the following controls to move your avatar around your HQ:" Layout.preferredWidth: parent.width wrapMode: Text.Wrap diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml index 81edc9ff37..7bfb711e29 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/faq/HelpFAQ.qml @@ -51,7 +51,7 @@ Item { anchors.top: parent.top spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "FAQ" Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -60,7 +60,7 @@ Item { 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." Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -82,7 +82,7 @@ Item { } } - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "Having problems with your audio?" Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -91,7 +91,7 @@ Item { 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." Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight diff --git a/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml b/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml index 31b9593f09..156e5cf5fd 100644 --- a/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml +++ b/interface/resources/qml/hifi/simplifiedUI/helpApp/support/HelpSupport.qml @@ -49,7 +49,7 @@ Item { anchors.top: parent.top spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "Support" Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight @@ -58,7 +58,7 @@ Item { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "You can quickly get the support that you need by clicking the button below." Layout.preferredWidth: parent.width Layout.preferredHeight: paintedHeight diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml index ffb4f58355..2f0128cfb8 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml @@ -27,8 +27,8 @@ Rectangle { SimplifiedConstants.SimplifiedConstants { id: simplifiedUI } - - focus: true + + focus: true Keys.onPressed: { 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); @@ -128,7 +128,7 @@ Rectangle { width: tabTitleText.paintedWidth + 32 height: parent.height - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: tabTitleText color: simplifiedUI.colors.text.white anchors.fill: parent diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml index ea2b1467b5..a22292dd05 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/audio/Audio.qml @@ -67,14 +67,14 @@ Flickable { anchors.rightMargin: 26 anchors.top: parent.top spacing: simplifiedUI.margins.settings.spacingBetweenSettings - + ColumnLayout { id: volumeControlsContainer Layout.preferredWidth: parent.width Layout.topMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: volumeControlsTitle text: "Volume Controls" Layout.preferredWidth: parent.width @@ -165,13 +165,13 @@ Flickable { } } } - + ColumnLayout { id: micControlsContainer Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: micControlsTitle text: "Default Mute Controls" Layout.preferredWidth: parent.width @@ -241,7 +241,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: inputDeviceTitle text: "Which input device?" Layout.preferredWidth: parent.width @@ -293,7 +293,7 @@ Flickable { SimplifiedControls.Button { id: audioLoopbackButton property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho() - + function startAudioLoopback() { if (!audioLoopedBack) { audioLoopedBack = true; @@ -336,7 +336,7 @@ Flickable { Layout.bottomMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: outputDeviceTitle text: "Which output device?" Layout.preferredWidth: parent.width diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml index 4d0589c1e1..359b1bb670 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/dev/Dev.qml @@ -57,7 +57,7 @@ Flickable { anchors.rightMargin: 26 anchors.top: parent.top spacing: simplifiedUI.margins.settings.spacingBetweenSettings - + ColumnLayout { id: uiControlsContainer Layout.preferredWidth: parent.width @@ -65,7 +65,7 @@ Flickable { Layout.bottomMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: uiControlsTitle text: "User Interface" Layout.preferredWidth: parent.width @@ -74,7 +74,7 @@ Flickable { color: simplifiedUI.colors.text.white } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { 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." Layout.preferredWidth: parent.width diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml index 68f667ec78..a61fd68239 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/general/General.qml @@ -69,7 +69,7 @@ Flickable { Layout.topMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: avatarNameTagsTitle text: "Avatar Name Tags" Layout.preferredWidth: parent.width @@ -117,7 +117,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: emoteTitle text: "Emote UI" Layout.maximumWidth: parent.width @@ -140,7 +140,7 @@ Flickable { onClicked: { var currentSetting = Settings.getValue("simplifiedUI/allowEmoteDrawerExpansion", true); Settings.setValue("simplifiedUI/allowEmoteDrawerExpansion", !currentSetting); - } + } Connections { target: Settings @@ -160,7 +160,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: performanceTitle text: "Graphics Settings" Layout.preferredWidth: parent.width @@ -217,7 +217,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: cameraTitle text: "Camera View" Layout.preferredWidth: parent.width @@ -258,7 +258,7 @@ Flickable { Camera.mode = "selfie" } } - + Connections { target: Camera @@ -289,7 +289,7 @@ Flickable { Layout.bottomMargin: 24 spacing: 0 - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: logoutText text: (AccountServices.username === "Unknown user" ? "Log In" : "Logout " + AccountServices.username) wrapMode: Text.Wrap diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml index d713f3f6f9..91be7db78b 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/vr/VR.qml @@ -74,7 +74,7 @@ Flickable { Layout.topMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: controlsTitle text: "VR Movement Controls" Layout.preferredWidth: parent.width @@ -159,7 +159,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "VR Rotation Mode" Layout.preferredWidth: parent.width height: paintedHeight @@ -193,13 +193,13 @@ Flickable { } } } - + ColumnLayout { id: micControlsContainer Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: micControlsTitle text: "Default Mute Controls" Layout.preferredWidth: parent.width @@ -242,7 +242,7 @@ Flickable { Layout.preferredWidth: parent.width spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: inputDeviceTitle text: "Which input device?" Layout.preferredWidth: parent.width @@ -265,7 +265,7 @@ Flickable { width: parent.width height: model.type != "desktop" ? inputDeviceCheckbox.height + simplifiedUI.margins.settings.spacingBetweenRadiobuttons : 0 visible: model.type != "desktop" - + SimplifiedControls.RadioButton { id: inputDeviceCheckbox anchors.left: parent.left @@ -295,7 +295,7 @@ Flickable { SimplifiedControls.Button { id: audioLoopbackButton property bool audioLoopedBack: AudioScriptingInterface.getLocalEcho() - + function startAudioLoopback() { if (!audioLoopedBack) { audioLoopedBack = true; @@ -338,7 +338,7 @@ Flickable { Layout.bottomMargin: 24 spacing: 0 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: outputDeviceTitle text: "Which output device?" Layout.preferredWidth: parent.width diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml index 1d594a0d6d..e4a1c2af08 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Button.qml @@ -72,7 +72,7 @@ Original.Button { anchors.centerIn: parent width: parent.width - parent.border.width * 2 height: parent.height - parent.border.width * 2 - + Rectangle { z: -1 clip: true @@ -96,9 +96,9 @@ Original.Button { } } - contentItem: HifiStylesUit.GraphikMedium { + contentItem: HifiStylesUit.FiraSansMedium { id: buttonText - topPadding: -2 // Necessary for proper alignment using Graphik Medium + //topPadding: -2 // Necessary for proper alignment using Graphik Medium wrapMode: Text.Wrap color: enabled ? simplifiedUI.colors.controls.button.text.enabled : simplifiedUI.colors.controls.button.text.disabled size: simplifiedUI.sizes.controls.button.textSize diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml index afac03d6b3..9d29907859 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/CheckBox.qml @@ -77,7 +77,7 @@ Original.CheckBox { id: checkBoxLabel text: root.text color: root.color - font.family: "Graphik" + font.family: "FiraSans" font.pixelSize: 14 font.weight: Font.DemiBold x: 2 diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml index 43d4aaee33..0f0f1bf636 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/RadioButton.qml @@ -88,7 +88,7 @@ RadioButton { contentItem: Text { id: radioButtonLabel font.pixelSize: 14 - font.family: "Graphik" + font.family: "FiraSans" font.weight: Font.Normal text: root.text color: simplifiedUI.colors.text.white @@ -98,6 +98,6 @@ RadioButton { enabled: root.enabled verticalAlignment: Text.AlignVCenter leftPadding: radioButtonIndicator.width + root.labelLeftMargin - topPadding: -3 // For perfect alignment when using Graphik + //topPadding: -3 // For perfect alignment when using Graphik } } diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Slider.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Slider.qml index 9397963fbf..a40b065a42 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Slider.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Slider.qml @@ -33,7 +33,7 @@ Item { property alias pressed: sliderControl.pressed property real defaultValue: 0.0 - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: sliderText text: "" anchors.right: sliderControl.left diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml index bbfaa1ef1a..4d1e1768de 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/Switch.qml @@ -147,7 +147,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: labelOff text: "" size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize @@ -195,7 +195,7 @@ Item { anchors.top: parent.top anchors.bottom: parent.bottom - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: labelOn text: "" size: simplifiedUI.sizes.controls.simplifiedSwitch.labelTextSize @@ -230,7 +230,7 @@ Item { } else { originalSwitch.checked = true; } - + root.clicked(); } } diff --git a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml index 44f34c3356..33778d1915 100644 --- a/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml +++ b/interface/resources/qml/hifi/simplifiedUI/simplifiedControls/TextField.qml @@ -28,7 +28,7 @@ TextField { property bool blankPlaceholderTextOnFocus: true color: simplifiedUI.colors.text.white - font.family: "Graphik Medium" + font.family: "FiraSans Medium" font.pixelSize: 22 selectionColor: simplifiedUI.colors.text.white selectedTextColor: simplifiedUI.colors.text.darkGrey diff --git a/interface/resources/qml/stylesUit/GraphikMedium.qml b/interface/resources/qml/stylesUit/FiraSansMedium.qml similarity index 73% rename from interface/resources/qml/stylesUit/GraphikMedium.qml rename to interface/resources/qml/stylesUit/FiraSansMedium.qml index 6374fa4488..a7550f300a 100644 --- a/interface/resources/qml/stylesUit/GraphikMedium.qml +++ b/interface/resources/qml/stylesUit/FiraSansMedium.qml @@ -1,8 +1,8 @@ // -// GraphikMedium.qml +// FiraSansMedium.qml // -// Created by Wayne Chen on 3 May 2019 -// Copyright 2019 High Fidelity, Inc. +// Created by Dale Glass on 7 Aug 2022 +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html @@ -16,6 +16,6 @@ Text { font.pixelSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: "Graphik" + font.family: "Fira Sans" font.weight: Font.Medium } diff --git a/interface/resources/qml/stylesUit/FiraSansRegular.qml b/interface/resources/qml/stylesUit/FiraSansRegular.qml index 05f6ecf74b..77f4a7270b 100644 --- a/interface/resources/qml/stylesUit/FiraSansRegular.qml +++ b/interface/resources/qml/stylesUit/FiraSansRegular.qml @@ -1,14 +1,14 @@ // // FiraSansRegular.qml // -// Created by David Rowe on 12 May 2016 -// Copyright 2016 High Fidelity, Inc. +// Created by Dale Glass on 7 Aug 2022 +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -import QtQuick 2.5 +import QtQuick 2.7 Text { id: root diff --git a/interface/resources/qml/stylesUit/FiraSansSemiBold.qml b/interface/resources/qml/stylesUit/FiraSansSemiBold.qml index 32554c2f25..146bb1f20e 100644 --- a/interface/resources/qml/stylesUit/FiraSansSemiBold.qml +++ b/interface/resources/qml/stylesUit/FiraSansSemiBold.qml @@ -1,14 +1,14 @@ // // FiraSansSemiBold.qml // -// Created by David Rowe on 12 Feb 2016 -// Copyright 2016 High Fidelity, Inc. +// Created by Dale Glass on 7 Aug 2022 +// Copyright 2022 Overte e.V. // // Distributed under the Apache License, Version 2.0. // See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html // -import QtQuick 2.5 +import QtQuick 2.7 Text { id: root @@ -16,5 +16,6 @@ Text { font.pixelSize: size verticalAlignment: Text.AlignVCenter horizontalAlignment: Text.AlignLeft - font.family: "Fira Sans SemiBold" + font.family: "Fira Sans" + font.weight: Font.DemiBold } diff --git a/interface/resources/qml/stylesUit/GraphikRegular.qml b/interface/resources/qml/stylesUit/GraphikRegular.qml deleted file mode 100644 index 0c9adf2af4..0000000000 --- a/interface/resources/qml/stylesUit/GraphikRegular.qml +++ /dev/null @@ -1,20 +0,0 @@ -// -// GraphikRegular.qml -// -// Created by Wayne Chen on 2 May 2019 -// Copyright 2019 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -import QtQuick 2.7 - -Text { - id: root - property real size: 32 - font.pixelSize: size - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignLeft - font.family: "Graphik" -} diff --git a/interface/resources/qml/stylesUit/GraphikSemiBold.qml b/interface/resources/qml/stylesUit/GraphikSemiBold.qml deleted file mode 100644 index 12dcb1d5a7..0000000000 --- a/interface/resources/qml/stylesUit/GraphikSemiBold.qml +++ /dev/null @@ -1,21 +0,0 @@ -// -// GraphikSemiBold.qml -// -// Created by Wayne Chen on 2 May 2019 -// Copyright 2019 High Fidelity, Inc. -// -// Distributed under the Apache License, Version 2.0. -// See the accompanying file LICENSE or http://www.apache.org/licenses/LICENSE-2.0.html -// - -import QtQuick 2.7 - -Text { - id: root - property real size: 32 - font.pixelSize: size - verticalAlignment: Text.AlignVCenter - horizontalAlignment: Text.AlignLeft - font.family: "Graphik" - font.weight: Font.DemiBold -} diff --git a/interface/src/Application.cpp b/interface/src/Application.cpp index a60f2b4bdf..c74ec0a397 100644 --- a/interface/src/Application.cpp +++ b/interface/src/Application.cpp @@ -1088,17 +1088,15 @@ Application::Application( QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/fontawesome-webfont.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/hifi-glyphs.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/AnonymousPro-Regular.ttf"); - QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf"); - QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Light.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Regular.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/rawline-500.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-Bold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Raleway-SemiBold.ttf"); QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Cairo-SemiBold.ttf"); - QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-SemiBold.ttf"); - QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Regular.ttf"); - QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/Graphik-Medium.ttf"); + QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-SemiBold.ttf"); + QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Regular.ttf"); + QFontDatabase::addApplicationFont(PathUtils::resourcesPath() + "fonts/FiraSans-Medium.ttf"); _window->setWindowTitle("Overte"); Model::setAbstractViewStateInterface(this); // The model class will sometimes need to know view state details from us diff --git a/launchers/qt/resources/fonts/Graphik-Medium.ttf b/launchers/qt/resources/fonts/Graphik-Medium.ttf deleted file mode 100644 index 9d766a1d76..0000000000 Binary files a/launchers/qt/resources/fonts/Graphik-Medium.ttf and /dev/null differ diff --git a/launchers/qt/resources/fonts/Graphik-Regular.ttf b/launchers/qt/resources/fonts/Graphik-Regular.ttf deleted file mode 100644 index 001faa7f47..0000000000 Binary files a/launchers/qt/resources/fonts/Graphik-Regular.ttf and /dev/null differ diff --git a/launchers/qt/resources/fonts/Graphik-Semibold.ttf b/launchers/qt/resources/fonts/Graphik-Semibold.ttf deleted file mode 100644 index b0ee02248d..0000000000 Binary files a/launchers/qt/resources/fonts/Graphik-Semibold.ttf and /dev/null differ diff --git a/launchers/win32/Launcher.rc b/launchers/win32/Launcher.rc index 80d5f74404..c8fa297c0f 100644 --- a/launchers/win32/Launcher.rc +++ b/launchers/win32/Launcher.rc @@ -29,12 +29,12 @@ LANGUAGE LANG_ENGLISH, SUBLANG_ENGLISH_US // TEXTINCLUDE // -1 TEXTINCLUDE +1 TEXTINCLUDE BEGIN "resource.h\0" END -2 TEXTINCLUDE +2 TEXTINCLUDE BEGIN "#ifndef APSTUDIO_INVOKED\r\n" "#include ""targetver.h""\r\n" @@ -44,7 +44,7 @@ BEGIN "\0" END -3 TEXTINCLUDE +3 TEXTINCLUDE BEGIN "#define _AFX_NO_SPLITTER_RESOURCES\r\n" "#define _AFX_NO_OLE_RESOURCES\r\n" @@ -77,9 +77,9 @@ IDR_MAINFRAME ICON "res\\interface.ico" // 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" ///////////////////////////////////////////////////////////////////////////// diff --git a/launchers/win32/LauncherDlg.cpp b/launchers/win32/LauncherDlg.cpp index 386d2747d6..83c2d646ec 100644 --- a/launchers/win32/LauncherDlg.cpp +++ b/launchers/win32/LauncherDlg.cpp @@ -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_BLUE = RGB(50, 160, 200); -static CString GRAPHIK_REGULAR = _T("Graphik-Regular"); -static CString GRAPHIK_SEMIBOLD = _T("Graphik-Semibold"); +static CString FIRASANS_REGULAR = _T("FiraSans-Regular"); +static CString FIRASANS_SEMIBOLD = _T("FiraSans-SemiBold"); static CString TROUBLE_URL = _T("https://www.highfidelity.com/hq-support"); static CString TERMS_URL = _T("https://www.highfidelity.com/termsofservice"); @@ -91,13 +91,13 @@ BOOL CLauncherDlg::OnInitDialog() { SetIcon(m_hIcon, FALSE); // Set small icon 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_username.SetFont(&editFont); m_password.SetFont(&editFont); } 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); } @@ -127,7 +127,7 @@ BOOL CLauncherDlg::OnInitDialog() { m_pRenderTarget = GetRenderTarget(); SetTimer(1, 2, NULL); - + return TRUE; } @@ -201,7 +201,7 @@ BOOL CLauncherDlg::PreTranslateMessage(MSG* pMsg) { } void CLauncherDlg::setCustomDialog() { - + LONG lStyle = GetWindowLong(GetSafeHwnd(), GWL_STYLE); lStyle &= ~(WS_CAPTION | WS_THICKFRAME | WS_MINIMIZEBOX | WS_MAXIMIZEBOX | WS_SYSMENU); SetWindowLong(GetSafeHwnd(), GWL_STYLE, lStyle); @@ -282,8 +282,8 @@ afx_msg void CLauncherDlg::OnNextClicked() { startProcess(); } else if (_drawStep == DrawStep::DrawError) { theApp._manager.restartLauncher(); - } else if (_drawStep == DrawStep::DrawLoginLogin || - _drawStep == DrawStep::DrawLoginErrorCred || + } else if (_drawStep == DrawStep::DrawLoginLogin || + _drawStep == DrawStep::DrawLoginErrorCred || _drawStep == DrawStep::DrawLoginErrorOrg) { CString token; CString username, password, orgname; @@ -377,7 +377,7 @@ void CLauncherDlg::drawProgress(CHwndRenderTarget* pRenderTarget, float progress return; } else { progress = min(1.0f, progress); - } + } CRect winRec; float fullHeight = (float)size.height; float halfHeight = 0.5f * (float)size.height; @@ -468,7 +468,7 @@ void CLauncherDlg::prepareProcess(DrawStep step) { m_progress->ShowWindow(SW_SHOW); CString actionText = _T(""); CString messageText = _T(""); - + switch (step) { case DrawStep::DrawProcessSetup: actionText = _T("We're building your virtual HQ"); @@ -515,7 +515,7 @@ BOOL CLauncherDlg::getTextFormat(int resID, TextFormat& formatOut) { formatOut.isButton = false; formatOut.size = MESSAGE_FONT_SIZE; formatOut.underlined = false; - + switch (resID) { case IDC_VOXEL: case IDD_LAUNCHER_DIALOG: @@ -568,7 +568,7 @@ HBRUSH CLauncherDlg::OnCtlColor(CDC* pDC, CWnd* pWnd, UINT nCtlColor) pDC->SetTextColor(textFormat.color); pDC->SetBkMode(TRANSPARENT); 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)) { 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); lineRect.MoveToY(lineRect.bottom + 1); pDC->FillSolidRect(lineRect, COLOR_GREY); - + } - } + } return (HBRUSH)GetStockObject(BLACK_BRUSH); } @@ -613,7 +613,7 @@ void CLauncherDlg::OnDrawItem(int nIDCtl, LPDRAWITEMSTRUCT lpDrawItemStruct) dc.SetTextColor(COLOR_WHITE); 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.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.SetTextColor(COLOR_BLUE); 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.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.SetTextColor(COLOR_LIGHT_GREY); 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.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()) { progress = CONTINUE_UPDATING_GLOBAL_OFFSET * progress; progress = min(progress, CONTINUE_UPDATING_GLOBAL_OFFSET); - } + } theApp._manager.updateProgress(LauncherManager::ProcessType::Uninstall, progress); _splashStep++; } @@ -836,7 +836,7 @@ void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) { case DrawStep::DrawProcessFinishUpdate: case DrawStep::DrawProcessUpdate: case DrawStep::DrawProcessUninstall: - case DrawStep::DrawProcessSetup: + case DrawStep::DrawProcessSetup: if (!isUpdate) { m_voxelRenderTarget->BeginDraw(); 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); m_pRenderTarget->EndDraw(); RedrawWindow(); - } + } m_progressRenderTarget->BeginDraw(); 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)); @@ -855,7 +855,7 @@ void CLauncherDlg::setDrawDialog(DrawStep step, BOOL isUpdate) { m_progressRenderTarget->EndDraw(); m_voxelRenderTarget->BeginDraw(); drawVoxel(m_voxelRenderTarget); - m_voxelRenderTarget->EndDraw(); + m_voxelRenderTarget->EndDraw(); break; default: break; diff --git a/launchers/win32/res/FiraSansbold.ttf b/launchers/win32/res/FiraSansbold.ttf new file mode 100644 index 0000000000..95e1660240 Binary files /dev/null and b/launchers/win32/res/FiraSansbold.ttf differ diff --git a/launchers/win32/res/FiraSansregular.ttf b/launchers/win32/res/FiraSansregular.ttf new file mode 100644 index 0000000000..d9fdc0e922 Binary files /dev/null and b/launchers/win32/res/FiraSansregular.ttf differ diff --git a/launchers/win32/res/Graphikbold.ttf b/launchers/win32/res/Graphikbold.ttf deleted file mode 100644 index 1c0549830b..0000000000 Binary files a/launchers/win32/res/Graphikbold.ttf and /dev/null differ diff --git a/launchers/win32/res/Graphikregular.ttf b/launchers/win32/res/Graphikregular.ttf deleted file mode 100644 index 0b7464bad2..0000000000 Binary files a/launchers/win32/res/Graphikregular.ttf and /dev/null differ diff --git a/screenshare/src/resources/FiraSans-Regular.ttf b/screenshare/src/resources/FiraSans-Regular.ttf new file mode 100644 index 0000000000..d9fdc0e922 Binary files /dev/null and b/screenshare/src/resources/FiraSans-Regular.ttf differ diff --git a/screenshare/src/resources/Graphik-Regular.ttf b/screenshare/src/resources/Graphik-Regular.ttf deleted file mode 100644 index 001faa7f47..0000000000 Binary files a/screenshare/src/resources/Graphik-Regular.ttf and /dev/null differ diff --git a/screenshare/src/styles.css b/screenshare/src/styles.css index 78dca032fa..7a6d20447d 100644 --- a/screenshare/src/styles.css +++ b/screenshare/src/styles.css @@ -1,7 +1,7 @@ body { background-color: black; box-sizing: border-box; - font-family: "Graphik"; + font-family: "FiraSans"; margin: 0px 22px 10px 22px; } @@ -77,8 +77,8 @@ yes:hover + #yes_background { } @font-face { - font-family: "Graphik"; - src: url("./resources/Graphik-Regular.ttf"); + font-family: "FiraSans"; + src: url("./resources/FiraSans-Regular.ttf"); } #title { @@ -203,7 +203,7 @@ img { width: 9px; overflow: scroll; overflow-x: hidden; -} +} #style-1::-webkit-scrollbar-thumb { background-color: #0198CB; diff --git a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml index a890be46f1..67912be757 100644 --- a/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml +++ b/scripts/simplifiedUI/simplifiedEmote/emojiApp/ui/qml/SimplifiedEmoji.qml @@ -22,7 +22,7 @@ Rectangle { id: root color: simplifiedUI.colors.darkBackground anchors.fill: parent - + // Used for the indicator picture readonly property string emojiBaseURL: "../../resources/images/emojis/512px/" readonly property string emoji52BaseURL: "../../resources/images/emojis/52px/" @@ -57,7 +57,7 @@ Rectangle { emojiSearchTextField.forceActiveFocus(); EmojiList.emojiList .filter(emoji => { - return emoji.mainCategory === "Smileys & Emotion" || + return emoji.mainCategory === "Smileys & Emotion" || emoji.mainCategory === "People & Body" || emoji.mainCategory === "Animals & Nature" || emoji.mainCategory === "Food & Drink"; @@ -78,7 +78,7 @@ Rectangle { mainModel.append(item); filteredModel.append(item); }); - + root.currentCode = filteredModel.get(0).code.utf; } @@ -88,7 +88,7 @@ Rectangle { visible: false color: Qt.rgba(0, 0, 0, 0.8) anchors.fill: parent - + MouseArea { hoverEnabled: false anchors.fill: parent @@ -96,7 +96,7 @@ Rectangle { popupContainer.visible = false; } } - + MouseArea { hoverEnabled: false anchors.fill: popupContentContainer @@ -117,7 +117,7 @@ Rectangle { width: 50 height: width - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { text: "X" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -126,7 +126,7 @@ Rectangle { opacity: closeButtonMouseArea.containsMouse ? 1.0 : 0.8 size: 22 } - + MouseArea { id: closeButtonMouseArea hoverEnabled: true @@ -137,7 +137,7 @@ Rectangle { } } - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: popupHeader1 text: "Emoji Reactions" anchors.top: parent.top @@ -154,7 +154,7 @@ Rectangle { size: 22 } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { 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" + "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 } - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: popupHeader2 text: "Attributions" anchors.top: popupText1.bottom @@ -188,7 +188,7 @@ Rectangle { size: 22 } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { id: popupText2 textFormat: Text.RichText text: "" + @@ -214,7 +214,7 @@ Rectangle { } } } - + // If this MouseArea is hit, the user is clicking on an area not handled // by any other MouseArea MouseArea { @@ -372,7 +372,7 @@ Rectangle { width: 22 height: width - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { text: "?" anchors.fill: parent horizontalAlignment: Text.AlignHCenter @@ -381,7 +381,7 @@ Rectangle { opacity: attributionMouseArea.containsMouse ? 1.0 : 0.8 size: 22 } - + MouseArea { id: attributionMouseArea hoverEnabled: enabled @@ -412,7 +412,7 @@ Rectangle { propagateComposedEvents: false onEntered: { 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) { return; } @@ -459,7 +459,7 @@ Rectangle { anchors.rightMargin: -grid.anchors.rightMargin + 2 } - HifiStylesUit.GraphikRegular { + HifiStylesUit.FiraSansRegular { readonly property var cantFindEmojiList: ["😣", "😭", "😖", "😢", "🤔"] onVisibleChanged: { if (visible) { diff --git a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml index efc14ce901..32a4664e0a 100644 --- a/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml +++ b/scripts/simplifiedUI/simplifiedEmote/ui/qml/SimplifiedEmoteIndicator.qml @@ -255,7 +255,7 @@ Rectangle { opacity: 0.8 radius: 4 - HifiStylesUit.GraphikSemiBold { + HifiStylesUit.FiraSansSemiBold { id: toolTipText anchors.left: parent.left anchors.leftMargin: 2 diff --git a/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-Regular.ttf b/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-Regular.ttf new file mode 100644 index 0000000000..d9fdc0e922 Binary files /dev/null and b/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-Regular.ttf differ diff --git a/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-SemiBold.ttf b/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-SemiBold.ttf new file mode 100644 index 0000000000..821a43d7fd Binary files /dev/null and b/tools/jsdoc/hifi-jsdoc-template/static/fonts/FiraSans-SemiBold.ttf differ diff --git a/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Regular.otf b/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Regular.otf deleted file mode 100644 index 8100438827..0000000000 Binary files a/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Regular.otf and /dev/null differ diff --git a/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Semibold.otf b/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Semibold.otf deleted file mode 100644 index 45cf6bc865..0000000000 Binary files a/tools/jsdoc/hifi-jsdoc-template/static/fonts/Graphik-Semibold.otf and /dev/null differ diff --git a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css index 7af55da7d5..709bcb62c9 100644 --- a/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css +++ b/tools/jsdoc/hifi-jsdoc-template/static/styles/jsdoc.css @@ -4,13 +4,13 @@ ********************************************************************/ @font-face{ - font-family: 'Graphik Semibold'; - src: url('../fonts/Graphik-SemiBold.otf') format('opentype'); + font-family: 'FiraSans Semibold'; + src: url('../fonts/FiraSans-SemiBold.ttf') format('truetype'); } @font-face{ - font-family: 'Graphik Regular'; - src: url('../fonts/Graphik-Regular.otf') format('opentype'); + font-family: 'FiraSans Regular'; + src: url('../fonts/FiraSans-Regular.ttf') format('truetype'); } @font-face{ @@ -34,12 +34,12 @@ html body { - font-family: 'Graphik Regular', 'Proxima Nova', arial, sans-serif; - font-weight: 400; + font-family: 'FiraSans Regular', 'Proxima Nova', arial, sans-serif; + font-weight: 400; color: #000000; - letter-spacing: 0.5px; + letter-spacing: 0.5px; font-size: 0.95rem; - line-height: 20px; + line-height: 20px; } p { @@ -59,7 +59,7 @@ section ********************************************************************/ h1, h2, h3, h4 { - font-family: "Graphik Semibold", Helvetica, sans-serif; + font-family: "FiraSans Semibold", Helvetica, sans-serif; } h1 @@ -83,7 +83,7 @@ h3 h4 { - font-family: 'Graphik Regular'; + font-family: 'FiraSans Regular'; font-size: 1.03rem; } @@ -237,11 +237,11 @@ nav #nav-search { background-color: #27343B; color: #FFFFFF; text-align: center; - margin-top: 0px; + margin-top: 0px; } .nav-header p { - padding-top: 8px; + padding-top: 8px; } .nav-header a { @@ -251,7 +251,7 @@ nav #nav-search { } nav h3 { - font-family: "Graphik Regular", sans-serif; + font-family: "FiraSans Regular", sans-serif; font-size: 0.9rem; color: #FFFFFF; text-transform: uppercase; @@ -288,11 +288,11 @@ nav ul ul li:first-child padding-top: 0; } -nav li +nav li { margin-top: 14px; } - + nav a:hover { font-weight: bold; @@ -373,11 +373,11 @@ nav > h2 > a { .search-input { - font-family: 'Graphik Regular', sans-serif; - font-size: 90%; + font-family: 'FiraSans Regular', sans-serif; + font-size: 90%; border: 1px solid #ddd; 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; color: white; width: 70%; @@ -429,7 +429,7 @@ header { padding: 0px 4px; } -.apiLinks +.apiLinks { display: block; text-align: center; @@ -459,7 +459,7 @@ header { color: #999 !important; } -#main p.availableIn +#main p.availableIn { font-size: 0.8rem; }