Changeset 46332 in vbox for trunk/src/VBox/Frontends

Timestamp:

May 30, 2013 1:43:23 PM (12 years ago)

Author:

vboxsync

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

86105

Message:

FE/Qt: 6756: Selector UI: Details-view: Machine-preview: Do not cache the machine-state, always try to use the actual one, accessible through the CMachine getter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details

Files:

• UIGMachinePreview.cpp (modified) (13 diffs)
• UIGMachinePreview.h (modified) (2 diffs)

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

@@ -49 +49 @@
 UIGMachinePreview::UIGMachinePreview(QIGraphicsWidget *pParent)
     : QIWithRetranslateUI4<QIGraphicsWidget>(pParent)
-    , m_machineState(KMachineState_Null)
     , m_pUpdateTimer(new QTimer(this))
     , m_pUpdateTimerMenu(0)
@@ -92 +91 @@
     connect(m_pUpdateTimer, SIGNAL(timeout()), this, SLOT(sltRecreatePreview()));
     connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)),
-            this, SLOT(sltMachineStateChange(QString, KMachineState)));
+            this, SLOT(sltMachineStateChange(QString)));
 
     /* Retranslate the UI */
@@ -123 +122 @@
 }
 
-void UIGMachinePreview::sltMachineStateChange(QString strId, KMachineState state)
-{
-    if (!m_machine.isNull() && m_machine.GetId() == strId)
-    {
-        /* Cache the machine state: */
-        m_machineState = state;
-        restart();
-    }
+void UIGMachinePreview::sltMachineStateChange(QString strId)
+{
+    /* Make sure its the event for our machine: */
+    if (m_machine.isNull() || m_machine.GetId() != strId)
+        return;
+
+    /* Restart the preview: */
+    restart();
 }
 
@@ -139 +138 @@
         return;
 
-    /* Remove preview if any: */
+    /* Cleanup preview first: */
     if (m_pPreviewImg)
     {
@@ -146 +145 @@
     }
 
-    /* We are not creating preview for inaccessible VMs: */
-    if (m_machineState == KMachineState_Null)
-        return;
-
-    if (!m_machine.isNull() && m_vRect.width() > 0 && m_vRect.height() > 0)
+    /* Fetch the latest machine-state: */
+    KMachineState machineState = m_machine.isNull() ? KMachineState_Null : m_machine.GetState();
+
+    /* We are creating preview only for assigned and accessible VMs: */
+    if (!m_machine.isNull() && machineState != KMachineState_Null &&
+        m_vRect.width() > 0 && m_vRect.height() > 0)
     {
         QImage image(size().toSize(), QImage::Format_ARGB32);
@@ -161 +161 @@
         {
             /* Use the image which may be included in the save state. */
-            if (m_machineState == KMachineState_Saved || m_machineState == KMachineState_Restoring)
+            if (machineState == KMachineState_Saved || machineState == KMachineState_Restoring)
             {
                 ULONG width = 0, height = 0;
@@ -168 +168 @@
                 {
                     QImage shot = QImage::fromData(screenData.data(), screenData.size(), "PNG")
-                            .scaled(m_vRect.size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
+                                  .scaled(m_vRect.size(), Qt::IgnoreAspectRatio, Qt::SmoothTransformation);
                     dimImage(shot);
                     painter.drawImage(m_vRect.x(), m_vRect.y(), shot);
@@ -175 +175 @@
             }
             /* Use the current VM output. */
-            else if (m_machineState == KMachineState_Running || m_machineState == KMachineState_Paused)
+            else if (machineState == KMachineState_Running || machineState == KMachineState_Paused)
             {
                 if (m_session.GetState() == KSessionState_Locked)
@@ -210 +210 @@
                                 QImage shot = QImage((uchar*)d, m_vRect.width(), m_vRect.height(), QImage::Format_RGB32);
 
-                                if (m_machineState == KMachineState_Paused)
+                                if (machineState == KMachineState_Paused)
                                     dimImage(shot);
                                 painter.drawImage(m_vRect.x(), m_vRect.y(), shot);
@@ -220 +220 @@
             }
         }
+
         if (fDone)
             m_pPreviewImg = new QImage(image);
     }
+
+    /* Redraw preview in any case! */
     update();
 }
@@ -378 +381 @@
 void UIGMachinePreview::restart()
 {
+    /* Fetch the latest machine-state: */
+    KMachineState machineState = m_machine.isNull() ? KMachineState_Null : m_machine.GetState();
+
     /* Reopen session if necessary: */
     if (m_session.GetState() == KSessionState_Locked)
@@ -383 +389 @@
     if (!m_machine.isNull())
     {
-        /* Fetch the latest machine state: */
-        m_machineState = m_machine.GetState();
         /* Lock the session for the current machine: */
-        if (m_machineState == KMachineState_Running || m_machineState == KMachineState_Paused)
+        if (machineState == KMachineState_Running || machineState == KMachineState_Paused)
             m_machine.LockMachine(m_session, KLockType_Shared);
     }
@@ -396 +400 @@
     if (!m_machine.isNull())
     {
-        if (m_pUpdateTimer->interval() > 0 && m_machineState == KMachineState_Running)
+        if (m_pUpdateTimer->interval() > 0 && machineState == KMachineState_Running)
             m_pUpdateTimer->start();
     }

trunk/src/VBox/Frontends/VirtualBox/src/selector/graphics/details/UIGMachinePreview.h

@@ -73 +73 @@
 private slots:
 
-    /* Handler: Global-event listener: */
-    void sltMachineStateChange(QString strId, KMachineState state);
+    /* Handler: Global-event listener stuff: */
+    void sltMachineStateChange(QString strId);
 
     /* Handler: Preview recreator: */
@@ -105 +105 @@
     CSession m_session;
     CMachine m_machine;
-    KMachineState m_machineState;
     QTimer *m_pUpdateTimer;
     QMenu *m_pUpdateTimerMenu;