Changeset 71693 in vbox for trunk/src/VBox/Frontends

Timestamp:

Apr 6, 2018 7:43:08 AM (7 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6699 Print out COM errors in the log window of the file manager

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl

Files:

• UIGuestControlFileManager.cpp (modified) (12 diffs)
• UIGuestControlFileManager.h (modified) (2 diffs)
• UIGuestControlFileTable.cpp (modified) (3 diffs)
• UIGuestControlFileTable.h (modified) (1 diff)
• UIGuestFileTable.cpp (modified) (17 diffs)
• UIHostFileTable.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.cpp

@@ -25 +25 @@
 # include <QHBoxLayout>
 # include <QHeaderView>
-# include <QPlainTextEdit>
+# include <QTextEdit>
 # include <QPushButton>
 # include <QSplitter>
@@ -36 +36 @@
 # include "QITreeWidget.h"
 # include "QIWithRetranslateUI.h"
+# include "UIErrorString.h"
 # include "UIExtraDataManager.h"
 # include "UIIconPool.h"
@@ -392 +393 @@
     }
 
-    m_pLogOutput = new QPlainTextEdit;
+    m_pLogOutput = new QTextEdit;
     if (m_pLogOutput)
     {
@@ -482 +483 @@
         if (m_pLogOutput)
         {
-            m_pLogOutput->appendPlainText("Could not find Guest Additions");
+            m_pLogOutput->append("Could not find Guest Additions");
             postSessionClosed();
             return;
@@ -490 +491 @@
     {
         if (m_pLogOutput)
-            m_pLogOutput->appendPlainText("No user name is given");
+            m_pLogOutput->append("No user name is given");
         return;
     }
@@ -500 +501 @@
     if (!m_comGuestSession.isOk())
     {
-        m_pLogOutput->appendPlainText("Guest session is not valid");
+        m_pLogOutput->append("Guest session is not valid");
         postSessionClosed();
         return;
@@ -511 +512 @@
 
     m_comGuestSession.Close();
-    m_pLogOutput->appendPlainText("Guest session is closed");
+    m_pLogOutput->append("Guest session is closed");
     postSessionClosed();
 }
@@ -522 +523 @@
         if (cErrorInfo.isOk())
         {
-            m_pLogOutput->appendPlainText(cErrorInfo.GetText());
+            m_pLogOutput->append(cErrorInfo.GetText());
         }
     }
@@ -532 +533 @@
     else
     {
-        m_pLogOutput->appendPlainText("Session status has changed");
+        m_pLogOutput->append("Session status has changed");
     }
 }
@@ -539 +540 @@
 {
     if (m_pLogOutput)
-        m_pLogOutput->appendPlainText(strOutput);
+        m_pLogOutput->append(strOutput);
 }
 
@@ -601 +602 @@
     if (!m_comGuestSession.isOk())
     {
-        m_pLogOutput->appendPlainText("Guest session could not be created");
+        m_pLogOutput->append(UIErrorString::formatErrorInfo(m_comGuestSession));
         return false;
     }
 
-    m_pLogOutput->appendPlainText("Guest session has been created");
+    m_pLogOutput->append("Guest session has been created");
     if (m_pSessionCreateWidget)
         m_pSessionCreateWidget->switchSessionCloseMode();
@@ -624 +625 @@
      /* Wait session to start. For some reason we cannot get GuestSessionStatusChanged event
         consistently. So we wait: */
-    m_pLogOutput->appendPlainText("Waiting the session to start");
+    m_pLogOutput->append("Waiting the session to start");
     const ULONG waitTimeout = 2000;
     KGuestSessionWaitResult waitResult = m_comGuestSession.WaitFor(KGuestSessionWaitForFlag_Start, waitTimeout);
     if (waitResult != KGuestSessionWaitResult_Start)
     {
-        m_pLogOutput->appendPlainText("The session did not start");
+        m_pLogOutput->append("The session did not start");
         sltCloseSession();
         return false;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileManager.h

@@ -35 +35 @@
 /* Forward declarations: */
 class QHBoxLayout;
-class QPlainTextEdit;
+class QTextEdit;
 class QVBoxLayout;
 class QSplitter;
@@ -105 +105 @@
     QVBoxLayout        *m_pMainLayout;
     QSplitter          *m_pVerticalSplitter;
-    QPlainTextEdit     *m_pLogOutput;
+    QTextEdit          *m_pLogOutput;
     UIToolBar          *m_pToolBar;
     QAction            *m_pCopyGuestToHost;

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.cpp

@@ -269 +269 @@
 /* static */ QStringList UIPathOperations::pathTrail(const QString &path)
 {
-    QList<QString> pathList = path.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
+    QStringList pathList = path.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
     return pathList;
 }
@@ -1068 +1068 @@
 }
 
-void UIGuestControlFileTable::goIntoDirectory(const QList<QString> &pathTrail)
+void UIGuestControlFileTable::goIntoDirectory(const QStringList &pathTrail)
 {
     UIFileTableItem *parent = getStartDirectoryItem();
@@ -1229 +1229 @@
         return;
 
-    QList<QString> pathList = comboLocation.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
+    QStringList pathList = comboLocation.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
     goIntoDirectory(pathList);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestControlFileTable.h

@@ -269 +269 @@
     void             goIntoDirectory(const QModelIndex &itemIndex);
     /** Follows the path trail, opens directories as it descends */
-    void             goIntoDirectory(const QList<QString> &pathTrail);
+    void             goIntoDirectory(const QStringList &pathTrail);
     /** Goes into directory pointed by the @p item */
     void             goIntoDirectory(UIFileTableItem *item);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIGuestFileTable.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "QILabel.h"
+# include "UIErrorString.h"
 # include "UIGuestFileTable.h"
 # include "UIVMInformationDialog.h"
@@ -100 +101 @@
     if (!m_comGuestSession.isOk())
         return;
-
     /* if the object is a file or a symlink then read the size and return: */
     if (fileInfo.GetType() == KFsObjType_File)
@@ -122 +122 @@
     QVector<KDirectoryOpenFlag> flag(KDirectoryOpenFlag_None);
     CGuestDirectory directory = m_comGuestSession.DirectoryOpen(path, /*aFilter*/ "", flag);
+    if (!m_comGuestSession.isOk())
+        return;
 
     if (directory.isOk())
@@ -155 +157 @@
         return;
     m_comGuestSession = session;
-
-
     initializeFileTree();
 }
