Changeset 85881 in vbox for trunk/src/VBox/Frontends/VirtualBox

Timestamp:

Aug 24, 2020 6:48:40 PM (5 years ago)

Author:

vboxsync

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

140055

Message:

FE/Qt: bugref:9812. Removing UISettingsDialog.ui

Location:

trunk/src/VBox/Frontends/VirtualBox

Files:

• VBoxUI.pro (modified) (1 diff)
• src/manager/UIVirtualBoxManager.cpp (modified) (1 diff)
• src/settings/UISettingsDialog.cpp (modified) (11 diffs)
• src/settings/UISettingsDialog.h (modified) (4 diffs)
• src/settings/UISettingsDialog.ui (deleted)

trunk/src/VBox/Frontends/VirtualBox/VBoxUI.pro

@@ -20 +20 @@
 TEMPLATE        = app
 LANGUAGE        = C++
-
-FORMS = \
-    src/settings/UISettingsDialog.ui
 
 TRANSLATIONS = \

trunk/src/VBox/Frontends/VirtualBox/src/manager/UIVirtualBoxManager.cpp

@@ -29 +29 @@
 # include <QRegExp>
 #endif
+# include <QVBoxLayout>
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "QIFileDialog.h"
 #include "UIActionPoolManager.h"

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.cpp

@@ -18 +18 @@
 /* Qt includes: */
 #include <QCloseEvent>
+#include <QGridLayout>
+#include <QLabel>
 #include <QProgressBar>
 #include <QPushButton>
@@ -24 +26 @@
 
 /* GUI includes: */
+#include "QIDialogButtonBox.h"
 #include "QIWidgetValidator.h"
 #include "UICommon.h"
@@ -61 +64 @@
     , m_fSilent(true)
     , m_pWhatsThisTimer(new QTimer(this))
+    , m_pLabelTitle(0)
+    , m_pButtonBox(0)
+    , m_pWidgetStackHandler(0)
 {
     /* Prepare: */
@@ -151 +157 @@
     setWindowTitle(title());
 #else
-    m_pLbTitle->setText(m_pSelector->itemText(cId));
+    m_pLabelTitle->setText(m_pSelector->itemText(cId));
 #endif
 }
