Plugins::WebBrowser: modify paratmeters

KangLin · KangLin · commit c8b385e77843 · 2026-01-11T11:34:29.000+08:00
diff --git a/App/Client/ParameterDlgSettings.cpp b/App/Client/ParameterDlgSettings.cpp
@@ -8,8 +8,6 @@
 
 #include "ParameterDlgSettings.h"
 #include "ui_ParameterDlgSettings.h"
-#include "mainwindow.h"
-#include "RabbitCommonDir.h"
 
 #ifdef HAVE_ICE
 #include "Ice.h"
@@ -18,52 +16,13 @@
 static Q_LOGGING_CATEGORY(log, "App.MainWindow.Parameter")
 
 CParameterDlgSettings::CParameterDlgSettings(CParameterApp *pPara,
-                                             QList<QWidget *> wViewer,
                                              QWidget *parent) :
     QDialog(parent),
     ui(new Ui::CParameterDlgSettings),
     m_pParameters(pPara)
 {
     ui->setupUi(this);
 
-    int nWidth = 0;
-    int nHeigth = 0;
-    foreach(auto p, wViewer) {
-        if(!p) continue;
-        nWidth = qMax(nWidth, p->frameSize().width());
-        nHeigth = qMax(nHeigth, p->frameSize().height());
-    }
-    bool bScroll = false;
-    QScreen* pScreen = QApplication::primaryScreen();
-    QSize size = this->size();
-    if(nWidth > size.width() || nHeigth > size.height())
-        bScroll = true;
-    // [connect accepted to slotAccept of widget]
-    foreach(auto p, wViewer)
-    {
-        QString szMsg;
-        QWidget* pView = p;
-        if(bScroll)
-        {
-            QScrollArea* pScroll = new QScrollArea(ui->tabWidget);
-            if(!pScroll) continue;
-            pScroll->setWidget(p);
-            pView = pScroll;
-        }
-        ui->tabWidget->addTab(pView, p->windowIcon(), p->windowTitle());
-        bool check = false;
-        check = connect(this, SIGNAL(accepted()), p, SLOT(slotAccept()));
-        if(!check)
-        {
-            szMsg = "Class" + QString(p->metaObject()->className())
-                + "must has slot slotAccept(), please add it. "
-                + "Or the class derived from CParameterUI";
-            qCritical(log) << szMsg;
-        }
-        Q_ASSERT_X(check, "CParameterDlgSettings", szMsg.toStdString().c_str());
-    }
-    // [connect accepted to slotAccept of widget]
-
 #ifdef HAVE_ICE
     QWidget* pWidget = CICE::Instance()->GetParameterWidget(this);
     if(pWidget)
@@ -135,6 +94,47 @@ CParameterDlgSettings::~CParameterDlgSettings()
     delete ui;
 }
 
+void CParameterDlgSettings::SetViewers(const QList<QWidget *> &wViewer)
+{
+    int nWidth = 0;
+    int nHeigth = 0;
+    foreach(auto p, wViewer) {
+        if(!p) continue;
+        nWidth = qMax(nWidth, p->frameSize().width());
+        nHeigth = qMax(nHeigth, p->frameSize().height());
+    }
+    bool bScroll = false;
+    QScreen* pScreen = QApplication::primaryScreen();
+    QSize size = this->size();
+    if(nWidth > size.width() || nHeigth > size.height())
+        bScroll = true;
+    // [connect accepted to slotAccept of widget]
+    foreach(auto p, wViewer)
+    {
+        QString szMsg;
+        QWidget* pView = p;
+        if(bScroll)
+        {
+            QScrollArea* pScroll = new QScrollArea(ui->tabWidget);
+            if(!pScroll) continue;
+            pScroll->setWidget(p);
+            pView = pScroll;
+        }
+        ui->tabWidget->addTab(pView, p->windowIcon(), p->windowTitle());
+        bool check = false;
+        check = connect(this, SIGNAL(accepted()), p, SLOT(slotAccept()));
+        if(!check)
+        {
+            szMsg = "Class" + QString(p->metaObject()->className())
+            + "must has slot slotAccept(), please add it. "
+                + "Or the class derived from CParameterUI";
+            qCritical(log) << szMsg;
+        }
+        Q_ASSERT_X(check, "CParameterDlgSettings", szMsg.toStdString().c_str());
+    }
+    // [connect accepted to slotAccept of widget]
+}
+
 void CParameterDlgSettings::on_pbOk_clicked()
 {
     if(!m_pParameters) return;
diff --git a/App/Client/ParameterDlgSettings.h b/App/Client/ParameterDlgSettings.h
@@ -14,10 +14,9 @@ class CParameterDlgSettings : public QDialog
     
 public:
     explicit CParameterDlgSettings(CParameterApp* pPara,
-                                   QList<QWidget*> wViewer,
                                    QWidget *parent = nullptr);
     virtual ~CParameterDlgSettings();
-
+    void SetViewers(const QList<QWidget*> &wViewer);
 private slots:    
     void on_pbOk_clicked();
     void on_pbNo_clicked();
diff --git a/App/Client/mainwindow.cpp b/App/Client/mainwindow.cpp
@@ -1425,17 +1425,22 @@ void MainWindow::on_actionStatus_bar_S_toggled(bool checked)
     m_Parameter.SetStatusBar(checked);
 }
 
