Changeset 55346 in vbox for trunk/src/VBox

Timestamp:

Apr 20, 2015 5:27:35 PM (10 years ago)

Author:

vboxsync

Message:

FE/Qt: Mac OS X: Cleanup: No forced presentation-mode for native full-screen.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• VBoxGlobalSettings.cpp (modified) (4 diffs)
• VBoxGlobalSettings.h (modified) (3 diffs)
• extradata/UIExtraDataDefs.cpp (modified) (1 diff)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• extradata/UIExtraDataManager.cpp (modified) (3 diffs)
• extradata/UIExtraDataManager.h (modified) (2 diffs)
• runtime/UIMultiScreenLayout.cpp (modified) (1 diff)
• runtime/UIMultiScreenLayout.h (modified) (1 diff)
• runtime/fullscreen/UIMachineLogicFullscreen.cpp (modified) (7 diffs)
• runtime/fullscreen/UIMachineLogicFullscreen.h (modified) (3 diffs)
• settings/global/UIGlobalSettingsGeneral.cpp (modified) (6 diffs)
• settings/global/UIGlobalSettingsGeneral.h (modified) (1 diff)
• settings/global/UIGlobalSettingsGeneral.ui (modified) (3 diffs)

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

@@ -67 +67 @@
     remapScancodes = QString::null;
     proxySettings = QString::null;
-    presentationModeEnabled = false;
     hostScreenSaverDisabled = false;
 }
@@ -80 +79 @@
     remapScancodes = that.remapScancodes;
     proxySettings = that.proxySettings;
-    presentationModeEnabled = that.presentationModeEnabled;
     hostScreenSaverDisabled = that.hostScreenSaverDisabled;
 }
@@ -98 +96 @@
          remapScancodes == that.remapScancodes &&
          proxySettings == that.proxySettings &&
-         presentationModeEnabled == that.presentationModeEnabled &&
          hostScreenSaverDisabled == that.hostScreenSaverDisabled
         );
@@ -128 +125 @@
     { "GUI/RemapScancodes",                        "remapScancodes",          "(\\d+=\\d+,)*\\d+=\\d+", true },
     { "GUI/ProxySettings",                         "proxySettings",           "[\\s\\S]*", true },
-#ifdef Q_WS_MAC
-    { GUI_PresentationModeEnabled,                 "presentationModeEnabled", "true|false", true },
-#endif /* Q_WS_MAC */
     { "GUI/HostScreenSaverDisabled",               "hostScreenSaverDisabled", "true|false", true }
 };

trunk/src/VBox/Frontends/VirtualBox/src/VBoxGlobalSettings.h

@@ -43 +43 @@
     QString remapScancodes;
     QString proxySettings;
-    bool presentationModeEnabled;
     bool hostScreenSaverDisabled;
 
@@ -61 +60 @@
     Q_PROPERTY (QString remapScancodes READ remapScancodes WRITE setRemapScancodes)
     Q_PROPERTY (QString proxySettings READ proxySettings WRITE setProxySettings)
-    Q_PROPERTY (bool presentationModeEnabled READ presentationModeEnabled WRITE setPresentationModeEnabled)
     Q_PROPERTY (bool hostScreenSaverDisabled READ hostScreenSaverDisabled WRITE setHostScreenSaverDisabled)
 
@@ -118 +116 @@
     }
 
-    bool presentationModeEnabled() const { return data()->presentationModeEnabled; }
-    void setPresentationModeEnabled (bool enabled)
-    {
-        mData()->presentationModeEnabled = enabled;
-    }
-
     bool hostScreenSaverDisabled() const { return data()->hostScreenSaverDisabled; }
     void setHostScreenSaverDisabled (bool disabled)

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

@@ -134 +134 @@
 const char* UIExtraDataDefs::GUI_StatusBar_IndicatorOrder = "GUI/StatusBar/IndicatorOrder";
 #ifdef Q_WS_MAC
-const char* UIExtraDataDefs::GUI_PresentationModeEnabled = "GUI/PresentationModeEnabled";
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateEnabled = "GUI/RealtimeDockIconUpdateEnabled";
 const char* UIExtraDataDefs::GUI_RealtimeDockIconUpdateMonitor = "GUI/RealtimeDockIconUpdateMonitor";

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

@@ -230 +230 @@
         extern const char* GUI_StatusBar_IndicatorOrder;
 #ifdef Q_WS_MAC
