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

Timestamp:

Apr 15, 2021 4:45:15 PM (4 years ago)

Author:

vboxsync

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

143840

Message:

FE/Qt: bugref:9831. more menu stuff

Location:

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

Files:

• UIHelpBrowserWidget.cpp (modified) (12 diffs)
• UIHelpBrowserWidget.h (modified) (2 diffs)
• UIHelpViewer.h (modified) (2 diffs)

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

@@ -208 +208 @@
     bool hasSelectedText() const;
     bool isFindInPageWidgetVisible() const;
+    void findNext();
+    void findPrevious();
 
 public slots:
@@ -291 +293 @@
     bool isFindInPageWidgetVisible() const;
     void toggleFindInPage(bool fTrigger);
+    void findNext();
+    void findPrevious();
 
 public slots:
@@ -632 +636 @@
         return m_pContentViewer->isFindInPageWidgetVisible();
     return false;
+}
+
+void UIHelpBrowserTab::findNext()
+{
+    if (m_pContentViewer)
+        return m_pContentViewer->sltSelectNextMatch();
+}
+
+void UIHelpBrowserTab::findPrevious()
+{
+    if (m_pContentViewer)
+        return m_pContentViewer->sltSelectPreviousMatch();
 }
 
@@ -704 +720 @@
                      m_pFindInPageAction);
     m_pFindInPageAction->setCheckable(true);
-    m_pFindInPageAction->setShortcut(QKeySequence::Find);
 
     connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHomeAction);
@@ -1083 +1098 @@
     if (pTab)
         pTab->sltFindInPageAction(fTrigger);
+}
+
+void UIHelpBrowserTabManager::findNext()
+{
+    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
+    if (pTab)
+        pTab->findNext();
+}
+
+void UIHelpBrowserTabManager::findPrevious()
+{
+    UIHelpBrowserTab *pTab = qobject_cast<UIHelpBrowserTab*>(currentWidget());
+    if (pTab)
+        pTab->findPrevious();
 }
 
@@ -1250 +1279 @@
     , m_pCopySelectedTextAction(0)
     , m_pFindInPageAction(0)
+    , m_pFindNextInPageAction(0)
+    , m_pFindPreviousInPageAction(0)
     , m_pZoomMenuAction(0)
     , m_fModelContentCreated(false)
@@ -1336 +1367 @@
     connect(m_pFindInPageAction, &QAction::triggered,
             this, &UIHelpBrowserWidget::sltFindInPage);
-    m_pFindInPageAction->setShortcut(QString("Ctrl+F"));
+    m_pFindInPageAction->setShortcut(QKeySequence::Find);
+
+    m_pFindNextInPageAction = new QAction(this);
+    m_pFindNextInPageAction->setEnabled(false);
+    connect(m_pFindNextInPageAction, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sltFindNextInPage);
+    m_pFindNextInPageAction->setShortcut(QKeySequence::FindNext);
+
+    m_pFindPreviousInPageAction = new QAction(this);
+    m_pFindPreviousInPageAction->setEnabled(false);
+    connect(m_pFindPreviousInPageAction, &QAction::triggered,
+            this, &UIHelpBrowserWidget::sltFindPreviousInPage);
+    m_pFindPreviousInPageAction->setShortcut(QKeySequence::FindPrevious);
 
     m_pPrintAction = new QAction(this);
@@ -1505 +1548 @@
     if(m_pFindInPageAction)
         m_pEditMenu->addAction(m_pFindInPageAction);
+    if(m_pFindNextInPageAction)
+        m_pEditMenu->addAction(m_pFindNextInPageAction);
+    if(m_pFindPreviousInPageAction)
+        m_pEditMenu->addAction(m_pFindPreviousInPageAction);
 
     if (m_pZoomMenuAction)
@@ -1646 +1693 @@
     if (m_pFindInPageAction)
         m_pFindInPageAction->setText(tr("&Find in Page"));
+    if (m_pFindNextInPageAction)
+        m_pFindNextInPageAction->setText(tr("&Find Next"));
+    if (m_pFindPreviousInPageAction)
+        m_pFindPreviousInPageAction->setText(tr("&Find Previous"));
 }
 
@@ -1701 +1752 @@
 }
 
+void UIHelpBrowserWidget::sltFindNextInPage()
+{
+    if (m_pTabManager)
+        m_pTabManager->findNext();
+}
+
+void UIHelpBrowserWidget::sltFindPreviousInPage()
+{
+    if (m_pTabManager)
+        m_pTabManager->findPrevious();
+}
+
 void UIHelpBrowserWidget::sltCopyAvailableChanged(bool fAvailable)
 {
@@ -1715 +1778 @@
         m_pFindInPageAction->blockSignals(false);
     }
+    if (m_pFindNextInPageAction)
+        m_pFindNextInPageAction->setEnabled(fVisible);
+
+    if (m_pFindPreviousInPageAction)
+        m_pFindPreviousInPageAction->setEnabled(fVisible);
 }
 
@@ -1984 +2052 @@
         if (m_pFindInPageAction)
             m_pFindInPageAction->setChecked(m_pTabManager->isFindInPageWidgetVisible());
+        if (m_pFindNextInPageAction)
+            m_pFindNextInPageAction->setEnabled(m_pTabManager->isFindInPageWidgetVisible());
+        if (m_pFindPreviousInPageAction)
+            m_pFindPreviousInPageAction->setEnabled(m_pTabManager->isFindInPageWidgetVisible());
     }
 }

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

@@ -101 +101 @@
     void sltFindInPage(bool fChecked);
     void sltFindInPageWidgetVisibilityChanged(bool fVisible);
+    void sltFindNextInPage();
+    void sltFindPreviousInPage();
 
 private:
@@ -175 +177 @@
     QAction             *m_pCopySelectedTextAction;
     QAction             *m_pFindInPageAction;
+    QAction             *m_pFindNextInPageAction;
+    QAction             *m_pFindPreviousInPageAction;
     UIZoomMenuAction    *m_pZoomMenuAction;
 

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

@@ -77 +77 @@
     void toggleFindInPageWidget(bool fVisible);
 
+public slots:
+
+    void sltSelectPreviousMatch();
+    void sltSelectNextMatch();
+
 protected:
 
@@ -97 +102 @@
     void sltFindWidgetDrag(const QPoint &delta);
     void sltFindInPageSearchTextChange(const QString &strSearchText);
-    void sltSelectPreviousMatch();
-    void sltSelectNextMatch();
     void sltToggleFindInPageWidget(bool fVisible);
     void sltCloseFindInPageWidget();