Changeset 42553 in vbox

Timestamp:

Aug 2, 2012 5:36:40 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Restoring snapshot-view auto-update functionality, using valid events for that.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (2 diffs)
• selector/UISelectorWindow.cpp (modified) (4 diffs)
• selector/UISelectorWindow.h (modified) (1 diff)
• selector/UIVirtualBoxEventHandler.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIMainEventListener.cpp

@@ -32 +32 @@
 #include "CMachineRegisteredEvent.h"
 #include "CSessionStateChangedEvent.h"
+#include "CSnapshotTakenEvent.h"
+#include "CSnapshotDeletedEvent.h"
 #include "CSnapshotChangedEvent.h"
 #include "CMousePointerShapeChangedEvent.h"
@@ -128 +130 @@
             break;
         }
-        /* Not used:
         case KVBoxEventType_OnSnapshotTaken:
+        {
+            CSnapshotTakenEvent es(pEvent);
+            emit sigSnapshotChange(es.GetMachineId(), es.GetSnapshotId());
+            break;
+        }
         case KVBoxEventType_OnSnapshotDeleted:
-         */
+        {
+            CSnapshotDeletedEvent es(pEvent);
+            emit sigSnapshotChange(es.GetMachineId(), es.GetSnapshotId());
+            break;
+        }
         case KVBoxEventType_OnSnapshotChanged:
         {

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

@@ -135 +135 @@
 }
 
+void UISelectorWindow::sltSnapshotChanged(QString strId)
+{
+    /* Get current item: */
+    UIVMItem *pCurrentItem = currentItem();
+
+    /* Make sure current item present: */
+    if (!pCurrentItem)
+        return;
+
+    /* If signal is for current item: */
+    if (pCurrentItem->id() == strId)
+        m_pVMDesktop->updateSnapshots(pCurrentItem, pCurrentItem->machine());
+}
+
 void UISelectorWindow::sltDetailsViewIndexChanged(int iWidgetIndex)
 {
@@ -784 +798 @@
             m_pContainer->setCurrentWidget(m_pDetails);
 
-        CMachine m = pItem->machine();
-        QList<CMachine> machines;
-        for (int i = 0; i < items.size(); ++i)
-            machines << items[i]->machine();
         KMachineState state = pItem->machineState();
 
@@ -793 +803 @@
             m_pDetails->setItems(currentItems());
         if (fRefreshSnapshots)
-            m_pVMDesktop->updateSnapshots(pItem, m);
+            m_pVMDesktop->updateSnapshots(pItem, pItem->machine());
 
         /* Update the Start button action appearance: */
@@ -1451 +1461 @@
     connect(&vboxGlobal(), SIGNAL(sigTrayIconShow(bool)), this, SLOT(sltTrayIconShow(bool)));
 #endif /* VBOX_GUI_WITH_SYSTRAY */
+
+    /* Global event handlers: */
+    connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)), this, SLOT(sltSnapshotChanged(QString)));
 }
 

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

@@ -62 +62 @@
 
 private slots:
+
+    /* Handler: Snapshot-view stuff: */
+    void sltSnapshotChanged(QString strId);
 
     /* Handler: Details-view stuff: */

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

@@ -61 +61 @@
         << KVBoxEventType_OnMachineRegistered
         << KVBoxEventType_OnSessionStateChanged
+        << KVBoxEventType_OnSnapshotTaken
+        << KVBoxEventType_OnSnapshotDeleted
         << KVBoxEventType_OnSnapshotChanged;