-// [Get the widget that settings client parameters]
+// [Get the widget that settings plugin parameters]
 void MainWindow::on_actionSettings_triggered()
 {
-    CParameterDlgSettings set(&m_Parameter, m_Manager.GetSettingsWidgets(this), this);
+    CParameterDlgSettings set(&m_Parameter, this);
+    auto viewers = m_Manager.GetSettingsWidgets(&set);
+    set.SetViewers(viewers);
     if(CParameterDlgSettings::Accepted == RC_SHOW_WINDOW(&set))
     {
         m_Manager.SaveSettings();
         m_Parameter.Save();
     }
+    foreach(auto v, viewers) {
+        v->deleteLater();
+    }
 }
-// [Get the widget that settings client parameters]
+// [Get the widget that settings plugin parameters]
 
 void MainWindow::slotShortCut()
 {
diff --git a/Plugins/WebBrowser/ParameterWebBrowser.cpp b/Plugins/WebBrowser/ParameterWebBrowser.cpp
@@ -19,14 +19,17 @@ CParameterWebBrowser::CParameterWebBrowser(QObject *parent, const QString &szPre
     , m_bPromptPrintFinished(true)
     , m_bAutoFillUserAndPassword(false)
 {
+    SetHomeUrl("https://github.com/KangLin");
+    SetTabUrl("https://github.com/KangLin/RabbitRemoteControl");
     //m_szDownloadFolder = QStandardPaths::writableLocation(QStandardPaths::DownloadLocation);
     SetDownloadFolder(QWebEngineProfile::defaultProfile()->downloadPath());
     qDebug(log) << "Download folder:" << GetDownloadFolder();
     SetSearchEngine("https://cn.bing.com/search?q=%s");
     SetSearchRelaceString("%s");
     QStringList searchEngines;
-    searchEngines << "https://cn.bing.com/search?q=%s";
-    searchEngines << "https://www.google.com/search?q=%s";
+    searchEngines << "https://www.bing.com/search?q=%s"
+                  << "https://www.google.com/search?q=%s"
+                  << "https://www.baidu.com/s?wd=%s";
     SetSearchEngineList(searchEngines);
 }
 
diff --git a/Plugins/WebBrowser/PluginWebBrowser.cpp b/Plugins/WebBrowser/PluginWebBrowser.cpp
@@ -76,3 +76,12 @@ const QString CPluginWebBrowser::Details() const
 #endif
     return szDetails;
 }
+
+QWidget* CPluginWebBrowser::GetSettingsWidget(QWidget* parent)
+{
+    //TODO: Add set global parameters
+    QWidget* pSetting = new QWidget(parent);
+    if(pSetting)
+        pSetting->setWindowTitle(tr("Set Web Wrowser"));
+    return pSetting;
+}
diff --git a/Plugins/WebBrowser/PluginWebBrowser.h b/Plugins/WebBrowser/PluginWebBrowser.h
@@ -30,6 +30,7 @@ class CPluginWebBrowser: public CPlugin
     
 protected:
     virtual COperate *OnCreateOperate(const QString &szId) override;
+    Q_INVOKABLE virtual QWidget* GetSettingsWidget(QWidget *parent) override;
 };
 
 
