Plugin: fix filter header bug

Author: KangLin

Src/FrmManagePlugins.cpp

@@ -15,7 +15,6 @@ CFrmManagePlugins::CFrmManagePlugins(QWidget *parent) : CParameterUI(parent)
     , m_pPara(nullptr)
     , ui(new Ui::CFrmManagePluginsUI)
     , m_pModelFilter(nullptr)
-    , m_nColPath(4)
 {
     ui->setupUi(this);
     setWindowTitle(tr("Load Plugins"));
@@ -32,11 +31,7 @@ CFrmManagePlugins::CFrmManagePlugins(QWidget *parent) : CParameterUI(parent)
 
     m_pModelFilter = new QStandardItemModel(ui->tvFilter);
     ui->tvFilter->setModel(m_pModelFilter);
-    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Whitelist, new QStandardItem(tr("Whitelist")));
-    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Blacklist, new QStandardItem(tr("Blacklist")));
-    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Name, new QStandardItem(tr("Name")));
-    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Type, new QStandardItem(tr("Type")));
-    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Path, new QStandardItem(tr("Path")));
+    SetFilterHeader();
 
     //必须在 setModel 后,才能应用
     /*第二个参数可以为：
@@ -117,7 +112,7 @@ int CFrmManagePlugins::FindPlugins(QDir dir, QStringList filters, bool bAdd)
             RemoveItem(szPath);
             continue;
         }
-        auto pFind = m_pModelFilter->findItems(szPath, Qt::MatchExactly, m_nColPath);
+        auto pFind = m_pModelFilter->findItems(szPath, Qt::MatchExactly, ColumnNo::Path);
         if(!pFind.isEmpty()) continue;
 
         QPluginLoader loader(szPath);
@@ -167,7 +162,7 @@ int CFrmManagePlugins::AddItem(CPlugin* plugin, const QString& szPath)
 
 int CFrmManagePlugins::RemoveItem(const QString &szPath)
 {
-    auto pFind = m_pModelFilter->findItems(szPath, Qt::MatchExactly, m_nColPath);
+    auto pFind = m_pModelFilter->findItems(szPath, Qt::MatchExactly, ColumnNo::Path);
     if(pFind.isEmpty()) return 0;
     foreach(auto item, pFind) {
         m_pModelFilter->removeRow(item->index().row());
@@ -223,6 +218,7 @@ void CFrmManagePlugins::on_gbPluginsPath_clicked(bool checked)
 {
     m_pModelPluginPath->clear();
     m_pModelFilter->clear();
+    SetFilterHeader();
 
     QStringList lstPaths;
     if(checked)
@@ -233,3 +229,14 @@ void CFrmManagePlugins::on_gbPluginsPath_clicked(bool checked)
         AddPath(szPath);
     }
 }
+
+int CFrmManagePlugins::SetFilterHeader()
+{
+    if(!m_pModelFilter) return -1;
+    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Whitelist, new QStandardItem(tr("Whitelist")));
+    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Blacklist, new QStandardItem(tr("Blacklist")));
+    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Name, new QStandardItem(tr("Name")));
+    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Type, new QStandardItem(tr("Type")));
+    m_pModelFilter->setHorizontalHeaderItem(ColumnNo::Path, new QStandardItem(tr("Path")));
+    return 0;
+}

Src/FrmManagePlugins.h

@@ -30,6 +30,7 @@ private slots:
     void on_gbPluginsPath_clicked(bool checked);
 
 private:
+    int SetFilterHeader();
     int AddPath(const QString &szPath);
     int FindPlugins(QDir dir, QStringList filters, bool bAdd = true);
     int AddItem(CPlugin* plugin, const QString& szPath);
@@ -46,6 +47,5 @@ private slots:
     CParameterPlugin* m_pPara;
     QStandardItemModel* m_pModelPluginPath;
     QStandardItemModel* m_pModelFilter;
-    int m_nColPath;
 };
 

Src/Resource/Translations/Plugin_zh_CN.ts

@@ -263,47 +263,47 @@
 <context>
     <name>CFrmManagePlugins</name>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="21"/>
+        <location filename="../../FrmManagePlugins.cpp" line="20"/>
         <source>Load Plugins</source>
         <translation>加载插件</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="35"/>
+        <location filename="../../FrmManagePlugins.cpp" line="236"/>
         <source>Whitelist</source>
         <translation>白名单</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="36"/>
+        <location filename="../../FrmManagePlugins.cpp" line="237"/>
         <source>Blacklist</source>
         <translation>黑名单</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="37"/>
+        <location filename="../../FrmManagePlugins.cpp" line="238"/>
         <source>Name</source>
         <translation>名称</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="38"/>
+        <location filename="../../FrmManagePlugins.cpp" line="239"/>
         <source>Type</source>
         <translation>类型</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="39"/>
+        <location filename="../../FrmManagePlugins.cpp" line="240"/>
         <source>Path</source>
         <translation>路径</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="181"/>
+        <location filename="../../FrmManagePlugins.cpp" line="176"/>
         <source>Plugin path</source>
         <translation>插件路径</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="217"/>
+        <location filename="../../FrmManagePlugins.cpp" line="212"/>
         <source>Add</source>
         <translation>增加</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="218"/>
+        <location filename="../../FrmManagePlugins.cpp" line="213"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>

Src/Resource/Translations/Plugin_zh_TW.ts

@@ -263,47 +263,47 @@
 <context>
     <name>CFrmManagePlugins</name>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="21"/>
+        <location filename="../../FrmManagePlugins.cpp" line="20"/>
         <source>Load Plugins</source>
         <translation>加載插件</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="35"/>
+        <location filename="../../FrmManagePlugins.cpp" line="236"/>
         <source>Whitelist</source>
         <translation>白名單</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="36"/>
+        <location filename="../../FrmManagePlugins.cpp" line="237"/>
         <source>Blacklist</source>
         <translation>黑名單</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="37"/>
+        <location filename="../../FrmManagePlugins.cpp" line="238"/>
         <source>Name</source>
         <translation>名稱</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="38"/>
+        <location filename="../../FrmManagePlugins.cpp" line="239"/>
         <source>Type</source>
         <translation>類型</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="39"/>
+        <location filename="../../FrmManagePlugins.cpp" line="240"/>
         <source>Path</source>
         <translation>路徑</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="181"/>
+        <location filename="../../FrmManagePlugins.cpp" line="176"/>
         <source>Plugin path</source>
         <translation>插件路徑</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="217"/>
+        <location filename="../../FrmManagePlugins.cpp" line="212"/>
         <source>Add</source>
         <translation>增加</translation>
     </message>
     <message>
-        <location filename="../../FrmManagePlugins.cpp" line="218"/>
+        <location filename="../../FrmManagePlugins.cpp" line="213"/>
         <source>Remove</source>
         <translation>移除</translation>
     </message>