Changeset 45314 in vbox for trunk/src

Timestamp:

Apr 3, 2013 5:18:31 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Message-center cleanup (part 20): Snapshot stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMessageCenter.cpp (modified) (1 diff)
• globals/UIMessageCenter.h (modified) (1 diff)
• runtime/UISession.cpp (modified) (2 diffs)
• selector/VBoxSnapshotsWgt.cpp (modified) (2 diffs)

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

@@ -742 +742 @@
 }
 
-void UIMessageCenter::cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName) const
-{
-    message(mainWindowShown(), MessageType_Error,
+void UIMessageCenter::cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
+{
+    message(pParent ? pParent : mainWindowShown(), MessageType_Error,
             tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
-               .arg(strSnapshotName).arg(CConsole(console).GetMachine().GetName()),
+               .arg(strSnapshotName, strMachineName),
             formatErrorInfo(console));
 }
 
-void UIMessageCenter::cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName) const
-{
-    /* Get console: */
-    AssertWrapperOk(progress);
-    CConsole console(CProgress(progress).GetInitiator());
-    AssertWrapperOk(console);
-    /* Show the message: */
-    message(mainWindowShown(), MessageType_Error,
+void UIMessageCenter::cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent /*= 0*/) const
+{
+    message(pParent ? pParent : mainWindowShown(), MessageType_Error,
             tr("Failed to restore the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
-               .arg(strSnapshotName).arg(console.GetMachine().GetName()),
-            formatErrorInfo(progress.GetErrorInfo()));
-}
-
-void UIMessageCenter::cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName) const
+               .arg(strSnapshotName, strMachineName),
+            !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
+}
+
+void UIMessageCenter::cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const
 {
     message(mainWindowShown(), MessageType_Error,
             tr("Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
-               .arg(strSnapshotName)
-               .arg(CConsole(console).GetMachine().GetName()),
+               .arg(strSnapshotName, strMachineName),
             formatErrorInfo(console));
 }
 
-void UIMessageCenter::cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName) const
-{
-    /* Get console: */
-    AssertWrapperOk(progress);
-    CConsole console(CProgress(progress).GetInitiator());
-    AssertWrapperOk(console);
-    /* Show the message: */
+void UIMessageCenter::cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const
+{
     message(mainWindowShown(), MessageType_Error,
             tr("Failed to delete the snapshot <b>%1</b> of the virtual machine <b>%2</b>.")
-               .arg(strSnapshotName)
-               .arg(console.GetMachine().GetName()),
-            formatErrorInfo(progress.GetErrorInfo()));
+               .arg(strSnapshotName).arg(strMachineName),
+            !progress.isOk() ? formatErrorInfo(progress) : formatErrorInfo(progress.GetErrorInfo()));
 }
 

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

@@ -236 +236 @@
     bool warnAboutSnapshotRemovalFreeSpace(const QString &strSnapshotName, const QString &strTargetImageName,
                                            const QString &strTargetImageMaxSize, const QString &strTargetFileSystemFree) const;
-    void cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName) const;
-    void cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName) const;
-    void cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName) const;
-    void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName) const;
+    void cannotRestoreSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent = 0) const;
+    void cannotRestoreSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName, QWidget *pParent = 0) const;
+    void cannotRemoveSnapshot(const CConsole &console, const QString &strSnapshotName, const QString &strMachineName) const;
+    void cannotRemoveSnapshot(const CProgress &progress, const QString &strSnapshotName, const QString &strMachineName) const;
 
     /* API: Settings warnings: */

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp

@@ -391 +391 @@
                     {
                         /* Failed in progress: */
-                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName());
+                        msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), machine.GetName(), machineLogic()->activeMachineWindow());
                         return false;
                     }
@@ -398 +398 @@
                 {
                     /* Failed in console: */
-                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName());
+                    msgCenter().cannotRestoreSnapshot(console, snapshot.GetName(), machine.GetName(), machineLogic()->activeMachineWindow());
                     return false;
                 }

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -608 +608 @@
     {
         msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_restore_90px.png",
-                                              msgCenter().mainWindowShown(), true);
+                                            msgCenter().mainWindowShown(), true);
         if (progress.GetResultCode() != 0)
-            msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName());
+            msgCenter().cannotRestoreSnapshot(progress, snapshot.GetName(), mMachine.GetName());
     }
     else
-        msgCenter().cannotRestoreSnapshot(console, snapshot.GetName());
+        msgCenter().cannotRestoreSnapshot(console, snapshot.GetName(), mMachine.GetName());
 
     /* Unlock machine finally: */
@@ -656 +656 @@
     {
         /* Show the progress dialog */
-        msgCenter().showModalProgressDialog (progress, mMachine.GetName(), ":/progress_snapshot_discard_90px.png",
-                                               msgCenter().mainWindowShown(), true);
+        msgCenter().showModalProgressDialog(progress, mMachine.GetName(), ":/progress_snapshot_discard_90px.png",
+                                            msgCenter().mainWindowShown(), true);
 
         if (progress.GetResultCode() != 0)
-            msgCenter().cannotRemoveSnapshot (progress,  snapshot.GetName());
+            msgCenter().cannotRemoveSnapshot(progress,  snapshot.GetName(), mMachine.GetName());
     }
     else
-        msgCenter().cannotRemoveSnapshot (console,  snapshot.GetName());
+        msgCenter().cannotRemoveSnapshot(console,  snapshot.GetName(), mMachine.GetName());
 
     session.UnlockMachine();