From da284a2d0b956591024f05d34842b34a1a47cd92 Mon Sep 17 00:00:00 2001 From: Krad Date: Fri, 1 Apr 2022 15:28:18 +0800 Subject: [PATCH] Change setAvailableDates to setValues of SelectDialog --- src/SelectDialog.cpp | 2 +- src/SelectDialog.h | 2 +- src/UserOperationLogForm.cpp | 2 +- src/generalform.cpp | 2 +- src/systemsettingform.cpp | 4 ++-- 5 files changed, 6 insertions(+), 6 deletions(-) diff --git a/src/SelectDialog.cpp b/src/SelectDialog.cpp index 04e98ed..571c693 100644 --- a/src/SelectDialog.cpp +++ b/src/SelectDialog.cpp @@ -24,7 +24,7 @@ bool SelectDialog::updateReferenceData() { return true; } -void SelectDialog::setAvailableDates(QStringList dates) { +void SelectDialog::setValues(QStringList dates) { box->setItems(dates); } diff --git a/src/SelectDialog.h b/src/SelectDialog.h index 548db61..433fcfb 100644 --- a/src/SelectDialog.h +++ b/src/SelectDialog.h @@ -12,7 +12,7 @@ class SelectDialog :public GUIFormBaseDialog{ public: explicit SelectDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags()); ~SelectDialog() override; - void setAvailableDates(QStringList dates); + void setValues(QStringList values); QString getSelectedValue(); void setSelectedValue(const QString& val); protected: diff --git a/src/UserOperationLogForm.cpp b/src/UserOperationLogForm.cpp index e1d3daf..757b67c 100644 --- a/src/UserOperationLogForm.cpp +++ b/src/UserOperationLogForm.cpp @@ -51,7 +51,7 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) { dialog = new SelectDialog(this); dialog->setWindowModality(Qt::WindowModal); } - dialog->setAvailableDates(dates); + dialog->setValues(dates); if (!selectedDateStr.isEmpty()) dialog->setSelectedValue(selectedDateStr); if (dialog->exec() == QDialog::Accepted) { diff --git a/src/generalform.cpp b/src/generalform.cpp index 4036242..a83973a 100644 --- a/src/generalform.cpp +++ b/src/generalform.cpp @@ -93,7 +93,7 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent) dialog = new SelectDialog(this); dialog->setWindowModality(Qt::WindowModal); } - dialog->setAvailableDates(JsonObject::Instance()->language()); + dialog->setValues(JsonObject::Instance()->language()); dialog->setSelectedValue(JsonObject::Instance()->defaultLanguage()); if (dialog->exec() == QDialog::Accepted) { diff --git a/src/systemsettingform.cpp b/src/systemsettingform.cpp index e722cb4..be77bc1 100644 --- a/src/systemsettingform.cpp +++ b/src/systemsettingform.cpp @@ -116,7 +116,7 @@ systemSettingForm::systemSettingForm(QWidget* parent) : sd_protocal = new SelectDialog(this); sd_protocal->setWindowModality(Qt::WindowModal); } - sd_protocal->setAvailableDates(JsonObject::Instance()->protocals()); + sd_protocal->setValues(JsonObject::Instance()->protocals()); sd_protocal->setSelectedValue(JsonObject::Instance()->defaultProtocal()); if (sd_protocal->exec() == QDialog::Accepted) { @@ -132,7 +132,7 @@ systemSettingForm::systemSettingForm(QWidget* parent) : sd_filter = new SelectDialog(this); sd_filter->setWindowModality(Qt::WindowModal); } - sd_filter->setAvailableDates(JsonObject::Instance()->worklistFilters()); + sd_filter->setValues(JsonObject::Instance()->worklistFilters()); sd_filter->setSelectedValue(JsonObject::Instance()->defaultFilter()); if (sd_filter->exec() == QDialog::Accepted) {