Changeset 49465 in vbox

Timestamp:

Nov 13, 2013 1:27:44 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Close actions handling rework (step 1): Providing VBoxGlobal and UISession with required stuff.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (3 diffs)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineWindow.cpp (modified) (4 diffs)
• runtime/UISession.cpp (modified) (2 diffs)
• runtime/UISession.h (modified) (2 diffs)
• runtime/UIVMCloseDialog.cpp (modified) (6 diffs)
• runtime/UIVMCloseDialog.h (modified) (4 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDefs.h

@@ -351 +351 @@
 enum MachineCloseAction
 {
-    MachineCloseAction_Invalid,
-    MachineCloseAction_SaveState,
-    MachineCloseAction_Shutdown,
-    MachineCloseAction_PowerOff,
-    MachineCloseAction_PowerOff_RestoringSnapshot,
-    MachineCloseAction_Max
+    MachineCloseAction_Invalid                    = 0,
+    MachineCloseAction_SaveState                  = RT_BIT(0),
+    MachineCloseAction_Shutdown                   = RT_BIT(1),
+    MachineCloseAction_PowerOff                   = RT_BIT(2),
+    MachineCloseAction_PowerOff_RestoringSnapshot = RT_BIT(3),
+    MachineCloseAction_All                        = 0xFF
 };
 Q_DECLARE_METATYPE(MachineCloseAction);

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

@@ -3533 +3533 @@
 }
 
+/** Returns default machine close action for passed @a machine. */
+MachineCloseAction VBoxGlobal::defaultMachineCloseAction(CMachine &machine)
+{
+    return gpConverter->fromInternalString<MachineCloseAction>(machine.GetExtraData(GUI_DefaultCloseAction));
+}
+
 /* static */
 RuntimeMenuType VBoxGlobal::restrictedRuntimeMenuTypes(CMachine &machine)
@@ -3590 +3596 @@
 }
 
-/* static */
-QList<MachineCloseAction> VBoxGlobal::restrictedMachineCloseActions(CMachine &machine)
+/** Returns merged restricted machine close actions for passed @a machine. */
+MachineCloseAction VBoxGlobal::restrictedMachineCloseActions(CMachine &machine)
 {
     /* Prepare result: */
-    QList<MachineCloseAction> result;
+    MachineCloseAction result = MachineCloseAction_Invalid;
     /* Load restricted machine-close-actions: */
     QString strList(machine.GetExtraData(GUI_RestrictedCloseActions));
@@ -3603 +3609 @@
         MachineCloseAction value = gpConverter->fromInternalString<MachineCloseAction>(strValue);
         if (value != MachineCloseAction_Invalid)
-            result << value;
+            result = static_cast<MachineCloseAction>(result | value);
     }
     /* Return result: */

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

@@ -359 +359 @@
     static bool shouldWeAutoMountGuestScreens(CMachine &machine, bool fIncludingSanityCheck = true);
     static bool shouldWeAllowSnapshotOperations(CMachine &machine, bool fIncludingSanityCheck = true);
+    static MachineCloseAction defaultMachineCloseAction(CMachine &machine);
     static RuntimeMenuType restrictedRuntimeMenuTypes(CMachine &machine);
     static UIVisualStateType restrictedVisualStateTypes(CMachine &machine);
     static QList<IndicatorType> restrictedStatusBarIndicators(CMachine &machine);
-    static QList<MachineCloseAction> restrictedMachineCloseActions(CMachine &machine);
+    static MachineCloseAction restrictedMachineCloseActions(CMachine &machine);
     static QList<GlobalSettingsPageType> restrictedGlobalSettingsPages(CVirtualBox &vbox);
     static QList<MachineSettingsPageType> restrictedMachineSettingsPages(CMachine &machine);

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

@@ -253 +253 @@
         return;
 
+    /* Get machine: */
+    CMachine m = machine();
+
     /* If there is a close hook script defined: */
-    QString strScript = machine().GetExtraData(GUI_CloseActionHook);
+    QString strScript = m.GetExtraData(GUI_CloseActionHook);
     if (!strScript.isEmpty())
     {
         /* Execute asynchronously and leave: */
-        QProcess::startDetached(strScript, QStringList() << machine().GetId());
+        QProcess::startDetached(strScript, QStringList() << m.GetId());
         return;
     }
@@ -266 +269 @@
 
     /* If there IS default close-action defined: */
-    QString strDefaultAction = machine().GetExtraData(GUI_DefaultCloseAction);
+    QString strDefaultAction = m.GetExtraData(GUI_DefaultCloseAction);
     if (!strDefaultAction.isEmpty())
     {
@@ -279 +282 @@
          * we should check if its possible to discard machine-state: */
         if (closeAction == MachineCloseAction_PowerOff &&
-            machine().GetSnapshotCount() > 0)
+            m.GetSnapshotCount() > 0)
             closeAction = MachineCloseAction_PowerOff_RestoringSnapshot;
     }
@@ -288 +291 @@
         /* Prepare close-dialog: */
         QWidget *pParentDlg = windowManager().realParentWindow(this);
-        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, machine(), session());
+        QPointer<UIVMCloseDialog> pCloseDlg = new UIVMCloseDialog(pParentDlg, m, session());
 
         /* Make sure close-dialog is valid: */

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

@@ -132 +132 @@
     , m_pWatchdogDisplayChange(0)
 #endif /* Q_WS_MAC */
+    , m_defaultCloseAction(MachineCloseAction_Invalid)
+    , m_restrictedCloseActions(MachineCloseAction_Invalid)
     , m_fSnapshotOperationsAllowed(true)
     /* Common flags: */
@@ -1087 +1089 @@
         updateSessionSettings();
 
