Changeset 98386 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Feb 1, 2023 1:16:52 PM (2 years ago)

Author:

vboxsync

Message:

Merging r155287 and r155288 from gui4 branch: FE/Qt: Runtime UI: Moving host-screen & guest-screen handling stuff from UISession to UIMachine; Dangerous a bit.

Location:

trunk

Files:

• . (modified) (1 prop)
• src/VBox (modified) (1 prop)
• src/VBox/Frontends (modified) (1 prop)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.cpp (modified) (11 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h (modified) (8 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineLogic.cpp (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMachineView.cpp (modified) (12 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UIMultiScreenLayout.cpp (modified) (4 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UISession.cpp (modified) (14 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/UISession.h (modified) (10 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp (modified) (5 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp (modified) (1 diff)
• src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp (modified) (2 diffs)
• src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp (modified) (2 diffs)

trunk

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288
 /trunk/src:92342,154921

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288
 /trunk/src:92342,154921

trunk/src/VBox

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288

trunk/src/VBox/Frontends

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288

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

@@ -30 +30 @@
 # include <QBitmap>
 #endif
+#ifdef VBOX_WS_MAC
+# include <QTimer>
+#endif
 
 /* GUI includes: */
 #include "UICommon.h"
+#include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
@@ -41 +45 @@
 #include "UIMachineWindow.h"
 #include "UIMessageCenter.h"
+#ifdef VBOX_WS_MAC
+# include "UICocoaApplication.h"
+# include "VBoxUtils-darwin.h"
+#endif
 
 /* COM includes: */
+#include "CConsole.h"
+#include "CGraphicsAdapter.h"
 #include "CMachine.h"
+#include "CProgress.h"
 #include "CSession.h"
-#include "CConsole.h"
 #include "CSnapshot.h"
-#include "CProgress.h"
+
+
+#ifdef VBOX_WS_MAC
+/**
+ * MacOS X: Application Services: Core Graphics: Display reconfiguration callback.
+ *
+ * Notifies UIMachine about @a display configuration change.
+ * Corresponding change described by Core Graphics @a flags.
+ * Uses UIMachine @a pHandler to process this change.
+ *
+ * @note Last argument (@a pHandler) must always be valid pointer to UIMachine object.
+ * @note Calls for UIMachine::sltHandleHostDisplayAboutToChange() slot if display configuration changed.
+ */
+void cgDisplayReconfigurationCallback(CGDirectDisplayID display, CGDisplayChangeSummaryFlags flags, void *pHandler)
+{
+    /* Which flags we are handling? */
+    int iHandledFlags = kCGDisplayAddFlag     /* display added */
+                        | kCGDisplayRemoveFlag  /* display removed */
+                        | kCGDisplaySetModeFlag /* display mode changed */;
+
+    /* Handle 'display-add' case: */
+    if (flags & kCGDisplayAddFlag)
+        LogRelFlow(("GUI: UIMachine::cgDisplayReconfigurationCallback: Display added.\n"));
+    /* Handle 'display-remove' case: */
+    else if (flags & kCGDisplayRemoveFlag)
+        LogRelFlow(("GUI: UIMachine::cgDisplayReconfigurationCallback: Display removed.\n"));
+    /* Handle 'mode-set' case: */
+    else if (flags & kCGDisplaySetModeFlag)
+        LogRelFlow(("GUI: UIMachine::cgDisplayReconfigurationCallback: Display mode changed.\n"));
+
+    /* Ask handler to process our callback: */
+    if (flags & iHandledFlags)
+        QTimer::singleShot(0, static_cast<UIMachine*>(pHandler),
+                           SLOT(sltHandleHostDisplayAboutToChange()));
+
+    Q_UNUSED(display);
+}
+#endif /* VBOX_WS_MAC */
 
 
@@ -169 +216 @@
 }
 
+bool UIMachine::isScreenVisibleHostDesires(ulong uScreenId) const
+{
+    /* Make sure index feats the bounds: */
+    AssertReturn(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size(), false);
+
+    /* Return 'actual' (host-desire) visibility status: */
+    return m_monitorVisibilityVectorHostDesires.value((int)uScreenId);
+}
+
+void UIMachine::setScreenVisibleHostDesires(ulong uScreenId, bool fIsMonitorVisible)
+{
+    /* Make sure index feats the bounds: */
+    AssertReturnVoid(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size());
+
+    /* Remember 'actual' (host-desire) visibility status: */
+    m_monitorVisibilityVectorHostDesires[(int)uScreenId] = fIsMonitorVisible;
+
+    /* And remember the request in extra data for guests with VMSVGA: */
+    /* This should be done before the actual hint is sent in case the guest overrides it. */
+    gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
+}
+
+bool UIMachine::isScreenVisible(ulong uScreenId) const
+{
+    /* Make sure index feats the bounds: */
+    AssertReturn(uScreenId < (ulong)m_monitorVisibilityVector.size(), false);
+
+    /* Return 'actual' visibility status: */
+    return m_monitorVisibilityVector.value((int)uScreenId);
+}
+
+void UIMachine::setScreenVisible(ulong uScreenId, bool fIsMonitorVisible)
+{
+    /* Make sure index feats the bounds: */
+    AssertReturnVoid(uScreenId < (ulong)m_monitorVisibilityVector.size());
+
+    /* Remember 'actual' visibility status: */
+    m_monitorVisibilityVector[(int)uScreenId] = fIsMonitorVisible;
+    /* Remember 'desired' visibility status: */
+    // See note in UIMachineView::sltHandleNotifyChange() regarding the graphics controller check. */
+    if (uisession()->machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
+        gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
+
+    /* Make sure action-pool knows guest-screen visibility status: */
+    uisession()->actionPool()->toRuntime()->setGuestScreenVisible(uScreenId, fIsMonitorVisible);
+}
+
+int UIMachine::countOfVisibleWindows()
+{
+    int cCountOfVisibleWindows = 0;
+    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
+        if (m_monitorVisibilityVector[i])
+            ++cCountOfVisibleWindows;
+    return cCountOfVisibleWindows;
+}
+
+QList<int> UIMachine::listOfVisibleWindows() const
+{
+    QList<int> visibleWindows;
+    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
+        if (m_monitorVisibilityVector.at(i))
+            visibleWindows.push_back(i);
+    return visibleWindows;
+}
+
+QSize UIMachine::lastFullScreenSize(ulong uScreenId) const
+{
+    /* Make sure index fits the bounds: */
+    AssertReturn(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size(), QSize(-1, -1));
+
+    /* Return last full-screen size: */
+    return m_monitorLastFullScreenSizeVector.value((int)uScreenId);
+}
+
+void UIMachine::setLastFullScreenSize(ulong uScreenId, QSize size)
+{
+    /* Make sure index fits the bounds: */
+    AssertReturnVoid(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size());
+
+    /* Remember last full-screen size: */
+    m_monitorLastFullScreenSizeVector[(int)uScreenId] = size;
+}
+
 void UIMachine::closeRuntimeUI()
 {
@@ -217 +347 @@
         enterInitialVisualState();
     }
+}
+
+void UIMachine::sltHandleHostScreenCountChange()
+{
+    LogRelFlow(("GUI: UIMachine: Host-screen count changed.\n"));
+
+    /* Recache display data: */
+    updateHostScreenData();
+
+    /* Notify current machine-logic: */
+    emit sigHostScreenCountChange();
+}
+
+void UIMachine::sltHandleHostScreenGeometryChange()
+{
+    LogRelFlow(("GUI: UIMachine: Host-screen geometry changed.\n"));
+
+    /* Recache display data: */
+    updateHostScreenData();
+
+    /* Notify current machine-logic: */
+    emit sigHostScreenGeometryChange();
+}
+
+void UIMachine::sltHandleHostScreenAvailableAreaChange()
+{
+    LogRelFlow(("GUI: UIMachine: Host-screen available-area changed.\n"));
+
+    /* Notify current machine-logic: */
+    emit sigHostScreenAvailableAreaChange();
+}
+
+#ifdef VBOX_WS_MAC
+void UIMachine::sltHandleHostDisplayAboutToChange()
+{
+    LogRelFlow(("GUI: UIMachine::sltHandleHostDisplayAboutToChange()\n"));
+
+    if (m_pWatchdogDisplayChange->isActive())
+        m_pWatchdogDisplayChange->stop();
+    m_pWatchdogDisplayChange->setProperty("tryNumber", 1);
+    m_pWatchdogDisplayChange->start();
+}
+
+void UIMachine::sltCheckIfHostDisplayChanged()
+{
+    LogRelFlow(("GUI: UIMachine::sltCheckIfHostDisplayChanged()\n"));
+
+    /* Check if display count changed: */
+    if (UIDesktopWidgetWatchdog::screenCount() != m_hostScreens.size())
+    {
+        /* Reset watchdog: */
+        m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
+        /* Notify listeners about screen-count changed: */
+        return sltHandleHostScreenCountChange();
+    }
+    else
+    {
+        /* Check if at least one display geometry changed: */
+        for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
+        {
+            if (gpDesktop->screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
+            {
+                /* Reset watchdog: */
+                m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
+                /* Notify listeners about screen-geometry changed: */
+                return sltHandleHostScreenGeometryChange();
+            }
+        }
+    }
+
+    /* Check if watchdog expired, restart if not: */
+    int cTryNumber = m_pWatchdogDisplayChange->property("tryNumber").toInt();
+    if (cTryNumber > 0 && cTryNumber < 40)
+    {
+        /* Restart watchdog again: */
+        m_pWatchdogDisplayChange->setProperty("tryNumber", ++cTryNumber);
+        m_pWatchdogDisplayChange->start();
+    }
+    else
+    {
+        /* Reset watchdog: */
+        m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
+    }
+}
+#endif /* VBOX_WS_MAC */
+
+void UIMachine::sltHandleGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo)
+{
+    /* Ignore KGuestMonitorChangedEventType_NewOrigin change event: */
+    if (changeType == KGuestMonitorChangedEventType_NewOrigin)
+        return;
+    /* Ignore KGuestMonitorChangedEventType_Disabled event for primary screen: */
+    AssertMsg(countOfVisibleWindows() > 0, ("All machine windows are hidden!"));
+    if (changeType == KGuestMonitorChangedEventType_Disabled && uScreenId == 0)
+        return;
+
+    /* Process KGuestMonitorChangedEventType_Enabled change event: */
+    if (   !isScreenVisible(uScreenId)
+        && changeType == KGuestMonitorChangedEventType_Enabled)
+        setScreenVisible(uScreenId, true);
+    /* Process KGuestMonitorChangedEventType_Disabled change event: */
+    else if (   isScreenVisible(uScreenId)
+             && changeType == KGuestMonitorChangedEventType_Disabled)
+        setScreenVisible(uScreenId, false);
+
+    /* Notify listeners about the change: */
+    emit sigGuestMonitorChange(changeType, uScreenId, screenGeo);
 }
 
@@ -344 +581 @@
     , m_pMachineLogic(0)
     , m_pMachineWindowIcon(0)
+#ifdef VBOX_WS_MAC
+    , m_pWatchdogDisplayChange(0)
+#endif
     , m_fNumLock(false)
     , m_fCapsLock(false)
@@ -385 +625 @@
     /* Prepare stuff: */
     prepareSessionConnections();
+    prepareScreens();
     prepareMachineWindowIcon();
     prepareMachineLogic();
@@ -418 +659 @@
             this, &UIMachine::sigDnDModeChange);
     connect(uisession(), &UISession::sigGuestMonitorChange,
-            this, &UIMachine::sigGuestMonitorChange);
+            this, &UIMachine::sltHandleGuestMonitorChange);
     connect(uisession(), &UISession::sigMachineStateChange,
             this, &UIMachine::sigMachineStateChange);
@@ -457 +698 @@
 }
 
+void UIMachine::prepareScreens()
+{
+    /* Recache display data: */
+    updateHostScreenData();
+
+#ifdef VBOX_WS_MAC
+    /* Prepare display-change watchdog: */
+    m_pWatchdogDisplayChange = new QTimer(this);
+    {
+        m_pWatchdogDisplayChange->setInterval(500);
+        m_pWatchdogDisplayChange->setSingleShot(true);
+        connect(m_pWatchdogDisplayChange, &QTimer::timeout,
+                this, &UIMachine::sltCheckIfHostDisplayChanged);
+    }
+#endif /* VBOX_WS_MAC */
+
+#ifdef VBOX_WS_MAC
+    /* Install native display reconfiguration callback: */
+    CGDisplayRegisterReconfigurationCallback(cgDisplayReconfigurationCallback, this);
+#else /* !VBOX_WS_MAC */
+    /* Install Qt display reconfiguration callbacks: */
+    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenCountChanged,
+            this, &UIMachine::sltHandleHostScreenCountChange);
+    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
+            this, &UIMachine::sltHandleHostScreenGeometryChange);
+# if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
+    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaRecalculated,
+            this, &UIMachine::sltHandleHostScreenAvailableAreaChange);
+# else /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaResized,
+            this, &UIMachine::sltHandleHostScreenAvailableAreaChange);
+# endif /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
+#endif /* !VBOX_WS_MAC */
+
+    /* Prepare initial screen visibility status: */
+    m_monitorVisibilityVector.resize(uisession()->machine().GetGraphicsAdapter().GetMonitorCount());
+    m_monitorVisibilityVector.fill(false);
+    m_monitorVisibilityVector[0] = true;
+
+    /* Prepare empty last full-screen size vector: */
+    m_monitorLastFullScreenSizeVector.resize(uisession()->machine().GetGraphicsAdapter().GetMonitorCount());
+    m_monitorLastFullScreenSizeVector.fill(QSize(-1, -1));
+
+    /* If machine is in 'saved' state: */
+    if (uisession()->isSaved())
+    {
+        /* Update screen visibility status from saved-state: */
+        for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
+        {
+            BOOL fEnabled = true;
+            ULONG uGuestOriginX = 0, uGuestOriginY = 0, uGuestWidth = 0, uGuestHeight = 0;
+            uisession()->machine().QuerySavedGuestScreenInfo(iScreenIndex,
+                                                             uGuestOriginX, uGuestOriginY,
+                                                             uGuestWidth, uGuestHeight, fEnabled);
+            m_monitorVisibilityVector[iScreenIndex] = fEnabled;
+        }
+        /* And make sure at least one of them is visible (primary if others are hidden): */
+        if (countOfVisibleWindows() < 1)
+            m_monitorVisibilityVector[0] = true;
+    }
+    else if (uiCommon().isSeparateProcess())
+    {
+        /* Update screen visibility status from display directly: */
+        for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
+        {
+            KGuestMonitorStatus enmStatus = KGuestMonitorStatus_Disabled;
+            ULONG uGuestWidth = 0, uGuestHeight = 0, uBpp = 0;
+            LONG iGuestOriginX = 0, iGuestOriginY = 0;
+            uisession()->display().GetScreenResolution(iScreenIndex,
+                                                       uGuestWidth, uGuestHeight, uBpp,
+                                                       iGuestOriginX, iGuestOriginY, enmStatus);
+            m_monitorVisibilityVector[iScreenIndex] = (   enmStatus == KGuestMonitorStatus_Enabled
+                                                       || enmStatus == KGuestMonitorStatus_Blank);
+        }
+        /* And make sure at least one of them is visible (primary if others are hidden): */
+        if (countOfVisibleWindows() < 1)
+            m_monitorVisibilityVector[0] = true;
+    }
+
+    /* Prepare initial screen visibility status of host-desires (same as facts): */
+    m_monitorVisibilityVectorHostDesires.resize(uisession()->machine().GetGraphicsAdapter().GetMonitorCount());
+    for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
+        m_monitorVisibilityVectorHostDesires[iScreenIndex] = m_monitorVisibilityVector[iScreenIndex];
+
+    /* Make sure action-pool knows guest-screen visibility status: */
+    for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
+        uisession()->actionPool()->toRuntime()->setGuestScreenVisible(iScreenIndex, m_monitorVisibilityVector.at(iScreenIndex));
+}
+
 void UIMachine::prepareMachineWindowIcon()
 {
@@ -535 +865 @@
 }
 
