Changeset 51565 in vbox for trunk/src/VBox

Timestamp:

Jun 6, 2014 10:51:02 AM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

94230

Message:

FE/Qt: 6660: Advanced extra-data management framework: Integrate GUI_Fullscreen, GUI_Seamless, GUI_Scale.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• extradata/UIExtraDataManager.cpp (modified) (2 diffs)
• extradata/UIExtraDataManager.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• runtime/UIMachine.cpp (modified) (2 diffs)
• runtime/UIMachine.h (modified) (2 diffs)
• runtime/UIMachineLogic.cpp (modified) (1 diff)
• runtime/UIMachineMenuBar.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (1 diff)
• runtime/UISession.h (modified) (1 diff)

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

@@ -791 +791 @@
 }
 
-UIVisualStateType UIExtraDataManager::restrictedVisualStateTypes(const QString &strID) const
+UIVisualStateType UIExtraDataManager::restrictedVisualStates(const QString &strID) const
 {
     /* Prepare result: */
@@ -804 +804 @@
     /* Return result: */
     return result;
+}
+
+UIVisualStateType UIExtraDataManager::requestedVisualState(const QString &strID) const
+{
+    if (isFeatureAllowed(GUI_Fullscreen, strID)) return UIVisualStateType_Fullscreen;
+    if (isFeatureAllowed(GUI_Seamless, strID)) return UIVisualStateType_Seamless;
+    if (isFeatureAllowed(GUI_Scale, strID)) return UIVisualStateType_Scale;
+    return UIVisualStateType_Normal;
+}
+
+void UIExtraDataManager::setRequestedVisualState(UIVisualStateType visualState, const QString &strID)
+{
+    setExtraDataString(GUI_Fullscreen, toFeatureAllowed(visualState == UIVisualStateType_Fullscreen), strID);
+    setExtraDataString(GUI_Seamless, toFeatureAllowed(visualState == UIVisualStateType_Seamless), strID);
+    setExtraDataString(GUI_Scale, toFeatureAllowed(visualState == UIVisualStateType_Scale), strID);
 }
 

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

@@ -227 +227 @@
     RuntimeMenuHelpActionType restrictedRuntimeMenuHelpActionTypes(const QString &strID) const;
 
-    /** Returns restricted Runtime UI visual-state types. */
-    UIVisualStateType restrictedVisualStateTypes(const QString &strID) const;
+    /** Returns restricted Runtime UI visual-states. */
+    UIVisualStateType restrictedVisualStates(const QString &strID) const;
+
+    /** Returns requested Runtime UI visual-state. */
+    UIVisualStateType requestedVisualState(const QString &strID) const;
+    /** Defines requested Runtime UI visual-state as @a visualState. */
+    void setRequestedVisualState(UIVisualStateType visualState, const QString &strID);
 
     /** Returns default machine close action. */

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

@@ -4021 +4021 @@
     /* process command line */
 
-    bool bForceSeamless = false;
-    bool bForceFullscreen = false;
+    UIVisualStateType visualStateType = UIVisualStateType_Invalid;
 
 #ifdef Q_WS_X11
@@ -4067 +4066 @@
         }
 #endif /* VBOX_GUI_WITH_PIDFILE */
+        else if (!::strcmp(arg, "-fullscreen") || !::strcmp(arg, "--fullscreen"))
+        {
+            visualStateType = UIVisualStateType_Fullscreen;
+        }
         else if (!::strcmp(arg, "-seamless") || !::strcmp(arg, "--seamless"))
         {
-            bForceSeamless = true;
-        }
-        else if (!::strcmp(arg, "-fullscreen") || !::strcmp(arg, "--fullscreen"))
-        {
-            bForceFullscreen = true;
+            visualStateType = UIVisualStateType_Seamless;
+        }
+        else if (!::strcmp(arg, "-scale") || !::strcmp(arg, "--scale"))
+        {
+            visualStateType = UIVisualStateType_Scale;
         }
         else if (!::strcmp (arg, "-comment") || !::strcmp (arg, "--comment"))
@@ -4236 +4239 @@
         mVBox.SetSettingsSecret(mSettingsPw);
 
-    if (bForceSeamless && !vmUuid.isEmpty())
-    {
-        mVBox.FindMachine(vmUuid).SetExtraData(GUI_Seamless, "on");
-    }
-    else if (bForceFullscreen && !vmUuid.isEmpty())
-    {
-        mVBox.FindMachine(vmUuid).SetExtraData(GUI_Fullscreen, "on");
-    }
+    if (visualStateType != UIVisualStateType_Invalid && !vmUuid.isEmpty())
+        gEDataManager->setRequestedVisualState(visualStateType, vmUuid);
 
 #ifdef VBOX_WITH_DEBUGGER_GUI

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

@@ -89 +89 @@
     , m_pSession(0)
     , m_pVisualState(0)
