Merge pull request #292 from machinekoder/execute-preview

PathViewCore: execute preview for anything

Author: luminize

src/application/ApplicationCore.qml

@@ -167,7 +167,8 @@ Item {
         ready: fileService.ready
 
         onUploadFinished: {
-            fileSyncHandler.ignoreNextChange = true;
+            var extension = remoteFilePath.split('.').pop();
+            fileSyncHandler.ignoreNextChange =  ["ngc", "txt"].indexOf(extension) != -1;
             executeProgram(remoteFilePath);
         }
     }

src/application/applicationfile.cpp

@@ -162,6 +162,7 @@ void ApplicationFile::startDownload()
 
     if (!ready() || (m_transferState != NoTransfer))
     {
+        qDebug() << "download failed" << ready() << m_transferState;
         return;
     }
 
@@ -439,31 +440,34 @@ void ApplicationFile::ftpCommandFinished(int, bool error)
     {
     case QFtp::Get:
         cleanupFile();
-        emit downloadFinished();
         updateState(NoTransfer);
+        emit downloadFinished();
         return;
     case QFtp::List:
-        emit refreshFinished();
         updateState(NoTransfer);
+        emit refreshFinished();
         return;
     case QFtp::Put:
         cleanupFile();
+        updateState(NoTransfer);
         emit uploadFinished();
-        break;
+        return;
     case QFtp::Remove:
+        updateState(NoTransfer);
         emit removeFinished();
         break;
     case QFtp::Rmdir:
+        updateState(NoTransfer);
         emit removeDirectoryFinished();
         break;
     case QFtp::Mkdir:
+        updateState(NoTransfer);
         emit createDirectoryFinished();
         break;
     default:
         return;
     }
 
-    updateState(NoTransfer);
     refreshFiles();
 }
 } // namespace qtquickvcp

src/applicationcontrols/ApplicationFileDialog.qml

@@ -38,7 +38,7 @@ FileDialog {
 
     nameFilters: {
         var filters = []
-        var allExtensions = ["*.ngc"]
+        var allExtensions = ["*.ngc *.txt"]
 
         if ((status.synced) && (status.config.programExtension !== undefined))
         {
@@ -63,6 +63,7 @@ FileDialog {
 
         filters.unshift(qsTr("All machinable files (%1)").arg(allExtensions.join(" ")));
         filters.push(qsTr("rs274ngc files (*.ngc)"));
+        filters.push(qsTr("Text files (*.txt)"));
         filters.push(qsTr("All files (*)"));
         return filters;
     }

src/pathview/PathViewCore.qml

@@ -112,11 +112,9 @@ ApplicationItem {
         }
 
         function executePreview() {
-            if (file.remoteFilePath.split('.').pop() === 'ngc') {   // only open ngc files
-                gcodeProgramModel.clearPreview();
-                command.openProgram('preview', file.remoteFilePath);
-                command.runProgram('preview', 0);
-            }
+            gcodeProgramModel.clearPreview();
+            command.openProgram('preview', file.remoteFilePath);
+            command.runProgram('preview', 0);
         }
     }