Merge pull request #5302 from DonLakeFlyer/UploadHide

Plan: Better user model for Upload button

Merge pull request #5302 from DonLakeFlyer/UploadHide
Plan: Better user model for Upload button
d6715f55 · Don Gagne · GitHub · 5b96a14f · 383252e7 · d6715f55
Commit d6715f55 authored Jun 16, 2017 by Don Gagne Committed by GitHub Jun 16, 2017
Hide whitespace changes
Inline Side-by-side

Showing with 2 additions and 2 deletions

PlanToolBar.qml src/PlanView/PlanToolBar.qml +2 -2

No files found.
--- a/src/PlanView/PlanToolBar.qml
+++ b/src/PlanView/PlanToolBar.qml
@@ -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 {