Changeset 22157 in vbox for trunk/src/VBox

Timestamp:

Aug 11, 2009 11:19:58 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: Few little GUI coding-style fixes for 50914 & 50915.

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• include/VBoxGlobal.h (modified) (1 diff)
• src/VBoxConsoleWnd.cpp (modified) (1 diff)
• src/VBoxGlobal.cpp (modified) (1 diff)
• src/VBoxVMSettingsDisplay.cpp (modified) (3 diffs)

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

@@ -753 +753 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    static bool isAcceleration2DVideoAvailable() {/*TODO: */ return true; }
+    static bool isAcceleration2DVideoAvailable() { /* TODO: */ return true; }
     VBoxDefs::RenderMode vmAcceleration2DVideoRenderMode() { return VBoxDefs::QGLMode; }
 #endif

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

@@ -810 +810 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    /* need to force the QGL framebuffer in case 2D Video Acceleration is enabled && supported */
-    if(cmachine.GetAccelerate2DVideoEnabled() && VBoxGlobal::isAcceleration2DVideoAvailable())
-    {
-        mode = vboxGlobal().vmAcceleration2DVideoRenderMode();
-    }
+    /* Need to force the QGL framebuffer in case 2D Video Acceleration is supported & enabled */
+    if (VBoxGlobal::isAcceleration2DVideoAvailable() && cmachine.GetAccelerate2DVideoEnabled())
+        mode = vboxGlobal().vmAcceleration2DVideoRenderMode();
 #endif
 

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

@@ -1561 +1561 @@
 
         item += QString (sSectionItemTpl2)
-                       .arg (tr ("2D Video Acceleration", "details report"), acc2dVideo);
-        rows++;
+                .arg (tr ("2D Video Acceleration", "details report"), acc2dVideo);
+        ++ rows;
 #endif
 

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

@@ -96 +96 @@
 
 #ifndef VBOX_WITH_VIDEOHWACCEL
-    mCb2DVideo->setEnabled (false);
+    mCb2DVideo->setVisible (false);
 #endif
 
@@ -117 +117 @@
 
 #ifdef VBOX_WITH_VIDEOHWACCEL
-    bool is2DVideoAccelerationSupported = VBoxGlobal::isAcceleration2DVideoAvailable();
-    mCb2DVideo->setEnabled (is2DVideoAccelerationSupported);
+    mCb2DVideo->setEnabled (VBoxGlobal::isAcceleration2DVideoAvailable());
     mCb2DVideo->setChecked (mMachine.GetAccelerate2DVideoEnabled());
-#else
-    mCb2DVideo->setEnabled (false);
 #endif
 
@@ -170 +167 @@
     connect (mCb3D, SIGNAL (stateChanged (int)),
              mValidator, SLOT (revalidate()));
-#ifdef VBOX_WITH_VIDEOHWACCEL
-    connect (mCb2DVideo, SIGNAL (stateChanged (int)),
-             mValidator, SLOT (revalidate()));
-#endif
     connect (mCbVRDP, SIGNAL (toggled (bool)),
              mValidator, SLOT (revalidate()));