Changeset 43988 in vbox for trunk

Timestamp:

Nov 28, 2012 3:52:23 PM (12 years ago)

Author:

vboxsync

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

82363

Message:

FE/Qt: VM group UI: Details-view: Manual layout for group item.

Location:

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

Files:

• UIGDetailsGroup.cpp (modified) (7 diffs)
• UIGDetailsGroup.h (modified) (4 diffs)
• UIGDetailsSet.h (modified) (1 diff)

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

@@ -18 +18 @@
  */
 
-/* Qt includes: */
-#include <QGraphicsLinearLayout>
-
 /* GUI includes: */
 #include "UIGDetailsGroup.h"
@@ -30 +27 @@
 UIGDetailsGroup::UIGDetailsGroup()
     : UIGDetailsItem(0)
-    , m_pMainLayout(0)
-    , m_pLayout(0)
     , m_pStep(0)
     , m_iStep(0)
 {
-    /* Prepare layout: */
-    prepareLayout();
-
     /* Prepare connections: */
     connect(this, SIGNAL(sigStartFirstStep(QString)), this, SLOT(sltFirstStep(QString)), Qt::QueuedConnection);
@@ -67 +59 @@
     switch (pItem->type())
     {
-        case UIGDetailsItemType_Set: m_sets.append(pItem); m_pLayout->addItem(pItem); break;
+        case UIGDetailsItemType_Set: m_sets.append(pItem); break;
         default: AssertMsgFailed(("Invalid item type!")); break;
     }
@@ -76 +68 @@
     switch (pItem->type())
     {
-        case UIGDetailsItemType_Set: m_sets.removeAt(m_sets.indexOf(pItem)); m_pLayout->removeItem(pItem); break;
+        case UIGDetailsItemType_Set: m_sets.removeAt(m_sets.indexOf(pItem)); break;
         default: AssertMsgFailed(("Invalid item type!")); break;
     }
@@ -125 +117 @@
     }
     return QVariant();
-}
-
-void UIGDetailsGroup::updateLayout()
-{
-    /* Update size-hints for all the items: */
-    foreach (UIGDetailsItem *pItem, items())
-        pItem->updateSizeHint();
-    /* Update size-hint for this item: */
-    updateSizeHint();
-
-    /* Update layout finally: */
-    m_pMainLayout->activate();
-    m_pLayout->activate();
-    foreach (UIGDetailsItem *pItem, items())
-        pItem->updateLayout();
 }
 
@@ -194 +171 @@
 }
 
-void UIGDetailsGroup::prepareLayout()
-{
-    /* Prepare variables: */
-    int iMargin = data(GroupData_Margin).toInt();
-    int iSpacing = data(GroupData_Spacing).toInt();
-
-    /* Prepare layout: */
-    m_pMainLayout = new QGraphicsLinearLayout(Qt::Vertical);
-    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
-    m_pMainLayout->setSpacing(0);
-    m_pLayout = new QGraphicsLinearLayout(Qt::Vertical);
-    m_pLayout->setContentsMargins(iMargin, iMargin, iMargin, iMargin);
-    m_pLayout->setSpacing(iSpacing);
-    m_pMainLayout->addItem(m_pLayout);
-    m_pMainLayout->addStretch();
-    setLayout(m_pMainLayout);
-}
-
 void UIGDetailsGroup::prepareSets(const QList<UIVMItem*> &items)
 {
@@ -264 +223 @@
 }
 
