Plugins::WebBrowser: add custom command

Author: KangLin

Plugins/WebBrowser/AddressCompleter.cpp

@@ -404,7 +404,9 @@ void CAddressCompleter::onItemClicked(QListWidgetItem *item)
         QString keyword = url.mid(8);
         qDebug(log) << "emit searchRequested:" << keyword;
         emit searchRequested(keyword);
-    } else {
+    } if(url.startsWith("@")) {
+        emit sigCommand(url);
+    }else {
         qDebug(log) << "emit urlSelected:" << url;
         emit urlSelected(url);
     }

Plugins/WebBrowser/AddressCompleter.h

@@ -48,6 +48,7 @@ class CAddressCompleter : public QWidget
 signals:
     void urlSelected(const QString &url);
     void searchRequested(const QString &keyword);
+    void sigCommand(const QString& szCmd);
 
 protected:
     bool eventFilter(QObject *watched, QEvent *event) override;

Plugins/WebBrowser/FrmWebBrowser.cpp

@@ -181,6 +181,17 @@ CFrmWebBrowser::CFrmWebBrowser(CParameterWebBrowser *pPara, bool bMenuBar, QWidg
         }
     });
     Q_ASSERT(check);
+    check = connect(pAddressCompleter, &CAddressCompleter::sigCommand,
+                    this, [&](const QString& cmd) {
+        if(cmd.startsWith("@setting")) {
+
+        } else if(cmd.startsWith("@history")) {
+
+        } else if(cmd.startsWith("@bookmark")) {
+            slotBookmark();
+        }
+    });
+    Q_ASSERT(check);
 
     m_pAddBookmark = m_pToolBar->addAction(
         QIcon::fromTheme("user-bookmarks"),
@@ -773,21 +784,7 @@ int CFrmWebBrowser::InitMenu(QMenu *pMenu)
     pMenuBookmark->setIcon(QIcon::fromTheme("user-bookmarks"));
     pMenu->addMenu(pMenuBookmark);
     pMenuBookmark->addAction(m_pAddBookmark);
-    pMenuBookmark->addAction(tr("Manage Bookmark "), this, [&]{
-        CFrmBookmark* pBookmark = new CFrmBookmark(m_pPara);
-        if(!pBookmark) return;
-        pBookmark->setAttribute(Qt::WA_DeleteOnClose);
-        connect(this, &CFrmWebBrowser::destroyed, pBookmark, &CFrmBookmark::close);
-        connect(pBookmark, &CFrmBookmark::openUrlRequested, this, [&](const QString& url) {
-            CFrmWebView* pWeb = CurrentView();
-            if(!pWeb) {
-                pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
-            }
-            if(pWeb)
-                pWeb->load(url);
-        });
-        RC_SHOW_WINDOW(pBookmark);
-    });
+    pMenuBookmark->addAction(tr("Manage Bookmark "), this, &CFrmWebBrowser::slotBookmark);
     pMenu->addAction(tr("History"), this, [&]() {
         CFrmHistory* pHistory = new CFrmHistory(m_pPara);
         if(!pHistory) return;
@@ -1300,3 +1297,20 @@ void CFrmWebBrowser::slotAddBookmark()
     Q_ASSERT(check);
     RC_SHOW_WINDOW(pAdd);
 }
+
+void CFrmWebBrowser::slotBookmark()
+{
+    CFrmBookmark* pBookmark = new CFrmBookmark(m_pPara);
+    if(!pBookmark) return;
+    pBookmark->setAttribute(Qt::WA_DeleteOnClose);
+    connect(this, &CFrmWebBrowser::destroyed, pBookmark, &CFrmBookmark::close);
+    connect(pBookmark, &CFrmBookmark::openUrlRequested, this, [&](const QString& url) {
+        CFrmWebView* pWeb = CurrentView();
+        if(!pWeb) {
+            pWeb = qobject_cast<CFrmWebView*>(CreateWindow(QWebEnginePage::WebBrowserTab));
+        }
+        if(pWeb)
+            pWeb->load(url);
+    });
+    RC_SHOW_WINDOW(pBookmark);
+}

Plugins/WebBrowser/FrmWebBrowser.h

@@ -69,6 +69,7 @@ private Q_SLOTS:
     void slotRecordTimeout();
 
     void slotAddBookmark();
+    void slotBookmark();
 
 public Q_SLOTS:
     void slotFullScreen(bool bFullScreen);