Changeset 42813 in vbox for trunk/src

Timestamp:

Aug 14, 2012 5:38:46 PM (12 years ago)

Author:

vboxsync

Message:

FE/Qt: 6234: Support for VM groups: Details-view update fix, performance improvement.

Location:

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

Files:

• UIGDetailsElement.h (modified) (1 diff)
• UIGDetailsElements.cpp (modified) (2 diffs)
• UIGDetailsGroup.cpp (modified) (2 diffs)
• UIGDetailsGroup.h (modified) (1 diff)
• UIGDetailsSet.cpp (modified) (7 diffs)
• UIGDetailsSet.h (modified) (2 diffs)

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

@@ -49 +49 @@
 
 signals:
+
+    /* Notifier: Prepare stuff: */
+    void sigElementUpdateDone();
 
     /* Notifiers: Hover stuff: */

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

@@ -77 +77 @@
 {
     if (text() != newText)
-    {
         setText(newText);
-        model()->updateLayout();
-        update();
-    }
     cleanupThread();
+    emit sigElementUpdateDone();
 }
 
@@ -224 +221 @@
 {
     m_pPreview->setMachine(machine());
+    emit sigElementUpdateDone();
 }
 

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

@@ -160 +160 @@
 }
 
-void UIGDetailsGroup::sltNextDone(QString strGroupId)
+void UIGDetailsGroup::sltNextStep(QString strGroupId)
 {
     /* Clear step: */
@@ -256 +256 @@
         m_pStep = new UIPrepareStep(this, strGroupId);
         connect(pSet, SIGNAL(sigSetCreationDone()), m_pStep, SLOT(sltStepDone()), Qt::QueuedConnection);
-        connect(m_pStep, SIGNAL(sigStepDone(const QString&)), this, SLOT(sltNextDone(const QString&)), Qt::QueuedConnection);
+        connect(m_pStep, SIGNAL(sigStepDone(const QString&)), this, SLOT(sltNextStep(const QString&)), Qt::QueuedConnection);
         /* Configure set: */
         pSet->configure(m_items[m_iStep], m_settings, m_items.size() == 1);
-        /* Update model: */
-        model()->updateLayout();
-    }
-}
-
+    }
+}
+

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

@@ -67 +67 @@
     /* Handlers: Prepare stuff: */
     void sltFirstStep(QString strGroupId);
-    void sltNextDone(QString strGroupId);
+    void sltNextStep(QString strGroupId);
 
 private:

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

@@ -32 +32 @@
 UIGDetailsSet::UIGDetailsSet(UIGDetailsItem *pParent)
     : UIGDetailsItem(pParent)
+    , m_pStep(0)
     , m_iStep(-1)
     , m_iLastStep(-1)
@@ -43 +44 @@
     /* Prepare connections: */
     connect(this, SIGNAL(sigStartFirstStep(QString)), this, SLOT(sltFirstStep(QString)), Qt::QueuedConnection);
-    connect(this, SIGNAL(sigElementPrepared(QString)), this, SLOT(sltNextStep(QString)), Qt::QueuedConnection);
     connect(this, SIGNAL(sigSetPrepared()), this, SLOT(sltSetPrepared()), Qt::QueuedConnection);
     connect(gVBoxEvents, SIGNAL(sigMachineStateChange(QString, KMachineState)), this, SLOT(sltMachineStateChange(QString)));
@@ -79 +79 @@
 void UIGDetailsSet::sltFirstStep(QString strSetId)
 {
+    /* Clear step: */
+    delete m_pStep;
+    m_pStep = 0;
+
     /* Was that a requested set? */
     if (strSetId != m_strSetId)
@@ -90 +94 @@
 void UIGDetailsSet::sltNextStep(QString strSetId)
 {
+    /* Clear step: */
+    delete m_pStep;
+    m_pStep = 0;
+
     /* Was that a requested set? */
     if (strSetId != m_strSetId)
@@ -477 +485 @@
     }
 
+    /* Clear step: */
+    delete m_pStep;
+    m_pStep = 0;
+
     /* Prepare first element: */
     m_strSetId = QUuid::createUuid().toString();
@@ -498 +510 @@
         /* Check if element is present already: */
         UIGDetailsElement *pElement = element(elementType);
-        /* Create if necessary: */
+        /* Create element if necessary: */
+        bool fJustCreated = false;
         if (!pElement)
+        {
+            fJustCreated = true;
             pElement = createElement(elementType, fOpen);
-        /* Prepare element: */
+        }
+
+        /* Show element if necessary: */
         if (fVisible && !pElement->isVisible())
+        {
             pElement->show();
+            model()->updateLayout();
+        }
+        /* Hide element if necessary: */
         else if (!fVisible && pElement->isVisible())
+        {
             pElement->hide();
+            model()->updateLayout();
+        }
+        /* Update model if necessary: */
+        else if (fJustCreated)
+            model()->updateLayout();
+
+        /* For visible element: */
         if (pElement->isVisible())
+        {
+            /* Create prepare step: */
+            m_pStep = new UIPrepareStep(this, strSetId);
+            connect(pElement, SIGNAL(sigElementUpdateDone()), m_pStep, SLOT(sltStepDone()), Qt::QueuedConnection);
+            connect(m_pStep, SIGNAL(sigStepDone(const QString&)), this, SLOT(sltNextStep(const QString&)), Qt::QueuedConnection);
+
+            /* Update element: */
             pElement->updateAppearance();
-        model()->updateLayout();
-        /* Mark element prepared: */
-        emit sigElementPrepared(strSetId);
+        }
+        /* For invisible element: */
+        else
+        {
+            /* Just go to the next step: */
+            sltNextStep(strSetId);
+        }
     }
     /* Step number out of bounds: */
@@ -516 +556 @@
     {
         /* Mark whole set prepared: */
+        model()->updateLayout();
+        foreach (UIGDetailsItem *pElement, items())
+            pElement->update();
         emit sigSetPrepared();
     }

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

@@ -41 +41 @@
     /* Notifiers: Prepare stuff: */
     void sigStartFirstStep(QString strSetId);
-    void sigElementPrepared(QString strSetId);
     void sigSetPrepared();
     void sigSetCreationDone();
@@ -112 +111 @@
 
     /* Prepare variables: */
+    UIPrepareStep *m_pStep;
     int m_iStep;
     int m_iLastStep;