Changeset 88436 in vbox

Timestamp:

Apr 9, 2021 1:35:23 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Moving the weird zoom widget to menu

Location:

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser

Files:

• UIHelpBrowserWidget.cpp (modified) (27 diffs)
• UIHelpBrowserWidget.h (modified) (3 diffs)
• UIHelpViewer.cpp (modified) (2 diffs)

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp

@@ -39 +39 @@
 # include <QFontDatabase>
 #endif
+#include <QWidgetAction>
 
 /* GUI includes: */
@@ -71 +72 @@
 
 /*********************************************************************************************************************************
-*   UIZoomWidget definition.                                                                                         *
+*   UIZoomMenuAction definition.                                                                                    *
 *********************************************************************************************************************************/
-class UIZoomWidget : public QIWithRetranslateUI<QWidget>
+class UIZoomMenuAction : public QIWithRetranslateUI<QWidgetAction>
 {
 
@@ -80 +81 @@
 signals:
 
-    void sigZoomChanged(UIHelpViewer::ZoomOperation enmOperation);
+    void sigZoomChanged(int iOperation);
 
 public:
 
-
-    UIZoomWidget(QWidget *pParent = 0);
-    int zoomPercentage() const;
+    UIZoomMenuAction(QWidget *pParent = 0);
     void setZoomPercentage(int iZoomPercentage);
 
@@ -101 +100 @@
     void prepare();
 
-    QHBoxLayout  *m_pMainLayout;
     QIToolButton *m_pMinusButton;
     QIToolButton *m_pResetButton;
     QIToolButton *m_pPlusButton;
     QLabel *m_pValueLabel;
+    QLabel *m_pLabel;
 };
 
@@ -255 +254 @@
     void sigTabsListChanged(const QStringList &titleList);
     void sigLinkHighlighted(const QString &strLink);
+    void sigZoomPercentageChanged(int iPercentage);
 
 public:
@@ -271 +271 @@
     void setToolBarVisible(bool fVisible);
     void printCurrent(QPrinter &printer);
-    void setZoomWidgetVisible(bool fToggled);
     void switchToTab(int iIndex);
-    /** returns the zoom percentage of 0th tab. */
+    /** Returns the zoom percentage of 0th tab. */
     int zoomPercentage() const;
     /** Sets the zoom percentage of all tabs. */
@@ -284 +283 @@
     void sltHandleCloseOtherTabs();
     void sltHandleZoomOperation(UIHelpViewer::ZoomOperation enmZoomOperation);
-
-protected:
-
-    virtual void paintEvent(QPaintEvent *pEvent) /* override */;
 
 private slots:
@@ -298 +293 @@
     void sltShowTabBarContextMenu(const QPoint &pos);
     void sltHandleCloseOtherTabsContextMenuAction();
-    void sltZoomPercentageChanged(int iPercentage);
 
 private:
@@ -313 +307 @@
 
     const QHelpEngine* m_pHelpEngine;
-    UIZoomWidget *m_pZoomWidget;
     QUrl m_homeUrl;
     QStringList m_savedUrlList;
@@ -325 +318 @@
 
 /*********************************************************************************************************************************
-*   UIZoomWidget implementation.                                                                                          *
+*   UIZoomMenuAction implementation.                                                                                *
 *********************************************************************************************************************************/
-
-UIZoomWidget::UIZoomWidget(QWidget *pParent /* = 0 */)
-    :QIWithRetranslateUI<QWidget>(pParent)
-    , m_pMainLayout(0)
+UIZoomMenuAction::UIZoomMenuAction(QWidget *pParent /* = 0 */)
+    :QIWithRetranslateUI<QWidgetAction>(pParent)
     , m_pMinusButton(0)
     , m_pResetButton(0)
     , m_pPlusButton(0)
     , m_pValueLabel(0)
