Plugin: modify set plugins paths

Author: KangLin

App/Client/ParameterDlgSettings.cpp

@@ -35,8 +35,8 @@ CParameterDlgSettings::CParameterDlgSettings(CParameterApp *pPara,
     }
     bool bScroll = false;
     QScreen* pScreen = QApplication::primaryScreen();
-    QSize size = pScreen->availableGeometry().size();
-    if(nWidth > size.width() * 3 / 4 || nHeigth > size.height() * 3 / 4)
+    QSize size = this->size();
+    if(nWidth > size.width() || nHeigth > size.height())
         bScroll = true;
     // [connect accepted to slotAccept of widget]
     foreach(auto p, wViewer)

Src/FrmManagePlugins.cpp

@@ -54,6 +54,7 @@ CFrmManagePlugins::CFrmManagePlugins(QWidget *parent) : CParameterUI(parent)
 int CFrmManagePlugins::SetParameter(CParameter *pParameter)
 {
     m_pPara = qobject_cast<CParameterPlugin*>(pParameter);
+    ui->gbPluginsPath->setChecked(m_pPara->GetEnableSetPluginsPath());
     foreach(auto szPath, m_pPara->GetPluginsPath()) {
         auto pPath = new QStandardItem(szPath);
         m_pModelPluginPath->appendRow(pPath);
@@ -77,6 +78,7 @@ int CFrmManagePlugins::SetParameter(CParameter *pParameter)
 int CFrmManagePlugins::Accept()
 {
     QStringList lstPath;
+    m_pPara->SetEnableSetPluginsPath(ui->gbPluginsPath->isChecked());
     for(int i = 0; i < m_pModelPluginPath->rowCount(); i++) {
         lstPath << m_pModelPluginPath->item(i)->text();
     }

Src/FrmManagePlugins.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>600</width>
-    <height>450</height>
+    <width>550</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">
@@ -25,7 +25,7 @@
     </widget>
    </item>
    <item row="0" column="0">
-    <widget class="QGroupBox" name="groupBox">
+    <widget class="QGroupBox" name="gbPluginsPath">
      <property name="sizePolicy">
       <sizepolicy hsizetype="Preferred" vsizetype="Preferred">
        <horstretch>0</horstretch>
@@ -35,6 +35,12 @@
      <property name="title">
       <string>Plugins path:</string>
      </property>
+     <property name="checkable">
+      <bool>true</bool>
+     </property>
+     <property name="checked">
+      <bool>false</bool>
+     </property>
      <layout class="QGridLayout" name="gridLayout_2">
       <item row="0" column="0">
        <widget class="QListView" name="lvPluginsPath">

Src/Manager.cpp

@@ -168,9 +168,15 @@ int CManager::LoadPlugins()
         }
     }//*/
 
-    if(m_pParameter->GetPluginsPath().isEmpty())
+    QStringList lstPaths;
+    if(m_pParameter->GetEnableSetPluginsPath()) {
+        lstPaths = m_pParameter->GetPluginsPath();
+    }
+    else
+        lstPaths << RabbitCommon::CDir::Instance()->GetDirPlugins();
+    if(lstPaths.isEmpty())
         qWarning(log) << "The plugins path is empty. please set it from: `Menu` -> `Tools` -> `Settings` -> `Load Plugins`";
-    foreach (auto szPath, m_pParameter->GetPluginsPath()) {
+    foreach (auto szPath, lstPaths) {
         //QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugins();
 
         QStringList filters;

Src/ParameterCompone/ParameterPlugin.cpp

@@ -19,6 +19,7 @@ CParameterPlugin::CParameterPlugin(QObject *parent)
     , m_bShowProtocolPrefix(false)
     , m_bShowIpPortInName(false)
     , m_AdaptWindows(CFrmViewer::ADAPT_WINDOWS::KeepAspectRationToWindow)
+    , m_bEnableSetPluginsPath(false)
     , m_szPluginsPath(RabbitCommon::CDir::Instance()->GetDirPlugins())
     , m_WhiteList(this, "Whilelist")
     , m_BlackList(this, "BlackList")
@@ -64,6 +65,7 @@ int CParameterPlugin::OnLoad(QSettings &set)
     SetAdaptWindows((CFrmViewer::ADAPT_WINDOWS)set.value("Viewer/AdaptWindows",
                                          (int)GetAdaptWindows()).toInt());
     SetPluginsPath(set.value("PluginsPath", GetPluginsPath()).toStringList());
+    SetEnableSetPluginsPath(set.value("PluginsPath/Enable", GetEnableSetPluginsPath()).toBool());
     set.endGroup();
     return 0;
 }
@@ -86,6 +88,7 @@ int CParameterPlugin::OnSave(QSettings& set)
     set.setValue("Connecter/Name/ShowIpPort", GetShowIpPortInName());
     set.setValue("Viewer/AdaptWindows", (int)GetAdaptWindows());
     set.setValue("PluginsPath", GetPluginsPath());
+    set.setValue("PluginsPath/Enable", GetEnableSetPluginsPath());
     set.endGroup();
     return 0;
 }
@@ -308,6 +311,19 @@ void CParameterPlugin::SetAdaptWindows(CFrmViewer::ADAPT_WINDOWS aw)
     emit sigAdaptWindowsChanged();
 }
 
+bool CParameterPlugin::GetEnableSetPluginsPath() const
+{
+    return m_bEnableSetPluginsPath;
+}
+
+void CParameterPlugin::SetEnableSetPluginsPath(bool newEnableSetPluginsPath)
+{
+    if(m_bEnableSetPluginsPath == newEnableSetPluginsPath)
+        return;
+    m_bEnableSetPluginsPath = newEnableSetPluginsPath;
+    SetModified(true);
+}
+
 QStringList CParameterPlugin::GetPluginsPath() const
 {
     return m_szPluginsPath;

Src/ParameterCompone/ParameterPlugin.h

@@ -180,6 +180,12 @@ class PLUGIN_EXPORT CParameterPlugin : public CParameter
     CFrmViewer::ADAPT_WINDOWS m_AdaptWindows;
     Q_PROPERTY(CFrmViewer::ADAPT_WINDOWS AdaptWindows READ GetAdaptWindows WRITE SetAdaptWindows NOTIFY sigAdaptWindowsChanged)
 
+public:
+    bool GetEnableSetPluginsPath() const;
+    void SetEnableSetPluginsPath(bool newEnableSetPluginsPath);
+private:
+    bool m_bEnableSetPluginsPath;
+
 public:
     QStringList GetPluginsPath() const;
     void SetPluginsPath(const QStringList &newPluginsPath);

Src/ParameterCompone/ParameterRecordUI.ui

@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>471</width>
-    <height>383</height>
+    <width>550</width>
+    <height>400</height>
    </rect>
   </property>
   <property name="windowTitle">