Changeset 39800 in vbox

Timestamp:

Jan 18, 2012 5:54:06 PM (13 years ago)

Author:

vboxsync

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

75774

Message:

fix for xtracker 6010

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/VBoxGlobal.cpp (modified) (4 diffs)
• globals/VBoxGlobal.h (modified) (2 diffs)
• selector/UIVMDesktop.cpp (modified) (1 diff)
• settings/machine/UIMachineSettingsDisplay.cpp (modified) (1 diff)

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

@@ -19 +19 @@
 #include <VBox/vd.h>
 #include <VBox/version.h>
+#include <stdio.h>
 
 #include "VBoxUtils.h"
@@ -281 +282 @@
     , mRecompileSupervisor(false)
     , mRecompileUser(false)
-    , mVerString ("1.0")
+    , mVerString("1.0")
+    , m3DAvailable(-1)
 {
 }
@@ -391 +393 @@
 }
 
+bool VBoxGlobal::is3DAvailable()
+{
+    if (m3DAvailable < 0)
+        m3DAvailable = virtualBox().GetHost().GetAcceleration3DAvailable();
+    return m3DAvailable;
+}
+
 /**
  *  Sets the new global settings and saves them to the VirtualBox server.
@@ -1712 +1721 @@
         }
 
-        QString acc3d = aMachine.GetAccelerate3DEnabled()
+        QString acc3d = is3DAvailable() && aMachine.GetAccelerate3DEnabled()
             ? tr ("Enabled", "details report (3D Acceleration)")
             : tr ("Disabled", "details report (3D Acceleration)");

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

@@ -150 +150 @@
     QWidget *mainWindow() const { return mMainWindow; }
 
+    bool is3DAvailable();
+
 #ifdef VBOX_GUI_WITH_PIDFILE
     void createPidfile();
@@ -860 +862 @@
     QString mVerString;
     QString mBrandingConfig;
+    
+    int m3DAvailable;
 
     QList <QString> mFamilyIDs;

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

@@ -840 +840 @@
                 accel << tr("2D Video", "details report");
 #endif /* VBOX_WITH_VIDEOHWACCEL */
-            if (m_machine.GetAccelerate3DEnabled())
+            if (   vboxGlobal().is3DAvailable()
+                && m_machine.GetAccelerate3DEnabled())
                 accel << tr("3D", "details report");
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/machine/UIMachineSettingsDisplay.cpp

@@ -523 +523 @@
     mLeMonitors->setEnabled(isMachineOffline());
     mLbOptions->setEnabled(isMachineOffline());
-    mCb3D->setEnabled(isMachineOffline() && vboxGlobal().virtualBox().GetHost().GetAcceleration3DAvailable());
+    if (vboxGlobal().is3DAvailable())
+        mCb3D->setEnabled(isMachineOffline());
+    else
+    {
+        mCb3D->setEnabled(false);
+        mCb3D->setChecked(false);
+    }
 #ifdef VBOX_WITH_VIDEOHWACCEL
     mCb2DVideo->setEnabled(isMachineOffline() && VBoxGlobal::isAcceleration2DVideoAvailable());