Changeset 57670 in vbox

Timestamp:

Sep 9, 2015 3:06:32 PM (9 years ago)

Author:

vboxsync

Message:

FE/Qt: Selector UI: Details pane: Elements: Cleanup/rework (step 3).

Location:

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

Files:

• UIGDetailsElements.cpp (modified) (3 diffs)
• UIGDetailsElements.h (modified) (3 diffs)

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

@@ -55 +55 @@
 
 
-/* Constructor: */
 UIGDetailsUpdateThread::UIGDetailsUpdateThread(const CMachine &machine)
     : m_machine(machine)
@@ -115 +114 @@
         m_pThread = 0;
     }
+}
+
+
+UIGDetailsElementPreview::UIGDetailsElementPreview(UIGDetailsSet *pParent, bool fOpened)
+    : UIGDetailsElement(pParent, DetailsElementType_Preview, fOpened)
+{
+    /* Icon: */
+    setIcon(UIIconPool::iconSet(":/machine_16px.png"));
+
+    /* Prepare variables: */
+    int iMargin = data(ElementData_Margin).toInt();
+    /* Prepare layout: */
+    QGraphicsLinearLayout *pLayout = new QGraphicsLinearLayout;
+    pLayout->setContentsMargins(iMargin, 2 * iMargin + minimumHeaderHeight(), iMargin, iMargin);
+    setLayout(pLayout);
+
+    /* Create preview: */
+    m_pPreview = new UIGMachinePreview(this);
+    connect(m_pPreview, SIGNAL(sigSizeHintChanged()),
+            this, SLOT(sltPreviewSizeHintChanged()));
+    pLayout->addItem(m_pPreview);
+    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
+
+    /* Translate finally: */
+    retranslateUi();
+}
+
+void UIGDetailsElementPreview::sltPreviewSizeHintChanged()
+{
+    /* Recursively update size-hints: */
+    updateGeometry();
+    /* Update whole model layout: */
+    model()->updateLayout();
+}
+
+void UIGDetailsElementPreview::retranslateUi()
+{
+    /* Assign corresponding name: */
+    setName(gpConverter->toString(elementType()));
+}
+
+int UIGDetailsElementPreview::minimumWidthHint() const
+{
+    /* Prepare variables: */
+    int iMargin = data(ElementData_Margin).toInt();
+
+    /* Calculating proposed width: */
+    int iProposedWidth = 0;
+
+    /* Maximum between header width and preview width: */
+    iProposedWidth += qMax(minimumHeaderWidth(), m_pPreview->minimumSizeHint().toSize().width());
+
+    /* Two margins: */
+    iProposedWidth += 2 * iMargin;
+
+    /* Return result: */
+    return iProposedWidth;
+}
+
+int UIGDetailsElementPreview::minimumHeightHint(bool fClosed) const
+{
+    /* Prepare variables: */
+    int iMargin = data(ElementData_Margin).toInt();
+
+    /* Calculating proposed height: */
+    int iProposedHeight = 0;
+
+    /* Two margins: */
+    iProposedHeight += 2 * iMargin;
+
+    /* Header height: */
+    iProposedHeight += minimumHeaderHeight();
+
+    /* Element is opened? */
+    if (!fClosed)
+    {
+        iProposedHeight += iMargin;
+        iProposedHeight += m_pPreview->minimumSizeHint().toSize().height();
+    }
+    else
+    {
+        /* Additional height during animation: */
+        if (button()->isAnimationRunning())
+            iProposedHeight += additionalHeight();
+    }
+
+    /* Return result: */
+    return iProposedHeight;
+}
+
+void UIGDetailsElementPreview::updateLayout()
+{
+    /* Call to base-class: */
+    UIGDetailsElement::updateLayout();
+
+    /* Show/hide preview: */
+    if (closed() && m_pPreview->isVisible())
+        m_pPreview->hide();
+    if (opened() && !m_pPreview->isVisible() && !isAnimationRunning())
+        m_pPreview->show();
+}
+
+void UIGDetailsElementPreview::updateAppearance()
+{
+    /* Call for base class: */
+    UIGDetailsElement::updateAppearance();
+
+    /* Set new machine attribute: */
+    m_pPreview->setMachine(machine());
+    emit sigBuildDone();
 }
 
@@ -164 +273 @@
 
     COMBase::CleanupCOM();