+void UIMachine::cleanupScreens()
+{
+#ifdef VBOX_WS_MAC
+    /* Remove display reconfiguration callback: */
+    CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
+#endif /* VBOX_WS_MAC */
+}
+
 void UIMachine::cleanupSession()
 {
@@ -550 +888 @@
     cleanupMachineLogic();
     cleanupMachineWindowIcon();
+    cleanupScreens();
 
     /* Cleanup session UI: */
@@ -558 +897 @@
 {
     sltChangeVisualState(m_initialVisualState);
+}
+
+void UIMachine::updateHostScreenData()
+{
+    /* Rebuild host-screen data vector: */
+    m_hostScreens.clear();
+    for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
+        m_hostScreens << gpDesktop->screenGeometry(iScreenIndex);
+
+    /* Make sure action-pool knows host-screen count: */
+    uisession()->actionPool()->toRuntime()->setHostScreenCount(m_hostScreens.size());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UIMachine.h

@@ -51 +51 @@
 class UISession;
 class UIMachineLogic;
+#ifdef VBOX_WS_MAC
+ class QTimer;
+#endif
 
 /** Singleton QObject extension
@@ -129 +132 @@
     /** @} */
 
+    /** @name Host-screen stuff.
+     ** @{ */
+        /** Notifies about host-screen count change. */
+        void sigHostScreenCountChange();
+        /** Notifies about host-screen geometry change. */
+        void sigHostScreenGeometryChange();
+        /** Notifies about host-screen available-area change. */
+        void sigHostScreenAvailableAreaChange();
+    /** @} */
+
 public:
 
@@ -167 +180 @@
         QString machineWindowNamePostfix() const { return m_strMachineWindowNamePostfix; }
 #endif
+    /** @} */
+
+    /** @name Host-screen stuff.
+     ** @{ */
+        /** Returns the list of host-screen geometries we currently have. */
+        QList<QRect> hostScreens() const { return m_hostScreens; }
+    /** @} */
+
+    /** @name Guest-screen stuff.
+     ** @{ */
+        /** Returns whether guest-screen with @a uScreenId specified is expected to be visible. */
+        bool isScreenVisibleHostDesires(ulong uScreenId) const;
+        /** Defines whether guest-screen with @a uScreenId specified is expected to be @a fVisible. */
+        void setScreenVisibleHostDesires(ulong uScreenId, bool fVisible);
+
+        /** Returns whether guest-screen with @a uScreenId specified is actually visible. */
+        bool isScreenVisible(ulong uScreenId) const;
+        /** Defines whether guest-screen with @a uScreenId specified is actually @a fVisible. */
+        void setScreenVisible(ulong uScreenId, bool fIsMonitorVisible);
+
+        /** Returns a number of visible guest-windows. */
+        int countOfVisibleWindows();
+        /** Returns the list of visible guest-windows. */
+        QList<int> listOfVisibleWindows() const;
+
+        /** Returns last full-screen size for guest-screen with index @a uScreenId. */
+        QSize lastFullScreenSize(ulong uScreenId) const;
+        /** Defines last full-screen @a size for guest-screen with index @a uScreenId. */
+        void setLastFullScreenSize(ulong uScreenId, QSize size);
     /** @} */
 
@@ -257 +299 @@
     /** Visual state-change handler. */
     void sltChangeVisualState(UIVisualStateType visualStateType);
+
+    /** @name Host-screen stuff.
+     * @{ */
+        /** Handles host-screen count change. */
+        void sltHandleHostScreenCountChange();
+        /** Handles host-screen geometry change. */
+        void sltHandleHostScreenGeometryChange();
+        /** Handles host-screen available-area change. */
+        void sltHandleHostScreenAvailableAreaChange();
+
+#ifdef VBOX_WS_MAC
+        /** MacOS X: Restarts display-reconfiguration watchdog timer from the beginning.
+          * @note Watchdog is trying to determine display reconfiguration in
+          *       UISession::sltCheckIfHostDisplayChanged() slot every 500ms for 40 tries. */
+        void sltHandleHostDisplayAboutToChange();
+        /** MacOS X: Determines display reconfiguration.
+          * @note Calls for UISession::sltHandleHostScreenCountChange() if screen count changed.
+          * @note Calls for UISession::sltHandleHostScreenGeometryChange() if screen geometry changed. */
+        void sltCheckIfHostDisplayChanged();
+#endif /* VBOX_WS_MAC */
+    /** @} */
+
+    /** @name Guest-screen stuff.
+     * @{ */
+        /** Handles guest-monitor state change. */
+        void sltHandleGuestMonitorChange(KGuestMonitorChangedEventType enmChangeType, ulong uScreenId, QRect screenGeo);
+    /** @} */
 
     /** @name Keyboard stuff.
@@ -301 +370 @@
     /** Prepare routine: Session connection stuff. */
     void prepareSessionConnections();
+    /** Prepare routine: Screens stuff. */
+    void prepareScreens();
     /** Prepare routine: Machine-window icon. */
     void prepareMachineWindowIcon();
@@ -313 +384 @@
     /** Cleanup routine: Machine-window icon. */
     void cleanupMachineWindowIcon();
+    /** Cleanup routine: Screens stuff. */
+    void cleanupScreens();
     /** Cleanup routine: Session stuff. */
     void cleanupSession();
@@ -320 +393 @@
     /** Moves VM to initial state. */
     void enterInitialVisualState();
+
+    /** @name Host-screen stuff.
+     * @{ */
+        /** Update host-screen data. */
+        void updateHostScreenData();
+    /** @} */
 
     /** @name Mouse cursor stuff.
@@ -380 +459 @@
     /** @} */
 
+    /** @name Host-screen stuff.
+     * @{ */
+        /** Holds the list of host-screen geometries we currently have. */
+        QList<QRect>  m_hostScreens;
+
+#ifdef VBOX_WS_MAC
+        /** Mac OS X: Watchdog timer looking for display reconfiguration. */
+        QTimer *m_pWatchdogDisplayChange;
+#endif
+    /** @} */
+
+    /** @name Guest-screen stuff.
+     * @{ */
+        /** Holds the list of desired guest-screen visibility flags. */
+        QVector<bool>  m_monitorVisibilityVectorHostDesires;
+        /** Holds the list of actual guest-screen visibility flags. */
+        QVector<bool>  m_monitorVisibilityVector;
+
+        /** Holds the list of guest-screen full-screen sizes. */
+        QVector<QSize>  m_monitorLastFullScreenSizeVector;
+    /** @} */
+
     /** @name Keyboard stuff.
      ** @{ */

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

@@ -898 +898 @@
 
     /* We should watch for host-screen-change events: */
-    connect(uisession(), &UISession::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange);
-    connect(uisession(), &UISession::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange);
-    connect(uisession(), &UISession::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange);
+    connect(uimachine(), &UIMachine::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange);
+    connect(uimachine(), &UIMachine::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange);
+    connect(uimachine(), &UIMachine::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange);
 
     /* We should notify about frame-buffer events: */
@@ -1210 +1210 @@
 
     /* If we have more than one visible window: */
-    const QList<int> visibleWindowsList = uisession()->listOfVisibleWindows();
+    const QList<int> visibleWindowsList = uimachine()->listOfVisibleWindows();
     const int cVisibleGuestScreens = visibleWindowsList.size();
     if (cVisibleGuestScreens > 1)
@@ -1322 +1322 @@
         }
     }
