Added progress indicator, download speed

Also updated to latest QGCUASFileManager implementation.

src/ui/QGCUASFileView.h

@@ -42,29 +42,38 @@ protected:
     
 private slots:
     void _refreshTree(void);
-    void _downloadFiles(void);
-    void _treeStatusMessage(const QString& msg);
-    void _treeErrorMessage(const QString& msg);
+    void _listEntryReceived(const QString& entry);
+    void _listErrorMessage(const QString& msg);
     void _listComplete(void);
-    void _downloadStatusMessage(const QString& msg);
+    
+    void _downloadFile(void);
+    void _downloadLength(unsigned int length);
+    void _downloadProgress(unsigned int length);
+    void _downloadErrorMessage(const QString& msg);
+    void _downloadComplete(void);
+
     void _currentItemChanged(QTreeWidgetItem* current, QTreeWidgetItem* previous);
-    void _listCompleteTimeout(void);
 
 private:
-    void _setupListCompleteTimeout(void);
-    void _clearListCompleteTimeout(void);
+    void _connectDownloadSignals(void);
+    void _disconnectDownloadSignals(void);
+    void _connectListSignals(void);
+    void _disconnectListSignals(void);
     void _requestDirectoryList(const QString& dir);
 
     static const int        _typeFile = QTreeWidgetItem::UserType + 1;
     static const int        _typeDir = QTreeWidgetItem::UserType + 2;
     static const int        _typeError = QTreeWidgetItem::UserType + 3;
     
-    QTimer                  _listCompleteTimer;                     ///> Used to signal a timeout waiting for a listComplete signal
-    static const int        _listCompleteTimerTimeoutMsecs = 5000;  ///> Timeout in msecs for listComplete timer
-    
     QList<int>              _walkIndexStack;
     QList<QTreeWidgetItem*> _walkItemStack;
     Ui::QGCUASFileView      _ui;
+    
+    QString _downloadFilename;  ///< File currently being downloaded, not including path
+    QTime   _downloadStartTime; ///< Time at which download started
+    
+    bool _listInProgress;       ///< Indicates that a listDirectory command is in progress
+    bool _downloadInProgress;   ///< Indicates that a downloadPath command is in progress
 };
 
 #endif // QGCUASFILEVIEW_H

src/ui/QGCUASFileView.ui

@@ -14,13 +14,23 @@
    <string>Form</string>
   </property>
   <layout class="QGridLayout" name="gridLayout">
-   <item row="1" column="1">
+   <item row="3" column="1">
     <widget class="QPushButton" name="listFilesButton">
      <property name="text">
       <string>List Files</string>
      </property>
     </widget>
    </item>
+   <item row="1" column="0" colspan="3">
+    <widget class="QProgressBar" name="progressBar">
+     <property name="value">
+      <number>24</number>
+     </property>
+     <property name="textVisible">
+      <bool>false</bool>
+     </property>
+    </widget>
+   </item>
    <item row="0" column="0" colspan="3">
     <widget class="QTreeWidget" name="treeWidget">
      <property name="headerHidden">
@@ -33,7 +43,7 @@
      </column>
     </widget>
    </item>
-   <item row="1" column="2">
+   <item row="3" column="2">
     <widget class="QPushButton" name="downloadButton">
      <property name="enabled">
       <bool>false</bool>
@@ -43,6 +53,19 @@
      </property>
     </widget>
    </item>
+   <item row="2" column="0" colspan="3">
+    <widget class="QLabel" name="statusText">
+     <property name="sizePolicy">
+      <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+       <horstretch>0</horstretch>
+       <verstretch>0</verstretch>
+      </sizepolicy>
+     </property>
+     <property name="text">
+      <string/>
+     </property>
+    </widget>
+   </item>
   </layout>
  </widget>
  <resources/>