Changeset 47210 in vbox

Timestamp:

Jul 17, 2013 12:11:10 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Popup-center: Withdraw invalid-bit-depth reminders in case of issue they are reflecting is obsolete already.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

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

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

@@ -518 +518 @@
 }
 
-void UIPopupCenter::remindAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP)
+void UIPopupCenter::updatePopupAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP)
 {
     alert(pParent, "remindAboutWrongColorDepth",
@@ -533 +533 @@
 }
 
+void UIPopupCenter::recallPopupAboutWrongColorDepth(QWidget *pParent)
+{
+    recall(pParent, "remindAboutWrongColorDepth");
+}
+

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

@@ -105 +105 @@
     void remindAboutPausedVMInput(QWidget *pParent);
     void remindAboutGuestAdditionsAreNotActive(QWidget *pParent);
-    void remindAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP);
+    void updatePopupAboutWrongColorDepth(QWidget *pParent, ulong uRealBPP, ulong uWantedBPP);
+    void recallPopupAboutWrongColorDepth(QWidget *pParent);
 
 private slots:

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

@@ -130 +130 @@
     /* Remind if requested: */
     if (bRemind)
-        popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
-                                                 pEvent->bitsPerPixel(), 32);
+        popupCenter().updatePopupAboutWrongColorDepth(m_pMachineView->machineWindow(),
+                                                      pEvent->bitsPerPixel(), 32);
+    else
+        popupCenter().recallPopupAboutWrongColorDepth(m_pMachineView->machineWindow());
 }
 

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

@@ -211 +211 @@
 
     if (remind)
-        popupCenter().remindAboutWrongColorDepth(m_pMachineView->machineWindow(),
-                                                 aEvent->bitsPerPixel(), 32);
+        popupCenter().updatePopupAboutWrongColorDepth(m_pMachineView->machineWindow(),
+                                                      aEvent->bitsPerPixel(), 32);
+    else
+        popupCenter().recallPopupAboutWrongColorDepth(m_pMachineView->machineWindow());
 }