-    const QList<int> visibleWindowsList = uisession()->listOfVisibleWindows();
+    const QList<int> visibleWindowsList = uimachine()->listOfVisibleWindows();
     const int cVisibleGuestScreens = visibleWindowsList.size();
     if (cVisibleGuestScreens > 1)
@@ -1448 +1448 @@
 
     /* We should stop watching for host-screen-change events: */
-    disconnect(uisession(), &UISession::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange);
-    disconnect(uisession(), &UISession::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange);
-    disconnect(uisession(), &UISession::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange);
+    disconnect(uimachine(), &UIMachine::sigHostScreenCountChange, this, &UIMachineLogic::sltHostScreenCountChange);
+    disconnect(uimachine(), &UIMachine::sigHostScreenGeometryChange, this, &UIMachineLogic::sltHostScreenGeometryChange);
+    disconnect(uimachine(), &UIMachine::sigHostScreenAvailableAreaChange, this, &UIMachineLogic::sltHostScreenAvailableAreaChange);
 
     /* We should stop notify about frame-buffer events: */

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

@@ -630 +630 @@
 
         /* Forget the last full-screen size: */
-        uisession()->setLastFullScreenSize(screenId(), QSize(-1, -1));
+        uimachine()->setLastFullScreenSize(screenId(), QSize(-1, -1));
     }
     /* For other than 'scale' mode: */
