Changeset 61052 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 19, 2016 4:17:43 PM (9 years ago)

Author:

vboxsync

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

107319

Message:

FE/Qt: ​​​​​​​​​​bugref:7791: Runtime UI: Implement unfairly forgotten Machine menu Detach GUI action.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• converter/UIConverterBackendGlobal.cpp (modified) (2 diffs)
• extradata/UIExtraDataDefs.h (modified) (1 diff)
• runtime/UIActionPoolRuntime.cpp (modified) (3 diffs)
• runtime/UIActionPoolRuntime.h (modified) (1 diff)
• runtime/UIMachineLogic.cpp (modified) (4 diffs)
• runtime/UIMachineLogic.h (modified) (2 diffs)
• runtime/UIMachineWindow.cpp (modified) (1 diff)
• runtime/UIMenuBarEditorWindow.cpp (modified) (1 diff)
• runtime/UISession.cpp (modified) (3 diffs)
• runtime/UISession.h (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/converter/UIConverterBackendGlobal.cpp

@@ -540 +540 @@
         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause:             strResult = "Pause"; break;
         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset:             strResult = "Reset"; break;
+        case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach:            strResult = "Detach"; break;
         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState:         strResult = "SaveState"; break;
         case UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown:          strResult = "Shutdown"; break;
@@ -565 +566 @@
     keys << "Pause";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Pause;
     keys << "Reset";             values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Reset;
+    keys << "Detach";            values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach;
     keys << "SaveState";         values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_SaveState;
     keys << "Shutdown";          values << UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Shutdown;

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

@@ -381 +381 @@
         RuntimeMenuMachineActionType_Pause             = RT_BIT(3),
         RuntimeMenuMachineActionType_Reset             = RT_BIT(4),
-        RuntimeMenuMachineActionType_SaveState         = RT_BIT(5),
-        RuntimeMenuMachineActionType_Shutdown          = RT_BIT(6),
-        RuntimeMenuMachineActionType_PowerOff          = RT_BIT(7),
-        RuntimeMenuMachineActionType_Nothing           = RT_BIT(8),
+        RuntimeMenuMachineActionType_Detach            = RT_BIT(5),
+        RuntimeMenuMachineActionType_SaveState         = RT_BIT(6),
+        RuntimeMenuMachineActionType_Shutdown          = RT_BIT(7),
+        RuntimeMenuMachineActionType_PowerOff          = RT_BIT(8),
+        RuntimeMenuMachineActionType_Nothing           = RT_BIT(9),
         RuntimeMenuMachineActionType_All               = 0xFFFF
     };

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

@@ -243 +243 @@
 };
 
+class UIActionSimplePerformDetach : public UIActionSimple
+{
+    Q_OBJECT;
+
+public:
+
+    UIActionSimplePerformDetach(UIActionPool *pParent)
+        : UIActionSimple(pParent, ":/vm_create_shortcut_16px.png", ":/vm_create_shortcut_disabled_16px.png") {}
+
+protected:
+
+    /** Returns action extra-data ID. */
+    virtual int extraDataID() const { return UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach; }
+    /** Returns action extra-data key. */
+    virtual QString extraDataKey() const { return gpConverter->toInternalString(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach); }
+    /** Returns whether action is allowed. */
+    virtual bool isAllowed() const { return actionPool()->toRuntime()->isAllowedInMenuMachine(UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach); }
+
+    QString shortcutExtraDataID() const
+    {
+        return QString("DetachUI");
+    }
+
+    void retranslateUi()
+    {
+        setName(QApplication::translate("UIActionPool", "&Detach GUI"));
+        setStatusTip(QApplication::translate("UIActionPool", "Detach the GUI from headless VM"));
+    }
+};
+
 class UIActionSimplePerformSaveState : public UIActionSimple
 {
@@ -2074 +2104 @@
     m_pool[UIActionIndexRT_M_Machine_T_Pause] = new UIActionTogglePause(this);
     m_pool[UIActionIndexRT_M_Machine_S_Reset] = new UIActionSimplePerformReset(this);
+    m_pool[UIActionIndexRT_M_Machine_S_Detach] = new UIActionSimplePerformDetach(this);
     m_pool[UIActionIndexRT_M_Machine_S_SaveState] = new UIActionSimplePerformSaveState(this);
     m_pool[UIActionIndexRT_M_Machine_S_Shutdown] = new UIActionSimplePerformShutdown(this);
@@ -2372 +2403 @@
     /* 'Reset' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_Reset)) || fSeparator;
+    /* 'Detach' action: */
+    fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_Detach)) || fSeparator;
     /* 'SaveState' action: */
     fSeparator = addAction(pMenu, action(UIActionIndexRT_M_Machine_S_SaveState)) || fSeparator;

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

