Changeset 63835 in vbox

Timestamp:

Sep 14, 2016 3:01:23 PM (8 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:6899: Accessibility support (step 30): Selector UI: UISnapshotPane: Cleanup/rework snapshot operations.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector

Files:

• UISnapshotPane.cpp (modified) (10 diffs)
• UISnapshotPane.h (modified) (5 diffs)

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

@@ -413 +413 @@
     , m_pSnapshotItemActionGroup(new QActionGroup(this))
     , m_pCurrentStateItemActionGroup(new QActionGroup(this))
+    , m_pActionTakeSnapshot(new QAction(m_pCurrentStateItemActionGroup))
     , m_pActionRestoreSnapshot(new QAction(m_pSnapshotItemActionGroup))
     , m_pActionDeleteSnapshot(new QAction(m_pSnapshotItemActionGroup))
     , m_pActionShowSnapshotDetails(new QAction(m_pSnapshotItemActionGroup))
-    , m_pActionTakeSnapshot(new QAction(m_pCurrentStateItemActionGroup))
     , m_pActionCloneSnapshot(new QAction(m_pCurrentStateItemActionGroup))
     , m_fShapshotOperationsAllowed(false)
@@ -466 +466 @@
 
     /* Setup action icons: */
+    m_pActionTakeSnapshot->setIcon(UIIconPool::iconSetFull(
+        ":/snapshot_take_22px.png", ":/snapshot_take_16px.png",
+        ":/snapshot_take_disabled_22px.png", ":/snapshot_take_disabled_16px.png"));
     m_pActionRestoreSnapshot->setIcon(UIIconPool::iconSetFull(
         ":/snapshot_restore_22px.png", ":/snapshot_restore_16px.png",
@@ -475 +478 @@
         ":/snapshot_show_details_22px.png", ":/snapshot_show_details_16px.png",
         ":/snapshot_show_details_disabled_22px.png", ":/snapshot_details_show_disabled_16px.png"));
-    m_pActionTakeSnapshot->setIcon(UIIconPool::iconSetFull(
-        ":/snapshot_take_22px.png", ":/snapshot_take_16px.png",
-        ":/snapshot_take_disabled_22px.png", ":/snapshot_take_disabled_16px.png"));
     m_pActionCloneSnapshot->setIcon(UIIconPool::iconSetFull(
         ":/vm_clone_22px.png", ":/vm_clone_16px.png",
         ":/vm_clone_disabled_22px.png", ":/vm_clone_disabled_16px.png"));
     /* Setup action shortcuts: */
+    m_pActionTakeSnapshot->setShortcut(QString("Ctrl+Shift+S"));
     m_pActionRestoreSnapshot->setShortcut(QString("Ctrl+Shift+R"));
     m_pActionDeleteSnapshot->setShortcut(QString("Ctrl+Shift+D"));
     m_pActionShowSnapshotDetails->setShortcut(QString("Ctrl+Space"));
-    m_pActionTakeSnapshot->setShortcut(QString("Ctrl+Shift+S"));
     m_pActionCloneSnapshot->setShortcut(QString("Ctrl+Shift+C"));
 
@@ -549 +549 @@
 
     /* Translate actions names: */
+    m_pActionTakeSnapshot->setText(tr("Take &Snapshot"));
     m_pActionRestoreSnapshot->setText(tr("&Restore Snapshot"));
     m_pActionDeleteSnapshot->setText(tr("&Delete Snapshot"));
     m_pActionShowSnapshotDetails->setText(tr("S&how Details"));
-    m_pActionTakeSnapshot->setText(tr("Take &Snapshot"));
     m_pActionCloneSnapshot->setText(tr("&Clone..."));
     /* Translate actions status-tips: */
+    m_pActionTakeSnapshot->setStatusTip(tr("Take a snapshot of the current virtual machine state"));
     m_pActionRestoreSnapshot->setStatusTip(tr("Restore selected snapshot of the virtual machine"));
     m_pActionDeleteSnapshot->setStatusTip(tr("Delete selected snapshot of the virtual machine"));
     m_pActionShowSnapshotDetails->setStatusTip(tr("Display a window with selected snapshot details"));
-    m_pActionTakeSnapshot->setStatusTip(tr("Take a snapshot of the current virtual machine state"));
     m_pActionCloneSnapshot->setStatusTip(tr("Clone selected virtual machine"));
 }
