Mercurial Repositories > eric / changeset
changeset
Continued porting signal/slot usage to the new API.
Tue, 10 Aug 2010 19:40:44 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 10 Aug 2010 19:40:44 +0200
- changeset 486
- e4711a55e482
- parent 485
- b17b3aea644e
- child 487
- 4d41d03d3d00
Continued porting signal/slot usage to the new API.
--- a/Debugger/DebugUI.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Debugger/DebugUI.py Tue Aug 10 19:40:44 2010 +0200 @@ -125,18 +125,16 @@ debugServer.clientThreadList.connect(debugViewer.showThreadList) # Connect the signals emitted by the viewmanager - self.connect(vm, SIGNAL('editorOpened'), self.__editorOpened) - self.connect(vm, SIGNAL('lastEditorClosed'), self.__lastEditorClosed) - self.connect(vm, SIGNAL('checkActions'), self.__checkActions) - self.connect(vm, SIGNAL('cursorChanged'), self.__cursorChanged) - self.connect(vm, SIGNAL('breakpointToggled'), self.__cursorChanged) + vm.editorOpened.connect(self.__editorOpened) + vm.lastEditorClosed.connect(self.__lastEditorClosed) + vm.checkActions.connect(self.__checkActions) + vm.cursorChanged.connect(self.__cursorChanged) + vm.breakpointToggled.connect(self.__cursorChanged) # Connect the signals emitted by the project - self.connect(project, SIGNAL('projectOpened'), self.__projectOpened) - self.connect(project, SIGNAL('newProject'), self.__projectOpened) - self.connect(project, SIGNAL('projectClosed'), self.__projectClosed) - self.connect(project, SIGNAL('projectSessionLoaded'), - self.__projectSessionLoaded) + project.projectOpened.connect(self.__projectOpened) + project.newProject.connect(self.__projectOpened) + project.projectClosed.connect(self.__projectClosed) # Set a flag for the passive debug mode self.passive = Preferences.getDebugger("PassiveDbgEnabled") @@ -843,16 +841,6 @@ self.lastDebuggedFile = None self.lastStartAction = 0 - def __projectSessionLoaded(self): - """ - Private slot to handle the projectSessionLoaded signal. - """ - fn = self.project.getMainScript(True) - if fn is not None: - self.lastStartAction = 2 - self.lastDebuggedFile = fn - self.restartAct.setEnabled(True) - def shutdown(self): """ Public method to perform shutdown actions.
--- a/MultiProject/MultiProject.py Tue Aug 10 18:03:57 2010 +0200 +++ b/MultiProject/MultiProject.py Tue Aug 10 19:40:44 2010 +0200 @@ -52,6 +52,8 @@ has been removed @signal projectOpened(filename) emitted after the project has been opened """ + projectOpened = pyqtSignal(str) + def __init__(self, project, parent = None, filename = None): """ Constructor @@ -936,7 +938,7 @@ @param filename filename of the project file (string) """ self.projectObject.openProject(filename) - self.emit(SIGNAL('projectOpened'), filename) + self.projectOpened.emit(filename) def __openMasterProject(self, reopen = True): """
--- a/MultiProject/MultiProjectBrowser.py Tue Aug 10 18:03:57 2010 +0200 +++ b/MultiProject/MultiProjectBrowser.py Tue Aug 10 19:40:44 2010 +0200 @@ -45,8 +45,7 @@ self.__projectAdded) self.connect(self.multiProject, SIGNAL("projectRemoved"), self.__projectRemoved) - self.connect(self.multiProject, SIGNAL("projectOpened"), - self.__projectOpened) + self.multiProject.projectOpened.connect(self.__projectOpened) self.__createPopupMenu() self.setContextMenuPolicy(Qt.CustomContextMenu)
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Tue Aug 10 19:40:44 2010 +0200 @@ -123,6 +123,12 @@ @signal changeCaption(string) emitted if a change of the caption is necessary @signal editorChanged(string) emitted when the current editor has changed """ + editorOpened = pyqtSignal(str) + lastEditorClosed = pyqtSignal() + checkActions = pyqtSignal(Editor) + cursorChanged = pyqtSignal(Editor) + breakpointToggled = pyqtSignal(Editor) + def __init__(self, parent): """ Constructor
--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Tue Aug 10 19:40:44 2010 +0200 @@ -26,6 +26,12 @@ @signal editorChanged(string) emitted when the current editor has changed """ + editorOpened = pyqtSignal(str) + lastEditorClosed = pyqtSignal() + checkActions = pyqtSignal(Editor) + cursorChanged = pyqtSignal(Editor) + breakpointToggled = pyqtSignal(Editor) + def __init__(self, parent): """ Constructor @@ -363,4 +369,4 @@ Private slot to iconize all windows. """ for win in self.subWindowList(): - win.showMinimized() \ No newline at end of file + win.showMinimized()
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Tue Aug 10 19:40:44 2010 +0200 @@ -17,6 +17,7 @@ from ViewManager.ViewManager import ViewManager import QScintilla.Editor +from QScintilla.Editor import Editor import UI.PixmapCache @@ -621,6 +622,12 @@ @signal changeCaption(string) emitted if a change of the caption is necessary @signal editorChanged(string) emitted when the current editor has changed """ + editorOpened = pyqtSignal(str) + lastEditorClosed = pyqtSignal() + checkActions = pyqtSignal(Editor) + cursorChanged = pyqtSignal(Editor) + breakpointToggled = pyqtSignal(Editor) + def __init__(self, parent): """ Constructor @@ -1095,4 +1102,4 @@ for tw in self.tabWidgets: if id(tw) == id_: return tw - return None \ No newline at end of file + return None
--- a/Project/Project.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Project/Project.py Tue Aug 10 19:40:44 2010 +0200 @@ -73,7 +73,6 @@ Class implementing the project management functionality. @signal dirty(int) emitted when the dirty state changes - @signal projectSessionLoaded() emitted after a project session file was loaded @signal projectLanguageAdded(string) emitted after a new language was added @signal projectLanguageAddedByCode(string) emitted after a new language was added. The language code is sent by this signal. @@ -113,6 +112,9 @@ changed """ sourceFile = pyqtSignal(str) + projectOpened = pyqtSignal() + newProject = pyqtSignal() + projectClosed = pyqtSignal() keynames = [ "PROGLANGUAGE", "MIXEDLANGUAGE", "PROJECTTYPE", @@ -2244,7 +2246,7 @@ else: return False - def newProject(self): + def createNewProject(self): """ Public slot to built a new project. @@ -2475,11 +2477,11 @@ self.vcs.vcsConvertProject(vcsDataDict, self) else: self.emit(SIGNAL('newProjectHooks')) - self.emit(SIGNAL('newProject')) + self.newProject.emit() else: self.emit(SIGNAL('newProjectHooks')) - self.emit(SIGNAL('newProject')) + self.newProject.emit() def newProjectAddFiles(self, mainscript): @@ -2802,7 +2804,7 @@ self.__model.projectOpened() self.emit(SIGNAL('projectOpenedHooks')) - self.emit(SIGNAL('projectOpened')) + self.projectOpened.emit() QApplication.restoreOverrideCursor() @@ -2914,9 +2916,9 @@ self.sessActGrp.setEnabled(ok) self.menuSessionAct.setEnabled(ok) self.emit(SIGNAL('projectClosedHooks')) - self.emit(SIGNAL('projectClosed')) + self.projectClosed.emit() self.emit(SIGNAL('projectOpenedHooks')) - self.emit(SIGNAL('projectOpened')) + self.projectOpened.emit() return True else: return False @@ -3045,7 +3047,7 @@ self.__model.projectClosed() self.emit(SIGNAL('projectClosedHooks')) - self.emit(SIGNAL('projectClosed')) + self.projectClosed.emit() return True @@ -3350,7 +3352,7 @@ """<p>This opens a dialog for entering the info for a""" """ new project.</p>""" )) - act.triggered[()].connect(self.newProject) + act.triggered[()].connect(self.createNewProject) self.actions.append(act) act = E5Action(self.trUtf8('Open project'),
--- a/Project/ProjectBrowser.py Tue Aug 10 18:03:57 2010 +0200 +++ b/Project/ProjectBrowser.py Tue Aug 10 19:40:44 2010 +0200 @@ -99,72 +99,51 @@ # step 2: connect all the browsers # connect the sources browser - self.connect(self.project, SIGNAL('projectClosed'), - self.psBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.psBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.psBrowser._newProject) + self.project.projectClosed.connect(self.psBrowser._projectClosed) + self.project.projectOpened.connect(self.psBrowser._projectOpened) + self.project.newProject.connect(self.psBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.psBrowser._initMenusAndVcs) # connect the forms browser - self.connect(self.project, SIGNAL('projectClosed'), - self.pfBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.pfBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.pfBrowser._newProject) + self.project.projectClosed.connect(self.pfBrowser._projectClosed) + self.project.projectOpened.connect(self.pfBrowser._projectOpened) + self.project.newProject.connect(self.pfBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.pfBrowser._initMenusAndVcs) # connect the resources browser - self.connect(self.project, SIGNAL('projectClosed'), - self.prBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.prBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.prBrowser._newProject) + self.project.projectClosed.connect(self.prBrowser._projectClosed) + self.project.projectOpened.connect(self.prBrowser._projectOpened) + self.project.newProject.connect(self.prBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.prBrowser._initMenusAndVcs) # connect the translations browser - self.connect(self.project, SIGNAL('projectClosed'), - self.ptBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.ptBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.ptBrowser._newProject) + self.project.projectClosed.connect(self.ptBrowser._projectClosed) + self.project.projectOpened.connect(self.ptBrowser._projectOpened) + self.project.newProject.connect(self.ptBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.ptBrowser._initMenusAndVcs) # connect the interfaces (IDL) browser - self.connect(self.project, SIGNAL('projectClosed'), - self.piBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.piBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.piBrowser._newProject) + self.project.projectClosed.connect(self.piBrowser._projectClosed) + self.project.projectOpened.connect(self.piBrowser._projectOpened) + self.project.newProject.connect(self.piBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.piBrowser._initMenusAndVcs) # connect the others browser - self.connect(self.project, SIGNAL('projectClosed'), - self.poBrowser._projectClosed) - self.connect(self.project, SIGNAL('projectOpened'), - self.poBrowser._projectOpened) - self.connect(self.project, SIGNAL('newProject'), - self.poBrowser._newProject) + self.project.projectClosed.connect(self.poBrowser._projectClosed) + self.project.projectOpened.connect(self.poBrowser._projectOpened) + self.project.newProject.connect(self.poBrowser._newProject) self.connect(self.project, SIGNAL('reinitVCS'), self.poBrowser._initMenusAndVcs) # add signal connection to ourself - self.connect(self.project, SIGNAL('projectOpened'), - self.__projectOpened) - self.connect(self.project, SIGNAL('projectClosed'), - self.__projectClosed) - self.connect(self.project, SIGNAL('newProject'), - self.__newProject) + self.project.projectOpened.connect(self.__projectOpened) + self.project.projectClosed.connect(self.__projectClosed) + self.project.newProject.connect(self.__newProject) self.connect(self.project, SIGNAL('projectPropertiesChanged'), self.__projectPropertiesChanged) self.connect(self, SIGNAL("currentChanged(int)"), self.__currentChanged)
--- a/QScintilla/Editor.py Tue Aug 10 18:03:57 2010 +0200 +++ b/QScintilla/Editor.py Tue Aug 10 19:40:44 2010 +0200 @@ -78,6 +78,9 @@ @signal encodingChanged(encoding) emitted when the editors encoding was set. The encoding name is passed as a parameter. """ + cursorChanged = pyqtSignal(str, int, int) + breakpointToggled = pyqtSignal(QsciScintillaCompat) + # Autocompletion icon definitions ClassID = 1 ClassProtectedID = 2 @@ -1446,7 +1449,7 @@ @param line line number of the cursor @param index position in line of the cursor """ - self.emit(SIGNAL('cursorChanged'), self.fileName, line+1, index) + self.cursorChanged.emit(self.fileName, line + 1, index) if Preferences.getEditor("MarkOccurrencesEnabled"): self.__markOccurrencesTimer.stop() @@ -1721,7 +1724,7 @@ handle = self.markerAdd(line-1, marker) self.breaks[handle] = (line,) + properties - self.emit(SIGNAL('breakpointToggled'), self) + self.breakpointToggled.emit(self) def __toggleBreakpoint(self, line, temporary = False): """ @@ -1740,7 +1743,7 @@ self.__addBreakPoint(line, True) else: self.breakpointModel.deleteBreakPointByIndex(index) - self.emit(SIGNAL('breakpointToggled'), self) + self.breakpointToggled.emit(self) break else: self.__addBreakPoint(line, temporary) @@ -1756,7 +1759,7 @@ (self.isPyFile() or self.isPy3File() or self.isRubyFile()): self.breakpointModel.addBreakPoint(self.fileName, line, ('', temporary, True, 0)) - self.emit(SIGNAL('breakpointToggled'), self) + self.breakpointToggled.emit(self) def __toggleBreakpointEnabled(self, line): """
--- a/QScintilla/SearchReplaceWidget.py Tue Aug 10 18:03:57 2010 +0200 +++ b/QScintilla/SearchReplaceWidget.py Tue Aug 10 19:40:44 2010 +0200 @@ -13,6 +13,8 @@ from .Ui_SearchWidget import Ui_SearchWidget from .Ui_ReplaceWidget import Ui_ReplaceWidget +from .Editor import Editor + from E5Gui.E5Action import E5Action import Preferences @@ -419,6 +421,7 @@ aw = self.sender() self.updateSelectionCheckBox(aw) + @pyqtSlot(Editor) def updateSelectionCheckBox(self, editor): """ Public slot to update the selection check box.
--- a/UI/UserInterface.py Tue Aug 10 18:03:57 2010 +0200 +++ b/UI/UserInterface.py Tue Aug 10 19:40:44 2010 +0200 @@ -370,26 +370,18 @@ self.connect(self.projectBrowser.poBrowser, SIGNAL('svgFile'), self.__showSvg) - self.project.sourceFile.connect( - self.viewmanager.openSourceFile) - self.connect(self.project, SIGNAL('newProject'), - self.viewmanager.newProject) - self.connect(self.project, SIGNAL('projectOpened'), - self.viewmanager.projectOpened) - self.connect(self.project, SIGNAL('projectClosed'), - self.viewmanager.projectClosed) + self.project.sourceFile.connect(self.viewmanager.openSourceFile) + self.project.newProject.connect(self.viewmanager.newProject) + self.project.projectOpened.connect(self.viewmanager.projectOpened) + self.project.projectClosed.connect(self.viewmanager.projectClosed) self.connect(self.project, SIGNAL('projectFileRenamed'), self.viewmanager.projectFileRenamed) self.connect(self.project, SIGNAL('lexerAssociationsChanged'), self.viewmanager.projectLexerAssociationsChanged) - self.connect(self.project, SIGNAL('newProject'), - self.__newProject) - self.connect(self.project, SIGNAL('projectOpened'), - self.__projectOpened) - self.connect(self.project, SIGNAL('projectOpened'), - self.__activateProjectBrowser) - self.connect(self.project, SIGNAL('projectClosed'), - self.__projectClosed) + self.project.newProject.connect(self.__newProject) + self.project.projectOpened.connect(self.__projectOpened) + self.project.projectOpened.connect(self.__activateProjectBrowser) + self.project.projectClosed.connect(self.__projectClosed) self.connect(self.multiProject, SIGNAL("multiProjectOpened"), self.__activateMultiProjectBrowser) @@ -466,18 +458,14 @@ self.connect(self.viewmanager, SIGNAL('editorSaved'), self.project.repopulateItem) - self.connect(self.viewmanager, SIGNAL('lastEditorClosed'), - self.__lastEditorClosed) - self.connect(self.viewmanager, SIGNAL('editorOpened'), - self.__editorOpened) + self.viewmanager.lastEditorClosed.connect(self.__lastEditorClosed) + self.viewmanager.editorOpened.connect(self.__editorOpened) self.connect(self.viewmanager, SIGNAL('changeCaption'), self.__setWindowCaption) - self.connect(self.viewmanager, SIGNAL('checkActions'), - self.__checkActions) + self.viewmanager.checkActions.connect(self.__checkActions) self.connect(self.viewmanager, SIGNAL('editorChanged'), self.projectBrowser.handleEditorChanged) - self.connect(self.viewmanager, SIGNAL('checkActions'), - self.cooperation.checkEditorActions) + self.viewmanager.checkActions.connect(self.cooperation.checkEditorActions) self.connect(self.cooperation, SIGNAL('shareEditor(bool)'), self.viewmanager.shareEditor)
--- a/VCS/ProjectHelper.py Tue Aug 10 18:03:57 2010 +0200 +++ b/VCS/ProjectHelper.py Tue Aug 10 19:40:44 2010 +0200 @@ -194,7 +194,7 @@ if len(plist): if len(plist) == 1: self.project.openProject(plist[0].absoluteFilePath()) - self.project.emit(SIGNAL('newProject')) + self.project.newProject.emit() else: pfilenamelist = d.entryList(filters) pfilename, ok = QInputDialog.getItem( @@ -205,7 +205,7 @@ if ok: self.project.openProject(\ QFileInfo(d, pfilename).absoluteFilePath()) - self.project.emit(SIGNAL('newProject')) + self.project.newProject.emit() if export: self.project.pdata["VCS"] = ['None'] self.project.vcs = self.project.initVCS() @@ -469,4 +469,4 @@ """ info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() \ No newline at end of file + dlg.exec_()
--- a/ViewManager/ViewManager.py Tue Aug 10 18:03:57 2010 +0200 +++ b/ViewManager/ViewManager.py Tue Aug 10 19:40:44 2010 +0200 @@ -108,6 +108,12 @@ @signal breakpointToggled(editor) emitted when a breakpoint is toggled. @signal bookmarkToggled(editor) emitted when a bookmark is toggled. """ + editorOpened = pyqtSignal(str) + lastEditorClosed = pyqtSignal() + checkActions = pyqtSignal(Editor) + cursorChanged = pyqtSignal(Editor) + breakpointToggled = pyqtSignal(Editor) + def __init__(self): """ Constructor @@ -162,10 +168,8 @@ self.searchDlg = SearchReplaceWidget(False, self, ui) self.replaceDlg = SearchReplaceWidget(True, self, ui) - self.connect(self, SIGNAL("checkActions"), - self.searchDlg.updateSelectionCheckBox) - self.connect(self, SIGNAL("checkActions"), - self.replaceDlg.updateSelectionCheckBox) + self.checkActions.connect(self.searchDlg.updateSelectionCheckBox) + self.checkActions.connect(self.replaceDlg.updateSelectionCheckBox) def __loadRecent(self): """ @@ -3047,7 +3051,7 @@ # send a signal, if it was the very last editor if not len(self.editors): self.__lastEditorClosed() - self.emit(SIGNAL('lastEditorClosed')) + self.lastEditorClosed.emit() return True @@ -3154,9 +3158,9 @@ """ self.connect(editor, SIGNAL('modificationStatusChanged'), self._modificationStatusChanged) - self.connect(editor, SIGNAL('cursorChanged'), self.__cursorChanged) + editor.cursorChanged.connect(self.__cursorChanged) self.connect(editor, SIGNAL('editorSaved'), self.__editorSaved) - self.connect(editor, SIGNAL('breakpointToggled'), self.__breakpointToggled) + editor.breakpointToggled.connect(self.__breakpointToggled) self.connect(editor, SIGNAL('bookmarkToggled'), self.__bookmarkToggled) self.connect(editor, SIGNAL('syntaxerrorToggled'), self._syntaxErrorToggled) self.connect(editor, SIGNAL('coverageMarkersShown'), @@ -3202,7 +3206,7 @@ self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() - self.emit(SIGNAL('editorOpened'), fn) + self.editorOpened.emit(fn) self.emit(SIGNAL('editorOpenedEd'), editor) return editor @@ -3355,7 +3359,7 @@ self.editors.append(editor) self.__connectEditor(editor) self.__editorOpened() - self.emit(SIGNAL('editorOpened'), fn) + self.editorOpened.emit(fn) self.emit(SIGNAL('editorOpenedEd'), editor) newWin = True @@ -3554,7 +3558,7 @@ self._addView(editor, None) self.__editorOpened() self._checkActions(editor) - self.emit(SIGNAL('editorOpened'), "") + self.editorOpened.emit("") self.emit(SIGNAL('editorOpenedEd'), editor) def printEditor(self, editor): @@ -4722,7 +4726,7 @@ eol = editor.getEolIndicator() self.__setSbFile(editor.getFileName(), line + 1, pos, enc, lang, eol) - self.emit(SIGNAL('checkActions'), editor) + self.checkActions.emit(editor) def preferencesChanged(self): """ @@ -4789,7 +4793,7 @@ lang = None eol = None self.__setSbFile(fn, line, pos, enc, lang, eol) - self.emit(SIGNAL('cursorChanged'), editor) + self.cursorChanged.emit(editor) def __breakpointToggled(self, editor): """ @@ -4799,7 +4803,7 @@ @param editor editor that sent the signal """ - self.emit(SIGNAL('breakpointToggled'), editor) + self.breakpointToggled.emit(editor) def getActions(self, type): """