@@ -641 +641 @@
         m_sizeHintOverride = QSize(-1, -1);
         if (visualStateType() == UIVisualStateType_Normal)
-            uisession()->setLastFullScreenSize(screenId(), QSize(-1, -1));
+            uimachine()->setLastFullScreenSize(screenId(), QSize(-1, -1));
 
         /* Force machine-window update own layout: */
@@ -782 +782 @@
         && (   (int)frameBuffer()->width() != size.width()
             || (int)frameBuffer()->height() != size.height()
-            || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
+            || uimachine()->isScreenVisible(screenId()) != uimachine()->isScreenVisibleHostDesires(screenId())))
         setStoredGuestScreenSizeHint(size);
 
@@ -789 +789 @@
     {
         /* If host and guest have same opinion about guest-screen visibility: */
-        if (uisession()->isScreenVisible(screenId()) == uisession()->isScreenVisibleHostDesires(screenId()))
+        if (uimachine()->isScreenVisible(screenId()) == uimachine()->isScreenVisibleHostDesires(screenId()))
         {
             /* Do not send a hint if nothing has changed to prevent the guest being notified about its own changes: */
@@ -797 +797 @@
                         (int)screenId(), size.width(), size.height()));
                 display().SetVideoModeHint(screenId(),
-                                           uisession()->isScreenVisible(screenId()),
+                                           uimachine()->isScreenVisible(screenId()),
                                            false /* change origin? */,
                                            0 /* origin x */,
@@ -810 +810 @@
         {
             /* If host desires to have guest-screen enabled and guest-screen is disabled, retrying: */
-            if (uisession()->isScreenVisibleHostDesires(screenId()))
+            if (uimachine()->isScreenVisibleHostDesires(screenId()))
             {
                 /* Send enabling size-hint to the guest: */
@@ -865 +865 @@
                     (int)screenId(), size.width(), size.height()));
             display().SetVideoModeHint(screenId(),
-                                       uisession()->isScreenVisible(screenId()),
+                                       uimachine()->isScreenVisible(screenId()),
                                        false /* change origin? */,
                                        0 /* origin x */,
@@ -896 +896 @@
 
     /* Update desirable screen status: */
-    uisession()->setScreenVisibleHostDesires(screenId(), fEnabled);
+    uimachine()->setScreenVisibleHostDesires(screenId(), fEnabled);
 
     /* Send enabling size-hint: */
@@ -917 +917 @@
             && (   frameBuffer()->width() != uWidth
                 || frameBuffer()->height() != uHeight
-                || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
+                || uimachine()->isScreenVisible(screenId()) != uimachine()->isScreenVisibleHostDesires(screenId())))
             setStoredGuestScreenSizeHint(QSize(uWidth, uHeight));
 
@@ -968 +968 @@
         && (   (int)frameBuffer()->width() != size.width()
             || (int)frameBuffer()->height() != size.height()
-            || uisession()->isScreenVisible(screenId()) != uisession()->isScreenVisibleHostDesires(screenId())))
+            || uimachine()->isScreenVisible(screenId()) != uimachine()->isScreenVisibleHostDesires(screenId())))
         setStoredGuestScreenSizeHint(size);
 
@@ -1479 +1479 @@
     frameBufferSize = scaledForward(frameBufferSize);
     /* Check against the last full-screen size. */
-    if (frameBufferSize == uisession()->lastFullScreenSize(screenId()) && m_sizeHintOverride.isValid())
+    if (frameBufferSize == uimachine()->lastFullScreenSize(screenId()) && m_sizeHintOverride.isValid())
         return m_sizeHintOverride;
 
@@ -1562 +1562 @@
 
     /* If machine-window is visible: */
-    if (uisession()->isScreenVisible(m_uScreenId))
+    if (uimachine()->isScreenVisible(m_uScreenId))
     {
         /* For 'scale' mode: */

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

@@ -37 +37 @@
 #include "UIFrameBuffer.h"
 #include "UISession.h"
+#include "UIMachine.h"
 #include "UIMessageCenter.h"
 #include "UIExtraDataManager.h"
@@ -139 +140 @@
             /* Then we have to disable excessive guest-screen: */
             LogRel(("GUI: UIMultiScreenLayout::update: Disabling excessive guest-screen %d\n", iGuestScreen));
-            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, false);
+            m_pMachineLogic->uimachine()->setScreenVisibleHostDesires(iGuestScreen, false);
             m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, false, false, 0, 0, 0, 0, 0, true);
         }
@@ -172 +173 @@
             LogRel(("GUI: UIMultiScreenLayout::update: Enabling guest-screen %d with following resolution: %dx%d\n",
                     iGuestScreen, uWidth, uHeight));
-            m_pMachineLogic->uisession()->setScreenVisibleHostDesires(iGuestScreen, true);
+            m_pMachineLogic->uimachine()->setScreenVisibleHostDesires(iGuestScreen, true);
             m_pMachineLogic->display().SetVideoModeHint(iGuestScreen, true, false, 0, 0, uWidth, uHeight, 32, true);
         }
@@ -277 +278 @@
     m_disabledGuestScreens.clear();
     for (uint iGuestScreen = 0; iGuestScreen < m_cGuestScreens; ++iGuestScreen)
-        if (m_pMachineLogic->uisession()->isScreenVisible(iGuestScreen))
+        if (m_pMachineLogic->uimachine()->isScreenVisible(iGuestScreen))
             m_guestScreens << iGuestScreen;
         else

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

@@ -30 +30 @@
 #include <QMenuBar>
 #include <QWidget>
-#ifdef VBOX_WS_MAC
-# include <QTimer>
-#endif
 #ifdef VBOX_WS_WIN
 # include <iprt/win/windows.h> /* Workaround for compile errors if included directly by QtWin. */
@@ -40 +37 @@
 /* GUI includes: */
 #include "UICommon.h"
