4 files changed, 43 insertions, 23 deletions
diff --git a/src/gui/tags/panel/table/menu.py b/src/gui/tags/panel/table/menu.py
index 2238444..6bf812e 100644
--- a/src/gui/tags/panel/table/menu.py
+++ b/src/gui/tags/panel/table/menu.py
@@ -1,25 +1,36 @@
 from PyQt5 import QtWidgets, QtCore
 
+from model.tag import Tag, ValidTagForm
+import database
 import db.tags
+import db.task_tags
 import gui.tags.panel.dialog
-from model.tag import Tag, ValidTagForm
 
 def open(table, update_tag_signal, position):
     rows = set([index.row() for index in table.selectedIndexes()])
 
     menu = QtWidgets.QMenu(table)
 
+    actions = 0
+
     if len(rows) == 1:
         modify_action = menu.addAction(gui.icon.dialog_open(menu.style()), 'modify')
+        actions += 1
     else:
         modify_action = QtWidgets.QAction(menu)
 
-    delete_action = menu.addAction(gui.icon.trash(menu.style()), 'delete')
+    tags = table.model().row_ids(rows)
+    if not db.task_tags.one_is_used(database.cursor(), tags):
+        delete_action = menu.addAction(gui.icon.trash(menu.style()), 'delete')
+        actions += 1
+    else:
+        delete_action = 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]
-        tag = table.model().get_at(row)
-        gui.tags.panel.dialog.update(table, update_tag_signal, row, tag).exec_()
-    elif action == delete_action:
-        gui.tags.panel.dialog.show_delete(table, rows)
+    if actions > 0:
+        action = menu.exec_(table.mapToGlobal(position + QtCore.QPoint(15, 20)))
+        if action == modify_action and len(rows) == 1:
+            row = list(rows)[0]
+            tag = table.model().get_at(row)
+            gui.tags.panel.dialog.update(table, update_tag_signal, row, tag).exec_()
+        elif action == delete_action:
+            gui.tags.panel.dialog.show_delete(table, rows)
diff --git a/src/gui/tags/panel/table/model.py b/src/gui/tags/panel/table/model.py
index 7c66b5d..353f747 100644
--- a/src/gui/tags/panel/table/model.py
+++ b/src/gui/tags/panel/table/model.py
@@ -1,5 +1,6 @@
 from PyQt5 import QtCore, QtWidgets, QtGui
 from PyQt5.QtCore import Qt
+from typing import List
 
 from model.tag import Tag
 import time
diff --git a/src/gui/tags/panel/table/widget.py b/src/gui/tags/panel/table/widget.py
index f0bf82c..0ef67c2 100644
--- a/src/gui/tags/panel/table/widget.py
+++ b/src/gui/tags/panel/table/widget.py
@@ -1,13 +1,14 @@
 from PyQt5 import QtWidgets
 from PyQt5.QtCore import Qt
 
+from model.tag import Tag, ValidTagForm
+import database
 import db.tags
+import db.task_tags
+import gui.tags.panel.dialog
 import gui.tags.panel.signal
 import gui.tags.panel.table.menu
 import gui.tags.panel.table.model
-import gui.tags.panel.dialog
-from model.tag import Tag, ValidTagForm
-import database
 
 class Widget(QtWidgets.QTableView):
 
@@ -60,7 +61,9 @@ class Widget(QtWidgets.QTableView):
                 gui.tags.panel.dialog.update(self, self._update_tag_signal, row, tag).exec_()
         elif event.key() == Qt.Key_Delete:
             rows = self.get_selected_rows()
-            gui.tags.panel.dialog.show_delete(self, rows)
+            tags = self.model().row_ids(rows)
+            if not db.task_tags.one_is_used(database.cursor(), tags):
+                gui.tags.panel.dialog.show_delete(self, rows)
 
     def get_selected_rows(self):
         return list(set([index.row() for index in self.selectedIndexes()]))
diff --git a/src/gui/tasks/table/widget.py b/src/gui/tasks/table/widget.py
index 0a8d216..82c0456 100644
--- a/src/gui/tasks/table/widget.py
+++ b/src/gui/tasks/table/widget.py
@@ -99,16 +99,21 @@ class Widget(QtWidgets.QTableWidget):
                 reverse = is_rev)
 
     def update_task(self, row, task: Task, tags: List[int]):
-        # TODO: just update if sort order is not impacted
-        # self._tasks[row] = task
-        # task_ids = [t.id for t in self._tasks]
-        # filtred_task_tags = [tt for tt in self._task_tags if tt.task_id in task_ids]
-        # new_task_tags = [TaskTag(task_id=task.id, tag_id=tag_id) for tag_id in tags]
-        # self._task_tags = filtred_task_tags + new_task_tags
-        # self.update_row(row)
-        self.delete_rows([row])
-        row = self.insert(task, tags)
-        self.selectRow(row)
+        self._tasks[row] = task
+        filtred_task_tags = [tt for tt in self._task_tags if tt.task_id in [t.id for t in self._tasks if t.id != task.id]]
+        new_task_tags = [TaskTag(task_id=task.id, tag_id=tag_id) for tag_id in tags]
+        self._task_tags = filtred_task_tags + new_task_tags
+
+        # Update task in table
+        self.sort()
+        row_after_sort = [i for i in range(len(self._tasks)) if self._tasks[i].id == task.id][0]
+        if row_after_sort == row:
+            self.update_row(row)
+        else:
+            self.removeRow(row)
+            self.insertRow(row_after_sort)
+            self.update_row(row_after_sort)
+            self.selectRow(row_after_sort)
 
     def update_view(self):
         for row in range(len(self._tasks)):