Plugins::WebBrowser: modify url search

Author: KangLin

Plugins/WebBrowser/AddressCompleter.cpp

@@ -149,6 +149,7 @@ bool CAddressCompleter::eventFilter(QObject *watched, QEvent *event)
         switch (event->type()) {
         case QEvent::KeyPress: {
             QKeyEvent *keyEvent = static_cast<QKeyEvent*>(event);
+            //qDebug(log) << Q_FUNC_INFO << keyEvent;
             switch (keyEvent->key()) {
             case Qt::Key_Down:
                 if (m_isCompleterVisible) {
@@ -168,7 +169,9 @@ bool CAddressCompleter::eventFilter(QObject *watched, QEvent *event)
                     selectCurrentItem();
                     return true;
                 }
-                emit urlSelected(m_pLineEdit->text());
+                if(m_pLineEdit) {
+                    emit urlSelected(m_pLineEdit->text());
+                }
                 break;
             case Qt::Key_Escape:
                 hideCompleter();
@@ -276,27 +279,28 @@ void CAddressCompleter::performSearch()
 
         addedUrls.insert(url);
 
-        if(url == m_pLineEdit->text())
-            m_currentSelectedIndex = count;
-
         count++;
     }
 
     // 如果没有找到历史记录，显示搜索建议
     if (0 == count) {
         addSearchSuggestions(keyword);
     } else if (1 == count) {
+        // 防止重复显示
         if(*addedUrls.begin() == m_pLineEdit->text())
             return;
     }
 
     // 如果有结果，显示下拉列表
     if (m_pListWidget->count() > 0) {
-        if(-1 < m_currentSelectedIndex) {
-            m_pListWidget->setCurrentRow(m_currentSelectedIndex);
-            // 确保选中项可见
-            m_pListWidget->scrollToItem(m_pListWidget->item(m_currentSelectedIndex));
-        }
+        // 选中第一项
+        if(-1 == m_currentSelectedIndex)
+            m_currentSelectedIndex = 0;
+
+        m_pListWidget->setCurrentRow(m_currentSelectedIndex);
+        // 确保选中项可见
+        m_pListWidget->scrollToItem(m_pListWidget->item(m_currentSelectedIndex));
+
         showCompleter();
     } else {
         hideCompleter();
@@ -315,7 +319,7 @@ void CAddressCompleter::addSearchSuggestions(const QString &keyword)
     QListWidgetItem *pSearchItem = new QListWidgetItem(m_pListWidget);
     if(pSearchItem) {
         pSearchItem->setSizeHint(QSize(0, 40));
-        pSearchItem->setData(Qt::UserRole, QString("search:%1").arg(keyword));
+        pSearchItem->setData(Qt::UserRole, QString("@search:%1").arg(keyword));
 
         CAddressCompleterItem *pCompleterItem = new CAddressCompleterItem(
             searchText,
@@ -361,10 +365,12 @@ void CAddressCompleter::onItemClicked(QListWidgetItem *item)
     QString url = item->data(Qt::UserRole).toString();
 
     // 处理搜索请求
-    if (url.startsWith("search:")) {
-        QString keyword = url.mid(7);
+    if (url.startsWith("@search:", Qt::CaseInsensitive)) {
+        QString keyword = url.mid(8);
+        qDebug(log) << "emit searchRequested:" << keyword;
         emit searchRequested(keyword);
     } else {
+        qDebug(log) << "emit urlSelected:" << url;
         emit urlSelected(url);
     }
 
@@ -405,6 +411,7 @@ void CAddressCompleter::moveToPreviousItem()
 
 void CAddressCompleter::selectCurrentItem()
 {
+    //qDebug(log) << Q_FUNC_INFO;
     if(!m_pListWidget) return;
     QListWidgetItem *item = m_pListWidget->item(m_currentSelectedIndex);
     if (item) {
@@ -415,7 +422,7 @@ void CAddressCompleter::selectCurrentItem()
 void CAddressCompleter::showCompleter()
 {
     if(!m_pListWidget) return;
-    if (m_isCompleterVisible || !m_pLineEdit || m_pListWidget->count() == 0) {
+    if (m_isCompleterVisible || m_pListWidget->count() == 0) {
         return;
     }
 
@@ -444,12 +451,6 @@ void CAddressCompleter::showCompleter()
         setGeometry(endRect);
         show();
     }
-
-    // 选中第一项
-    if (m_pListWidget->count() > 0) {
-        m_currentSelectedIndex = 0;
-        m_pListWidget->setCurrentRow(0);
-    }
 }
 
 void CAddressCompleter::hideCompleter()

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -161,6 +161,20 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
     check = connect(pAddressCompleter, &CAddressCompleter::urlSelected,
                     this, &CFrmWebBrowser::slotUrlSelected);
     Q_ASSERT(check);
+    check = connect(pAddressCompleter, &CAddressCompleter::searchRequested,
+                    this, [&](const QString& keyword) {
+        qDebug(log) << "CAddressCompleter::searchRequested keyword:" << keyword;
+        QString szSearch;
+        QString szUrl;
+        if(m_pPara) {
+            szSearch = m_pPara->GetSearchEngine();
+            szUrl = szSearch.replace(m_pPara->GetSearchRelaceString(),
+                                 QUrl::toPercentEncoding(keyword));
+            if(!szUrl.isEmpty())
+                slotUrlSelected(szUrl);
+        }
+    });
+    Q_ASSERT(check);
 
     m_pAddPage = m_pToolBar->addAction(QIcon::fromTheme("add"), tr("Add tab page"),
                                    this, [&](){
@@ -918,21 +932,23 @@ void CFrmWebBrowser::slotReturnPressed()
 
 void CFrmWebBrowser::slotUrlSelected(const QString &szUrl)
 {
-    QUrl u = QUrl::fromUserInput(szUrl);
-    qDebug(log) << u << szUrl;
-    if(u.isEmpty()) {
+    if(szUrl.isEmpty()) return;
+    QUrl url = QUrl::fromUserInput(szUrl);
+    qDebug(log) << url << szUrl << url.isValid();
+    if(szUrl.startsWith("@search:", Qt::CaseInsensitive)) {
         QString szSearch;
+        QString keyword = szUrl.mid(8);
         if(m_pPara) {
             szSearch = m_pPara->GetSearchEngine();
-            u = szSearch.replace(m_pPara->GetSearchRelaceString(),
-                                 QUrl::toPercentEncoding(m_pUrlLineEdit->text()));
+            url = szSearch.replace(m_pPara->GetSearchRelaceString(),
+                                 QUrl::toPercentEncoding(keyword));
         }
     }
-    emit sigInformation(u.toString());
+    emit sigInformation(url.toString());
     CFrmWebView* pWeb = CurrentView();
     if(!pWeb)
         pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
-    pWeb->load(u);
+    pWeb->load(url);
     if(m_pGo->isVisible())
         m_pGo->setVisible(false);
 }