+int UIGDetailsGroup::minimumWidthHint() const
+{
+    /* Prepare variables: */
+    int iMargin = data(GroupData_Margin).toInt();
+    int iMinimumWidthHint = 0;
+
+    /* Take into account all the sets: */
+    foreach (UIGDetailsItem *pItem, items())
+        if (UIGDetailsSet *pSet = pItem->toSet())
+            iMinimumWidthHint = qMax(iMinimumWidthHint, pSet->minimumWidthHint());
+
+    /* And two margins finally: */
+    iMinimumWidthHint += 2 * iMargin;
+
+    /* Return value: */
+    return iMinimumWidthHint;
+}
+
+int UIGDetailsGroup::minimumHeightHint() const
+{
+    /* Prepare variables: */
+    int iMargin = data(GroupData_Margin).toInt();
+    int iSpacing = data(GroupData_Spacing).toInt();
+    int iMinimumHeightHint = 0;
+
+    /* Take into account all the sets: */
+    foreach (UIGDetailsItem *pItem, items())
+        if (UIGDetailsSet *pSet = pItem->toSet())
+            iMinimumHeightHint += (pSet->minimumHeightHint() + iSpacing);
+
+    /* Minus last spacing: */
+    iMinimumHeightHint -= iSpacing;
+
+    /* And two margins finally: */
+    iMinimumHeightHint += 2 * iMargin;
+
+    /* Return value: */
+    return iMinimumHeightHint;
+}
+
+QSizeF UIGDetailsGroup::sizeHint(Qt::SizeHint which, const QSizeF &constraint /* = QSizeF() */) const
+{
+    /* If Qt::MinimumSize requested: */
+    if (which == Qt::MinimumSize || which == Qt::PreferredSize)
+    {
+        /* Return wrappers: */
+        return QSizeF(minimumWidthHint(), minimumHeightHint());
+    }
+
+    /* Call to base-class: */
+    return UIGDetailsItem::sizeHint(which, constraint);
+}
+
+void UIGDetailsGroup::updateLayout()
+{
+    /* Prepare variables: */
+    int iMargin = data(GroupData_Margin).toInt();
+    int iSpacing = data(GroupData_Spacing).toInt();
+    int iMaximumWidth = (int)geometry().width() - 2 * iMargin;
+    int iVerticalIndent = iMargin;
+
+    /* Layout all the sets: */
+    foreach (UIGDetailsItem *pItem, items())
+    {
+        /* Get particular set: */
+        UIGDetailsSet *pSet = pItem->toSet();
+        /* Move set: */
+        pItem->setPos(iMargin, iVerticalIndent);
+        /* Resize set: */
+        int iWidth = iMaximumWidth;
+        pItem->resize(iWidth, pSet->minimumHeightHint());
+        /* Layout set content: */
+        pItem->updateLayout();
+        /* Advance indent: */
+        iVerticalIndent += (pSet->minimumHeightHint() + iSpacing);
+    }
+}
+

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

@@ -24 +24 @@
 
 /* Forward declarations: */
-class QGraphicsLinearLayout;
 class UIVMItem;
 
@@ -60 +59 @@
     void clearItems(UIGDetailsItemType type = UIGDetailsItemType_Set);
 
-    /* API: Layout stuff: */
-    void updateLayout();
-
 private slots:
 
@@ -84 +80 @@
     /* Helpers: Prepare stuff: */
     void loadSettings();
-    void prepareLayout();
     void prepareSets(const QList<UIVMItem*> &items);
     void updateSets();
     void prepareSet(QString strGroupId);
 
-    /* Main variables: */
-    QGraphicsLinearLayout *m_pMainLayout;
-    QGraphicsLinearLayout *m_pLayout;
+    /* Helpers: Layout stuff: */
+    int minimumWidthHint() const;
+    int minimumHeightHint() const;
+    QSizeF sizeHint(Qt::SizeHint which, const QSizeF &constraint = QSizeF()) const;
+    void updateLayout();
+
+    /* Variables: */
     QList<UIGDetailsItem*> m_sets;
-
-    /* Prepare variables: */
     QList<UIVMItem*> m_items;
     UIPrepareStep *m_pStep;
@@ -100 +97 @@
     QString m_strGroupId;
     QStringList m_settings;
+
+    /* Friends: */
+    friend class UIGDetailsModel;
 };
 

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

@@ -117 +117 @@
     QString m_strSetId;
     QStringList m_settings;
+
+    /* Friends: */
+    friend class UIGDetailsGroup;
 };