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

Timestamp:

Nov 6, 2020 1:17:15 PM (4 years ago)

Author:

vboxsync

Message:

FE/Qt: bugref:9831. Adding a close button to the find-in-page widget

File:

• trunk/src/VBox/Frontends/VirtualBox/src/helpbrowser/UIHelpBrowserWidget.cpp (modified) (12 diffs)

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

@@ -88 +88 @@
     void sigSelectNextMatch();
     void sigSelectPreviousMatch();
+    void sigClose();
 
 public:
@@ -106 +107 @@
     QIToolButton      *m_pNextButton;
     QIToolButton      *m_pPreviousButton;
+    QIToolButton      *m_pCloseButton;
     QLabel            *m_pDragMoveLabel;
     QPoint m_previousMousePosition;
@@ -121 +123 @@
 
     void sigOpenLinkInNewTab(const QUrl &url);
+    void sigCloseFindInPageWidget();
 
 public:
@@ -200 +203 @@
     void sltHandleAddBookmarkAction();
     void sltAnchorClicked(const QUrl &link);
+    void sltCloseFindInPageWidget();
 
 private:
@@ -276 +280 @@
     , m_pNextButton(0)
     , m_pPreviousButton(0)
+    , m_pCloseButton(0)
     , m_previousMousePosition(-1, -1)
 {
@@ -348 +353 @@
     m_pPreviousButton = new QIToolButton;
     m_pNextButton = new QIToolButton;
+    m_pCloseButton = new QIToolButton;
 
     pLayout->addWidget(m_pPreviousButton);
     pLayout->addWidget(m_pNextButton);
+    pLayout->addWidget(m_pCloseButton);
 
     m_pPreviousButton->setIcon(UIIconPool::iconSet(":/arrow_up_10px.png"));
     m_pNextButton->setIcon(UIIconPool::iconSet(":/arrow_down_10px.png"));
+    m_pCloseButton->setIcon(UIIconPool::iconSet(":/close_16px.png"));
 
     connect(m_pPreviousButton, &QIToolButton::pressed, this, &UIFindInPageWidget::sigSelectPreviousMatch);
     connect(m_pNextButton, &QIToolButton::pressed, this, &UIFindInPageWidget::sigSelectNextMatch);
+    connect(m_pCloseButton, &QIToolButton::pressed, this, &UIFindInPageWidget::sigClose);
 }
 
@@ -448 +457 @@
     connect(m_pContentViewer, &UIHelpBrowserViewer::sigOpenLinkInNewTab,
         this, &UIHelpBrowserTab::sigOpenLinkInNewTab);
+    connect(m_pContentViewer, &UIHelpBrowserViewer::sigCloseFindInPageWidget,
+            this, &UIHelpBrowserTab::sltCloseFindInPageWidget);
+
     m_pContentViewer->setSource(initialUrl, m_strPageNotFoundText);
 }
@@ -596 +608 @@
 }
 
-
 void UIHelpBrowserTab::sltAnchorClicked(const QUrl &link)
 {
@@ -602 +613 @@
 }
 
+void UIHelpBrowserTab::sltCloseFindInPageWidget()
+{
+    if (m_pFindInPageAction)
+        m_pFindInPageAction->setChecked(false);
+}
 
 /*********************************************************************************************************************************
@@ -626 +642 @@
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSelectNextMatch,
             this, &UIHelpBrowserViewer::sltSelectNextMatch);
+    connect(m_pFindInPageWidget, &UIFindInPageWidget::sigClose,
+            this, &UIHelpBrowserViewer::sigCloseFindInPageWidget);
 
     m_pFindInPageWidget->setVisible(false);
@@ -697 +715 @@
         if (!m_fFindWidgetPositioned)
         {
-            m_pFindInPageWidget->move(width() - m_pFindInPageWidget->width() - 10, 10);
+            m_pFindInPageWidget->move(m_iMarginForFindWidget, m_iMarginForFindWidget);
             m_fFindWidgetPositioned = true;
         }
@@ -844 +862 @@
         m_pFindInPageWidget->setMatchCountAndCurrentIndex(m_matchedCursorPosition.size(), m_iSelectedMatchIndex);
 }
-
 
 /*********************************************************************************************************************************