-        /** Mac OS X: Holds whether 'presentation mode' enabled. */
-        extern const char* GUI_PresentationModeEnabled;
         /** Mac OS X: Holds whether Dock icon should be updated at runtime. */
         extern const char* GUI_RealtimeDockIconUpdateEnabled;

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

@@ -1791 +1791 @@
            << GUI_StatusBar_Enabled << GUI_RestrictedStatusBarIndicators << GUI_StatusBar_IndicatorOrder
 #ifdef Q_WS_MAC
-           << GUI_PresentationModeEnabled
            << GUI_RealtimeDockIconUpdateEnabled << GUI_RealtimeDockIconUpdateMonitor
 #endif /* Q_WS_MAC */
@@ -3320 +3319 @@
 
 #ifdef Q_WS_MAC
-bool UIExtraDataManager::presentationModeEnabled(const QString &strID)
-{
-    /* 'False' unless feature allowed: */
-    return isFeatureAllowed(GUI_PresentationModeEnabled, strID);
-}
-
 bool UIExtraDataManager::realtimeDockIconUpdateEnabled(const QString &strID)
 {
@@ -3647 +3640 @@
             else if (strKey == GUI_Input_MachineShortcuts)
                 emit sigRuntimeUIShortcutChange();
-#ifdef Q_WS_MAC
-            /* 'Presentation mode' status changed (allowed if not restricted)? */
-            else if (strKey == GUI_PresentationModeEnabled)
-                emit sigPresentationModeChange(!isFeatureRestricted(strKey));
-#endif /* Q_WS_MAC */
         }
     }

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

@@ -86 +86 @@
 
 #ifdef RT_OS_DARWIN
-    /** Mac OS X: Notifies about 'presentation mode' status change. */
-    void sigPresentationModeChange(bool fEnabled);
     /** Mac OS X: Notifies about 'dock icon' appearance change. */
     void sigDockIconAppearanceChange(bool fEnabled);
@@ -448 +446 @@
 
 #ifdef Q_WS_MAC
-        /** Mac OS X: Returns whether 'presentation mode' enabled. */
-        bool presentationModeEnabled(const QString &strID);
-
         /** Mac OS X: Returns whether Dock icon should be updated at runtime. */
         bool realtimeDockIconUpdateEnabled(const QString &strID);

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

@@ -212 +212 @@
 }
 
-bool UIMultiScreenLayout::isHostTaskbarCovert() const
-{
-    /* Check for all screens which are in use if they have some
-     * taskbar/menubar/dock on it. Its done by comparing the available with the
-     * screen geometry. Only if they are the same for all screens, there are no
-     * host area covert. This is a little bit ugly, but there seems no other
-     * way to find out if we are on a screen where the taskbar/dock or whatever
-     * is present. */
-    QDesktopWidget *pDW = QApplication::desktop();
-    for (int i = 0; i < m_screenMap.size(); ++i)
-    {
-        int hostScreen = m_screenMap.value(i);
-        if (pDW->availableGeometry(hostScreen) != pDW->screenGeometry(hostScreen))
-            return true;
-    }
-    return false;
-}
-
 void UIMultiScreenLayout::sltHandleScreenLayoutChange(int iRequestedGuestScreen, int iRequestedHostScreen)
 {

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

@@ -54 +54 @@
     bool hasHostScreenForGuestScreen(int iScreenId) const;
     quint64 memoryRequirements() const;
-    bool isHostTaskbarCovert() const;
 
 private slots:

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

@@ -389 +389 @@
 }
 
-#ifdef Q_WS_MAC
-void UIMachineLogicFullscreen::sltChangePresentationMode(bool /* fEnabled */)
-{
-    setPresentationModeEnabled(true);
-}
-#endif /* Q_WS_MAC */
-
 void UIMachineLogicFullscreen::sltScreenLayoutChanged()
 {
@@ -407 +400 @@
         foreach (UIMachineWindow *pMachineWindow, machineWindows())
             pMachineWindow->showInNecessaryMode();
-        /* Update 'presentation mode': */
-        setPresentationModeEnabled(true);
     }
     /* Revalidate native fullscreen for ML and next: */
@@ -504 +495 @@
 }
 
