Changeset 100135 in vbox

Timestamp:

Jun 8, 2023 7:48:21 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9080. Changing the layout a bit.

Location:

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso

Files:

• UIVisoCreator.cpp (modified) (9 diffs)
• UIVisoCreator.h (modified) (3 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.cpp

@@ -97 +97 @@
     , m_fShowToolBar(fShowToolBar)
     , m_pSettingsWidget(0)
+    , m_pBrowserContainerWidget(0)
 {
     m_visoOptions.m_strVisoName = !strMachineName.isEmpty() ? strMachineName : "ad-hoc";
@@ -158 +159 @@
 void UIVisoCreatorWidget::sltPanelActionToggled(bool fChecked)
 {
+    Q_UNUSED(fChecked);
     if (m_pSettingsWidget)
         m_pSettingsWidget->setVisible(!m_pSettingsWidget->isVisible());
-    return;
+#if 0
     QAction *pSenderAction = qobject_cast<QAction*>(sender());
     if (!pSenderAction)
@@ -178 +180 @@
     else
         hidePanel(pPanel);
+#endif
 }
 
@@ -261 +264 @@
 void UIVisoCreatorWidget::prepareWidgets()
 {
-    m_pMainLayout = new QGridLayout(this);
+    m_pMainLayout = new QVBoxLayout(this);
     if (!m_pMainLayout)
         return;
@@ -279 +282 @@
     if (m_pActionPool && m_pActionPool->action(UIActionIndex_M_VISOCreator))
         m_pMainMenu = m_pActionPool->action(UIActionIndex_M_VISOCreator)->menu();
-    int iLayoutRow = 0;
+    // int iLayoutRow = 0;
     if (m_fShowToolBar)
     {
@@ -289 +292 @@
             m_pToolBar->setIconSize(QSize(iIconMetric, iIconMetric));
             m_pToolBar->setToolButtonStyle(Qt::ToolButtonTextUnderIcon);
-            m_pMainLayout->addWidget(m_pToolBar, iLayoutRow++, 0, 1, 5);
+            m_pMainLayout->addWidget(m_pToolBar);
         }
     }
 
+    m_pBrowserContainerWidget = new QWidget;
+    if (!m_pBrowserContainerWidget)
+        return;
+    m_pMainLayout->addWidget(m_pBrowserContainerWidget);
+    QGridLayout *pContainerLayout = new QGridLayout(m_pBrowserContainerWidget);
+    pContainerLayout->setContentsMargins(0, 0, 0, 0);
     m_pHostBrowser = new UIVisoHostBrowser;
     if (m_pHostBrowser)
     {
-        m_pMainLayout->addWidget(m_pHostBrowser, iLayoutRow, 0, 1, 4);
+        pContainerLayout->addWidget(m_pHostBrowser, 0, 0, 1, 4);
         //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pHostBrowser), 2);
     }
@@ -303 +312 @@
     if (m_pVerticalToolBar)
     {
-        m_pMainLayout->addWidget(m_pVerticalToolBar, iLayoutRow, 4, 1, 1);
+        pContainerLayout->addWidget(m_pVerticalToolBar, 0, 4, 1, 1);
         //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVerticalToolBar), 1);
     }
@@ -310 +319 @@
     if (m_pVISOContentBrowser)
     {
-        m_pMainLayout->addWidget(m_pVISOContentBrowser, iLayoutRow, 5, 1, 4);
+        pContainerLayout->addWidget(m_pVISOContentBrowser, 0, 5, 1, 4);
         m_pVISOContentBrowser->setVisoName(m_visoOptions.m_strVisoName);
         //m_pMainLayout->setColumnStretch(m_pMainLayout->indexOf(m_pVISOContentBrowser), 2);
     }
-    ++iLayoutRow;
-    m_pConfigurationPanel = new UIVisoConfigurationPanel(this);
-    if (m_pConfigurationPanel)
-    {
-        m_pMainLayout->addWidget(m_pConfigurationPanel, iLayoutRow++, 0, 1, 9);
-        m_pConfigurationPanel->hide();
-        m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName);
-        m_pConfigurationPanel->setVisoCustomOptions(m_visoOptions.m_customOptions);
-    }
-
-    m_pCreatorOptionsPanel = new UIVisoConfigurationPanel;
-    if (m_pCreatorOptionsPanel)
-    {
-        m_pCreatorOptionsPanel->setShowHiddenbjects(m_browserOptions.m_fShowHiddenObjects);
-        m_pMainLayout->addWidget(m_pCreatorOptionsPanel, iLayoutRow++, 0, 1, 9);
-        m_pCreatorOptionsPanel->hide();
-    }
-
-    m_pSettingsWidget = new UIVisoSettingWidget(this);
-    if (m_pSettingsWidget)
-    {
-        QVBoxLayout *pMainLayout = new QVBoxLayout(m_pSettingsWidget);
-        QPushButton *pB = new QPushButton;
-        pB->setText("ssssasas");
-        pMainLayout->addWidget(pB);
-        m_pSettingsWidget->setVisible(false);
-    }
+    // ++iLayoutRow;
+    // m_pConfigurationPanel = new UIVisoConfigurationPanel(this);
+    // if (m_pConfigurationPanel)
+    // {
+    //     m_pMainLayout->addWidget(m_pConfigurationPanel, iLayoutRow++, 0, 1, 9);
+    //     m_pConfigurationPanel->hide();
+    //     m_pConfigurationPanel->setVisoName(m_visoOptions.m_strVisoName);
+    //     m_pConfigurationPanel->setVisoCustomOptions(m_visoOptions.m_customOptions);
+    // }
+
+    // m_pCreatorOptionsPanel = new UIVisoConfigurationPanel;
+    // if (m_pCreatorOptionsPanel)
+    // {
+    //     m_pCreatorOptionsPanel->setShowHiddenbjects(m_browserOptions.m_fShowHiddenObjects);
+    //     m_pMainLayout->addWidget(m_pCreatorOptionsPanel, iLayoutRow++, 0, 1, 9);
+    //     m_pCreatorOptionsPanel->hide();
+    // }
+
+    // m_pSettingsWidget = new UIVisoSettingWidget(this);
+    // if (m_pSettingsWidget)
+    // {
+    //     QVBoxLayout *pMainLayout = new QVBoxLayout(m_pSettingsWidget);
+    //     QPushButton *pB = new QPushButton;
+    //     pB->setText("ssssasas");
+    //     pMainLayout->addWidget(pB);
+    //     m_pSettingsWidget->setVisible(false);
+    // }
 }
 
@@ -665 +674 @@
 
     m_pVisoCreatorWidget = new UIVisoCreatorWidget(m_pActionPool, this, true /* show toolbar */, strMachineName);
-    if (m_pVisoCreatorWidget)
+    if (m_pVisoCreatorWidget && m_pVisoCreatorWidget->menu())
     {
         menuBar()->addMenu(m_pVisoCreatorWidget->menu());

trunk/src/VBox/Frontends/VirtualBox/src/medium/viso/UIVisoCreator.h

@@ -44 +44 @@
 /* Forward declarations: */
 class QGridLayout;
+class QVBoxLayout;
 class QLabel;
 class QMenu;
@@ -160 +161 @@
     /** @} */
 
-    QGridLayout          *m_pMainLayout;
+    QVBoxLayout          *m_pMainLayout;
     UIVisoHostBrowser    *m_pHostBrowser;
     UIVisoContentBrowser *m_pVISOContentBrowser;
@@ -176 +177 @@
     bool                   m_fShowToolBar;
     UIVisoSettingWidget   *m_pSettingsWidget;
+    QWidget               *m_pBrowserContainerWidget;
 };