-    , m_allowedVisualStateTypes(UIVisualStateType_Invalid)
+    , m_allowedVisualStates(UIVisualStateType_Invalid)
 {
     /* Store self pointer: */
@@ -196 +196 @@
 void UIMachine::loadMachineSettings()
 {
-    /* Load machine settings: */
-    CMachine machine = uisession()->session().GetMachine();
-    UIVisualStateType restrictedVisualStateTypes = gEDataManager->restrictedVisualStateTypes(vboxGlobal().managedVMUuid());
-    m_allowedVisualStateTypes = static_cast<UIVisualStateType>(UIVisualStateType_All ^ restrictedVisualStateTypes);
-
-    /* Load extra-data settings: */
-    {
-        /* Machine while saving own settings will save "on" only for current
-         * visual representation mode if its differs from normal mode of course.
-         * But user can alter extra data manually in machine xml file and set there
-         * more than one visual representation mode flags. Shame on such user!
-         * There is no reason to enter in more than one visual representation mode
-         * at machine start, so we are choosing first of requested modes: */
-        bool fIsSomeExtendedModeChosen = false;
-
-        if (!fIsSomeExtendedModeChosen)
+    /* Load 'visual state' option: */
+    {
+        /* Load restricted visual states: */
+        UIVisualStateType restrictedVisualStates = gEDataManager->restrictedVisualStates(vboxGlobal().managedVMUuid());
+        /* Acquire allowed visual states: */
+        m_allowedVisualStates = static_cast<UIVisualStateType>(UIVisualStateType_All ^ restrictedVisualStates);
+
+        /* Load requested visual state: */
+        UIVisualStateType requestedVisualState = gEDataManager->requestedVisualState(vboxGlobal().managedVMUuid());
+        /* Check if requested visual state type allowed: */
+        if (isVisualStateAllowed(requestedVisualState))
         {
-            /* Test 'scale' flag: */
-            QString strScaleSettings = machine.GetExtraData(GUI_Scale);
-            if (strScaleSettings == "on" && isVisualStateAllowedScale())
+            switch (requestedVisualState)
             {
-                fIsSomeExtendedModeChosen = true;
-                /* We can enter scale mode initially: */
-                initialStateType = UIVisualStateType_Scale;
-            }
-        }
-
-        if (!fIsSomeExtendedModeChosen)
-        {
-            /* Test 'seamless' flag: */
-            QString strSeamlessSettings = machine.GetExtraData(GUI_Seamless);
-            if (strSeamlessSettings == "on" && isVisualStateAllowedSeamless())
-            {
-                fIsSomeExtendedModeChosen = true;
-                /* We can't enter seamless mode initially,
-                 * so we should ask ui-session for that: */
-                uisession()->setRequestedVisualState(UIVisualStateType_Seamless);
-            }
-        }
-
-        if (!fIsSomeExtendedModeChosen)
-        {
-            /* Test 'fullscreen' flag: */
-            QString strFullscreenSettings = machine.GetExtraData(GUI_Fullscreen);
-            if (strFullscreenSettings == "on" && isVisualStateAllowedFullscreen())
-            {
-                fIsSomeExtendedModeChosen = true;
-                /* We can enter fullscreen mode initially: */
-                initialStateType = UIVisualStateType_Fullscreen;
-            }
-        }
-    }
-}
-
-void UIMachine::saveMachineSettings()
-{
-    /* Save machine settings: */
-    CMachine machine = uisession()->session().GetMachine();
-
-    /* Save extra-data settings: */
-    {
-        /* Prepare extra-data values: */
-        QString strFullscreenRequested;
-        QString strSeamlessRequested;
-        QString strScaleRequested;
-        /* Check if some state was requested: */
-        if (uisession()->requestedVisualState() != UIVisualStateType_Invalid)
-        {
-            switch (uisession()->requestedVisualState())
-            {
-                case UIVisualStateType_Fullscreen: strFullscreenRequested = "on"; break;
-                case UIVisualStateType_Seamless: strSeamlessRequested = "on"; break;
-                case UIVisualStateType_Scale: strScaleRequested = "on"; break;
+                /* Direct transition to scale/fullscreen mode allowed: */
+                case UIVisualStateType_Scale: initialStateType = UIVisualStateType_Scale; break;
+                case UIVisualStateType_Fullscreen: initialStateType = UIVisualStateType_Fullscreen; break;
+                /* While to seamless is not, so we have to request transition on GA capability-change event: */
+                case UIVisualStateType_Seamless: uisession()->setRequestedVisualState(UIVisualStateType_Seamless); break;
                 default: break;
             }
         }
-        /* Check if some state still exists: */
-        else if (m_pVisualState)
+    }
+}
+
+void UIMachine::saveMachineSettings()
+{
+    /* Save 'visual state' option: */
+    {
+        /* Get requested visual state: */
+        UIVisualStateType requestedVisualState = uisession()->requestedVisualState();
+
+        /* If requested state is invalid: */
+        if (requestedVisualState == UIVisualStateType_Invalid)
         {
-            switch (m_pVisualState->visualStateType())
-            {
-                case UIVisualStateType_Fullscreen: strFullscreenRequested = "on"; break;
-                case UIVisualStateType_Seamless: strSeamlessRequested = "on"; break;
-                case UIVisualStateType_Scale: strScaleRequested = "on"; break;
-                default: break;
-            }
+            /* Get current if still exists or normal otherwise: */
+            requestedVisualState = m_pVisualState ? m_pVisualState->visualStateType() : UIVisualStateType_Normal;
         }
-        /* Rewrite extra-data values: */
-        machine.SetExtraData(GUI_Fullscreen, strFullscreenRequested);
-        machine.SetExtraData(GUI_Seamless, strSeamlessRequested);
-        machine.SetExtraData(GUI_Scale, strScaleRequested);
+
+        /* Save requested visual state: */
+        gEDataManager->setRequestedVisualState(requestedVisualState, vboxGlobal().managedVMUuid());
     }
 }

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

@@ -54 +54 @@
     UISession *uisession() const { return m_pSession; }
 
-    /* API: Visual-state stuff: */
-    bool isVisualStateAllowedFullscreen() const { return m_allowedVisualStateTypes & UIVisualStateType_Fullscreen; }
-    bool isVisualStateAllowedSeamless() const { return m_allowedVisualStateTypes & UIVisualStateType_Seamless; }
-    bool isVisualStateAllowedScale() const { return m_allowedVisualStateTypes & UIVisualStateType_Scale; }
+    /** Returns whether requested visual @a state allowed. */
+    bool isVisualStateAllowed(UIVisualStateType state) const { return m_allowedVisualStates & state; }
 
     /** Requests async visual-state change. */
@@ -87 +85 @@
     UISession *m_pSession;
     UIVisualState *m_pVisualState;
-    UIVisualStateType m_allowedVisualStateTypes;
+    UIVisualStateType m_allowedVisualStates;
 
     /* Friend classes: */

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

@@ -503 +503 @@
     /* Update action states: */
     gActionPool->action(UIActionIndexRuntime_Toggle_GuestAutoresize)->setEnabled(uisession()->isGuestSupportsGraphics());
-    gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(uisession()->isVisualStateAllowedSeamless() && uisession()->isGuestSupportsSeamless());
+    gActionPool->action(UIActionIndexRuntime_Toggle_Seamless)->setEnabled(uisession()->isVisualStateAllowed(UIVisualStateType_Seamless) &&
+                                                                          uisession()->isGuestSupportsSeamless());
 }
 

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

@@ -356 +356 @@
 
     /* Mode flags: */
-    bool fIsAllowedFullscreen = m_pSession->isVisualStateAllowedFullscreen() &&
+    bool fIsAllowedFullscreen = m_pSession->isVisualStateAllowed(UIVisualStateType_Fullscreen) &&
                                 (m_pSession->allowedActionsMenuView() & RuntimeMenuViewActionType_Fullscreen);
-    bool fIsAllowedSeamless = m_pSession->isVisualStateAllowedSeamless() &&
+    bool fIsAllowedSeamless = m_pSession->isVisualStateAllowed(UIVisualStateType_Seamless) &&
                               (m_pSession->allowedActionsMenuView() & RuntimeMenuViewActionType_Seamless);
-    bool fIsAllowedScale = m_pSession->isVisualStateAllowedScale() &&
+    bool fIsAllowedScale = m_pSession->isVisualStateAllowed(UIVisualStateType_Scale) &&
                            (m_pSession->allowedActionsMenuView() & RuntimeMenuViewActionType_Scale);
 

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

@@ -507 +507 @@
 }
 
-bool UISession::isVisualStateAllowedFullscreen() const
-{
-    return m_pMachine->isVisualStateAllowedFullscreen();
-}
-
-bool UISession::isVisualStateAllowedSeamless() const
-{
-    return m_pMachine->isVisualStateAllowedSeamless();
-}
-
-bool UISession::isVisualStateAllowedScale() const
-{
-    return m_pMachine->isVisualStateAllowedScale();
+bool UISession::isVisualStateAllowed(UIVisualStateType state) const
+{
+    return m_pMachine->isVisualStateAllowed(state);
 }
 

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

@@ -157 +157 @@
     /** @} */
 
-    /* API: Visual-state stuff: */
-    bool isVisualStateAllowedFullscreen() const;
-    bool isVisualStateAllowedSeamless() const;
-    bool isVisualStateAllowedScale() const;
+    /** Returns whether visual @a state is allowed. */
+    bool isVisualStateAllowed(UIVisualStateType state) const;
     /** Requests visual-state change. */
     void changeVisualState(UIVisualStateType visualStateType);