+        /* What is the default close action and the restricted are? */
+        m_defaultCloseAction = vboxGlobal().defaultMachineCloseAction(machine);
+        m_restrictedCloseActions = vboxGlobal().restrictedMachineCloseActions(machine);
+
         /* Should we allow snapshot operations? */
         m_fSnapshotOperationsAllowed = vboxGlobal().shouldWeAllowSnapshotOperations(machine);

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

@@ -105 +105 @@
     QCursor cursor() const { return m_cursor; }
 
+    /** @name Application Close configuration stuff.
+     * @{ */
+    /** Returns default close action. */
+    MachineCloseAction defaultCloseAction() const { return m_defaultCloseAction; }
+    /** Returns merged restricted close actions. */
+    MachineCloseAction restrictedCloseActions() const { return m_restrictedCloseActions; }
+    /** @} */
+
     /** @name Snapshot Operations configuration stuff.
      * @{ */
@@ -319 +327 @@
 #endif /* Q_WS_MAC */
 
+    /** @name Application Close configuration variables.
+     * @{ */
+    /** Default close action. */
+    MachineCloseAction m_defaultCloseAction;
+    /** Merged restricted close actions. */
+    MachineCloseAction m_restrictedCloseActions;
+    /** @} */
+
     /** @name Snapshot Operations configuration variables.
      * @{ */

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

@@ -39 +39 @@
 
 /* COM includes: */
+# include "CMachine.h"
 # include "CSession.h"
 # include "CConsole.h"
@@ -45 +46 @@
 #endif /* !VBOX_WITH_PRECOMPILED_HEADERS */
 
-UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, const CMachine &machine, const CSession &session)
+UIVMCloseDialog::UIVMCloseDialog(QWidget *pParent, CMachine &machine, const CSession &session)
     : QIWithRetranslateUI<QIDialog>(pParent)
+    , m_machine(machine)
+    , m_session(session)
     , m_fValid(false)
     , m_fIsACPIEnabled(false)
@@ -55 +58 @@
 
     /* Configure: */
-    setSizeGripEnabled(false);
-    configure(machine, session);
-
-    /* Retranslate finally: */
+    configure();
+
+    /* Retranslate: */
     retranslateUi();
 }
@@ -270 +272 @@
         pMainLayout->addWidget(pButtonBox);
     }
-}
-
-void UIVMCloseDialog::configure(const CMachine &machine, const CSession &session)
-{
-    /* Assign machine: */
-    m_machine = machine;
-
-    /* Get machine-state: */
+    /* Prepare size-grip token: */
+    setSizeGripEnabled(false);
+}
+
+void UIVMCloseDialog::configure()
+{
+    /* Get actual machine-state: */
     KMachineState machineState = m_machine.GetState();
 
@@ -284 +285 @@
 
     /* Check which close-actions are resticted: */
-    QList<MachineCloseAction> restictedCloseActions = vboxGlobal().restrictedMachineCloseActions(m_machine);
-    bool fIsStateSavingAllowed = !restictedCloseActions.contains(MachineCloseAction_SaveState);
-    bool fIsACPIShutdownAllowed = !restictedCloseActions.contains(MachineCloseAction_Shutdown);
-    bool fIsPowerOffAllowed = !restictedCloseActions.contains(MachineCloseAction_PowerOff);
-    bool fIsPowerOffAndRestoreAllowed = fIsPowerOffAllowed && !restictedCloseActions.contains(MachineCloseAction_PowerOff_RestoringSnapshot);
+    MachineCloseAction restictedCloseActions = vboxGlobal().restrictedMachineCloseActions(m_machine);
+    bool fIsStateSavingAllowed = !(restictedCloseActions & MachineCloseAction_SaveState);
+    bool fIsACPIShutdownAllowed = !(restictedCloseActions & MachineCloseAction_Shutdown);
+    bool fIsPowerOffAllowed = !(restictedCloseActions & MachineCloseAction_PowerOff);
+    bool fIsPowerOffAndRestoreAllowed = fIsPowerOffAllowed && !(restictedCloseActions & MachineCloseAction_PowerOff_RestoringSnapshot);
 
     /* Make 'Save state' button visible/hidden depending on restriction: */
@@ -297 +298 @@
     setShutdownButtonVisible(fIsACPIShutdownAllowed);
     /* Make 'Shutdown button' enabled/disabled depending on ACPI-state & machine-state: */
-    m_fIsACPIEnabled = session.GetConsole().GetGuestEnteredACPIMode();
+    m_fIsACPIEnabled = m_session.GetConsole().GetGuestEnteredACPIMode();
     setShutdownButtonEnabled(m_fIsACPIEnabled && machineState != KMachineState_Stuck);
     /* Make 'Power off' button visible/hidden depending on restriction: */

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

@@ -25 +25 @@
 #include "UIDefs.h"
 
-/* COM includes: */
-#include "COMEnums.h"
-#include "CMachine.h"
-
 /* Forward declarations: */
+class CMachine;
 class CSession;
 class QLabel;
@@ -43 +40 @@
 
     /* Constructor: */
-    UIVMCloseDialog(QWidget *pParent, const CMachine &machine, const CSession &session);
+    UIVMCloseDialog(QWidget *pParent, CMachine &machine, const CSession &session);
 
     /* API: Validation stuff: */
@@ -75 +72 @@
     /* Helpers: Prepare stuff: */
     void prepare();
-    void configure(const CMachine &machine, const CSession &session);
+    void configure();
 
     /* Helper: Translate stuff: */
@@ -98 +95 @@
 
     /* Variables: */
+    CMachine &m_machine;
+    const CSession &m_session;
     bool m_fValid;
-    CMachine m_machine;
     bool m_fIsACPIEnabled;
     QString m_strDiscardCheckBoxText;