From 24aaeee5fd82d7f29fe00c9986ccdd487c54ab40 Mon Sep 17 00:00:00 2001
From: Ryan Huffman <ryanhuffman@gmail.com>
Date: Thu, 27 Dec 2018 22:55:54 -0800
Subject: [PATCH] Disable back button on avatar upload page

---
 .../resources/qml/hifi/AvatarPackager.qml     |  4 ++--
 .../avatarPackager/AvatarPackagerHeader.qml   | 13 ++++++-----
 .../avatarPackager/AvatarProjectUpload.qml    | 23 ++-----------------
 interface/src/avatar/AvatarProject.cpp        |  2 +-
 4 files changed, 12 insertions(+), 30 deletions(-)

diff --git a/interface/resources/qml/hifi/AvatarPackager.qml b/interface/resources/qml/hifi/AvatarPackager.qml
index 1300184591..2492746627 100644
--- a/interface/resources/qml/hifi/AvatarPackager.qml
+++ b/interface/resources/qml/hifi/AvatarPackager.qml
@@ -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 }
                 }
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
index 663d4d0f3a..5b01005edd 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarPackagerHeader.qml
@@ -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"
diff --git a/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml b/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
index b21bd38070..2031392ca2 100644
--- a/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
+++ b/interface/resources/qml/hifi/avatarPackager/AvatarProjectUpload.qml
@@ -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"
-        }
-    }
-
 }
diff --git a/interface/src/avatar/AvatarProject.cpp b/interface/src/avatar/AvatarProject.cpp
index 17ed4b6921..09d60163b6 100644
--- a/interface/src/avatar/AvatarProject.cpp
+++ b/interface/src/avatar/AvatarProject.cpp
@@ -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) {