Add test for non-writable paths and show message if macos app store.

ovilab · May 12, 2017 · 96238ce · 96238ce
1 parent d13c6d4
commit 96238ce
Show file tree

Hide file tree

Showing 4 changed files with 57 additions and 11 deletions.
diff --git a/src/qml/desktop/MainDesktop.qml b/src/qml/desktop/MainDesktop.qml
@@ -159,7 +159,7 @@ Rectangle {
 
                 onCurrentIndexChanged: {
                     root.viewMode = model[currentIndex].mode
-                    if(root.viewMode === "edit") messageOverlay.visible = false
+                    if(root.viewMode === "edit") messageOverlay.hideClickedAtLeastOnce = true
                 }
 
                 Connections {
@@ -458,13 +458,12 @@ Rectangle {
 
             MessageOverlay {
                 id: messageOverlay
-                property bool shouldBeVisible: simulator.states.idle.active || simulator.states.finished.active || simulator.states.crashed.active || simulator.states.reset.active || simulator.welcomeSimulationRunning
-
+                property bool shouldBeVisible: simulator.states.idle.active || simulator.states.finished.active || simulator.states.crashed.active || simulator.states.reset.active || welcome || cantWrite
                 anchors.fill: parent
                 visible: false
 
                 errorMessage: simulator.error
-                welcome: simulator.states.idle.active || simulator.welcomeSimulationRunning
+                welcome: (simulator.states.idle.active || simulator.welcomeSimulationRunning) && !hideClickedAtLeastOnce
                 finished: simulator.states.finished.active
                 crashed: simulator.states.crashed.active
                 cancelling: simulator.states.reset.active
@@ -481,7 +480,6 @@ Rectangle {
                 }
 
                 onExamplesClicked: modeMenu.currentIndex = 3
-                onHideClicked: visible = false
                 onShouldBeVisibleChanged: {
                     if(shouldBeVisible) {
                         visible = true
@@ -586,14 +584,25 @@ Rectangle {
         id: shortcuts
         Shortcut {
             sequence: "Return"
-            onActivated: messageOverlay.visible = false
+            onActivated: messageOverlay.hideClicked()
         }
 
         EventCatcher {
             name: "simulator.togglePause"
             onTriggered: simulator.togglePause()
         }
 
+
+        EventCatcher {
+            name: "editor.cantwrite"
+            onTriggered: {
+                console.log("Mac app store: ", simulator.system.macAppStore)
+                if(simulator.system.macAppStore) {
+                    messageOverlay.cantWrite = true
+                }
+            }
+        }
+
         EventCatcher {
             name: "editor.focus"
             onTriggered: editor.editorWindow.currentEditor.textArea.forceActiveFocus()

diff --git a/src/qml/desktop/MessageOverlay.qml b/src/qml/desktop/MessageOverlay.qml
@@ -13,10 +13,35 @@ Rectangle {
     signal newTabClicked()
     signal hideClicked()
 
+    onHideClicked: {
+        hideClickedAtLeastOnce = true
+        cantWrite = false
+        visible = false
+    }
+
+    Timer {
+        interval: 1000
+        repeat: true
+        running: true
+        onTriggered: console.log("Welcome now: ", welcome)
+    }
+
+    property bool hideClickedAtLeastOnce: false // TODO: state machinery should be used...
     property bool welcome: true
     property bool finished: false
     property bool crashed: false
     property bool cancelling: false
+    property bool cantWrite: false // TODO: rename to showCantWrite
+    property string cantWriteMacOSAppStoreText:
+        "
+<style>
+h2 { text-align: center; }
+a { font-weight: bold; color: #56b1b4; text-decoration: none; }
+</style>
+<h2>File access problem:</h2>
+<p>This simulation is in a directory which Atomify cannot write to. Due to limitations<br>
+to file access in the Mac App Store, your simulations must be in the Downloads folder. </p>"
+
     property string cancellingText:
         "
 <style>
@@ -72,7 +97,9 @@ Learn more about Atomify at <a href=\"website\">ovilab.net/atomify</a>. We love
         textFormat: TextEdit.RichText
         wrapMode: TextArea.WordWrap
         text: {
-            if(welcome) {
+            if(cantWrite) {
+                return cantWriteMacOSAppStoreText
+            } else if(welcome) {
                 return welcomeText
             } else if(finished) {
                 return finishedText

diff --git a/src/qml/desktop/editor/CodeEditor.qml b/src/qml/desktop/editor/CodeEditor.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.1
 
 import QtQuick.Dialogs 1.2
 import Atomify 1.0
+import "../../events"
 
 Item {
     id: root
@@ -18,6 +19,11 @@ Item {
     property int currentLine: -1
     property int errorLine: -1
 
+    Component.onCompleted: {
+        highlighter.setTextDocument(textArea.textDocument)
+        EventCenter.register("editor.cantwrite")
+    }
+
     onCurrentLineChanged: {
         lineNumbers.currentLine = currentLine
         textArea.update()
@@ -44,6 +50,10 @@ Item {
             }
             loadAndUpdateTextField()
         }
+
+        if(root.visible && backend.fileExists(fileUrl) && !backend.filePathIsWritable(fileUrl)) {
+            EventCenter.postEvent("editor.cantwrite", fileName)
+        }
     }
 
     function fileExists(path) {
@@ -96,10 +106,6 @@ Item {
         fileDialogSave.open()
     }
 
-    Component.onCompleted: {
-        highlighter.setTextDocument(textArea.textDocument)
-    }
-
     Highlighter {
         id: highlighter
     }

diff --git a/src/src.pro b/src/src.pro
@@ -10,11 +10,15 @@ unix:!macx {
     QMAKE_CXXFLAGS += -fopenmp
     LIBS += -fopenmp
 }
+
 macx {
     QMAKE_MAC_SDK = macosx10.9
     ICON = images/icon.icns
     QMAKE_INFO_PLIST = info.plist
 }
+
+# DEFINES += MACAPPSTORE
+
 ios {
     QMAKE_INFO_PLIST = iOS.plist
 }