From ec4fc672b6b0a7758eae15c5db19f4b5b7956d8f Mon Sep 17 00:00:00 2001 From: Zach Fox Date: Tue, 18 Jun 2019 11:29:20 -0700 Subject: [PATCH] Better design; Interface version --- .../simplifiedUI/settingsApp/about/About.qml | 36 ++++++++++++++----- 1 file changed, 28 insertions(+), 8 deletions(-) diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml index 7f0dcc2289..a79aa82336 100644 --- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml +++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml @@ -66,18 +66,36 @@ Flickable { spacing: 0 HifiStylesUit.GraphikSemiBold { - id: platformInfoTitle - text: "Platform Info" + text: "About Interface" Layout.maximumWidth: parent.width + Layout.bottomMargin: 14 height: paintedHeight size: 22 color: simplifiedUI.colors.text.white } HifiStylesUit.GraphikRegular { - text: "Platform Tier: " + PlatformInfo.getTierProfiled() + text: "Interface Version: " + Window.checkVersion() + Layout.maximumWidth: parent.width + height: paintedHeight + size: 16 + color: simplifiedUI.colors.text.white + wrapMode: Text.Wrap + } + + HifiStylesUit.GraphikSemiBold { + text: "Platform Info" + Layout.maximumWidth: parent.width + Layout.topMargin: 24 + Layout.bottomMargin: 14 + height: paintedHeight + size: 22 + color: simplifiedUI.colors.text.white + } + + HifiStylesUit.GraphikRegular { + text: "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() Layout.maximumWidth: parent.width - Layout.topMargin: 14 height: paintedHeight size: 16 color: simplifiedUI.colors.text.white @@ -130,7 +148,7 @@ Flickable { } HifiStylesUit.GraphikRegular { - text: "GPU Type: " + PlatformInfo.getGraphicsCardType() + text: "GPU: " + PlatformInfo.getGraphicsCardType() Layout.maximumWidth: parent.width height: paintedHeight size: 16 @@ -161,14 +179,16 @@ Flickable { } function buildPlatformInfoTextToCopy() { - var textToCopy = "Platform Info:\n"; - textToCopy += "Platform Tier: " + PlatformInfo.getTierProfiled() + "\n"; + var textToCopy = "About Interface:\n"; + textToCopy += "Interface Version: " + Window.checkVersion() + "\n"; + textToCopy += "\nPlatform Info:\n"; + textToCopy += "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() + "\n"; textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n"; textToCopy += "CPU: " + PlatformInfo.getCPUBrand() + "\n"; textToCopy += "# CPUs: " + PlatformInfo.getNumCPUs() + "\n"; textToCopy += "# CPU Cores: " + PlatformInfo.getNumLogicalCores() + "\n"; textToCopy += "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB\n"; - textToCopy += "GPU Type: " + PlatformInfo.getGraphicsCardType() + "\n"; + textToCopy += "GPU: " + PlatformInfo.getGraphicsCardType() + "\n"; textToCopy += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None")); return textToCopy;