Changeset 55305 in vbox for trunk/src/VBox

Timestamp:

Apr 16, 2015 12:40:54 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: 7676: Disk Encryption (DE) support: Handling encryption progress errors during settings save routine.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• settings/UISettingsPage.h (modified) (1 diff)
• settings/UISettingsSerializer.cpp (modified) (5 diffs)
• settings/UISettingsSerializer.h (modified) (2 diffs)
• settings/machine/UIMachineSettingsGeneral.cpp (modified) (2 diffs)
• widgets/UIProgressDialog.cpp (modified) (2 diffs)
• widgets/UIProgressDialog.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.cpp

@@ -914 +914 @@
              .arg(strSnapshotName).arg(strMachineName),
           formatErrorInfo(progress));
+}
+
+void UIMessageCenter::cannotSaveSettings(const QString strDetails, QWidget *pParent /* = 0 */) const
+{
+    error(pParent, MessageType_Error,
+          tr("Failed to save the settings."),
+          strDetails);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMessageCenter.h

@@ -209 +209 @@
     void cannotRemoveSnapshot(const CMachine &machine, const QString &strSnapshotName, const QString &strMachineName) const;
     void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
+
+    /* API: Common settings warnings: */
+    void cannotSaveSettings(const QString strDetails, QWidget *pParent = 0) const;
 
     /* API: Global settings warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsPage.h

@@ -88 +88 @@
                                     ulong iOperation, ulong iPercent);
 
+    /** Notifies listeners about particular COM error.
+      * @param strErrorInfo holds the details of the error happened. */
+    void sigOperationProgressError(QString strErrorInfo);
+
 public:
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.cpp

@@ -27 +27 @@
 /* GUI includes: */
 # include "UISettingsSerializer.h"
+# include "UIMessageCenter.h"
 # include "UISettingsPage.h"
 # include "UIIconPool.h"
@@ -147 +148 @@
         connect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
                 this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
+        connect(pPage, SIGNAL(sigOperationProgressError(QString)),
+                this, SIGNAL(sigOperationProgressError(QString)));
         if (pPage->isEnabled())
         {
@@ -157 +160 @@
         disconnect(pPage, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
                    this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)));
+        disconnect(pPage, SIGNAL(sigOperationProgressError(QString)),
+                   this, SIGNAL(sigOperationProgressError(QString)));
         pPage->setProcessed(true);
         /* Remove processed page from our map: */
@@ -233 +238 @@
         connect(m_pSerializer, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
                 this, SLOT(sltHandleOperationProgressChange(ulong, QString, ulong, ulong)));
+        connect(m_pSerializer, SIGNAL(sigOperationProgressError(QString)),
+                this, SLOT(sltHandleOperationProgressError(QString)));
     }
 
@@ -376 +383 @@
 }
 
+void UISettingsSerializerProgress::sltHandleOperationProgressError(QString strErrorInfo)
+{
+    /* Show the error message: */
+    msgCenter().cannotSaveSettings(strErrorInfo, this);
+}
+

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsSerializer.h

@@ -72 +72 @@
                                     ulong iOperation, ulong iPercent);
 
+    /** Notifies listeners about particular COM error.
+      * @param strErrorInfo holds the details of the error happened. */
+    void sigOperationProgressError(QString strErrorInfo);
+
 public:
 
@@ -196 +200 @@
                                           ulong iOperation, ulong iPercent);
 
+    /** Handles particular COM error.
+      * @param strErrorInfo holds the details of the error happened. */
+    void sltHandleOperationProgressError(QString strErrorInfo);
+
 private:
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsGeneral.cpp

@@ -329 +329 @@
                         QString strOldPassword = encryptionPasswords.value(strOldPasswordId);
 
-//                        printf(" Medium: %s, old password = %s, new cipher = %s, new password = %s, new password id = %s\n",
-//                               medium.GetId().toAscii().constData(),
-//                               strOldPassword.toAscii().constData(),
-//                               strNewCipher.toAscii().constData(),
-//                               strNewPassword.toAscii().constData(),
-//                               strNewPasswordId.toAscii().constData());
-
                         /* Update encryption: */
                         CProgress cprogress = medium.ChangeEncryption(strOldPassword,
@@ -341 +334 @@
                                                                       strNewPassword,
                                                                       strNewPasswordId);
-//                        if (!medium.isOk())
-//                            printf("  Medium API Error, rc = %s\n", msgCenter().formatRC(medium.lastRC()).toAscii().constData());
+                        if (!medium.isOk())
+                        {
+                            QMetaObject::invokeMethod(this, "sigOperationProgressError", Qt::BlockingQueuedConnection,
+                                                      Q_ARG(QString, UIMessageCenter::formatErrorInfo(medium)));
+                            continue;
+                        }
                         UIProgress uiprogress(cprogress);
                         connect(&uiprogress, SIGNAL(sigProgressChange(ulong, QString, ulong, ulong)),
                                 this, SIGNAL(sigOperationProgressChange(ulong, QString, ulong, ulong)),
                                 Qt::QueuedConnection);
+                        connect(&uiprogress, SIGNAL(sigProgressError(QString)),
+                                this, SIGNAL(sigOperationProgressError(QString)),
+                                Qt::BlockingQueuedConnection);
                         uiprogress.run(350);
-//                        if (!progress.isOk())
-//                            printf("  Progress API Error, rc = %s\n", msgCenter().formatRC(progress.lastRC()).toAscii().constData());
-//                        if (progress.GetResultCode() != 0)
-//                            printf("  Progress Processing Error, rc = %s\n", msgCenter().formatRC(progress.GetResultCode()).toAscii().constData());
                     }
                 }

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.cpp

@@ -30 +30 @@
 /* GUI includes: */
 # include "UIProgressDialog.h"
+# include "UIMessageCenter.h"
+# include "UISpecialControls.h"
+# include "UIModalWindowManager.h"
 # include "QIDialogButtonBox.h"
 # include "QILabel.h"
-# include "UISpecialControls.h"
 # include "VBoxGlobal.h"
-# include "UIModalWindowManager.h"
 # ifdef Q_WS_MAC
 #  include "VBoxUtils-darwin.h"
@@ -378 +379 @@
     if (!m_progress.isOk() || m_progress.GetCompleted())
     {
+        /* Notify listeners about the operation progress error: */
+        if (!m_progress.isOk() || m_progress.GetResultCode() != 0)
+            emit sigProgressError(UIMessageCenter::formatErrorInfo(m_progress));
+
         /* Exit from the event-loop if there is any: */
         if (m_pEventLoop)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIProgressDialog.h

@@ -115 +115 @@
                            ulong iOperation, ulong iPercent);
 
+    /** Notifies listeners about particular COM error.
+      * @param strErrorInfo holds the details of the error happened. */
+    void sigProgressError(QString strErrorInfo);
+
 public: