儲存庫 vbox 的更動 67540

時間撮記:

2017-6-21 下午01:40:27 (7 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:8901: Selector UI: Tools pane: Snapshot pane: A bit of automation for Take snapshot action.

位置:

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

檔案:

• UISnapshotPane.cpp (修改) (4 筆差異)
• UISnapshotPane.h (修改) (1 筆差異)

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

@@ -1085 +1085 @@
         {
             /* As snapshot-restore procedure: */
-            if (pSnapshotItem->snapshot().isNotNull())
+            if (pSnapshotItem->isCurrentStateItem())
+                takeSnapshot(true /* automatically */);
+            else
                 restoreSnapshot(true /* suppress non-critical warnings */);
         }
@@ -1179 +1181 @@
                                                       QString(), this, &UISnapshotPane::sltTakeSnapshot);
         {
-            m_pActionTakeSnapshot->setShortcut(QString("Ctrl+Shift+S"));
+            m_pActionTakeSnapshot->setShortcut(QString("Ctrl+Shift+T"));
         }
 
@@ -1453 +1455 @@
 }
 
-bool UISnapshotPane::takeSnapshot()
+bool UISnapshotPane::takeSnapshot(bool fAutomatically /* = false */)
 {
     /* Simulate try-catch block: */
@@ -1474 +1476 @@
             CMachine comMachine = comSession.GetMachine();
 
-            /* Create take-snapshot dialog: */
-            QWidget *pDlgParent = windowManager().realParentWindow(this);
-            QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, m_comMachine);
-            windowManager().registerNewParent(pDlg, pDlgParent);
-
-            /* Assign corresponding icon: */
-            QPixmap pixmap = vboxGlobal().vmUserPixmapDefault(m_comMachine);
-            if (pixmap.isNull())
-                pixmap = vboxGlobal().vmGuestOSTypePixmapDefault(m_comMachine.GetOSTypeId());
-            pDlg->setPixmap(pixmap);
-
-            /* Search for the max available snapshot index: */
-            int iMaxSnapShotIndex = 0;
-            QString strSnapshotName = tr("Snapshot %1");
-            QRegExp regExp(QString("^") + strSnapshotName.arg("([0-9]+)") + QString("$"));
+            /* Search for a maximum available snapshot index: */
+            int iMaximumIndex = 0;
+            const QString strNameTemplate = tr("Snapshot %1");
+            const QRegExp reName(QString("^") + strNameTemplate.arg("([0-9]+)") + QString("$"));
             QTreeWidgetItemIterator iterator(m_pSnapshotTree);
             while (*iterator)
             {
-                QString strSnapshot = static_cast<UISnapshotItem*>(*iterator)->text(Column_Name);
-                int iPos = regExp.indexIn(strSnapshot);
-                if (iPos != -1)
-                    iMaxSnapShotIndex = regExp.cap(1).toInt() > iMaxSnapShotIndex ? regExp.cap(1).toInt() : iMaxSnapShotIndex;
+                const QString strName = static_cast<UISnapshotItem*>(*iterator)->text(Column_Name);
+                const int iPosition = reName.indexIn(strName);
+                if (iPosition != -1)
+                    iMaximumIndex = reName.cap(1).toInt() > iMaximumIndex
+                                  ? reName.cap(1).toInt()
+                                  : iMaximumIndex;
                 ++iterator;
             }
-            /* Assign corresponding snapshot name: */
-            pDlg->setName(strSnapshotName.arg(iMaxSnapShotIndex + 1));
-
-            /* Show Take Snapshot dialog: */
-            if (pDlg->exec() != QDialog::Accepted)
+
+            /* Prepare final snapshot name/description: */
+            QString strFinalName = strNameTemplate.arg(iMaximumIndex + 1);
+            QString strFinalDescription;
+
+            /* Should we take snapshot manually? */
+            if (!fAutomatically)
             {
-                /* Cleanup dialog if it wasn't destroyed in own loop: */
-                if (pDlg)
-                    delete pDlg;
+                /* Create take-snapshot dialog: */
+                QWidget *pDlgParent = windowManager().realParentWindow(this);
+                QPointer<UITakeSnapshotDialog> pDlg = new UITakeSnapshotDialog(pDlgParent, comMachine);
+                windowManager().registerNewParent(pDlg, pDlgParent);
+
+                /* Assign corresponding icon: */
+                QPixmap pixmap = vboxGlobal().vmUserPixmapDefault(comMachine);
+                if (pixmap.isNull())
+                    pixmap = vboxGlobal().vmGuestOSTypePixmapDefault(comMachine.GetOSTypeId());
+                pDlg->setPixmap(pixmap);
+
+                /* Assign corresponding snapshot name: */
+                pDlg->setName(strFinalName);
+
+                /* 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 final snapshot name/description: */
+                strFinalName = pDlg->name().trimmed();
+                strFinalDescription = pDlg->description();
+
+                /* Cleanup dialog: */
+                delete pDlg;
+            }
+
+            /* Take snapshot: */
+            QString strSnapshotId;
+            CProgress comProgress = comMachine.TakeSnapshot(strFinalName, strFinalDescription, true, strSnapshotId);
+            if (!comMachine.isOk())
+            {
+                msgCenter().cannotTakeSnapshot(comMachine, comMachine.GetName());
                 break;
             }
 
-            /* Acquire real snapshot name/description: */
-            const QString strRealSnapshotName = pDlg->name().trimmed();
-            const QString strRealSnapshotDescription = pDlg->description();
-
-            /* 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");
+            msgCenter().showModalProgressDialog(comProgress, comMachine.GetName(), ":/progress_snapshot_create_90px.png");
             if (!comProgress.isOk() || comProgress.GetResultCode() != 0)
             {
-                msgCenter().cannotTakeSnapshot(comProgress, m_comMachine.GetName());
+                msgCenter().cannotTakeSnapshot(comProgress, comMachine.GetName());
                 break;
             }

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

@@ -167 +167 @@
 
         /** Proposes to take a snapshot. */
-        bool takeSnapshot();
+        bool takeSnapshot(bool fAutomatically = false);
         /** Proposes to delete the snapshot. */
         bool deleteSnapshot();