commit 95a01ff9542b778e38de8853ec968401788509de
author Dennis Syrovatsky <dennis@tightvnc.com> Wed Dec 14 07:58:29 2005 +0000
committer Dennis Syrovatsky <dennis@tightvnc.com> Wed Dec 14 07:58:29 2005 +0000
tree 305de47f5e93bb37195f6972ee3edc40c7e7b9c2
parent 1f86851b2dae48d2535b73547b7545940e939f57

Added status strings for copy operation.


git-svn-id: svn://svn.code.sf.net/p/tigervnc/code/trunk@442 3789f03b-4d11-0410-bbf8-ca57d06f2519

vncviewer/FileTransfer.cxx

diff --git a/vncviewer/FileTransfer.cxx b/vncviewer/FileTransfer.cxx
index 5ea2be8..0eb5fe7 100644
--- a/vncviewer/FileTransfer.cxx
+++ b/vncviewer/FileTransfer.cxx
@@ -268,6 +268,9 @@
 {
   if (m_TransferQueue.getFlagsAt(0) & FT_ATTR_FILE) {
     if (m_fileReader.create(m_TransferQueue.getFullLocPathAt(0))) {
+      if (m_bFTDlgShown) m_pFTDialog->setStatusText("Upload Started: %s to %s", 
+                                                    m_TransferQueue.getFullLocPathAt(0), 
+                                                    m_TransferQueue.getFullRemPathAt(0));
       m_pWriter->writeFileUploadRqst(strlen(m_TransferQueue.getFullRemPathAt(0)),
                                      m_TransferQueue.getFullRemPathAt(0), 0);
       uploadFilePortion();
@@ -281,6 +284,9 @@
 {
   if (m_TransferQueue.getFlagsAt(0) & FT_ATTR_FILE) {
     if (m_fileWriter.create(m_TransferQueue.getFullLocPathAt(0))) {
+      if (m_bFTDlgShown) m_pFTDialog->setStatusText("Download Started: %s to %s", 
+                                                    m_TransferQueue.getFullRemPathAt(0), 
+                                                    m_TransferQueue.getFullLocPathAt(0));
       m_pWriter->writeFileDownloadRqst(strlen(m_TransferQueue.getFullRemPathAt(0)),
                                        m_TransferQueue.getFullRemPathAt(0), 0);
       return true;
@@ -299,6 +305,8 @@
       if (bytesRead == 0) {
         m_pWriter->writeFileUploadData(m_TransferQueue.getDataAt(0));
         m_fileReader.close();
+        if (m_bFTDlgShown) 
+          m_pFTDialog->setStatusText("Upload Completed");
         m_TransferQueue.deleteAt(0);
         m_pFTDialog->postCheckTransferQueueMsg();
       } else {
@@ -307,18 +315,14 @@
       }
     } else {
       m_fileReader.close();
+      char reason[] = "Error While Reading File";
+      m_pWriter->writeFileUploadFailed(strlen(reason), reason);
       m_TransferQueue.deleteAt(0);
       m_pFTDialog->postCheckTransferQueueMsg();
     }
   }
 }
 
-void
-FileTransfer::downloadFilePortion()
-{
-
-}
-
 bool 
 FileTransfer::procFileListDataMsg()
 {
@@ -376,7 +380,7 @@
     m_fileWriter.write(pFile, bufSize, &bytesWritten);
     delete pFile;
     if (bytesWritten != bufSize) {
-      char reason[] = "Error File Writting";
+      char reason[] = "Error File Writting to File";
       m_pWriter->writeFileDownloadCancel(strlen(reason), reason);
       m_TransferQueue.deleteAt(0);
       m_pFTDialog->postCheckTransferQueueMsg();
@@ -387,12 +391,16 @@
     if (modTime != 0) {
       m_fileWriter.setTime(modTime);
       m_fileWriter.close();
+      if (m_bFTDlgShown) 
+        m_pFTDialog->setStatusText("Download Completed");
+
       m_TransferQueue.deleteAt(0);
       m_pFTDialog->postCheckTransferQueueMsg();
       return true;
     } else {
       m_fileWriter.close();
       char reason[] = "Error File Writting";
+      m_pFTDialog->setStatusText("Download Failed");
       m_pWriter->writeFileDownloadCancel(strlen(reason), reason);
       m_TransferQueue.deleteAt(0);
       m_pFTDialog->postCheckTransferQueueMsg();