Skip to content

Commit 0149769

Browse files
KangLinKangLin
committed
Plugin: modify parameters
1 parent 124209d commit 0149769

11 files changed

Lines changed: 114 additions & 44 deletions

File tree

‎Plugins/FreeRDP/Client/PluginFreeRDP.cpp‎

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -111,8 +111,7 @@ const QString CPluginFreeRDP::Version() const
111111
const QString CPluginFreeRDP::Details() const
112112
{
113113
QString szDetails;
114-
szDetails = "- " + tr("FreeRDP");
115-
szDetails += "\n";
114+
szDetails = "- " + tr("FreeRDP") + "\n";
116115
szDetails += " - " + tr("version: ");
117116
szDetails += freerdp_get_version_string();
118117
szDetails += "\n";

‎Plugins/FtpServer/CMakeLists.txt‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ if(NOT QFtpServerLib_FOUND)
2121
# set(WITH_TEST OFF CACHE BOOL "" FORCE)
2222
# FetchContent_MakeAvailable(QFtpServerLib)
2323
endif()
24+
message("QFtpServerLib version: ${QFtpServerLib_VERSION}")
2425

2526
SET(FtpServer_PRIVATE_LIBS Plugin QFtpServerLib)
2627
SET(SOURCE_FILES
@@ -61,7 +62,7 @@ ADD_PLUGIN_TARGET(NAME PluginService${PROJECT_NAME}
6162
SOURCE_FILES ${SOURCE_FILES} ${HEADER_FILES} ${RCC_FILES}
6263
PRIVATE_LIBS ${FtpServer_PRIVATE_LIBS}
6364
PRIVATE_INCLUDE_DIRS ${FtpServer_INCLUDE_DIR} ${WinPR_INCLUDE_DIR}
64-
PRIVATE_DEFINITIONS FtpServer_VERSION_MAJOR=${FtpServer_MAJOR}
65+
PRIVATE_DEFINITIONS QFtpServerLib_VERSION="${QFtpServerLib_VERSION}"
6566
PRIVATE_OPTIONS ${FtpServer_OPTIONS}
6667
INSTALL_DIR ${PLUGIN_PATH}
6768
OUTPUT_DIR ${CMAKE_BINARY_DIR}/${PLUGIN_PATH}

‎Plugins/FtpServer/ParameterFtpServer.cpp‎

Lines changed: 33 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,10 @@ uint16_t CParameterFtpServer::GetPort() const
1919

2020
void CParameterFtpServer::SetPort(uint16_t newPort)
2121
{
22+
if(m_nPort == newPort)
23+
return;
2224
m_nPort = newPort;
25+
SetModified(true);
2326
}
2427

2528
QString CParameterFtpServer::GetUser() const
@@ -29,7 +32,10 @@ QString CParameterFtpServer::GetUser() const
2932

3033
void CParameterFtpServer::SetUser(const QString &newUser)
3134
{
35+
if(m_szUser == newUser)
36+
return;
3237
m_szUser = newUser;
38+
SetModified(true);
3339
}
3440

3541
QString CParameterFtpServer::GetPassword() const
@@ -39,7 +45,10 @@ QString CParameterFtpServer::GetPassword() const
3945

4046
void CParameterFtpServer::SetPassword(const QString &newPassword)
4147
{
48+
if(m_szPassword == newPassword)
49+
return;
4250
m_szPassword = newPassword;
51+
SetModified(true);
4352
}
4453

4554
bool CParameterFtpServer::GetAnonymousLogin() const
@@ -49,7 +58,10 @@ bool CParameterFtpServer::GetAnonymousLogin() const
4958

5059
void CParameterFtpServer::SetAnonymousLogin(bool newAnonymousLogin)
5160
{
61+
if(m_bAnonymousLogin == newAnonymousLogin)
62+
return;
5263
m_bAnonymousLogin = newAnonymousLogin;
64+
SetModified(true);
5365
}
5466

5567
bool CParameterFtpServer::GetReadOnly() const
@@ -59,7 +71,10 @@ bool CParameterFtpServer::GetReadOnly() const
5971

6072
void CParameterFtpServer::SetReadOnly(bool newReadOnly)
6173
{
74+
if(m_bReadOnly == newReadOnly)
75+
return;
6276
m_bReadOnly = newReadOnly;
77+
SetModified(true);
6378
}
6479

6580
QString CParameterFtpServer::GetRoot() const
@@ -69,7 +84,10 @@ QString CParameterFtpServer::GetRoot() const
6984

7085
void CParameterFtpServer::SetRoot(const QString &newRoot)
7186
{
87+
if(m_szRoot == newRoot)
88+
return;
7289
m_szRoot = newRoot;
90+
SetModified(true);
7391
}
7492

7593
int CParameterFtpServer::GetConnectCount() const
@@ -79,7 +97,10 @@ int CParameterFtpServer::GetConnectCount() const
7997

8098
void CParameterFtpServer::SetConnectCount(int newConnectCount)
8199
{
100+
if(m_ConnectCount == newConnectCount)
101+
return;
82102
m_ConnectCount = newConnectCount;
103+
SetModified(true);
83104
}
84105

85106
bool CParameterFtpServer::GetListenAll() const
@@ -89,7 +110,10 @@ bool CParameterFtpServer::GetListenAll() const
89110

90111
void CParameterFtpServer::SetListenAll(bool newListenAll)
91112
{
113+
if(m_bListenAll == newListenAll)
114+
return;
92115
m_bListenAll = newListenAll;
116+
SetModified(true);
93117
}
94118

95119
QStringList CParameterFtpServer::GetListen() const
@@ -99,7 +123,10 @@ QStringList CParameterFtpServer::GetListen() const
99123

100124
void CParameterFtpServer::SetListen(const QStringList &newListen)
101125
{
126+
if(m_Listen == newListen)
127+
return;
102128
m_Listen = newListen;
129+
SetModified(true);
103130
}
104131

105132
QStringList CParameterFtpServer::GetWhitelist() const
@@ -109,7 +136,10 @@ QStringList CParameterFtpServer::GetWhitelist() const
109136

110137
void CParameterFtpServer::SetWhitelist(const QStringList &newWhitelist)
111138
{
139+
if(m_Whitelist == newWhitelist)
140+
return;
112141
m_Whitelist = newWhitelist;
142+
SetModified(true);
113143
}
114144

115145
QStringList CParameterFtpServer::GetBlacklist() const
@@ -119,7 +149,10 @@ QStringList CParameterFtpServer::GetBlacklist() const
119149

120150
void CParameterFtpServer::SetBlacklist(const QStringList &newBlacklist)
121151
{
152+
if(m_Blacklist == newBlacklist)
153+
return;
122154
m_Blacklist = newBlacklist;
155+
SetModified(true);
123156
}
124157

125158
int CParameterFtpServer::OnLoad(QSettings &set)

‎Plugins/FtpServer/PluginFtpServer.cpp‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -60,6 +60,7 @@ const QIcon CPluginFtpServer::Icon() const
6060
const QString CPluginFtpServer::Details() const
6161
{
6262
QString szDetails;
63+
szDetails = "- " + tr("QFtpServerLib version") + ": " + QFtpServerLib_VERSION;
6364
return szDetails;
6465
}
6566

‎Plugins/FtpServer/Resource/Translations/FtpServer_zh_CN.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,5 +246,10 @@
246246
<source>It uses: </source>
247247
<translation>使用：</translation>
248248
</message>
249+
<message>
250+
<location filename="../../PluginFtpServer.cpp" line="63"/>
251+
<source>QFtpServerLib version</source>
252+
<translation>QFtpServerLib 版本号</translation>
253+
</message>
249254
</context>
250255
</TS>

‎Plugins/FtpServer/Resource/Translations/FtpServer_zh_TW.ts‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -246,5 +246,10 @@
246246
<source>It uses: </source>
247247
<translation>使用：</translation>
248248
</message>
249+
<message>
250+
<location filename="../../PluginFtpServer.cpp" line="63"/>
251+
<source>QFtpServerLib version</source>
252+
<translation>QFtpServerLib 版本號</translation>
253+
</message>
249254
</context>
250255
</TS>

‎Src/FrmManagePlugins.ui‎

Lines changed: 14 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,16 @@
1414
<string>Form</string>
1515
</property>
1616
<layout class="QGridLayout" name="gridLayout">
17+
<item row="1" column="0">
18+
<widget class="QTableView" name="tvFilter">
19+
<property name="sizePolicy">
20+
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
21+
<horstretch>0</horstretch>
22+
<verstretch>2</verstretch>
23+
</sizepolicy>
24+
</property>
25+
</widget>
26+
</item>
1727
<item row="0" column="0">
1828
<widget class="QGroupBox" name="groupBox">
1929
<property name="sizePolicy">
@@ -63,13 +73,10 @@
6373
</layout>
6474
</widget>
6575
</item>
66-
<item row="1" column="0">
67-
<widget class="QTableView" name="tvFilter">
68-
<property name="sizePolicy">
69-
<sizepolicy hsizetype="Expanding" vsizetype="Expanding">
70-
<horstretch>0</horstretch>
71-
<verstretch>2</verstretch>
72-
</sizepolicy>
76+
<item row="2" column="0">
77+
<widget class="QLabel" name="label">
78+
<property name="text">
79+
<string>The settings will take effect after the application is restarted.</string>
7380
</property>
7481
</widget>
7582
</item>

‎Src/Manager.cpp‎

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -168,6 +168,8 @@ int CManager::LoadPlugins()
168168
}
169169
}//*/
170170

171+
if(m_pParameter->GetPluginsPath().isEmpty())
172+
qWarning(log) << "The plugins path is empty. please set it from: `Menu` -> `Tools` -> `Settings` -> `Load Plugins`";
171173
foreach (auto szPath, m_pParameter->GetPluginsPath()) {
172174
//QString szPath = RabbitCommon::CDir::Instance()->GetDirPlugins();
173175

@@ -185,6 +187,10 @@ int CManager::LoadPlugins()
185187
nRet = FindPlugins(szPath, filters);
186188
}
187189

190+
if(m_Plugins.empty()) {
191+
qWarning(log) << "The plugins is empty. please set it from: `Menu` -> `Tools` -> `Settings` -> `Load Plugins`";
192+
}
193+
188194
if(!m_szDetails.isEmpty())
189195
m_szDetails = "## " + tr("Plugins") + "\n" + m_szDetails;
190196

‎Src/ParameterCompone/ParameterFilter.cpp‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,10 @@ bool CParameterFilter::contains(const QString &szKey)
1313

1414
int CParameterFilter::AddKey(const QString& szKey)
1515
{
16+
if(contains(szKey))
17+
return 0;
1618
m_Key.insert(szKey);
19+
SetModified(true);
1720
return 0;
1821
}
1922

‎Src/Resource/Translations/Plugin_zh_CN.ts‎

Lines changed: 22 additions & 17 deletions
Original file line numberDiff line numberDiff line change
@@ -263,47 +263,47 @@
263263
<context>
264264
<name>CFrmManagePlugins</name>
265265
<message>
266-
<location filename="../../FrmManagePlugins.cpp" line="19"/>
266+
<location filename="../../FrmManagePlugins.cpp" line="20"/>
267267
<source>Load Plugins</source>
268268
<translation>加载插件</translation>
269269
</message>
270270
<message>
271-
<location filename="../../FrmManagePlugins.cpp" line="33"/>
271+
<location filename="../../FrmManagePlugins.cpp" line="34"/>
272272
<source>Whitelist</source>
273273
<translation>白名单</translation>
274274
</message>
275275
<message>
276-
<location filename="../../FrmManagePlugins.cpp" line="34"/>
276+
<location filename="../../FrmManagePlugins.cpp" line="35"/>
277277
<source>Blacklist</source>
278278
<translation>黑名单</translation>
279279
</message>
280280
<message>
281-
<location filename="../../FrmManagePlugins.cpp" line="35"/>
281+
<location filename="../../FrmManagePlugins.cpp" line="36"/>
282282
<source>Name</source>
283283
<translation>名称</translation>
284284
</message>
285285
<message>
286-
<location filename="../../FrmManagePlugins.cpp" line="36"/>
286+
<location filename="../../FrmManagePlugins.cpp" line="37"/>
287287
<source>Type</source>
288288
<translation>类型</translation>
289289
</message>
290290
<message>
291-
<location filename="../../FrmManagePlugins.cpp" line="37"/>
291+
<location filename="../../FrmManagePlugins.cpp" line="38"/>
292292
<source>Path</source>
293293
<translation>路径</translation>
294294
</message>
295295
<message>
296-
<location filename="../../FrmManagePlugins.cpp" line="151"/>
296+
<location filename="../../FrmManagePlugins.cpp" line="152"/>
297297
<source>Plugin path</source>
298298
<translation>插件路径</translation>
299299
</message>
300300
<message>
301-
<location filename="../../FrmManagePlugins.cpp" line="170"/>
301+
<location filename="../../FrmManagePlugins.cpp" line="172"/>
302302
<source>Add</source>
303303
<translation>增加</translation>
304304
</message>
305305
<message>
306-
<location filename="../../FrmManagePlugins.cpp" line="171"/>
306+
<location filename="../../FrmManagePlugins.cpp" line="173"/>
307307
<source>Remove</source>
308308
<translation>移除</translation>
309309
</message>
@@ -316,20 +316,25 @@
316316
<translation></translation>
317317
</message>
318318
<message>
319-
<location filename="../../FrmManagePlugins.ui" line="26"/>
319+
<location filename="../../FrmManagePlugins.ui" line="36"/>
320320
<source>Plugins path:</source>
321321
<translation>插件路径：</translation>
322322
</message>
323323
<message>
324-
<location filename="../../FrmManagePlugins.ui" line="50"/>
324+
<location filename="../../FrmManagePlugins.ui" line="60"/>
325325
<source>Add</source>
326326
<translation>增加</translation>
327327
</message>
328328
<message>
329-
<location filename="../../FrmManagePlugins.ui" line="57"/>
329+
<location filename="../../FrmManagePlugins.ui" line="67"/>
330330
<source>Remove</source>
331331
<translation>移除</translation>
332332
</message>
333+
<message>
334+
<location filename="../../FrmManagePlugins.ui" line="79"/>
335+
<source>The settings will take effect after the application is restarted.</source>
336+
<translation>需要重启应用后，设置才能生效。</translation>
337+
</message>
333338
</context>
334339
<context>
335340
<name>CFrmViewer</name>
@@ -375,23 +380,23 @@ Some features are limited.
375380
<translation>总是显示</translation>
376381
</message>
377382
<message>
378-
<location filename="../../Manager.cpp" line="189"/>
383+
<location filename="../../Manager.cpp" line="195"/>
379384
<source>Plugins</source>
380385
<translation>插件</translation>
381386
</message>
382387
<message>
383-
<location filename="../../Manager.cpp" line="277"/>
384-
<location filename="../../Manager.cpp" line="538"/>
388+
<location filename="../../Manager.cpp" line="283"/>
389+
<location filename="../../Manager.cpp" line="544"/>
385390
<source>Version:</source>
386391
<translation>版本：</translation>
387392
</message>
388393
<message>
389-
<location filename="../../Manager.cpp" line="480"/>
394+
<location filename="../../Manager.cpp" line="486"/>
390395
<source>Terminal</source>
391396
<translation>终端</translation>
392397
</message>
393398
<message>
394-
<location filename="../../Manager.cpp" line="543"/>
399+
<location filename="../../Manager.cpp" line="549"/>
395400
<source>Dependency libraries:</source>
396401
<translation>依赖库：</translation>
397402
</message>

0 commit comments

Comments
 (0)