-#include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
 #include "UISession.h"
@@ -55 +51 @@
 #include "UIFrameBuffer.h"
 #include "UISettingsDialogSpecific.h"
-#ifdef VBOX_WS_MAC
-# include "UICocoaApplication.h"
-# include "VBoxUtils-darwin.h"
-#endif
 #ifdef VBOX_GUI_WITH_KEYS_RESET_HANDLER
 # include "UIKeyboardHandler.h"
@@ -94 +86 @@
 #endif
 
-#ifdef VBOX_WS_MAC
-/**
- * MacOS X: Application Services: Core Graphics: Display reconfiguration callback.
- *
- * Notifies UISession about @a display configuration change.
- * Corresponding change described by Core Graphics @a flags.
- * Uses UISession @a pHandler to process this change.
- *
- * @note Last argument (@a pHandler) must always be valid pointer to UISession object.
- * @note Calls for UISession::sltHandleHostDisplayAboutToChange() slot if display configuration changed.
- */
-void cgDisplayReconfigurationCallback(CGDirectDisplayID display, CGDisplayChangeSummaryFlags flags, void *pHandler)
-{
-    /* Which flags we are handling? */
-    int iHandledFlags = kCGDisplayAddFlag     /* display added */
-                      | kCGDisplayRemoveFlag  /* display removed */
-                      | kCGDisplaySetModeFlag /* display mode changed */;
-
-    /* Handle 'display-add' case: */
-    if (flags & kCGDisplayAddFlag)
-        LogRelFlow(("GUI: UISession::cgDisplayReconfigurationCallback: Display added.\n"));
-    /* Handle 'display-remove' case: */
-    else if (flags & kCGDisplayRemoveFlag)
-        LogRelFlow(("GUI: UISession::cgDisplayReconfigurationCallback: Display removed.\n"));
-    /* Handle 'mode-set' case: */
-    else if (flags & kCGDisplaySetModeFlag)
-        LogRelFlow(("GUI: UISession::cgDisplayReconfigurationCallback: Display mode changed.\n"));
-
-    /* Ask handler to process our callback: */
-    if (flags & iHandledFlags)
-        QTimer::singleShot(0, static_cast<UISession*>(pHandler),
-                           SLOT(sltHandleHostDisplayAboutToChange()));
-
-    Q_UNUSED(display);
-}
-#endif /* VBOX_WS_MAC */
-
 /* static */
 bool UISession::create(UISession *&pSession, UIMachine *pMachine)
@@ -561 +516 @@
 }
 
-void UISession::sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo)
-{
-    /* Ignore KGuestMonitorChangedEventType_NewOrigin change event: */
-    if (changeType == KGuestMonitorChangedEventType_NewOrigin)
-        return;
-    /* Ignore KGuestMonitorChangedEventType_Disabled event for primary screen: */
-    AssertMsg(countOfVisibleWindows() > 0, ("All machine windows are hidden!"));
-    if (changeType == KGuestMonitorChangedEventType_Disabled && uScreenId == 0)
-        return;
-
-    /* Process KGuestMonitorChangedEventType_Enabled change event: */
-    if (   !isScreenVisible(uScreenId)
-        && changeType == KGuestMonitorChangedEventType_Enabled)
-        setScreenVisible(uScreenId, true);
-    /* Process KGuestMonitorChangedEventType_Disabled change event: */
-    else if (   isScreenVisible(uScreenId)
-             && changeType == KGuestMonitorChangedEventType_Disabled)
-        setScreenVisible(uScreenId, false);
-
-    /* Notify listeners about the change: */
-    emit sigGuestMonitorChange(changeType, uScreenId, screenGeo);
-}
-
 void UISession::sltHandleStorageDeviceChange(const CMediumAttachment &attachment, bool fRemoved, bool fSilent)
 {
@@ -612 +544 @@
     emit sigAudioAdapterChange();
 
-}
-
-#ifdef RT_OS_DARWIN
-/**
- * MacOS X: Restarts display-reconfiguration watchdog timer from the beginning.
- * @note Watchdog is trying to determine display reconfiguration in
- *       UISession::sltCheckIfHostDisplayChanged() slot every 500ms for 40 tries.
- */
-void UISession::sltHandleHostDisplayAboutToChange()
-{
-    LogRelFlow(("GUI: UISession::sltHandleHostDisplayAboutToChange()\n"));
-
-    if (m_pWatchdogDisplayChange->isActive())
-        m_pWatchdogDisplayChange->stop();
-    m_pWatchdogDisplayChange->setProperty("tryNumber", 1);
-    m_pWatchdogDisplayChange->start();
-}
-
-/**
- * MacOS X: Determines display reconfiguration.
- * @note Calls for UISession::sltHandleHostScreenCountChange() if screen count changed.
- * @note Calls for UISession::sltHandleHostScreenGeometryChange() if screen geometry changed.
- */
-void UISession::sltCheckIfHostDisplayChanged()
-{
-    LogRelFlow(("GUI: UISession::sltCheckIfHostDisplayChanged()\n"));
-
-    /* Check if display count changed: */
-    if (UIDesktopWidgetWatchdog::screenCount() != m_hostScreens.size())
-    {
-        /* Reset watchdog: */
-        m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
-        /* Notify listeners about screen-count changed: */
-        return sltHandleHostScreenCountChange();
-    }
-    else
-    {
-        /* Check if at least one display geometry changed: */
-        for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
-        {
-            if (gpDesktop->screenGeometry(iScreenIndex) != m_hostScreens.at(iScreenIndex))
-            {
-                /* Reset watchdog: */
-                m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
-                /* Notify listeners about screen-geometry changed: */
-                return sltHandleHostScreenGeometryChange();
-            }
-        }
-    }
-
-    /* Check if watchdog expired, restart if not: */
-    int cTryNumber = m_pWatchdogDisplayChange->property("tryNumber").toInt();
-    if (cTryNumber > 0 && cTryNumber < 40)
-    {
-        /* Restart watchdog again: */
-        m_pWatchdogDisplayChange->setProperty("tryNumber", ++cTryNumber);
-        m_pWatchdogDisplayChange->start();
-    }
-    else
-    {
-        /* Reset watchdog: */
-        m_pWatchdogDisplayChange->setProperty("tryNumber", 0);
-    }
-}
-#endif /* RT_OS_DARWIN */
-
-void UISession::sltHandleHostScreenCountChange()
-{
-    LogRelFlow(("GUI: UISession: Host-screen count changed.\n"));
-
-    /* Recache display data: */
-    updateHostScreenData();
-
-    /* Notify current machine-logic: */
-    emit sigHostScreenCountChange();
-}
-
-void UISession::sltHandleHostScreenGeometryChange()
-{
-    LogRelFlow(("GUI: UISession: Host-screen geometry changed.\n"));
-
-    /* Recache display data: */
-    updateHostScreenData();
-
-    /* Notify current machine-logic: */
-    emit sigHostScreenGeometryChange();
-}
-
-void UISession::sltHandleHostScreenAvailableAreaChange()
-{
-    LogRelFlow(("GUI: UISession: Host-screen available-area changed.\n"));
-
-    /* Notify current machine-logic: */
-    emit sigHostScreenAvailableAreaChange();
 }
 
@@ -795 +633 @@
     , m_machineStatePrevious(KMachineState_Null)
     , m_machineState(KMachineState_Null)
-#ifdef VBOX_WS_MAC
-    , m_pWatchdogDisplayChange(0)
-#endif /* VBOX_WS_MAC */
     , m_defaultCloseAction(MachineCloseAction_Invalid)
     , m_restrictedCloseActions(MachineCloseAction_Invalid)
@@ -835 +670 @@
     prepareActions();
     prepareConnections();
-    prepareScreens();
     prepareSignalHandling();
 
