diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
index ecc8bac2a7..c9857afcec 100644
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
+++ b/interface/resources/qml/hifi/simplifiedUI/settingsApp/SettingsApp.qml
@@ -17,8 +17,6 @@ import "./audio" as AudioSettings
import "./general" as GeneralSettings
import "./vr" as VrSettings
import "./dev" as DevSettings
-import "./about" as AboutSettings
-
Rectangle {
property string activeTabView: "generalTabView"
id: root
@@ -86,10 +84,6 @@ Rectangle {
tabTitle: "VR"
tabViewName: "vrTabView"
}
- ListElement {
- tabTitle: "About"
- tabViewName: "aboutTabView"
- }
ListElement {
tabTitle: "Dev"
tabViewName: "devTabView"
@@ -190,12 +184,6 @@ Rectangle {
anchors.fill: parent
}
- AboutSettings.About {
- id: aboutTabViewContainer
- visible: activeTabView === "aboutTabView"
- anchors.fill: parent
- }
-
SimplifiedControls.VerticalScrollBar {
parent: {
if (activeTabView === "generalTabView") {
@@ -206,8 +194,6 @@ Rectangle {
vrTabViewContainer
} else if (activeTabView === "devTabView") {
devTabViewContainer
- } else if (activeTabView === "aboutTabView") {
- aboutTabViewContainer
}
}
}
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
deleted file mode 100644
index 89cccb8ecd..0000000000
--- a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/About.qml
+++ /dev/null
@@ -1,332 +0,0 @@
-//
-// 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;
-
- // When the user clicks the About tab, refresh the audio I/O model so that
- // the delegate Component.onCompleted handlers fire, which will update
- // the text that appears in the About screen.
- audioOutputDevices.model = undefined;
- audioOutputDevices.model = AudioScriptingInterface.devices.output;
- audioInputDevices.model = undefined;
- audioInputDevices.model = AudioScriptingInterface.devices.input;
- }
- }
-
-
- SimplifiedConstants.SimplifiedConstants {
- id: simplifiedUI
- }
-
-
- ColumnLayout {
- id: aboutColumnLayout
- anchors.left: parent.left
- anchors.leftMargin: 26
- anchors.right: parent.right
- anchors.rightMargin: 26
- anchors.top: parent.top
- spacing: 0
-
- Image {
- source: "images/logo.png"
- Layout.alignment: Qt.AlignHCenter
- Layout.topMargin: 16
- Layout.preferredWidth: 160
- Layout.preferredHeight: 120
- fillMode: Image.PreserveAspectFit
- mipmap: true
- }
-
- ColumnLayout {
- id: platformInfoContainer
- Layout.preferredWidth: parent.width
- Layout.bottomMargin: 24
- spacing: 0
-
- HifiStylesUit.GraphikSemiBold {
- text: "Version " + Window.checkVersion()
- Layout.alignment: Qt.AlignHCenter
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikSemiBold {
- text: "Platform Info"
- Layout.preferredWidth: parent.width
- Layout.topMargin: 8
- Layout.bottomMargin: 8
- height: paintedHeight
- size: 22
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- text: "Computer Vendor/Model:"
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
-
- Component.onCompleted: {
- var computer = JSON.parse(PlatformInfo.getComputer());
- var computerVendor = computer.vendor;
- if (computerVendor.length === 0) {
- computerVendor = "Unknown";
- }
- var computerModel = computer.model;
- if (computerModel.length === 0) {
- computerModel = "Unknown";
- }
-
- text = "Computer Vendor/Model: " + computerVendor + "/" + computerModel;
- }
- }
-
- HifiStylesUit.GraphikRegular {
- text: "Profiled Platform Tier: " + PlatformInfo.getTierProfiled()
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- text: "OS Type: " + PlatformInfo.getOperatingSystemType()
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- 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;
- if (cpuModel.length === 0) {
- cpuModel = "Unknown";
- }
-
- text = "CPU: " + cpuModel;
- }
- }
-
- HifiStylesUit.GraphikRegular {
- text: "# CPUs: " + PlatformInfo.getNumCPUs()
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- text: "# CPU Cores: " + PlatformInfo.getNumLogicalCores()
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- text: "RAM: " + PlatformInfo.getTotalSystemMemoryMB() + " MB"
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- HifiStylesUit.GraphikRegular {
- 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;
- if (gpuModel.length === 0) {
- gpuModel = "Unknown";
- }
-
- text = "GPU: " + gpuModel;
- }
- }
-
- HifiStylesUit.GraphikRegular {
- text: "VR Hand Controllers: " + (PlatformInfo.hasRiftControllers() ? "Rift" : (PlatformInfo.hasViveControllers() ? "Vive" : "None"))
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- // This is a bit of a hack to get the name of the currently-selected audio input device
- // in the current mode (Desktop or VR). The reason this is necessary is because it seems to me like
- // the only way one can get a human-readable list of the audio I/O devices is by using a ListView
- // and grabbing the names from the AudioScriptingInterface; you can't do it using a ListModel.
- // See `AudioDevices.h`, specifically the comment above the declaration of `QVariant data()`.
- ListView {
- id: audioInputDevices
- visible: false
- property string selectedInputDeviceName
- Layout.preferredWidth: parent.width
- Layout.preferredHeight: contentItem.height
- interactive: false
- delegate: Item {
- Component.onCompleted: {
- if (HMD.active && selectedHMD) {
- audioInputDevices.selectedInputDeviceName = model.devicename
- } else if (!HMD.active && selectedDesktop) {
- audioInputDevices.selectedInputDeviceName = model.devicename
- }
- }
- }
- }
-
- HifiStylesUit.GraphikRegular {
- text: "Audio Input: " + audioInputDevices.selectedInputDeviceName
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
-
- // This is a bit of a hack to get the name of the currently-selected audio output device
- // in the current mode (Desktop or VR). The reason this is necessary is because it seems to me like
- // the only way one can get a human-readable list of the audio I/O devices is by using a ListView
- // and grabbing the names from the AudioScriptingInterface; you can't do it using a ListModel.
- // See `AudioDevices.h`, specifically the comment above the declaration of `QVariant data()`.
- ListView {
- id: audioOutputDevices
- visible: false
- property string selectedOutputDeviceName
- Layout.preferredWidth: parent.width
- Layout.preferredHeight: contentItem.height
- interactive: false
- delegate: Item {
- Component.onCompleted: {
- if (HMD.active && selectedHMD) {
- audioOutputDevices.selectedOutputDeviceName = model.devicename
- } else if (!HMD.active && selectedDesktop) {
- audioOutputDevices.selectedOutputDeviceName = model.devicename
- }
- }
- }
- }
-
- HifiStylesUit.GraphikRegular {
- text: "Audio Output: " + audioOutputDevices.selectedOutputDeviceName
- Layout.preferredWidth: parent.width
- height: paintedHeight
- size: 16
- color: simplifiedUI.colors.text.white
- wrapMode: Text.Wrap
- }
-
- SimplifiedControls.Button {
- Layout.topMargin: 8
- width: 200
- height: 32
- text: "Copy to Clipboard"
- temporaryText: "Copied!"
-
- onClicked: {
- Window.copyToClipboard(root.buildPlatformInfoTextToCopy());
- showTemporaryText();
- }
- }
- }
- }
-
- function buildPlatformInfoTextToCopy() {
- var textToCopy = "**About Interface**\n";
- textToCopy += "Interface Version: " + Window.checkVersion() + "\n";
- textToCopy += "\n**Platform Info**\n";
-
- var computer = JSON.parse(PlatformInfo.getComputer());
- var computerVendor = computer.vendor;
- if (computerVendor.length === 0) {
- computerVendor = "Unknown";
- }
- var computerModel = computer.model;
- if (computerModel.length === 0) {
- computerModel = "Unknown";
- }
-
- textToCopy += "Computer Vendor/Model: " + computerVendor + "/" + computerModel + "\n";
- textToCopy += "Profiled Platform Tier: " + PlatformInfo.getTierProfiled() + "\n";
- textToCopy += "OS Type: " + PlatformInfo.getOperatingSystemType() + "\n";
-
- var cpu = JSON.parse(PlatformInfo.getCPU(0));
- var cpuModel = cpu.model;
- if (cpuModel.length === 0) {
- cpuModel = "Unknown";
- }
-
- textToCopy += "CPU: " + cpuModel + "\n";
- 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.length === 0) {
- gpuModel = "Unknown";
- }
-
- textToCopy += "GPU: " + gpuModel + "\n";
- 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);
-
- return textToCopy;
- }
-}
diff --git a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png b/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png
deleted file mode 100644
index d480da86dd..0000000000
Binary files a/interface/resources/qml/hifi/simplifiedUI/settingsApp/about/images/logo.png and /dev/null differ