eric: comparison MultiProject/MultiProject.py

-:01f3384d535a
+:b31b0bffa5b0
 class MultiProject(QObject):
 """
 Class implementing the project management functionality.
-@signal dirty(int) emitted when the dirty state changes
+@signal dirty(bool) emitted when the dirty state changes
 @signal newMultiProject() emitted after a new multi project was generated
 @signal multiProjectOpened() emitted after a multi project file was read
 @signal multiProjectClosed() emitted after a multi project was closed
 @signal multiProjectPropertiesChanged() emitted after the multi project
 properties were changed
 has been added
 @signal projectRemoved(project data dict) emitted after a project entry
 has been removed
 @signal projectOpened(filename) emitted after the project has been opened
 """
+dirty = pyqtSignal(bool)
+newMultiProject = pyqtSignal()
+multiProjectOpened = pyqtSignal()
+multiProjectClosed = pyqtSignal()
+multiProjectPropertiesChanged = pyqtSignal()
+showMenu = pyqtSignal(str, QMenu)
+projectDataChanged = pyqtSignal(dict)
+projectAdded = pyqtSignal(dict)
+projectRemoved = pyqtSignal(dict)
 projectOpened = pyqtSignal(str)
 def __init__(self, project, parent = None, filename = None):
 """
 Constructor
 @param b dirty state (boolean)
 """
 self.dirty = b
 self.saveAct.setEnabled(b)
-self.emit(SIGNAL("dirty"), bool(b))
+self.dirty.emit(bool(b))
 def isDirty(self):
 """
 Public method to return the dirty state.
 # step 2: check, if master should be changed
 if isMaster:
 for project in self.projects:
 if project['master']:
 project['master'] = False
-self.emit(SIGNAL("projectDataChanged"), project)
+self.projectDataChanged.emit(project)
 self.setDirty(True)
 break
 # step 3: add the project entry
 project = {
 'file'        : filename,
 'master'      : isMaster,
 'description' : description,
 }
 self.projects.append(project)
-self.emit(SIGNAL("projectAdded"), project)
+self.projectAdded.emit(project)
 self.setDirty(True)
 def changeProjectProperties(self, pro):
 """
 Public method to change the data of a project entry.
 if pro['master']:
 for project in self.projects:
 if project['master']:
 if project['file'] != pro['file']:
 project['master'] = False
-self.emit(SIGNAL("projectDataChanged"), project)
+self.projectDataChanged.emit(project)
 self.setDirty(True)
 break
 # step 2: change the entry
 for project in self.projects:
 if project['file'] == pro['file']:
 # project filename is not changeable via interface
 project['name'] = pro['name']
 project['master'] = pro['master']
 project['description'] = pro['description']
-self.emit(SIGNAL("projectDataChanged"), project)
+self.projectDataChanged.emit(project)
 self.setDirty(True)
 def getProjects(self):
 """
 Public method to get all project entries.
 @param fn filename of the project to be removed from the multi project (string)
 """
 for project in self.projects:
 if project['file'] == fn:
 self.projects.remove(project)
-self.emit(SIGNAL("projectRemoved"), project)
+self.projectRemoved.emit(project)
 self.setDirty(True)
 break
-def newMultiProject(self):
+def __newMultiProject(self):
 """
-Public slot to build a new multi project.
+Private slot to build a new multi project.
 This method displays the new multi project dialog and initializes
 the multi project object with the data entered.
 """
 if not self.checkDirty():
 self.setDirty(True)
 self.closeAct.setEnabled(True)
 self.saveasAct.setEnabled(True)
 self.addProjectAct.setEnabled(True)
 self.propsAct.setEnabled(True)
-self.emit(SIGNAL('newMultiProject'))
+self.newMultiProject.emit()
 def __showProperties(self):
 """
 Private slot to display the properties dialog.
 """
 dlg = PropertiesDialog(self, False)
 if dlg.exec_() == QDialog.Accepted:
 dlg.storeData()
 self.setDirty(True)
-self.emit(SIGNAL('multiProjectPropertiesChanged'))
+self.multiProjectPropertiesChanged.emit()
 def openMultiProject(self, fn = None, openMaster = True):
 """
 Public slot to open a multi project.
 self.closeAct.setEnabled(True)
 self.saveasAct.setEnabled(True)
 self.addProjectAct.setEnabled(True)
 self.propsAct.setEnabled(True)
-self.emit(SIGNAL('multiProjectOpened'))
+self.multiProjectOpened.emit()
 if openMaster and Preferences.getMultiProject("OpenMasterAutomatically"):
 self.__openMasterProject(False)
 else:
 QApplication.restoreOverrideCursor()
 return False
 self.name = QFileInfo(fn).baseName()
 self.__writeMultiProject(fn)
-self.emit(SIGNAL('multiProjectClosed'))
+self.multiProjectClosed.emit()
-self.emit(SIGNAL('multiProjectOpened'))
+self.multiProjectOpened.emit()
 return True
 else:
 return False
 def checkDirty(self):
 self.saveasAct.setEnabled(False)
 self.saveAct.setEnabled(False)
 self.addProjectAct.setEnabled(False)
 self.propsAct.setEnabled(False)
-self.emit(SIGNAL('multiProjectClosed'))
+self.multiProjectClosed.emit()
 return True
 def initActions(self):
 """
 act.setWhatsThis(self.trUtf8(
 """<b>New...</b>"""
 """<p>This opens a dialog for entering the info for a"""
 """ new multiproject.</p>"""
 ))
-act.triggered[()].connect(self.newMultiProject)
+act.triggered[()].connect(self.__newMultiProject)
 self.actions.append(act)
 act = E5Action(self.trUtf8('Open multiproject'),
 UI.PixmapCache.getIcon("multiProjectOpen.png"),
 self.trUtf8('&Open...'), 0, 0,
 "Recent"    : self.recentMenu,
 }
 # connect the aboutToShow signals
 self.recentMenu.aboutToShow.connect(self.__showContextMenuRecent)
-self.connect(self.recentMenu, SIGNAL('triggered(QAction *)'),
+self.recentMenu.triggered.connect(self.__openRecent)
-self.__openRecent)
 menu.aboutToShow.connect(self.__showMenu)
 # build the main menu
 menu.setTearOffEnabled(True)
 menu.addActions(self.actGrp1.actions())
 """
 Private method to set up the multi project menu.
 """
 self.menuRecentAct.setEnabled(len(self.recent) > 0)
-self.emit(SIGNAL("showMenu"), "Main", self.__menus["Main"])
+self.showMenu.emit("Main", self.__menus["Main"])
 def __syncRecent(self):
 """
 Private method to synchronize the list of recently opened multi projects
 with the central store.

Mercurial Repositories > eric / file comparison

comparison: MultiProject/MultiProject.py

MultiProject/MultiProject.py