Changeset 28937 in vbox

Timestamp:

Apr 30, 2010 1:22:46 PM (15 years ago)

Author:

vboxsync

Message:

Frontends/VirtualBox: allow taking snapshots from the selector window, and related small cleanups

File:

• trunk/src/VBox/Frontends/VirtualBox/src/VBoxSnapshotsWgt.cpp (modified) (4 diffs)

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

@@ -448 +448 @@
         s = curStateItem()->getCurrentState();
 
+    /* Whether taking or deleting snapshots is possible right now */
+    bool canTakeDeleteSnapshot =    !busy
+                                 || s == KMachineState_PoweredOff
+                                 || s == KMachineState_Saved
+                                 || s == KMachineState_Aborted
+                                 || s == KMachineState_Running
+                                 || s == KMachineState_Paused;
+
     /* Enable/disable restoring snapshot */
     mRestoreSnapshotAction->setEnabled (!busy && mCurSnapshotItem && item && !item->isCurrentStateItem());
 
     /* Enable/disable deleting snapshot */
-    mDeleteSnapshotAction->setEnabled (   (   !busy
-                                           || s == KMachineState_PoweredOff
-                                           || s == KMachineState_Saved
-                                           || s == KMachineState_Aborted
-                                           || s == KMachineState_Running
-                                           || s == KMachineState_Paused)
+    mDeleteSnapshotAction->setEnabled (   canTakeDeleteSnapshot
                                        && mCurSnapshotItem && item && !item->isCurrentStateItem());
 
@@ -463 +466 @@
     mShowSnapshotDetailsAction->setEnabled (mCurSnapshotItem && item && !item->isCurrentStateItem());
 
-    /* Enable/disable current state actions */
-    mCurStateActionGroup->setEnabled ((!busy && mCurSnapshotItem && item && item->isCurrentStateItem()) ||
-                                      (item && !mCurSnapshotItem));
+    /* Enable/disable taking snapshots */
+    mTakeSnapshotAction->setEnabled (   canTakeDeleteSnapshot
+                                     && mCurSnapshotItem && item && item->isCurrentStateItem());
 }
 
@@ -561 +564 @@
         return;
 #endif
-                                                          
+
 
     /* Open a direct session (this call will handle all errors) */
@@ -634 +637 @@
     {
         /* Open a direct session (this call will handle all errors) */
-        CSession session = vboxGlobal().openSession (mMachineId);
+        bool busy = mSessionState != KSessionState_Closed;
+        CSession session = vboxGlobal().openSession (mMachineId, busy /* aExisting */);
         if (session.isNull())
             return;