-#ifdef Q_WS_MAC
-void UIMachineLogicFullscreen::prepareOtherConnections()
-{
-    /* Make sure 'presentation mode' preference handling
-     * is updated at runtime for Lion and previous: */
-    if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        connect(gEDataManager, SIGNAL(sigPresentationModeChange(bool)),
-                this, SLOT(sltChangePresentationMode(bool)));
-}
-#endif /* Q_WS_MAC */
-
 void UIMachineLogicFullscreen::prepareMachineWindows()
 {
@@ -555 +535 @@
 
 #ifdef Q_WS_MAC
-    /* Activate 'presentation mode': */
-    setPresentationModeEnabled(true);
-
     /* For ML and next: */
     if (vboxGlobal().osRelease() > MacOSXRelease_Lion)
@@ -636 +613 @@
     foreach (UIMachineWindow *pMachineWindow, machineWindows())
         UIMachineWindow::destroy(pMachineWindow);
-
-#ifdef Q_WS_MAC
-    /* Deactivate 'presentation mode': */
-    setPresentationModeEnabled(false);
-#endif/* Q_WS_MAC */
 }
 
@@ -682 +654 @@
 
 #ifdef Q_WS_MAC
-void UIMachineLogicFullscreen::setPresentationModeEnabled(bool fEnabled)
-{
-    /* Should we enable it? */
-    if (fEnabled)
-    {
-        /* For Lion and previous: */
-        if (vboxGlobal().osRelease() <= MacOSXRelease_Lion)
-        {
-            /* Check if we have screen which contains the Dock or the Menubar (which hasn't to be the same),
-             * only than the 'presentation mode' have to be changed. */
-            if (m_pScreenLayout->isHostTaskbarCovert())
-            {
-                if (gEDataManager->presentationModeEnabled(vboxGlobal().managedVMUuid()))
-                    SetSystemUIMode(kUIModeAllHidden, 0);
-                else
-                    SetSystemUIMode(kUIModeAllSuppressed, 0);
-            }
-        }
-        /* For ML and next: */
-        else
-        {
-            /* I am not sure we have to check anything here.
-             * Without 'presentation mode' native fullscreen works pretty bad,
-             * so we have to enable it anyway: */
-            SetSystemUIMode(kUIModeAllSuppressed, 0);
-        }
-    }
-    /* Should we disable it? */
-    else SetSystemUIMode(kUIModeNormal, 0);
-}
-
 void UIMachineLogicFullscreen::revalidateNativeFullScreen(UIMachineWindow *pMachineWindow)
 {
@@ -771 +712 @@
                 LogRel(("UIMachineLogicFullscreen::revalidateNativeFullScreen: "
                         "Ask machine-window #%d to enter native fullscreen.\n", (int)uScreenID));
-
-                /* Update 'presentation mode': */
-                setPresentationModeEnabled(true);
 
                 /* Make sure window have proper geometry and shown: */

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

@@ -100 +100 @@
     void sltInvokePopupMenu();
 
-#ifdef RT_OS_DARWIN
-    void sltChangePresentationMode(bool fEnabled);
-#endif /* RT_OS_DARWIN */
-
     /** Updates machine-window(s) location/size on screen-layout changes. */
     void sltScreenLayoutChanged();
@@ -119 +115 @@
     void prepareActionGroups();
     void prepareActionConnections();
-#ifdef Q_WS_MAC
-    void prepareOtherConnections();
-#endif /* Q_WS_MAC */
     void prepareMachineWindows();
     void prepareMenu();
@@ -128 +121 @@
     void cleanupMenu();
     void cleanupMachineWindows();
-#ifdef Q_WS_MAC
-    //void cleanupOtherConnections() {}
-#endif /* Q_WS_MAC */
     void cleanupActionConnections();
     void cleanupActionGroups();
 
 #ifdef Q_WS_MAC
-    void setPresentationModeEnabled(bool fEnabled);
-
     /** Mac OS X: Revalidates 'fullscreen' mode for @a pMachineWindow. */
     void revalidateNativeFullScreen(UIMachineWindow *pMachineWindow);

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.cpp

@@ -35 +35 @@
     Ui::UIGlobalSettingsGeneral::setupUi(this);
 
-#ifndef Q_WS_MAC
-    m_pLabelPresentationMode->hide();
-    m_pCheckBoxPresentationMode->hide();
-#endif /* !Q_WS_MAC */
     /* Hide checkbox for now: */
     m_pLabelHostScreenSaver->hide();
@@ -62 +58 @@
     m_cache.m_strDefaultMachineFolder = m_properties.GetDefaultMachineFolder();
     m_cache.m_strVRDEAuthLibrary = m_properties.GetVRDEAuthLibrary();
-#ifdef Q_WS_MAC
-    m_cache.m_fPresentationModeEnabled = m_settings.presentationModeEnabled();
-#endif /* Q_WS_MAC */
     m_cache.m_fHostScreenSaverDisabled = m_settings.hostScreenSaverDisabled();
 
@@ -78 +71 @@
     m_pSelectorMachineFolder->setPath(m_cache.m_strDefaultMachineFolder);
     m_pSelectorVRDPLibName->setPath(m_cache.m_strVRDEAuthLibrary);
-#ifdef Q_WS_MAC
-    m_pCheckBoxPresentationMode->setChecked(m_cache.m_fPresentationModeEnabled);
-#endif /* Q_WS_MAC */
     m_pCheckBoxHostScreenSaver->setChecked(m_cache.m_fHostScreenSaverDisabled);
 }
