Changeset 49267 in vbox for trunk

Timestamp:

Oct 23, 2013 6:57:04 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: only mention wrong BPP settings if the Guest Additions are loaded.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIPopupCenter.cpp (modified) (1 diff)
• runtime/UIFrameBufferQImage.cpp (modified) (1 diff)
• runtime/UIFrameBufferQuartz2D.cpp (modified) (1 diff)

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

@@ -479 +479 @@
 {
     alert(pParent, "remindAboutWrongColorDepth",
-          QApplication::translate("UIMessageCenter", "<p>The virtual machine window is optimized to work in <b>%1&nbsp;bit</b> color mode "
-                                                     "but the virtual display is currently set to <b>%2&nbsp;bit</b>.</p>"
-                                                     "<p>Please open the display properties dialog of the guest OS and select a <b>%3&nbsp;bit</b> color mode, "
-                                                     "if it is available, for best possible performance of the virtual video subsystem.</p>"
-                                                     "<p><b>Note</b>. Some operating systems, like OS/2, may actually work in 32&nbsp;bit mode "
-                                                     "but report it as 24&nbsp;bit (16 million colors). You may try to select a different color "
-                                                     "mode to see if this message disappears or you can simply disable the message now "
-                                                     "if you are sure the required color mode (%4&nbsp;bit) is not available in the guest OS.</p>")
-                                                     .arg(uWantedBPP).arg(uRealBPP).arg(uWantedBPP).arg(uWantedBPP),
+          QApplication::translate("UIMessageCenter", "<p>The virtual screen is currently set to a <b>%1&nbsp;bit</b> color mode. For better "
+                                                     "performance please change this to <b>%2&nbsp;bit</b>. This can usually be done from the"
+                                                     " <b>Display</b> section of the guest operating system's Control Panel or System Settings.</p>")
+                                                     .arg(uRealBPP).arg(uWantedBPP),
           true);
 }

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQImage.cpp

@@ -140 +140 @@
 
     /* Remind if requested: */
-    if (bRemind)
+    if (bRemind && m_pMachineView->uisession()->isGuestAdditionsActive())
         popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
                                                       pEvent->bitsPerPixel(), 32);

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIFrameBufferQuartz2D.cpp

@@ -235 +235 @@
 #endif
 
-    if (remind)
+    if (remind && m_pMachineView->uisession()->isGuestAdditionsActive())
         popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
                                                       aEvent->bitsPerPixel(), 32);