Changeset 2764 in vbox for trunk/src

Timestamp:

May 22, 2007 12:57:33 PM (18 years ago)

Author:

vboxsync

Message:

FE/Qt: Fixed spelling; added proper console window restriction for SDL mode when no guest additions are active or when the auto-resize feature is turned off.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

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

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

@@ -181 +181 @@
 private:
 
+    void maybeRestrictMinimumSize();
+
     VBoxConsoleWnd *mainwnd;
 
@@ -209 +211 @@
     bool mAutoresizeGuest : 1;
 
-    bool mIsAdditionsActive;
+    bool mIsAdditionsActive : 1;
 
     bool mfNumLock : 1;

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

@@ -273 +273 @@
     QPoint normal_pos;
     QSize normal_size;
+    QSize prev_min_size;
 
     // variables for dealing with true fullscreen

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

@@ -144 +144 @@
     bool confirmDiscardSavedState (const CMachine &machine);
 
+    bool confirmReleaseImage (QWidget *parent, const QString &usage);
+
     void sayCannotOverwriteHardDiskImage (QWidget *parent, const QString &src);
     int confirmHardDiskImageDeletion (QWidget *parent, const QString &src);
@@ -198 +200 @@
                                    const QString &, const QString &);
 
-    bool confirmReleaseImage (QWidget*, QString);
-
-    void warnAboutOldAdditions (QWidget*, const QString &);
-    void warnAboutNewAdditions (QWidget*, const QString &);
+    void warnAboutTooOldAdditions (QWidget *, const QString &, const QString &);
+    void warnAboutOldAdditions (QWidget *, const QString &, const QString &);
+    void warnAboutNewAdditions (QWidget *, const QString &, const QString &);
 
     bool remindAboutInputCapture();

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

@@ -774 +774 @@
         mAutoresizeGuest = on;
 
-        if (mode == VBoxDefs::SDLMode)
-        {
-            /* restrict minimum size because we cannot correctly draw
-             * in a scrolled window using SDL */
-            if (!mAutoresizeGuest)
-                setMinimumSize (sizeHint());
-            else
-                setMinimumSize (0, 0);
-        }
+        maybeRestrictMinimumSize();
 
         if (mIsAdditionsActive && mAutoresizeGuest)
@@ -795 +787 @@
 void VBoxConsoleView::onFullscreenChange (bool /* on */)
 {
-    /// @todo (r=dmik) not currently sure is this method necessary to
-    //  fix fullscreen toggle problems (invalid areas) on Linux/SDL
-//    if (fb)
-//    {
-//        VBoxResizeEvent e (fb->pixelFormat(), fb->address(), fb->colorDepth(),
-//                           fb->width(), fb->height());
-//        fb->resizeEvent (&e);
-//    }
+    /* Nothing to do here so far */
 }
 
@@ -843 +828 @@
                 setMaximumSize (sizeHint());
 
-                if (mode == VBoxDefs::SDLMode)
-                {
-                    /* restrict minimum size because we cannot correctly draw
-                     * in a scrolled window using SDL */
-                    if (!mAutoresizeGuest)
-                        setMinimumSize (sizeHint());
-                    else
-                        setMinimumSize (0, 0);
-                }
+                maybeRestrictMinimumSize();
 
                 /* resize the guest canvas */
@@ -937 +914 @@
                 GuestAdditionsEvent *ge = (GuestAdditionsEvent *) e;
                 LogFlowFunc (("AdditionsStateChangeEventType\n"));
+
                 mIsAdditionsActive = ge->additionActive();
+
+                maybeRestrictMinimumSize();
+
                 emit additionsStateChanged (ge->additionVersion(), ge->additionActive());
                 return true;
@@ -1700 +1681 @@
 
 /**
- *  Called on every exit from fullscreen and maximized mode.
+ *  Called on exit from fullscreen or from maximized mode.
  */
 void VBoxConsoleView::exitFullScreen()
