Changeset 58382 in vbox

Timestamp:

Oct 22, 2015 5:18:37 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: 7909: Mac OS X: Runtime UI: Extra-Data Manager: Adding extra-data config setting for showing/hiding guest-os overlay in application dock icon.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• platform/darwin/UIAbstractDockIconPreview.cpp (modified) (3 diffs)
• runtime/UIMachineLogic.cpp (modified) (2 diffs)
• runtime/UIMachineLogic.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.cpp

@@ -136 +136 @@
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";
+const char* UIExtraDataDefs::GUI_DockIconOverlayEnabled = "GUI/DockIconOverlayEnabled";
 #endif /* Q_WS_MAC */
 const char* UIExtraDataDefs::GUI_PassCAD = "GUI/PassCAD";

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataDefs.h

@@ -235 +235 @@
         /** Mac OS X: Holds guest-screen which Dock icon should reflect at runtime. */
         extern const char* GUI_RealtimeDockIconUpdateMonitor;
+        /** Mac OS X: Holds whether Dock icon should have guest-os overlay. */
+        extern const char* GUI_DockIconOverlayEnabled;
 #endif /* Q_WS_MAC */
         /** Holds whether machine should pass CAD to guest. */

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.cpp

@@ -1874 +1874 @@
            << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
 #ifdef Q_WS_MAC
-           << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor
+           << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor << GUI_DockIconOverlayEnabled
 #endif /* Q_WS_MAC */
            << GUI_PassCAD
@@ -3430 +3430 @@
     setExtraDataString(GUI_RealtimeDockIconUpdateMonitor, iIndex ? QString::number(iIndex) : QString(), strID);
 }
+
+bool UIExtraDataManager::dockIconOverlayEnabled(const QString &strID)
+{
+    /* 'True' unless feature restricted: */
+    return !isFeatureRestricted(GUI_DockIconOverlayEnabled, strID);
+}
+
+void UIExtraDataManager::setdockIconOverlayEnabled(bool fEnabled, const QString &strID)
+{
+    /* 'False' if feature restricted, 'True' otherwise: */
+    setExtraDataString(GUI_DockIconOverlayEnabled, toFeatureRestricted(!fEnabled), strID);
+}
 #endif /* Q_WS_MAC */
 
@@ -3810 +3822 @@
 #ifdef Q_WS_MAC
             /* 'Dock icon' appearance changed (allowed if not restricted)? */
-            else if (   strKey == GUI_RealtimeDockIconUpdateEnabled
-                     || strKey == GUI_RealtimeDockIconUpdateMonitor)
+            else if (strKey == GUI_RealtimeDockIconUpdateEnabled ||
+                     strKey == GUI_RealtimeDockIconUpdateMonitor)
                 emit sigDockIconAppearanceChange(!isFeatureRestricted(strKey, strMachineID));
+            /* 'Dock icon overlay' appearance changed (allowed if not restricted)? */
+            else if (strKey == GUI_DockIconOverlayEnabled)
+                emit sigDockIconOverlayAppearanceChange(!isFeatureRestricted(strKey, strMachineID));
 #endif /* Q_WS_MAC */
         }

trunk/src/VBox/Frontends/VirtualBox/src/extradata/UIExtraDataManager.h

@@ -92 +92 @@
     /** Mac OS X: Notifies about 'dock icon' appearance change. */
     void sigDockIconAppearanceChange(bool fEnabled);
+    /** Mac OS X: Notifies about 'dock icon overlay' appearance change. */
+    void sigDockIconOverlayAppearanceChange(bool fEnabled);
 #endif /* RT_OS_DARWIN */
 
@@ -460 +462 @@
         /** Mac OS X: Defines guest-screen @a iIndex which Dock icon should reflect at runtime. */
         void setRealtimeDockIconUpdateMonitor(int iIndex, const QString &strID);
+
+        /** Mac OS X: Returns whether Dock icon overlay is enabled. */
+        bool dockIconOverlayEnabled(const QString &strID);
+        /** Mac OS X: Defines whether Dock icon overlay @a fEnabled. */
+        void setdockIconOverlayEnabled(bool fEnabled, const QString &strID);
 #endif /* Q_WS_MAC */
 

trunk/src/VBox/Frontends/VirtualBox/src/platform/darwin/UIAbstractDockIconPreview.cpp

