Mirrors/overte-HifiExperiments
3
0
Fork 0
mirror of https://github.com/HifiExperiments/overte.git synced 2025-04-14 16:27:41 +02:00
Code Issues Projects Releases Packages Wiki Activity Actions

Disable back button on avatar upload page

Browse source
This commit is contained in:
Ryan Huffman 2018-12-27 22:55:54 -08:00
parent 8f70865cf7
commit 24aaeee5fd
4 changed files with 12 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
interface/resources/qml/hifi/AvatarPackager.qml
View file

@ -102,7 +102,7 @@ Windows.ScrollingWindow {
states: [
State {
name: AvatarPackagerState.main
PropertyChanges { target: avatarPackagerHeader; title: qsTr("Avatar Packager"); faqEnabled: true; backButtonEnabled: false }
PropertyChanges { target: avatarPackagerHeader; title: qsTr("Avatar Packager"); faqEnabled: true; backButtonVisible: false }
PropertyChanges { target: avatarPackagerMain; visible: true }
PropertyChanges { target: avatarPackagerFooter; content: avatarPackagerMain.footer }
},
@ -120,7 +120,7 @@ Windows.ScrollingWindow {
},
State {
name: "project-upload"
PropertyChanges { target: avatarPackagerHeader; title: AvatarPackagerCore.currentAvatarProject.name }
PropertyChanges { target: avatarPackagerHeader; title: AvatarPackagerCore.currentAvatarProject.name; backButtonEnabled: false }
PropertyChanges { target: avatarUploader; visible: true }
PropertyChanges { target: avatarPackagerFooter; visible: false }
}

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

@ -4,7 +4,7 @@ import "../../controlsUit" 1.0 as HifiControls
import "../../stylesUit" 1.0
Rectangle {
id: avatarPackagerHeader
id: root
width: parent.width
height: 74
@ -12,13 +12,14 @@ Rectangle {
property alias title: title.text
property alias faqEnabled: faq.visible
property alias backButtonEnabled: back.visible
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 canRename: false;
signal backButtonClicked
RalewaySemiBold {
id: back
visible: true
visible: backButtonEnabled && backButtonVisible
size: 28
anchors.top: parent.top
anchors.bottom: parent.bottom
@ -29,7 +30,7 @@ Rectangle {
color: "white"
MouseArea {
anchors.fill: parent
onClicked: avatarPackagerHeader.backButtonClicked()
onClicked: root.backButtonClicked()
hoverEnabled: true
onEntered: { state = "hovering" }
onExited: { state = "" }
@ -50,8 +51,8 @@ Rectangle {
size: 28
anchors.top: parent.top
anchors.bottom: parent.bottom
anchors.left: back.visible ? back.right : parent.left
anchors.leftMargin: back.visible ? 11 : 21
anchors.left: root.backButtonVisible ? back.right : parent.left
anchors.leftMargin: root.backButtonVisible ? 11 : 21
anchors.verticalCenter: title.verticalCenter
text: qsTr("Avatar Packager")
color: "white"

23
interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
View file

@ -47,8 +47,6 @@ Item {
Item {
id: uploadStatus
visible: !!root.uploader
anchors.fill: parent
Item {
@ -60,14 +58,14 @@ Item {
states: [
State {
name: "success"
when: !!root.uploader && root.uploader.state >= 4 && root.uploader.error === 0
when: root.uploader.state >= 4 && root.uploader.error === 0
PropertyChanges { target: uploadSpinner; visible: false }
PropertyChanges { target: errorIcon; visible: false }
PropertyChanges { target: successIcon; visible: true }
},
State {
name: "error"
when: !!root.uploader && root.uploader.finished && root.uploader.error !== 0
when: root.uploader.finished && root.uploader.error !== 0
PropertyChanges { target: uploadSpinner; visible: false }
PropertyChanges { target: errorIcon; visible: true }
PropertyChanges { target: successIcon; visible: false }
@ -198,21 +196,4 @@ Item {
}
}
}
Column {
id: debugInfo
visible: false
Text {
text: "Uploading"
color: "white"
}
Text {
text: "State: " + (!!root.uploader ? root.uploader.state : " NONE")
color: "white"
}
}
}

2
interface/src/avatar/AvatarProject.cpp
View file

@ -187,7 +187,7 @@ MarketplaceItemUploader* AvatarProject::upload(bool updateExisting) {
if (updateExisting) {
itemID = _fst->getMarketplaceID();
}
auto uploader = new MarketplaceItemUploader(getProjectName(), "Empty description", QFileInfo(getFSTPath()).fileName(),
auto uploader = new MarketplaceItemUploader(getProjectName(), "", QFileInfo(getFSTPath()).fileName(),
itemID, _projectFiles);
connect(uploader, &MarketplaceItemUploader::completed, this, [this, uploader]() {
if (uploader->getError() == MarketplaceItemUploader::Error::None) {