eric: comparison src/eric7/MultiProject/MultiProjectBrowser.py

-:8d888f38bf89
+:da82156f44e9
 from PyQt6.QtWidgets import QDialog, QMenu, QTreeWidget, QTreeWidgetItem
 from eric7.EricGui import EricPixmapCache
 from eric7.EricWidgets import EricMessageBox
 from eric7.EricWidgets.EricApplication import ericApp
+from .MultiProjectProjectMeta import MultiProjectProjectMeta
 class MultiProjectBrowser(QTreeWidget):
 """
 Class implementing the multi project browser.
 def __projectAdded(self, project):
 """
 Private slot to handle the addition of a project to the multi project.
-@param project reference to the project data dictionary
+@param project reference to the project metadata
+@type MultiProjectProjectMeta
 """
 self.__addProject(project)
 self.sortItems(0, Qt.SortOrder.AscendingOrder)
 def __projectRemoved(self, project):
 """
 Private slot to handle the removal of a project from the multi project.
-@param project reference to the project data dictionary
+@param project reference to the project metadata
+@type MultiProjectProjectMeta
 """
 itm = self.__findProjectItem(project)
 if itm:
 parent = itm.parent()
 parent.removeChild(itm)
 def __projectDataChanged(self, project):
 """
 Private slot to handle the change of a project of the multi project.
-@param project reference to the project data dictionary
+@param project reference to the project metadata
 """
 itm = self.__findProjectItem(project)
 if itm:
 parent = itm.parent()
-if parent.text(0) != project["category"]:
+if parent.text(0) != project.category:
 self.__projectRemoved(project)
 self.__addProject(project)
 else:
 self.__setItemData(itm, project)
 def __projectOpened(self):
 """
 Private slot to handle the opening of a project.
 """
 projectfile = self.project.getProjectFile()
-project = {
+project = MultiProjectProjectMeta(
-"name": "",
+name="",
-"file": projectfile,
+file=projectfile,
-"master": False,
+uid="",
-"description": "",
+)
-"category": "",
-"uid": "",
-}
 itm = self.__findProjectItem(project)
 if itm:
 font = itm.font(0)
 font.setBold(True)
 itm.setFont(0, font)
 def __contextMenuRequested(self, coord):
 """
 Private slot to show the context menu.
-@param coord the position of the mouse pointer (QPoint)
+@param coord the position of the mouse pointer
+@type QPoint
 """
 itm = self.itemAt(coord)
 if itm is None or itm.parent() is None:
+self.__clearRemovedBackAct.setEnabled(
+self.multiProject.hasRemovedProjects()
+)
 self.__backMenu.popup(self.mapToGlobal(coord))
 else:
+self.__clearRemovedAct.setEnabled(
+self.multiProject.hasRemovedProjects()
+)
 self.__menu.popup(self.mapToGlobal(coord))
 def __openItem(self, itm=None):
 """
 Private slot to open a project.
-@param itm reference to the project item to be opened (QTreeWidgetItem)
+@param itm reference to the project item to be opened
+@type QTreeWidgetItem
 """
 if itm is None:
 itm = self.currentItem()
 if itm is None or itm.parent() is None:
 return
 def __findCategoryItem(self, category):
 """
 Private method to find the item for a category.
-@param category category to search for (string)
+@param category category to search for
+@type str
 @return reference to the category item or None, if there is
-no such item (QTreeWidgetItem or None)
+no such item
+@rtype QTreeWidgetItem or None
 """
 if category == "":
 category = self.tr("Not categorized")
 for index in range(self.topLevelItemCount()):
 itm = self.topLevelItem(index)
 def __addProject(self, project):
 """
 Private method to add a project to the list.
-@param project reference to the project data dictionary
+@param project reference to the project metadata
-"""
+@type MultiProjectProjectMeta
-parent = self.__findCategoryItem(project["category"])
+"""
+parent = self.__findCategoryItem(project.category)
 if parent is None:
-if project["category"]:
+if project.category:
-parent = QTreeWidgetItem(self, [project["category"]])
+parent = QTreeWidgetItem(self, [project.category])
 else:
 parent = QTreeWidgetItem(self, [self.tr("Not categorized")])
 parent.setExpanded(True)
 itm = QTreeWidgetItem(parent)
 self.__setItemData(itm, project)
 def __setItemData(self, itm, project):
 """
 Private method to set the data of a project item.
-@param itm reference to the item to be set (QTreeWidgetItem)
+@param itm reference to the item to be set
-@param project reference to the project data dictionary
+@type QTreeWidgetItem
-"""
+@param project reference to the project metadata
-itm.setText(0, project["name"])
+@type MultiProjectProjectMeta
-if project["master"]:
+"""
+itm.setText(0, project.name)
+if project.master:
 itm.setIcon(0, EricPixmapCache.getIcon("mainProject"))
 else:
 itm.setIcon(0, EricPixmapCache.getIcon("empty"))
-itm.setToolTip(0, project["file"])
+itm.setToolTip(0, project.file)
-itm.setData(0, MultiProjectBrowser.ProjectFileNameRole, project["file"])
+itm.setData(0, MultiProjectBrowser.ProjectFileNameRole, project.file)
-itm.setData(0, MultiProjectBrowser.ProjectUidRole, project["uid"])
+itm.setData(0, MultiProjectBrowser.ProjectUidRole, project.uid)
+if project.removed:
+itm.setText(0, self.tr("{0} (removed)").format(itm.text(0)))
+font = itm.font(0)
+font.setItalic(True)
+itm.setFont(0, font)
 def __findProjectItem(self, project):
 """
 Private method to search a specific project item.
-@param project reference to the project data dictionary
+@param project reference to the project metadata
-@return reference to the item (QTreeWidgetItem) or None
+@type MultiProjectProjectMeta
-"""
+@return reference to the item or None
-if project["uid"]:
+@rtype QTreeWidgetItem
-compareData = project["uid"]
+"""
+if project.uid:
+compareData = project.uid
 compareRole = MultiProjectBrowser.ProjectUidRole
 else:
-compareData = project["file"]
+compareData = project.file
 compareRole = MultiProjectBrowser.ProjectFileNameRole
 for topIndex in range(self.topLevelItemCount()):
 topItm = self.topLevelItem(topIndex)
 for childIndex in range(topItm.childCount()):
 if itm is not None and itm.parent() is not None:
 uid = itm.data(0, MultiProjectBrowser.ProjectUidRole)
 if uid:
 project = self.multiProject.getProject(uid)
 if project is not None:
+# TODO: change the dialog
 dlg = AddProjectDialog(
 self,
 project=project,
 categories=self.multiProject.getCategories(),
 )
 if dlg.exec() == QDialog.DialogCode.Accepted:
-(
+# TODO: move the metadata creation to the dialog
-name,
+project = dlg.getProjectMetadata()
-filename,
-isMain,
-description,
-category,
-uid,
-) = dlg.getData()
-project = {
-"name": name,
-"file": filename,
-"master": isMain,
-"description": description,
-"category": category,
-"uid": uid,
-}
 self.multiProject.changeProjectProperties(project)
 def __addNewProject(self):
 """
 Private method to add a new project entry.
 self.__menu.addAction(self.tr("Properties"), self.__showProjectProperties)
 self.__menu.addSeparator()
 self.__menu.addAction(self.tr("Add Project..."), self.__addNewProject)
 self.__menu.addAction(self.tr("Copy Project..."), self.__copyProject)
 self.__menu.addSeparator()
+self.__clearRemovedAct = self.__menu.addAction(
+self.tr("Clear Out"), self.multiProject.clearRemovedProjects
+)
+self.__menu.addSeparator()
 self.__menu.addAction(self.tr("Configure..."), self.__configure)
 self.__backMenu = QMenu(self)
 self.__backMenu.addAction(self.tr("Add Project..."), self.__addNewProject)
 self.__backMenu.addSeparator()
+self.__clearRemovedBackAct = self.__backMenu.addAction(
+self.tr("Clear Out"), self.multiProject.clearRemovedProjects
+)
+self.__backMenu.addSeparator()
 self.__backMenu.addAction(self.tr("Configure..."), self.__configure)
 def __configure(self):
 """
 Private method to open the configuration dialog.

Mercurial Repositories > eric / file comparison

comparison: src/eric7/MultiProject/MultiProjectBrowser.py

src/eric7/MultiProject/MultiProjectBrowser.py