diff --git a/Src/Manager.cpp b/Src/Manager.cpp
@@ -501,16 +501,18 @@ QList<QWidget*> CManager::GetSettingsWidgets(QWidget* parent)
 {
     QList<QWidget*> lstWidget;
 
-    CParameterPluginUI* pClient = new CParameterPluginUI(parent);
-    if(pClient) {
-        pClient->SetParameter(m_pParameter);
-        lstWidget.push_back(pClient);
-    }
     CFrmManagePlugins* pManagePlugins = new CFrmManagePlugins(parent);
     if(pManagePlugins) {
         pManagePlugins->SetParameter(m_pParameter);
         lstWidget.push_back(pManagePlugins);
     }
+
+    CParameterPluginUI* pClient = new CParameterPluginUI(parent);
+    if(pClient) {
+        pClient->SetParameter(m_pParameter);
+        lstWidget.push_back(pClient);
+    }
+
 #if defined(HAVE_QTERMWIDGET)
     CParameterTerminalUI* pTermina = new CParameterTerminalUI(parent);
     if(pTermina) {
@@ -530,6 +532,26 @@ QList<QWidget*> CManager::GetSettingsWidgets(QWidget* parent)
         pMediaDevices->SetParameter(&m_pParameter->m_MediaDevices.m_Para);
         lstWidget.push_back(pMediaDevices);
     }
+
+    //! [Get the widget to set global parameters for the plugin]
+    foreach(auto plugin, m_Plugins) {
+        if(!plugin) continue;
+        QWidget* pSettings = nullptr;
+        bool bRet = QMetaObject::invokeMethod(
+            plugin,
+            "GetSettingsWidget",
+            Qt::DirectConnection,
+            Q_RETURN_ARG(QWidget*, pSettings),
+            Q_ARG(QWidget*, parent));
+        if(!bRet) {
+            qCritical(log) << "Call CPlugin::GetSettingsWidget() fail.";
+            continue;
+        }
+        if(!pSettings) continue;
+        lstWidget.push_back(pSettings);
+    }
+    //! [Get the widget to set global parameters for the plugin]
+
     return lstWidget;
 }
 
diff --git a/Src/Manager.h b/Src/Manager.h
@@ -97,28 +97,35 @@ class PLUGIN_EXPORT CManager : public QObject
     /*!
      * \~chinese 得到设置参数窗口
      * \return 设置参数窗口。此窗口的所有者为调用者。
-     * \note 此窗口必须从 CParameterUI 派生。
+     * \note 此窗口一般从 CParameterUI 派生。
      *       例如: CParameterPluginUI
+     *       如果不是从 CParameterUI 派生，则需要实现接口：
+     *       - virtual int SetParameter(CParameter* pParameter);
+     *       - virtual int Accept();
+     *
      * 用法示例：
-     * \snippet App/Client/mainwindow.cpp Get the widget that settings client parameters
+     * \snippet App/Client/mainwindow.cpp Get the widget that settings plugin parameters
      * 
      * 在 CParameterDlgSettings 的构造函数中连接信号和槽
      * \snippet App/Client/ParameterDlgSettings.cpp connect accepted to slotAccept of widget
      * 
      * \~english Get parameter settings widget
      * \return Parameter widget. The QWidget owner is caller.
-     * \note The widget must be a derivative of CParameterUI.
-     *         Eg: CParameterPluginUI
+     * \note This window is generally derived from CParameterUI.
+     *       For example: CParameterPluginUI
+     *       If it is not derived from CParameterUI, then you need to implement the following interfaces:
+     *       - virtual int SetParameter(CParameter* pParameter);
+     *       - virtual int Accept();
      *
      * \snippet Src/ParameterPluginUI.h Accept parameters
      * Usage:
-     * \snippet App/Client/mainwindow.cpp Get the widget that settings client parameters
+     * \snippet App/Client/mainwindow.cpp Get the widget that settings plugin parameters
      * Connect the signal(accepted) to the slot(slotAccept) in CParameterDlgSettings
      * \snippet App/Client/ParameterDlgSettings.cpp connect accepted to slotAccept of widget
      * 
      * \~
      * \see CParameterPluginUI CParameterDlgSettings
-     */   
+     */
     virtual QList<QWidget*> GetSettingsWidgets(QWidget *parent);
     /*!
      * \~chinese
@@ -183,6 +190,11 @@ class PLUGIN_EXPORT CManager : public QObject
      */
     int LoadPlugin(const QString& szPath);
     int FindPlugins(QDir dir, QStringList filters);
+    /*!
+     * \brief Append Plugin
+     * \param plugin
+     * \return
+     */
     int AppendPlugin(CPlugin* plugin);
 
 private Q_SLOTS:
diff --git a/Src/Plugin.cpp b/Src/Plugin.cpp
@@ -147,3 +147,8 @@ int CPlugin::DeleteOperate(COperate *p)
     p->deleteLater();
     return 0;
 }
+
+QWidget* CPlugin::GetSettingsWidget(QWidget* parent)
+{
+    return nullptr;
+}
diff --git a/Src/Plugin.h b/Src/Plugin.h
@@ -65,23 +65,23 @@ class PLUGIN_EXPORT CPlugin : public QObject
 protected:
     /*!
      * \~chinese
-     * \brief 新建 COperate 实例。仅由 CClient 调用
-     * \snippet Client/Client.cpp CClient CreateOperate
+     * \brief 新建 COperate 实例。仅由 CManager 调用
+     * \snippet Src/Manager.cpp CManager CreateOperate
      * \return 返回 COperate 指针, 它的所有者是调用者。
      * \note 此函数新建一个对象指针，
      *       <b>调用者必须负责在用完后释放指针</b>。
      * \param szId 连接 ID
      *
      * \~english
-     * \brief New COperate instance. Only is called by CClient
-     * \snippet Client/Client.cpp CClient CreateOperate
+     * \brief New COperate instance. Only is called by CManager
+     * \snippet Src/Manager.cpp CManager CreateOperate
      * \return Return COperate pointer, the owner is caller
      * \note The function new object pointer,
      *       <b>the caller must delete it when don't use it</b>.
      * \param szId
      *
      * \~
-     * \see CClient::CreateOperate CClient::LoadOperate
+     * \see CManager::CreateOperate CManager::LoadOperate
      *
      */
     Q_INVOKABLE virtual COperate* CreateOperate(
@@ -91,19 +91,40 @@ class PLUGIN_EXPORT CPlugin : public QObject
      * Delete COperate
      */
     Q_INVOKABLE virtual int DeleteOperate(COperate* p);
+    /*!
+     * \~chinese 得到设置此插件全局参数的窗口
+     * \return 设置参数窗口。如果不需要，则返回 nullptr。此窗口的所有者为调用者。
+     * \note 此窗口必须从 CParameterUI 派生。
+     * 用法示例：
+     * \snippet Src/Manager.cpp  Get the widget to set global parameters for the plugin
+     *
+     * \~english Get the widget to set global parameters for the plugin
+     * \return Sets the parameters widget.
+     *         Returns nullptr if no parameters are needed.
+     *         This widget belongs to the caller.
+     * \note The widget must be a derivative of CParameterUI.
+     *         Eg: CParameterPluginUI
+     *
+     * \snippet Src/ParameterPluginUI.h Accept parameters
+     * Usage:
+     * \snippet Src/Manager.cpp  Get the widget to set global parameters for the plugin
+     * \~
+     * \see CManager::GetSettingsWidgets
+     */
+    Q_INVOKABLE virtual QWidget* GetSettingsWidget(QWidget *parent);
 
 private:
     QSharedPointer<QTranslator> m_Translator;
     /*!
-     * \~chinese 初始化翻译资源，仅由 CClient 调用。
+     * \~chinese 初始化翻译资源，仅由 CManager 调用。
      *   因为它调用了 Name() ，所以不能在此类的构造函数中直接调用。
      *
      * \~english Initialize the translation resource,
-     *   which is only called by CClient.
+     *   which is only called by CManager.
      *   Because it calls Name(),
      *   So it can't be called directly in the constructor of this class.
      *
-     * \see CClient::AppendPlugin
+     * \see CManager::AppendPlugin
      */
     Q_INVOKABLE int InitTranslator();
 };

Original file line number	Diff line number	Diff line change
`@@ -1425,17 +1425,22 @@ void MainWindow::on_actionStatus_bar_S_toggled(bool checked)`
`1425`	`1425`	`m_Parameter.SetStatusBar(checked);`
`1426`	`1426`	`}`
`1427`	`1427`
`1428`		`-// [Get the widget that settings client parameters]`
	`1428`	`+// [Get the widget that settings plugin parameters]`
`1429`	`1429`	`void MainWindow::on_actionSettings_triggered()`
`1430`	`1430`	`{`
`1431`		`- CParameterDlgSettings set(&m_Parameter, m_Manager.GetSettingsWidgets(this), this);`
	`1431`	`+ CParameterDlgSettings set(&m_Parameter, this);`
	`1432`	`+ auto viewers = m_Manager.GetSettingsWidgets(&set);`
	`1433`	`+ set.SetViewers(viewers);`
`1432`	`1434`	`if(CParameterDlgSettings::Accepted == RC_SHOW_WINDOW(&set))`
`1433`	`1435`	`{`
`1434`	`1436`	`m_Manager.SaveSettings();`
`1435`	`1437`	`m_Parameter.Save();`
`1436`	`1438`	`}`
	`1439`	`+ foreach(auto v, viewers) {`
	`1440`	`+ v->deleteLater();`
	`1441`	`+ }`
`1437`	`1442`	`}`
`1438`		`-// [Get the widget that settings client parameters]`
	`1443`	`+// [Get the widget that settings plugin parameters]`
`1439`	`1444`
`1440`	`1445`	`void MainWindow::slotShortCut()`
`1441`	`1446`	`{`
Original file line number	Diff line number	Diff line change
`@@ -147,3 +147,8 @@ int CPlugin::DeleteOperate(COperate *p)`
`147`	`147`	`p->deleteLater();`
`148`	`148`	`return 0;`
`149`	`149`	`}`
	`150`	`+`
	`151`	`+QWidget* CPlugin::GetSettingsWidget(QWidget* parent)`
	`152`	`+{`
	`153`	`+ return nullptr;`
	`154`	`+}`