--- a/MultiProject/MultiProject.py Fri Mar 07 19:20:36 2014 +0100 +++ b/MultiProject/MultiProject.py Sat Mar 08 20:09:41 2014 +0100 @@ -9,7 +9,8 @@ import os -from PyQt4.QtCore import pyqtSignal, Qt, QFileInfo, QFile, QIODevice, QObject +from PyQt4.QtCore import pyqtSignal, pyqtSlot, Qt, QFileInfo, QFile, \ + QIODevice, QObject from PyQt4.QtGui import QMenu, QApplication, QDialog, QCursor, QToolBar from Globals import recentNameMultiProject @@ -288,6 +289,7 @@ return res + @pyqtSlot() def addProject(self, startdir=None): """ Public slot used to add files to the project. @@ -430,6 +432,8 @@ self.setDirty(True) self.multiProjectPropertiesChanged.emit() + @pyqtSlot() + @pyqtSlot(str) def openMultiProject(self, fn=None, openMaster=True): """ Public slot to open a multi project. @@ -612,7 +616,7 @@ """<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( @@ -625,7 +629,7 @@ """<b>Open...</b>""" """<p>This opens an existing multiproject.</p>""" )) - act.triggered[()].connect(self.openMultiProject) + act.triggered.connect(self.openMultiProject) self.actions.append(act) self.closeAct = E5Action( @@ -638,7 +642,7 @@ """<b>Close</b>""" """<p>This closes the current multiproject.</p>""" )) - self.closeAct.triggered[()].connect(self.closeMultiProject) + self.closeAct.triggered.connect(self.closeMultiProject) self.actions.append(self.closeAct) self.saveAct = E5Action( @@ -650,7 +654,7 @@ """<b>Save</b>""" """<p>This saves the current multiproject.</p>""" )) - self.saveAct.triggered[()].connect(self.saveMultiProject) + self.saveAct.triggered.connect(self.saveMultiProject) self.actions.append(self.saveAct) self.saveasAct = E5Action( @@ -664,7 +668,7 @@ """<b>Save as</b>""" """<p>This saves the current multiproject to a new file.</p>""" )) - self.saveasAct.triggered[()].connect(self.saveMultiProjectAs) + self.saveasAct.triggered.connect(self.saveMultiProjectAs) self.actions.append(self.saveasAct) self.addProjectAct = E5Action( @@ -679,7 +683,7 @@ """<p>This opens a dialog for adding a project""" """ to the current multiproject.</p>""" )) - self.addProjectAct.triggered[()].connect(self.addProject) + self.addProjectAct.triggered.connect(self.addProject) self.actions.append(self.addProjectAct) self.propsAct = E5Action( @@ -694,7 +698,7 @@ """<p>This shows a dialog to edit the multiproject""" """ properties.</p>""" )) - self.propsAct.triggered[()].connect(self.__showProperties) + self.propsAct.triggered.connect(self.__showProperties) self.actions.append(self.propsAct) self.closeAct.setEnabled(False)