@@ -91 +81 @@
     m_cache.m_strDefaultMachineFolder = m_pSelectorMachineFolder->path();
     m_cache.m_strVRDEAuthLibrary = m_pSelectorVRDPLibName->path();
-#ifdef Q_WS_MAC
-    m_cache.m_fPresentationModeEnabled = m_pCheckBoxPresentationMode->isChecked();
-#endif /* Q_WS_MAC */
     m_cache.m_fHostScreenSaverDisabled = m_pCheckBoxHostScreenSaver->isChecked();
 }
@@ -109 +96 @@
     if (m_properties.isOk() && m_pSelectorVRDPLibName->isModified())
         m_properties.SetVRDEAuthLibrary(m_cache.m_strVRDEAuthLibrary);
-#ifdef Q_WS_MAC
-    m_settings.setPresentationModeEnabled(m_cache.m_fPresentationModeEnabled);
-#endif /* Q_WS_MAC */
     m_settings.setHostScreenSaverDisabled(m_cache.m_fHostScreenSaverDisabled);
 
@@ -123 +107 @@
     setTabOrder(pWidget, m_pSelectorMachineFolder);
     setTabOrder(m_pSelectorMachineFolder, m_pSelectorVRDPLibName);
-    setTabOrder(m_pSelectorVRDPLibName, m_pCheckBoxPresentationMode);
-    setTabOrder(m_pCheckBoxPresentationMode, m_pCheckBoxHostScreenSaver);
+    setTabOrder(m_pSelectorVRDPLibName, m_pCheckBoxHostScreenSaver);
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.h

@@ -27 +27 @@
     QString m_strDefaultMachineFolder;
     QString m_strVRDEAuthLibrary;
-#ifdef Q_WS_MAC
-    bool m_fPresentationModeEnabled;
-#endif /* Q_WS_MAC */
     bool m_fHostScreenSaverDisabled;
 };

trunk/src/VBox/Frontends/VirtualBox/src/settings/global/UIGlobalSettingsGeneral.ui

@@ -72 +72 @@
    </item>
    <item row="2" column="0">
-    <widget class="QLabel" name="m_pLabelPresentationMode">
-     <property name="text">
-      <string>&amp;Dock and Menubar:</string>
-     </property>
-     <property name="alignment">
-      <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
-     </property>
-     <property name="buddy">
-      <cstring>m_pCheckBoxPresentationMode</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QCheckBox" name="m_pCheckBoxPresentationMode">
-     <property name="text">
-      <string>Auto-Show in Fullscreen</string>
-     </property>
-     <property name="whatsThis">
-      <string>When checked, the host dock and menu bar will be shown when the virtual machine is in fullscreen mode.</string>
-     </property>
-    </widget>
-   </item>
-   <item row="3" column="0">
     <widget class="QLabel" name="m_pLabelHostScreenSaver">
      <property name="text">
@@ -107 +84 @@
     </widget>
    </item>
-   <item row="3" column="1">
+   <item row="2" column="1">
     <widget class="QCheckBox" name="m_pCheckBoxHostScreenSaver">
      <property name="whatsThis">
@@ -117 +94 @@
     </widget>
    </item>
-   <item row="4" column="0" colspan="3">
+   <item row="3" column="0" colspan="3">
     <spacer>
      <property name="orientation">