Change setAvailableDates to setValues of SelectDialog
This commit is contained in:
@@ -24,7 +24,7 @@ bool SelectDialog::updateReferenceData() {
|
|||||||
return true;
|
return true;
|
||||||
}
|
}
|
||||||
|
|
||||||
void SelectDialog::setAvailableDates(QStringList dates) {
|
void SelectDialog::setValues(QStringList dates) {
|
||||||
box->setItems(dates);
|
box->setItems(dates);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
@@ -12,7 +12,7 @@ class SelectDialog :public GUIFormBaseDialog{
|
|||||||
public:
|
public:
|
||||||
explicit SelectDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
|
explicit SelectDialog(QWidget *parent = nullptr, Qt::WindowFlags f = Qt::WindowFlags());
|
||||||
~SelectDialog() override;
|
~SelectDialog() override;
|
||||||
void setAvailableDates(QStringList dates);
|
void setValues(QStringList values);
|
||||||
QString getSelectedValue();
|
QString getSelectedValue();
|
||||||
void setSelectedValue(const QString& val);
|
void setSelectedValue(const QString& val);
|
||||||
protected:
|
protected:
|
||||||
|
|||||||
@@ -51,7 +51,7 @@ UserOperationLogForm::UserOperationLogForm(QWidget* parent) {
|
|||||||
dialog = new SelectDialog(this);
|
dialog = new SelectDialog(this);
|
||||||
dialog->setWindowModality(Qt::WindowModal);
|
dialog->setWindowModality(Qt::WindowModal);
|
||||||
}
|
}
|
||||||
dialog->setAvailableDates(dates);
|
dialog->setValues(dates);
|
||||||
if (!selectedDateStr.isEmpty()) dialog->setSelectedValue(selectedDateStr);
|
if (!selectedDateStr.isEmpty()) dialog->setSelectedValue(selectedDateStr);
|
||||||
if (dialog->exec() == QDialog::Accepted)
|
if (dialog->exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -93,7 +93,7 @@ GeneralForm::GeneralForm(QWidget* parent) : QWidget(parent)
|
|||||||
dialog = new SelectDialog(this);
|
dialog = new SelectDialog(this);
|
||||||
dialog->setWindowModality(Qt::WindowModal);
|
dialog->setWindowModality(Qt::WindowModal);
|
||||||
}
|
}
|
||||||
dialog->setAvailableDates(JsonObject::Instance()->language());
|
dialog->setValues(JsonObject::Instance()->language());
|
||||||
dialog->setSelectedValue(JsonObject::Instance()->defaultLanguage());
|
dialog->setSelectedValue(JsonObject::Instance()->defaultLanguage());
|
||||||
if (dialog->exec() == QDialog::Accepted)
|
if (dialog->exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
@@ -116,7 +116,7 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
|
|||||||
sd_protocal = new SelectDialog(this);
|
sd_protocal = new SelectDialog(this);
|
||||||
sd_protocal->setWindowModality(Qt::WindowModal);
|
sd_protocal->setWindowModality(Qt::WindowModal);
|
||||||
}
|
}
|
||||||
sd_protocal->setAvailableDates(JsonObject::Instance()->protocals());
|
sd_protocal->setValues(JsonObject::Instance()->protocals());
|
||||||
sd_protocal->setSelectedValue(JsonObject::Instance()->defaultProtocal());
|
sd_protocal->setSelectedValue(JsonObject::Instance()->defaultProtocal());
|
||||||
if (sd_protocal->exec() == QDialog::Accepted)
|
if (sd_protocal->exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
@@ -132,7 +132,7 @@ systemSettingForm::systemSettingForm(QWidget* parent) :
|
|||||||
sd_filter = new SelectDialog(this);
|
sd_filter = new SelectDialog(this);
|
||||||
sd_filter->setWindowModality(Qt::WindowModal);
|
sd_filter->setWindowModality(Qt::WindowModal);
|
||||||
}
|
}
|
||||||
sd_filter->setAvailableDates(JsonObject::Instance()->worklistFilters());
|
sd_filter->setValues(JsonObject::Instance()->worklistFilters());
|
||||||
sd_filter->setSelectedValue(JsonObject::Instance()->defaultFilter());
|
sd_filter->setSelectedValue(JsonObject::Instance()->defaultFilter());
|
||||||
if (sd_filter->exec() == QDialog::Accepted)
|
if (sd_filter->exec() == QDialog::Accepted)
|
||||||
{
|
{
|
||||||
|
|||||||
Reference in New Issue
Block a user