Changeset 8947 in vbox for trunk

Timestamp:

May 20, 2008 10:25:09 AM (17 years ago)

Author:

vboxsync

Message:

FE/Qt4: Backported r30973 (2854: "Warn if not enough guest VRAM when entering fullscreen with Additions (and AutoResize?) enabled" : latest request implemented (comment #3).)

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

• include/VBoxProblemReporter.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxProblemReporter.cpp (modified) (1 diff)

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

@@ -182 +182 @@
     void cannotFindMachineByName (const CVirtualBox &vbox, const QString &name);
 
-    void cannotEnterFSMode (bool aIsSeamless, ULONG aWidth, ULONG aHeight,
-                            ULONG aBpp, ULONG64 aMinVRAM);
+    void cannotEnterSeamlessMode (ULONG aWidth, ULONG aHeight,
+                                  ULONG aBpp, ULONG64 aMinVRAM);
+    int cannotEnterFullscreenMode (ULONG aWidth, ULONG aHeight,
+                                   ULONG aBpp, ULONG64 aMinVRAM);
 
     bool confirmMachineDeletion (const CMachine &machine);

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

@@ -2013 +2013 @@
         if (aOn && (availBits < usedBits))
         {
-            vboxProblem().cannotEnterFSMode (aSeamless, screen.width(),
-                screen.height(), guestBpp, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
-            return false;
+            if (aSeamless)
+            {
+                vboxProblem().cannotEnterSeamlessMode (
+                    screen.width(), screen.height(), guestBpp,
+                    (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
+                return false;
+            }
+            else
+            {
+                int result = vboxProblem().cannotEnterFullscreenMode (
+                    screen.width(), screen.height(), guestBpp,
+                    (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
+                if (result == QIMessageBox::Cancel)
+                    return false;
+            }
         }
     }

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

@@ -941 +941 @@
 }
 
-void VBoxProblemReporter::cannotEnterFSMode (bool aIsSeamless,
-                                             ULONG /* aWidth */,
-                                             ULONG /* aHeight */,
-                                             ULONG /* aBpp */,
-                                             ULONG64 aMinVRAM)
+void VBoxProblemReporter::cannotEnterSeamlessMode (ULONG /* aWidth */,
+                                                   ULONG /* aHeight */,
+                                                   ULONG /* aBpp */,
+                                                   ULONG64 aMinVRAM)
 {
     message (&vboxGlobal().consoleWnd(), Error,
-             (aIsSeamless ?
-                tr ("<p>Could not enter seamless mode due to insufficient guest "
-                    "video memory.</p>"
-                    "<p>You should configure the virtual machine to have at "
-                    "least <b>%1</b> of video memory.</p>") :
-                tr ("<p>Could not switch the guest display to fullscreen mode due "
-                    "to insufficient guest video memory.</p>"
-                    "<p>You should configure the virtual machine to have at "
-                    "least <b>%1</b> of video memory.</p>"
-                    "<p>Press <b>Ignore</b> to switch to fullscreen mode anyway "
-                    "or press <b>Cancel</b> to cancel the operation.</p>"))
+             tr ("<p>Could not enter seamless mode due to insufficient guest "
+                  "video memory.</p>"
+                  "<p>You should configure the virtual machine to have at "
+                  "least <b>%1</b> of video memory.</p>")
              .arg (VBoxGlobal::formatSize (aMinVRAM)));
+}
+
+int VBoxProblemReporter::cannotEnterFullscreenMode (ULONG /* aWidth */,
+                                                    ULONG /* aHeight */,
+                                                    ULONG /* aBpp */,
+                                                    ULONG64 aMinVRAM)
+{
+    return message (&vboxGlobal().consoleWnd(), Warning,
+             tr ("<p>Could not switch the guest display to fullscreen mode due "
+                 "to insufficient guest video memory.</p>"
+                 "<p>You should configure the virtual machine to have at "
+                 "least <b>%1</b> of video memory.</p>"
+                 "<p>Press <b>Ignore</b> to switch to fullscreen mode anyway "
+                 "or press <b>Cancel</b> to cancel the operation.</p>")
+             .arg (VBoxGlobal::formatSize (aMinVRAM)),
+             0, /* aAutoConfirmId */
+             QIMessageBox::Ignore | QIMessageBox::Default,
+             QIMessageBox::Cancel | QIMessageBox::Escape);
 }