Changeset 4165 in vbox for trunk

Timestamp:

Aug 16, 2007 8:30:32 AM (18 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

23655

Message:

2240: Change snapshot folder error is not reported:

Added the error handling for the snapshot's folder unable to be changed in case of there are already snapshots created.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxProblemReporter.h (modified) (2 diffs)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (2 diffs)
• ui/VBoxVMSettingsDlg.ui.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/include/VBoxProblemReporter.h

@@ -120 +120 @@
     void cannotDiscardSavedState (const CConsole &console);
 
+    void cannotSetSnapshotFolder (const CMachine &aMachine);
     void cannotDiscardSnapshot (const CConsole &console, const CSnapshot &snapshot);
     void cannotDiscardSnapshot (const CProgress &progress, const CSnapshot &snapshot);
@@ -129 +130 @@
     void cannotFindMachineByName (const CVirtualBox &vbox, const QString &name);
 
-    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight,
-                                  ULONG aBpp, ULONG aVRam);
+    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight, ULONG aBpp);
 
     bool confirmMachineDeletion (const CMachine &machine);

trunk/src/VBox/Frontends/VirtualBox/src/VBoxConsoleWnd.cpp

@@ -1815 +1815 @@
     {
         vboxProblem().cannotEnterSeamlessMode (screen.width(),
-            screen.height(), QColor::numBitPlanes(), vRamSize);
+            screen.height(), QColor::numBitPlanes());
         vmSeamlessAction->setOn (false);
         return;

trunk/src/VBox/Frontends/VirtualBox/src/VBoxProblemReporter.cpp

@@ -753 +753 @@
 }
 
+void VBoxProblemReporter::cannotSetSnapshotFolder (const CMachine &aMachine)
+{
+    message (
+        mainWindowShown(),
+        Error,
+        tr ("Failed to change the snapshot folder path."),
+        formatErrorInfo (aMachine));
+}
+
 void VBoxProblemReporter::cannotDiscardSnapshot (const CConsole &console,
                                                  const CSnapshot &snapshot)
@@ -843 +852 @@
 void VBoxProblemReporter::cannotEnterSeamlessMode (ULONG aWidth,
                                                    ULONG aHeight,
-                                                   ULONG aBpp, ULONG aVRam)
+                                                   ULONG aBpp)
 {
     message (&vboxGlobal().consoleWnd(), Error,

trunk/src/VBox/Frontends/VirtualBox/ui/VBoxVMSettingsDlg.ui.h

@@ -1850 +1850 @@
     /* Saved state folder */
     if (leSnapshotFolder->isModified())
+    {
         cmachine.SetSnapshotFolder (leSnapshotFolder->text());
+        if (!cmachine.isOk())
+            vboxProblem().cannotSetSnapshotFolder (cmachine);
+    }
 
     /* Description */