mirror of
https://github.com/overte-org/overte.git
synced 2025-08-09 15:29:32 +02:00
DEV-145: About screen for platform info
This commit is contained in:
parent
caba398645
commit
34def0fd6b
2 changed files with 190 additions and 1 deletions
|
@ -17,6 +17,7 @@ import "./audio" as AudioSettings
|
||||||
import "./general" as GeneralSettings
|
import "./general" as GeneralSettings
|
||||||
import "./vr" as VrSettings
|
import "./vr" as VrSettings
|
||||||
import "./dev" as DevSettings
|
import "./dev" as DevSettings
|
||||||
|
import "./about" as AboutSettings
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
property string activeTabView: "generalTabView"
|
property string activeTabView: "generalTabView"
|
||||||
|
@ -76,6 +77,10 @@ Rectangle {
|
||||||
tabTitle: "VR"
|
tabTitle: "VR"
|
||||||
tabViewName: "vrTabView"
|
tabViewName: "vrTabView"
|
||||||
}
|
}
|
||||||
|
ListElement {
|
||||||
|
tabTitle: "About"
|
||||||
|
tabViewName: "aboutTabView"
|
||||||
|
}
|
||||||
ListElement {
|
ListElement {
|
||||||
tabTitle: "Dev"
|
tabTitle: "Dev"
|
||||||
tabViewName: "devTabView"
|
tabViewName: "devTabView"
|
||||||
|
@ -103,7 +108,7 @@ Rectangle {
|
||||||
delegate: Item {
|
delegate: Item {
|
||||||
visible: model.tabTitle !== "Dev" || (model.tabTitle === "Dev" && root.developerModeEnabled)
|
visible: model.tabTitle !== "Dev" || (model.tabTitle === "Dev" && root.developerModeEnabled)
|
||||||
|
|
||||||
width: tabTitleText.paintedWidth + 64
|
width: tabTitleText.paintedWidth + 32
|
||||||
height: parent.height
|
height: parent.height
|
||||||
|
|
||||||
HifiStylesUit.GraphikRegular {
|
HifiStylesUit.GraphikRegular {
|
||||||
|
@ -163,6 +168,12 @@ Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
AboutSettings.About {
|
||||||
|
id: aboutTabViewContainer
|
||||||
|
visible: activeTabView === "aboutTabView"
|
||||||
|
anchors.fill: parent
|
||||||
|
}
|
||||||
|
|
||||||
SimplifiedControls.VerticalScrollBar {
|
SimplifiedControls.VerticalScrollBar {
|
||||||
parent: {
|
parent: {
|
||||||
if (activeTabView === "generalTabView") {
|
if (activeTabView === "generalTabView") {
|
||||||
|
@ -173,6 +184,8 @@ Rectangle {
|
||||||
vrTabViewContainer
|
vrTabViewContainer
|
||||||
} else if (activeTabView === "devTabView") {
|
} else if (activeTabView === "devTabView") {
|
||||||
devTabViewContainer
|
devTabViewContainer
|
||||||
|
} else if (activeTabView === "aboutTabView") {
|
||||||
|
aboutTabViewContainer
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,176 @@
|
||||||
|
//
|
||||||
|
// About.qml
|
||||||
|
//
|
||||||
|
// Created by Zach Fox on 2019-06-18
|
||||||
|
// 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.10
|
||||||
|
import QtQuick.Controls 2.3
|
||||||
|
import "../../simplifiedConstants" as SimplifiedConstants
|
||||||
|
import "../../simplifiedControls" as SimplifiedControls
|
||||||
|
import stylesUit 1.0 as HifiStylesUit
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
|
||||||
|
Flickable {
|
||||||
|
id: root
|
||||||
|
contentWidth: parent.width
|
||||||
|
contentHeight: aboutColumnLayout.height
|
||||||
|
clip: true
|
||||||
|
|
||||||
|
onVisibleChanged: {
|
||||||
|
if (visible) {
|
||||||
|
root.contentX = 0;
|
||||||
|
root.contentY = 0;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
SimplifiedConstants.SimplifiedConstants {
|
||||||
|
id: simplifiedUI
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
Image {
|
||||||
|
id: accent
|
||||||
|
source: "../images/accent3.svg"
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.top: parent.top
|
||||||
|
width: 83
|
||||||
|
height: 156
|
||||||
|
transform: Scale {
|
||||||
|
xScale: -1
|
||||||
|
origin.x: accent.width / 2
|
||||||
|
origin.y: accent.height / 2
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
id: aboutColumnLayout
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.leftMargin: 26
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 26
|
||||||
|
anchors.top: parent.top
|
||||||
|
spacing: simplifiedUI.margins.settings.spacingBetweenSettings
|
||||||
|
|
||||||
|
ColumnLayout {
|
||||||
|
id: platformInfoContainer
|
||||||
|
Layout.preferredWidth: parent.width
|
||||||
|
Layout.topMargin: 24
|
||||||
|
Layout.bottomMargin: 24
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikSemiBold {
|
||||||
|
id: platformInfoTitle
|
||||||
|
text: "Platform Info"
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 22
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>Platform Tier:</b> " + PlatformInfo.getTierProfiled()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
Layout.topMargin: 14
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>OS Type:</b> " + PlatformInfo.getOperatingSystemType()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>CPU:</b> " + PlatformInfo.getCPUBrand()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b># CPUs:</b> " + PlatformInfo.getNumCPUs()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b># CPU Cores:</b> " + PlatformInfo.getNumLogicalCores()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>RAM:</b> " + PlatformInfo.getTotalSystemMemoryMB() + " MB"
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>GPU Type:</b> " + PlatformInfo.getGraphicsCardType()
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikRegular {
|
||||||
|
text: "<b>VR Hand Controllers:</b> " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"))
|
||||||
|
Layout.maximumWidth: parent.width
|
||||||
|
height: paintedHeight
|
||||||
|
size: 16
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
wrapMode: Text.Wrap
|
||||||
|
}
|
||||||
|
|
||||||
|
SimplifiedControls.Button {
|
||||||
|
Layout.topMargin: 24
|
||||||
|
width: 200
|
||||||
|
height: 32
|
||||||
|
text: "Copy to Clipboard"
|
||||||
|
|
||||||
|
onClicked: {
|
||||||
|
Window.copyToClipboard(root.buildPlatformInfoTextToCopy());
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|
||||||
|
function buildPlatformInfoTextToCopy() {
|
||||||
|
var textToCopy = "Platform Info:\n";
|
||||||
|
textToCopy += "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 += "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"));
|
||||||
|
|
||||||
|
return textToCopy;
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue