儲存庫 vbox 的更動 67509

時間撮記:

2017-6-20 下午02:10:06 (7 年 以前)

作者:

vboxsync

訊息:

FE/Qt: bugref:8901: Selector UI: Tools pane: Snapshot pane: Implement 'delete snapshot' event handler.

位置:

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

檔案:

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

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

@@ -729 +729 @@
             strMachineId.toUtf8().constData(), strSnapshotId.toUtf8().constData()));
 
-    // TODO: Refresh only necessary bits.
-    /* Refresh everything: */
-    refreshAll();
+    /* Prepare result: */
+    bool fSuccess = false;
+    {
+        /* Prevent snapshot editing in the meantime: */
+        QWriteLocker locker(m_pLockReadWrite);
+
+        /* Search for an existing item with such id: */
+        UISnapshotItem *pItem = findItem(strSnapshotId);
+        fSuccess = pItem;
+
+        /* Make sure item has no more than one child: */
+        if (fSuccess)
+            fSuccess = pItem->childCount() <= 1;
+
+        /* Detach child before deleting item: */
+        QTreeWidgetItem *pChild = 0;
+        if (fSuccess && pItem->childCount() == 1)
+            pChild = pItem->takeChild(0);
+
+        /* Check whether item has parent: */
+        QTreeWidgetItem *pParent = 0;
+        if (fSuccess)
+            pParent = pItem->QTreeWidgetItem::parent();
+
+        /* If item has child: */
+        if (pChild)
+        {
+            /* Determine where the item located: */
+            int iIndexOfChild = -1;
+            if (fSuccess)
+            {
+                if (pParent)
+                    iIndexOfChild = pParent->indexOfChild(pItem);
+                else
+                    iIndexOfChild = m_pSnapshotTree->indexOfTopLevelItem(pItem);
+                fSuccess = iIndexOfChild != -1;
+            }
+
+            /* And move child into this place: */
+            if (fSuccess)
+            {
+                if (pParent)
+                    pParent->insertChild(iIndexOfChild, pChild);
+                else
+                    m_pSnapshotTree->insertTopLevelItem(iIndexOfChild, pChild);
+                expandItemChildren(pChild);
+            }
+        }
+
+        /* Delete item finally: */
+        if (fSuccess)
+        {
+            delete pItem;
+            pItem = 0;
+
+            LogRel(("GUI: Snapshot tree update successful!\n"));
+        }
+    }
+
+    /* Just refresh everything as fallback: */
+    if (!fSuccess)
+    {
+        LogRel(("GUI: Snapshot tree update failed! Rebuilding from scratch...\n"));
+        refreshAll();
+    }
 }
 
@@ -1748 +1810 @@
 }
 
+void UISnapshotPane::expandItemChildren(QTreeWidgetItem *pItem)
+{
+    pItem ->setExpanded(true);
+    for (int i = 0; i < pItem->childCount(); ++i)
+        expandItemChildren(pItem->child(i));
+}
+
 #include "UISnapshotPane.moc"
 

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

@@ -186 +186 @@
         /** Searches for smallest snapshot age starting with @a pItem as parent. */
         SnapshotAgeFormat traverseSnapshotAge(QTreeWidgetItem *pItem) const;
+
+        /** Expand all the children starting with @a pItem. */
+        void expandItemChildren(QTreeWidgetItem *pItem);
     /** @} */