+    , m_pLabel(0)
 {
     prepare();
-}
-
-void UIZoomWidget::retranslateUi()
-{
-}
-
-void UIZoomWidget::prepare()
-{
-    setAutoFillBackground(true);
-    m_pMainLayout = new QHBoxLayout(this);
-    AssertReturnVoid(m_pMainLayout);
-    m_pMainLayout->setSpacing(0);
-    m_pMainLayout->setContentsMargins(0, 0, 0, 0);
+    retranslateUi();
+}
+
+void UIZoomMenuAction::setZoomPercentage(int iZoomPercentage)
+{
+    if (m_pValueLabel)
+        m_pValueLabel->setText(QString("%1%2").arg(QString::number(iZoomPercentage)).arg("%"));
+}
+
+void UIZoomMenuAction::retranslateUi()
+{
+    if (m_pLabel)
+        m_pLabel->setText(UIHelpBrowserWidget::tr("Zoom"));
+}
+
+void UIZoomMenuAction::prepare()
+{
+    QWidget *pWidget = new QWidget;
+    setDefaultWidget(pWidget);
+    // if (pWidget)
+    //     pWidget->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
+
+    QHBoxLayout *pMainLayout = new QHBoxLayout(pWidget);
+    pMainLayout->setSpacing(0);
+    AssertReturnVoid(pMainLayout);
+
+    m_pLabel = new QLabel;
     m_pMinusButton = new QIToolButton;
     m_pResetButton = new QIToolButton;
     m_pPlusButton = new QIToolButton;
     m_pValueLabel = new QLabel;
+    m_pValueLabel->setAlignment(Qt::AlignCenter);
+    m_pValueLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Fixed);
     AssertReturnVoid(m_pMinusButton &&
                      m_pResetButton &&
@@ -363 +371 @@
     m_pPlusButton->setIcon(UIIconPool::iconSet(":/help_browser_plus_32px.png"));
 
-    connect(m_pPlusButton, &QIToolButton::pressed, this, &UIZoomWidget::sltZoomOperation);
-    connect(m_pMinusButton, &QIToolButton::pressed, this, &UIZoomWidget::sltZoomOperation);
-    connect(m_pResetButton, &QIToolButton::pressed, this, &UIZoomWidget::sltZoomOperation);
-
-    m_pMainLayout->addWidget(m_pResetButton);
-    m_pMainLayout->addWidget(m_pMinusButton);
-    m_pMainLayout->addWidget(m_pValueLabel);
-    m_pMainLayout->addWidget(m_pPlusButton);
-}
-
-void UIZoomWidget::setZoomPercentage(int iZoomPercentage)
-{
-    if (m_pValueLabel)
-        m_pValueLabel->setText(QString("%1%2").arg(QString::number(iZoomPercentage)).arg("%"));
-}
-
-void UIZoomWidget::sltZoomOperation()
+    connect(m_pPlusButton, &QIToolButton::pressed, this, &UIZoomMenuAction::sltZoomOperation);
+    connect(m_pMinusButton, &QIToolButton::pressed, this, &UIZoomMenuAction::sltZoomOperation);
+    connect(m_pResetButton, &QIToolButton::pressed, this, &UIZoomMenuAction::sltZoomOperation);
+
+    pMainLayout->addWidget(m_pLabel);
+    pMainLayout->addWidget(m_pResetButton);
+    pMainLayout->addWidget(m_pMinusButton);
+    pMainLayout->addWidget(m_pValueLabel, Qt::AlignCenter);
+    pMainLayout->addWidget(m_pPlusButton);
+}
+
+void UIZoomMenuAction::sltZoomOperation()
 {
     if (!sender())
@@ -390 +393 @@
     else if (sender() == m_pResetButton)
         enmOperation = UIHelpViewer::ZoomOperation_Reset;
-    emit sigZoomChanged(enmOperation);
+    emit sigZoomChanged((int)enmOperation);
 }
 
@@ -807 +810 @@
     : QITabWidget(pParent)
     , m_pHelpEngine(pHelpEngine)
-    , m_pZoomWidget(0)
     , m_homeUrl(homeUrl)
     , m_savedUrlList(urlList)
@@ -840 +842 @@
             this, &UIHelpBrowserTabManager::sigAddBookmark);
     connect(pTabWidget, &UIHelpBrowserTab::sigZoomPercentageChanged,
-            this, &UIHelpBrowserTabManager::sltZoomPercentageChanged);
+            this, &UIHelpBrowserTabManager::sigZoomPercentageChanged);
     connect(pTabWidget, &UIHelpBrowserTab::sigLinkHighlighted,
             this, &UIHelpBrowserTabManager::sigLinkHighlighted);
@@ -849 +851 @@
     if (!fBackground)
         setCurrentIndex(index);
-
-    if (!m_pZoomWidget)
-    {
-        m_pZoomWidget = new UIZoomWidget(this);
-        connect(m_pZoomWidget, &UIZoomWidget::sigZoomChanged,
-                this, &UIHelpBrowserTabManager::sltHandleZoomOperation);
-        m_pZoomWidget->setZoomPercentage(100);
-    }
 }
 
@@ -985 +979 @@
 }
 