@@ -1707 +1688 @@
     {
         doResizeHint();
+        /* Fire a normalize event with some delay to let the guest process the
+         * resize hint and send resize properly, instead of normalizing to the
+         * current guest size right now. */
         QTimer::singleShot (200, this, SLOT (normalizeGeo()));
     }
@@ -1713 +1697 @@
         normalizeGeo();
     }
+
     ignore_mainwnd_resize = false;
 }
@@ -2888 +2873 @@
 }
 
+/** 
+ *  Sets the the minimum size restriction depending on the auto-resize feature
+ *  state and the current rendering mode.
+ *
+ *  Currently, the restriction is set only in SDL mode and only when the
+ *  auto-resize feature is inactive. We need to do that because we cannot
+ *  correctly draw in a scrolled window in SDL mode.
+ *
+ *  In all other modes, or when auto-resize is in force, this function does
+ *  nothing.
+ */
+void VBoxConsoleView::maybeRestrictMinimumSize()
+{
+    if (mode == VBoxDefs::SDLMode)
+    {
+        if (!mIsAdditionsActive || !mAutoresizeGuest)
+            setMinimumSize (sizeHint());
+        else
+            setMinimumSize (0, 0);
+    }
+}

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

@@ -1710 +1710 @@
     bool wasHidden = isHidden();
 
-    static QSize prevMinimumSize;
     if (on)
     {
-        /* Save previous scroll-view minimum size before entering fullscreen
-         * state to make return to this minimum size before the exiting
-         * fullscreen. Required for correct scroll-view update in SDL mode. */
-        prevMinimumSize = console->minimumSize();
+        /* Save the previous scroll-view minimum size before entering
+         * fullscreen state to restore this minimum size before the exiting
+         * fullscreen. Required for correct scroll-view and guest display
+         * update in SDL mode. */
+        prev_min_size = console->minimumSize();
         console->setMinimumSize (0, 0);
 
@@ -1766 +1766 @@
     else
     {
-        /* Returns to previous scroll-view minimum size before the exiting
-         * fullscreen. Required for correct scroll-view update in SDL mode. */
-        console->setMinimumSize (prevMinimumSize);
+        /* Restore the previous scroll-view minimum size before the exiting
+         * fullscreen. Required for correct scroll-view and guest display
+         * update in SDL mode. */
+        console->setMinimumSize (prev_min_size);
 
         /* hide early to avoid extra flicker */
@@ -2515 +2516 @@
     vmAutoresizeGuestAction->setEnabled (aActive);
 
-    /* Checking for the Guest Additions version to warn user about possible
-     * compatibility issues in case of installed version is outdated. */
+    /* Check the Guest Additions version and warn the user about possible
+     * compatibility issues in case if the installed version is outdated. */
     uint version = aVersion.toUInt();
-    QString fullVersion = QString ("%1.%2")
+    QString verisonStr = QString ("%1.%2")
         .arg (RT_HIWORD (version)).arg (RT_LOWORD (version));
-
-    if (RT_HIWORD (version) < RT_HIWORD (VMMDEV_VERSION))
-        vboxProblem().warnAboutOldAdditions (this, fullVersion);
-    else if (RT_HIWORD (version) == RT_HIWORD (VMMDEV_VERSION) &&
-             RT_LOWORD (version) <  RT_LOWORD (VMMDEV_VERSION))
-        vboxProblem().warnAboutNewAdditions (this, fullVersion);
+    QString expectedStr = QString ("%1.%2")
+        .arg (VMMDEV_VERSION_MAJOR).arg (VMMDEV_VERSION_MINOR);
+
+    if (RT_HIWORD (version) < VMMDEV_VERSION_MAJOR)
+    {
+        vboxProblem().warnAboutTooOldAdditions (this, verisonStr, expectedStr);
+    }
+    else if (RT_HIWORD (version) == VMMDEV_VERSION_MAJOR &&
+             RT_LOWORD (version) <  VMMDEV_VERSION_MINOR)
+    {
+        vboxProblem().warnAboutOldAdditions (this, verisonStr, expectedStr);
+    }
+    else if (version > VMMDEV_VERSION)
+    {
+        vboxProblem().warnAboutNewAdditions (this, verisonStr, expectedStr);
+    }
 }
 

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

@@ -884 +884 @@
 }
 
