thelilfrog/TaskBoard
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases 7 Wiki Activity

disable status showing for boards, add helper labels in pref dialog

Browse Source
This commit is contained in:
Aurélie Delhaie
2024-10-28 16:13:34 +01:00
parent e961e7642e
commit e40dfb8f69
8 changed files with 122 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
TaskBoard.pro
View File

@@ -4,8 +4,8 @@ greaterThan(QT_MAJOR_VERSION, 5): QT += widgets
CONFIG += c++17 CONFIG += c++17
win32:VERSION = 0.3.0.0 # major.minor.patch.build win32:VERSION = 0.3.1.0 # major.minor.patch.build
else:VERSION = 0.3.0 # major.minor.patch else:VERSION = 0.3.1 # major.minor.patch
DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\" DEFINES += APP_VERSION=\"\\\"$${VERSION}\\\"\"
DEFINES += APP_NAME=\"\\\"TaskBoard\\\"\" DEFINES += APP_NAME=\"\\\"TaskBoard\\\"\"

6
src/frames/boardconfigdialog.cpp
View File

@@ -11,6 +11,7 @@ BoardConfigDialog::BoardConfigDialog(Board *b, QWidget *parent) :
ui->setupUi(this); ui->setupUi(this);
ui->nameField->setText(b->getName()); ui->nameField->setText(b->getName());
ui->descriptionField->setPlainText(b->getDescription()); ui->descriptionField->setPlainText(b->getDescription());
ui->showStatusCheckbox->setChecked(b->isShowingStatus());
if (!b->isAutoStatus()) if (!b->isAutoStatus())
{ {
QVector<Status> statuses = TaskStateService::getInstance()->getStatuses(); QVector<Status> statuses = TaskStateService::getInstance()->getStatuses();
@@ -44,6 +45,11 @@ bool BoardConfigDialog::isAutoStatus()
return ui->autoStatusCheckbox->isChecked(); return ui->autoStatusCheckbox->isChecked();
} }
bool BoardConfigDialog::isShowingStatus()
{
return ui->showStatusCheckbox->isChecked();
}
const QString BoardConfigDialog::getStatus() const QString BoardConfigDialog::getStatus()
{ {
if (!ui->autoStatusCheckbox->isChecked()) if (!ui->autoStatusCheckbox->isChecked())

1
src/frames/boardconfigdialog.h
View File

@@ -20,6 +20,7 @@ public:
const QString getName(); const QString getName();
const QString getDescription(); const QString getDescription();
bool isAutoStatus(); bool isAutoStatus();
bool isShowingStatus();
const QString getStatus(); const QString getStatus();
private slots: private slots:

13
src/frames/boardconfigdialog.ui
View File

@@ -37,7 +37,14 @@
<item> <item>
<widget class="Line" name="line"> <widget class="Line" name="line">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Orientation::Horizontal</enum>
</property>
</widget>
</item>
<item>
<widget class="QCheckBox" name="showStatusCheckbox">
<property name="text">
<string>Show the board status</string>
</property> </property>
</widget> </widget>
</item> </item>
@@ -72,10 +79,10 @@
<item> <item>
<widget class="QDialogButtonBox" name="buttonBox"> <widget class="QDialogButtonBox" name="buttonBox">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Orientation::Horizontal</enum>
</property> </property>
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property> </property>
</widget> </widget>
</item> </item>

14
src/frames/mainwindow.cpp
View File

@@ -355,6 +355,7 @@ void MainWindow::onEditNameBoardMenu()
QString newDesc = dialog.getDescription(); QString newDesc = dialog.getDescription();
b->setName(newName); b->setName(newName);
b->setDescription(newDesc); b->setDescription(newDesc);
b->setShowingStatus(dialog.isShowingStatus());
if (!dialog.isAutoStatus()) if (!dialog.isAutoStatus())
{ {
std::optional<Status> status = TaskStateService::getInstance()->getStatusByUUID(dialog.getStatus()); std::optional<Status> status = TaskStateService::getInstance()->getStatusByUUID(dialog.getStatus());
@@ -731,12 +732,15 @@ void MainWindow::redrawBoardStatus()
if (selectedBoardIndex > -1) if (selectedBoardIndex > -1)
{ {
Board *b = boards[selectedBoardIndex]; Board *b = boards[selectedBoardIndex];
std::optional<Status> boardStatus = TaskStateService::getInstance()->getStatusByUUID(b->getStatus()); if (b->isShowingStatus())
if (boardStatus.has_value())
{ {
ui->boardStatus->setStyleSheet(Tools::getStatusLabelStylesheet(boardStatus.value())); std::optional<Status> boardStatus = TaskStateService::getInstance()->getStatusByUUID(b->getStatus());
ui->boardStatus->setText(boardStatus.value().getName()); if (boardStatus.has_value())
ui->boardStatus->setVisible(true); {
ui->boardStatus->setStyleSheet(Tools::getStatusLabelStylesheet(boardStatus.value()));
ui->boardStatus->setText(boardStatus.value().getName());
ui->boardStatus->setVisible(true);
}
} }
} }
} }

92
src/frames/prefdialog.ui
View File

@@ -3,7 +3,7 @@
<class>PrefDialog</class> <class>PrefDialog</class>
<widget class="QDialog" name="PrefDialog"> <widget class="QDialog" name="PrefDialog">
<property name="windowModality"> <property name="windowModality">
<enum>Qt::ApplicationModal</enum> <enum>Qt::WindowModality::ApplicationModal</enum>
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
@@ -41,10 +41,10 @@
</rect> </rect>
</property> </property>
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Orientation::Horizontal</enum>
</property> </property>
<property name="standardButtons"> <property name="standardButtons">
<set>QDialogButtonBox::Cancel|QDialogButtonBox::Ok</set> <set>QDialogButtonBox::StandardButton::Cancel|QDialogButtonBox::StandardButton::Ok</set>
</property> </property>
</widget> </widget>
<widget class="QTabWidget" name="tabWidget"> <widget class="QTabWidget" name="tabWidget">
@@ -66,10 +66,10 @@
<widget class="QListWidget" name="statusListWidget"> <widget class="QListWidget" name="statusListWidget">
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>10</x> <x>40</x>
<y>10</y> <y>50</y>
<width>601</width> <width>571</width>
<height>291</height> <height>251</height>
</rect> </rect>
</property> </property>
</widget> </widget>
@@ -150,7 +150,7 @@
<x>570</x> <x>570</x>
<y>310</y> <y>310</y>
<width>41</width> <width>41</width>
<height>21</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@@ -166,7 +166,7 @@
<x>520</x> <x>520</x>
<y>310</y> <y>310</y>
<width>41</width> <width>41</width>
<height>21</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@@ -179,10 +179,10 @@
</property> </property>
<property name="geometry"> <property name="geometry">
<rect> <rect>
<x>20</x> <x>10</x>
<y>310</y> <y>310</y>
<width>41</width> <width>51</width>
<height>21</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
@@ -197,14 +197,78 @@
<rect> <rect>
<x>70</x> <x>70</x>
<y>310</y> <y>310</y>
<width>41</width> <width>51</width>
<height>21</height> <height>31</height>
</rect> </rect>
</property> </property>
<property name="text"> <property name="text">
<string>Up</string> <string>Up</string>
</property> </property>
</widget> </widget>
<widget class="QLabel" name="label_5">
<property name="geometry">
<rect>
<x>11</x>
<y>4</y>
<width>601</width>
<height>41</height>
</rect>
</property>
<property name="text">
<string>&lt;html&gt;&lt;head/&gt;&lt;body&gt;&lt;p&gt;Sort status by display priority. The lowest status will only be displayed if higher statuses are not assigned to the board.&lt;/p&gt;&lt;/body&gt;&lt;/html&gt;</string>
</property>
<property name="scaledContents">
<bool>false</bool>
</property>
<property name="wordWrap">
<bool>true</bool>
</property>
</widget>
<widget class="Line" name="line">
<property name="geometry">
<rect>
<x>7</x>
<y>65</y>
<width>20</width>
<height>221</height>
</rect>
</property>
<property name="orientation">
<enum>Qt::Orientation::Vertical</enum>
</property>
</widget>
<widget class="QLabel" name="label_6">
<property name="geometry">
<rect>
<x>-4</x>
<y>46</y>
<width>41</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>Low</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
<widget class="QLabel" name="label_7">
<property name="geometry">
<rect>
<x>-3</x>
<y>290</y>
<width>41</width>
<height>16</height>
</rect>
</property>
<property name="text">
<string>High</string>
</property>
<property name="alignment">
<set>Qt::AlignmentFlag::AlignCenter</set>
</property>
</widget>
</widget> </widget>
<widget class="QWidget" name="tab_2"> <widget class="QWidget" name="tab_2">
<attribute name="title"> <attribute name="title">

13
src/models/board.cpp
View File

@@ -6,6 +6,7 @@
#define DESCRIPTION_KEY "description" #define DESCRIPTION_KEY "description"
#define AUTOSTATUS_KEY "auto_status" #define AUTOSTATUS_KEY "auto_status"
#define STATUS_KEY "status" #define STATUS_KEY "status"
#define SHOW_STATUS_KEY "show_status"
#include <QJsonArray> #include <QJsonArray>
#include <QJsonValue> #include <QJsonValue>
@@ -29,6 +30,7 @@ Board::Board(QJsonObject obj)
this->description = obj[DESCRIPTION_KEY].toString(""); this->description = obj[DESCRIPTION_KEY].toString("");
this->autoStatus = obj[AUTOSTATUS_KEY].toBool(true); this->autoStatus = obj[AUTOSTATUS_KEY].toBool(true);
this->statusUUID = obj[STATUS_KEY].toString(); this->statusUUID = obj[STATUS_KEY].toString();
this->showStatus = obj[SHOW_STATUS_KEY].toBool(!this->autoStatus);
QJsonArray jsonTasks = obj[TASKS_KEY].toArray(); QJsonArray jsonTasks = obj[TASKS_KEY].toArray();
foreach (QJsonValue value, jsonTasks) { foreach (QJsonValue value, jsonTasks) {
Task *t = new Task(value.toObject()); Task *t = new Task(value.toObject());
@@ -81,6 +83,11 @@ const QString Board::getStatus()
return statusUUID; return statusUUID;
} }
bool Board::isShowingStatus()
{
return showStatus;
}
bool Board::isAutoStatus() bool Board::isAutoStatus()
{ {
return autoStatus; return autoStatus;
@@ -102,6 +109,11 @@ void Board::setDirtyStatus(Status s)
this->statusUUID = s.getUUID(); this->statusUUID = s.getUUID();
} }
void Board::setShowingStatus(bool v)
{
this->showStatus = v;
}
void Board::removeDirtyStatus() void Board::removeDirtyStatus()
{ {
this->autoStatus = true; this->autoStatus = true;
@@ -148,6 +160,7 @@ const QJsonObject Board::toJson()
obj[AUTOSTATUS_KEY] = this->autoStatus; obj[AUTOSTATUS_KEY] = this->autoStatus;
obj[TASKS_KEY] = array; obj[TASKS_KEY] = array;
obj[DESCRIPTION_KEY] = description; obj[DESCRIPTION_KEY] = description;
obj[SHOW_STATUS_KEY] = this->showStatus;
return obj; return obj;
} }

3
src/models/board.h
View File

@@ -19,11 +19,13 @@ public:
const QString getName(); const QString getName();
const QString getDescription(); const QString getDescription();
const QString getStatus(); const QString getStatus();
bool isShowingStatus();
bool isAutoStatus(); bool isAutoStatus();
void setName(const QString name); void setName(const QString name);
void setDescription(const QString description); void setDescription(const QString description);
void setDirtyStatus(Status s); void setDirtyStatus(Status s);
void setShowingStatus(bool);
void removeDirtyStatus(); void removeDirtyStatus();
void add(Task); void add(Task);
@@ -42,6 +44,7 @@ private:
QString statusUUID; QString statusUUID;
bool autoStatus; bool autoStatus;
bool showStatus;
}; };