Changeset 88266 in vbox for trunk/src/VBox

Timestamp:

Mar 24, 2021 7:22:33 AM (4 years ago)

Author:

vboxsync

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

143471

Message:

FE/Qt: bugref:9515. 2nd attempt to make UIToolBox titles keyboard responsive.

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• widgets/UIToolBox.cpp (modified) (10 diffs)
• wizards/newvm/UIWizardNewVMPageBasic2.cpp (modified) (1 diff)
• 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>
@@ -29 +30 @@
 #include "UIToolBox.h"
 #include "UIWizardNewVM.h"
+
+class UIToolPageButton : public QAbstractButton
+{
+    Q_OBJECT;
+public:
+    UIToolPageButton(QWidget *pParent = 0);
+    void setPixmap(const QPixmap &pixmap);
+protected:
+    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
+    virtual QSize sizeHint() const /* override */;
+private:
+    QPixmap m_pixmap;
+};
+
+UIToolPageButton::UIToolPageButton(QWidget *pParent /* = 0 */)
+    :QAbstractButton(pParent)
+{
+}
+
+void UIToolPageButton::paintEvent(QPaintEvent *pEvent)
+{
+    Q_UNUSED(pEvent);
+    if (!m_pixmap.isNull())
+    {
+        QPainter painter(this);
+        painter.drawPixmap(0, 0, m_pixmap.width(), m_pixmap.height(), m_pixmap);
+    }
+}
+
+void UIToolPageButton::setPixmap(const QPixmap &pixmap)
+{
+    m_pixmap = pixmap;
+    update();
+}
+
+QSize UIToolPageButton::sizeHint() const
+{
+    if (m_pixmap.isNull())
+        return QSize (0,0);
+    return m_pixmap.size();
+}
 
 /*********************************************************************************************************************************
@@ -76 +118 @@
     QLabel      *m_pTitleLabel;
     QLabel      *m_pIconLabel;
-    QLabel      *m_pExpandCollapseIconLabel;
     QCheckBox   *m_pEnableCheckBox;
 
@@ -83 +124 @@
     bool         m_fExpandCollapseIconVisible;
     QIcon        m_expandCollapseIcon;
+    UIToolPageButton *m_pTitleButton;
 };
 
@@ -96 +138 @@
     , m_pTitleLabel(0)
     , m_pIconLabel(0)
-    , m_pExpandCollapseIconLabel(0)
     , m_pEnableCheckBox(0)
     , m_pWidget(0)
     , m_iIndex(0)
     , m_fExpandCollapseIconVisible(true)
+    , m_pTitleButton(0)
 {
     prepare(fEnableCheckBoxEnabled);
@@ -127 +169 @@
                                      .4f * qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
 
-    m_pExpandCollapseIconLabel = new QLabel;
-    if (m_pExpandCollapseIconLabel)
-        pTitleLayout->addWidget(m_pExpandCollapseIconLabel);
+    m_pTitleButton = new UIToolPageButton;
+    pTitleLayout->addWidget(m_pTitleButton);
+    connect(m_pTitleButton, &QAbstractButton::clicked, this, &UIToolBoxPage::sigShowPageWidget);
+
 
     if (fEnableCheckBoxEnabled)
@@ -140 +183 @@
     m_pTitleLabel = new QLabel;
     m_pTitleLabel->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
+    m_pTitleLabel->setBuddy(m_pTitleButton);
 
     pTitleLayout->addWidget(m_pTitleLabel);
@@ -244 +288 @@
 void UIToolBoxPage::setExpandCollapseIcon()
 {
-    if (!m_pExpandCollapseIconLabel)
-        return;
     if (!m_fExpandCollapseIconVisible)
     {
-        m_pExpandCollapseIconLabel->setVisible(false);
+        m_pTitleButton->setVisible(false);
         return;
     }
@@ -254 +296 @@
     QPixmap basePixmap = m_expandCollapseIcon.pixmap(windowHandle(), QSize(iMetric, iMetric));
     if (!m_fExpanded)
-        m_pExpandCollapseIconLabel->setPixmap(basePixmap);
+        m_pTitleButton->setPixmap(basePixmap);
     else
     {
@@ -261 +303 @@
         QPixmap transformedPixmap = basePixmap.transformed(transform);
         transformedPixmap.setDevicePixelRatio(basePixmap.devicePixelRatio());
-        m_pExpandCollapseIconLabel->setPixmap(transformedPixmap);
+        m_pTitleButton->setPixmap(transformedPixmap);
     }
 }

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

@@ -194 +194 @@
 {
     if (m_pHostnameLabel)
-        m_pHostnameLabel->setText(UIWizardNewVM::tr("&Hostname:"));
+        m_pHostnameLabel->setText(UIWizardNewVM::tr("Hostna&me:"));
 
     if (m_pGAISOPathLabel)

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("Unattended 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("H&ardware"));
     }