-}
-
-
-UIGDetailsElementPreview::UIGDetailsElementPreview(UIGDetailsSet *pParent, bool fOpened)
-    : UIGDetailsElement(pParent, DetailsElementType_Preview, fOpened)
-{
-    /* Icon: */
-    setIcon(UIIconPool::iconSet(":/machine_16px.png"));
-
-    /* Prepare variables: */
-    int iMargin = data(ElementData_Margin).toInt();
-    /* Prepare layout: */
-    QGraphicsLinearLayout *pLayout = new QGraphicsLinearLayout;
-    pLayout->setContentsMargins(iMargin, 2 * iMargin + minimumHeaderHeight(), iMargin, iMargin);
-    setLayout(pLayout);
-
-    /* Create preview: */
-    m_pPreview = new UIGMachinePreview(this);
-    connect(m_pPreview, SIGNAL(sigSizeHintChanged()),
-            this, SLOT(sltPreviewSizeHintChanged()));
-    pLayout->addItem(m_pPreview);
-    setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-    /* Translate finally: */
-    retranslateUi();
-}
-
-void UIGDetailsElementPreview::sltPreviewSizeHintChanged()
-{
-    /* Recursively update size-hints: */
-    updateGeometry();
-    /* Update whole model layout: */
-    model()->updateLayout();
-}
-
-void UIGDetailsElementPreview::retranslateUi()
-{
-    /* Assign corresponding name: */
-    setName(gpConverter->toString(elementType()));
-}
-
-int UIGDetailsElementPreview::minimumWidthHint() const
-{
-    /* Prepare variables: */
-    int iMargin = data(ElementData_Margin).toInt();
-
-    /* Calculating proposed width: */
-    int iProposedWidth = 0;
-
-    /* Maximum between header width and preview width: */
-    iProposedWidth += qMax(minimumHeaderWidth(), m_pPreview->minimumSizeHint().toSize().width());
-
-    /* Two margins: */
-    iProposedWidth += 2 * iMargin;
-
-    /* Return result: */
-    return iProposedWidth;
-}
-
-int UIGDetailsElementPreview::minimumHeightHint(bool fClosed) const
-{
-    /* Prepare variables: */
-    int iMargin = data(ElementData_Margin).toInt();
-
-    /* Calculating proposed height: */
-    int iProposedHeight = 0;
-
-    /* Two margins: */
-    iProposedHeight += 2 * iMargin;
-
-    /* Header height: */
-    iProposedHeight += minimumHeaderHeight();
-
-    /* Element is opened? */
-    if (!fClosed)
-    {
-        iProposedHeight += iMargin;
-        iProposedHeight += m_pPreview->minimumSizeHint().toSize().height();
-    }
-    else
-    {
-        /* Additional height during animation: */
-        if (button()->isAnimationRunning())
-            iProposedHeight += additionalHeight();
-    }
-
-    /* Return result: */
-    return iProposedHeight;
-}
-
-void UIGDetailsElementPreview::updateLayout()
-{
-    /* Call to base-class: */
-    UIGDetailsElement::updateLayout();
-
-    /* Show/hide preview: */
-    if (closed() && m_pPreview->isVisible())
-        m_pPreview->hide();
-    if (opened() && !m_pPreview->isVisible() && !isAnimationRunning())
-        m_pPreview->show();
-}
-
-void UIGDetailsElementPreview::updateAppearance()
-{
-    /* Call for base class: */
-    UIGDetailsElement::updateAppearance();
-
-    /* Set new machine attribute: */
-    m_pPreview->setMachine(machine());
-    emit sigBuildDone();
 }
 

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

@@ -32 +32 @@
 class UIGMachinePreview;
 
+
 /* Element update thread: */
 class UIGDetailsUpdateThread : public QThread
@@ -90 +91 @@
     /* Variables: */
     UIGDetailsUpdateThread *m_pThread;
-};
-
-
-/* Thread 'General': */
-class UIGDetailsUpdateThreadGeneral : public UIGDetailsUpdateThread
-{
-    Q_OBJECT;
-
-public:
-
-    /* Constructor: */
-    UIGDetailsUpdateThreadGeneral(const CMachine &machine)
-        : UIGDetailsUpdateThread(machine) {}
-
-private:
-
-    /* Helpers: Prepare stuff: */
-    void run();
-};
-
-/* Element 'General': */
-class UIGDetailsElementGeneral : public UIGDetailsElementInterface
-{
-    Q_OBJECT;
-
-public:
-
-    /* Constructor: */
-    UIGDetailsElementGeneral(UIGDetailsSet *pParent, bool fOpened)
-        : UIGDetailsElementInterface(pParent, DetailsElementType_General, fOpened) {}
-
-private:
-
-    /* Helper: Update stuff: */
-    UIGDetailsUpdateThread* createUpdateThread() { return new UIGDetailsUpdateThreadGeneral(machine()); }
 };
 
@@ -161 +127 @@
 
 
+/* Thread 'General': */
+class UIGDetailsUpdateThreadGeneral : public UIGDetailsUpdateThread
+{
+    Q_OBJECT;
+
+public:
+
+    /* Constructor: */
+    UIGDetailsUpdateThreadGeneral(const CMachine &machine)
+        : UIGDetailsUpdateThread(machine) {}
+
+private:
+
+    /* Helpers: Prepare stuff: */
+    void run();
+};
+
+/* Element 'General': */
+class UIGDetailsElementGeneral : public UIGDetailsElementInterface
+{
+    Q_OBJECT;
+
+public:
+
+    /* Constructor: */
+    UIGDetailsElementGeneral(UIGDetailsSet *pParent, bool fOpened)
+        : UIGDetailsElementInterface(pParent, DetailsElementType_General, fOpened) {}
+
+private:
+
+    /* Helper: Update stuff: */
+    UIGDetailsUpdateThread* createUpdateThread() { return new UIGDetailsUpdateThreadGeneral(machine()); }
+};
+
+
 /* Thread 'System': */
 class UIGDetailsUpdateThreadSystem : public UIGDetailsUpdateThread