eric: comparison Tasks/TaskViewer.py

-:57354896fd29
+:5dd6edf8540a
 @param parent the parent (QWidget)
 @param project reference to the project object
 """
 super(TaskViewer, self).__init__(parent)
-self.setRootIsDecorated(False)
-self.setItemsExpandable(False)
 self.setSortingEnabled(True)
 self.__headerItem = QTreeWidgetItem(
 ["", "", self.tr("Summary"), self.tr("Filename"),
 self.tr("Line"), ""])
 self.tr("&Configure scan options"),
 self.__configureProjectTasksScanOptions)
 self.__menu = QMenu(self)
 self.__menu.addAction(self.tr("&New Task..."), self.__newTask)
+self.subtaskItem = self.__menu.addAction(
+self.tr("New &Sub-Task..."), self.__newSubTask)
 self.__menu.addSeparator()
 self.projectTasksMenuItem = self.__menu.addMenu(
 self.__projectTasksMenu)
 self.__menu.addSeparator()
 self.gotoItem = self.__menu.addAction(
 self.__menu.addSeparator()
 self.copyItem = self.__menu.addAction(
 self.tr("&Copy"), self.__copyTask)
 self.pasteItem = self.__menu.addAction(
 self.tr("&Paste"), self.__pasteTask)
+self.pasteMainItem = self.__menu.addAction(
+self.tr("Paste as &Main Task"), self.__pasteMainTask)
 self.deleteItem = self.__menu.addAction(
 self.tr("&Delete"), self.__deleteTask)
 self.__menu.addSeparator()
 self.markCompletedItem = self.__menu.addAction(
 self.tr("&Mark Completed"), self.__markCompleted)
 self.backProjectTasksMenuItem = self.__backMenu.addMenu(
 self.__projectTasksMenu)
 self.__backMenu.addSeparator()
 self.backPasteItem = self.__backMenu.addAction(
 self.tr("&Paste"), self.__pasteTask)
+self.backPasteMainItem = self.__menu.addAction(
+self.tr("Paste as &Main Task"), self.__pasteMainTask)
 self.__backMenu.addSeparator()
 self.__backMenu.addAction(
 self.tr("Delete Completed &Tasks"), self.__deleteCompleted)
 self.__backMenu.addSeparator()
 self.__backMenuFilteredAct = self.__backMenu.addAction(
 def __resort(self):
 """
 Private method to resort the tree.
 """
 self.sortItems(self.sortColumn(), self.header().sortIndicatorOrder())
 def __resizeColumns(self):
 """
 Private method to resize the list columns.
 """
 self.header().resizeSections(QHeaderView.ResizeToContents)
 self.header().setStretchLastSection(True)
+def findParentTask(self, parentUid):
+"""
+Public method to find a parent task by its ID.
+@param parentUid uid of the parent task (string)
+@return reference to the task (Task)
+"""
+if not parentUid:
+return None
+parentTask = None
+for task in self.tasks:
+if task.getUuid() == parentUid:
+parentTask = task
+break
+return parentTask
 def __refreshDisplay(self):
 """
 Private method to refresh the display.
 """
 for task in self.tasks:
-index = self.indexOfTopLevelItem(task)
+task.setHidden(not self.taskFilter.showTask(task))
-if self.taskFilter.showTask(task):
-# show the task
-if index == -1:
-self.addTopLevelItem(task)
-else:
-# hide the task
-if index != -1:
-self.takeTopLevelItem(index)
 self.__resort()
 self.__resizeColumns()
 def __taskItemActivated(self, itm, col):
 """
 coord = self.mapToGlobal(coord)
 if itm is None:
 self.backProjectTasksMenuItem.setEnabled(self.projectOpen)
 if self.copyTask:
 self.backPasteItem.setEnabled(True)
+self.backPasteMainItem.setEnabled(True)
 else:
 self.backPasteItem.setEnabled(False)