-void UIHelpBrowserTabManager::paintEvent(QPaintEvent *pEvent)
-{
-    if (m_pZoomWidget)
-    {
-        int iMargin = 1.5 * qApp->style()->pixelMetric(QStyle::PM_ScrollBarExtent);
-        m_pZoomWidget->move(width() - m_pZoomWidget->width() - iMargin,
-                            height() - m_pZoomWidget->height() - iMargin);
-    }
-    QITabWidget::paintEvent(pEvent);
-}
-
-void UIHelpBrowserTabManager::setZoomWidgetVisible(bool fToggled)
-{
-    if (m_pZoomWidget)
-        m_pZoomWidget->setVisible(fToggled);
-}
-
 void UIHelpBrowserTabManager::switchToTab(int iIndex)
 {
@@ -1086 +1063 @@
         return;
     closeAllTabsBut(iTabIndex);
-}
-
-void UIHelpBrowserTabManager::sltZoomPercentageChanged(int iPercentage)
-{
-    if (m_pZoomWidget)
-        m_pZoomWidget->setZoomPercentage(iPercentage);
 }
 
@@ -1191 +1162 @@
     , m_pShowHideSideBarAction(0)
     , m_pShowHideToolBarAction(0)
-    , m_pShowHideZoomWidgetAction(0)
     , m_pShowHideStatusBarAction(0)
-    , m_pZoomInAction(0)
-    , m_pZoomOutAction(0)
-    , m_pZoomResetAction(0)
+    , m_pZoomMenuAction(0)
     , m_fModelContentCreated(false)
     , m_fIndexingFinished(false)
@@ -1264 +1232 @@
             this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
 
-    m_pShowHideZoomWidgetAction = new QAction(this);
-    m_pShowHideZoomWidgetAction->setCheckable(true);
-    m_pShowHideZoomWidgetAction->setChecked(true);
-    connect(m_pShowHideZoomWidgetAction, &QAction::toggled,
-            this, &UIHelpBrowserWidget::sltHandleWidgetVisibilityToggle);
-
     m_pShowHideStatusBarAction = new QAction(this);
     m_pShowHideStatusBarAction->setCheckable(true);
@@ -1285 +1247 @@
             this, &UIHelpBrowserWidget::sigCloseDialog);
 
-    /* For size control actions: */
-    m_pZoomInAction = new QAction(this);
-    m_pZoomInAction->setIcon(UIIconPool::iconSet(":/help_browser_plus_32px.png"));
-
-    m_pZoomOutAction = new QAction(this);
-    m_pZoomOutAction->setIcon(UIIconPool::iconSet(":/help_browser_minus_32px.png"));
-
-    m_pZoomResetAction = new QAction(this);
-    m_pZoomResetAction->setIcon(UIIconPool::iconSet(":/help_browser_reset_32px.png"));
-
-    connect(m_pZoomInAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleZoomActions);
-    connect(m_pZoomOutAction, &QAction::triggered,
-            this, &UIHelpBrowserWidget::sltHandleZoomActions);
-    connect(m_pZoomResetAction, &QAction::triggered,
+    m_pZoomMenuAction = new UIZoomMenuAction(this);
+    connect(m_pZoomMenuAction, &UIZoomMenuAction::sigZoomChanged,
             this, &UIHelpBrowserWidget::sltHandleZoomActions);
 }
@@ -1348 +1297 @@
     connect(m_pTabManager, &UIHelpBrowserTabManager::sigLinkHighlighted,
             this, &UIHelpBrowserWidget::sigLinkHighlighted);
+    connect(m_pTabManager, &UIHelpBrowserTabManager::sigZoomPercentageChanged,
+            this, &UIHelpBrowserWidget::sltZoomPercentageChanged);
 
     connect(m_pHelpEngine, &QHelpEngine::setupFinished,
@@ -1444 +1395 @@
         m_pFileMenu->addAction(m_pCloseDialogAction);
 
-    if (m_pZoomInAction)
-        m_pViewMenu->addAction(m_pZoomInAction);
-    if (m_pZoomOutAction)
-        m_pViewMenu->addAction(m_pZoomOutAction);
-    if (m_pZoomResetAction)
-        m_pViewMenu->addAction(m_pZoomResetAction);
-    m_pViewMenu->addSeparator();
+    if (m_pZoomMenuAction)
+        m_pViewMenu->addAction(m_pZoomMenuAction);
     if (m_pShowHideSideBarAction)
         m_pViewMenu->addAction(m_pShowHideSideBarAction);
     if (m_pShowHideToolBarAction)
         m_pViewMenu->addAction(m_pShowHideToolBarAction);
-    if (m_pShowHideZoomWidgetAction)
-        m_pViewMenu->addAction(m_pShowHideZoomWidgetAction);
     if (m_pShowHideStatusBarAction)
         m_pViewMenu->addAction(m_pShowHideStatusBarAction);
@@ -1579 +1523 @@
     if (m_pShowHideToolBarAction)
         m_pShowHideToolBarAction->setText(tr("Show Tool Bar"));
-    if (m_pShowHideZoomWidgetAction)
-        m_pShowHideZoomWidgetAction->setText(tr("Show Zoom Widget"));
     if (m_pShowHideStatusBarAction)
         m_pShowHideStatusBarAction->setText(tr("Show Status Bar"));
-
 
     if (m_pPrintAction)
@@ -1589 +1530 @@
     if (m_pCloseDialogAction)
         m_pCloseDialogAction->setText(tr("Close"));
-
-    if (m_pZoomInAction)
-        m_pZoomInAction->setText(tr("Zoom &In"));
-    if (m_pZoomOutAction)
-        m_pZoomOutAction->setText(tr("Zoom &Out"));
-    if (m_pZoomResetAction)
-        m_pZoomResetAction->setText(tr("&Reset Zoom"));
 }
 
