Changeset 49645 in vbox

Timestamp:

Nov 25, 2013 6:03:38 PM (11 years ago)

Author:

vboxsync

svn:sync-xref-src-repo-rev:

90888

Message:

FE/Qt: Separate Qt signals for snapshot take/delete events.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIMainEventListener.cpp (modified) (2 diffs)
• globals/UIMainEventListener.h (modified) (1 diff)
• medium/UIMediumEnumerator.cpp (modified) (1 diff)
• selector/UISelectorWindow.cpp (modified) (1 diff)
• selector/UIVirtualBoxEventHandler.cpp (modified) (1 diff)
• selector/UIVirtualBoxEventHandler.h (modified) (1 diff)
• selector/graphics/chooser/UIGChooserModel.cpp (modified) (1 diff)
• selector/graphics/details/UIGDetailsSet.cpp (modified) (1 diff)

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

@@ -133 +133 @@
         {
             CSnapshotTakenEvent es(pEvent);
-            emit sigSnapshotChange(es.GetMachineId(), es.GetSnapshotId());
+            emit sigSnapshotTake(es.GetMachineId(), es.GetSnapshotId());
             break;
         }
@@ -139 +139 @@
         {
             CSnapshotDeletedEvent es(pEvent);
-            emit sigSnapshotChange(es.GetMachineId(), es.GetSnapshotId());
+            emit sigSnapshotDelete(es.GetMachineId(), es.GetSnapshotId());
             break;
         }

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

@@ -63 +63 @@
     void sigMachineRegistered(QString strId, bool fRegistered);
     void sigSessionStateChange(QString strId, KSessionState state);
+    void sigSnapshotTake(QString strId, QString strSnapshotId);
+    void sigSnapshotDelete(QString strId, QString strSnapshotId);
     void sigSnapshotChange(QString strId, QString strSnapshotId);
     /* All Console Signals */

trunk/src/VBox/Frontends/VirtualBox/src/medium/UIMediumEnumerator.cpp

@@ -70 +70 @@
     /* Prepare Main event handlers: */
     connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)), this, SLOT(sltHandleMachineUpdate(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)), this, SLOT(sltHandleMachineUpdate(QString)));
     connect(gVBoxEvents, SIGNAL(sigMachineRegistered(QString, bool)), this, SLOT(sltHandleMachineRegistration(QString, bool)));

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

@@ -1517 +1517 @@
     connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)), this, SLOT(sltStateChanged(QString)));
     connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)), this, SLOT(sltStateChanged(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QString, QString)), this, SLOT(sltSnapshotChanged(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)), this, SLOT(sltSnapshotChanged(QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)), this, SLOT(sltSnapshotChanged(QString)));
 }

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

@@ -84 +84 @@
             Qt::QueuedConnection);
 
+    connect(pListener->getWrapped(), SIGNAL(sigSnapshotTake(QString, QString)),
+            this, SIGNAL(sigSnapshotTake(QString, QString)),
+            Qt::QueuedConnection);
+
+    connect(pListener->getWrapped(), SIGNAL(sigSnapshotDelete(QString, QString)),
+            this, SIGNAL(sigSnapshotDelete(QString, QString)),
+            Qt::QueuedConnection);
+
     connect(pListener->getWrapped(), SIGNAL(sigSnapshotChange(QString, QString)),
             this, SIGNAL(sigSnapshotChange(QString, QString)),

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

@@ -38 +38 @@
     void sigMachineRegistered(QString strId, bool fRegistered);
     void sigSessionStateChange(QString strId, KSessionState state);
+    void sigSnapshotTake(QString strId, QString strSnapshotId);
+    void sigSnapshotDelete(QString strId, QString strSnapshotId);
     void sigSnapshotChange(QString strId, QString strSnapshotId);
 

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/chooser/UIGChooserModel.cpp

@@ -1219 +1219 @@
     connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)),
             this, SLOT(sltSessionStateChanged(QString, KSessionState)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QString, QString)),
+            this, SLOT(sltSnapshotChanged(QString, QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)),
+            this, SLOT(sltSnapshotChanged(QString, QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)),
             this, SLOT(sltSnapshotChanged(QString, QString)));

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGDetailsSet.cpp

@@ -343 +343 @@
     connect(gVBoxEvents, SIGNAL(sigMachineDataChange(QString)), this, SLOT(sltMachineAttributesChange(QString)));
     connect(gVBoxEvents, SIGNAL(sigSessionStateChange(QString, KSessionState)), this, SLOT(sltMachineAttributesChange(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotTake(QString, QString)), this, SLOT(sltMachineAttributesChange(QString)));
+    connect(gVBoxEvents, SIGNAL(sigSnapshotDelete(QString, QString)), this, SLOT(sltMachineAttributesChange(QString)));
     connect(gVBoxEvents, SIGNAL(sigSnapshotChange(QString, QString)), this, SLOT(sltMachineAttributesChange(QString)));