+self.backPasteMainItem.setEnabled(False)
 self.__backMenu.popup(coord)
 else:
 self.projectTasksMenuItem.setEnabled(self.projectOpen)
 if itm.getFilename():
 self.gotoItem.setEnabled(True)
 self.deleteItem.setEnabled(True)
 self.markCompletedItem.setEnabled(False)
 self.copyItem.setEnabled(False)
+self.subtaskItem.setEnabled(False)
 else:
 self.gotoItem.setEnabled(False)
 self.deleteItem.setEnabled(True)
 self.markCompletedItem.setEnabled(True)
 self.copyItem.setEnabled(True)
+self.subtaskItem.setEnabled(True)
 if self.copyTask:
 self.pasteItem.setEnabled(True)
+self.pasteMainItem.setEnabled(True)
 else:
 self.pasteItem.setEnabled(False)
+self.pasteMainItem.setEnabled(False)
 self.__menu.popup(coord)
 def setProjectOpen(self, o=False):
 """
 """
 self.projectOpen = o
 def addTask(self, summary, priority=1, filename="", lineno=0,
 completed=False, _time=0, isProjectTask=False,
-taskType=Task.TypeTodo, description=""):
+taskType=Task.TypeTodo, description="", uid="",
+parentTask=None):
 """
 Public slot to add a task.
 @param summary summary text of the task (string)
 @param priority priority of the task (0=high, 1=normal, 2=low)
 @param isProjectTask flag indicating a task related to the current
 project (boolean)
 @param taskType type of the task (one of Task.TypeFixme, Task.TypeTodo,
 Task.TypeWarning, Task.TypeNote)
 @param description explanatory text of the task (string)
-"""
+@param uid unique id of the task (string)
+@param parentTask reference to the parent task item (Task)
+@return reference to the task item (Task)
+"""
+if parentTask:
+parentUid = parentTask.getUuid()
+else:
+parentUid = ""
 task = Task(summary, priority, filename, lineno, completed,
 _time, isProjectTask, taskType,
-self.project, description)
+self.project, description, uid, parentUid)
 self.tasks.append(task)
-if self.taskFilter.showTask(task):
+if parentTask:
+parentTask.addChild(task)
+parentTask.setExpanded(True)
+else:
 self.addTopLevelItem(task)
-self.__resort()
+task.setHidden(not self.taskFilter.showTask(task))
-self.__resizeColumns()
+self.__resort()
+self.__resizeColumns()
 if isProjectTask:
 self.__projectTasksSaveTimer.changeOccurred()
+return task
 def addFileTask(self, summary, filename, lineno, taskType=Task.TypeTodo,
 description=""):
 """
 Public slot to add a file related task.
 Public slot to clear project related tasks.
 @keyparam fileOnly flag indicating to clear only file related
 project tasks (boolean)
 """
-for task in self.tasks[:]:
+for task in reversed(self.tasks[:]):
 if (fileOnly and task.isProjectFileTask()) or \
 (not fileOnly and task.isProjectTask()):
 if self.copyTask == task:
 self.copyTask = None
-index = self.indexOfTopLevelItem(task)
+parent = task.parent()
-self.takeTopLevelItem(index)
+if parent:
+parent.removeChild(task)
+else:
+index = self.indexOfTopLevelItem(task)
+self.takeTopLevelItem(index)
 self.tasks.remove(task)
 del task
 def clearFileTasks(self, filename, conditionally=False):
 """
 dlg = TaskPropertiesDialog(task, self, self.projectOpen)
 ro = task.getFilename() != ""
 if ro:
 dlg.setReadOnly()
 if dlg.exec_() == QDialog.Accepted and not ro:
-data = dlg.getData()
+summary, priority, completed, isProjectTask, description = \
-task.setSummary(data[0])
+dlg.getData()
-task.setPriority(data[1])
+task.setSummary(summary)
-task.setCompleted(data[2])
+task.setPriority(priority)
-task.setProjectTask(data[3])
+task.setCompleted(completed)
-task.setDescription(data[4])
+task.setProjectTask(isProjectTask)
+task.setDescription(description)
 self.__projectTasksSaveTimer.changeOccurred()
 def __newTask(self):
 """
 Private slot to handle the "New Task" context menu entry.
 """
 from .TaskPropertiesDialog import TaskPropertiesDialog
 dlg = TaskPropertiesDialog(None, self, self.projectOpen)
 if dlg.exec_() == QDialog.Accepted:
