Mirrors/overte
3
0
Fork 0
mirror of https://github.com/overte-org/overte.git synced 2025-08-09 08:21:24 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions 2

- Video, and new Docs url in QML

Browse source
This commit is contained in:
Thijs Wenker 2019-03-15 21:36:46 +01:00
parent b5a45be7b9
commit 714115adef
2 changed files with 26 additions and 5 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

11
interface/resources/qml/hifi/avatarPackager/AvatarPackagerApp.qml
View file

@ -133,7 +133,7 @@ Item {
states: [ states: [
State { State {
name: AvatarPackagerState.main name: AvatarPackagerState.main
PropertyChanges { target: avatarPackagerHeader; title: qsTr("Avatar Packager"); docsEnabled: true; backButtonVisible: false } PropertyChanges { target: avatarPackagerHeader; title: qsTr("Avatar Packager"); docsEnabled: true; videoEnabled: true; backButtonVisible: false }
PropertyChanges { target: avatarPackagerMain; visible: true } PropertyChanges { target: avatarPackagerMain; visible: true }
PropertyChanges { target: avatarPackagerFooter; content: avatarPackagerMain.footer } PropertyChanges { target: avatarPackagerFooter; content: avatarPackagerMain.footer }
}, },
@ -229,7 +229,11 @@ Item {
} }
function openDocs() { function openDocs() {
Qt.openUrlExternally("https://docs.highfidelity.com/create/avatars/create-avatars#how-to-package-your-avatar"); Qt.openUrlExternally("https://docs.highfidelity.com/create/avatars/package-avatar.html");
}
function openVideo() {
Qt.openUrlExternally("https://youtu.be/zrkEowu_yps");
} }
AvatarPackagerHeader { AvatarPackagerHeader {
@ -243,6 +247,9 @@ Item {
onDocsButtonClicked: { onDocsButtonClicked: {
avatarPackager.openDocs(); avatarPackager.openDocs();
} }
onVideoButtonClicked: {
avatarPackager.openVideo();
}
} }
Item { Item {

20
interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
View file

@ -13,6 +13,7 @@ ShadowRectangle {
property string title: qsTr("Avatar Packager") property string title: qsTr("Avatar Packager")
property alias docsEnabled: docs.visible property alias docsEnabled: docs.visible
property alias videoEnabled: video.visible
property bool backButtonVisible: true // If false, is not visible and does not take up space property bool backButtonVisible: true // If false, is not visible and does not take up space
property bool backButtonEnabled: true // If false, is not visible but does not affect space property bool backButtonEnabled: true // If false, is not visible but does not affect space
property bool canRename: false property bool canRename: false
@ -24,6 +25,7 @@ ShadowRectangle {
signal backButtonClicked signal backButtonClicked
signal docsButtonClicked signal docsButtonClicked
signal videoButtonClicked
RalewayButton { RalewayButton {
id: back id: back
@ -126,6 +128,20 @@ ShadowRectangle {
} }
} }
RalewayButton {
id: video
visible: false
size: 28
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.right: docs.left
anchors.rightMargin: 16
text: qsTr("Video")
onClicked: videoButtonClicked()
}
RalewayButton { RalewayButton {
id: docs id: docs
visible: false visible: false
@ -137,8 +153,6 @@ ShadowRectangle {
text: qsTr("Docs") text: qsTr("Docs")
onClicked: { onClicked: docsButtonClicked()
docsButtonClicked();
}
} }
} }