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

Timestamp:

Mar 23, 2021 5:10:59 PM (4 years ago)

Author:

vboxsync

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

143467

Message:

FE/Qt: bugref:9510. reverting r143466.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIToolBox.cpp (modified) (11 diffs)
• wizards/newvm/UIWizardNewVMPageExpert.cpp (modified) (1 diff)

trunk/src/VBox/Frontends/VirtualBox/src/widgets/UIToolBox.cpp

@@ -19 +19 @@
 #include <QCheckBox>
 #include <QLabel>
-#include <QPainter>
 #include <QStyle>
 #include <QVBoxLayout>
-#include <QStyle>
-#include <QStyleOptionToolBox>
 
 /* GUI includes: */
@@ -32 +29 @@
 #include "UIToolBox.h"
 #include "UIWizardNewVM.h"
-
-class UIToolBoxPageButton : public QAbstractButton
-{
-        Q_OBJECT;
-public:
-    UIToolBoxPageButton(QWidget *pParent = 0);
-    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
-    QSize sizeHint() const /* override */;
-
-};
-
-UIToolBoxPageButton::UIToolBoxPageButton(QWidget *pParent /* = 0 */)
-    : QAbstractButton(pParent)
-{
-    setBackgroundRole(QPalette::Window);
-    //setSizePolicy(QSizePolicy::Preferred, QSizePolicy::Minimum);
-    setFocusPolicy(Qt::NoFocus);
-
-}
-
-void UIToolBoxPageButton::paintEvent(QPaintEvent *pEvent)
-{
-
-    Q_UNUSED(pEvent);
-    QPainter painter(this);
-
-    // QFontMetrics metrics = fontMetrics();
-    // painter.drawText(QRect(0, 0, metrics.averageCharWidth() * text().length(), metrics.height()),
-    //                  Qt::TextShowMnemonic,
-    //                  text());
-
-    QStyleOptionToolBox opt;
-    opt.initFrom(this);
-    opt.text = text();
-    opt.state |= QStyle::State_Selected;
-    style()->drawControl(QStyle::CE_ToolBoxTabLabel, &opt, &painter, parentWidget());
-}
-
-QSize UIToolBoxPageButton::sizeHint() const
-{
-    QFontMetrics metrics = fontMetrics();
-    return QSize(metrics.averageCharWidth() * text().length(), metrics.height());
-}
 
 /*********************************************************************************************************************************
@@ -111 +65 @@
 
     void sltHandleEnableToggle(int iState);
-    void sltTitleButtonClicked();
+
 private:
 
@@ -120 +74 @@
     QVBoxLayout *m_pLayout;
     QWidget     *m_pTitleContainerWidget;
+    QLabel      *m_pTitleLabel;
     QLabel      *m_pIconLabel;
     QLabel      *m_pExpandCollapseIconLabel;
@@ -128 +83 @@
     bool         m_fExpandCollapseIconVisible;
     QIcon        m_expandCollapseIcon;
-    UIToolBoxPageButton *m_pTitleButton;
 };
 
@@ -140 +94 @@
     , m_pLayout(0)
     , m_pTitleContainerWidget(0)
+    , m_pTitleLabel(0)
     , m_pIconLabel(0)
     , m_pExpandCollapseIconLabel(0)
@@ -146 +101 @@
     , m_iIndex(0)
     , m_fExpandCollapseIconVisible(true)
-    , m_pTitleButton(0)
 {
     prepare(fEnableCheckBoxEnabled);
@@ -153 +107 @@
 void UIToolBoxPage::setTitle(const QString &strTitle)
 {
-    if (m_pTitleButton)
-        m_pTitleButton->setText(strTitle);
+    if (!m_pTitleLabel)
+        return;
+    m_pTitleLabel->setText(strTitle);
 }
 
@@ -183 +138 @@
     }
 
-    m_pTitleButton = new UIToolBoxPageButton;
-    pTitleLayout->addWidget(m_pTitleButton);
-    connect(m_pTitleButton, &UIToolBoxPageButton::clicked,
-            this, &UIToolBoxPage::sltTitleButtonClicked);
+    m_pTitleLabel = new QLabel;
+    m_pTitleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+
+    pTitleLayout->addWidget(m_pTitleLabel);
     m_pIconLabel = new QLabel;
     pTitleLayout->addWidget(m_pIconLabel, Qt::AlignLeft);
@@ -211 +166 @@
 void UIToolBoxPage::setTitleBackgroundColor(const QColor &color)
 {
+    if (!m_pTitleLabel)
+        return;
     QPalette palette = m_pTitleContainerWidget->palette();
     palette.setColor(QPalette::Window, color);
@@ -283 +240 @@
     if (m_pWidget)
         m_pWidget->setEnabled(iState == Qt::Checked);
-}
-
-void UIToolBoxPage::sltTitleButtonClicked()
-{
-    emit sigShowPageWidget();
 }
 

trunk/src/VBox/Frontends/VirtualBox/src/wizards/newvm/UIWizardNewVMPageExpert.cpp

@@ -164 +164 @@
     if (m_pToolBox)
     {
-        m_pToolBox->setPageTitle(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Name and &Operating System")));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("Unatt&ended Install"));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Hard &Disk"));
-        m_pToolBox->setPageTitle(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("&Hardware"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_NameAndOSType, QString(UIWizardNewVM::tr("Name and Operating System")));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Unattended, UIWizardNewVM::tr("Unattended Install"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Disk, UIWizardNewVM::tr("Hard Disk"));
+        m_pToolBox->setPageTitle(ExpertToolboxItems_Hardware, UIWizardNewVM::tr("Hardware"));
     }