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

Timestamp:

Jun 21, 2013 2:32:44 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI, Runtime UI: Extra-data flag to prevent snapshot-operations (create/delete).

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDefs.cpp (modified) (1 diff)
• globals/UIDefs.h (modified) (1 diff)
• globals/VBoxGlobal.cpp (modified) (1 diff)
• globals/VBoxGlobal.h (modified) (1 diff)
• runtime/UIMachineMenuBar.cpp (modified) (3 diffs)
• runtime/UIMachineMenuBar.h (modified) (3 diffs)
• runtime/UISession.cpp (modified) (1 diff)
• selector/VBoxSnapshotsWgt.cpp (modified) (5 diffs)
• selector/VBoxSnapshotsWgt.h (modified) (1 diff)

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

@@ -47 +47 @@
 const char* UIDefs::GUI_HideFromManager = "GUI/HideFromManager";
 const char* UIDefs::GUI_PreventReconfiguration = "GUI/PreventReconfiguration";
+const char* UIDefs::GUI_PreventSnapshotOperations = "GUI/PreventSnapshotOperations";
 const char* UIDefs::GUI_HideDetails = "GUI/HideDetails";
 

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

@@ -119 +119 @@
     extern const char* GUI_HideFromManager;
     extern const char* GUI_PreventReconfiguration;
+    extern const char* GUI_PreventSnapshotOperations;
     extern const char* GUI_HideDetails;
 

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

@@ -3721 +3721 @@
     /* 'true' if guest-screen auto-mounting approved by the extra-data: */
     return isApprovedByExtraData(machine, GUI_AutomountGuestScreens);
+}
+
+/* static */
+bool VBoxGlobal::shouldWeAllowSnapshotOperations(CMachine &machine,
+                                                 bool fIncludingSanityCheck /*= true*/)
+{
+    if (fIncludingSanityCheck)
+    {
+        /* 'false' for null machines,
+         * we can't operate snapshot in that case: */
+        if (machine.isNull())
+            return false;
+
+        /* 'false' for inaccessible machines,
+         * we can't operate snapshot in that case: */
+        if (!machine.GetAccessible())
+            return false;
+    }
+
+    /* 'true' if snapshot operations are not restricted by the extra-data: */
+    return !isApprovedByExtraData(machine, GUI_PreventSnapshotOperations);
 }
 

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

@@ -383 +383 @@
                                     bool fIncludingMachineGeneralCheck = false);
     static bool shouldWeAutoMountGuestScreens(CMachine &machine, bool fIncludingSanityCheck = true);
+    static bool shouldWeAllowSnapshotOperations(CMachine &machine, bool fIncludingSanityCheck = true);
     static QList<IndicatorType> restrictedStatusBarIndicators(CMachine &machine);
     static QList<MachineCloseAction> restrictedMachineCloseActions(CMachine &machine);

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

@@ -33 +33 @@
 #include "UIImageTools.h"
 #include "UINetworkManager.h"
+#include "VBoxGlobal.h"
 
 /* COM includes: */
@@ -98 +99 @@
 };
 
-UIMachineMenuBar::UIMachineMenuBar()
+UIMachineMenuBar::UIMachineMenuBar(const CMachine &machine)
     /* On the Mac we add some items only the first time, cause otherwise they
      * will be merged more than once to the application menu by Qt. */
     : m_fIsFirstTime(true)
+    , m_machine(machine)
 {
 }
@@ -195 +197 @@
     /* Machine submenu: */
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_SettingsDialog));
-    pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot));
+    if (vboxGlobal().shouldWeAllowSnapshotOperations(m_machine))
+        pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot));
+    else
+        gActionPool->action(UIActionIndexRuntime_Simple_TakeSnapshot)->setEnabled(false);
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_TakeScreenshot));
     pMenu->addAction(gActionPool->action(UIActionIndexRuntime_Simple_InformationDialog));

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

@@ -26 +26 @@
 #include <QList>
 
+/* COM includes: */
+#include "COMEnums.h"
+#include "CMachine.h"
+
 /* Global forwards */
 class QMenu;
@@ -33 +37 @@
 {
 public:
-    UIMachineMenuBar();
+
+    UIMachineMenuBar(const CMachine &machine);
 
     QMenu* createMenu(UIMainMenuType fOptions = UIMainMenuType_All);
@@ -50 +55 @@
 
     bool m_fIsFirstTime;
+    CMachine m_machine;
 };
 

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

@@ -893 +893 @@
 void UISession::prepareMenuPool()
 {
-    m_pMenuPool = new UIMachineMenuBar;
+    m_pMenuPool = new UIMachineMenuBar(session().GetMachine());
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.cpp

@@ -340 +340 @@
     , mTakeSnapshotAction (new QAction (mCurStateActionGroup))
     , mCloneSnapshotAction(new QAction(mCurStateActionGroup))
+    , m_fShapshotOperationsAllowed(false)
 {
     /* Apply UI decorations */
@@ -438 +439 @@
         mMachineId = QString::null;
         mSessionState = KSessionState_Null;
+        m_fShapshotOperationsAllowed = false;
     }
     else
@@ -443 +445 @@
         mMachineId = aMachine.GetId();
         mSessionState = aMachine.GetSessionState();
+        m_fShapshotOperationsAllowed = vboxGlobal().shouldWeAllowSnapshotOperations(mMachine);
     }
 
@@ -509 +512 @@
 
     /* Enable/disable deleting snapshot */
-    mDeleteSnapshotAction->setEnabled (   canTakeDeleteSnapshot
-                                       && mCurSnapshotItem && item && !item->isCurrentStateItem());
+    mDeleteSnapshotAction->setEnabled (m_fShapshotOperationsAllowed &&
+                                       canTakeDeleteSnapshot && mCurSnapshotItem && item && !item->isCurrentStateItem());
 
     /* Enable/disable the details action regardless of the session state */
@@ -516 +519 @@
 
     /* Enable/disable taking snapshots */
-    mTakeSnapshotAction->setEnabled (   (   canTakeDeleteSnapshot
-                                         && mCurSnapshotItem && item && item->isCurrentStateItem())
-                                     || (item && !mCurSnapshotItem));
+    mTakeSnapshotAction->setEnabled (m_fShapshotOperationsAllowed &&
+                                     ((canTakeDeleteSnapshot && mCurSnapshotItem && item && item->isCurrentStateItem()) ||
+                                      (item && !mCurSnapshotItem)));
 
     /* Enable/disable cloning snapshots */

trunk/src/VBox/Frontends/VirtualBox/src/selector/VBoxSnapshotsWgt.h

@@ -109 +109 @@
 
     QTimer          mAgeUpdateTimer;
+
+    bool            m_fShapshotOperationsAllowed;
 };