Changeset 49466 in vbox for trunk/src/VBox

Timestamp:

Nov 13, 2013 1:35:56 PM (11 years ago)

Author:

vboxsync

Message:

FE/Qt: Runtime UI: Close actions handling rework (step 2): Make sure menu/menubar Application Close action is disabled if SaveState, Shutdown and PowerOff close actions are restricted.

Location:

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

Files:

• UIMachineMenuBar.cpp (modified) (1 diff)
• UISession.cpp (modified) (2 diffs)
• UISession.h (modified) (2 diffs)

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

@@ -225 +225 @@
 #endif /* !Q_WS_MAC */
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_Close));
+    if (m_pSession->isAllCloseActionsRestricted())
+        gActionPool->action(UIActionIndexRuntime_Simple_Close)->setEnabled(false);
 }
 

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

@@ -134 +134 @@
     , m_defaultCloseAction(MachineCloseAction_Invalid)
     , m_restrictedCloseActions(MachineCloseAction_Invalid)
+    , m_fAllCloseActionsRestricted(false)
     , m_fSnapshotOperationsAllowed(true)
     /* Common flags: */
@@ -1092 +1093 @@
         m_defaultCloseAction = vboxGlobal().defaultMachineCloseAction(machine);
         m_restrictedCloseActions = vboxGlobal().restrictedMachineCloseActions(machine);
+        m_fAllCloseActionsRestricted =  (m_restrictedCloseActions & MachineCloseAction_SaveState)
+                                     && (m_restrictedCloseActions & MachineCloseAction_Shutdown)
+                                     && (m_restrictedCloseActions & MachineCloseAction_PowerOff);
+                                     // Close VM Dialog hides PowerOff_RestoringSnapshot implicitly if PowerOff is hidden..
+                                     // && (m_restrictedCloseActions & MachineCloseAction_PowerOff_RestoringSnapshot);
 
         /* Should we allow snapshot operations? */

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

@@ -111 +111 @@
     /** Returns merged restricted close actions. */
     MachineCloseAction restrictedCloseActions() const { return m_restrictedCloseActions; }
+    /** Returns whether all the close actions are restricted. */
+    bool isAllCloseActionsRestricted() const { return m_fAllCloseActionsRestricted; }
     /** @} */
 
@@ -333 +335 @@
     /** Merged restricted close actions. */
     MachineCloseAction m_restrictedCloseActions;
+    /** Determines whether all the close actions are restricted. */
+    bool m_fAllCloseActionsRestricted;
     /** @} */