Edit default status
This commit is contained in:
@@ -70,6 +70,7 @@ void MainWindow::openPreferences()
|
|||||||
{
|
{
|
||||||
TaskStateService::getInstance()->updatePriorities(dialog.getPriorities());
|
TaskStateService::getInstance()->updatePriorities(dialog.getPriorities());
|
||||||
TaskStateService::getInstance()->updateStatuses(dialog.getStatus());
|
TaskStateService::getInstance()->updateStatuses(dialog.getStatus());
|
||||||
|
TaskStateService::getInstance()->setDefaultStatus(dialog.getDefaultStatus());
|
||||||
save();
|
save();
|
||||||
redrawTaskTree();
|
redrawTaskTree();
|
||||||
}
|
}
|
||||||
|
|||||||
@@ -20,6 +20,7 @@ PrefDialog::PrefDialog(QWidget *parent) :
|
|||||||
statusUUIDRef.append(s.getUUID());
|
statusUUIDRef.append(s.getUUID());
|
||||||
setItemColor(item, s.getColor());
|
setItemColor(item, s.getColor());
|
||||||
ui->statusListWidget->addItem(item);
|
ui->statusListWidget->addItem(item);
|
||||||
|
ui->defaultStatusCombobox->addItem(s.getName(), s.getUUID());
|
||||||
}
|
}
|
||||||
|
|
||||||
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
|
QVector<Priority> priorities = TaskStateService::getInstance()->getPriorities();
|
||||||
@@ -31,6 +32,8 @@ PrefDialog::PrefDialog(QWidget *parent) :
|
|||||||
ui->priorityListWidget->addItem(item);
|
ui->priorityListWidget->addItem(item);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
ui->defaultStatusCombobox->setCurrentText(TaskStateService::getInstance()->getDefaultStatus().getName());
|
||||||
|
|
||||||
connect(ui->addStatusButton, &QPushButton::clicked, this, &PrefDialog::onAddStatusButtonClick);
|
connect(ui->addStatusButton, &QPushButton::clicked, this, &PrefDialog::onAddStatusButtonClick);
|
||||||
connect(ui->addPriorityButton, &QPushButton::clicked, this, &PrefDialog::onAddPriorityButtonClick);
|
connect(ui->addPriorityButton, &QPushButton::clicked, this, &PrefDialog::onAddPriorityButtonClick);
|
||||||
connect(ui->statusListWidget, &QListWidget::currentRowChanged, this, &PrefDialog::onItemSelectionChange);
|
connect(ui->statusListWidget, &QListWidget::currentRowChanged, this, &PrefDialog::onItemSelectionChange);
|
||||||
@@ -80,6 +83,24 @@ QVector<Status> PrefDialog::getStatus()
|
|||||||
return res;
|
return res;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Status PrefDialog::getDefaultStatus()
|
||||||
|
{
|
||||||
|
QVector<Status> status = TaskStateService::getInstance()->getStatuses();
|
||||||
|
QString uuid = ui->defaultStatusCombobox->currentData().toString();
|
||||||
|
for (Status s : status)
|
||||||
|
{
|
||||||
|
if (uuid == s.getUUID())
|
||||||
|
{
|
||||||
|
return s;
|
||||||
|
}
|
||||||
|
}
|
||||||
|
if (status.count() > 0)
|
||||||
|
{
|
||||||
|
return status[0];
|
||||||
|
}
|
||||||
|
return Status("", "", QColor::fromRgb(0, 0, 0));
|
||||||
|
}
|
||||||
|
|
||||||
void PrefDialog::onAddStatusButtonClick()
|
void PrefDialog::onAddStatusButtonClick()
|
||||||
{
|
{
|
||||||
QColor bgColor = Tools::getRandomColor();
|
QColor bgColor = Tools::getRandomColor();
|
||||||
|
|||||||
@@ -22,6 +22,7 @@ public:
|
|||||||
|
|
||||||
QVector<Priority> getPriorities();
|
QVector<Priority> getPriorities();
|
||||||
QVector<Status> getStatus();
|
QVector<Status> getStatus();
|
||||||
|
Status getDefaultStatus();
|
||||||
|
|
||||||
private slots:
|
private slots:
|
||||||
void onAddStatusButtonClick();
|
void onAddStatusButtonClick();
|
||||||
|
|||||||
@@ -16,6 +16,7 @@ TaskDialog::TaskDialog(QWidget *parent) :
|
|||||||
QDate expectedFor = QDate::currentDate();
|
QDate expectedFor = QDate::currentDate();
|
||||||
expectedFor = expectedFor.addDays(10);
|
expectedFor = expectedFor.addDays(10);
|
||||||
ui->expectedForEdit->setDate(expectedFor);
|
ui->expectedForEdit->setDate(expectedFor);
|
||||||
|
ui->statusCombo->setCurrentText(TaskStateService::getInstance()->getDefaultStatus().getName());
|
||||||
}
|
}
|
||||||
|
|
||||||
TaskDialog::TaskDialog(Task *t, QWidget *parent) :
|
TaskDialog::TaskDialog(Task *t, QWidget *parent) :
|
||||||
|
|||||||
Reference in New Issue
Block a user