mirror of
https://thingvellir.net/git/overte
synced 2025-03-27 23:52:03 +01:00
Initial integration of browser
This commit is contained in:
parent
e8b93998da
commit
dc2e08ef6b
2 changed files with 88 additions and 2 deletions
|
@ -14,6 +14,7 @@ import "../simplifiedConstants" as SimplifiedConstants
|
||||||
import "../simplifiedControls" as SimplifiedControls
|
import "../simplifiedControls" as SimplifiedControls
|
||||||
import stylesUit 1.0 as HifiStylesUit
|
import stylesUit 1.0 as HifiStylesUit
|
||||||
import "./controls" as HelpControls
|
import "./controls" as HelpControls
|
||||||
|
import "./faq" as HelpFAQ
|
||||||
import "./about" as HelpAbout
|
import "./about" as HelpAbout
|
||||||
|
|
||||||
Rectangle {
|
Rectangle {
|
||||||
|
@ -48,6 +49,10 @@ Rectangle {
|
||||||
tabTitle: "Controls"
|
tabTitle: "Controls"
|
||||||
tabViewName: "controlsTabView"
|
tabViewName: "controlsTabView"
|
||||||
}
|
}
|
||||||
|
ListElement {
|
||||||
|
tabTitle: "FAQ"
|
||||||
|
tabViewName: "faqTabView"
|
||||||
|
}
|
||||||
ListElement {
|
ListElement {
|
||||||
tabTitle: "About"
|
tabTitle: "About"
|
||||||
tabViewName: "aboutTabView"
|
tabViewName: "aboutTabView"
|
||||||
|
@ -125,6 +130,12 @@ Rectangle {
|
||||||
anchors.fill: parent
|
anchors.fill: parent
|
||||||
}
|
}
|
||||||
|
|
||||||
|
HelpFAQ.HelpFAQ {
|
||||||
|
id: faqTabViewContainer
|
||||||
|
visible: activeTabView === "faqTabView"
|
||||||
|
anchors.fill: parent
|
||||||
|
}
|
||||||
|
|
||||||
HelpAbout.HelpAbout {
|
HelpAbout.HelpAbout {
|
||||||
id: aboutTabViewContainer
|
id: aboutTabViewContainer
|
||||||
visible: activeTabView === "aboutTabView"
|
visible: activeTabView === "aboutTabView"
|
||||||
|
@ -133,8 +144,10 @@ Rectangle {
|
||||||
|
|
||||||
SimplifiedControls.VerticalScrollBar {
|
SimplifiedControls.VerticalScrollBar {
|
||||||
parent: {
|
parent: {
|
||||||
if (activeTabView === "generalTabView") {
|
if (activeTabView === "controlsTabView") {
|
||||||
controlsTabViewContainers
|
controlsTabViewContainer
|
||||||
|
} else if (activeTabView === "faqTabView") {
|
||||||
|
faqTabViewContainer
|
||||||
} else if (activeTabView === "aboutTabView") {
|
} else if (activeTabView === "aboutTabView") {
|
||||||
aboutTabViewContainer
|
aboutTabViewContainer
|
||||||
}
|
}
|
||||||
|
|
|
@ -0,0 +1,73 @@
|
||||||
|
//
|
||||||
|
// HelpFAQ.qml
|
||||||
|
//
|
||||||
|
// Created by Zach Fox on 2019-08-08
|
||||||
|
// 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 controlsUit 1.0 as HifiControlsUit
|
||||||
|
import QtQuick.Layouts 1.3
|
||||||
|
import PerformanceEnums 1.0
|
||||||
|
|
||||||
|
Item {
|
||||||
|
id: root
|
||||||
|
width: parent.width
|
||||||
|
height: parent.height
|
||||||
|
|
||||||
|
|
||||||
|
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: faqColumnLayout
|
||||||
|
anchors.left: parent.left
|
||||||
|
anchors.leftMargin: 26
|
||||||
|
anchors.right: parent.right
|
||||||
|
anchors.rightMargin: 26
|
||||||
|
anchors.top: parent.top
|
||||||
|
anchors.bottom: parent.bottom
|
||||||
|
anchors.bottomMargin: 16
|
||||||
|
spacing: 0
|
||||||
|
|
||||||
|
HifiStylesUit.GraphikSemiBold {
|
||||||
|
text: "FAQ"
|
||||||
|
Layout.preferredWidth: parent.width
|
||||||
|
Layout.preferredHeight: paintedHeight
|
||||||
|
Layout.topMargin: 16
|
||||||
|
size: 22
|
||||||
|
color: simplifiedUI.colors.text.white
|
||||||
|
}
|
||||||
|
|
||||||
|
HifiControlsUit.WebView {
|
||||||
|
url: "https://www.highfidelity.com/knowledge"
|
||||||
|
Layout.preferredWidth: parent.width
|
||||||
|
Layout.fillHeight: true
|
||||||
|
Layout.topMargin: 16
|
||||||
|
}
|
||||||
|
}
|
||||||
|
}
|
Loading…
Reference in a new issue