@@ -241 +247 @@
 void UISettingsDialog::retranslateUi()
 {
-    /* Translate generated stuff: */
-    Ui::UISettingsDialog::retranslateUi(this);
+    setWhatsThis(tr("<i>Select a settings category from the list on the left-hand side and move the mouse over a settings "
+                    "item to get more information.</i>"));
+    m_pLabelTitle->setText(QString());
 
     /* Translate warning stuff: */
@@ -251 +258 @@
 #ifndef VBOX_GUI_WITH_TOOLBAR_SETTINGS
     /* Retranslate current page headline: */
-    m_pLbTitle->setText(m_pSelector->itemText(m_pSelector->currentId()));
+    m_pLabelTitle->setText(m_pSelector->itemText(m_pSelector->currentId()));
 #endif
 
@@ -589 +596 @@
 void UISettingsDialog::prepare()
 {
-    /* Apply UI decorations: */
-    Ui::UISettingsDialog::setupUi(this);
+    prepareWidgets();
 
     /* Configure title: */
-    if (m_pLbTitle)
+    if (m_pLabelTitle)
     {
         /* Page-title font is bold and larger but derived from the system font: */
@@ -599 +605 @@
         pageTitleFont.setBold(true);
         pageTitleFont.setPointSize(pageTitleFont.pointSize() + 2);
-        m_pLbTitle->setFont(pageTitleFont);
+        m_pLabelTitle->setFont(pageTitleFont);
     }
 
@@ -609 +615 @@
 
         /* No page-title with tool-bar: */
-        m_pLbTitle->hide();
+        m_pLabelTitle->hide();
 
         /* Create modern tool-bar selector: */
@@ -645 +651 @@
 
     /* Prepare stack-handler: */
-    if (m_pWtStackHandler)
+    if (m_pWidgetStackHandler)
     {
         /* Create page-stack layout: */
-        QVBoxLayout *pStackLayout = new QVBoxLayout(m_pWtStackHandler);
+        QVBoxLayout *pStackLayout = new QVBoxLayout(m_pWidgetStackHandler);
         if (pStackLayout)
         {
@@ -722 +728 @@
 }
 
+void UISettingsDialog::prepareWidgets()
+{
+    if (objectName().isEmpty())
+        setObjectName(QStringLiteral("UISettingsDialog"));
+    resize(550, 450);
+    QWidget *pCentralWidget = new QWidget(this);
+    pCentralWidget->setObjectName(QStringLiteral("pCentralWidget"));
+    QGridLayout *pMainLayout = new QGridLayout(pCentralWidget);
+    pMainLayout->setObjectName(QStringLiteral("pMainLayout"));
+    m_pLabelTitle = new QLabel(pCentralWidget);
+    m_pLabelTitle->setObjectName(QStringLiteral("m_pLabelTitle"));
+    QSizePolicy sizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    sizePolicy.setHorizontalStretch(0);
+    sizePolicy.setVerticalStretch(0);
+    sizePolicy.setHeightForWidth(m_pLabelTitle->sizePolicy().hasHeightForWidth());
+    m_pLabelTitle->setSizePolicy(sizePolicy);
+    QPalette palette;
+    QBrush brush(QColor(255, 255, 255, 255));
+    brush.setStyle(Qt::SolidPattern);
+    palette.setBrush(QPalette::Active, QPalette::Window, brush);
+    palette.setBrush(QPalette::Inactive, QPalette::Window, brush);
+    palette.setBrush(QPalette::Disabled, QPalette::Window, brush);
+    m_pLabelTitle->setPalette(palette);
+    QFont font;
+    font.setFamily(QStringLiteral("Sans Serif"));
+    font.setPointSize(11);
+    font.setBold(true);
+    font.setWeight(75);
+    m_pLabelTitle->setFont(font);
+    m_pLabelTitle->setAutoFillBackground(true);
+    m_pLabelTitle->setFrameShape(QFrame::Box);
+    m_pLabelTitle->setFrameShadow(QFrame::Sunken);
+    m_pLabelTitle->setMargin(7);
+    pMainLayout->addWidget(m_pLabelTitle, 0, 1, 1, 1);
+
+    m_pWidgetStackHandler = new QWidget(pCentralWidget);
+    m_pWidgetStackHandler->setObjectName(QStringLiteral("m_pWidgetStackHandler"));
+    QSizePolicy sizePolicy1(QSizePolicy::Preferred, QSizePolicy::Expanding);
+    sizePolicy1.setHorizontalStretch(0);
+    sizePolicy1.setVerticalStretch(0);
+    sizePolicy1.setHeightForWidth(m_pWidgetStackHandler->sizePolicy().hasHeightForWidth());
+    m_pWidgetStackHandler->setSizePolicy(sizePolicy1);
+    pMainLayout->addWidget(m_pWidgetStackHandler, 1, 1, 1, 1);
+
+    m_pButtonBox = new QIDialogButtonBox(pCentralWidget);
+    m_pButtonBox->setObjectName(QStringLiteral("m_pButtonBox"));
+    m_pButtonBox->setStandardButtons(QDialogButtonBox::Cancel|QDialogButtonBox::NoButton|QDialogButtonBox::Ok);
+    pMainLayout->addWidget(m_pButtonBox, 2, 0, 1, 2);
+
+    setCentralWidget(pCentralWidget);
+
+    QObject::connect(m_pButtonBox, &QIDialogButtonBox::rejected, this, &UISettingsDialog::reject);
+    QObject::connect(m_pButtonBox, &QIDialogButtonBox::accepted, this, &UISettingsDialog::accept);
+}
+
 void UISettingsDialog::assignValidator(UISettingsPage *pPage)
 {

trunk/src/VBox/Frontends/VirtualBox/src/settings/UISettingsDialog.h

@@ -30 +30 @@
 #include "QIWithRetranslateUI.h"
 #include "UISettingsDefs.h"
-#include "UISettingsDialog.gen.h"
 
 /* Forward declarations: */
 class QEvent;
 class QObject;
+class QLabel;
 class QProgressBar;
 class QShowEvent;
 class QStackedWidget;
 class QTimer;
+class QIDialogButtonBox;
 class UIPageValidator;
 class UISettingsPage;
@@ -50 +51 @@
 /** QIMainDialog aubclass used as
   * base dialog class for both Global & VM settings which encapsulates most of their common functionality. */
-class SHARED_LIBRARY_STUFF UISettingsDialog : public QIWithRetranslateUI<QIMainDialog>, public Ui::UISettingsDialog
+class SHARED_LIBRARY_STUFF UISettingsDialog : public QIWithRetranslateUI<QIMainDialog>
 {
     Q_OBJECT;
@@ -164 +165 @@
     /** Prepares all. */
     void prepare();
-
+    /** Prepares widgets. */
+    void prepareWidgets();
     /** Assigns validater for passed @a pPage. */
     void assignValidator(UISettingsPage *pPage);
@@ -209 +211 @@
     QList<QSize>  m_sizeList;
 #endif
+
+    /** @name Widgets
+     * @{ */
+       QLabel *m_pLabelTitle;
+       QIDialogButtonBox *m_pButtonBox;
+       QWidget *m_pWidgetStackHandler;
+    /** @} */
 };