-data = dlg.getData()
+summary, priority, completed, isProjectTask, description = \
-self.addTask(data[0], data[1], completed=data[2],
+dlg.getData()
-isProjectTask=data[3], description=data[4])
+self.addTask(summary, priority, completed=completed,
+isProjectTask=isProjectTask, description=description)
+def __newSubTask(self):
+"""
+Private slot to handle the "New Sub-Task" context menu entry.
+"""
+parentTask = self.currentItem()
+projectTask = parentTask.isProjectTask()
+from .TaskPropertiesDialog import TaskPropertiesDialog
+dlg = TaskPropertiesDialog(None, self, self.projectOpen)
+dlg.setSubTaskMode(projectTask)
+if dlg.exec_() == QDialog.Accepted:
+summary, priority, completed, isProjectTask, description = \
+dlg.getData()
+self.addTask(summary, priority, completed=completed,
+isProjectTask=isProjectTask, description=description,
+parentTask=parentTask)
 def __markCompleted(self):
 """
 Private slot to handle the "Mark Completed" context menu entry.
 """
 def __deleteCompleted(self):
 """
 Private slot to handle the "Delete Completed Tasks" context menu entry.
 """
-for task in self.tasks[:]:
+for task in reversed(self.tasks[:]):
 if task.isCompleted():
 if self.copyTask == task:
 self.copyTask = None
-index = self.indexOfTopLevelItem(task)
+parent = task.parent()
-self.takeTopLevelItem(index)
+if parent:
+parent.removeChild(task)
+else:
+index = self.indexOfTopLevelItem(task)
+self.takeTopLevelItem(index)
 self.tasks.remove(task)
 if task.isProjectTask:
 self.__projectTasksSaveTimer.changeOccurred()
 del task
 ci = self.currentItem()
 if self.copyTask:
 self.addTask(self.copyTask.summary,
 priority=self.copyTask.priority,
 completed=self.copyTask.completed,
 description=self.copyTask.description,
+isProjectTask=self.copyTask._isProjectTask,
+parentTask=self.copyTask.parent())
+def __pasteMainTask(self):
+"""
+Private slot to handle the "Paste as Main Task" context menu entry.
+"""
+if self.copyTask:
+self.addTask(self.copyTask.summary,
+priority=self.copyTask.priority,
+completed=self.copyTask.completed,
+description=self.copyTask.description,
 isProjectTask=self.copyTask._isProjectTask)
+def __deleteSubTasks(self, task):
+"""
+Private method to delete all sub-tasks.
+@param task task to delete sub-tasks of (Task)
+"""
+for subtask in task.takeChildren():
+if self.copyTask == subtask:
+self.copyTask = None
+if subtask.childCount() > 0:
+self.__deleteSubTasks(subtask)
+self.tasks.remove(subtask)
 def __deleteTask(self):
 """
 Private slot to handle the "Delete Task" context menu entry.
 """
 task = self.currentItem()
 if self.copyTask == task:
 self.copyTask = None
-index = self.indexOfTopLevelItem(task)
+if task.childCount() > 0:
-self.takeTopLevelItem(index)
+self.__deleteSubTasks(task)
+parent = task.parent()
+if parent:
+parent.removeChild(task)
+else:
+index = self.indexOfTopLevelItem(task)
+self.takeTopLevelItem(index)
 self.tasks.remove(task)
 if task.isProjectTask:
 self.__projectTasksSaveTimer.changeOccurred()
 del task
 ci = self.currentItem()

Mercurial Repositories > eric / file comparison

comparison: Tasks/TaskViewer.py

Tasks/TaskViewer.py