@@ -922 +756 @@
             this, &UISession::sigDnDModeChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigGuestMonitorChange,
-            this, &UISession::sltGuestMonitorChange);
+            this, &UISession::sigGuestMonitorChange);
     connect(m_pConsoleEventhandler, &UIConsoleEventHandler::sigMediumChange,
             this, &UISession::sigMediumChange);
@@ -1001 +835 @@
     /* UICommon connections: */
     connect(&uiCommon(), &UICommon::sigAskToDetachCOM, this, &UISession::sltDetachCOM);
-
-#ifdef VBOX_WS_MAC
-    /* Install native display reconfiguration callback: */
-    CGDisplayRegisterReconfigurationCallback(cgDisplayReconfigurationCallback, this);
-#else /* !VBOX_WS_MAC */
-    /* Install Qt display reconfiguration callbacks: */
-    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenCountChanged,
-            this, &UISession::sltHandleHostScreenCountChange);
-    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenResized,
-            this, &UISession::sltHandleHostScreenGeometryChange);
-# if defined(VBOX_WS_X11) && !defined(VBOX_GUI_WITH_CUSTOMIZATIONS1)
-    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaRecalculated,
-            this, &UISession::sltHandleHostScreenAvailableAreaChange);
-# else /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
-    connect(gpDesktop, &UIDesktopWidgetWatchdog::sigHostScreenWorkAreaResized,
-            this, &UISession::sltHandleHostScreenAvailableAreaChange);
-# endif /* !VBOX_WS_X11 || VBOX_GUI_WITH_CUSTOMIZATIONS1 */
-#endif /* !VBOX_WS_MAC */
-}
-
-void UISession::prepareScreens()
-{
-    /* Recache display data: */
-    updateHostScreenData();
-
-#ifdef VBOX_WS_MAC
-    /* Prepare display-change watchdog: */
-    m_pWatchdogDisplayChange = new QTimer(this);
-    {
-        m_pWatchdogDisplayChange->setInterval(500);
-        m_pWatchdogDisplayChange->setSingleShot(true);
-        connect(m_pWatchdogDisplayChange, &QTimer::timeout,
-                this, &UISession::sltCheckIfHostDisplayChanged);
-    }
-#endif /* VBOX_WS_MAC */
-
-    /* Prepare initial screen visibility status: */
-    m_monitorVisibilityVector.resize(machine().GetGraphicsAdapter().GetMonitorCount());
-    m_monitorVisibilityVector.fill(false);
-    m_monitorVisibilityVector[0] = true;
-
-    /* Prepare empty last full-screen size vector: */
-    m_monitorLastFullScreenSizeVector.resize(machine().GetGraphicsAdapter().GetMonitorCount());
-    m_monitorLastFullScreenSizeVector.fill(QSize(-1, -1));
-
-    /* If machine is in 'saved' state: */
-    if (isSaved())
-    {
-        /* Update screen visibility status from saved-state: */
-        for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
-        {
-            BOOL fEnabled = true;
-            ULONG uGuestOriginX = 0, uGuestOriginY = 0, uGuestWidth = 0, uGuestHeight = 0;
-            machine().QuerySavedGuestScreenInfo(iScreenIndex,
-                                                uGuestOriginX, uGuestOriginY,
-                                                uGuestWidth, uGuestHeight, fEnabled);
-            m_monitorVisibilityVector[iScreenIndex] = fEnabled;
-        }
-        /* And make sure at least one of them is visible (primary if others are hidden): */
-        if (countOfVisibleWindows() < 1)
-            m_monitorVisibilityVector[0] = true;
-    }
-    else if (uiCommon().isSeparateProcess())
-    {
-        /* Update screen visibility status from display directly: */
-        for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
-        {
-            KGuestMonitorStatus enmStatus = KGuestMonitorStatus_Disabled;
-            ULONG uGuestWidth = 0, uGuestHeight = 0, uBpp = 0;
-            LONG iGuestOriginX = 0, iGuestOriginY = 0;
-            display().GetScreenResolution(iScreenIndex,
-                                          uGuestWidth, uGuestHeight, uBpp,
-                                          iGuestOriginX, iGuestOriginY, enmStatus);
-            m_monitorVisibilityVector[iScreenIndex] = (   enmStatus == KGuestMonitorStatus_Enabled
-                                                       || enmStatus == KGuestMonitorStatus_Blank);
-        }
-        /* And make sure at least one of them is visible (primary if others are hidden): */
-        if (countOfVisibleWindows() < 1)
-            m_monitorVisibilityVector[0] = true;
-    }
-
-    /* Prepare initial screen visibility status of host-desires (same as facts): */
-    m_monitorVisibilityVectorHostDesires.resize(machine().GetGraphicsAdapter().GetMonitorCount());
-    for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
-        m_monitorVisibilityVectorHostDesires[iScreenIndex] = m_monitorVisibilityVector[iScreenIndex];
-
-    /* Make sure action-pool knows guest-screen visibility status: */
-    for (int iScreenIndex = 0; iScreenIndex < m_monitorVisibilityVector.size(); ++iScreenIndex)
-        actionPool()->toRuntime()->setGuestScreenVisible(iScreenIndex, m_monitorVisibilityVector.at(iScreenIndex));
 }
 
@@ -1174 +919 @@
 }
 
-void UISession::cleanupConnections()
-{
-#ifdef VBOX_WS_MAC
-    /* Remove display reconfiguration callback: */
-    CGDisplayRemoveReconfigurationCallback(cgDisplayReconfigurationCallback, this);
-#endif /* VBOX_WS_MAC */
-}
-
 void UISession::cleanupActions()
 {
@@ -1273 +1010 @@
     //cleanupSignalHandling();
     //cleanupScreens();
-    cleanupConnections();
+    //cleanupConnections();
     cleanupActions();
 }
@@ -1482 +1219 @@
 }
 
-bool UISession::isScreenVisibleHostDesires(ulong uScreenId) const
-{
-    /* Make sure index feats the bounds: */
-    AssertReturn(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size(), false);
-
-    /* Return 'actual' (host-desire) visibility status: */
-    return m_monitorVisibilityVectorHostDesires.value((int)uScreenId);
-}
-
-void UISession::setScreenVisibleHostDesires(ulong uScreenId, bool fIsMonitorVisible)
-{
-    /* Make sure index feats the bounds: */
-    AssertReturnVoid(uScreenId < (ulong)m_monitorVisibilityVectorHostDesires.size());
-
-    /* Remember 'actual' (host-desire) visibility status: */
-    m_monitorVisibilityVectorHostDesires[(int)uScreenId] = fIsMonitorVisible;
-
-    /* And remember the request in extra data for guests with VMSVGA: */
-    /* This should be done before the actual hint is sent in case the guest overrides it. */
-    gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
-}
-
-bool UISession::isScreenVisible(ulong uScreenId) const
-{
-    /* Make sure index feats the bounds: */
-    AssertReturn(uScreenId < (ulong)m_monitorVisibilityVector.size(), false);
-
-    /* Return 'actual' visibility status: */
-    return m_monitorVisibilityVector.value((int)uScreenId);
-}
-
-void UISession::setScreenVisible(ulong uScreenId, bool fIsMonitorVisible)
-{
-    /* Make sure index feats the bounds: */
-    AssertReturnVoid(uScreenId < (ulong)m_monitorVisibilityVector.size());
-
-    /* Remember 'actual' visibility status: */
-    m_monitorVisibilityVector[(int)uScreenId] = fIsMonitorVisible;
-    /* Remember 'desired' visibility status: */
-    /* See note in UIMachineView::sltHandleNotifyChange() regarding the graphics controller check. */
-    if (machine().GetGraphicsAdapter().GetGraphicsControllerType() != KGraphicsControllerType_VMSVGA)
-        gEDataManager->setLastGuestScreenVisibilityStatus(uScreenId, fIsMonitorVisible, uiCommon().managedVMUuid());
-
-    /* Make sure action-pool knows guest-screen visibility status: */
-    actionPool()->toRuntime()->setGuestScreenVisible(uScreenId, fIsMonitorVisible);
-}
-
-QSize UISession::lastFullScreenSize(ulong uScreenId) const
-{
-    /* Make sure index fits the bounds: */
-    AssertReturn(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size(), QSize(-1, -1));
-
-    /* Return last full-screen size: */
-    return m_monitorLastFullScreenSizeVector.value((int)uScreenId);
-}
-
-void UISession::setLastFullScreenSize(ulong uScreenId, QSize size)
-{
-    /* Make sure index fits the bounds: */
-    AssertReturnVoid(uScreenId < (ulong)m_monitorLastFullScreenSizeVector.size());
-
-    /* Remember last full-screen size: */
-    m_monitorLastFullScreenSizeVector[(int)uScreenId] = size;
-}
-
-int UISession::countOfVisibleWindows()
-{
-    int cCountOfVisibleWindows = 0;
-    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
-        if (m_monitorVisibilityVector[i])
-            ++cCountOfVisibleWindows;
-    return cCountOfVisibleWindows;
-}
-
-QList<int> UISession::listOfVisibleWindows() const
-{
-    QList<int> visibleWindows;
-    for (int i = 0; i < m_monitorVisibilityVector.size(); ++i)
-        if (m_monitorVisibilityVector.at(i))
-            visibleWindows.push_back(i);
-    return visibleWindows;
-}
-
 CMediumVector UISession::machineMedia() const
 {
@@ -1614 +1268 @@
 }
 