@@ -592 +592 @@
 
     /* Enable/disable snapshot operations: */
+    m_pActionTakeSnapshot->setEnabled(
+           m_fShapshotOperationsAllowed
+        && (   (   fCanTakeDeleteSnapshot
+                && m_pCurrentSnapshotItem
+                && pSnapshotItem
+                && pSnapshotItem->isCurrentStateItem())
+            || (   pSnapshotItem
+                && !m_pCurrentSnapshotItem))
+    );
     m_pActionRestoreSnapshot->setEnabled(
            !fBusy
@@ -610 +619 @@
         && !pSnapshotItem->isCurrentStateItem()
     );
-    m_pActionTakeSnapshot->setEnabled(
-           m_fShapshotOperationsAllowed
-        && (   (   fCanTakeDeleteSnapshot
-                && m_pCurrentSnapshotItem
-                && pSnapshotItem
-                && pSnapshotItem->isCurrentStateItem())
-            || (   pSnapshotItem
-                && !m_pCurrentSnapshotItem))
-    );
     m_pActionCloneSnapshot->setEnabled(
            !fBusy
@@ -688 +688 @@
     {
         /* As snapshot-restore procedure: */
-        sltRestoreSnapshot(true /* suppress non-critical warnings */);
-    }
-}
-
-void UISnapshotPane::sltRestoreSnapshot(bool fSuppressNonCriticalWarnings /* = false */)
+        restoreSnapshot(true /* suppress non-critical warnings */);
+    }
+}
+
+void UISnapshotPane::sltMachineDataChange(QString strMachineID)
+{
+    /* Make sure it's our VM: */
+    if (strMachineID != m_strMachineID)
+        return;
+
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
+
+    /* Recache state current item: */
+    currentStateItem()->recache();
+}
+
+void UISnapshotPane::sltMachineStateChange(QString strMachineID, KMachineState enmState)
+{
+    /* Make sure it's our VM: */
+    if (strMachineID != m_strMachineID)
+        return;
+
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
+
+    /* Recache new machine state: */
+    currentStateItem()->recache();
+    currentStateItem()->updateCurrentState(enmState);
+}
+
+void UISnapshotPane::sltSessionStateChange(QString strMachineID, KSessionState enmState)
+{
+    /* Make sure it's our VM: */
+    if (strMachineID != m_strMachineID)
+        return;
+
+    /* Prevent snapshot editing in the meantime: */
+    QWriteLocker locker(&m_lockReadWrite);
+
+    /* Recache new session state: */
+    m_enmSessionState = enmState;
+    sltCurrentItemChanged(m_pTreeWidget->currentItem());
+}
+
+void UISnapshotPane::sltUpdateSnapshotsAge()
+{
+    /* Stop timer if active: */
+    if (m_ageUpdateTimer.isActive())
+        m_ageUpdateTimer.stop();
+
+    /* Search for smallest snapshot age to optimize timer timeout: */
+    const SnapshotAgeFormat age = traverseSnapshotAge(m_pTreeWidget->invisibleRootItem());
+    switch (age)
+    {
+        case SnapshotAgeFormat_InSeconds: m_ageUpdateTimer.setInterval(5 * 1000); break;
+        case SnapshotAgeFormat_InMinutes: m_ageUpdateTimer.setInterval(60 * 1000); break;
+        case SnapshotAgeFormat_InHours:   m_ageUpdateTimer.setInterval(60 * 60 * 1000); break;
+        case SnapshotAgeFormat_InDays:    m_ageUpdateTimer.setInterval(24 * 60 * 60 * 1000); break;
+        default:                          m_ageUpdateTimer.setInterval(0); break;
+    }
+
+    /* Restart timer if necessary: */
+    if (m_ageUpdateTimer.interval() > 0)
+        m_ageUpdateTimer.start();
+}
+
+bool UISnapshotPane::takeSnapshot()
+{
+    /* Simulate try-catch block: */
+    bool fSuccess = false;
+    do
+    {
+        /* Open a session (this call will handle all errors): */
+        CSession comSession;
+        if (m_enmSessionState != KSessionState_Unlocked)
+            comSession = vboxGlobal().openExistingSession(m_strMachineID);
+        else
+            comSession = vboxGlobal().openSession(m_strMachineID);
+        if (comSession.isNull())
+            break;
+
+        /* Simulate try-catch block: */
+        do
+        {
+            /* Get corresponding machine object: */
+            CMachine comMachine = comSession.GetMachine();
+
+            /* Create take-snapshot dialog: */
+            QWidget *pDlgParent = windowManager().realParentWindow(this);
+            QPointer<VBoxTakeSnapshotDlg> pDlg = new VBoxTakeSnapshotDlg(pDlgParent, m_comMachine);
+            windowManager().registerNewParent(pDlg, pDlgParent);
+
+            // TODO: Assign corresponding icon through sub-dialog API: */
+            pDlg->mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(m_comMachine.GetOSTypeId()));
+
+            /* Search for the max available snapshot index: */
+            int iMaxSnapShotIndex = 0;
+            QString strSnapshotName = tr("Snapshot %1");
+            QRegExp regExp(QString("^") + strSnapshotName.arg("([0-9]+)") + QString("$"));
+            QTreeWidgetItemIterator iterator(m_pTreeWidget);
+            while (*iterator)
+            {
+                QString strSnapshot = static_cast<SnapshotWgtItem*>(*iterator)->text(0);
+                int iPos = regExp.indexIn(strSnapshot);
+                if (iPos != -1)
+                    iMaxSnapShotIndex = regExp.cap(1).toInt() > iMaxSnapShotIndex ? regExp.cap(1).toInt() : iMaxSnapShotIndex;
+                ++iterator;
+            }
+            // TODO: Assign corresponding snapshot name through sub-dialog API: */
+            pDlg->mLeName->setText(strSnapshotName.arg(iMaxSnapShotIndex + 1));
+
+            /* Show Take Snapshot dialog: */
+            if (pDlg->exec() != QDialog::Accepted)
+            {
+                /* Cleanup dialog if it wasn't destroyed in own loop: */
+                if (pDlg)
+                    delete pDlg;
+                break;
+            }
+
+            /* Acquire real snapshot name/description: */
+            const QString strRealSnapshotName = pDlg->mLeName->text().trimmed();
+            const QString strRealSnapshotDescription = pDlg->mTeDescription->toPlainText();
+
+            /* Cleanup dialog: */
+            delete pDlg;
+
+            /* Take snapshot: */
+            QString strSnapshotID;
+            CProgress comProgress = comMachine.TakeSnapshot(strRealSnapshotName, strRealSnapshotDescription, true, strSnapshotID);
+            if (!comMachine.isOk())
+            {
+                msgCenter().cannotTakeSnapshot(comMachine, m_comMachine.GetName());
+                break;
+            }
+
+            /* Show snapshot taking progress: */
+            msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_create_90px.png");
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotTakeSnapshot(comProgress, m_comMachine.GetName());
+                break;
+            }
+
+            /* Mark snapshot restoring successful: */
+            fSuccess = true;
+        }
+        while (0);
+
+        /* Cleanup try-catch block: */
+        comSession.UnlockMachine();
+    }
+    while (0);
+
+    /* Return result: */
+    return fSuccess;
+}
+
+bool UISnapshotPane::restoreSnapshot(bool fSuppressNonCriticalWarnings /* = false */)
+{
+    /* Simulate try-catch block: */
+    bool fSuccess = false;
+    do
+    {
+        /* Acquire currently chosen snapshot item: */
+        const SnapshotWgtItem *pSnapshotItem = toSnapshotItem(m_pTreeWidget->currentItem());
+        AssertPtr(pSnapshotItem);
+        if (!pSnapshotItem)
+            break;
+
+        /* Get corresponding snapshot: */
+        const CSnapshot comSnapshot = pSnapshotItem->snapshot();
+        Assert(!comSnapshot.isNull());
+        if (comSnapshot.isNull())
+            break;
+
+        /* If non-critical warnings are not hidden or current state is changed: */
+        if (!fSuppressNonCriticalWarnings || m_comMachine.GetCurrentStateModified())
+        {
+            /* Ask if user really wants to restore the selected snapshot: */
+            int iResultCode = msgCenter().confirmSnapshotRestoring(comSnapshot.GetName(), m_comMachine.GetCurrentStateModified());
+            if (iResultCode & AlertButton_Cancel)
+                break;
+
+            /* Ask if user also wants to create new snapshot of current state which is changed: */
+            if (iResultCode & AlertOption_CheckBox)
+            {
+                /* Take snapshot of changed current state: */
+                m_pTreeWidget->setCurrentItem(currentStateItem());
+                if (!takeSnapshot())
+                    break;
+            }
+        }
+
+        /* Open a direct session (this call will handle all errors): */
+        CSession comSession = vboxGlobal().openSession(m_strMachineID);
+        if (comSession.isNull())
+            break;
+
+        /* Simulate try-catch block: */
+        do
+        {
+            /* Restore chosen snapshot: */
+            CMachine comMachine = comSession.GetMachine();
+            CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
+            if (!comMachine.isOk())
+            {
+                msgCenter().cannotRestoreSnapshot(comMachine, comSnapshot.GetName(), m_comMachine.GetName());
+                break;
+            }
+
+            /* Show snapshot restoring progress: */
+            msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_restore_90px.png");
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotRestoreSnapshot(comProgress, comSnapshot.GetName(), m_comMachine.GetName());
+                break;
+            }
+
+            /* Mark snapshot restoring successful: */
+            fSuccess = true;
+        }
+        while (0);
+
+        /* Cleanup try-catch block: */
+        comSession.UnlockMachine();
+    }
+    while (0);
+
+    /* Return result: */
+    return fSuccess;
+}
+
+bool UISnapshotPane::deleteSnapshot()
+{
+    /* Simulate try-catch block: */
+    bool fSuccess = false;
+    do
+    {
+        /* Acquire currently chosen snapshot item: */
+        const SnapshotWgtItem *pSnapshotItem = toSnapshotItem(m_pTreeWidget->currentItem());
+        AssertPtr(pSnapshotItem);
+        if (!pSnapshotItem)
+            break;
+
+        /* Get corresponding snapshot: */
+        const CSnapshot comSnapshot = pSnapshotItem->snapshot();
+        Assert(!comSnapshot.isNull());
+        if (comSnapshot.isNull())
+            break;
+
+        /* Ask if user really wants to remove the selected snapshot: */
+        if (!msgCenter().confirmSnapshotRemoval(comSnapshot.GetName()))
+            break;
+
+        /** @todo check available space on the target filesystem etc etc. */
+#if 0
+        if (!msgCenter().warnAboutSnapshotRemovalFreeSpace(comSnapshot.GetName(),
+                                                           "/home/juser/.VirtualBox/Machines/SampleVM/Snapshots/{01020304-0102-0102-0102-010203040506}.vdi",
+                                                           "59 GiB",
+                                                           "15 GiB"))
+            break;
+#endif
+
+        /* Open a session (this call will handle all errors): */
+        CSession comSession;
+        if (m_enmSessionState != KSessionState_Unlocked)
+            comSession = vboxGlobal().openExistingSession(m_strMachineID);
+        else
+            comSession = vboxGlobal().openSession(m_strMachineID);
+        if (comSession.isNull())
+            break;
+
+        /* Simulate try-catch block: */
+        do
+        {
+            /* Remove chosen snapshot: */
+            CMachine comMachine = comSession.GetMachine();
+            CProgress comProgress = comMachine.DeleteSnapshot(pSnapshotItem->snapshotID());
+            if (!comMachine.isOk())
+            {
+                msgCenter().cannotRemoveSnapshot(comMachine,  comSnapshot.GetName(), m_comMachine.GetName());
+                break;
+            }
+
+            /* Show snapshot removing progress: */
+            msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_discard_90px.png");
+            if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
+            {
+                msgCenter().cannotRemoveSnapshot(comProgress,  comSnapshot.GetName(), m_comMachine.GetName());
+                break;
+            }
+
+            /* Mark snapshot removing successful: */
+            fSuccess = true;
+        }
+        while (0);
+
+        /* Cleanup try-catch block: */
+        comSession.UnlockMachine();
+    }
+    while (0);
+
+    /* Return result: */
+    return fSuccess;
+}
+
+void UISnapshotPane::showSnapshotDetails()
 {
     /* Acquire currently chosen snapshot item: */
@@ -698 +1002 @@
     AssertReturnVoid(pSnapshotItem);
 
-    /* Get desired snapshot: */
-    const CSnapshot comSnapshot = pSnapshotItem->snapshot();
-    AssertReturnVoid(!comSnapshot.isNull());
-
-    /* Ask the user if he really wants to restore the snapshot: */
-    int iResultCode = AlertButton_Ok;
-    if (!fSuppressNonCriticalWarnings || m_comMachine.GetCurrentStateModified())
-    {
-        iResultCode = msgCenter().confirmSnapshotRestoring(comSnapshot.GetName(), m_comMachine.GetCurrentStateModified());
-        if (iResultCode & AlertButton_Cancel)
-            return;
-    }
-
-    /* If user also confirmed new snapshot creation: */
-    if (iResultCode & AlertOption_CheckBox)
-    {
-        /* Take snapshot of changed current state: */
-        m_pTreeWidget->setCurrentItem(currentStateItem());
-        if (!takeSnapshot())
-            return;
-    }
-
-    /* Open a direct session (this call will handle all errors): */
-    CSession comSession = vboxGlobal().openSession(m_strMachineID);
-    if (comSession.isNull())
-        return;
-
-    /* Restore chosen snapshot: */
-    CMachine comMachine = comSession.GetMachine();
-    CProgress comProgress = comMachine.RestoreSnapshot(comSnapshot);
-    if (comMachine.isOk())
-    {
-        msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_restore_90px.png");
-        if (comProgress.GetResultCode() != 0)
-            msgCenter().cannotRestoreSnapshot(comProgress, comSnapshot.GetName(), m_comMachine.GetName());
-    }
-    else
-        msgCenter().cannotRestoreSnapshot(comMachine, comSnapshot.GetName(), m_comMachine.GetName());
-
-    /* Unlock machine finally: */
-    comSession.UnlockMachine();
-}
-
-void UISnapshotPane::sltDeleteSnapshot()
-{
-    /* Acquire currently chosen snapshot item: */
-    const SnapshotWgtItem *pSnapshotItem = toSnapshotItem(m_pTreeWidget->currentItem());
-    AssertReturnVoid(pSnapshotItem);
-
-    /* Get desired snapshot: */
-    const CSnapshot comSnapshot = pSnapshotItem->snapshot();
-    AssertReturnVoid(!comSnapshot.isNull());
-
-    /* Confirm snapshot removal: */
-    if (!msgCenter().confirmSnapshotRemoval(comSnapshot.GetName()))
-        return;
-
-    /** @todo check available space on the target filesystem etc etc. */
-#if 0
-    if (!msgCenter().warnAboutSnapshotRemovalFreeSpace(comSnapshot.GetName(),
-                                                       "/home/juser/.VirtualBox/Machines/SampleVM/Snapshots/{01020304-0102-0102-0102-010203040506}.vdi",
-                                                       "59 GiB",
-                                                       "15 GiB"))
-        return;
-#endif
-
-    /* Open a session (this call will handle all errors): */
-    bool fBusy = m_enmSessionState != KSessionState_Unlocked;
-    CSession comSession;
-    if (fBusy)
-        comSession = vboxGlobal().openExistingSession(m_strMachineID);
-    else
-        comSession = vboxGlobal().openSession(m_strMachineID);
-    if (comSession.isNull())
-        return;
-
-    /* Remove chosen snapshot: */
-    CMachine comMachine = comSession.GetMachine();
-    CProgress comProgress = comMachine.DeleteSnapshot(pSnapshotItem->snapshotID());
-    if (comMachine.isOk())
-    {
-        msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_discard_90px.png");
-        if (comProgress.GetResultCode() != 0)
-            msgCenter().cannotRemoveSnapshot(comProgress,  comSnapshot.GetName(), m_comMachine.GetName());
-    }
-    else
-        msgCenter().cannotRemoveSnapshot(comMachine,  comSnapshot.GetName(), m_comMachine.GetName());
-
-    /* Unlock machine finally: */
-    comSession.UnlockMachine();
-}
-
-void UISnapshotPane::sltShowSnapshotDetails()
-{
-    /* Acquire currently chosen snapshot item: */
-    const SnapshotWgtItem *pSnapshotItem = toSnapshotItem(m_pTreeWidget->currentItem());
-    AssertReturnVoid(pSnapshotItem);
-
-    /* Get desired snapshot: */
+    /* Get corresponding snapshot: */
     const CSnapshot comSnapshot = pSnapshotItem->snapshot();
     AssertReturnVoid(!comSnapshot.isNull());
@@ -809 +1015 @@
 }
 
