Skip to content

Commit 299f307

Browse files
XMuliXMuli
committed
feat: UI of the Adjust Internet Speed plugin
Remove many features that are not used much
1 parent f58c756 commit 299f307

10 files changed

Lines changed: 920 additions & 693 deletions

‎CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@ add_executable(${PROJECT_NAME} ${DIR} ${QM_FILES})
4949
#find_package(Qt${QT_VERSION} COMPONENTS ${REQUIRED_LIBS} REQUIRED)
5050

5151
if (EXISTS "/usr/lib/dde-dock/plugins")
52-
target_link_libraries(${PROJECT_NAME} MonitorInfo lfxMonitorNet)
52+
target_link_libraries(${PROJECT_NAME} MonitorInfo MonitorNet)
5353
else()
5454
target_link_libraries(${PROJECT_NAME} MonitorInfo)
5555
endif()

‎dde-dock-plugin/CMakeLists.txt‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,6 @@
11
set(DDE_DOCK_PLUGINS_PATH "/usr/lib/dde-dock/plugins")
22
if (EXISTS ${DDE_DOCK_PLUGINS_PATH})
3-
set(PLUGIN_NAME "lfxMonitorNet")
3+
set(PLUGIN_NAME "MonitorNet")
44
set(CMAKE_AUTOUIC ON)
55

66
find_package(DtkWidget REQUIRED) # 一次只能找一个库

‎dde-dock-plugin/NetPlugin.cpp‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -31,7 +31,7 @@ NetPlugin::NetPlugin(QObject *parent)
3131
*/
3232
const QString NetPlugin::pluginName() const
3333
{
34-
return "datetime";
34+
return "MonitorNet";
3535
}
3636

3737
/*!
@@ -99,7 +99,7 @@ void NetPlugin::pluginStateSwitched()
9999
*/
100100
const QString NetPlugin::pluginDisplayName() const
101101
{
102-
return QString("lfxMonitorNet");
102+
return QString("MonitorNet");
103103
}
104104