-void UISession::updateHostScreenData()
-{
-    /* Rebuild host-screen data vector: */
-    m_hostScreens.clear();
-    for (int iScreenIndex = 0; iScreenIndex < UIDesktopWidgetWatchdog::screenCount(); ++iScreenIndex)
-        m_hostScreens << gpDesktop->screenGeometry(iScreenIndex);
-
-    /* Make sure action-pool knows host-screen count: */
-    actionPool()->toRuntime()->setHostScreenCount(m_hostScreens.size());
-}
-
 void UISession::updateActionRestrictions()
 {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/UISession.h

@@ -134 +134 @@
     void sigCursorPositionChange(bool fContainsData, unsigned long uX, unsigned long uY);
 
-    /** Notifies about host-screen count change. */
-    void sigHostScreenCountChange();
-    /** Notifies about host-screen geometry change. */
-    void sigHostScreenGeometryChange();
-    /** Notifies about host-screen available-area change. */
-    void sigHostScreenAvailableAreaChange();
-
     /** Notifies about frame-buffer resize. */
     void sigFrameBufferResize();
@@ -191 +184 @@
     WId mainMachineWindowId() const;
     UIMachineWindow *activeMachineWindow() const;
-
-    /** @name Host-screen configuration variables.
-     ** @{ */
-    /** Returns the list of host-screen geometries we currently have. */
-    QList<QRect> hostScreens() const { return m_hostScreens; }
-    /** @} */
 
     /** @name Application Close configuration stuff.
@@ -262 +249 @@
     void forgetPreviousMachineState() { m_machineStatePrevious = m_machineState; }
 
-    /* Screen visibility status for host-desires: */
-    bool isScreenVisibleHostDesires(ulong uScreenId) const;
-    void setScreenVisibleHostDesires(ulong uScreenId, bool fIsMonitorVisible);
-
-    /* Screen visibility status: */
-    bool isScreenVisible(ulong uScreenId) const;
-    void setScreenVisible(ulong uScreenId, bool fIsMonitorVisible);
-
-    /* Last screen full-screen size: */
-    QSize lastFullScreenSize(ulong uScreenId) const;
-    void setLastFullScreenSize(ulong uScreenId, QSize size);
-
     /** Returns whether guest-screen is undrawable.
      *  @todo: extend this method to all the states when guest-screen is undrawable. */
@@ -310 +285 @@
     KParavirtProvider paraVirtProvider() const { return m_paraVirtProvider; }
 
-    /** Returns the list of visible guest windows. */
-    QList<int> listOfVisibleWindows() const;
-
     /** Returns a vector of media attached to the machine. */
     CMediumVector machineMedia() const;
@@ -343 +315 @@
     void sltVRDEChange();
     void sltRecordingChange();
-    void sltGuestMonitorChange(KGuestMonitorChangedEventType changeType, ulong uScreenId, QRect screenGeo);
     /** Handles storage device change for @a attachment, which was @a fRemoved and it was @a fSilent for guest. */
     void sltHandleStorageDeviceChange(const CMediumAttachment &attachment, bool fRemoved, bool fSilent);
     /** Handles audio adapter change. */
     void sltAudioAdapterChange();
-
-    /* Handlers: Display reconfiguration stuff: */
-#ifdef RT_OS_DARWIN
-    void sltHandleHostDisplayAboutToChange();
-    void sltCheckIfHostDisplayChanged();
-#endif /* RT_OS_DARWIN */
-
-    /** Handles host-screen count change. */
-    void sltHandleHostScreenCountChange();
-    /** Handles host-screen geometry change. */
-    void sltHandleHostScreenGeometryChange();
-    /** Handles host-screen available-area change. */
-    void sltHandleHostScreenAvailableAreaChange();
 
     /** Handles signal about machine state saved.
@@ -391 +349 @@
     void prepareActions();
     void prepareConnections();
-    void prepareScreens();
     void prepareSignalHandling();
 
@@ -398 +355 @@
 
     /* Cleanup helpers: */
-    //void cleanupSignalHandling();
+    //void cleanupSignalHandling() {}
     //void cleanupScreens() {}
-    void cleanupConnections();
+    //void cleanupConnections() {}
     void cleanupActions();
     void cleanupFramebuffers();
@@ -417 +374 @@
     bool mountAdHocImage(KDeviceType enmDeviceType, UIMediumDeviceType enmMediumType, const QString &strMediumName);
     bool postprocessInitialization();
-    int countOfVisibleWindows();
     /** Loads VM settings. */
     void loadVMSettings();
-
-    /** Update host-screen data. */
-    void updateHostScreenData();
 
     /** Updates action restrictions. */
@@ -461 +414 @@
 #endif /* VBOX_WS_MAC */
 
-    /* Screen visibility vector: */
-    QVector<bool> m_monitorVisibilityVector;
-
-    /* Screen visibility vector for host-desires: */
-    QVector<bool> m_monitorVisibilityVectorHostDesires;
-
-    /* Screen last full-screen size vector: */
-    QVector<QSize> m_monitorLastFullScreenSizeVector;
-
     /* Frame-buffers vector: */
     QVector<UIFrameBuffer*> m_frameBufferVector;
@@ -476 +420 @@
     KMachineState m_machineStatePrevious;
     KMachineState m_machineState;
-
-    /** @name Host-screen configuration variables.
-     * @{ */
-    /** Holds the list of host-screen geometries we currently have. */
-    QList<QRect> m_hostScreens;
-#ifdef VBOX_WS_MAC
-    /** Mac OS X: Watchdog timer looking for display reconfiguration. */
-    QTimer *m_pWatchdogDisplayChange;
-#endif /* VBOX_WS_MAC */
-    /** @} */
 
     /** @name Application Close configuration variables.

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineLogicFullscreen.cpp

@@ -747 +747 @@
              * 1. should really be shown and
              * 2. is mapped to some host-screen: */
-            if (   uisession()->isScreenVisible(uScreenID)
+            if (   uimachine()->isScreenVisible(uScreenID)
                 && hasHostScreenForGuestScreen(uScreenID))
             {
@@ -783 +783 @@
              * 2. isn't mapped to some host-screen or
              * 3. should be located on another host-screen than currently. */
-            if (   !uisession()->isScreenVisible(uScreenID)
+            if (   !uimachine()->isScreenVisible(uScreenID)
                 || !hasHostScreenForGuestScreen(uScreenID)
                 || iWantedHostScreenIndex != iCurrentHostScreenIndex)

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineViewFullscreen.cpp

@@ -136 +136 @@
 {
     /* Step 1: Is guest-screen visible? */
-    if (!uisession()->isScreenVisible(screenId()))
+    if (!uimachine()->isScreenVisible(screenId()))
     {
         LogRel(("GUI: UIMachineViewFullscreen::adjustGuestScreenSize: "
@@ -172 +172 @@
     sltPerformGuestResize(sizeToApply);
     /* And remember the size to know what we are resizing out of when we exit: */
-    uisession()->setLastFullScreenSize(screenId(), scaledForward(desiredSizeHint));
+    uimachine()->setLastFullScreenSize(screenId(), scaledForward(desiredSizeHint));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/fullscreen/UIMachineWindowFullscreen.cpp

@@ -34 +34 @@
 
 /* GUI includes: */
+#include "UIActionPoolRuntime.h"
 #include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
-#include "UISession.h"
-#include "UIActionPoolRuntime.h"
+#include "UIMachine.h"
+#include "UIMachineView.h"
 #include "UIMachineLogicFullscreen.h"
 #include "UIMachineWindowFullscreen.h"
-#include "UIMachineView.h"
 #include "UINotificationCenter.h"
+#include "UISession.h"
 #if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 # include "UIMachineDefs.h"
@@ -183 +184 @@
 
     /* Make sure this window should be shown and mapped to host-screen: */
-    if (!uisession()->isScreenVisible(m_uScreenId) ||
+    if (!uimachine()->isScreenVisible(m_uScreenId) ||
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
         return;
@@ -432 +433 @@
 
     /* If window shouldn't be shown or mapped to some host-screen: */
-    if (!uisession()->isScreenVisible(m_uScreenId) ||
+    if (!uimachine()->isScreenVisible(m_uScreenId) ||
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
@@ -460 +461 @@
 
     /* If window shouldn't be shown or mapped to some host-screen: */
-    if (!uisession()->isScreenVisible(m_uScreenId) ||
+    if (!uimachine()->isScreenVisible(m_uScreenId) ||
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {
@@ -503 +504 @@
 
     /* If window shouldn't be shown or mapped to some host-screen: */
-    if (!uisession()->isScreenVisible(m_uScreenId) ||
+    if (!uimachine()->isScreenVisible(m_uScreenId) ||
         !pFullscreenLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineViewNormal.cpp

@@ -173 +173 @@
      * hardware as before shutdown), and notifying would interfere with the Windows
      * guest driver which saves the video mode to the registry on shutdown. */
-    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
+    uimachine()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),

trunk/src/VBox/Frontends/VirtualBox/src/runtime/normal/UIMachineWindowNormal.cpp

@@ -618 +618 @@
 {
     /* Make sure this window should be shown at all: */
-    if (!uisession()->isScreenVisible(m_uScreenId))
+    if (!uimachine()->isScreenVisible(m_uScreenId))
         return hide();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineViewScale.cpp

@@ -32 +32 @@
 /* GUI includes */
 #include "UICommon.h"
+#include "UIDesktopWidgetWatchdog.h"
+#include "UIExtraDataManager.h"
+#include "UIFrameBuffer.h"
+#include "UIMachine.h"
+#include "UIMachineLogic.h"
+#include "UIMachineViewScale.h"
+#include "UIMachineWindow.h"
 #include "UISession.h"
-#include "UIMachineLogic.h"
-#include "UIMachineWindow.h"
-#include "UIMachineViewScale.h"
-#include "UIFrameBuffer.h"
-#include "UIExtraDataManager.h"
-#include "UIDesktopWidgetWatchdog.h"
 
 /* COM includes: */
@@ -175 +176 @@
 
     /* Send saved size-hint to the guest: */
-    uisession()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
+    uimachine()->setScreenVisibleHostDesires(screenId(), guestScreenVisibilityStatus());
     display().SetVideoModeHint(screenId(),
                                guestScreenVisibilityStatus(),

trunk/src/VBox/Frontends/VirtualBox/src/runtime/scale/UIMachineWindowScale.cpp

@@ -39 +39 @@
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
-#include "UISession.h"
+#include "UIMachine.h"
 #include "UIMachineLogic.h"
 #include "UIMachineWindowScale.h"
 #include "UIMachineView.h"
 #include "UINotificationCenter.h"
+#include "UISession.h"
 #ifdef VBOX_WS_MAC
 # include "VBoxUtils.h"
@@ -166 +167 @@
 {
     /* Make sure this window should be shown at all: */
-    if (!uisession()->isScreenVisible(m_uScreenId))
+    if (!uimachine()->isScreenVisible(m_uScreenId))
         return hide();
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineViewSeamless.cpp

@@ -149 +149 @@
 {
     /* Step 1: Is guest-screen visible? */
-    if (!uisession()->isScreenVisible(screenId()))
+    if (!uimachine()->isScreenVisible(screenId()))
     {
         LogRel(("GUI: UIMachineViewSeamless::adjustGuestScreenSize: "
@@ -177 +177 @@
     sltPerformGuestResize(sizeToApply);
     /* And remember the size to know what we are resizing out of when we exit: */
-    uisession()->setLastFullScreenSize(screenId(), scaledForward(desiredSizeHint));
+    uimachine()->setLastFullScreenSize(screenId(), scaledForward(desiredSizeHint));
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/runtime/seamless/UIMachineWindowSeamless.cpp

@@ -32 +32 @@
 
 /* GUI includes: */
+#include "UIActionPoolRuntime.h"
 #include "UICommon.h"
 #include "UIDesktopWidgetWatchdog.h"
 #include "UIExtraDataManager.h"
+#include "UIMachine.h"
+#include "UIMachineLogicSeamless.h"
+#include "UIMachineView.h"
+#include "UIMachineWindowSeamless.h"
 #include "UISession.h"
-#include "UIActionPoolRuntime.h"
-#include "UIMachineLogicSeamless.h"
-#include "UIMachineWindowSeamless.h"
-#include "UIMachineView.h"
 #if   defined(VBOX_WS_WIN) || defined(VBOX_WS_X11)
 # include "UIMachineDefs.h"
@@ -250 +251 @@
 
     /* If window shouldn't be shown or mapped to some host-screen: */
-    if (!uisession()->isScreenVisible(m_uScreenId) ||
+    if (!uimachine()->isScreenVisible(m_uScreenId) ||
         !pSeamlessLogic->hasHostScreenForGuestScreen(m_uScreenId))
     {

@@ -19 +19 @@
 /branches/dsen/gui2:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3:79645-79692
-/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288
 /trunk/src:92342,154921

@@ -19 +19 @@
 /branches/dsen/gui2/src/VBox:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox:79645-79692
-/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288

@@ -16 +16 @@
 /branches/dsen/gui2/src/VBox/Frontends:79224,79228,79233,79235,79258,79262-79263,79273,79341,79345,79354,79357,79387-79388,79559-79569,79572-79573,79578,79581-79582,79590-79591,79598-79599,79602-79603,79605-79606,79632,79635,79637,79644
 /branches/dsen/gui3/src/VBox/Frontends:79645-79692
-/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285
+/branches/dsen/gui4/src/VBox/Frontends:155183-155185,155187,155198,155200-155201,155205,155228,155235,155243,155248,155282,155285,155287-155288