@@ -1634 +1568 @@
         if (m_pTabManager)
             m_pTabManager->setToolBarVisible(fToggled);
-    }
-    else if (sender() == m_pShowHideZoomWidgetAction)
-    {
-        if (m_pTabManager)
-            m_pTabManager->setZoomWidgetVisible(fToggled);
     }
     else if (sender() == m_pShowHideStatusBarAction)
@@ -1864 +1793 @@
 }
 
-void UIHelpBrowserWidget::sltHandleZoomActions()
-{
-    if (!sender() || !m_pTabManager)
-        return;
-    UIHelpViewer::ZoomOperation enmOperation = UIHelpViewer::ZoomOperation_Reset;
-    if (sender() == m_pZoomResetAction)
-        enmOperation = UIHelpViewer::ZoomOperation_Reset;
-    else if (sender() == m_pZoomInAction)
-        enmOperation = UIHelpViewer::ZoomOperation_In;
-    else if (sender() == m_pZoomOutAction)
-        enmOperation = UIHelpViewer::ZoomOperation_Out;
+void UIHelpBrowserWidget::sltHandleZoomActions(int iZoomOperation)
+{
+    if (iZoomOperation >= (int) UIHelpViewer::ZoomOperation_Max)
+        return;
+    UIHelpViewer::ZoomOperation enmOperation = (UIHelpViewer::ZoomOperation)(iZoomOperation);
     m_pTabManager->sltHandleZoomOperation(enmOperation);
 }
@@ -1909 +1832 @@
 }
 
+void UIHelpBrowserWidget::sltZoomPercentageChanged(int iPercentage)
+{
+    if (m_pZoomMenuAction)
+        m_pZoomMenuAction->setZoomPercentage(iPercentage);
+}
+
 
 #include "UIHelpBrowserWidget.moc"

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.h

@@ -46 +46 @@
 class UIBookmarksListContainer;
 class UIHelpBrowserTabManager;
+class UIZoomMenuAction;
 
 #ifdef VBOX_WITH_QHELP_VIEWER
@@ -91 +92 @@
     void sltCopyLink();
     void sltAddNewBookmark(const QUrl &url, const QString &strTitle);
-    void sltHandleZoomActions();
+    void sltHandleZoomActions(int iZoomOperation);
     void sltHandleTabListChanged(const QStringList &titleList);
     void sltHandleTabChoose();
     void sltHandleCurrentTabChanged(int iIndex);
+    void sltZoomPercentageChanged(int iPercentage);
 
 private:
@@ -165 +167 @@
     QAction             *m_pShowHideSideBarAction;
     QAction             *m_pShowHideToolBarAction;
-    QAction             *m_pShowHideZoomWidgetAction;
     QAction             *m_pShowHideStatusBarAction;
-    QAction             *m_pZoomInAction;
-    QAction             *m_pZoomOutAction;
-    QAction             *m_pZoomResetAction;
+    UIZoomMenuAction    *m_pZoomMenuAction;
 
     /* This is set t true when handling QHelpContentModel::contentsCreated signal. */

trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpViewer.cpp

@@ -78 +78 @@
     void setForwardAvailable(bool fAvailable);
 
-protected:
-
-
-private slots:
-
-
 private:
 
@@ -185 +179 @@
     pMainLayout->addWidget(m_pAddBookmarkButton);
     pMainLayout->setContentsMargins(0, 0, 0, 0);
-    //pMainLayout->addSpacerItem(new QSpacerItem(0, 0, QSizePolicy::Expanding, QSizePolicy::Fixed));
 
     connect(m_pBackwardButton, &QIToolButton::pressed,