105105
/*!

‎dde-dock-plugin/WinDdeDockSetting.cpp‎

Lines changed: 10 additions & 70 deletions
Original file line numberDiff line numberDiff line change
@@ -26,8 +26,6 @@ WinDdeDockSetting::WinDdeDockSetting(QWidget *parent)
2626
, m_path("")
2727
, m_btnGroupTheme(new QButtonGroup(nullptr))
2828
, m_doubleClick(2)
29-
, m_cpuOverNum(0)
30-
, m_memOverNum(0)
3129
{
3230
ui->setupUi(this);
3331
init();
@@ -48,9 +46,9 @@ void WinDdeDockSetting::init()
4846
readConfig();
4947

5048
// 控件的基本设置，其读写留其它函数完成
51-
// auto list = this->findChildren<QAbstractSpinBox *>(); // 切换为上下按钮模式
52-
// for (auto v : list)
53-
// v->setProperty("_d_dtk_spinBox", true);
49+
auto listChild = this->findChildren<QAbstractSpinBox *>(); // 切换为上下按钮模式
50+
for (auto v : listChild)
51+
v->setProperty("_d_dtk_spinBox", true);
5452

5553
ui->labLabTextColor->setAutoFillBackground(true);
5654
ui->labTextColor->setAutoFillBackground(true);
@@ -79,7 +77,7 @@ void WinDdeDockSetting::init()
7977
}
8078
}
8179

82-
setWindowTitle(QString("lfxMonitorNet"));
80+
setWindowTitle(QString("MonitorNet"));
8381
setWindowFlags(Qt::WindowStaysOnTopHint);
8482
}
8583

@@ -101,14 +99,10 @@ void WinDdeDockSetting::initSigConnectWinDdeDock()
10199
connect(ui->lineLabDown, &QLineEdit::textChanged, this, &WinDdeDockSetting::sigLabDownText);
102100
connect(ui->lineLabCpu, &QLineEdit::textChanged, this, &WinDdeDockSetting::sigLabCpuText);
103101
connect(ui->lineLabMemory, &QLineEdit::textChanged, this, &WinDdeDockSetting::sigLabMemoryText);
104-
connect(ui->lineLabDiskRead, &QLineEdit::textChanged, this, &WinDdeDockSetting::sigLabDiskReadText);
105-
connect(ui->lineLabDiskWrite, &QLineEdit::textChanged, this, &WinDdeDockSetting::sigLabDiskWriteText);
106102
connect(ui->checkBoxDisolayNet, &QCheckBox::clicked, this, &WinDdeDockSetting::sigDisolayNet);
107103
connect(ui->checkBoxDisolayCPUAndMemory, &QCheckBox::clicked, this, &WinDdeDockSetting::sigDisolayCPUAndMemory);
108-
connect(ui->checkBoxDisolayDisk, &QCheckBox::clicked, this, &WinDdeDockSetting::sigDisolayDisk);
109104
connect(ui->checkBoxLocationExchangeNet, &QCheckBox::clicked, this, &WinDdeDockSetting::sigLocationExchangeNet);
110105
connect(ui->checkBoxLocationExchangeCPUAndMenory, &QCheckBox::clicked, this, &WinDdeDockSetting::sigLocationExchangeCPUAndMenory);
111-
connect(ui->checkBoxLocationExchangeDisk, &QCheckBox::clicked, this, &WinDdeDockSetting::sigLocationExchangeDisk);
112106

113107
connect(ui->spinBoxFractionalAccuracy, pFun, this, &WinDdeDockSetting::sigFractionalAccuracy);
114108
void (QComboBox::*pFunDoubleClick)(int) = &QComboBox::currentIndexChanged;
@@ -123,12 +117,6 @@ void WinDdeDockSetting::initSigConnectWinMain()
123117
connect(ui->btnQuitWinMain, &QPushButton::clicked, this, &WinDdeDockSetting::onBtnQuitWinMain);
124118
connect(ui->btnExportData, &QPushButton::clicked, this, &WinDdeDockSetting::onChangePath);
125119

126-
connect(ui->checkBoxCpuOver, &QCheckBox::clicked, this, &WinDdeDockSetting::sigCpuOver);
127-
connect(ui->checkBoxMemOver, &QCheckBox::clicked, this, &WinDdeDockSetting::sigMemOver);
128-
void (QSpinBox::*pFun)(int) = &QSpinBox::valueChanged;
129-
connect(ui->spinBoxCpuOverNum, pFun, this, &WinDdeDockSetting::sigCpuOverNum);
130-
connect(ui->spinBoxMemOverNum, pFun, this, &WinDdeDockSetting::sigMemOverNum);
131-
132120
void (QButtonGroup::*pFunTheme)(int, bool) = &QButtonGroup::buttonToggled;
133121
connect(m_btnGroupTheme, pFunTheme, this, &WinDdeDockSetting::onBtnGroupTheme);
134122
void (QComboBox::*pFuncomboBoxStyle)(int) = &QComboBox::currentIndexChanged;
@@ -166,51 +154,38 @@ void WinDdeDockSetting::readConfigWinDdeDock()
166154
ui->lineLabDown->setText(QString::fromStdString(jsDisplayText[0]["LabDown"]));
167155
ui->lineLabCpu->setText(QString::fromStdString(jsDisplayText[0]["LabCpu"]));
168156
ui->lineLabMemory->setText(QString::fromStdString(jsDisplayText[0]["LabMemory"]));
169-
ui->lineLabDiskRead->setText(QString::fromStdString(jsDisplayText[0]["LabDiskRead"]));
170-
ui->lineLabDiskWrite->setText(QString::fromStdString(jsDisplayText[0]["LabDiskWrite"]));
171157
} else {
172158
ui->lineLabUpload->setText(QString::fromStdString(jsDisplayText[1]["LabUpload"]));
173159
ui->lineLabDown->setText(QString::fromStdString(jsDisplayText[1]["LabDown"]));
174160
ui->lineLabCpu->setText(QString::fromStdString(jsDisplayText[1]["LabCpu"]));
175161
ui->lineLabMemory->setText(QString::fromStdString(jsDisplayText[1]["LabMemory"]));
176-
ui->lineLabDiskRead->setText(QString::fromStdString(jsDisplayText[1]["LabDiskRead"]));
177-
ui->lineLabDiskWrite->setText(QString::fromStdString(jsDisplayText[1]["LabDiskWrite"]));
178162
}
179163

180164
ui->checkBoxDisolayNet->setChecked(jsDisplayText[2]["DisolayNet"]);
181165
ui->checkBoxDisolayCPUAndMemory->setChecked(jsDisplayText[2]["DisolayCPUAndMemory"]);
182-
ui->checkBoxDisolayDisk->setChecked(jsDisplayText[2]["DisolayDisk"]);
183166
ui->checkBoxLocationExchangeNet->setChecked(jsDisplayText[3]["LocationExchangeNet"]);
184167
ui->checkBoxLocationExchangeCPUAndMenory->setChecked(jsDisplayText[3]["LocationExchangeCPUAndMenory"]);
185-
ui->checkBoxLocationExchangeDisk->setChecked(jsDisplayText[3]["LocationExchangeDisk"]);
186168
ui->spinBoxFractionalAccuracy->setValue(jsDisplayText[4]["FractionalAccuracy"]);
187169
ui->spinBoxRefreshInterval->setValue(jsDisplayText[4]["RefreshInterval"]);
188170

189171
json jsDockWindow = m_js["WinDdeDock"]["DockWindow"];
190172
ui->checkBoxHoverDisplay->setChecked(jsDockWindow["HoverDisplay"]);
191173
ui->comboBoxDoubleClick->setCurrentIndex(jsDockWindow["DoubleClickIndex"]);
192174

193-
// TODO: 2021-01-07 占用图模式未写
194-
195175
// 第一次发射信号，加载配置文件
196176
emit ui->fontComboBox->currentTextChanged(ui->fontComboBox->currentText());
197177
emit ui->spinBoxFontSize->valueChanged(ui->spinBoxFontSize->value());
198178
emit sigLabTextColor(ui->labLabTextColor->palette().color(QPalette::Background));
199179
emit sigTextColor(ui->labTextColor->palette().color(QPalette::Background));
200-
// emit ui->radioHorizontal->toggled(ui->radioHorizontal->isChecked());
201-
// emit ui->comboBoxUnitModel->currentIndexChanged(ui->comboBoxUnitModel->currentIndex());
180+
202181
emit ui->lineLabUpload->textChanged(ui->lineLabUpload->text());
203182
emit ui->lineLabDown->textChanged(ui->lineLabDown->text());
204183
emit ui->lineLabCpu->textChanged(ui->lineLabCpu->text());
205184
emit ui->lineLabMemory->textChanged(ui->lineLabMemory->text());
206-
// emit ui->lineLabDiskRead->textChanged(ui->lineLabDiskRead->text());
207-
// emit ui->lineLabDiskWrite->textChanged(ui->lineLabDiskWrite->text());
185+
208186
emit ui->checkBoxDisolayNet->clicked(ui->checkBoxDisolayNet->isChecked());
209187
emit ui->checkBoxDisolayCPUAndMemory->clicked(ui->checkBoxDisolayCPUAndMemory->isChecked());
210-
// emit ui->checkBoxDisolayDisk->clicked(ui->checkBoxDisolayDisk->isChecked());
211-
// emit ui->checkBoxLocationExchangeNet->clicked(ui->checkBoxLocationExchangeNet->isChecked());
212-
// emit ui->checkBoxLocationExchangeCPUAndMenory->clicked(ui->checkBoxLocationExchangeCPUAndMenory->isChecked());
213-
// emit ui->checkBoxLocationExchangeDisk->clicked(ui->checkBoxLocationExchangeDisk->isChecked());
188+
214189
emit ui->spinBoxFractionalAccuracy->valueChanged(ui->spinBoxFractionalAccuracy->value());
215190
emit ui->spinBoxRefreshInterval->valueChanged(ui->spinBoxRefreshInterval->value());
216191
emit ui->checkBoxHoverDisplay->clicked(ui->checkBoxHoverDisplay->isChecked());
@@ -249,23 +224,17 @@ void WinDdeDockSetting::saveConfigWinDdeDock()
249224
jsDisplayText[0]["LabDown"] = ui->lineLabDown->text().toStdString().c_str();
250225
jsDisplayText[0]["LabCpu"] = ui->lineLabCpu->text().toStdString().c_str();
251226
jsDisplayText[0]["LabMemory"] = ui->lineLabMemory->text().toStdString().c_str();
252-
jsDisplayText[0]["LabDiskRead"] = ui->lineLabDiskRead->text().toStdString().c_str();
253-
jsDisplayText[0]["LabDiskWrite"] = ui->lineLabDiskWrite->text().toStdString().c_str();
254227
} else {
255228
jsDisplayText[1]["LabUpload"] = ui->lineLabUpload->text().toStdString().c_str();
256229
jsDisplayText[1]["LabDown"] = ui->lineLabDown->text().toStdString().c_str();
257230
jsDisplayText[1]["LabCpu"] = ui->lineLabCpu->text().toStdString().c_str();
258231
jsDisplayText[1]["LabMemory"] = ui->lineLabMemory->text().toStdString().c_str();
259-
jsDisplayText[1]["LabDiskRead"] = ui->lineLabDiskRead->text().toStdString().c_str();
260-
jsDisplayText[1]["LabDiskWrite"] = ui->lineLabDiskWrite->text().toStdString().c_str();
261232
}
262233

263234
jsDisplayText[2]["DisolayNet"] = ui->checkBoxDisolayNet->isChecked();
264235
jsDisplayText[2]["DisolayCPUAndMemory"] = ui->checkBoxDisolayCPUAndMemory->isChecked();
265-
jsDisplayText[2]["DisolayDisk"] = ui->checkBoxDisolayDisk->isChecked();
266236
jsDisplayText[3]["LocationExchangeNet"] = ui->checkBoxLocationExchangeNet->isChecked();
267237
jsDisplayText[3]["LocationExchangeCPUAndMenory"] = ui->checkBoxLocationExchangeCPUAndMenory->isChecked();
268-
jsDisplayText[3]["LocationExchangeDisk"] = ui->checkBoxLocationExchangeDisk->isChecked();
269238
jsDisplayText[4]["FractionalAccuracy"] = ui->spinBoxFractionalAccuracy->value();
270239
jsDisplayText[4]["RefreshInterval"] = ui->spinBoxRefreshInterval->value();
271240

@@ -274,8 +243,6 @@ void WinDdeDockSetting::saveConfigWinDdeDock()
274243
jsDockWindow["DoubleClickIndex"] = ui->comboBoxDoubleClick->currentIndex();
275244
jsDockWindow["DoubleClick"] = ui->comboBoxDoubleClick->currentText().toStdString().c_str();
276245

277-
// TODO: 2021-01-07 占用图模式未写
278-
279246
saveConfig();
280247
}
281248

@@ -285,13 +252,7 @@ void WinDdeDockSetting::saveConfigWinDdeDock()
285252
void WinDdeDockSetting::readConfigWinMain()
286253
{
287254
json jsAppSetting = m_js["WinMain"]["AppSetting"];
288-
ui->comboBoxLanguage->setCurrentIndex(jsAppSetting["LanguageIndex"]);
289-
290-
json jsAppNotification = m_js["WinMain"]["Notification"];
291-
ui->checkBoxCpuOver->setChecked(jsAppNotification["CpuOver"]);
292-
ui->spinBoxCpuOverNum->setValue(jsAppNotification["CpuOverNum"]);
293-
ui->checkBoxMemOver->setChecked(jsAppNotification["MemoryOver"]);
294-
ui->spinBoxMemOverNum->setValue(jsAppNotification["MemoryOverNum"]);
255+
ui->comboBoxStyle ->setCurrentIndex(jsAppSetting["LanguageIndex"]);
295256

296257
json jsThemeStyle = m_js["WinMain"]["ThemeStyle"];
297258
ui->comboBoxStyle->setCurrentIndex(ui->comboBoxStyle->currentIndex());
@@ -307,8 +268,6 @@ void WinDdeDockSetting::readConfigWinMain()
307268
QMessageBox::warning(nullptr, tr("主题选择数值错误"), tr("json 的 themeIndex 值错误，此处采用约定：themeIndex 为 0-跟随系统； 1-浅色模式； 2-暗色模式； 其它-未知"));
308269

309270
emit ui->radioDefaultPath->toggled(ui->radioDefaultPath->isChecked());
310-
emit ui->checkBoxCpuOver->clicked(ui->checkBoxCpuOver->isChecked());
311-
emit ui->checkBoxMemOver->clicked(ui->checkBoxMemOver->isChecked());
312271
emit ui->radioButtonSystem->toggled(ui->radioButtonSystem->isChecked());
313272
emit ui->comboBoxStyle->currentIndexChanged(ui->comboBoxStyle->currentIndex());
314273
}
@@ -319,14 +278,8 @@ void WinDdeDockSetting::readConfigWinMain()
319278
void WinDdeDockSetting::saveConfigWinMain()
320279
{
321280
json &jsAppSetting = m_js["WinMain"]["AppSetting"];
322-
jsAppSetting["LanguageIndex"] = ui->comboBoxLanguage->currentIndex();
323-
jsAppSetting["Language"] = ui->comboBoxLanguage->currentText().toStdString().c_str();
324-
325-
json &jsAppNotification = m_js["WinMain"]["Notification"];
326-
jsAppNotification["CpuOver"] = ui->checkBoxCpuOver->isChecked();
327-
jsAppNotification["CpuOverNum"] = ui->spinBoxCpuOverNum->value();
328-
jsAppNotification["MemoryOver"] = ui->checkBoxMemOver->isChecked();
329-
jsAppNotification["MemoryOverNum"] = ui->spinBoxMemOverNum->value();
281+
jsAppSetting["LanguageIndex"] = ui->comboBoxStyle->currentIndex();
282+
jsAppSetting["Language"] = ui->comboBoxStyle->currentText().toStdString().c_str();
330283

331284
json &jsThemeStyle = m_js["WinMain"]["ThemeStyle"];
332285
// themeIndex 为 0-跟随系统； 1-浅色模式； 2-暗色模式； 其它-为止
@@ -525,15 +478,11 @@ void WinDdeDockSetting::updateLabelText(bool isHorizontal)
525478
ui->lineLabDown->setText(QString::fromStdString(jsDisplayText[0]["LabDown"]));
526479
ui->lineLabCpu->setText(QString::fromStdString(jsDisplayText[0]["LabCpu"]));
527480
ui->lineLabMemory->setText(QString::fromStdString(jsDisplayText[0]["LabMemory"]));
528-
ui->lineLabDiskRead->setText(QString::fromStdString(jsDisplayText[0]["LabDiskRead"]));
529-
ui->lineLabDiskWrite->setText(QString::fromStdString(jsDisplayText[0]["LabDiskWrite"]));
530481
} else {
531482
ui->lineLabUpload->setText(QString::fromStdString(jsDisplayText[1]["LabUpload"]));
532483
ui->lineLabDown->setText(QString::fromStdString(jsDisplayText[1]["LabDown"]));
533484
ui->lineLabCpu->setText(QString::fromStdString(jsDisplayText[1]["LabCpu"]));
534485
ui->lineLabMemory->setText(QString::fromStdString(jsDisplayText[1]["LabMemory"]));
535-
ui->lineLabDiskRead->setText(QString::fromStdString(jsDisplayText[1]["LabDiskRead"]));
536-
ui->lineLabDiskWrite->setText(QString::fromStdString(jsDisplayText[1]["LabDiskWrite"]));
537486
}
538487
}
539488

@@ -611,15 +560,6 @@ void WinDdeDockSetting::onDoubleClick(int index)
611560
m_doubleClick = index;
612561
}
613562

614-
/*!
615-
* \brief WinDdeDockSetting::onBootUpUpdate 设置开机检查更新
616-
* \param check
617-
*/
618-
void WinDdeDockSetting::onBootUpUpdate(bool check)
619-
{
620-
// TODO: 2021-01-12
621-
}
622-
623563
void WinDdeDockSetting::onChangePath()
624564
{
625565
QString sour = "";

‎dde-dock-plugin/WinDdeDockSetting.h‎

Lines changed: 0 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -88,8 +88,6 @@ public slots:
8888
void onBtnQuitWinMain(bool check);
8989

9090
void onDoubleClick(int index);
91-
void onBootUpUpdate(bool check);
92-
// void onCheckUpdate(bool check);
9391
void onChangePath();
9492

9593
void onBtnGroupTheme(int index, bool checked);
@@ -102,9 +100,6 @@ public slots:
102100
QString m_path; // 数据保存路径
103101
QButtonGroup *m_btnGroupTheme;
104102
int m_doubleClick;
105-
106-
int m_cpuOverNum;
107-
int m_memOverNum;
108103
};
109104

110105
#endif // WINDDEDOCKSETTING_H

0 commit comments

Comments
 (0)