Changeset 8909 in vbox

Timestamp:

May 19, 2008 9:57:22 AM (17 years ago)

Author:

vboxsync

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

30960

Message:

FE/Qt4: Backported:

• r30204 (Get rid of compilation warning of unused variables.)
• r30929 (2854: "Warn if not enough guest VRAM when entering fullscreen with Additions (and AutoResize?) enabled" implemented.)
• r30947 (FE/Qt: NLS: Spelling.)

Location:

trunk/src/VBox/Frontends/VirtualBox4

Files:

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

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

@@ -100 +100 @@
 
     QRect desktopGeometry();
+
+    bool isAutoresizeGuestActive();
 
     /* todo: This are some support functions for the qt4 port. Maybe we get rid

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

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

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

@@ -2335 +2335 @@
 }
 
+bool VBoxConsoleView::isAutoresizeGuestActive()
+{
+    return mIsAdditionsActive && mAutoresizeGuest;
+}
+
 /**
  *  Called on every key press and release (while in focus).

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

@@ -1980 +1980 @@
 {
     disconnect (console, SIGNAL (resizeHintDone()), 0, 0);
-    if (aSeamless)
-    {
-        /* Check if the Guest Video RAM enough for the seamless mode. */
-        QRect screen = QApplication::desktop()->availableGeometry (this);
+    /* Check if the Guest Video RAM enough for the fullscreen/seamless mode. */
+    if (aSeamless || console->isAutoresizeGuestActive())
+    {
+        QRect screen = aSeamless ?
+            QApplication::desktop()->availableGeometry (this) :
+            QApplication::desktop()->screenGeometry (this);
         ULONG64 availBits = csession.GetMachine().GetVRAMSize() /* vram */
                           * _1M /* mb to bytes */
@@ -1996 +1998 @@
         if (aOn && (availBits < usedBits))
         {
-            vboxProblem().cannotEnterSeamlessMode (screen.width(),
+            vboxProblem().cannotEnterFSMode (aSeamless, screen.width(),
                 screen.height(), guestBpp, (((usedBits + 7) / 8 + _1M - 1) / _1M) * _1M);
             return false;

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

@@ -941 +941 @@
 }
 
-void VBoxProblemReporter::cannotEnterSeamlessMode (ULONG aWidth,
-                                                   ULONG aHeight,
-                                                   ULONG aBpp,
-                                                   ULONG64 aMinVRAM)
+void VBoxProblemReporter::cannotEnterFSMode (bool aIsSeamless,
+                                             ULONG /* aWidth */,
+                                             ULONG /* aHeight */,
+                                             ULONG /* aBpp */,
+                                             ULONG64 aMinVRAM)
 {
     message (&vboxGlobal().consoleWnd(), Error,
-             tr ("<p>Could not enter seamless mode due to insufficient guest "
-                 "video memory.</p>"
-                 "<p>You should configure the VM to have at least <b>%1</b> "
-                 "of video memory.</p>")
+             (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>"))
              .arg (VBoxGlobal::formatSize (aMinVRAM)));
 }