Changeset 100907 in vbox

Timestamp:

Aug 18, 2023 5:01:06 PM (18 months ago)

Author:

vboxsync

Message:

FE/Qt: bugref:10496, bugref:9080. Using new base class for dialog panel in VISO creation dialog.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• globals/UIDialogPanel.cpp (modified) (1 diff)
• globals/UIDialogPanel.h (modified) (1 diff)
• guestctrl/UIFileManagerPanel.cpp (modified) (3 diffs)
• medium/viso/UIVisoCreator.cpp (modified) (8 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.cpp

@@ -65 +65 @@
 }
 
-void UIDialogPanelBase::insertTab(int iIndex, QWidget *pPage, const QString &strLabel)
+void UIDialogPanelBase::insertTab(int iIndex, QWidget *pPage, const QString &strLabel /* = QString() */)
 {
     if (m_pTabWidget)

trunk/src/VBox/Frontends/VirtualBox/src/globals/UIDialogPanel.h

@@ -60 +60 @@
 
     virtual void prepare();
-    void insertTab(int iIndex, QWidget *pPage, const QString &strLabel);
+    void insertTab(int iIndex, QWidget *pPage, const QString &strLabel = QString());
     void setTabText(int iIndex, const QString &strText);
 

trunk/src/VBox/Frontends/VirtualBox/src/guestctrl/UIFileManagerPanel.cpp

@@ -438 +438 @@
     pPreferencesLayout->addItem(new QSpacerItem(0, 0, QSizePolicy::Minimum, QSizePolicy::Expanding), 2, 0, 1, 2);
 
-    insertTab(Page_Preferences, pPreferencesTab, QString());
+    insertTab(Page_Preferences, pPreferencesTab);
 }
 
@@ -451 +451 @@
     if (m_pLogTextEdit)
         pLogLayout->addWidget(m_pLogTextEdit);
-    insertTab(Page_Log, pLogTab, QString());
+    insertTab(Page_Log, pLogTab);
 }
 
@@ -479 +479 @@
     pOperationsTab->setLayout(m_pOperationsTabLayout);
     m_pOperationsTabLayout->addStretch(4);
-    insertTab(Page_Operations, m_pScrollArea, QString());
+    insertTab(Page_Operations, m_pScrollArea);
 }
 

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

@@ -48 +48 @@
 #include "UIExtraDataManager.h"
 #include "UIIconPool.h"
+#include "UIDialogPanel.h"
 #include "UIModalWindowManager.h"
 #include "UIVisoHostBrowser.h"
@@ -64 +65 @@
 *********************************************************************************************************************************/
 
-class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public QIWithRetranslateUI<QWidget>
+class SHARED_LIBRARY_STUFF UIVisoSettingWidget : public QIWithRetranslateUI<UIDialogPanelBase>
 {
     Q_OBJECT;
@@ -84 +85 @@
 private:
 
-    void prepareObjects();
+    void prepare();
     void prepareConnections();
 
-    QTabWidget   *m_pTabWidget;
     QILabel      *m_pVisoNameLabel;
     QILabel      *m_pCustomOptionsLabel;
@@ -102 +102 @@
 
 UIVisoSettingWidget::UIVisoSettingWidget(QWidget *pParent)
-    :QIWithRetranslateUI<QWidget>(pParent)
-    , m_pTabWidget(0)
+    :QIWithRetranslateUI<UIDialogPanelBase>(pParent)
     , m_pVisoNameLabel(0)
     , m_pCustomOptionsLabel(0)
@@ -111 +110 @@
     , m_pVisoOptionsGridLayout(0)
 {
-    prepareObjects();
+    prepare();
     prepareConnections();
 }
 
-void UIVisoSettingWidget::prepareObjects()
-{
-    QVBoxLayout *pMainLayout = new QVBoxLayout(this);
-    AssertReturnVoid(pMainLayout);
-    m_pTabWidget = new QTabWidget;
-    AssertReturnVoid(m_pTabWidget);
-    pMainLayout->addWidget(m_pTabWidget);
-
+void UIVisoSettingWidget::prepare()
+{
     QWidget *pVisoOptionsContainerWidget = new QWidget;
     AssertReturnVoid(pVisoOptionsContainerWidget);
@@ -130 +123 @@
     //pVisoOptionsGridLayout->setContentsMargins(0, 0, 0, 0);
 
-    m_pTabWidget->addTab(pVisoOptionsContainerWidget, QApplication::translate("UIVisoCreatorWidget", "VISO options"));
+    insertTab(0, pVisoOptionsContainerWidget);
 
     /* Name edit and and label: */
@@ -165 +158 @@
     AssertReturnVoid(pDialogSettingsContainerLayout);
 
-    m_pTabWidget->addTab(pDialogSettingsContainerWidget, QApplication::translate("UIVisoCreatorWidget", "Dialog Settings"));
+    insertTab(1, pDialogSettingsContainerWidget);
 
     iRow = 0;
@@ -203 +196 @@
         m_pShowHiddenObjectsCheckBox->setText(QApplication::translate("UIVisoCreatorWidget", "Show Hidden Objects"));
     }
+    setTabText(1, QApplication::translate("UIVisoCreatorWidget", "Dialog Settings"));
+    setTabText(0, QApplication::translate("UIVisoCreatorWidget", "VISO options"));
 
     //m_pVisoOptionsGridLayout->setColumnMinimumWidth(0, iLabelWidth);