-void UISnapshotPane::sltCloneSnapshot()
+void UISnapshotPane::cloneSnapshot()
 {
     /* Acquire currently chosen snapshot item: */
@@ -836 +1042 @@
 }
 
-void UISnapshotPane::sltMachineDataChange(QString strMachineID)
-{
-    /* Make sure it's our VM: */
-    if (strMachineID != m_strMachineID)
-        return;
-
-    /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
-
-    /* Recache state current item: */
-    currentStateItem()->recache();
-}
-
-void UISnapshotPane::sltMachineStateChange(QString strMachineID, KMachineState enmState)
-{
-    /* Make sure it's our VM: */
-    if (strMachineID != m_strMachineID)
-        return;
-
-    /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
-
-    /* Recache new machine state: */
-    currentStateItem()->recache();
-    currentStateItem()->updateCurrentState(enmState);
-}
-
-void UISnapshotPane::sltSessionStateChange(QString strMachineID, KSessionState enmState)
-{
-    /* Make sure it's our VM: */
-    if (strMachineID != m_strMachineID)
-        return;
-
-    /* Prevent snapshot editing in the meantime: */
-    QWriteLocker locker(&m_lockReadWrite);
-
-    /* Recache new session state: */
-    m_enmSessionState = enmState;
-    sltCurrentItemChanged(m_pTreeWidget->currentItem());
-}
-
-void UISnapshotPane::sltUpdateSnapshotsAge()
-{
-    /* Stop timer if active: */
-    if (m_ageUpdateTimer.isActive())
-        m_ageUpdateTimer.stop();
-
-    /* Search for smallest snapshot age to optimize timer timeout: */
-    const SnapshotAgeFormat age = traverseSnapshotAge(m_pTreeWidget->invisibleRootItem());
-    switch (age)
-    {
-        case SnapshotAgeFormat_InSeconds: m_ageUpdateTimer.setInterval(5 * 1000); break;
-        case SnapshotAgeFormat_InMinutes: m_ageUpdateTimer.setInterval(60 * 1000); break;
-        case SnapshotAgeFormat_InHours:   m_ageUpdateTimer.setInterval(60 * 60 * 1000); break;
-        case SnapshotAgeFormat_InDays:    m_ageUpdateTimer.setInterval(24 * 60 * 60 * 1000); break;
-        default:                          m_ageUpdateTimer.setInterval(0); break;
-    }
-
-    /* Restart timer if necessary: */
-    if (m_ageUpdateTimer.interval() > 0)
-        m_ageUpdateTimer.start();
-}
-
-bool UISnapshotPane::takeSnapshot()
-{
-    /* Prepare result: */
-    bool fIsValid = true;
-
-    /* Open a session (this call will handle all errors): */
-    CSession comSession;
-    if (m_enmSessionState != KSessionState_Unlocked)
-        comSession = vboxGlobal().openExistingSession(m_strMachineID);
-    else
-        comSession = vboxGlobal().openSession(m_strMachineID);
-    fIsValid = !comSession.isNull();
-
-    if (fIsValid)
-    {
-        /* Get corresponding machine object also: */
-        CMachine comMachine = comSession.GetMachine();
-
-        /* Create take-snapshot dialog: */
-        QWidget *pDlgParent = windowManager().realParentWindow(this);
-        QPointer<VBoxTakeSnapshotDlg> pDlg = new VBoxTakeSnapshotDlg(pDlgParent, m_comMachine);
-        windowManager().registerNewParent(pDlg, pDlgParent);
-
-        // TODO: Assign corresponding icon through sub-dialog API: */
-        pDlg->mLbIcon->setPixmap(vboxGlobal().vmGuestOSTypeIcon(m_comMachine.GetOSTypeId()));
-
-        /* Search for the max available snapshot index: */
-        int iMaxSnapShotIndex = 0;
-        QString strSnapshotName = tr("Snapshot %1");
-        QRegExp regExp(QString("^") + strSnapshotName.arg("([0-9]+)") + QString("$"));
-        QTreeWidgetItemIterator iterator(m_pTreeWidget);
-        while (*iterator)
-        {
-            QString strSnapshot = static_cast<SnapshotWgtItem*>(*iterator)->text(0);
-            int iPos = regExp.indexIn(strSnapshot);
-            if (iPos != -1)
-                iMaxSnapShotIndex = regExp.cap(1).toInt() > iMaxSnapShotIndex ? regExp.cap(1).toInt() : iMaxSnapShotIndex;
-            ++iterator;
-        }
-        // TODO: Assign corresponding snapshot name through sub-dialog API: */
-        pDlg->mLeName->setText(strSnapshotName.arg(iMaxSnapShotIndex + 1));
-
-        /* Show Take Snapshot dialog: */
-        if (pDlg->exec() == QDialog::Accepted)
-        {
-            /* Acquire snapshot name/description: */
-            const QString strSnapshotName = pDlg->mLeName->text().trimmed();
-            const QString strSnapshotDescription = pDlg->mTeDescription->toPlainText();
-
-            /* Take snapshot: */
-            QString strSnapshotID;
-            CProgress comProgress = comMachine.TakeSnapshot(strSnapshotName, strSnapshotDescription, true, strSnapshotID);
-            if (comMachine.isOk())
-            {
-                msgCenter().showModalProgressDialog(comProgress, m_comMachine.GetName(), ":/progress_snapshot_create_90px.png");
-                if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
-                {
-                    msgCenter().cannotTakeSnapshot(comProgress, m_comMachine.GetName());
-                    fIsValid = false;
-                }
-            }
-            else
-            {
-                msgCenter().cannotTakeSnapshot(comMachine, m_comMachine.GetName());
-                fIsValid = false;
-            }
-        }
-        else
-            fIsValid = false;
-        if (pDlg)
-        {
-            delete pDlg;
-            /* Unlock machine finally: */
-            comSession.UnlockMachine();
-        }
-    }
-
-    /* Return result: */
-    return fIsValid;
-}
-
 void UISnapshotPane::refreshAll()
 {

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

@@ -82 +82 @@
     /** @} */
 
-    /** @name Snapshot operations
-      * @{ */
-        /** Proposes to take a snapshot. */
-        void sltTakeSnapshot() { takeSnapshot(); }
-        /** Proposes to restore the snapshot. */
-        void sltRestoreSnapshot(bool fSuppressNonCriticalWarnings = false);
-        /** Proposes to delete the snapshot. */
-        void sltDeleteSnapshot();
-        /** Displays the snapshot details dialog. */
-        void sltShowSnapshotDetails();
-        /** Proposes to clone the snapshot. */
-        void sltCloneSnapshot();
-    /** @} */
-
     /** @name Main event handlers
       * @{ */
@@ -112 +98 @@
     /** @} */
 
+    /** @name Snapshot operations
+      * @{ */
+        /** Proposes to take a snapshot. */
+        void sltTakeSnapshot() { takeSnapshot(); }
+        /** Proposes to restore the snapshot. */
+        void sltRestoreSnapshot() { restoreSnapshot(); }
+        /** Proposes to delete the snapshot. */
+        void sltDeleteSnapshot() { deleteSnapshot(); }
+        /** Displays the snapshot details dialog. */
+        void sltShowSnapshotDetails() { showSnapshotDetails(); }
+        /** Proposes to clone the snapshot. */
+        void sltCloneSnapshot() { cloneSnapshot(); }
+    /** @} */
+
 private:
 
@@ -119 +119 @@
         bool takeSnapshot();
         /** Proposes to restore the snapshot. */
-        //bool restoreSnapshot();
+        bool restoreSnapshot(bool fSuppressNonCriticalWarnings = false);
         /** Proposes to delete the snapshot. */
-        //bool deleteSnapshot();
+        bool deleteSnapshot();
         /** Displays the snapshot details dialog. */
-        //bool showSnapshotDetails();
+        void showSnapshotDetails();
         /** Proposes to clone the snapshot. */
-        //bool cloneSnapshot();
+        void cloneSnapshot();
     /** @} */
 
@@ -163 +163 @@
     QActionGroup    *m_pCurrentStateItemActionGroup;
 
+    /** Holds the snapshot take action instance. */
+    QAction         *m_pActionTakeSnapshot;
     /** Holds the snapshot restore action instance. */
     QAction         *m_pActionRestoreSnapshot;
@@ -169 +171 @@
     /** Holds the show snapshot details action instance. */
     QAction         *m_pActionShowSnapshotDetails;
-    /** Holds the snapshot take action instance. */
-    QAction         *m_pActionTakeSnapshot;
     /** Holds the snapshot clone action instance. */
     QAction         *m_pActionCloneSnapshot;