Changeset 27243 in vbox for trunk/src

Timestamp:

Mar 10, 2010 11:38:45 AM (15 years ago)

Author:

vboxsync

Message:

FE/Qt4: New running VM core: restored support for running VM in fullscreen mode initially.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/runtime

Files:

• UIMachine.cpp (modified) (4 diffs)
• UIMachine.h (modified) (2 diffs)

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

@@ -260 +260 @@
     : QObject(0)
     , m_ppThis(ppSelf)
+    , initialStateType(UIVisualStateType_Normal)
     , m_session(session)
     , m_pActionsPool(new UIActionsPool(this))
@@ -278 +279 @@
         *m_ppThis = this;
 
+    /* Load machine settings: */
+    loadMachineSettings();
+
     /* Enter default (normal) state */
-    enterBaseVisualState();
+    enterInitialVisualState();
 }
 
 UIMachine::~UIMachine()
 {
+    /* Save machine settings: */
+    saveMachineSettings();
     /* Erase itself pointer: */
     *m_ppThis = 0;
@@ -308 +314 @@
 }
 
+void UIMachine::sltChangeVisualState(UIVisualStateType visualStateType)
+{
+    /* Create new state: */
+    UIVisualState *pNewVisualState = 0;
+    switch (visualStateType)
+    {
+        case UIVisualStateType_Normal:
+        {
+            /* Create normal visual state: */
+            pNewVisualState = new UIVisualStateNormal(this, m_pSession, m_pActionsPool);
+            break;
+        }
+        case UIVisualStateType_Fullscreen:
+        {
+            /* Create fullscreen visual state: */
+            pNewVisualState = new UIVisualStateFullscreen(this, m_pSession, m_pActionsPool);
+            break;
+        }
+        case UIVisualStateType_Seamless:
+        {
+            /* Create seamless visual state: */
+            pNewVisualState = new UIVisualStateSeamless(this, m_pSession, m_pActionsPool);
+            break;
+        }
+        default:
+            break;
+    }
+
+    UIVisualStateType previousVisualStateType = UIVisualStateType_Normal;
+    if (m_pVisualState)
+        previousVisualStateType = m_pVisualState->visualStateType();
+
+    /* First we have to check if the selected mode is available at all.
+     * Only then we delete the old mode and switch to the new mode. */
+    if (pNewVisualState->prepareChange(previousVisualStateType))
+    {
+        /* Delete previous state: */
+        delete m_pVisualState;
+
+        /* Set the new mode as current mode: */
+        m_pVisualState = pNewVisualState;
+        m_pVisualState->change();
+
+        /* Finish any setup: */
+        m_pVisualState->finishChange();
+    }
+    else
+        /* Discard the temporary created new state: */
+        delete pNewVisualState;
+}
+
+void UIMachine::closeVirtualMachine()
+{
+    delete this;
+}
+
+void UIMachine::enterInitialVisualState()
+{
+    sltChangeVisualState(initialStateType);
+}
+
 UIMachineLogic* UIMachine::machineLogic() const
 {
@@ -316 +383 @@
 }
 
-void UIMachine::sltChangeVisualState(UIVisualStateType visualStateType)
-{
-    /* Create new state: */
-    UIVisualState *pNewVisualState = 0;
-    switch (visualStateType)
-    {
-        case UIVisualStateType_Normal:
-        {
-            /* Create normal visual state: */
-            pNewVisualState = new UIVisualStateNormal(this, m_pSession, m_pActionsPool);
-            break;
-        }
-        case UIVisualStateType_Fullscreen:
-        {
-            /* Create fullscreen visual state: */
-            pNewVisualState = new UIVisualStateFullscreen(this, m_pSession, m_pActionsPool);
-            break;
-        }
-        case UIVisualStateType_Seamless:
-        {
-            /* Create seamless visual state: */
-            pNewVisualState = new UIVisualStateSeamless(this, m_pSession, m_pActionsPool);
-            break;
-        }
-        default:
-            break;
-    }
-
-    UIVisualStateType previousVisualStateType = UIVisualStateType_Normal;
-    if (m_pVisualState)
-        previousVisualStateType = m_pVisualState->visualStateType();
-
-    /* First we have to check if the selected mode is available at all.
-     * Only then we delete the old mode and switch to the new mode. */
-    if (pNewVisualState->prepareChange(previousVisualStateType))
-    {
-        /* Delete previous state: */
-        delete m_pVisualState;
-
-        /* Set the new mode as current mode: */
-        m_pVisualState = pNewVisualState;
-        m_pVisualState->change();
-
-        /* Finish any setup: */
-        m_pVisualState->finishChange();
-    }
-    else
-        /* Discard the temporary created new state: */
-        delete pNewVisualState;
-}
-
-void UIMachine::closeVirtualMachine()
-{
-    delete this;
-}
-
-void UIMachine::enterBaseVisualState()
-{
-    sltChangeVisualState(UIVisualStateType_Normal);
+void UIMachine::loadMachineSettings()
+{
+    /* Load machine settings: */
+    CMachine machine = uisession()->session().GetMachine();
+
+    /* Load extra-data settings: */
+    {
+        /* Get 'fullscreen' attributes: */
+        QString strFullscreenSettings = machine.GetExtraData(VBoxDefs::GUI_Fullscreen);
+        if (strFullscreenSettings == "yes")
+            initialStateType = UIVisualStateType_Fullscreen;
+    }
+}
+
+void UIMachine::saveMachineSettings()
+{
+    /* Save machine settings: */
+    CMachine machine = uisession()->session().GetMachine();
+
+    /* Save extra-data settings: */
+    {
+        /* Set 'fullscreen' attributes: */
+        machine.SetExtraData(VBoxDefs::GUI_Fullscreen, m_pVisualState &&
+                             m_pVisualState->visualStateType() == UIVisualStateType_Fullscreen ? "yes" : QString());
+    }
 }
 

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

@@ -65 +65 @@
 
     /* Move VM to default (normal) state: */
-    void enterBaseVisualState();
+    void enterInitialVisualState();
 
     /* Private getters: */
@@ -71 +71 @@
     UIActionsPool* actionsPool() const { return m_pActionsPool; }
 
+    /* Prepare helpers: */
+    void loadMachineSettings();
+
+    /* Cleanup helpers: */
+    void saveMachineSettings();
+
     /* Private variables: */
     UIMachine **m_ppThis;
+    UIVisualStateType initialStateType;
     CSession m_session;
     UIActionsPool *m_pActionsPool;