@@ -47 +47 @@
     UIActionIndexRT_M_Machine_T_Pause,
     UIActionIndexRT_M_Machine_S_Reset,
+    UIActionIndexRT_M_Machine_S_Detach,
     UIActionIndexRT_M_Machine_S_SaveState,
     UIActionIndexRT_M_Machine_S_Shutdown,

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

@@ -387 +387 @@
 }
 #endif /* VBOX_WS_MAC */
+
+void UIMachineLogic::detach()
+{
+    /* Enable 'manual-override',
+     * preventing automatic Runtime UI closing: */
+    setManualOverrideMode(true);
+
+    /* Was the step successful? */
+    bool fSuccess = true;
+    LogRel(("GUI: Passing request to detach UI from machine-logic to UI session.\n"));
+    fSuccess = uisession()->detach();
+
+    /* Manually close Runtime UI: */
+    if (fSuccess)
+        closeRuntimeUI();
+}
 
 void UIMachineLogic::saveState()
@@ -1003 +1019 @@
 
     /* Move actions into running-n-paused actions group: */
+    m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_Detach));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_SaveState));
     m_pRunningOrPausedActions->addAction(actionPool()->action(UIActionIndexRT_M_Machine_S_Settings));
@@ -1072 +1089 @@
     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Reset), SIGNAL(triggered()),
             this, SLOT(sltReset()));
+    connect(actionPool()->action(UIActionIndexRT_M_Machine_S_Detach), SIGNAL(triggered()),
+            this, SLOT(sltDetach()), Qt::QueuedConnection);
     connect(actionPool()->action(UIActionIndexRT_M_Machine_S_SaveState), SIGNAL(triggered()),
             this, SLOT(sltSaveState()), Qt::QueuedConnection);
@@ -1570 +1589 @@
 }
 
+void UIMachineLogic::sltDetach()
+{
+    /* Make sure machine is in one of the allowed states: */
+    if (!uisession()->isRunning() && !uisession()->isPaused())
+    {
+        AssertMsgFailed(("Invalid machine-state. Action should be prohibited!"));
+        return;
+    }
+
+    detach();
+}
+
 void UIMachineLogic::sltSaveState()
 {

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

@@ -140 +140 @@
 #endif /* VBOX_WS_MAC */
 
+    /** Detach and close Runtime UI. */
+    void detach();
     /** Save VM state, then close Runtime UI. */
     void saveState();
@@ -267 +269 @@
     void sltReset();
     void sltPause(bool fOn);
+    void sltDetach();
     void sltSaveState();
     void sltShutdown();

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

@@ -421 +421 @@
             /* Just close Runtime UI: */
             LogRel(("GUI: Request for close-action to detach GUI.\n"));
-            machineLogic()->closeRuntimeUI();
+            machineLogic()->detach();
             break;
         }

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

@@ -882 +882 @@
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_T_Pause));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_S_Reset));
+        prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_S_Detach));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_S_SaveState));
         prepareCopiedAction(pMenu, actionPool()->action(UIActionIndexRT_M_Machine_S_Shutdown));

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

@@ -321 +321 @@
 
     /* True by default: */
+    return true;
+}
+
+bool UISession::detach()
+{
+    /* Nothing here for now: */
     return true;
 }
@@ -2132 +2138 @@
     /* Get host and prepare restrictions: */
     const CHost host = vboxGlobal().host();
+    UIExtraDataMetaDefs::RuntimeMenuMachineActionType restrictionForMachine = UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Invalid;
     UIExtraDataMetaDefs::RuntimeMenuViewActionType restrictionForView = UIExtraDataMetaDefs::RuntimeMenuViewActionType_Invalid;
     UIExtraDataMetaDefs::RuntimeMenuDevicesActionType restrictionForDevices = UIExtraDataMetaDefs::RuntimeMenuDevicesActionType_Invalid;
+
+    /* Separate process stuff: */
+    {
+        /* Initialize 'Machine' menu: */
+        if (!vboxGlobal().isSeparateProcess())
+            restrictionForMachine = (UIExtraDataMetaDefs::RuntimeMenuMachineActionType)(restrictionForMachine | UIExtraDataMetaDefs::RuntimeMenuMachineActionType_Detach);
+    }
 
     /* VRDE server stuff: */
@@ -2203 +2217 @@
     }
 
+    /* Apply cumulative restriction for 'Machine' menu: */
+    actionPool()->toRuntime()->setRestrictionForMenuMachine(UIActionRestrictionLevel_Session, restrictionForMachine);
     /* Apply cumulative restriction for 'View' menu: */
     actionPool()->toRuntime()->setRestrictionForMenuView(UIActionRestrictionLevel_Session, restrictionForView);

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

@@ -94 +94 @@
     bool initialize();
     bool powerUp();
+    bool detach();
     bool saveState();
     bool shutdown();