aboutsummaryrefslogtreecommitdiff
path: root/src/gui
diff options
context:
space:
mode:
Diffstat (limited to 'src/gui')
-rw-r--r--src/gui/icon.py13
-rw-r--r--src/gui/tags/panel/form/widget.py2
-rw-r--r--src/gui/tasks/dialog.py15
-rw-r--r--src/gui/tasks/form/widget.py2
-rw-r--r--src/gui/tasks/table/menu.py23
-rw-r--r--src/gui/tasks/table/widget.py12
-rw-r--r--src/gui/window.py6
7 files changed, 62 insertions, 11 deletions
diff --git a/src/gui/icon.py b/src/gui/icon.py
index c6584cb..7e2156d 100644
--- a/src/gui/icon.py
+++ b/src/gui/icon.py
@@ -1,12 +1,23 @@
from PyQt5 import QtWidgets
+# List of icons: https://joekuan.wordpress.com/2015/09/23/list-of-qt-icons/
+
+def task_ready(style):
+ return style.standardIcon(QtWidgets.QStyle.SP_DialogApplyButton)
+
+def task_waiting(style):
+ return style.standardIcon(QtWidgets.QStyle.SP_BrowserReload)
+
+def task_maybe(style):
+ return style.standardIcon(QtWidgets.QStyle.SP_TitleBarContextHelpButton)
+
def new_folder(style):
return style.standardIcon(QtWidgets.QStyle.SP_FileDialogNewFolder)
def dialog_open(style):
return style.standardIcon(QtWidgets.QStyle.SP_DialogOpenButton)
-def dialog_apply(style):
+def dialog_ok(style):
return style.standardIcon(QtWidgets.QStyle.SP_DialogOkButton)
def dialog_cancel(style):
diff --git a/src/gui/tags/panel/form/widget.py b/src/gui/tags/panel/form/widget.py
index eb9cec8..7079e57 100644
--- a/src/gui/tags/panel/form/widget.py
+++ b/src/gui/tags/panel/form/widget.py
@@ -117,7 +117,7 @@ def buttons(parent, action_title, tag_form_signal, on_validate, on_cancel):
validate = QtWidgets.QPushButton(action_title, widget)
validate.setDisabled(True)
- validate.setIcon(gui.icon.dialog_apply(validate.style()))
+ validate.setIcon(gui.icon.dialog_ok(validate.style()))
validate.clicked.connect(on_validate);
layout.addWidget(validate)
diff --git a/src/gui/tasks/dialog.py b/src/gui/tasks/dialog.py
index 3233dd6..2bf3b6b 100644
--- a/src/gui/tasks/dialog.py
+++ b/src/gui/tasks/dialog.py
@@ -26,7 +26,7 @@ def update(parent_widget, update_task_signal, row: int, task: Task, tags: List[i
return widget(parent_widget, "Modify a task", "modify", task, tags, on_update)
-def show_delete(parent, rows: List[int], on_delete):
+def confirm_delete(parent, rows: List[int], on_confirm):
confirm = QtWidgets.QMessageBox.question(
parent,
"Task deletion",
@@ -35,7 +35,18 @@ def show_delete(parent, rows: List[int], on_delete):
QtWidgets.QMessageBox.Yes)
if confirm == QtWidgets.QMessageBox.Yes:
- on_delete()
+ on_confirm()
+
+def confirm_move(parent, rows: List[int], move_to: Status, on_confirm):
+ confirm = QtWidgets.QMessageBox.question(
+ parent,
+ "Task move",
+ "Do you really want to move the selected tasks ?",
+ QtWidgets.QMessageBox.No | QtWidgets.QMessageBox.Yes,
+ QtWidgets.QMessageBox.Yes)
+
+ if confirm == QtWidgets.QMessageBox.Yes:
+ on_confirm()
def widget(
parent: QtWidgets.QWidget,
diff --git a/src/gui/tasks/form/widget.py b/src/gui/tasks/form/widget.py
index 9be2589..70d506d 100644
--- a/src/gui/tasks/form/widget.py
+++ b/src/gui/tasks/form/widget.py
@@ -164,7 +164,7 @@ def buttons(parent, action_title, task_form_signal, on_validate, on_cancel):
validate = QtWidgets.QPushButton(action_title, widget)
validate.setDisabled(True)
- validate.setIcon(gui.icon.dialog_apply(validate.style()))
+ validate.setIcon(gui.icon.dialog_ok(validate.style()))
validate.clicked.connect(on_validate);
layout.addWidget(validate)
diff --git a/src/gui/tasks/table/menu.py b/src/gui/tasks/table/menu.py
index 0ad9857..5356be2 100644
--- a/src/gui/tasks/table/menu.py
+++ b/src/gui/tasks/table/menu.py
@@ -19,10 +19,31 @@ def open(table: QtWidgets.QTableWidget, status: Status, update_task_signal, posi
delete_action = menu.addAction(gui.icon.trash(menu.style()), "delete")
+ if status != Status.READY:
+ move_to_ready = menu.addAction(gui.icon.task_ready(menu.style()), "move to ready")
+ else:
+ move_to_ready = QtWidgets.QAction(menu)
+
+ if status != Status.WAITING:
+ move_to_waiting = menu.addAction(gui.icon.task_waiting(menu.style()), "move to waiting")
+ else:
+ move_to_waiting = QtWidgets.QAction(menu)
+
+ if status != Status.MAYBE:
+ move_to_maybe = menu.addAction(gui.icon.task_maybe(menu.style()), "move to maybe")
+ else:
+ move_to_maybe = QtWidgets.QAction(menu)
+
action = menu.exec_(table.mapToGlobal(position + QtCore.QPoint(15, 20)))
if action == modify_action and len(rows) == 1:
row = list(rows)[0]
(task, tags) = table.get_at(row)
gui.tasks.dialog.update(table, update_task_signal, row, task, tags).exec_()
elif action == delete_action:
- gui.tasks.dialog.show_delete(table, rows, lambda: table.delete_rows(rows))
+ gui.tasks.dialog.confirm_delete(table, rows, lambda: table.delete_rows(rows))
+ elif action == move_to_ready:
+ gui.tasks.dialog.confirm_move(table, rows, Status.READY, lambda: table.update_status(rows, Status.READY))
+ elif action == move_to_waiting:
+ gui.tasks.dialog.confirm_move(table, rows, Status.WAITING, lambda: table.update_status(rows, Status.WAITING))
+ elif action == move_to_maybe:
+ gui.tasks.dialog.confirm_move(table, rows, Status.MAYBE, lambda: table.update_status(rows, Status.MAYBE))
diff --git a/src/gui/tasks/table/widget.py b/src/gui/tasks/table/widget.py
index 14806fa..aacae2f 100644
--- a/src/gui/tasks/table/widget.py
+++ b/src/gui/tasks/table/widget.py
@@ -192,10 +192,18 @@ class Widget(QtWidgets.QTableWidget):
def delete_rows(self, rows: List[int]):
task_ids = [task.id for i, task in enumerate(self._tasks) if i in rows]
service.tasks.delete(database.cursor(), task_ids)
- self._tasks = [t for t in self._tasks if t.id not in task_ids]
- self._task_tags = [tt for tt in self._task_tags if tt.task_id in [t.id for t in self._tasks]]
+ self.remove_rows_from_table(rows, task_ids)
+
+ def update_status(self, rows: List[int], status: Status):
+ task_ids = [task.id for i, task in enumerate(self._tasks) if i in rows]
+ service.tasks.update_status(database.cursor(), task_ids, status)
+ self.remove_rows_from_table(rows, task_ids)
+
+ def remove_rows_from_table(self, rows: List[int], task_ids: List[int]):
for row in sorted(rows, reverse=True):
self.removeRow(row)
+ self._tasks = [t for t in self._tasks if t.id not in task_ids]
+ self._task_tags = [tt for tt in self._task_tags if tt.task_id in [t.id for t in self._tasks]]
self.setRowCount(len(self._tasks))
def get_selected_rows(self):
diff --git a/src/gui/window.py b/src/gui/window.py
index 35670c7..584fda6 100644
--- a/src/gui/window.py
+++ b/src/gui/window.py
@@ -14,13 +14,13 @@ def get():
tabs = QtWidgets.QTabWidget(window)
window.setCentralWidget(tabs)
- show_todo = gui.signal.Reload()
+ show_ready = gui.signal.Reload()
show_waiting = gui.signal.Reload()
show_maybe = gui.signal.Reload()
def on_current_tab_changed(index: int):
if index == 0:
- show_todo.emit()
+ show_ready.emit()
elif index == 1:
show_waiting.emit()
elif index == 2:
@@ -28,7 +28,7 @@ def get():
tabs.currentChanged.connect(on_current_tab_changed)
- tabs.addTab(gui.tasks.widget.widget(tabs, show_todo, Status.READY), "Todo")
+ tabs.addTab(gui.tasks.widget.widget(tabs, show_ready, Status.READY), "Ready")
tabs.addTab(gui.tasks.widget.widget(tabs, show_waiting, Status.WAITING), "Waiting")
tabs.addTab(gui.tasks.widget.widget(tabs, show_maybe, Status.MAYBE), "Maybe")
tabs.addTab(gui.tags.panel.widget.widget(tabs), "Tags")
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-22 23:47:25 +0000