-bool VBoxProblemReporter::confirmReleaseImage (QWidget* parent, QString usage)
+bool VBoxProblemReporter::confirmReleaseImage (QWidget *parent,
+                                               const QString &usage)
 {
     return messageYesNo (
@@ -1097 +1098 @@
 }
 
-void VBoxProblemReporter::warnAboutOldAdditions (QWidget *aParent,
-                                                 const QString &aVersion)
-{
-    message (aParent, VBoxProblemReporter::Warning,
-        tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
-            "<p>You must update to the latest version by choosing Devices "
-            "- Install Guest Additions.</p>").arg (aVersion));
-}
-
-void VBoxProblemReporter::warnAboutNewAdditions (QWidget *aParent,
-                                                 const QString &aVersion)
-{
-    message (aParent, VBoxProblemReporter::Warning,
-        tr ("<p>Your Guest Additions are outdated (current version: %1).</p>"
-            "<p>There is a newer Guest Additions version. You should update "
-            "to the latest version by choosing Devices "
-            "- Install Guest Additions.</p>").arg (aVersion));
-}
-
 #if defined Q_WS_WIN
 
@@ -1254 +1236 @@
                  .arg (aConsole.GetMachine().GetName()),
              formatErrorInfo (res));
+}
+
+void VBoxProblemReporter::warnAboutTooOldAdditions (QWidget *aParent,
+                                                    const QString &aInstalledVer,
+                                                    const QString &aExpectedVer)
+{
+    message (aParent, VBoxProblemReporter::Error,
+        tr ("<p>VirtualBox Guest Additions installed in the Guest OS are too "
+            "old: the installed version is %1, the expected version is %2. "
+            "Some features that require Guest Additions (mouse integration, "
+            "guest dislpay auto-resize) will most likely stop "
+            "working properly.</p>"
+            "<p>Please update Guest Additions to a newer version by choosing "
+            "<b>Devices</b> - <b>Install Guest Additions</b> from the "
+            "main menu.</p>")
+             .arg (aInstalledVer).arg (aExpectedVer),
+        "warnAboutTooOldAdditions");
+}
+
+void VBoxProblemReporter::warnAboutOldAdditions (QWidget *aParent,
+                                                 const QString &aInstalledVer,
+                                                 const QString &aExpectedVer)
+{
+    message (aParent, VBoxProblemReporter::Warning,
+        tr ("<p>VirtualBox Guest Additions installed in the Guest OS are "
+            "outdated: the installed version is %1, the expected version is %2. "
+            "Some features that require Guest Additions (mouse integration, "
+            "guest dislpay auto-resize) may not work as expected.</p>"
+            "<p>It is recommended to update Guest Additions to a newer version by "
+            "choosing <b>Devices</b> - <b>Install Guest Additions</b> from the "
+            "main menu.</p>")
+             .arg (aInstalledVer).arg (aExpectedVer),
+        "warnAboutOldAdditions");
+}
+
+void VBoxProblemReporter::warnAboutNewAdditions (QWidget *aParent,
+                                                 const QString &aInstalledVer,
+                                                 const QString &aExpectedVer)
+{
+    message (aParent, VBoxProblemReporter::Error,
+        tr ("<p>VirtualBox Guest Additions installed in the Guest OS are "
+            "too new: the installed version is %1, the expected version is %2.</p>"
+            "<p>Using a newer version of Additions with an older version of "
+            "VirtualBox is not supported. Please update Guest Additions to a suitable "
+            "version by choosing <b>Devices</b> - <b>Install Guest Additions</b> "
+            "from the main menu.</p>")
+             .arg (aInstalledVer).arg (aExpectedVer),
+        "warnAboutNewAdditions");
 }