Changeset 86816 in vbox

Timestamp:

Nov 6, 2020 6:50:38 AM (4 years ago)

Author:

vboxsync

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

141260

Message:

FE/Qt: bugref:9831. Adding some connections

Location:

trunk/src/VBox/Frontends/VirtualBox/src

Files:

• helpbrowser/UIHelpBrowserWidget.cpp (modified) (13 diffs)
• widgets/UISearchLineEdit.cpp (modified) (2 diffs)

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

@@ -85 +85 @@
 
     void sigDragging(const QPoint &delta);
+    void sigSearchTextChanged(const QString &strSearchText);
 
 public:
@@ -123 +124 @@
     void emitHistoryChangedSignal();
     void setSource(const QUrl &url, const QString &strError);
+    void toggleFindInPageWidget(bool fVisible);
 
 public slots:
@@ -137 +139 @@
     void sltHandleOpenInNewTab();
     void sltHandleFindWidgetDrag(const QPoint &delta);
+    void sltHandleFindInPageSearchTextChange(const QString &strSearchText);
 
 private:
@@ -180 +183 @@
     void sltHandleForwardAction();
     void sltHandleBackwardAction();
+    void sltHandleFindInPageAction(bool fToggled);
     void sltHandleHistoryChanged();
     void sltHandleAddressBarIndexChanged(int index);
@@ -287 +291 @@
 {
     setAutoFillBackground(true);
-    setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
+    setSizePolicy(QSizePolicy::MinimumExpanding, QSizePolicy::Maximum);
 
     QHBoxLayout *pLayout = new QHBoxLayout(this);
@@ -293 +297 @@
     AssertReturnVoid(pLayout && m_pSearchLineEdit);
 
-    pLayout->setContentsMargins(0, 0, 0, 0);
-    pLayout->setContentsMargins(0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutLeftMargin),
-                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin),
-                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutRightMargin),
-                                0.5 * qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin));
+    QFontMetrics fontMetric(m_pSearchLineEdit->font());
+    setMinimumSize(40 * fontMetric.width("x"),
+                   fontMetric.height() +
+                   qApp->style()->pixelMetric(QStyle::PM_LayoutBottomMargin) +
+                   qApp->style()->pixelMetric(QStyle::PM_LayoutTopMargin));
+
+    connect(m_pSearchLineEdit, &UISearchLineEdit::textChanged,
+            this, &UIFindInPageWidget::sigSearchTextChanged);
+
     m_pDragMoveLabel = new QLabel;
     AssertReturnVoid(m_pDragMoveLabel);
@@ -424 +432 @@
         new QAction(UIIconPool::iconSet(":/help_browser_search.png"), QString(), this);
 
+    AssertReturnVoid(m_pHomeAction && m_pForwardAction &&
+                     m_pBackwardAction && m_pAddBookmarkAction &&
+                     m_pFindInPageAction);
+    m_pFindInPageAction->setCheckable(true);
+
     connect(m_pHomeAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleHomeAction);
     connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleAddBookmarkAction);
     connect(m_pForwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleForwardAction);
     connect(m_pBackwardAction, &QAction::triggered, this, &UIHelpBrowserTab::sltHandleBackwardAction);
-    AssertReturnVoid(m_pHomeAction && m_pForwardAction && m_pBackwardAction && m_pAddBookmarkAction);
+    connect(m_pFindInPageAction, &QAction::toggled, this, &UIHelpBrowserTab::sltHandleFindInPageAction);
+
     m_pForwardAction->setEnabled(false);
     m_pBackwardAction->setEnabled(false);
@@ -493 +507 @@
     if (m_pContentViewer)
         m_pContentViewer->backward();
+}
+
+void UIHelpBrowserTab::sltHandleFindInPageAction(bool fToggled)
+{
+    if (m_pContentViewer)
+        m_pContentViewer->toggleFindInPageWidget(fToggled);
 }
 
@@ -564 +584 @@
     connect(m_pFindInPageWidget, &UIFindInPageWidget::sigDragging,
             this, &UIHelpBrowserViewer::sltHandleFindWidgetDrag);
+    connect(m_pFindInPageWidget, &UIFindInPageWidget::sigSearchTextChanged,
+            this, &UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange);
+    m_pFindInPageWidget->setVisible(false);
     retranslateUi();
 }
@@ -587 +610 @@
     else
         QTextBrowser::setSource(url);
+}
+
+void UIHelpBrowserViewer::toggleFindInPageWidget(bool fVisible)
+{
+    if (m_pFindInPageWidget)
+    {
+        m_pFindInPageWidget->setVisible(fVisible);
+        update();
+    }
 }
 
@@ -618 +650 @@
         if (!m_fFindWidgetPositioned)
         {
-            m_pFindInPageWidget->move(width() - m_pFindInPageWidget->width() - 50, 0);
+            m_pFindInPageWidget->move(width() - m_pFindInPageWidget->width() - 10, 10);
             m_fFindWidgetPositioned = true;
         }
@@ -649 +681 @@
         rect.translate(0, (height() - iMargin - rect.bottom()));
     m_pFindInPageWidget->setGeometry(rect);
+    m_pFindInPageWidget->update();
 }
 
@@ -681 +714 @@
         m_pFindInPageWidget->move(m_pFindInPageWidget->pos() + delta);
     update();
+}
+
+void UIHelpBrowserViewer::sltHandleFindInPageSearchTextChange(const QString &strSearchText)
+{
+    printf("%s\n", qPrintable(strSearchText));
 }
 

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

@@ -30 +30 @@
     , m_unmarkColor(palette().color(QPalette::Base))
     , m_markColor(QColor(m_unmarkColor.red(),
-                         0.5 * m_unmarkColor.green(),
-                         0.5 * m_unmarkColor.blue()))
+                         0.7 * m_unmarkColor.green(),
+                         0.7 * m_unmarkColor.blue()))
 {
 }
@@ -58 +58 @@
     int iRightMargin = iTopMargin;
 
-    QColor fontColor(Qt::darkGray);
+    QColor fontColor(Qt::black);
     painter.setPen(fontColor);
     painter.setFont(pfont);