Changeset 66905 in vbox

Timestamp:

May 16, 2017 9:52:09 AM (8 years ago)

Author:

vboxsync

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

115429

Message:

FE/Qt: bugref:8847: Host Network Manager: Get rid of QSplitter.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork

Files:

• UIHostNetworkManager.cpp (modified) (11 diffs)
• UIHostNetworkManager.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.cpp

@@ -24 +24 @@
 # include <QMenuBar>
 # include <QPushButton>
-# include <QSplitter>
 
 /* GUI includes: */
@@ -202 +201 @@
     , m_pActionRemove(0)
     , m_pActionDetails(0)
-    , m_pSplitter(0)
     , m_pTreeWidget(0)
     , m_pDetailsWidget(0)
@@ -439 +437 @@
 void UIHostNetworkManager::sltShowHostNetworkDetails(bool fShow)
 {
-    /* Show/hide details area: */
-    if (fShow)
-    {
-        m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 1);
-        m_pButtonBox->button(QDialogButtonBox::Apply)->show();
-    }
-    else
-    {
-        m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 0);
-        m_pButtonBox->button(QDialogButtonBox::Apply)->hide();
-    }
+    /* Show/hide details area and Apply button: */
+    m_pDetailsWidget->setVisible(fShow);
+    m_pButtonBox->button(QDialogButtonBox::Apply)->setVisible(fShow);
 }
 
@@ -703 +693 @@
         /* Otherwise => clear details and close the area: */
         m_pDetailsWidget->clearData();
-        m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 0);
-        m_pButtonBox->button(QDialogButtonBox::Apply)->hide();
+        sltShowHostNetworkDetails(false);
     }
 }
@@ -839 +828 @@
             /* Prepare tool-bar: */
             prepareToolBar();
-            /* Prepare splitter: */
-            prepareSplitter();
+            /* Prepare tree-widget: */
+            prepareTreeWidget();
+            /* Prepare details-widget: */
+            prepareDetailsWidget();
             /* Prepare button-box: */
             prepareButtonBox();
@@ -858 +849 @@
         m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
         m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-        m_pToolBar->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
         /* Add tool-bar actions: */
         if (m_pActionAdd)
@@ -884 +874 @@
 }
 
-void UIHostNetworkManager::prepareSplitter()
-{
-    /* Create splitter: */
-    m_pSplitter = new QSplitter;
-    AssertPtrReturnVoid(m_pSplitter);
-    {
-        /* Prepare tree-widget: */
-        prepareTreeWidget();
-        /* Prepare details-widget: */
-        prepareDetailsWidget();
-        /* Configure splitter: */
-        m_pSplitter->setSizes(QList<int>() << m_pSplitter->height() << 0);
-        m_pSplitter->setOrientation(Qt::Vertical);
-        m_pSplitter->setCollapsible(0, false);
-        /* Add splitter into layout: */
-        QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
-        pMainLayout->addWidget(m_pSplitter);
-    }
-}
-
 void UIHostNetworkManager::prepareTreeWidget()
 {
@@ -918 +888 @@
         m_pTreeWidget->setSortingEnabled(true);
         m_pTreeWidget->sortByColumn(Column_Name, Qt::AscendingOrder);
+        m_pTreeWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Expanding);
         connect(m_pTreeWidget, &QITreeWidget::currentItemChanged,
                 this, &UIHostNetworkManager::sltHandleCurrentItemChange);
@@ -926 +897 @@
         connect(m_pTreeWidget, &QITreeWidget::itemDoubleClicked,
                 m_pActionDetails, &QAction::setChecked);
-        /* Add tree-widget into splitter: */
-        m_pSplitter->addWidget(m_pTreeWidget);
+
+        /* Add into layout: */
+        centralWidget()->layout()->addWidget(m_pTreeWidget);
     }
 }
@@ -937 +909 @@
     AssertPtrReturnVoid(m_pDetailsWidget);
     {
-        /* Add details-widget into splitter: */
-        m_pSplitter->addWidget(m_pDetailsWidget);
+        /* Configure details-widget: */
+        m_pDetailsWidget->setVisible(false);
+        m_pDetailsWidget->setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Fixed);
+
+        /* Add into layout: */
+        centralWidget()->layout()->addWidget(m_pDetailsWidget);
     }
 }
@@ -956 +932 @@
         connect(m_pDetailsWidget, &UIHostNetworkDetailsDialog::sigDataChanged,
                 m_pButtonBox->button(QDialogButtonBox::Apply), &QWidget::setEnabled);
+
         /* Add button-box into layout: */
-        QVBoxLayout *pMainLayout = qobject_cast<QVBoxLayout*>(centralWidget()->layout());
-        pMainLayout->addWidget(m_pButtonBox);
+        centralWidget()->layout()->addWidget(m_pButtonBox);
     }
 }

trunk/src/VBox/Frontends/VirtualBox/src/hostnetwork/UIHostNetworkManager.h

@@ -28 +28 @@
 class CHostNetworkInterface;
 class QAbstractButton;
-class QSplitter;
 class QTreeWidgetItem;
 class QIDialogButtonBox;
@@ -117 +116 @@
         /** Prepares tool-bar. */
         void prepareToolBar();
-        /** Prepares splitter. */
-        void prepareSplitter();
         /** Prepares tree-widget. */
         void prepareTreeWidget();
@@ -173 +170 @@
     /** @name Splitter variables.
      * @{ */
-        /** Holds the splitter instance. */
-        QSplitter    *m_pSplitter;
         /** Holds the tree-widget instance. */
         QITreeWidget *m_pTreeWidget;