@@ -179 +179 @@
 
     directory = m_comGuestSession.DirectoryOpen(strPath, /*aFilter*/ "", flag);
+    if (!m_comGuestSession.isOk())
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+        return;
+    }
+
     parent->setIsOpened(true);
     if (directory.isOk())
@@ -229 +235 @@
     if (!item)
         return;
-    if (!m_comGuestSession.isOk())
-        return;
     if (item->isUpDirectory())
         return;
@@ -242 +246 @@
         m_comGuestSession.FsObjRemove(item->path());
     if (!m_comGuestSession.isOk())
+    {
         emit sigLogOutput(QString(item->path()).append(" could not be deleted"));
-
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+    }
 }
 
@@ -257 +263 @@
 
     QString userHome = UIPathOperations::sanitize(m_comGuestSession.GetUserHome());
-    QList<QString> pathList = userHome.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
+    if (!m_comGuestSession.isOk())
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+        return;
+    }
+    QStringList pathList = userHome.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
     goIntoDirectory(pathList);
 }
@@ -264 +275 @@
 {
 
-    if (!item || item->isUpDirectory() || newBaseName.isEmpty() || !m_comGuestSession.isOk())
+    if (!item || item->isUpDirectory() || newBaseName.isEmpty())
         return false;
     QString newPath = UIPathOperations::constructNewItemPath(item->path(), newBaseName);
@@ -271 +282 @@
     m_comGuestSession.FsObjRename(item->path(), newPath, aFlags);
     if (!m_comGuestSession.isOk())
-        return false;
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+        return false;
+    }
+
     item->setPath(newPath);
     return true;
@@ -278 +293 @@
 bool UIGuestFileTable::createDirectory(const QString &path, const QString &directoryName)
 {
-    if (!m_comGuestSession.isOk())
-        return false;
-
     QString newDirectoryPath = UIPathOperations::mergePaths(path, directoryName);
     QVector<KDirectoryCreateFlag> flags(KDirectoryCreateFlag_None);
 
     m_comGuestSession.DirectoryCreate(newDirectoryPath, 0/*aMode*/, flags);
+
     if (!m_comGuestSession.isOk())
     {
         emit sigLogOutput(newDirectoryPath.append(" could not be created"));
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
         return false;
     }
@@ -331 +345 @@
     }
     if (!m_comGuestSession.isOk())
-        return false;
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+        return false;
+    }
+
     return true;
 }
@@ -342 +360 @@
     if (!hostFileInfo.exists())
         return false;
-
+    CProgress comProgress;
     /* Currently API expects a path including a file name for file copy*/
     if (hostFileInfo.isFile() || hostFileInfo.isSymLink())
@@ -349 +367 @@
         QString destinationFilePath =  UIPathOperations::addTrailingDelimiters(guestDestinationPath);
         /** @todo listen to CProgress object to monitor copy operation: */
-        /*CProgress comProgress =*/ m_comGuestSession.FileCopyToGuest(hostSourcePath, destinationFilePath, flags);
+        comProgress = m_comGuestSession.FileCopyToGuest(hostSourcePath, destinationFilePath, flags);
     }
     else if(hostFileInfo.isDir())
@@ -357 +375 @@
         QString destinationFilePath =  UIPathOperations::addTrailingDelimiters(guestDestinationPath);
         /** @todo listen to CProgress object to monitor copy operation: */
-        /*CProgress comProgress = */ m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, destinationFilePath, aFlags);
-    }
-    if (!m_comGuestSession.isOk())
-        return false;
+        comProgress = m_comGuestSession.DirectoryCopyToGuest(hostSourcePath, destinationFilePath, aFlags);
+
+
+    }
+    /** @todo currently I cannot get an errorfrom CProgress: */
+    if (m_comGuestSession.isOk())
+    {
+        if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+        {
+            emit sigLogOutput(UIErrorString::formatErrorInfo(comProgress));
+            return false;
+        }
+    }
+    else
+    {
+        emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
+        return false;
+    }
+
     return true;
 }
@@ -405 +438 @@
         CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(selectedObjects.at(0), true);
         if (!m_comGuestSession.isOk())
+        {
+            emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
             return QString();
+        }
+
 
         QString propertyString;
@@ -440 +477 @@
         CGuestFsObjInfo fileInfo = m_comGuestSession.FsObjQueryInfo(selectedObjects.at(0), true);
         if (!m_comGuestSession.isOk())
+        {
+            emit sigLogOutput(UIErrorString::formatErrorInfo(m_comGuestSession));
             continue;
+        }
+
         FileObjectType type = fileType(fileInfo);
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/guestctrl/UIHostFileTable.cpp

@@ -227 +227 @@
 
     QString userHome = UIPathOperations::sanitize(QDir::homePath());
-    QList<QString> pathList = userHome.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
+    QStringList pathList = userHome.split(UIPathOperations::delimiter, QString::SkipEmptyParts);
     goIntoDirectory(pathList);
 }