Merge pull request #5302 from DonLakeFlyer/UploadHide

Plan: Better user model for Upload button
8 years ago · d6715f5509
1 changed files with 2 additions and 2 deletions
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@ -300,8 +300,8 @@ Rectangle {
				@@ -300,8 +300,8 @@ Rectangle {
        anchors.verticalCenter: parent.verticalCenter
        text:                   _controllerDirty ? qsTr("Upload Required") : qsTr("Upload")
        enabled:                !_controllerSyncInProgress
-        visible:                !_controllerOffline
-        primary:                _controllerDirty && !_controllerSyncInProgress
+        visible:                !_controllerOffline && !_controllerSyncInProgress && !uploadCompleteText.visible
+        primary:                _controllerDirty
        onClicked:              planMasterController.upload()

        PropertyAnimation on opacity {