@@ -5 +5 @@
 
 /*
- * Copyright (C) 2009-2010 Oracle Corporation
+ * Copyright (C) 2009-2015 Oracle Corporation
  *
  * This file is part of VirtualBox Open Source Edition (OSE), as
@@ -25 +25 @@
 /* GUI includes: */
 # include "UIAbstractDockIconPreview.h"
+# include "UIConverter.h"
+# include "UIExtraDataManager.h"
 # include "UIFrameBuffer.h"
 # include "UIMachineLogic.h"
 # include "UIMachineView.h"
-# include "UIConverter.h"
 # include "UISession.h"
+# include "VBoxGlobal.h"
 
 /* COM includes: */
@@ -160 +162 @@
 void UIAbstractDockIconPreviewHelper::drawOverlayIcons(CGContextRef context)
 {
-    CGRect overlayRect = CGRectMake(0, 0, 0, 0);
-    /* The overlay image at bottom/right */
-    if (m_overlayImage)
+    /* Determine whether dock icon overlay enabled: */
+    if (gEDataManager->dockIconOverlayEnabled(vboxGlobal().managedVMUuid()))
     {
-        overlayRect = CGRectMake(m_dockIconRect.size.width - CGImageGetWidth(m_overlayImage),
-                                 m_dockIconRect.size.height - CGImageGetHeight(m_overlayImage),
-                                 CGImageGetWidth(m_overlayImage),
-                                 CGImageGetHeight(m_overlayImage));
-        CGContextDrawImage(context, flipRect(overlayRect), m_overlayImage);
-    }
-    CGImageRef sImage = stateImage();
-    /* The state image at bottom/right */
-    if (sImage)
-    {
-        CGRect stateRect = CGRectMake(overlayRect.origin.x - CGImageGetWidth(sImage) / 2.0,
-                                      overlayRect.origin.y - CGImageGetHeight(sImage) / 2.0,
-                                      CGImageGetWidth(sImage),
-                                      CGImageGetHeight(sImage));
-        CGContextDrawImage(context, flipRect(stateRect), sImage);
+        /* Initialize overlayrect: */
+        CGRect overlayRect = CGRectMake(0, 0, 0, 0);
+        /* Make sure overlay image is valid: */
+        if (m_overlayImage)
+        {
+            /* Draw overlay image at bottom-right of dock icon: */
+            overlayRect = CGRectMake(m_dockIconRect.size.width - CGImageGetWidth(m_overlayImage),
+                                     m_dockIconRect.size.height - CGImageGetHeight(m_overlayImage),
+                                     CGImageGetWidth(m_overlayImage),
+                                     CGImageGetHeight(m_overlayImage));
+            CGContextDrawImage(context, flipRect(overlayRect), m_overlayImage);
+        }
+
+        /* Determine correct state-overlay image: */
+        CGImageRef sImage = stateImage();
+        /* Make sure state-overlay image is valid: */
+        if (sImage)
+        {
+            /* Draw state overlay image at top-left of guest-os overlay image: */
+            CGRect stateRect = CGRectMake(overlayRect.origin.x - CGImageGetWidth(sImage) / 2.0,
+                                          overlayRect.origin.y - CGImageGetHeight(sImage) / 2.0,
+                                          CGImageGetWidth(sImage),
+                                          CGImageGetHeight(sImage));
+            CGContextDrawImage(context, flipRect(stateRect), sImage);
+        }
     }
 }

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

@@ -1193 +1193 @@
     connect(gEDataManager, SIGNAL(sigDockIconAppearanceChange(bool)),
             this, SLOT(sltChangeDockIconUpdate(bool)));
+    connect(gEDataManager, SIGNAL(sigDockIconOverlayAppearanceChange(bool)),
+            this, SLOT(sltChangeDockIconOverlayAppearance(bool)));
 
     /* Monitor selection if there are more than one monitor */
@@ -2128 +2130 @@
     }
 }
+
+void UIMachineLogic::sltChangeDockIconOverlayAppearance(bool fEnabled)
+{
+    /* Value of flag is directly referenced from extra-data manager later: */
+    Q_UNUSED(fEnabled);
+    /* Update dock icon overlay: */
+    if (isMachineWindowsCreated())
+        updateDockOverlay();
+}
 #endif /* Q_WS_MAC */
 

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

@@ -311 +311 @@
     void sltDockPreviewMonitorChanged(QAction *pAction);
     void sltChangeDockIconUpdate(bool fEnabled);
+    void sltChangeDockIconOverlayAppearance(bool fEnabled);
 #endif /* RT_OS_DARWIN */