diff --git a/interface/resources/images/about-highfidelity.png b/interface/resources/images/about-highfidelity.png new file mode 100644 index 0000000000..718ed7d525 Binary files /dev/null and b/interface/resources/images/about-highfidelity.png differ diff --git a/interface/resources/images/about-physics.png b/interface/resources/images/about-physics.png new file mode 100644 index 0000000000..62a7666da2 Binary files /dev/null and b/interface/resources/images/about-physics.png differ diff --git a/interface/resources/images/about-qt.png b/interface/resources/images/about-qt.png new file mode 100644 index 0000000000..90230ecbf5 Binary files /dev/null and b/interface/resources/images/about-qt.png differ diff --git a/interface/resources/qml/hifi/dialogs/AboutDialog.qml b/interface/resources/qml/hifi/dialogs/AboutDialog.qml new file mode 100644 index 0000000000..b8e6e89aec --- /dev/null +++ b/interface/resources/qml/hifi/dialogs/AboutDialog.qml @@ -0,0 +1,32 @@ +// +// AssetDialog.qml +// +// Created by David Rowe on 18 Apr 2017 +// Copyright 2017 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.8 + +import "../../styles-uit" +import "../../windows" + +ScrollingWindow { + id: root + resizable: false + implicitWidth: 480 + implicitHeight: 706 + objectName: "aboutDialog" + destroyOnCloseButton: true + destroyOnHidden: true + visible: true + minSize: Qt.vector2d(480, 706) + title: "About" + + TabletAboutDialog { + width: pane.width + height: pane.height + } +} diff --git a/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml new file mode 100644 index 0000000000..d89f8cafe3 --- /dev/null +++ b/interface/resources/qml/hifi/dialogs/TabletAboutDialog.qml @@ -0,0 +1,120 @@ +// +// TabletAssetDialog.qml +// +// Created by David Rowe on 18 Apr 2017 +// Copyright 2017 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.5 + +import "../../styles-uit" + +Rectangle { + width: 480 + height: 706 + + HifiConstants { id: hifi; } + + color: hifi.colors.baseGray + + Column { + x: 45 + y: 30 + spacing: 5 + + Image { + sourceSize.width: 295 + sourceSize.height: 75 + source: "../../../images/about-highfidelity.png" + } + Column { + id: buildColumm + anchors.left: parent.left + anchors.leftMargin: 70 + Row { + RalewayRegular { + text: "Build" + size: 16 + color: "white" + } + RalewayRegular { + id: build + size: 16 + color: "white" + } + } + Row { + RalewayRegular { + text: "Released" + size: 16 + color: "white" + } + RalewayRegular { + id: released + size: 16 + color: "white" + } + } + } + Item { height: 10; width: 1 } + RalewayRegular { + text: "An open-source virtual reality platform." + size: 20 + color: "white" + } + RalewayRegular { + textFormat: Text.RichText + color: "white" + text: "www.highfidelity.com." + size: 20 + } + Item { height: 40; width: 1 } + Row { + spacing: 5 + Image { + sourceSize.width: 34 + sourceSize.height: 25 + source: "../../../images/about-qt.png" + } + RalewayRegular { + color: "white" + text: "Built using Qt 5.10.1" + size: 12 + anchors.verticalCenter: parent.verticalCenter + } + Item { height: 1; width: 15 } + Image { + sourceSize.width: 70 + sourceSize.height: 26 + source: "../../../images/about-physics.png" + } + RalewayRegular { + color: "white" + text: "Physics powered by Bullet" + size: 12 + anchors.verticalCenter: parent.verticalCenter + } + } + Item { height: 20; width: 1 } + RalewayRegular { + textFormat: Text.RichText + color: "white" + text: "Blockchain technology from Elements." + size: 14 + } + RalewayRegular { + color: "white" + text: "© 2018 High Fidelity. All rights reserved." + size: 14 + } + RalewayRegular { + textFormat: Text.RichText + color: "white" + text: "Distributed under the Apache License, Version 2.0.." + size: 14 + } + } +} diff --git a/interface/src/Menu.cpp b/interface/src/Menu.cpp index d60e59a1cb..be50fe9119 100644 --- a/interface/src/Menu.cpp +++ b/interface/src/Menu.cpp @@ -814,9 +814,11 @@ Menu::Menu() { MenuWrapper * helpMenu = addMenu("Help"); // Help > About High Fidelity - //TODO: Add dialog to show about: Logo, Company, Version - addActionToQMenuAndActionHash(helpMenu, "About High Fidelity"); - + action = addActionToQMenuAndActionHash(helpMenu, "About High Fidelity"); + connect(action, &QAction::triggered, [] { + qApp->showDialog(QString("hifi/dialogs/AboutDialog.qml"), + QString("hifi/dialogs/TabletAboutDialog.qml"), "AboutDialog"); + }); helpMenu->addSeparator(); // Help > HiFi Docs