Changeset 96635 in vbox

Timestamp:

Sep 7, 2022 4:16:37 PM (2 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9930: Always pass a list of VM items to Snapshot pane.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• manager/UIToolPaneMachine.cpp (modified) (3 diffs)
• manager/UIToolPaneMachine.h (modified) (2 diffs)
• manager/UIVirtualBoxManagerWidget.cpp (modified) (2 diffs)
• snapshots/UISnapshotPane.cpp (modified) (6 diffs)
• snapshots/UISnapshotPane.h (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.cpp

@@ -175 +175 @@
                     connect(m_pPaneSnapshots, &UISnapshotPane::sigCurrentItemChange,
                             this, &UIToolPaneMachine::sigCurrentSnapshotItemChange);
-                    m_pPaneSnapshots->setMachine(m_comMachine);
+                    m_pPaneSnapshots->setMachineItems(m_items);
 
                     /* Add into layout: */
@@ -314 +314 @@
         m_pPaneDetails->setItems(m_items);
     }
+    /* Update snapshots pane if it is open: */
+    if (isToolOpened(UIToolType_Snapshots))
+    {
+        AssertPtrReturnVoid(m_pPaneSnapshots);
+        m_pPaneSnapshots->setMachineItems(m_items);
+    }
     /* Update logs pane if it is open: */
     if (isToolOpened(UIToolType_Logs))
@@ -334 +340 @@
 }
 
-void UIToolPaneMachine::setMachine(const CMachine &comMachine)
-{
-    /* Cache passed value: */
-    m_comMachine = comMachine;
-
-    /* Update snapshots pane is it is open: */
-    if (isToolOpened(UIToolType_Snapshots))
-    {
-        AssertPtrReturnVoid(m_pPaneSnapshots);
-        m_pPaneSnapshots->setMachine(m_comMachine);
-    }
-}
-
 bool UIToolPaneMachine::isCurrentStateItemSelected() const
 {

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIToolPaneMachine.h

@@ -105 +105 @@
     void setItems(const QList<UIVirtualMachineItem*> &items);
 
-    /** Defines the @a comMachine object. */
-    void setMachine(const CMachine &comMachine);
-
     /** Returns whether current-state item of Snapshot pane is selected. */
     bool isCurrentStateItemSelected() const;
@@ -152 +149 @@
     /** Holds the cache of passed items. */
     QList<UIVirtualMachineItem*>  m_items;
-    /** Holds the cache of passed machine. */
-    CMachine                      m_comMachine;
 };
 

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManagerWidget.cpp

@@ -1114 +1114 @@
         if (m_pPaneToolsMachine->currentTool() == UIToolType_Error)
             sltHandleToolsPaneIndexChange();
-
-        /* Propagate current items to update the Details-pane: */
-        m_pPaneToolsMachine->setItems(currentItems());
-        /* Propagate current machine to update the Snapshots-pane or/and Logviewer-pane: */
-        if (pItem->itemType() == UIVirtualMachineItemType_Local)
-            m_pPaneToolsMachine->setMachine(pItem->toLocal()->machine());
     }
     else
@@ -1133 +1127 @@
                 m_pPaneToolsMachine->setErrorDetails(pItem->accessError());
         }
-
-        /* Propagate current items to update the Details-pane (in any case): */
-        m_pPaneToolsMachine->setItems(currentItems());
-        /* Propagate current machine to update the Snapshots-pane or/and Logviewer-pane (in any case): */
-        m_pPaneToolsMachine->setMachine(CMachine());
-    }
-}
+    }
+
+    /* Propagate current items to update the Details-pane: */
+    m_pPaneToolsMachine->setItems(currentItems());
+}

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

@@ -57 +57 @@
 #include "UITranslator.h"
 #include "UIVirtualBoxEventHandler.h"
+#include "UIVirtualMachineItem.h"
+#include "UIVirtualMachineItemLocal.h"
 #include "UIWizardCloneVM.h"
 
@@ -500 +502 @@
     , m_pDetailsWidget(0)
 {
-    /* Prepare: */
     prepare();
 }
@@ -506 +507 @@
 UISnapshotPane::~UISnapshotPane()
 {
-    /* Cleanup: */
     cleanup();
 }
 
-void UISnapshotPane::setMachine(const CMachine &comMachine)
+void UISnapshotPane::setMachineItems(const QList<UIVirtualMachineItem*> &items)
 {
     /* Cache passed machine: */
-    m_comMachine = comMachine;
+    m_comMachine = items.isEmpty() ? CMachine() : items.first()->toLocal()->machine();
 
     /* Cache machine details: */
@@ -524 +524 @@
     else
     {
-        m_uMachineId = comMachine.GetId();
-        m_enmSessionState = comMachine.GetSessionState();
+        m_uMachineId = m_comMachine.GetId();
+        m_enmSessionState = m_comMachine.GetSessionState();
         m_fShapshotOperationsAllowed = gEDataManager->machineSnapshotOperationsEnabled(m_uMachineId);
     }
@@ -1213 +1213 @@
     loadSettings();
 
-
+    /* Register help topic: */
     uiCommon().setHelpKeyword(this, "snapshots");
 
@@ -1432 +1432 @@
 {
     /* Create a child of passed item: */
-    UISnapshotItem *pSnapshotItem = pItem ? new UISnapshotItem(this, pItem, comSnapshot) :
-                                            new UISnapshotItem(this, m_pSnapshotTree, comSnapshot);
+    UISnapshotItem *pSnapshotItem = pItem ? new UISnapshotItem(this, pItem, comSnapshot)
+                                          : new UISnapshotItem(this, m_pSnapshotTree, comSnapshot);
     /* And recache it's content: */
     pSnapshotItem->recache();

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

@@ -51 +51 @@
 class UISnapshotItem;
 class UISnapshotTree;
+class UIVirtualMachineItem;
 
 
@@ -81 +82 @@
     virtual ~UISnapshotPane() RT_OVERRIDE;
 
-    /** Defines the @a comMachine object to be parsed. */
-    void setMachine(const CMachine &comMachine);
+    /** Defines the machine @a items to be parsed. */
+    void setMachineItems(const QList<UIVirtualMachineItem*> &items);
 
     /** Returns cached snapshot-item icon depending on @a fOnline flag. */