Mercurial Repositories > eric / changeset
changeset
Started porting signal/slot usage to the new API.
Wed, 04 Aug 2010 08:54:52 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Wed, 04 Aug 2010 08:54:52 +0200
- changeset 453
- a81097a85889
- parent 452
- 0bc58cbb64b2
- child 454
- d28d558f7484
- child 455
- 9a7e0b7b801e
Started porting signal/slot usage to the new API.
--- a/Debugger/DebugUI.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Debugger/DebugUI.py Wed Aug 04 08:54:52 2010 +0200 @@ -165,7 +165,7 @@ """<p>Set the command line arguments and run the script outside the""" """ debugger. If the file has unsaved changes it may be saved first.</p>""" )) - self.connect(self.runAct, SIGNAL('triggered()'), self.__runScript) + self.runAct.triggered.connect(self.__runScript) self.actions.append(self.runAct) self.runProjectAct = E5Action(self.trUtf8('Run Project'), @@ -180,7 +180,7 @@ """ If files of the current project have unsaved changes they may""" """ be saved first.</p>""" )) - self.connect(self.runProjectAct, SIGNAL('triggered()'), self.__runProject) + self.runProjectAct.triggered.connect(self.__runProject) self.actions.append(self.runProjectAct) self.coverageAct = E5Action(self.trUtf8('Coverage run of Script'), @@ -194,7 +194,7 @@ """ of a coverage analysis tool. If the file has unsaved changes it may be""" """ saved first.</p>""" )) - self.connect(self.coverageAct, SIGNAL('triggered()'), self.__coverageScript) + self.coverageAct.triggered.connect(self.__coverageScript) self.actions.append(self.coverageAct) self.coverageProjectAct = E5Action(self.trUtf8('Coverage run of Project'), @@ -209,7 +209,7 @@ """ If files of the current project have unsaved changes they may""" """ be saved first.</p>""" )) - self.connect(self.coverageProjectAct, SIGNAL('triggered()'), self.__coverageProject) + self.coverageProjectAct.triggered.connect(self.__coverageProject) self.actions.append(self.coverageProjectAct) self.profileAct = E5Action(self.trUtf8('Profile Script'), @@ -221,7 +221,7 @@ """<p>Set the command line arguments and profile the script.""" """ If the file has unsaved changes it may be saved first.</p>""" )) - self.connect(self.profileAct, SIGNAL('triggered()'), self.__profileScript) + self.profileAct.triggered.connect(self.__profileScript) self.actions.append(self.profileAct) self.profileProjectAct = E5Action(self.trUtf8('Profile Project'), @@ -234,7 +234,7 @@ """ If files of the current project have unsaved changes they may""" """ be saved first.</p>""" )) - self.connect(self.profileProjectAct, SIGNAL('triggered()'), self.__profileProject) + self.profileProjectAct.triggered.connect(self.__profileProject) self.actions.append(self.profileProjectAct) self.debugAct = E5Action(self.trUtf8('Debug Script'), @@ -247,7 +247,7 @@ """ first executable Python statement of the current editor window.""" """ If the file has unsaved changes it may be saved first.</p>""" )) - self.connect(self.debugAct, SIGNAL('triggered()'), self.__debugScript) + self.debugAct.triggered.connect(self.__debugScript) self.actions.append(self.debugAct) self.debugProjectAct = E5Action(self.trUtf8('Debug Project'), @@ -262,7 +262,7 @@ """ project. If files of the current project have unsaved changes they may""" """ be saved first.</p>""" )) - self.connect(self.debugProjectAct, SIGNAL('triggered()'), self.__debugProject) + self.debugProjectAct.triggered.connect(self.__debugProject) self.actions.append(self.debugProjectAct) self.restartAct = E5Action(self.trUtf8('Restart Script'), @@ -275,7 +275,7 @@ """ first executable Python statement of the script that was debugged last.""" """ If there are unsaved changes, they may be saved first.</p>""" )) - self.connect(self.restartAct, SIGNAL('triggered()'), self.__doRestart) + self.restartAct.triggered.connect(self.__doRestart) self.actions.append(self.restartAct) self.stopAct = E5Action(self.trUtf8('Stop Script'), @@ -287,7 +287,7 @@ """<b>Stop Script</b>""" """<p>This stops the script running in the debugger backend.</p>""" )) - self.connect(self.stopAct, SIGNAL('triggered()'), self.__stopScript) + self.stopAct.triggered.connect(self.__stopScript) self.actions.append(self.stopAct) self.debugActGrp = createActionGroup(self) @@ -303,7 +303,7 @@ """<p>Continue running the program from the current line. The program will""" """ stop when it terminates or when a breakpoint is reached.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__continue) + act.triggered.connect(self.__continue) self.actions.append(act) act = E5Action(self.trUtf8('Continue to Cursor'), @@ -317,7 +317,7 @@ """<p>Continue running the program from the current line to the""" """ current cursor position.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__runToCursor) + act.triggered.connect(self.__runToCursor) self.actions.append(act) act = E5Action(self.trUtf8('Single Step'), @@ -332,7 +332,7 @@ """ method or function call then control is returned to the debugger at""" """ the next statement.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__step) + act.triggered.connect(self.__step) self.actions.append(act) act = E5Action(self.trUtf8('Step Over'), @@ -348,7 +348,7 @@ """ or a method or function call then control is returned to the debugger""" """ after the statement has completed.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__stepOver) + act.triggered.connect(self.__stepOver) self.actions.append(act) act = E5Action(self.trUtf8('Step Out'), @@ -364,7 +364,7 @@ """ constructor, or a method or function call then control is returned""" """ to the debugger after the current frame has been left.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__stepOut) + act.triggered.connect(self.__stepOut) self.actions.append(act) act = E5Action(self.trUtf8('Stop'), @@ -376,7 +376,7 @@ """<b>Stop</b>""" """<p>Stop the running debugging session.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__stepQuit) + act.triggered.connect(self.__stepQuit) self.actions.append(act) self.debugActGrp2 = createActionGroup(self) @@ -391,7 +391,7 @@ """ debugged program. The result is displayed in the""" """ shell window.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__eval) + act.triggered.connect(self.__eval) self.actions.append(act) act = E5Action(self.trUtf8('Execute'), @@ -404,7 +404,7 @@ """<p>Execute a one line statement in the current context""" """ of the debugged program.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__exec) + act.triggered.connect(self.__exec) self.actions.append(act) self.dbgFilterAct = E5Action(self.trUtf8('Variables Type Filter'), @@ -417,8 +417,7 @@ """ selected are displayed in the global or local variables window""" """ during a debugging session.</p>""" )) - self.connect(self.dbgFilterAct, SIGNAL('triggered()'), - self.__configureVariablesFilters) + self.dbgFilterAct.triggered.connect(self.__configureVariablesFilters) self.actions.append(self.dbgFilterAct) self.excFilterAct = E5Action(self.trUtf8('Exceptions Filter'), @@ -431,8 +430,7 @@ """<p>Please note, that all unhandled exceptions are highlighted""" """ indepent from the filter list.</p>""" )) - self.connect(self.excFilterAct, SIGNAL('triggered()'), - self.__configureExceptionsFilter) + self.excFilterAct.triggered.connect(self.__configureExceptionsFilter) self.actions.append(self.excFilterAct) self.excIgnoreFilterAct = E5Action(self.trUtf8('Ignored Exceptions'), @@ -445,8 +443,7 @@ """ not listed are highlighted during a debugging session.</p>""" """<p>Please note, that unhandled exceptions cannot be ignored.</p>""" )) - self.connect(self.excIgnoreFilterAct, SIGNAL('triggered()'), - self.__configureIgnoredExceptions) + self.excIgnoreFilterAct.triggered.connect(self.__configureIgnoredExceptions) self.actions.append(self.excIgnoreFilterAct) self.dbgSetBpActGrp = createActionGroup(self) @@ -462,7 +459,7 @@ """<p>Toggles a breakpoint at the current line of the""" """ current editor.</p>""" )) - self.connect(self.dbgToggleBpAct, SIGNAL('triggered()'), self.__toggleBreakpoint) + self.dbgToggleBpAct.triggered.connect(self.__toggleBreakpoint) self.actions.append(self.dbgToggleBpAct) self.dbgEditBpAct = E5Action(self.trUtf8('Edit Breakpoint'), @@ -476,7 +473,7 @@ """<p>Opens a dialog to edit the breakpoints properties.""" """ It works at the current line of the current editor.</p>""" )) - self.connect(self.dbgEditBpAct, SIGNAL('triggered()'), self.__editBreakpoint) + self.dbgEditBpAct.triggered.connect(self.__editBreakpoint) self.actions.append(self.dbgEditBpAct) self.dbgNextBpAct = E5Action(self.trUtf8('Next Breakpoint'), @@ -489,7 +486,7 @@ """<b>Next Breakpoint</b>""" """<p>Go to next breakpoint of the current editor.</p>""" )) - self.connect(self.dbgNextBpAct, SIGNAL('triggered()'), self.__nextBreakpoint) + self.dbgNextBpAct.triggered.connect(self.__nextBreakpoint) self.actions.append(self.dbgNextBpAct) self.dbgPrevBpAct = E5Action(self.trUtf8('Previous Breakpoint'), @@ -502,7 +499,7 @@ """<b>Previous Breakpoint</b>""" """<p>Go to previous breakpoint of the current editor.</p>""" )) - self.connect(self.dbgPrevBpAct, SIGNAL('triggered()'), self.__previousBreakpoint) + self.dbgPrevBpAct.triggered.connect(self.__previousBreakpoint) self.actions.append(self.dbgPrevBpAct) act = E5Action(self.trUtf8('Clear Breakpoints'), @@ -514,7 +511,7 @@ """<b>Clear Breakpoints</b>""" """<p>Clear breakpoints of all editors.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__clearBreakpoints) + act.triggered.connect(self.__clearBreakpoints) self.actions.append(act) self.debugActGrp.setEnabled(False) @@ -1991,4 +1988,4 @@ @return list of all actions (list of E5Action) """ - return self.actions[:] + return self.actions[:] \ No newline at end of file
--- a/Graphics/PixmapDiagram.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Graphics/PixmapDiagram.py Wed Aug 04 08:54:52 2010 +0200 @@ -66,38 +66,37 @@ self.closeAct = \ QAction(UI.PixmapCache.getIcon("close.png"), self.trUtf8("Close"), self) - self.connect(self.closeAct, SIGNAL("triggered()"), self.close) + self.closeAct.triggered.connect(self.close) self.printAct = \ QAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8("Print"), self) - self.connect(self.printAct, SIGNAL("triggered()"), self.__printDiagram) + self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = \ QAction(UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8("Print Preview"), self) - self.connect(self.printPreviewAct, SIGNAL("triggered()"), - self.__printPreviewDiagram) + self.printPreviewAct.triggered.connect(self.__printPreviewDiagram) self.zoomInAct = \ QAction(UI.PixmapCache.getIcon("zoomIn.png"), self.trUtf8("Zoom in"), self) - self.connect(self.zoomInAct, SIGNAL("triggered()"), self.__zoomIn) + self.zoomInAct.triggered.connect(self.__zoomIn) self.zoomOutAct = \ QAction(UI.PixmapCache.getIcon("zoomOut.png"), self.trUtf8("Zoom out"), self) - self.connect(self.zoomOutAct, SIGNAL("triggered()"), self.__zoomOut) + self.zoomOutAct.triggered.connect(self.__zoomOut) self.zoomAct = \ QAction(UI.PixmapCache.getIcon("zoomTo.png"), self.trUtf8("Zoom..."), self) - self.connect(self.zoomAct, SIGNAL("triggered()"), self.__zoom) + self.zoomAct.triggered.connect(self.__zoom) self.zoomResetAct = \ QAction(UI.PixmapCache.getIcon("zoomReset.png"), self.trUtf8("Zoom reset"), self) - self.connect(self.zoomResetAct, SIGNAL("triggered()"), self.__zoomReset) + self.zoomResetAct.triggered.connect(self.__zoomReset) def __initContextMenu(self): """ @@ -325,4 +324,4 @@ painter.setViewport(marginX + 5, marginY + 5, size.width(), size.height()) painter.setWindow(self.pixmapLabel.pixmap().rect()) painter.drawPixmap(0, 0, self.pixmapLabel.pixmap()) - painter.end() + painter.end() \ No newline at end of file
--- a/Graphics/SvgDiagram.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Graphics/SvgDiagram.py Wed Aug 04 08:54:52 2010 +0200 @@ -67,38 +67,37 @@ self.closeAct = \ QAction(UI.PixmapCache.getIcon("close.png"), self.trUtf8("Close"), self) - self.connect(self.closeAct, SIGNAL("triggered()"), self.close) + self.closeAct.triggered.connect(self.close) self.printAct = \ QAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8("Print"), self) - self.connect(self.printAct, SIGNAL("triggered()"), self.__printDiagram) + self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = \ QAction(UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8("Print Preview"), self) - self.connect(self.printPreviewAct, SIGNAL("triggered()"), - self.__printPreviewDiagram) + self.printPreviewAct.triggered.connect(self.__printPreviewDiagram) self.zoomInAct = \ QAction(UI.PixmapCache.getIcon("zoomIn.png"), self.trUtf8("Zoom in"), self) - self.connect(self.zoomInAct, SIGNAL("triggered()"), self.__zoomIn) + self.zoomInAct.triggered.connect(self.__zoomIn) self.zoomOutAct = \ QAction(UI.PixmapCache.getIcon("zoomOut.png"), self.trUtf8("Zoom out"), self) - self.connect(self.zoomOutAct, SIGNAL("triggered()"), self.__zoomOut) + self.zoomOutAct.triggered.connect(self.__zoomOut) self.zoomAct = \ QAction(UI.PixmapCache.getIcon("zoomTo.png"), self.trUtf8("Zoom..."), self) - self.connect(self.zoomAct, SIGNAL("triggered()"), self.__zoom) + self.zoomAct.triggered.connect(self.__zoom) self.zoomResetAct = \ QAction(UI.PixmapCache.getIcon("zoomReset.png"), self.trUtf8("Zoom reset"), self) - self.connect(self.zoomResetAct, SIGNAL("triggered()"), self.__zoomReset) + self.zoomResetAct.triggered.connect(self.__zoomReset) def __initContextMenu(self): """ @@ -295,4 +294,4 @@ # render the diagram painter.setViewport(marginX, marginY, width, height) self.svgWidget.renderer().render(painter) - painter.end() + painter.end() \ No newline at end of file
--- a/Graphics/UMLDialog.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Graphics/UMLDialog.py Wed Aug 04 08:54:52 2010 +0200 @@ -39,7 +39,7 @@ self.closeAct = \ QAction(UI.PixmapCache.getIcon("close.png"), self.trUtf8("Close"), self) - self.connect(self.closeAct, SIGNAL("triggered()"), self.close) + self.closeAct.triggered.connect(self.close) self.windowToolBar = QToolBar(self.trUtf8("Window"), self) self.windowToolBar.setIconSize(UI.Config.ToolBarIconSize) @@ -50,4 +50,4 @@ self.addToolBar(Qt.TopToolBarArea, self.windowToolBar) self.addToolBar(Qt.TopToolBarArea, self.umlToolBar) - self.setCentralWidget(self.umlView) + self.setCentralWidget(self.umlView) \ No newline at end of file
--- a/Graphics/UMLGraphicsView.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Graphics/UMLGraphicsView.py Wed Aug 04 08:54:52 2010 +0200 @@ -57,77 +57,76 @@ self.deleteShapeAct = \ QAction(UI.PixmapCache.getIcon("deleteShape.png"), self.trUtf8("Delete shapes"), self) - self.connect(self.deleteShapeAct, SIGNAL("triggered()"), self.__deleteShape) + self.deleteShapeAct.triggered.connect(self.__deleteShape) self.saveAct = \ QAction(UI.PixmapCache.getIcon("fileSave.png"), self.trUtf8("Save as PNG"), self) - self.connect(self.saveAct, SIGNAL("triggered()"), self.__saveImage) + self.saveAct.triggered.connect(self.__saveImage) self.printAct = \ QAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8("Print"), self) - self.connect(self.printAct, SIGNAL("triggered()"), self.__printDiagram) + self.printAct.triggered.connect(self.__printDiagram) self.printPreviewAct = \ QAction(UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8("Print Preview"), self) - self.connect(self.printPreviewAct, SIGNAL("triggered()"), - self.__printPreviewDiagram) + self.printPreviewAct.triggered.connect(self.__printPreviewDiagram) self.zoomInAct = \ QAction(UI.PixmapCache.getIcon("zoomIn.png"), self.trUtf8("Zoom in"), self) - self.connect(self.zoomInAct, SIGNAL("triggered()"), self.zoomIn) + self.zoomInAct.triggered.connect(self.zoomIn) self.zoomOutAct = \ QAction(UI.PixmapCache.getIcon("zoomOut.png"), self.trUtf8("Zoom out"), self) - self.connect(self.zoomOutAct, SIGNAL("triggered()"), self.zoomOut) + self.zoomOutAct.triggered.connect(self.zoomOut) self.zoomAct = \ QAction(UI.PixmapCache.getIcon("zoomTo.png"), self.trUtf8("Zoom..."), self) - self.connect(self.zoomAct, SIGNAL("triggered()"), self.__zoom) + self.zoomAct.triggered.connect(self.__zoom) self.zoomResetAct = \ QAction(UI.PixmapCache.getIcon("zoomReset.png"), self.trUtf8("Zoom reset"), self) - self.connect(self.zoomResetAct, SIGNAL("triggered()"), self.zoomReset) + self.zoomResetAct.triggered.connect(self.zoomReset) self.incWidthAct = \ QAction(UI.PixmapCache.getIcon("sceneWidthInc.png"), self.trUtf8("Increase width by {0} points").format(self.deltaSize), self) - self.connect(self.incWidthAct, SIGNAL("triggered()"), self.__incWidth) + self.incWidthAct.triggered.connect(self.__incWidth) self.incHeightAct = \ QAction(UI.PixmapCache.getIcon("sceneHeightInc.png"), self.trUtf8("Increase height by {0} points").format(self.deltaSize), self) - self.connect(self.incHeightAct, SIGNAL("triggered()"), self.__incHeight) + self.incHeightAct.triggered.connect(self.__incHeight) self.decWidthAct = \ QAction(UI.PixmapCache.getIcon("sceneWidthDec.png"), self.trUtf8("Decrease width by {0} points").format(self.deltaSize), self) - self.connect(self.decWidthAct, SIGNAL("triggered()"), self.__decWidth) + self.decWidthAct.triggered.connect(self.__decWidth) self.decHeightAct = \ QAction(UI.PixmapCache.getIcon("sceneHeightDec.png"), self.trUtf8("Decrease height by {0} points").format(self.deltaSize), self) - self.connect(self.decHeightAct, SIGNAL("triggered()"), self.__decHeight) + self.decHeightAct.triggered.connect(self.__decHeight) self.setSizeAct = \ QAction(UI.PixmapCache.getIcon("sceneSize.png"), self.trUtf8("Set size"), self) - self.connect(self.setSizeAct, SIGNAL("triggered()"), self.__setSize) + self.setSizeAct.triggered.connect(self.__setSize) self.relayoutAct = \ QAction(UI.PixmapCache.getIcon("reload.png"), self.trUtf8("Re-Layout"), self) - self.connect(self.relayoutAct, SIGNAL("triggered()"), self.__relayout) + self.relayoutAct.triggered.connect(self.__relayout) self.alignLeftAct = \ QAction(UI.PixmapCache.getIcon("shapesAlignLeft"), @@ -483,4 +482,4 @@ (itemrect.y() + itemrect.height() // 2) item.moveBy(xOffset, yOffset) - self.scene().update() + self.scene().update() \ No newline at end of file
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Wed Aug 04 08:54:52 2010 +0200 @@ -93,7 +93,7 @@ self.addSeparator() act = self.addAction(self.trUtf8("Open all in Tabs")) - self.connect(act, SIGNAL("triggered()"), self.__openAll) + act.triggered.connect(self.__openAll) def __openAll(self): """
--- a/Helpviewer/HelpWebSearchWidget.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Helpviewer/HelpWebSearchWidget.py Wed Aug 04 08:54:52 2010 +0200 @@ -240,7 +240,7 @@ engine = self.__openSearchManager.engine(engineName) action = OpenSearchEngineAction(engine, self.__enginesMenu) action.setData(engineName) - self.connect(action, SIGNAL("triggered()"), self.__changeCurrentEngine) + action.triggered.connect(self.__changeCurrentEngine) self.__enginesMenu.addAction(action) if self.__openSearchManager.currentEngineName() == engineName: @@ -386,4 +386,4 @@ Private slot to handle a change of the current search engine icon. """ self.__engineButton.setIcon( - QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) + QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image()))) \ No newline at end of file
--- a/Helpviewer/HelpWindow.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Helpviewer/HelpWindow.py Wed Aug 04 08:54:52 2010 +0200 @@ -373,7 +373,7 @@ """<b>New Tab</b>""" """<p>This opens a new help window tab.</p>""" )) - self.connect(self.newTabAct, SIGNAL('triggered()'), self.newTab) + self.newTabAct.triggered.connect(self.newTab) self.__actions.append(self.newTabAct) self.newAct = E5Action(self.trUtf8('New Window'), @@ -386,7 +386,7 @@ """<b>New Window</b>""" """<p>This opens a new help browser window.</p>""" )) - self.connect(self.newAct, SIGNAL('triggered()'), self.newWindow) + self.newAct.triggered.connect(self.newWindow) self.__actions.append(self.newAct) self.openAct = E5Action(self.trUtf8('Open File'), @@ -400,7 +400,7 @@ """<p>This opens a new help file for display.""" """ It pops up a file selection dialog.</p>""" )) - self.connect(self.openAct, SIGNAL('triggered()'), self.__openFile) + self.openAct.triggered.connect(self.__openFile) self.__actions.append(self.openAct) self.openTabAct = E5Action(self.trUtf8('Open File in New Tab'), @@ -415,7 +415,7 @@ """<p>This opens a new help file for display in a new tab.""" """ It pops up a file selection dialog.</p>""" )) - self.connect(self.openTabAct, SIGNAL('triggered()'), self.__openFileNewTab) + self.openTabAct.triggered.connect(self.__openFileNewTab) self.__actions.append(self.openTabAct) self.saveAsAct = E5Action(self.trUtf8('Save As '), @@ -429,7 +429,7 @@ """<b>Save As...</b>""" """<p>Saves the current page to disk.</p>""" )) - self.connect(self.saveAsAct, SIGNAL('triggered()'), self.__savePageAs) + self.saveAsAct.triggered.connect(self.__savePageAs) self.__actions.append(self.saveAsAct) bookmarksManager = self.bookmarksManager() @@ -442,8 +442,7 @@ """<b>Import Bookmarks</b>""" """<p>Import bookmarks from other browsers.</p>""" )) - self.connect(self.importBookmarksAct, SIGNAL('triggered()'), - bookmarksManager.importBookmarks) + self.importBookmarksAct.triggered.connect(bookmarksManager.importBookmarks) self.__actions.append(self.importBookmarksAct) self.exportBookmarksAct = E5Action(self.trUtf8('Export Bookmarks'), @@ -455,8 +454,7 @@ """<b>Export Bookmarks</b>""" """<p>Export the bookmarks into a file.</p>""" )) - self.connect(self.exportBookmarksAct, SIGNAL('triggered()'), - bookmarksManager.exportBookmarks) + self.exportBookmarksAct.triggered.connect(bookmarksManager.exportBookmarks) self.__actions.append(self.exportBookmarksAct) self.printAct = E5Action(self.trUtf8('Print'), @@ -469,7 +467,7 @@ """<b>Print</b>""" """<p>Print the displayed help text.</p>""" )) - self.connect(self.printAct, SIGNAL('triggered()'), self.__printFile) + self.printAct.triggered.connect(self.__printFile) self.__actions.append(self.printAct) self.printPdfAct = E5Action(self.trUtf8('Print as PDF'), @@ -481,7 +479,7 @@ """<b>Print as PDF</b>""" """<p>Print the displayed help text as a PDF file.</p>""" )) - self.connect(self.printPdfAct, SIGNAL('triggered()'), self.__printFilePdf) + self.printPdfAct.triggered.connect(self.__printFilePdf) self.__actions.append(self.printPdfAct) self.printPreviewAct = E5Action(self.trUtf8('Print Preview'), @@ -494,8 +492,7 @@ """<b>Print Preview</b>""" """<p>Print preview of the displayed help text.</p>""" )) - self.connect(self.printPreviewAct, SIGNAL('triggered()'), - self.__printPreviewFile) + self.printPreviewAct.triggered.connect(self.__printPreviewFile) self.__actions.append(self.printPreviewAct) self.closeAct = E5Action(self.trUtf8('Close'), @@ -508,7 +505,7 @@ """<b>Close</b>""" """<p>Closes the current help window.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.__close) + self.closeAct.triggered.connect(self.__close) self.__actions.append(self.closeAct) self.closeAllAct = E5Action(self.trUtf8('Close All'), @@ -519,7 +516,7 @@ """<b>Close All</b>""" """<p>Closes all help windows except the first one.</p>""" )) - self.connect(self.closeAllAct, SIGNAL('triggered()'), self.__closeAll) + self.closeAllAct.triggered.connect(self.__closeAll) self.__actions.append(self.closeAllAct) self.privateBrowsingAct = E5Action(self.trUtf8('Private Browsing'), @@ -532,8 +529,7 @@ """<p>Enables private browsing. In this mode no history is""" """ recorded anymore.</p>""" )) - self.connect(self.privateBrowsingAct, SIGNAL('triggered()'), - self.__privateBrowsing) + self.privateBrowsingAct.triggered.connect(self.__privateBrowsing) self.privateBrowsingAct.setCheckable(True) self.__actions.append(self.privateBrowsingAct) @@ -548,7 +544,7 @@ """<p>Quit the web browser.</p>""" )) if self.fromEric: - self.connect(self.exitAct, SIGNAL('triggered()'), self, SLOT('close()')) + self.exitAct.triggered.connect(self, SLOT('close()')) else: self.connect(self.exitAct, SIGNAL('triggered()'), qApp, SLOT('closeAllWindows()')) @@ -566,7 +562,7 @@ """<p>Moves one help screen backward. If none is""" """ available, this action is disabled.</p>""" )) - self.connect(self.backAct, SIGNAL('triggered()'), self.__backward) + self.backAct.triggered.connect(self.__backward) self.__actions.append(self.backAct) self.forwardAct = E5Action(self.trUtf8('Forward'), @@ -581,7 +577,7 @@ """<p>Moves one help screen forward. If none is""" """ available, this action is disabled.</p>""" )) - self.connect(self.forwardAct, SIGNAL('triggered()'), self.__forward) + self.forwardAct.triggered.connect(self.__forward) self.__actions.append(self.forwardAct) self.homeAct = E5Action(self.trUtf8('Home'), @@ -594,7 +590,7 @@ """<b>Home</b>""" """<p>Moves to the initial help screen.</p>""" )) - self.connect(self.homeAct, SIGNAL('triggered()'), self.__home) + self.homeAct.triggered.connect(self.__home) self.__actions.append(self.homeAct) self.reloadAct = E5Action(self.trUtf8('Reload'), @@ -608,7 +604,7 @@ """<b>Reload</b>""" """<p>Reloads the current help screen.</p>""" )) - self.connect(self.reloadAct, SIGNAL('triggered()'), self.__reload) + self.reloadAct.triggered.connect(self.__reload) self.__actions.append(self.reloadAct) self.stopAct = E5Action(self.trUtf8('Stop'), @@ -622,7 +618,7 @@ """<b>Stop</b>""" """<p>Stops loading of the current tab.</p>""" )) - self.connect(self.stopAct, SIGNAL('triggered()'), self.__stopLoading) + self.stopAct.triggered.connect(self.__stopLoading) self.__actions.append(self.stopAct) self.copyAct = E5Action(self.trUtf8('Copy'), @@ -635,7 +631,7 @@ """<b>Copy</b>""" """<p>Copy the selected text to the clipboard.</p>""" )) - self.connect(self.copyAct, SIGNAL('triggered()'), self.__copy) + self.copyAct.triggered.connect(self.__copy) self.__actions.append(self.copyAct) self.findAct = E5Action(self.trUtf8('Find...'), @@ -648,7 +644,7 @@ """<b>Find</b>""" """<p>Find text in the current page.</p>""" )) - self.connect(self.findAct, SIGNAL('triggered()'), self.__find) + self.findAct.triggered.connect(self.__find) self.__actions.append(self.findAct) self.findNextAct = E5Action(self.trUtf8('Find next'), @@ -662,7 +658,7 @@ """<p>Find the next occurrence of text in the current page.</p>""" )) if not self.initShortcutsOnly: - self.connect(self.findNextAct, SIGNAL('triggered()'), self.findDlg.findNext) + self.findNextAct.triggered.connect(self.findDlg.findNext) self.__actions.append(self.findNextAct) self.findPrevAct = E5Action(self.trUtf8('Find previous'), @@ -677,8 +673,7 @@ """<p>Find the previous occurrence of text in the current page.</p>""" )) if not self.initShortcutsOnly: - self.connect(self.findPrevAct, SIGNAL('triggered()'), - self.findDlg.findPrevious) + self.findPrevAct.triggered.connect(self.findDlg.findPrevious) self.__actions.append(self.findPrevAct) self.bookmarksManageAct = E5Action(self.trUtf8('Manage Bookmarks'), @@ -691,8 +686,7 @@ """<b>Manage Bookmarks...</b>""" """<p>Open a dialog to manage the bookmarks.</p>""" )) - self.connect(self.bookmarksManageAct, SIGNAL('triggered()'), - self.__showBookmarksDialog) + self.bookmarksManageAct.triggered.connect(self.__showBookmarksDialog) self.__actions.append(self.bookmarksManageAct) self.bookmarksAddAct = E5Action(self.trUtf8('Add Bookmark'), @@ -706,7 +700,7 @@ """<b>Add Bookmark</b>""" """<p>Open a dialog to add the current URL as a bookmark.</p>""" )) - self.connect(self.bookmarksAddAct, SIGNAL('triggered()'), self.__addBookmark) + self.bookmarksAddAct.triggered.connect(self.__addBookmark) self.__actions.append(self.bookmarksAddAct) self.bookmarksAddFolderAct = E5Action(self.trUtf8('Add Folder'), @@ -718,8 +712,7 @@ """<b>Add Folder...</b>""" """<p>Open a dialog to add a new bookmarks folder.</p>""" )) - self.connect(self.bookmarksAddFolderAct, SIGNAL('triggered()'), - self.__addBookmarkFolder) + self.bookmarksAddFolderAct.triggered.connect(self.__addBookmarkFolder) self.__actions.append(self.bookmarksAddFolderAct) self.bookmarksAllTabsAct = E5Action(self.trUtf8('Bookmark All Tabs'), @@ -732,8 +725,7 @@ """<p>Open a dialog to add a new bookmarks folder for""" """ all open tabs.</p>""" )) - self.connect(self.bookmarksAllTabsAct, SIGNAL('triggered()'), - self.__bookmarkAll) + self.bookmarksAllTabsAct.triggered.connect(self.__bookmarkAll) self.__actions.append(self.bookmarksAllTabsAct) self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), @@ -750,7 +742,7 @@ """ dialogs, this feature can be accessed using the context help button""" """ in the titlebar.</p>""" )) - self.connect(self.whatsThisAct, SIGNAL('triggered()'), self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.__actions.append(self.whatsThisAct) self.aboutAct = E5Action(self.trUtf8('About'), @@ -761,7 +753,7 @@ """<b>About</b>""" """<p>Display some information about this software.</p>""" )) - self.connect(self.aboutAct, SIGNAL('triggered()'), self.__about) + self.aboutAct.triggered.connect(self.__about) self.__actions.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), @@ -773,7 +765,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct, SIGNAL('triggered()'), self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) self.zoomInAct = E5Action(self.trUtf8('Zoom in'), @@ -786,7 +778,7 @@ """<b>Zoom in</b>""" """<p>Zoom in on the text. This makes the text bigger.</p>""" )) - self.connect(self.zoomInAct, SIGNAL('triggered()'), self.__zoomIn) + self.zoomInAct.triggered.connect(self.__zoomIn) self.__actions.append(self.zoomInAct) self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), @@ -799,7 +791,7 @@ """<b>Zoom out</b>""" """<p>Zoom out on the text. This makes the text smaller.</p>""" )) - self.connect(self.zoomOutAct, SIGNAL('triggered()'), self.__zoomOut) + self.zoomOutAct.triggered.connect(self.__zoomOut) self.__actions.append(self.zoomOutAct) self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), @@ -813,7 +805,7 @@ """<p>Reset the zoom of the text. """ """This sets the zoom factor to 100%.</p>""" )) - self.connect(self.zoomResetAct, SIGNAL('triggered()'), self.__zoomReset) + self.zoomResetAct.triggered.connect(self.__zoomReset) self.__actions.append(self.zoomResetAct) if hasattr(QWebSettings, 'ZoomTextOnly'): @@ -842,7 +834,7 @@ """<b>Show page source</b>""" """<p>Show the page source in an editor.</p>""" )) - self.connect(self.pageSourceAct, SIGNAL('triggered()'), self.__showPageSource) + self.pageSourceAct.triggered.connect(self.__showPageSource) self.__actions.append(self.pageSourceAct) self.addAction(self.pageSourceAct) @@ -851,7 +843,7 @@ self.trUtf8('&Full Screen'), QKeySequence(self.trUtf8('F11')), 0, self, 'help_view_full_scree') - self.connect(self.fullScreenAct, SIGNAL('triggered()'), self.__viewFullScreen) + self.fullScreenAct.triggered.connect(self.__viewFullScreen) self.__actions.append(self.fullScreenAct) self.addAction(self.fullScreenAct) @@ -859,7 +851,7 @@ self.trUtf8('Show next tab'), QKeySequence(self.trUtf8('Ctrl+Alt+Tab')), 0, self, 'help_view_next_tab') - self.connect(self.nextTabAct, SIGNAL('triggered()'), self.__nextTab) + self.nextTabAct.triggered.connect(self.__nextTab) self.__actions.append(self.nextTabAct) self.addAction(self.nextTabAct) @@ -867,7 +859,7 @@ self.trUtf8('Show previous tab'), QKeySequence(self.trUtf8('Shift+Ctrl+Alt+Tab')), 0, self, 'help_view_previous_tab') - self.connect(self.prevTabAct, SIGNAL('triggered()'), self.__prevTab) + self.prevTabAct.triggered.connect(self.__prevTab) self.__actions.append(self.prevTabAct) self.addAction(self.prevTabAct) @@ -875,7 +867,7 @@ self.trUtf8('Switch between tabs'), QKeySequence(self.trUtf8('Ctrl+1')), 0, self, 'help_switch_tabs') - self.connect(self.switchTabAct, SIGNAL('triggered()'), self.__switchTab) + self.switchTabAct.triggered.connect(self.__switchTab) self.__actions.append(self.switchTabAct) self.addAction(self.switchTabAct) @@ -888,7 +880,7 @@ """<p>Set the configuration items of the application""" """ with your prefered values.</p>""" )) - self.connect(self.prefAct, SIGNAL('triggered()'), self.__showPreferences) + self.prefAct.triggered.connect(self.__showPreferences) self.__actions.append(self.prefAct) self.acceptedLanguagesAct = E5Action(self.trUtf8('Languages'), @@ -900,8 +892,7 @@ """<b>Languages</b>""" """<p>Configure the accepted languages for web pages.</p>""" )) - self.connect(self.acceptedLanguagesAct, SIGNAL('triggered()'), - self.__showAcceptedLanguages) + self.acceptedLanguagesAct.triggered.connect(self.__showAcceptedLanguages) self.__actions.append(self.acceptedLanguagesAct) self.cookiesAct = E5Action(self.trUtf8('Cookies'), @@ -913,8 +904,7 @@ """<b>Cookies</b>""" """<p>Configure cookies handling.</p>""" )) - self.connect(self.cookiesAct, SIGNAL('triggered()'), - self.__showCookiesConfiguration) + self.cookiesAct.triggered.connect(self.__showCookiesConfiguration) self.__actions.append(self.cookiesAct) self.offlineStorageAct = E5Action(self.trUtf8('Offline Storage'), @@ -926,8 +916,7 @@ """<b>Offline Storage</b>""" """<p>Opens a dialog to configure offline storage.</p>""" )) - self.connect(self.offlineStorageAct, SIGNAL('triggered()'), - self.__showOfflineStorageConfiguration) + self.offlineStorageAct.triggered.connect(self.__showOfflineStorageConfiguration) self.__actions.append(self.offlineStorageAct) self.syncTocAct = E5Action(self.trUtf8('Sync with Table of Contents'), @@ -940,7 +929,7 @@ """<b>Sync with Table of Contents</b>""" """<p>Synchronizes the table of contents with current page.</p>""" )) - self.connect(self.syncTocAct, SIGNAL('triggered()'), self.__syncTOC) + self.syncTocAct.triggered.connect(self.__syncTOC) self.__actions.append(self.syncTocAct) self.showTocAct = E5Action(self.trUtf8('Table of Contents'), @@ -952,7 +941,7 @@ """<b>Table of Contents</b>""" """<p>Shows the table of contents window.</p>""" )) - self.connect(self.showTocAct, SIGNAL('triggered()'), self.__showTocWindow) + self.showTocAct.triggered.connect(self.__showTocWindow) self.__actions.append(self.showTocAct) self.showIndexAct = E5Action(self.trUtf8('Index'), @@ -964,7 +953,7 @@ """<b>Index</b>""" """<p>Shows the index window.</p>""" )) - self.connect(self.showIndexAct, SIGNAL('triggered()'), self.__showIndexWindow) + self.showIndexAct.triggered.connect(self.__showIndexWindow) self.__actions.append(self.showIndexAct) self.showSearchAct = E5Action(self.trUtf8('Search'), @@ -976,7 +965,7 @@ """<b>Search</b>""" """<p>Shows the search window.</p>""" )) - self.connect(self.showSearchAct, SIGNAL('triggered()'), self.__showSearchWindow) + self.showSearchAct.triggered.connect(self.__showSearchWindow) self.__actions.append(self.showSearchAct) self.manageQtHelpDocsAct = E5Action(self.trUtf8('Manage QtHelp Documents'), @@ -988,8 +977,7 @@ """<b>Manage QtHelp Documents</b>""" """<p>Shows a dialog to manage the QtHelp documentation set.</p>""" )) - self.connect(self.manageQtHelpDocsAct, SIGNAL('triggered()'), - self.__manageQtHelpDocumentation) + self.manageQtHelpDocsAct.triggered.connect(self.__manageQtHelpDocumentation) self.__actions.append(self.manageQtHelpDocsAct) self.manageQtHelpFiltersAct = E5Action(self.trUtf8('Manage QtHelp Filters'), @@ -1001,8 +989,7 @@ """<b>Manage QtHelp Filters</b>""" """<p>Shows a dialog to manage the QtHelp filters.</p>""" )) - self.connect(self.manageQtHelpFiltersAct, SIGNAL('triggered()'), - self.__manageQtHelpFilters) + self.manageQtHelpFiltersAct.triggered.connect(self.__manageQtHelpFilters) self.__actions.append(self.manageQtHelpFiltersAct) self.reindexDocumentationAct = E5Action(self.trUtf8('Reindex Documentation'), @@ -1015,8 +1002,7 @@ """<p>Reindexes the documentation set.</p>""" )) if not self.initShortcutsOnly: - self.connect(self.reindexDocumentationAct, SIGNAL('triggered()'), - self.__searchEngine.reindexDocumentation) + self.reindexDocumentationAct.triggered.connect(self.__searchEngine.reindexDocumentation) self.__actions.append(self.reindexDocumentationAct) self.clearPrivateDataAct = E5Action(self.trUtf8('Clear private data'), @@ -1029,8 +1015,7 @@ """<p>Clears the private data like browsing history, search history""" """ or the favicons database.</p>""" )) - self.connect(self.clearPrivateDataAct, SIGNAL('triggered()'), - self.__clearPrivateData) + self.clearPrivateDataAct.triggered.connect(self.__clearPrivateData) self.__actions.append(self.clearPrivateDataAct) self.clearIconsAct = E5Action(self.trUtf8('Clear icons database'), @@ -1042,7 +1027,7 @@ """<b>Clear icons database</b>""" """<p>Clears the database of favicons of previously visited URLs.</p>""" )) - self.connect(self.clearIconsAct, SIGNAL('triggered()'), self.__clearIconsDatabase) + self.clearIconsAct.triggered.connect(self.__clearIconsDatabase) self.__actions.append(self.clearIconsAct) self.searchEnginesAct = E5Action(self.trUtf8('Configure Search Engines'), @@ -1055,8 +1040,7 @@ """<b>Configure Search Engines...</b>""" """<p>Opens a dialog to configure the available search engines.</p>""" )) - self.connect(self.searchEnginesAct, SIGNAL('triggered()'), - self.__showEnginesConfigurationDialog) + self.searchEnginesAct.triggered.connect(self.__showEnginesConfigurationDialog) self.__actions.append(self.searchEnginesAct) self.passwordsAct = E5Action(self.trUtf8('Manage Saved Passwords'), @@ -1069,8 +1053,7 @@ """<b>Manage Saved Passwords...</b>""" """<p>Opens a dialog to manage the saved passwords.</p>""" )) - self.connect(self.passwordsAct, SIGNAL('triggered()'), - self.__showPasswordsDialog) + self.passwordsAct.triggered.connect(self.__showPasswordsDialog) self.__actions.append(self.passwordsAct) self.adblockAct = E5Action(self.trUtf8('Ad Block'), @@ -1083,8 +1066,7 @@ """<b>Ad Block...</b>""" """<p>Opens a dialog to configure AdBlock subscriptions and rules.</p>""" )) - self.connect(self.adblockAct, SIGNAL('triggered()'), - self.__showAdBlockDialog) + self.adblockAct.triggered.connect(self.__showAdBlockDialog) self.__actions.append(self.adblockAct) self.toolsMonitorAct = E5Action(self.trUtf8('Show Network Monitor'), @@ -1096,8 +1078,7 @@ """<b>Show Network Monitor</b>""" """<p>Shows the network monitor dialog.</p>""" )) - self.connect(self.toolsMonitorAct, SIGNAL('triggered()'), - self.__showNetworkMonitor) + self.toolsMonitorAct.triggered.connect(self.__showNetworkMonitor) self.__actions.append(self.toolsMonitorAct) self.backAct.setEnabled(False) @@ -3036,4 +3017,4 @@ else: print(codecs[offset]) QWebSettings.globalSettings().setDefaultTextEncoding(codecs[offset]) - Preferences.setHelp("DefaultTextEncoding", codecs[offset]) + Preferences.setHelp("DefaultTextEncoding", codecs[offset]) \ No newline at end of file
--- a/Helpviewer/History/HistoryMenu.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Helpviewer/History/HistoryMenu.py Wed Aug 04 08:54:52 2010 +0200 @@ -269,10 +269,10 @@ act = self.addAction(UI.PixmapCache.getIcon("history.png"), self.trUtf8("Show All History...")) - self.connect(act, SIGNAL("triggered()"), self.__showHistoryDialog) + act.triggered.connect(self.__showHistoryDialog) act = self.addAction(UI.PixmapCache.getIcon("historyClear.png"), self.trUtf8("Clear History...")) - self.connect(act, SIGNAL("triggered()"), self.__clearHistoryDialog) + act.triggered.connect(self.__clearHistoryDialog) def setInitialActions(self, actions): """
--- a/IconEditor/IconEditorWindow.py Mon Aug 02 08:33:11 2010 +0200 +++ b/IconEditor/IconEditorWindow.py Wed Aug 04 08:54:52 2010 +0200 @@ -172,7 +172,7 @@ """<b>New</b>""" """<p>This creates a new icon.</p>""" )) - self.connect(self.newAct, SIGNAL('triggered()'), self.__newIcon) + self.newAct.triggered.connect(self.__newIcon) self.__actions.append(self.newAct) self.newWindowAct = E5Action(self.trUtf8('New Window'), @@ -184,7 +184,7 @@ """<b>New Window</b>""" """<p>This opens a new icon editor window.</p>""" )) - self.connect(self.newWindowAct, SIGNAL('triggered()'), self.__newWindow) + self.newWindowAct.triggered.connect(self.__newWindow) self.__actions.append(self.newWindowAct) self.openAct = E5Action(self.trUtf8('Open'), @@ -198,7 +198,7 @@ """<p>This opens a new icon file for editing.""" """ It pops up a file selection dialog.</p>""" )) - self.connect(self.openAct, SIGNAL('triggered()'), self.__openIcon) + self.openAct.triggered.connect(self.__openIcon) self.__actions.append(self.openAct) self.saveAct = E5Action(self.trUtf8('Save'), @@ -211,7 +211,7 @@ """<b>Save File</b>""" """<p>Save the contents of the icon editor window.</p>""" )) - self.connect(self.saveAct, SIGNAL('triggered()'), self.__saveIcon) + self.saveAct.triggered.connect(self.__saveIcon) self.__actions.append(self.saveAct) self.saveAsAct = E5Action(self.trUtf8('Save As'), @@ -225,7 +225,7 @@ """<b>Save As...</b>""" """<p>Saves the current icon to a new file.</p>""" )) - self.connect(self.saveAsAct, SIGNAL('triggered()'), self.__saveIconAs) + self.saveAsAct.triggered.connect(self.__saveIconAs) self.__actions.append(self.saveAsAct) self.closeAct = E5Action(self.trUtf8('Close'), @@ -238,7 +238,7 @@ """<b>Close</b>""" """<p>Closes the current icon editor window.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.close) + self.closeAct.triggered.connect(self.close) self.__actions.append(self.closeAct) self.closeAllAct = E5Action(self.trUtf8('Close All'), @@ -249,7 +249,7 @@ """<b>Close All</b>""" """<p>Closes all icon editor windows except the first one.</p>""" )) - self.connect(self.closeAllAct, SIGNAL('triggered()'), self.__closeAll) + self.closeAllAct.triggered.connect(self.__closeAll) self.__actions.append(self.closeAllAct) self.exitAct = E5Action(self.trUtf8('Quit'), @@ -263,7 +263,7 @@ """<p>Quit the icon editor.</p>""" )) if self.fromEric: - self.connect(self.exitAct, SIGNAL('triggered()'), self.close) + self.exitAct.triggered.connect(self.close) else: self.connect(self.exitAct, SIGNAL('triggered()'), qApp, SLOT('closeAllWindows()')) @@ -284,7 +284,7 @@ """<b>Undo</b>""" """<p>Undo the last change done.</p>""" )) - self.connect(self.undoAct, SIGNAL('triggered()'), self.__editor.editUndo) + self.undoAct.triggered.connect(self.__editor.editUndo) self.__actions.append(self.undoAct) self.redoAct = E5Action(self.trUtf8('Redo'), @@ -297,7 +297,7 @@ """<b>Redo</b>""" """<p>Redo the last change done.</p>""" )) - self.connect(self.redoAct, SIGNAL('triggered()'), self.__editor.editRedo) + self.redoAct.triggered.connect(self.__editor.editRedo) self.__actions.append(self.redoAct) self.cutAct = E5Action(self.trUtf8('Cut'), @@ -311,7 +311,7 @@ """<b>Cut</b>""" """<p>Cut the selected image area to the clipboard.</p>""" )) - self.connect(self.cutAct, SIGNAL('triggered()'), self.__editor.editCut) + self.cutAct.triggered.connect(self.__editor.editCut) self.__actions.append(self.cutAct) self.copyAct = E5Action(self.trUtf8('Copy'), @@ -325,7 +325,7 @@ """<b>Copy</b>""" """<p>Copy the selected image area to the clipboard.</p>""" )) - self.connect(self.copyAct, SIGNAL('triggered()'), self.__editor.editCopy) + self.copyAct.triggered.connect(self.__editor.editCopy) self.__actions.append(self.copyAct) self.pasteAct = E5Action(self.trUtf8('Paste'), @@ -339,7 +339,7 @@ """<b>Paste</b>""" """<p>Paste the clipboard image.</p>""" )) - self.connect(self.pasteAct, SIGNAL('triggered()'), self.__editor.editPaste) + self.pasteAct.triggered.connect(self.__editor.editPaste) self.__actions.append(self.pasteAct) self.pasteNewAct = E5Action(self.trUtf8('Paste as New'), @@ -351,7 +351,7 @@ """<b>Paste as New</b>""" """<p>Paste the clipboard image replacing the current one.</p>""" )) - self.connect(self.pasteNewAct, SIGNAL('triggered()'), self.__editor.editPasteAsNew) + self.pasteNewAct.triggered.connect(self.__editor.editPasteAsNew) self.__actions.append(self.pasteNewAct) self.deleteAct = E5Action(self.trUtf8('Clear'), @@ -365,7 +365,7 @@ """<b>Clear</b>""" """<p>Clear the icon image and set it to be completely transparent.</p>""" )) - self.connect(self.deleteAct, SIGNAL('triggered()'), self.__editor.editClear) + self.deleteAct.triggered.connect(self.__editor.editClear) self.__actions.append(self.deleteAct) self.selectAllAct = E5Action(self.trUtf8('Select All'), @@ -378,7 +378,7 @@ """<b>Select All</b>""" """<p>Selects the complete icon image.</p>""" )) - self.connect(self.selectAllAct, SIGNAL('triggered()'), self.__editor.editSelectAll) + self.selectAllAct.triggered.connect(self.__editor.editSelectAll) self.__actions.append(self.selectAllAct) self.resizeAct = E5Action(self.trUtf8('Change Size'), @@ -391,7 +391,7 @@ """<b>Change Size...</b>""" """<p>Changes the icon size.</p>""" )) - self.connect(self.resizeAct, SIGNAL('triggered()'), self.__editor.editResize) + self.resizeAct.triggered.connect(self.__editor.editResize) self.__actions.append(self.resizeAct) self.grayscaleAct = E5Action(self.trUtf8('Grayscale'), @@ -404,7 +404,7 @@ """<b>Grayscale</b>""" """<p>Changes the icon to grayscale.</p>""" )) - self.connect(self.grayscaleAct, SIGNAL('triggered()'), self.__editor.grayScale) + self.grayscaleAct.triggered.connect(self.__editor.grayScale) self.__actions.append(self.grayscaleAct) self.redoAct.setEnabled(False) @@ -443,7 +443,7 @@ """<b>Zoom in</b>""" """<p>Zoom in on the icon. This makes the grid bigger.</p>""" )) - self.connect(self.zoomInAct, SIGNAL('triggered()'), self.__zoomIn) + self.zoomInAct.triggered.connect(self.__zoomIn) self.__actions.append(self.zoomInAct) self.zoomOutAct = E5Action(self.trUtf8('Zoom out'), @@ -456,7 +456,7 @@ """<b>Zoom out</b>""" """<p>Zoom out on the icon. This makes the grid smaller.</p>""" )) - self.connect(self.zoomOutAct, SIGNAL('triggered()'), self.__zoomOut) + self.zoomOutAct.triggered.connect(self.__zoomOut) self.__actions.append(self.zoomOutAct) self.zoomResetAct = E5Action(self.trUtf8('Zoom reset'), @@ -470,7 +470,7 @@ """<p>Reset the zoom of the icon. """ """This sets the zoom factor to 100%.</p>""" )) - self.connect(self.zoomResetAct, SIGNAL('triggered()'), self.__zoomReset) + self.zoomResetAct.triggered.connect(self.__zoomReset) self.__actions.append(self.zoomResetAct) self.zoomToAct = E5Action(self.trUtf8('Zoom'), @@ -485,7 +485,7 @@ """<p>Zoom the icon. This opens a dialog where the""" """ desired zoom factor can be entered.</p>""" )) - self.connect(self.zoomToAct, SIGNAL('triggered()'), self.__zoom) + self.zoomToAct.triggered.connect(self.__zoom) self.__actions.append(self.zoomToAct) self.showGridAct = E5Action(self.trUtf8('Show Grid'), @@ -525,8 +525,7 @@ )) self.drawPencilAct.setCheckable(True) self.esm.setMapping(self.drawPencilAct, IconEditorGrid.Pencil) - self.connect(self.drawPencilAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawPencilAct.triggered.connect(self.esm.map) self.__actions.append(self.drawPencilAct) self.drawColorPickerAct = E5Action(self.trUtf8('Color Picker'), @@ -541,8 +540,7 @@ )) self.drawColorPickerAct.setCheckable(True) self.esm.setMapping(self.drawColorPickerAct, IconEditorGrid.ColorPicker) - self.connect(self.drawColorPickerAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawColorPickerAct.triggered.connect(self.esm.map) self.__actions.append(self.drawColorPickerAct) self.drawRectangleAct = E5Action(self.trUtf8('Rectangle'), @@ -556,8 +554,7 @@ )) self.drawRectangleAct.setCheckable(True) self.esm.setMapping(self.drawRectangleAct, IconEditorGrid.Rectangle) - self.connect(self.drawRectangleAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawRectangleAct.triggered.connect(self.esm.map) self.__actions.append(self.drawRectangleAct) self.drawFilledRectangleAct = E5Action(self.trUtf8('Filled Rectangle'), @@ -571,8 +568,7 @@ )) self.drawFilledRectangleAct.setCheckable(True) self.esm.setMapping(self.drawFilledRectangleAct, IconEditorGrid.FilledRectangle) - self.connect(self.drawFilledRectangleAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawFilledRectangleAct.triggered.connect(self.esm.map) self.__actions.append(self.drawFilledRectangleAct) self.drawCircleAct = E5Action(self.trUtf8('Circle'), @@ -586,8 +582,7 @@ )) self.drawCircleAct.setCheckable(True) self.esm.setMapping(self.drawCircleAct, IconEditorGrid.Circle) - self.connect(self.drawCircleAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawCircleAct.triggered.connect(self.esm.map) self.__actions.append(self.drawCircleAct) self.drawFilledCircleAct = E5Action(self.trUtf8('Filled Circle'), @@ -601,8 +596,7 @@ )) self.drawFilledCircleAct.setCheckable(True) self.esm.setMapping(self.drawFilledCircleAct, IconEditorGrid.FilledCircle) - self.connect(self.drawFilledCircleAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawFilledCircleAct.triggered.connect(self.esm.map) self.__actions.append(self.drawFilledCircleAct) self.drawEllipseAct = E5Action(self.trUtf8('Ellipse'), @@ -616,8 +610,7 @@ )) self.drawEllipseAct.setCheckable(True) self.esm.setMapping(self.drawEllipseAct, IconEditorGrid.Ellipse) - self.connect(self.drawEllipseAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawEllipseAct.triggered.connect(self.esm.map) self.__actions.append(self.drawEllipseAct) self.drawFilledEllipseAct = E5Action(self.trUtf8('Filled Ellipse'), @@ -631,8 +624,7 @@ )) self.drawFilledEllipseAct.setCheckable(True) self.esm.setMapping(self.drawFilledEllipseAct, IconEditorGrid.FilledEllipse) - self.connect(self.drawFilledEllipseAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawFilledEllipseAct.triggered.connect(self.esm.map) self.__actions.append(self.drawFilledEllipseAct) self.drawFloodFillAct = E5Action(self.trUtf8('Flood Fill'), @@ -647,8 +639,7 @@ )) self.drawFloodFillAct.setCheckable(True) self.esm.setMapping(self.drawFloodFillAct, IconEditorGrid.Fill) - self.connect(self.drawFloodFillAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawFloodFillAct.triggered.connect(self.esm.map) self.__actions.append(self.drawFloodFillAct) self.drawLineAct = E5Action(self.trUtf8('Line'), @@ -662,8 +653,7 @@ )) self.drawLineAct.setCheckable(True) self.esm.setMapping(self.drawLineAct, IconEditorGrid.Line) - self.connect(self.drawLineAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawLineAct.triggered.connect(self.esm.map) self.__actions.append(self.drawLineAct) self.drawEraserAct = E5Action(self.trUtf8('Eraser (Transparent)'), @@ -677,8 +667,7 @@ )) self.drawEraserAct.setCheckable(True) self.esm.setMapping(self.drawEraserAct, IconEditorGrid.Rubber) - self.connect(self.drawEraserAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawEraserAct.triggered.connect(self.esm.map) self.__actions.append(self.drawEraserAct) self.drawRectangleSelectionAct = E5Action(self.trUtf8('Rectangular Selection'), @@ -693,8 +682,7 @@ self.drawRectangleSelectionAct.setCheckable(True) self.esm.setMapping(self.drawRectangleSelectionAct, IconEditorGrid.RectangleSelection) - self.connect(self.drawRectangleSelectionAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawRectangleSelectionAct.triggered.connect(self.esm.map) self.__actions.append(self.drawRectangleSelectionAct) self.drawCircleSelectionAct = E5Action(self.trUtf8('Circular Selection'), @@ -709,8 +697,7 @@ self.drawCircleSelectionAct.setCheckable(True) self.esm.setMapping(self.drawCircleSelectionAct, IconEditorGrid.CircleSelection) - self.connect(self.drawCircleSelectionAct, SIGNAL('triggered()'), - self.esm, SLOT('map()')) + self.drawCircleSelectionAct.triggered.connect(self.esm.map) self.__actions.append(self.drawCircleSelectionAct) self.drawPencilAct.setChecked(True) @@ -726,7 +713,7 @@ self.aboutAct.setWhatsThis(self.trUtf8( """<b>About</b>""" """<p>Display some information about this software.</p>""")) - self.connect(self.aboutAct, SIGNAL('triggered()'), self.__about) + self.aboutAct.triggered.connect(self.__about) self.__actions.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), @@ -738,7 +725,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct, SIGNAL('triggered()'), self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), @@ -755,7 +742,7 @@ """ dialogs, this feature can be accessed using the context help button""" """ in the titlebar.</p>""" )) - self.connect(self.whatsThisAct, SIGNAL('triggered()'), self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.__actions.append(self.whatsThisAct) def __initMenus(self): @@ -1244,4 +1231,4 @@ """ Private slot called in to enter Whats This mode. """ - QWhatsThis.enterWhatsThisMode() + QWhatsThis.enterWhatsThisMode() \ No newline at end of file
--- a/MultiProject/MultiProject.py Mon Aug 02 08:33:11 2010 +0200 +++ b/MultiProject/MultiProject.py Wed Aug 04 08:54:52 2010 +0200 @@ -685,7 +685,7 @@ """<p>This opens a dialog for entering the info for a""" """ new multiproject.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.newMultiProject) + act.triggered.connect(self.newMultiProject) self.actions.append(act) act = E5Action(self.trUtf8('Open multiproject'), @@ -697,7 +697,7 @@ """<b>Open...</b>""" """<p>This opens an existing multiproject.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.openMultiProject) + act.triggered.connect(self.openMultiProject) self.actions.append(act) self.closeAct = E5Action(self.trUtf8('Close multiproject'), @@ -708,7 +708,7 @@ """<b>Close</b>""" """<p>This closes the current multiproject.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.closeMultiProject) + self.closeAct.triggered.connect(self.closeMultiProject) self.actions.append(self.closeAct) self.saveAct = E5Action(self.trUtf8('Save multiproject'), @@ -719,7 +719,7 @@ """<b>Save</b>""" """<p>This saves the current multiproject.</p>""" )) - self.connect(self.saveAct, SIGNAL('triggered()'), self.saveMultiProject) + self.saveAct.triggered.connect(self.saveMultiProject) self.actions.append(self.saveAct) self.saveasAct = E5Action(self.trUtf8('Save multiproject as'), @@ -731,7 +731,7 @@ """<b>Save as</b>""" """<p>This saves the current multiproject to a new file.</p>""" )) - self.connect(self.saveasAct, SIGNAL('triggered()'), self.saveMultiProjectAs) + self.saveasAct.triggered.connect(self.saveMultiProjectAs) self.actions.append(self.saveasAct) self.addProjectAct = E5Action(self.trUtf8('Add project to multiproject'), @@ -745,7 +745,7 @@ """<p>This opens a dialog for adding a project""" """ to the current multiproject.</p>""" )) - self.connect(self.addProjectAct, SIGNAL('triggered()'), self.addProject) + self.addProjectAct.triggered.connect(self.addProject) self.actions.append(self.addProjectAct) self.propsAct = E5Action(self.trUtf8('Multiproject properties'), @@ -756,7 +756,7 @@ """<b>Properties...</b>""" """<p>This shows a dialog to edit the multiproject properties.</p>""" )) - self.connect(self.propsAct, SIGNAL('triggered()'), self.__showProperties) + self.propsAct.triggered.connect(self.__showProperties) self.actions.append(self.propsAct) self.closeAct.setEnabled(False) @@ -976,4 +976,4 @@ for project in self.projects: if not project['master']: files.append(project['file']) - return files + return files \ No newline at end of file
--- a/Plugins/PluginAbout.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginAbout.py Wed Aug 04 08:54:52 2010 +0200 @@ -82,7 +82,7 @@ """<b>About {0}</b>""" """<p>Display some information about this software.</p>""" ).format(Program)) - self.connect(self.aboutAct, SIGNAL('triggered()'), self.__about) + self.aboutAct.triggered.connect(self.__about) acts.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), @@ -94,7 +94,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct, SIGNAL('triggered()'), self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) acts.append(self.aboutQtAct) self.__ui.addE5Actions(acts, 'ui')
--- a/Plugins/PluginEricapi.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginEricapi.py Wed Aug 04 08:54:52 2010 +0200 @@ -101,7 +101,7 @@ """<b>Generate API file</b>""" """<p>Generate an API file using eric5-api.</p>""" )) - self.connect(self.__projectAct, SIGNAL('triggered()'), self.__doEricapi) + self.__projectAct.triggered.connect(self.__doEricapi) e5App().getObject("Project").addE5Actions([self.__projectAct]) menu.addAction(self.__projectAct) @@ -180,4 +180,4 @@ if outfile not in project.pdata['OTHERS']: project.pdata['OTHERS'].append(outfile) project.setDirty(True) - project.othersAdded(outfile) + project.othersAdded(outfile) \ No newline at end of file
--- a/Plugins/PluginEricdoc.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginEricdoc.py Wed Aug 04 08:54:52 2010 +0200 @@ -137,7 +137,7 @@ """<b>Generate documentation</b>""" """<p>Generate API documentation using eric5-doc.</p>""" )) - self.connect(self.__projectAct, SIGNAL('triggered()'), self.__doEricdoc) + self.__projectAct.triggered.connect(self.__doEricdoc) e5App().getObject("Project").addE5Actions([self.__projectAct]) menu.addAction(self.__projectAct) @@ -220,4 +220,4 @@ if outdir not in project.pdata['OTHERS']: project.pdata['OTHERS'].append(outdir) project.setDirty(True) - project.othersAdded(outdir) + project.othersAdded(outdir) \ No newline at end of file
--- a/Plugins/PluginSyntaxChecker.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginSyntaxChecker.py Wed Aug 04 08:54:52 2010 +0200 @@ -81,8 +81,7 @@ """<b>Check Syntax...</b>""" """<p>This checks Python files for syntax errors.</p>""" )) - self.connect(self.__projectAct, SIGNAL('triggered()'), - self.__projectSyntaxCheck) + self.__projectAct.triggered.connect(self.__projectSyntaxCheck) e5App().getObject("Project").addE5Actions([self.__projectAct]) menu.addAction(self.__projectAct) @@ -93,7 +92,7 @@ """<b>Check Syntax...</b>""" """<p>This checks Python files for syntax errors.</p>""" )) - self.connect(self.__editorAct, SIGNAL('triggered()'), self.__editorSyntaxCheck) + self.__editorAct.triggered.connect(self.__editorSyntaxCheck) self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) @@ -169,8 +168,7 @@ """<b>Check Syntax...</b>""" """<p>This checks Python files for syntax errors.</p>""" )) - self.connect(self.__projectBrowserAct, SIGNAL('triggered()'), - self.__projectBrowserSyntaxCheck) + self.__projectBrowserAct.triggered.connect(self.__projectBrowserSyntaxCheck) if not self.__projectBrowserAct in menu.actions(): menu.addAction(self.__projectBrowserAct)
--- a/Plugins/PluginTabnanny.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginTabnanny.py Wed Aug 04 08:54:52 2010 +0200 @@ -82,7 +82,7 @@ """<p>This checks Python files""" """ for bad indentations using tabnanny.</p>""" )) - self.connect(self.__projectAct, SIGNAL('triggered()'), self.__projectTabnanny) + self.__projectAct.triggered.connect(self.__projectTabnanny) e5App().getObject("Project").addE5Actions([self.__projectAct]) menu.addAction(self.__projectAct) @@ -94,7 +94,7 @@ """<p>This checks Python files""" """ for bad indentations using tabnanny.</p>""" )) - self.connect(self.__editorAct, SIGNAL('triggered()'), self.__editorTabnanny) + self.__editorAct.triggered.connect(self.__editorTabnanny) self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), self.__projectShowMenu) @@ -171,8 +171,7 @@ """<p>This checks Python files""" """ for bad indentations using tabnanny.</p>""" )) - self.connect(self.__projectBrowserAct, SIGNAL('triggered()'), - self.__projectBrowserTabnanny) + self.__projectBrowserAct.triggered.connect(self.__projectBrowserTabnanny) if not self.__projectBrowserAct in menu.actions(): menu.addAction(self.__projectBrowserAct)
--- a/Plugins/PluginWizardPyRegExp.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardPyRegExp.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a Python re string. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQColorDialog.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQColorDialog.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QColorDialog. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQFileDialog.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQFileDialog.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QFileDialog. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQFontDialog.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQFontDialog.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QFontDialog. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQInputDialog.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQInputDialog.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QInputDialog. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQMessageBox.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQMessageBox.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QMessageBox. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/PluginWizardQRegExp.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/PluginWizardQRegExp.py Wed Aug 04 08:54:52 2010 +0200 @@ -78,7 +78,7 @@ """ needed to create a QRegExp. The generated code is inserted""" """ at the current cursor position.</p>""" )) - self.connect(self.action, SIGNAL('triggered()'), self.__handle) + self.action.triggered.connect(self.__handle) self.__ui.addE5Actions([self.action], 'wizards')
--- a/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/ProjectHelper.py Wed Aug 04 08:54:52 2010 +0200 @@ -59,7 +59,7 @@ """<p>This creates (clones) a new local project from """ """a Mercurial repository.</p>""" )) - self.connect(self.vcsNewAct, SIGNAL('triggered()'), self._vcsCheckout) + self.vcsNewAct.triggered.connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) self.hgIncomingAct = E5Action(self.trUtf8('Show incoming log'), @@ -73,7 +73,7 @@ """<b>Show incoming log</b>""" """<p>This shows the log of changes coming into the repository.</p>""" )) - self.connect(self.hgIncomingAct, SIGNAL('triggered()'), self.__hgIncoming) + self.hgIncomingAct.triggered.connect(self.__hgIncoming) self.actions.append(self.hgIncomingAct) self.hgPullAct = E5Action(self.trUtf8('Pull changes'), @@ -88,7 +88,7 @@ """<p>This pulls changes from a remote repository into the """ """local repository.</p>""" )) - self.connect(self.hgPullAct, SIGNAL('triggered()'), self.__hgPull) + self.hgPullAct.triggered.connect(self.__hgPull) self.actions.append(self.hgPullAct) self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), @@ -102,7 +102,7 @@ """<b>Update from repository</b>""" """<p>This updates the local project from the Mercurial repository.</p>""" )) - self.connect(self.vcsUpdateAct, SIGNAL('triggered()'), self._vcsUpdate) + self.vcsUpdateAct.triggered.connect(self._vcsUpdate) self.actions.append(self.vcsUpdateAct) self.vcsCommitAct = E5Action(self.trUtf8('Commit changes to repository'), @@ -117,7 +117,7 @@ """<p>This commits changes to the local project to the """ """Mercurial repository.</p>""" )) - self.connect(self.vcsCommitAct, SIGNAL('triggered()'), self._vcsCommit) + self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) self.hgOutgoingAct = E5Action(self.trUtf8('Show outgoing log'), @@ -131,7 +131,7 @@ """<b>Show outgoing log</b>""" """<p>This shows the log of changes outgoing out of the repository.</p>""" )) - self.connect(self.hgOutgoingAct, SIGNAL('triggered()'), self.__hgOutgoing) + self.hgOutgoingAct.triggered.connect(self.__hgOutgoing) self.actions.append(self.hgOutgoingAct) self.hgPushAct = E5Action(self.trUtf8('Push changes'), @@ -146,7 +146,7 @@ """<p>This pushes changes from the local repository to a """ """remote repository.</p>""" )) - self.connect(self.hgPushAct, SIGNAL('triggered()'), self.__hgPush) + self.hgPushAct.triggered.connect(self.__hgPush) self.actions.append(self.hgPushAct) self.hgPushForcedAct = E5Action(self.trUtf8('Push changes (force)'), @@ -161,7 +161,7 @@ """<p>This pushes changes from the local repository to a """ """remote repository using the 'force' option.</p>""" )) - self.connect(self.hgPushForcedAct, SIGNAL('triggered()'), self.__hgPushForced) + self.hgPushForcedAct.triggered.connect(self.__hgPushForced) self.actions.append(self.hgPushForcedAct) self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), @@ -175,7 +175,7 @@ """<b>Export from repository</b>""" """<p>This exports a project from the repository.</p>""" )) - self.connect(self.vcsExportAct, SIGNAL('triggered()'), self._vcsExport) + self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), @@ -188,7 +188,7 @@ """<b>Add to repository</b>""" """<p>This adds (imports) the local project to the repository.</p>""" )) - self.connect(self.vcsAddAct, SIGNAL('triggered()'), self._vcsImport) + self.vcsAddAct.triggered.connect(self._vcsImport) self.actions.append(self.vcsAddAct) self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), @@ -203,7 +203,7 @@ """<p>This removes the local project from the repository""" """ (and disk).</p>""" )) - self.connect(self.vcsRemoveAct, SIGNAL('triggered()'), self._vcsRemove) + self.vcsRemoveAct.triggered.connect(self._vcsRemove) self.actions.append(self.vcsRemoveAct) self.vcsLogAct = E5Action(self.trUtf8('Show log'), @@ -217,7 +217,7 @@ """<b>Show log</b>""" """<p>This shows the log of the local project.</p>""" )) - self.connect(self.vcsLogAct, SIGNAL('triggered()'), self._vcsLog) + self.vcsLogAct.triggered.connect(self._vcsLog) self.actions.append(self.vcsLogAct) self.hgLogLimitedAct = E5Action(self.trUtf8('Show limited log'), @@ -232,7 +232,7 @@ """<p>This shows the log of the local project limited to a selectable""" """ number of entries.</p>""" )) - self.connect(self.hgLogLimitedAct, SIGNAL('triggered()'), self.__hgLogLimited) + self.hgLogLimitedAct.triggered.connect(self.__hgLogLimited) self.actions.append(self.hgLogLimitedAct) self.hgLogBrowserAct = E5Action(self.trUtf8('Show log browser'), @@ -248,7 +248,7 @@ """ A limited number of entries is shown first. More can be""" """ retrieved later on.</p>""" )) - self.connect(self.hgLogBrowserAct, SIGNAL('triggered()'), self.__hgLogBrowser) + self.hgLogBrowserAct.triggered.connect(self.__hgLogBrowser) self.actions.append(self.hgLogBrowserAct) self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), @@ -262,7 +262,7 @@ """<b>Show difference</b>""" """<p>This shows the difference of the local project to the repository.</p>""" )) - self.connect(self.vcsDiffAct, SIGNAL('triggered()'), self._vcsDiff) + self.vcsDiffAct.triggered.connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) self.hgExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), @@ -276,7 +276,7 @@ """<b>Show difference (extended)</b>""" """<p>This shows the difference of selectable revisions of the project.</p>""" )) - self.connect(self.hgExtDiffAct, SIGNAL('triggered()'), self.__hgExtendedDiff) + self.hgExtDiffAct.triggered.connect(self.__hgExtendedDiff) self.actions.append(self.hgExtDiffAct) self.vcsStatusAct = E5Action(self.trUtf8('Show status'), @@ -290,7 +290,7 @@ """<b>Show status</b>""" """<p>This shows the status of the local project.</p>""" )) - self.connect(self.vcsStatusAct, SIGNAL('triggered()'), self._vcsStatus) + self.vcsStatusAct.triggered.connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) self.hgHeadsAct = E5Action(self.trUtf8('Show heads'), @@ -303,7 +303,7 @@ """<b>Show heads</b>""" """<p>This shows the heads of the repository.</p>""" )) - self.connect(self.hgHeadsAct, SIGNAL('triggered()'), self.__hgHeads) + self.hgHeadsAct.triggered.connect(self.__hgHeads) self.actions.append(self.hgHeadsAct) self.hgParentsAct = E5Action(self.trUtf8('Show parents'), @@ -316,7 +316,7 @@ """<b>Show parents</b>""" """<p>This shows the parents of the repository.</p>""" )) - self.connect(self.hgParentsAct, SIGNAL('triggered()'), self.__hgParents) + self.hgParentsAct.triggered.connect(self.__hgParents) self.actions.append(self.hgParentsAct) self.hgTipAct = E5Action(self.trUtf8('Show tip'), @@ -329,7 +329,7 @@ """<b>Show tip</b>""" """<p>This shows the tip of the repository.</p>""" )) - self.connect(self.hgTipAct, SIGNAL('triggered()'), self.__hgTip) + self.hgTipAct.triggered.connect(self.__hgTip) self.actions.append(self.hgTipAct) self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), @@ -343,7 +343,7 @@ """<b>Revert changes</b>""" """<p>This reverts all changes made to the local project.</p>""" )) - self.connect(self.vcsRevertAct, SIGNAL('triggered()'), self._vcsRevert) + self.vcsRevertAct.triggered.connect(self._vcsRevert) self.actions.append(self.vcsRevertAct) self.vcsMergeAct = E5Action(self.trUtf8('Merge'), @@ -357,7 +357,7 @@ """<b>Merge</b>""" """<p>This merges changes of a revision into the local project.</p>""" )) - self.connect(self.vcsMergeAct, SIGNAL('triggered()'), self._vcsMerge) + self.vcsMergeAct.triggered.connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), @@ -370,7 +370,7 @@ """<b>Resolve conflicts</b>""" """<p>This resolves all conflicts of the local project.</p>""" )) - self.connect(self.vcsResolveAct, SIGNAL('triggered()'), self.__hgResolve) + self.vcsResolveAct.triggered.connect(self.__hgResolve) self.actions.append(self.vcsResolveAct) self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), @@ -384,7 +384,7 @@ """<b>Tag in repository</b>""" """<p>This tags the local project in the repository.</p>""" )) - self.connect(self.vcsTagAct, SIGNAL('triggered()'), self._vcsTag) + self.vcsTagAct.triggered.connect(self._vcsTag) self.actions.append(self.vcsTagAct) self.hgTagListAct = E5Action(self.trUtf8('List tags'), @@ -397,7 +397,7 @@ """<b>List tags</b>""" """<p>This lists the tags of the project.</p>""" )) - self.connect(self.hgTagListAct, SIGNAL('triggered()'), self.__hgTagList) + self.hgTagListAct.triggered.connect(self.__hgTagList) self.actions.append(self.hgTagListAct) self.hgBranchListAct = E5Action(self.trUtf8('List branches'), @@ -410,7 +410,7 @@ """<b>List branches</b>""" """<p>This lists the branches of the project.</p>""" )) - self.connect(self.hgBranchListAct, SIGNAL('triggered()'), self.__hgBranchList) + self.hgBranchListAct.triggered.connect(self.__hgBranchList) self.actions.append(self.hgBranchListAct) self.hgBranchAct = E5Action(self.trUtf8('Create branch'), @@ -425,7 +425,7 @@ """<p>This creates a new branch for the local project """ """in the repository.</p>""" )) - self.connect(self.hgBranchAct, SIGNAL('triggered()'), self.__hgBranch) + self.hgBranchAct.triggered.connect(self.__hgBranch) self.actions.append(self.hgBranchAct) self.hgCloseBranchAct = E5Action(self.trUtf8('Close branch'), @@ -438,7 +438,7 @@ """<b>Close branch</b>""" """<p>This closes the current branch of the local project.</p>""" )) - self.connect(self.hgCloseBranchAct, SIGNAL('triggered()'), self.__hgCloseBranch) + self.hgCloseBranchAct.triggered.connect(self.__hgCloseBranch) self.actions.append(self.hgCloseBranchAct) self.hgShowBranchAct = E5Action(self.trUtf8('Show current branch'), @@ -451,7 +451,7 @@ """<b>Show current branch</b>""" """<p>This shows the current branch of the project.</p>""" )) - self.connect(self.hgShowBranchAct, SIGNAL('triggered()'), self.__hgShowBranch) + self.hgShowBranchAct.triggered.connect(self.__hgShowBranch) self.actions.append(self.hgShowBranchAct) self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), @@ -465,7 +465,7 @@ """<b>Switch</b>""" """<p>This switches the working directory to another revision.</p>""" )) - self.connect(self.vcsSwitchAct, SIGNAL('triggered()'), self._vcsSwitch) + self.vcsSwitchAct.triggered.connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), @@ -478,7 +478,7 @@ """<b>Cleanup</b>""" """<p>This performs a cleanup of the local project.</p>""" )) - self.connect(self.vcsCleanupAct, SIGNAL('triggered()'), self._vcsCleanup) + self.vcsCleanupAct.triggered.connect(self._vcsCleanup) self.actions.append(self.vcsCleanupAct) self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), @@ -491,7 +491,7 @@ """<b>Execute command</b>""" """<p>This opens a dialog to enter an arbitrary Mercurial command.</p>""" )) - self.connect(self.vcsCommandAct, SIGNAL('triggered()'), self._vcsCommand) + self.vcsCommandAct.triggered.connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), @@ -502,7 +502,7 @@ """<b>Command options...</b>""" """<p>This shows a dialog to edit the Mercurial command options.</p>""" )) - self.connect(self.vcsPropsAct, SIGNAL('triggered()'), self._vcsCommandOptions) + self.vcsPropsAct.triggered.connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) self.hgConfigAct = E5Action(self.trUtf8('Configure'), @@ -515,7 +515,7 @@ """<b>Configure</b>""" """<p>Show the configuration dialog with the Mercurial page selected.</p>""" )) - self.connect(self.hgConfigAct, SIGNAL('triggered()'), self.__hgConfigure) + self.hgConfigAct.triggered.connect(self.__hgConfigure) self.actions.append(self.hgConfigAct) self.hgRepoConfigAct = E5Action(self.trUtf8('Edit repository config'), @@ -528,7 +528,7 @@ """<b>Edit repository config</b>""" """<p>Show an editor to edit the repository config file.</p>""" )) - self.connect(self.hgRepoConfigAct, SIGNAL('triggered()'), self.__hgEditRepoConfig) + self.hgRepoConfigAct.triggered.connect(self.__hgEditRepoConfig) self.actions.append(self.hgRepoConfigAct) self.hgShowConfigAct = E5Action(self.trUtf8('Show combined config settings'), @@ -541,7 +541,7 @@ """<b>Show combined config settings</b>""" """<p>This shows the combined config settings from all config files.</p>""" )) - self.connect(self.hgShowConfigAct, SIGNAL('triggered()'), self.__hgShowConfig) + self.hgShowConfigAct.triggered.connect(self.__hgShowConfig) self.actions.append(self.hgShowConfigAct) self.hgShowPathsAct = E5Action(self.trUtf8('Show paths'), @@ -554,7 +554,7 @@ """<b>Show paths</b>""" """<p>This shows the aliases for remote repositories.</p>""" )) - self.connect(self.hgShowPathsAct, SIGNAL('triggered()'), self.__hgShowPaths) + self.hgShowPathsAct.triggered.connect(self.__hgShowPaths) self.actions.append(self.hgShowPathsAct) self.hgVerifyAct = E5Action(self.trUtf8('Verify repository'), @@ -567,7 +567,7 @@ """<b>Verify repository</b>""" """<p>This verifies the integrity of the repository.</p>""" )) - self.connect(self.hgVerifyAct, SIGNAL('triggered()'), self.__hgVerify) + self.hgVerifyAct.triggered.connect(self.__hgVerify) self.actions.append(self.hgVerifyAct) self.hgRecoverAct = E5Action(self.trUtf8('Recover'), @@ -580,7 +580,7 @@ """<b>Recover</b>""" """<p>This recovers from an interrupted transaction.</p>""" )) - self.connect(self.hgRecoverAct, SIGNAL('triggered()'), self.__hgRecover) + self.hgRecoverAct.triggered.connect(self.__hgRecover) self.actions.append(self.hgRecoverAct) self.hgIdentifyAct = E5Action(self.trUtf8('Identify'), @@ -593,7 +593,7 @@ """<b>Identify</b>""" """<p>This identifies the project directory.</p>""" )) - self.connect(self.hgIdentifyAct, SIGNAL('triggered()'), self.__hgIdentify) + self.hgIdentifyAct.triggered.connect(self.__hgIdentify) self.actions.append(self.hgIdentifyAct) self.hgCreateIgnoreAct = E5Action(self.trUtf8('Create .hgignore'), @@ -606,7 +606,7 @@ """<b>Create .hgignore</b>""" """<p>This creates a .hgignore file with default values.</p>""" )) - self.connect(self.hgCreateIgnoreAct, SIGNAL('triggered()'), self.__hgCreateIgnore) + self.hgCreateIgnoreAct.triggered.connect(self.__hgCreateIgnore) self.actions.append(self.hgCreateIgnoreAct) self.hgBundleAct = E5Action(self.trUtf8('Create changegroup'), @@ -620,7 +620,7 @@ """<p>This creates a changegroup file collecting selected changesets""" """ (hg bundle).</p>""" )) - self.connect(self.hgBundleAct, SIGNAL('triggered()'), self.__hgBundle) + self.hgBundleAct.triggered.connect(self.__hgBundle) self.actions.append(self.hgBundleAct) self.hgPreviewBundleAct = E5Action(self.trUtf8('Preview changegroup'), @@ -634,8 +634,7 @@ """<p>This previews a changegroup file containing a collection of""" """ changesets.</p>""" )) - self.connect(self.hgPreviewBundleAct, SIGNAL('triggered()'), - self.__hgPreviewBundle) + self.hgPreviewBundleAct.triggered.connect(self.__hgPreviewBundle) self.actions.append(self.hgPreviewBundleAct) self.hgIdentifyBundleAct = E5Action(self.trUtf8('Identify changegroup'), @@ -649,8 +648,7 @@ """<p>This identifies a changegroup file containing a collection of""" """ changesets.</p>""" )) - self.connect(self.hgIdentifyBundleAct, SIGNAL('triggered()'), - self.__hgIdentifyBundle) + self.hgIdentifyBundleAct.triggered.connect(self.__hgIdentifyBundle) self.actions.append(self.hgIdentifyBundleAct) self.hgUnbundleAct = E5Action(self.trUtf8('Apply changegroups'), @@ -664,7 +662,7 @@ """<p>This applies one or several changegroup files generated by""" """ the 'Create changegroup' action (hg unbundle).</p>""" )) - self.connect(self.hgUnbundleAct, SIGNAL('triggered()'), self.__hgUnbundle) + self.hgUnbundleAct.triggered.connect(self.__hgUnbundle) self.actions.append(self.hgUnbundleAct) self.hgBisectGoodAct = E5Action(self.trUtf8('Mark as "good"'), @@ -677,7 +675,7 @@ """<b>Mark as good</b>""" """<p>This marks a selectable changeset as good.</p>""" )) - self.connect(self.hgBisectGoodAct, SIGNAL('triggered()'), self.__hgBisectGood) + self.hgBisectGoodAct.triggered.connect(self.__hgBisectGood) self.actions.append(self.hgBisectGoodAct) self.hgBisectBadAct = E5Action(self.trUtf8('Mark as "bad"'), @@ -690,7 +688,7 @@ """<b>Mark as bad</b>""" """<p>This marks a selectable changeset as bad.</p>""" )) - self.connect(self.hgBisectBadAct, SIGNAL('triggered()'), self.__hgBisectBad) + self.hgBisectBadAct.triggered.connect(self.__hgBisectBad) self.actions.append(self.hgBisectBadAct) self.hgBisectSkipAct = E5Action(self.trUtf8('Skip'), @@ -703,7 +701,7 @@ """<b>Skip</b>""" """<p>This skips the current changeset.</p>""" )) - self.connect(self.hgBisectSkipAct, SIGNAL('triggered()'), self.__hgBisectSkip) + self.hgBisectSkipAct.triggered.connect(self.__hgBisectSkip) self.actions.append(self.hgBisectSkipAct) self.hgBisectResetAct = E5Action(self.trUtf8('Reset'), @@ -716,7 +714,7 @@ """<b>Reset</b>""" """<p>This resets the bisect search data.</p>""" )) - self.connect(self.hgBisectResetAct, SIGNAL('triggered()'), self.__hgBisectReset) + self.hgBisectResetAct.triggered.connect(self.__hgBisectReset) self.actions.append(self.hgBisectResetAct) self.hgBackoutAct = E5Action(self.trUtf8('Back out changeset'), @@ -729,7 +727,7 @@ """<b>Back out changeset</b>""" """<p>This backs out changes of an earlier changeset.</p>""" )) - self.connect(self.hgBackoutAct, SIGNAL('triggered()'), self.__hgBackout) + self.hgBackoutAct.triggered.connect(self.__hgBackout) self.actions.append(self.hgBackoutAct) self.hgServeAct = E5Action(self.trUtf8('Serve project repository'), @@ -742,7 +740,7 @@ """<b>Serve project repository</b>""" """<p>This serves the project repository.</p>""" )) - self.connect(self.hgServeAct, SIGNAL('triggered()'), self.__hgServe) + self.hgServeAct.triggered.connect(self.__hgServe) self.actions.append(self.hgServeAct) def initMenu(self, menu): @@ -1062,4 +1060,4 @@ """ Protected slot used to serve the project. """ - self.vcs.hgServe(self.project.ppath) + self.vcs.hgServe(self.project.ppath) \ No newline at end of file
--- a/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/ProjectHelper.py Wed Aug 04 08:54:52 2010 +0200 @@ -57,7 +57,7 @@ """<b>New from repository</b>""" """<p>This creates a new local project from the VCS repository.</p>""" )) - self.connect(self.vcsNewAct, SIGNAL('triggered()'), self._vcsCheckout) + self.vcsNewAct.triggered.connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), @@ -71,7 +71,7 @@ """<b>Update from repository</b>""" """<p>This updates the local project from the VCS repository.</p>""" )) - self.connect(self.vcsUpdateAct, SIGNAL('triggered()'), self._vcsUpdate) + self.vcsUpdateAct.triggered.connect(self._vcsUpdate) self.actions.append(self.vcsUpdateAct) self.vcsCommitAct = E5Action(self.trUtf8('Commit changes to repository'), @@ -85,7 +85,7 @@ """<b>Commit changes to repository</b>""" """<p>This commits changes to the local project to the VCS repository.</p>""" )) - self.connect(self.vcsCommitAct, SIGNAL('triggered()'), self._vcsCommit) + self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), @@ -98,7 +98,7 @@ """<b>Add to repository</b>""" """<p>This adds (imports) the local project to the VCS repository.</p>""" )) - self.connect(self.vcsAddAct, SIGNAL('triggered()'), self._vcsImport) + self.vcsAddAct.triggered.connect(self._vcsImport) self.actions.append(self.vcsAddAct) self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), @@ -113,7 +113,7 @@ """<p>This removes the local project from the VCS repository""" """ (and disk).</p>""" )) - self.connect(self.vcsRemoveAct, SIGNAL('triggered()'), self._vcsRemove) + self.vcsRemoveAct.triggered.connect(self._vcsRemove) self.actions.append(self.vcsRemoveAct) self.vcsLogAct = E5Action(self.trUtf8('Show log'), @@ -127,7 +127,7 @@ """<b>Show log</b>""" """<p>This shows the log of the local project.</p>""" )) - self.connect(self.vcsLogAct, SIGNAL('triggered()'), self._vcsLog) + self.vcsLogAct.triggered.connect(self._vcsLog) self.actions.append(self.vcsLogAct) self.svnLogLimitedAct = E5Action(self.trUtf8('Show limited log'), @@ -142,7 +142,7 @@ """<p>This shows the log of the local project limited to a selectable""" """ number of entries.</p>""" )) - self.connect(self.svnLogLimitedAct, SIGNAL('triggered()'), self.__svnLogLimited) + self.svnLogLimitedAct.triggered.connect(self.__svnLogLimited) self.actions.append(self.svnLogLimitedAct) self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), @@ -158,7 +158,7 @@ """ A limited number of entries is shown first. More can be""" """ retrieved later on.</p>""" )) - self.connect(self.svnLogBrowserAct, SIGNAL('triggered()'), self.__svnLogBrowser) + self.svnLogBrowserAct.triggered.connect(self.__svnLogBrowser) self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), @@ -172,7 +172,7 @@ """<b>Show difference</b>""" """<p>This shows the difference of the local project to the repository.</p>""" )) - self.connect(self.vcsDiffAct, SIGNAL('triggered()'), self._vcsDiff) + self.vcsDiffAct.triggered.connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) self.svnExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), @@ -186,7 +186,7 @@ """<b>Show difference (extended)</b>""" """<p>This shows the difference of selectable revisions of the project.</p>""" )) - self.connect(self.svnExtDiffAct, SIGNAL('triggered()'), self.__svnExtendedDiff) + self.svnExtDiffAct.triggered.connect(self.__svnExtendedDiff) self.actions.append(self.svnExtDiffAct) self.svnUrlDiffAct = E5Action(self.trUtf8('Show difference (URLs)'), @@ -201,7 +201,7 @@ """<p>This shows the difference of the project between""" """ two repository URLs.</p>""" )) - self.connect(self.svnUrlDiffAct, SIGNAL('triggered()'), self.__svnUrlDiff) + self.svnUrlDiffAct.triggered.connect(self.__svnUrlDiff) self.actions.append(self.svnUrlDiffAct) self.vcsStatusAct = E5Action(self.trUtf8('Show status'), @@ -215,7 +215,7 @@ """<b>Show status</b>""" """<p>This shows the status of the local project.</p>""" )) - self.connect(self.vcsStatusAct, SIGNAL('triggered()'), self._vcsStatus) + self.vcsStatusAct.triggered.connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) self.svnRepoInfoAct = E5Action(self.trUtf8('Show repository info'), @@ -230,7 +230,7 @@ """<p>This shows some repository related information for""" """ the local project.</p>""" )) - self.connect(self.svnRepoInfoAct, SIGNAL('triggered()'), self.__svnInfo) + self.svnRepoInfoAct.triggered.connect(self.__svnInfo) self.actions.append(self.svnRepoInfoAct) self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), @@ -244,7 +244,7 @@ """<b>Tag in repository</b>""" """<p>This tags the local project in the repository.</p>""" )) - self.connect(self.vcsTagAct, SIGNAL('triggered()'), self._vcsTag) + self.vcsTagAct.triggered.connect(self._vcsTag) self.actions.append(self.vcsTagAct) self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), @@ -258,7 +258,7 @@ """<b>Export from repository</b>""" """<p>This exports a project from the repository.</p>""" )) - self.connect(self.vcsExportAct, SIGNAL('triggered()'), self._vcsExport) + self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), @@ -269,7 +269,7 @@ """<b>Command options...</b>""" """<p>This shows a dialog to edit the VCS command options.</p>""" )) - self.connect(self.vcsPropsAct, SIGNAL('triggered()'), self._vcsCommandOptions) + self.vcsPropsAct.triggered.connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), @@ -283,7 +283,7 @@ """<b>Revert changes</b>""" """<p>This reverts all changes made to the local project.</p>""" )) - self.connect(self.vcsRevertAct, SIGNAL('triggered()'), self._vcsRevert) + self.vcsRevertAct.triggered.connect(self._vcsRevert) self.actions.append(self.vcsRevertAct) self.vcsMergeAct = E5Action(self.trUtf8('Merge'), @@ -297,7 +297,7 @@ """<b>Merge</b>""" """<p>This merges changes of a tag/revision into the local project.</p>""" )) - self.connect(self.vcsMergeAct, SIGNAL('triggered()'), self._vcsMerge) + self.vcsMergeAct.triggered.connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), @@ -311,7 +311,7 @@ """<b>Switch</b>""" """<p>This switches the local copy to another tag/branch.</p>""" )) - self.connect(self.vcsSwitchAct, SIGNAL('triggered()'), self._vcsSwitch) + self.vcsSwitchAct.triggered.connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), @@ -324,7 +324,7 @@ """<b>Resolve conflicts</b>""" """<p>This resolves all conflicts of the local project.</p>""" )) - self.connect(self.vcsResolveAct, SIGNAL('triggered()'), self.__svnResolve) + self.vcsResolveAct.triggered.connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), @@ -337,7 +337,7 @@ """<b>Cleanup</b>""" """<p>This performs a cleanup of the local project.</p>""" )) - self.connect(self.vcsCleanupAct, SIGNAL('triggered()'), self._vcsCleanup) + self.vcsCleanupAct.triggered.connect(self._vcsCleanup) self.actions.append(self.vcsCleanupAct) self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), @@ -350,7 +350,7 @@ """<b>Execute command</b>""" """<p>This opens a dialog to enter an arbitrary VCS command.</p>""" )) - self.connect(self.vcsCommandAct, SIGNAL('triggered()'), self._vcsCommand) + self.vcsCommandAct.triggered.connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) self.svnTagListAct = E5Action(self.trUtf8('List tags'), @@ -363,7 +363,7 @@ """<b>List tags</b>""" """<p>This lists the tags of the project.</p>""" )) - self.connect(self.svnTagListAct, SIGNAL('triggered()'), self.__svnTagList) + self.svnTagListAct.triggered.connect(self.__svnTagList) self.actions.append(self.svnTagListAct) self.svnBranchListAct = E5Action(self.trUtf8('List branches'), @@ -376,7 +376,7 @@ """<b>List branches</b>""" """<p>This lists the branches of the project.</p>""" )) - self.connect(self.svnBranchListAct, SIGNAL('triggered()'), self.__svnBranchList) + self.svnBranchListAct.triggered.connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) self.svnListAct = E5Action(self.trUtf8('List repository contents'), @@ -389,7 +389,7 @@ """<b>List repository contents</b>""" """<p>This lists the contents of the repository.</p>""" )) - self.connect(self.svnListAct, SIGNAL('triggered()'), self.__svnTagList) + self.svnListAct.triggered.connect(self.__svnTagList) self.actions.append(self.svnListAct) self.svnPropSetAct = E5Action(self.trUtf8('Set Property'), @@ -402,7 +402,7 @@ """<b>Set Property</b>""" """<p>This sets a property for the project files.</p>""" )) - self.connect(self.svnPropSetAct, SIGNAL('triggered()'), self.__svnPropSet) + self.svnPropSetAct.triggered.connect(self.__svnPropSet) self.actions.append(self.svnPropSetAct) self.svnPropListAct = E5Action(self.trUtf8('List Properties'), @@ -415,7 +415,7 @@ """<b>List Properties</b>""" """<p>This lists the properties of the project files.</p>""" )) - self.connect(self.svnPropListAct, SIGNAL('triggered()'), self.__svnPropList) + self.svnPropListAct.triggered.connect(self.__svnPropList) self.actions.append(self.svnPropListAct) self.svnPropDelAct = E5Action(self.trUtf8('Delete Property'), @@ -428,7 +428,7 @@ """<b>Delete Property</b>""" """<p>This deletes a property for the project files.</p>""" )) - self.connect(self.svnPropDelAct, SIGNAL('triggered()'), self.__svnPropDel) + self.svnPropDelAct.triggered.connect(self.__svnPropDel) self.actions.append(self.svnPropDelAct) self.svnRelocateAct = E5Action(self.trUtf8('Relocate'), @@ -442,7 +442,7 @@ """<b>Relocate</b>""" """<p>This relocates the working copy to a new repository URL.</p>""" )) - self.connect(self.svnRelocateAct, SIGNAL('triggered()'), self.__svnRelocate) + self.svnRelocateAct.triggered.connect(self.__svnRelocate) self.actions.append(self.svnRelocateAct) self.svnRepoBrowserAct = E5Action(self.trUtf8('Repository Browser'), @@ -456,7 +456,7 @@ """<b>Repository Browser</b>""" """<p>This shows the Repository Browser dialog.</p>""" )) - self.connect(self.svnRepoBrowserAct, SIGNAL('triggered()'), self.__svnRepoBrowser) + self.svnRepoBrowserAct.triggered.connect(self.__svnRepoBrowser) self.actions.append(self.svnRepoBrowserAct) self.svnConfigAct = E5Action(self.trUtf8('Configure'), @@ -469,7 +469,7 @@ """<b>Configure</b>""" """<p>Show the configuration dialog with the Subversion page selected.</p>""" )) - self.connect(self.svnConfigAct, SIGNAL('triggered()'), self.__svnConfigure) + self.svnConfigAct.triggered.connect(self.__svnConfigure) self.actions.append(self.svnConfigAct) def initMenu(self, menu):
--- a/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/ProjectHelper.py Wed Aug 04 08:54:52 2010 +0200 @@ -57,7 +57,7 @@ """<b>New from repository</b>""" """<p>This creates a new local project from the VCS repository.</p>""" )) - self.connect(self.vcsNewAct, SIGNAL('triggered()'), self._vcsCheckout) + self.vcsNewAct.triggered.connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) self.vcsUpdateAct = E5Action(self.trUtf8('Update from repository'), @@ -71,7 +71,7 @@ """<b>Update from repository</b>""" """<p>This updates the local project from the VCS repository.</p>""" )) - self.connect(self.vcsUpdateAct, SIGNAL('triggered()'), self._vcsUpdate) + self.vcsUpdateAct.triggered.connect(self._vcsUpdate) self.actions.append(self.vcsUpdateAct) self.vcsCommitAct = E5Action(self.trUtf8('Commit changes to repository'), @@ -85,7 +85,7 @@ """<b>Commit changes to repository</b>""" """<p>This commits changes to the local project to the VCS repository.</p>""" )) - self.connect(self.vcsCommitAct, SIGNAL('triggered()'), self._vcsCommit) + self.vcsCommitAct.triggered.connect(self._vcsCommit) self.actions.append(self.vcsCommitAct) self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), @@ -98,7 +98,7 @@ """<b>Add to repository</b>""" """<p>This adds (imports) the local project to the VCS repository.</p>""" )) - self.connect(self.vcsAddAct, SIGNAL('triggered()'), self._vcsImport) + self.vcsAddAct.triggered.connect(self._vcsImport) self.actions.append(self.vcsAddAct) self.vcsRemoveAct = E5Action(self.trUtf8('Remove from repository (and disk)'), @@ -113,7 +113,7 @@ """<p>This removes the local project from the VCS repository""" """ (and disk).</p>""" )) - self.connect(self.vcsRemoveAct, SIGNAL('triggered()'), self._vcsRemove) + self.vcsRemoveAct.triggered.connect(self._vcsRemove) self.actions.append(self.vcsRemoveAct) self.vcsLogAct = E5Action(self.trUtf8('Show log'), @@ -127,7 +127,7 @@ """<b>Show log</b>""" """<p>This shows the log of the local project.</p>""" )) - self.connect(self.vcsLogAct, SIGNAL('triggered()'), self._vcsLog) + self.vcsLogAct.triggered.connect(self._vcsLog) self.actions.append(self.vcsLogAct) self.svnLogLimitedAct = E5Action(self.trUtf8('Show limited log'), @@ -142,7 +142,7 @@ """<p>This shows the log of the local project limited to a selectable""" """ number of entries.</p>""" )) - self.connect(self.svnLogLimitedAct, SIGNAL('triggered()'), self.__svnLogLimited) + self.svnLogLimitedAct.triggered.connect(self.__svnLogLimited) self.actions.append(self.svnLogLimitedAct) self.svnLogBrowserAct = E5Action(self.trUtf8('Show log browser'), @@ -158,7 +158,7 @@ """ A limited number of entries is shown first. More can be""" """ retrieved later on.</p>""" )) - self.connect(self.svnLogBrowserAct, SIGNAL('triggered()'), self.__svnLogBrowser) + self.svnLogBrowserAct.triggered.connect(self.__svnLogBrowser) self.actions.append(self.svnLogBrowserAct) self.vcsDiffAct = E5Action(self.trUtf8('Show difference'), @@ -172,7 +172,7 @@ """<b>Show difference</b>""" """<p>This shows the difference of the local project to the repository.</p>""" )) - self.connect(self.vcsDiffAct, SIGNAL('triggered()'), self._vcsDiff) + self.vcsDiffAct.triggered.connect(self._vcsDiff) self.actions.append(self.vcsDiffAct) self.svnExtDiffAct = E5Action(self.trUtf8('Show difference (extended)'), @@ -186,7 +186,7 @@ """<b>Show difference (extended)</b>""" """<p>This shows the difference of selectable revisions of the project.</p>""" )) - self.connect(self.svnExtDiffAct, SIGNAL('triggered()'), self.__svnExtendedDiff) + self.svnExtDiffAct.triggered.connect(self.__svnExtendedDiff) self.actions.append(self.svnExtDiffAct) self.svnUrlDiffAct = E5Action(self.trUtf8('Show difference (URLs)'), @@ -201,7 +201,7 @@ """<p>This shows the difference of the project between""" """ two repository URLs.</p>""" )) - self.connect(self.svnUrlDiffAct, SIGNAL('triggered()'), self.__svnUrlDiff) + self.svnUrlDiffAct.triggered.connect(self.__svnUrlDiff) self.actions.append(self.svnUrlDiffAct) self.vcsStatusAct = E5Action(self.trUtf8('Show status'), @@ -215,7 +215,7 @@ """<b>Show status</b>""" """<p>This shows the status of the local project.</p>""" )) - self.connect(self.vcsStatusAct, SIGNAL('triggered()'), self._vcsStatus) + self.vcsStatusAct.triggered.connect(self._vcsStatus) self.actions.append(self.vcsStatusAct) self.vcsTagAct = E5Action(self.trUtf8('Tag in repository'), @@ -229,7 +229,7 @@ """<b>Tag in repository</b>""" """<p>This tags the local project in the repository.</p>""" )) - self.connect(self.vcsTagAct, SIGNAL('triggered()'), self._vcsTag) + self.vcsTagAct.triggered.connect(self._vcsTag) self.actions.append(self.vcsTagAct) self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), @@ -243,7 +243,7 @@ """<b>Export from repository</b>""" """<p>This exports a project from the repository.</p>""" )) - self.connect(self.vcsExportAct, SIGNAL('triggered()'), self._vcsExport) + self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) self.vcsPropsAct = E5Action(self.trUtf8('Command options'), @@ -254,7 +254,7 @@ """<b>Command options...</b>""" """<p>This shows a dialog to edit the VCS command options.</p>""" )) - self.connect(self.vcsPropsAct, SIGNAL('triggered()'), self._vcsCommandOptions) + self.vcsPropsAct.triggered.connect(self._vcsCommandOptions) self.actions.append(self.vcsPropsAct) self.vcsRevertAct = E5Action(self.trUtf8('Revert changes'), @@ -268,7 +268,7 @@ """<b>Revert changes</b>""" """<p>This reverts all changes made to the local project.</p>""" )) - self.connect(self.vcsRevertAct, SIGNAL('triggered()'), self._vcsRevert) + self.vcsRevertAct.triggered.connect(self._vcsRevert) self.actions.append(self.vcsRevertAct) self.vcsMergeAct = E5Action(self.trUtf8('Merge'), @@ -282,7 +282,7 @@ """<b>Merge</b>""" """<p>This merges changes of a tag/revision into the local project.</p>""" )) - self.connect(self.vcsMergeAct, SIGNAL('triggered()'), self._vcsMerge) + self.vcsMergeAct.triggered.connect(self._vcsMerge) self.actions.append(self.vcsMergeAct) self.vcsSwitchAct = E5Action(self.trUtf8('Switch'), @@ -296,7 +296,7 @@ """<b>Switch</b>""" """<p>This switches the local copy to another tag/branch.</p>""" )) - self.connect(self.vcsSwitchAct, SIGNAL('triggered()'), self._vcsSwitch) + self.vcsSwitchAct.triggered.connect(self._vcsSwitch) self.actions.append(self.vcsSwitchAct) self.vcsResolveAct = E5Action(self.trUtf8('Resolve conflicts'), @@ -309,7 +309,7 @@ """<b>Resolve conflicts</b>""" """<p>This resolves all conflicts of the local project.</p>""" )) - self.connect(self.vcsResolveAct, SIGNAL('triggered()'), self.__svnResolve) + self.vcsResolveAct.triggered.connect(self.__svnResolve) self.actions.append(self.vcsResolveAct) self.vcsCleanupAct = E5Action(self.trUtf8('Cleanup'), @@ -322,7 +322,7 @@ """<b>Cleanup</b>""" """<p>This performs a cleanup of the local project.</p>""" )) - self.connect(self.vcsCleanupAct, SIGNAL('triggered()'), self._vcsCleanup) + self.vcsCleanupAct.triggered.connect(self._vcsCleanup) self.actions.append(self.vcsCleanupAct) self.vcsCommandAct = E5Action(self.trUtf8('Execute command'), @@ -335,7 +335,7 @@ """<b>Execute command</b>""" """<p>This opens a dialog to enter an arbitrary VCS command.</p>""" )) - self.connect(self.vcsCommandAct, SIGNAL('triggered()'), self._vcsCommand) + self.vcsCommandAct.triggered.connect(self._vcsCommand) self.actions.append(self.vcsCommandAct) self.svnTagListAct = E5Action(self.trUtf8('List tags'), @@ -348,7 +348,7 @@ """<b>List tags</b>""" """<p>This lists the tags of the project.</p>""" )) - self.connect(self.svnTagListAct, SIGNAL('triggered()'), self.__svnTagList) + self.svnTagListAct.triggered.connect(self.__svnTagList) self.actions.append(self.svnTagListAct) self.svnBranchListAct = E5Action(self.trUtf8('List branches'), @@ -361,7 +361,7 @@ """<b>List branches</b>""" """<p>This lists the branches of the project.</p>""" )) - self.connect(self.svnBranchListAct, SIGNAL('triggered()'), self.__svnBranchList) + self.svnBranchListAct.triggered.connect(self.__svnBranchList) self.actions.append(self.svnBranchListAct) self.svnListAct = E5Action(self.trUtf8('List repository contents'), @@ -374,7 +374,7 @@ """<b>List repository contents</b>""" """<p>This lists the contents of the repository.</p>""" )) - self.connect(self.svnListAct, SIGNAL('triggered()'), self.__svnTagList) + self.svnListAct.triggered.connect(self.__svnTagList) self.actions.append(self.svnListAct) self.svnPropSetAct = E5Action(self.trUtf8('Set Property'), @@ -387,7 +387,7 @@ """<b>Set Property</b>""" """<p>This sets a property for the project files.</p>""" )) - self.connect(self.svnPropSetAct, SIGNAL('triggered()'), self.__svnPropSet) + self.svnPropSetAct.triggered.connect(self.__svnPropSet) self.actions.append(self.svnPropSetAct) self.svnPropListAct = E5Action(self.trUtf8('List Properties'), @@ -400,7 +400,7 @@ """<b>List Properties</b>""" """<p>This lists the properties of the project files.</p>""" )) - self.connect(self.svnPropListAct, SIGNAL('triggered()'), self.__svnPropList) + self.svnPropListAct.triggered.connect(self.__svnPropList) self.actions.append(self.svnPropListAct) self.svnPropDelAct = E5Action(self.trUtf8('Delete Property'), @@ -413,7 +413,7 @@ """<b>Delete Property</b>""" """<p>This deletes a property for the project files.</p>""" )) - self.connect(self.svnPropDelAct, SIGNAL('triggered()'), self.__svnPropDel) + self.svnPropDelAct.triggered.connect(self.__svnPropDel) self.actions.append(self.svnPropDelAct) self.svnRelocateAct = E5Action(self.trUtf8('Relocate'), @@ -427,7 +427,7 @@ """<b>Relocate</b>""" """<p>This relocates the working copy to a new repository URL.</p>""" )) - self.connect(self.svnRelocateAct, SIGNAL('triggered()'), self.__svnRelocate) + self.svnRelocateAct.triggered.connect(self.__svnRelocate) self.actions.append(self.svnRelocateAct) self.svnRepoBrowserAct = E5Action(self.trUtf8('Repository Browser'), @@ -441,7 +441,7 @@ """<b>Repository Browser</b>""" """<p>This shows the Repository Browser dialog.</p>""" )) - self.connect(self.svnRepoBrowserAct, SIGNAL('triggered()'), self.__svnRepoBrowser) + self.svnRepoBrowserAct.triggered.connect(self.__svnRepoBrowser) self.actions.append(self.svnRepoBrowserAct) self.svnConfigAct = E5Action(self.trUtf8('Configure'), @@ -454,7 +454,7 @@ """<b>Configure</b>""" """<p>Show the configuration dialog with the Subversion page selected.</p>""" )) - self.connect(self.svnConfigAct, SIGNAL('triggered()'), self.__svnConfigure) + self.svnConfigAct.triggered.connect(self.__svnConfigure) self.actions.append(self.svnConfigAct) def initMenu(self, menu):
--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py Wed Aug 04 08:54:52 2010 +0200 @@ -217,7 +217,7 @@ """<b>Tile the windows</b>""" """<p>Rearrange and resize the windows so that they are tiled.</p>""" )) - self.connect(self.tileAct, SIGNAL('triggered()'), self.tile) + self.tileAct.triggered.connect(self.tile) self.windowActions.append(self.tileAct) self.cascadeAct = E5Action(self.trUtf8('Cascade'), @@ -227,7 +227,7 @@ """<b>Cascade the windows</b>""" """<p>Rearrange and resize the windows so that they are cascaded.</p>""" )) - self.connect(self.cascadeAct, SIGNAL('triggered()'), self.cascade) + self.cascadeAct.triggered.connect(self.cascade) self.windowActions.append(self.cascadeAct) self.nextChildAct = E5Action(self.trUtf8('Next'), @@ -237,7 +237,7 @@ """<b>Next</b>""" """<p>Activate the next window of the list of open windows.</p>""" )) - self.connect(self.nextChildAct, SIGNAL('triggered()'), self.activateNextSubWindow) + self.nextChildAct.triggered.connect(self.activateNextSubWindow) self.windowActions.append(self.nextChildAct) self.prevChildAct = E5Action(self.trUtf8('Previous'), @@ -247,8 +247,7 @@ """<b>Previous</b>""" """<p>Activate the previous window of the list of open windows.</p>""" )) - self.connect(self.prevChildAct, SIGNAL('triggered()'), - self.activatePreviousSubWindow) + self.prevChildAct.triggered.connect(self.activatePreviousSubWindow) self.windowActions.append(self.prevChildAct) self.restoreAllAct = E5Action(self.trUtf8('Restore All'), @@ -258,7 +257,7 @@ """<b>Restore All</b>""" """<p>Restores all windows to their original size.</p>""" )) - self.connect(self.restoreAllAct, SIGNAL('triggered()'), self.__restoreAllWindows) + self.restoreAllAct.triggered.connect(self.__restoreAllWindows) self.windowActions.append(self.restoreAllAct) self.iconizeAllAct = E5Action(self.trUtf8('Iconize All'), @@ -268,7 +267,7 @@ """<b>Iconize All</b>""" """<p>Iconizes all windows.</p>""" )) - self.connect(self.iconizeAllAct, SIGNAL('triggered()'), self.__iconizeAllWindows) + self.iconizeAllAct.triggered.connect(self.__iconizeAllWindows) self.windowActions.append(self.iconizeAllAct) def setEditorName(self, editor, newName): @@ -365,4 +364,4 @@ Private slot to iconize all windows. """ for win in self.subWindowList(): - win.showMinimized() + win.showMinimized() \ No newline at end of file
--- a/Project/Project.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Project/Project.py Wed Aug 04 08:54:52 2010 +0200 @@ -3348,7 +3348,7 @@ """<p>This opens a dialog for entering the info for a""" """ new project.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.newProject) + act.triggered.connect(self.newProject) self.actions.append(act) act = E5Action(self.trUtf8('Open project'), @@ -3360,7 +3360,7 @@ """<b>Open...</b>""" """<p>This opens an existing project.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.openProject) + act.triggered.connect(self.openProject) self.actions.append(act) self.closeAct = E5Action(self.trUtf8('Close project'), @@ -3371,7 +3371,7 @@ """<b>Close</b>""" """<p>This closes the current project.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.closeProject) + self.closeAct.triggered.connect(self.closeProject) self.actions.append(self.closeAct) self.saveAct = E5Action(self.trUtf8('Save project'), @@ -3382,7 +3382,7 @@ """<b>Save</b>""" """<p>This saves the current project.</p>""" )) - self.connect(self.saveAct, SIGNAL('triggered()'), self.saveProject) + self.saveAct.triggered.connect(self.saveProject) self.actions.append(self.saveAct) self.saveasAct = E5Action(self.trUtf8('Save project as'), @@ -3393,7 +3393,7 @@ """<b>Save as</b>""" """<p>This saves the current project to a new file.</p>""" )) - self.connect(self.saveasAct, SIGNAL('triggered()'), self.saveProjectAs) + self.saveasAct.triggered.connect(self.saveProjectAs) self.actions.append(self.saveasAct) self.actGrp2 = createActionGroup(self) @@ -3409,7 +3409,7 @@ """ to the current project. The place to add is""" """ determined by the file extension.</p>""" )) - self.connect(self.addFilesAct, SIGNAL('triggered()'), self.addFiles) + self.addFilesAct.triggered.connect(self.addFiles) self.actions.append(self.addFilesAct) self.addDirectoryAct = E5Action(self.trUtf8('Add directory to project'), @@ -3423,7 +3423,7 @@ """<p>This opens a dialog for adding a directory""" """ to the current project.</p>""" )) - self.connect(self.addDirectoryAct, SIGNAL('triggered()'), self.addDirectory) + self.addDirectoryAct.triggered.connect(self.addDirectory) self.actions.append(self.addDirectoryAct) self.addLanguageAct = E5Action(self.trUtf8('Add translation to project'), @@ -3437,7 +3437,7 @@ """<p>This opens a dialog for add a translation""" """ to the current project.</p>""" )) - self.connect(self.addLanguageAct, SIGNAL('triggered()'), self.addLanguage) + self.addLanguageAct.triggered.connect(self.addLanguage) self.actions.append(self.addLanguageAct) act = E5Action(self.trUtf8('Search new files'), @@ -3449,7 +3449,7 @@ """<p>This searches for new files (sources, *.ui, *.idl) in the project""" """ directory and registered subdirectories.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__searchNewFiles) + act.triggered.connect(self.__searchNewFiles) self.actions.append(act) self.propsAct = E5Action(self.trUtf8('Project properties'), @@ -3460,7 +3460,7 @@ """<b>Properties...</b>""" """<p>This shows a dialog to edit the project properties.</p>""" )) - self.connect(self.propsAct, SIGNAL('triggered()'), self.__showProperties) + self.propsAct.triggered.connect(self.__showProperties) self.actions.append(self.propsAct) self.userPropsAct = E5Action(self.trUtf8('User project properties'), @@ -3472,7 +3472,7 @@ """<b>User Properties...</b>""" """<p>This shows a dialog to edit the user specific project properties.</p>""" )) - self.connect(self.userPropsAct, SIGNAL('triggered()'), self.__showUserProperties) + self.userPropsAct.triggered.connect(self.__showUserProperties) self.actions.append(self.userPropsAct) self.filetypesAct = E5Action(self.trUtf8('Filetype Associations'), @@ -3487,8 +3487,7 @@ """ or others) with a filename pattern. They are used when adding a file""" """ to the project and when performing a search for new files.</p>""" )) - self.connect(self.filetypesAct, SIGNAL('triggered()'), - self.__showFiletypeAssociations) + self.filetypesAct.triggered.connect(self.__showFiletypeAssociations) self.actions.append(self.filetypesAct) self.lexersAct = E5Action(self.trUtf8('Lexer Associations'), @@ -3502,8 +3501,7 @@ """ These associations override the global lexer associations. Lexers""" """ are used to highlight the editor text.</p>""" )) - self.connect(self.lexersAct, SIGNAL('triggered()'), - self.__showLexerAssociations) + self.lexersAct.triggered.connect(self.__showLexerAssociations) self.actions.append(self.lexersAct) self.dbgActGrp = createActionGroup(self) @@ -3516,7 +3514,7 @@ """<b>Debugger Properties...</b>""" """<p>This shows a dialog to edit project specific debugger settings.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__showDebugProperties) + act.triggered.connect(self.__showDebugProperties) self.actions.append(act) act = E5Action(self.trUtf8('Load'), @@ -3527,7 +3525,7 @@ """<b>Load Debugger Properties</b>""" """<p>This loads the project specific debugger settings.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__readDebugProperties) + act.triggered.connect(self.__readDebugProperties) self.actions.append(act) act = E5Action(self.trUtf8('Save'), @@ -3538,7 +3536,7 @@ """<b>Save Debugger Properties</b>""" """<p>This saves the project specific debugger settings.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__writeDebugProperties) + act.triggered.connect(self.__writeDebugProperties) self.actions.append(act) act = E5Action(self.trUtf8('Delete'), @@ -3550,7 +3548,7 @@ """<p>This deletes the file containing the project specific""" """ debugger settings.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__deleteDebugProperties) + act.triggered.connect(self.__deleteDebugProperties) self.actions.append(act) act = E5Action(self.trUtf8('Reset'), @@ -3561,7 +3559,7 @@ """<b>Reset Debugger Properties</b>""" """<p>This resets the project specific debugger settings.</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__initDebugProperties) + act.triggered.connect(self.__initDebugProperties) self.actions.append(act) self.sessActGrp = createActionGroup(self) @@ -3580,7 +3578,7 @@ """- the working directory<br>""" """- the exception reporting flag</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__readSession) + act.triggered.connect(self.__readSession) self.actions.append(act) act = E5Action(self.trUtf8('Save session'), @@ -3597,7 +3595,7 @@ """- the working directory<br>""" """- the exception reporting flag</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__writeSession) + act.triggered.connect(self.__writeSession) self.actions.append(act) act = E5Action(self.trUtf8('Delete session'), @@ -3608,7 +3606,7 @@ """<b>Delete session</b>""" """<p>This deletes the projects session file</p>""" )) - self.connect(act, SIGNAL('triggered()'), self.__deleteSession) + act.triggered.connect(self.__deleteSession) self.actions.append(act) self.chkGrp = createActionGroup(self) @@ -3622,7 +3620,7 @@ """<b>Code Metrics...</b>""" """<p>This shows some code metrics for all Python files in the project.</p>""" )) - self.connect(self.codeMetricsAct, SIGNAL('triggered()'), self.__showCodeMetrics) + self.codeMetricsAct.triggered.connect(self.__showCodeMetrics) self.actions.append(self.codeMetricsAct) self.codeCoverageAct = E5Action(self.trUtf8('Python Code Coverage'), @@ -3635,7 +3633,7 @@ """<p>This shows the code coverage information for all Python files""" """ in the project.</p>""" )) - self.connect(self.codeCoverageAct, SIGNAL('triggered()'), self.__showCodeCoverage) + self.codeCoverageAct.triggered.connect(self.__showCodeCoverage) self.actions.append(self.codeCoverageAct) self.codeProfileAct = E5Action(self.trUtf8('Profile Data'), @@ -3647,7 +3645,7 @@ """<b>Profile Data...</b>""" """<p>This shows the profiling data for the project.</p>""" )) - self.connect(self.codeProfileAct, SIGNAL('triggered()'), self.__showProfileData) + self.codeProfileAct.triggered.connect(self.__showProfileData) self.actions.append(self.codeProfileAct) self.applicationDiagramAct = E5Action(self.trUtf8('Application Diagram'), @@ -3659,8 +3657,7 @@ """<b>Application Diagram...</b>""" """<p>This shows a diagram of the project.</p>""" )) - self.connect(self.applicationDiagramAct, - SIGNAL('triggered()'), self.handleApplicationDiagram) + self.applicationDiagramAct.triggered.connect(self.handleApplicationDiagram) self.actions.append(self.applicationDiagramAct) self.pluginGrp = createActionGroup(self) @@ -3676,8 +3673,7 @@ """<p>This creates an initial list of files to include in an eric5 """ """plugin archive. The list is created from the project file.</p>""" )) - self.connect(self.pluginPkgListAct, SIGNAL('triggered()'), - self.__pluginCreatePkgList) + self.pluginPkgListAct.triggered.connect(self.__pluginCreatePkgList) self.actions.append(self.pluginPkgListAct) self.pluginArchiveAct = E5Action(self.trUtf8('Create Plugin Archive'), @@ -3692,8 +3688,7 @@ """given in the PKGLIST file. The archive name is built from the main """ """script name.</p>""" )) - self.connect(self.pluginArchiveAct, SIGNAL('triggered()'), - self.__pluginCreateArchive) + self.pluginArchiveAct.triggered.connect(self.__pluginCreateArchive) self.actions.append(self.pluginArchiveAct) self.pluginSArchiveAct = E5Action(self.trUtf8('Create Plugin Archive (Snapshot)'), @@ -3709,8 +3704,7 @@ """script name. The version entry of the main script is modified to """ """reflect a snapshot release.</p>""" )) - self.connect(self.pluginSArchiveAct, SIGNAL('triggered()'), - self.__pluginCreateSnapshotArchive) + self.pluginSArchiveAct.triggered.connect(self.__pluginCreateSnapshotArchive) self.actions.append(self.pluginSArchiveAct) self.closeAct.setEnabled(False) @@ -4704,4 +4698,4 @@ .replace('"', "").replace("'", "") break - return version + return version \ No newline at end of file
--- a/QScintilla/MiniEditor.py Mon Aug 02 08:33:11 2010 +0200 +++ b/QScintilla/MiniEditor.py Wed Aug 04 08:54:52 2010 +0200 @@ -358,7 +358,7 @@ """<b>New</b>""" """<p>An empty editor window will be created.</p>""" )) - self.connect(self.newAct, SIGNAL('triggered()'), self.__newFile) + self.newAct.triggered.connect(self.__newFile) self.fileActions.append(self.newAct) self.openAct = E5Action(self.trUtf8('Open'), @@ -371,7 +371,7 @@ """<b>Open a file</b>""" """<p>You will be asked for the name of a file to be opened.</p>""" )) - self.connect(self.openAct, SIGNAL('triggered()'), self.__open) + self.openAct.triggered.connect(self.__open) self.fileActions.append(self.openAct) self.saveAct = E5Action(self.trUtf8('Save'), @@ -384,7 +384,7 @@ """<b>Save File</b>""" """<p>Save the contents of current editor window.</p>""" )) - self.connect(self.saveAct, SIGNAL('triggered()'), self.__save) + self.saveAct.triggered.connect(self.__save) self.fileActions.append(self.saveAct) self.saveAsAct = E5Action(self.trUtf8('Save as'), @@ -398,7 +398,7 @@ """<p>Save the contents of current editor window to a new file.""" """ The file can be entered in a file selection dialog.</p>""" )) - self.connect(self.saveAsAct, SIGNAL('triggered()'), self.__saveAs) + self.saveAsAct.triggered.connect(self.__saveAs) self.fileActions.append(self.saveAsAct) self.closeAct = E5Action(self.trUtf8('Close'), @@ -411,7 +411,7 @@ """<b>Close Window</b>""" """<p>Close the current window.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.close) + self.closeAct.triggered.connect(self.close) self.fileActions.append(self.closeAct) self.printAct = E5Action(self.trUtf8('Print'), @@ -424,7 +424,7 @@ """<b>Print File</b>""" """<p>Print the contents of the current file.</p>""" )) - self.connect(self.printAct, SIGNAL('triggered()'), self.__printFile) + self.printAct.triggered.connect(self.__printFile) self.fileActions.append(self.printAct) self.printPreviewAct = \ @@ -438,8 +438,7 @@ """<b>Print Preview</b>""" """<p>Print preview of the current file.</p>""" )) - self.connect(self.printPreviewAct, SIGNAL('triggered()'), - self.__printPreviewFile) + self.printPreviewAct.triggered.connect(self.__printPreviewFile) self.fileActions.append(self.printPreviewAct) def __createEditActions(self): @@ -457,7 +456,7 @@ """<b>Undo</b>""" """<p>Undo the last change done in the current editor.</p>""" )) - self.connect(self.undoAct, SIGNAL('triggered()'), self.__undo) + self.undoAct.triggered.connect(self.__undo) self.editActions.append(self.undoAct) self.redoAct = E5Action(self.trUtf8('Redo'), @@ -470,7 +469,7 @@ """<b>Redo</b>""" """<p>Redo the last change done in the current editor.</p>""" )) - self.connect(self.redoAct, SIGNAL('triggered()'), self.__redo) + self.redoAct.triggered.connect(self.__redo) self.editActions.append(self.redoAct) self.cutAct = E5Action(self.trUtf8('Cut'), @@ -484,7 +483,7 @@ """<b>Cut</b>""" """<p>Cut the selected text of the current editor to the clipboard.</p>""" )) - self.connect(self.cutAct, SIGNAL('triggered()'), self.__textEdit.cut) + self.cutAct.triggered.connect(self.__textEdit.cut) self.editActions.append(self.cutAct) self.copyAct = E5Action(self.trUtf8('Copy'), @@ -498,7 +497,7 @@ """<b>Copy</b>""" """<p>Copy the selected text of the current editor to the clipboard.</p>""" )) - self.connect(self.copyAct, SIGNAL('triggered()'), self.__textEdit.copy) + self.copyAct.triggered.connect(self.__textEdit.copy) self.editActions.append(self.copyAct) self.pasteAct = E5Action(self.trUtf8('Paste'), @@ -513,7 +512,7 @@ """<p>Paste the last cut/copied text from the clipboard to""" """ the current editor.</p>""" )) - self.connect(self.pasteAct, SIGNAL('triggered()'), self.__textEdit.paste) + self.pasteAct.triggered.connect(self.__textEdit.paste) self.editActions.append(self.pasteAct) self.deleteAct = E5Action(self.trUtf8('Clear'), @@ -527,7 +526,7 @@ """<b>Clear</b>""" """<p>Delete all text of the current editor.</p>""" )) - self.connect(self.deleteAct, SIGNAL('triggered()'), self.__textEdit.clear) + self.deleteAct.triggered.connect(self.__textEdit.clear) self.editActions.append(self.deleteAct) self.cutAct.setEnabled(False); @@ -551,7 +550,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), @@ -559,7 +558,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, self.editorActGrp, 'vm_edit_move_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), @@ -567,7 +566,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), @@ -575,7 +574,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), @@ -583,7 +582,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), @@ -591,7 +590,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), @@ -599,7 +598,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), @@ -608,7 +607,7 @@ 0, self.editorActGrp, 'vm_edit_move_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -618,7 +617,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Home')), 0, self.editorActGrp, 'vm_edit_move_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -628,7 +627,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Home')), 0, self.editorActGrp, 'vm_edit_move_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), @@ -636,7 +635,7 @@ QKeySequence(QApplication.translate('ViewManager', 'End')), 0, self.editorActGrp, 'vm_edit_move_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view down one line'), @@ -644,7 +643,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), @@ -652,7 +651,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), @@ -660,7 +659,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), @@ -668,7 +667,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), @@ -676,7 +675,7 @@ QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), @@ -684,7 +683,7 @@ QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, self.editorActGrp, 'vm_edit_move_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), @@ -692,7 +691,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Home')), 0, self.editorActGrp, 'vm_edit_move_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), @@ -700,7 +699,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+End')), 0, self.editorActGrp, 'vm_edit_move_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), @@ -708,7 +707,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), @@ -716,7 +715,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -727,7 +726,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -738,7 +737,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -748,7 +747,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -759,7 +758,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -771,7 +770,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -783,7 +782,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -795,7 +794,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -807,7 +806,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -818,7 +817,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -830,7 +829,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -840,7 +839,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -851,7 +850,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -863,7 +862,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -874,7 +873,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -885,7 +884,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -897,7 +896,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTARTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -909,7 +908,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -920,7 +919,7 @@ 'Shift+Backspace')), self.editorActGrp, 'vm_edit_delete_previous_char') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -930,7 +929,7 @@ 0, 0, self.editorActGrp, 'vm_edit_delet_previous_char_not_line_start') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACKNOTLINE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), @@ -938,7 +937,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, self.editorActGrp, 'vm_edit_delete_current_char') self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), @@ -948,7 +947,7 @@ 0, self.editorActGrp, 'vm_edit_delete_word_left') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), @@ -956,7 +955,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), @@ -966,7 +965,7 @@ 0, self.editorActGrp, 'vm_edit_delete_line_left') self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), @@ -976,7 +975,7 @@ 0, self.editorActGrp, 'vm_edit_delete_line_right') self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), @@ -985,7 +984,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -995,7 +994,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Return')), QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), self.editorActGrp, 'vm_edit_insert_line_below') - self.connect(act, SIGNAL('triggered()'), self.__textEdit.newLineBelow) + act.triggered.connect(self.__textEdit.newLineBelow) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), @@ -1004,7 +1003,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+L')), self.editorActGrp, 'vm_edit_delete_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), @@ -1012,7 +1011,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1022,7 +1021,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), @@ -1031,7 +1030,7 @@ 0, self.editorActGrp, 'vm_edit_cut_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECUT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), @@ -1040,7 +1039,7 @@ 0, self.editorActGrp, 'vm_edit_copy_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECOPY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), @@ -1048,7 +1047,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1059,7 +1058,7 @@ 0, self.editorActGrp, 'vm_edit_convert_selection_lower') self.esm.setMapping(act, QsciScintilla.SCI_LOWERCASE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1070,7 +1069,7 @@ 0, self.editorActGrp, 'vm_edit_convert_selection_upper') self.esm.setMapping(act, QsciScintilla.SCI_UPPERCASE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1080,7 +1079,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+End')), 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1090,7 +1089,7 @@ 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), @@ -1098,7 +1097,7 @@ 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Escape'), @@ -1106,7 +1105,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1118,7 +1117,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1129,7 +1128,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1141,7 +1140,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1153,7 +1152,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1168,7 +1167,7 @@ self.editorActGrp, 'vm_edit_extend_rect_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1179,7 +1178,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1191,7 +1190,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1203,7 +1202,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1214,7 +1213,7 @@ 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) self.__textEdit.addActions(self.editorActGrp.actions()) @@ -1238,7 +1237,7 @@ """ dialog is shown to enter the searchtext and options""" """ for the search.</p>""" )) - self.connect(self.searchAct, SIGNAL('triggered()'), self.__search) + self.searchAct.triggered.connect(self.__search) self.searchActions.append(self.searchAct) self.searchNextAct = E5Action(QApplication.translate('ViewManager', @@ -1256,7 +1255,7 @@ """<p>Search the next occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" )) - self.connect(self.searchNextAct, SIGNAL('triggered()'), self.searchDlg.findNext) + self.searchNextAct.triggered.connect(self.searchDlg.findNext) self.searchActions.append(self.searchNextAct) self.searchPrevAct = E5Action(QApplication.translate('ViewManager', @@ -1274,7 +1273,7 @@ """<p>Search the previous occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" )) - self.connect(self.searchPrevAct, SIGNAL('triggered()'), self.searchDlg.findPrev) + self.searchPrevAct.triggered.connect(self.searchDlg.findPrev) self.searchActions.append(self.searchPrevAct) self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', @@ -1291,8 +1290,7 @@ """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" )) - self.connect(self.searchClearMarkersAct, SIGNAL('triggered()'), - self.__searchClearMarkers) + self.searchClearMarkersAct.triggered.connect(self.__searchClearMarkers) self.searchActions.append(self.searchClearMarkersAct) self.replaceAct = E5Action(QApplication.translate('ViewManager', 'Replace'), @@ -1309,7 +1307,7 @@ """ dialog is shown to enter the searchtext, the replacement text""" """ and options for the search and replace.</p>""" )) - self.connect(self.replaceAct, SIGNAL('triggered()'), self.__replace) + self.replaceAct.triggered.connect(self.__replace) self.searchActions.append(self.replaceAct) def __createHelpActions(self): @@ -1323,7 +1321,7 @@ self.aboutAct.setWhatsThis(self.trUtf8( """<b>About</b>""" """<p>Display some information about this software.</p>""")) - self.connect(self.aboutAct, SIGNAL('triggered()'), self.__about) + self.aboutAct.triggered.connect(self.__about) self.helpActions.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), @@ -1334,7 +1332,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct, SIGNAL('triggered()'), self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) self.helpActions.append(self.aboutQtAct) self.whatsThisAct = E5Action(self.trUtf8('What\'s This?'), @@ -1351,7 +1349,7 @@ """ dialogs, this feature can be accessed using the context help button""" """ in the titlebar.</p>""" )) - self.connect(self.whatsThisAct, SIGNAL('triggered()'), self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.helpActions.append(self.whatsThisAct) def __createMenus(self): @@ -2300,4 +2298,4 @@ fileEol = self.__textEdit.detectEolString(txt) self.__textEdit.setEolModeByEolString(fileEol) - self.__textEdit.setModified(False) + self.__textEdit.setModified(False) \ No newline at end of file
--- a/QScintilla/SearchReplaceWidget.py Mon Aug 02 08:33:11 2010 +0200 +++ b/QScintilla/SearchReplaceWidget.py Wed Aug 04 08:54:52 2010 +0200 @@ -116,16 +116,14 @@ self.findNextAct = E5Action(self.trUtf8('Find Next'), self.trUtf8('Find Next'), 0, 0, self, 'search_widget_find_next') - self.connect(self.findNextAct, SIGNAL('triggered()'), - self.on_findNextButton_clicked) + self.findNextAct.triggered.connect(self.on_findNextButton_clicked) self.findNextAct.setEnabled(False) self.ui.findtextCombo.addAction(self.findNextAct) self.findPrevAct = E5Action(self.trUtf8('Find Prev'), self.trUtf8('Find Prev'), 0, 0, self, 'search_widget_find_prev') - self.connect(self.findPrevAct, SIGNAL('triggered()'), - self.on_findPrevButton_clicked) + self.findPrevAct.triggered.connect(self.on_findPrevButton_clicked) self.findPrevAct.setEnabled(False) self.ui.findtextCombo.addAction(self.findPrevAct) @@ -626,4 +624,4 @@ if aw: aw.setFocus(Qt.ActiveWindowFocusReason) event.accept() - self.close() + self.close() \ No newline at end of file
--- a/QScintilla/Terminal.py Mon Aug 02 08:33:11 2010 +0200 +++ b/QScintilla/Terminal.py Wed Aug 04 08:54:52 2010 +0200 @@ -94,13 +94,13 @@ self.cmenu = QMenu(self.trUtf8('Ctrl Commands')) act = self.cmenu.addAction(self.trUtf8('Ctrl-C')) self.csm.setMapping(act, 3) - self.connect(act, SIGNAL('triggered()'), self.csm, SLOT('map()')) + act.triggered.connect(self.csm.map) act = self.cmenu.addAction(self.trUtf8('Ctrl-D')) self.csm.setMapping(act, 4) - self.connect(act, SIGNAL('triggered()'), self.csm, SLOT('map()')) + act.triggered.connect(self.csm.map) act = self.cmenu.addAction(self.trUtf8('Ctrl-Z')) self.csm.setMapping(act, 26) - self.connect(act, SIGNAL('triggered()'), self.csm, SLOT('map()')) + act.triggered.connect(self.csm.map) # Create a little context menu self.menu = QMenu(self) @@ -931,4 +931,4 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("terminalPage") + e5App().getObject("UserInterface").showPreferences("terminalPage") \ No newline at end of file
--- a/SqlBrowser/SqlBrowser.py Mon Aug 02 08:33:11 2010 +0200 +++ b/SqlBrowser/SqlBrowser.py Wed Aug 04 08:54:52 2010 +0200 @@ -93,8 +93,7 @@ """<b>Add Connection</b>""" """<p>This opens a dialog to add a new database connection.</p>""" )) - self.connect(self.addConnectionAct, SIGNAL('triggered()'), - self.__browser.addConnectionByDialog) + self.addConnectionAct.triggered.connect(self.__browser.addConnectionByDialog) self.__actions.append(self.addConnectionAct) self.exitAct = E5Action(self.trUtf8('Quit'), @@ -118,7 +117,7 @@ """<b>About</b>""" """<p>Display some information about this software.</p>""" )) - self.connect(self.aboutAct, SIGNAL('triggered()'), self.__about) + self.aboutAct.triggered.connect(self.__about) self.__actions.append(self.aboutAct) self.aboutQtAct = E5Action(self.trUtf8('About Qt'), @@ -130,7 +129,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct, SIGNAL('triggered()'), self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) self.__actions.append(self.aboutQtAct) def __initMenus(self): @@ -178,4 +177,4 @@ """ Private slot to show info about Qt. """ - QMessageBox.aboutQt(self, self.trUtf8("SQL Browser")) + QMessageBox.aboutQt(self, self.trUtf8("SQL Browser")) \ No newline at end of file
--- a/SqlBrowser/SqlConnectionWidget.py Mon Aug 02 08:33:11 2010 +0200 +++ b/SqlBrowser/SqlConnectionWidget.py Wed Aug 04 08:54:52 2010 +0200 @@ -37,8 +37,8 @@ refreshAction = QAction(self.trUtf8("Refresh"), self.__connectionTree) self.__schemaAction = QAction(self.trUtf8("Show Schema"), self.__connectionTree) - self.connect(refreshAction, SIGNAL("triggered()"), self.refresh) - self.connect(self.__schemaAction, SIGNAL("triggered()"), self.showSchema) + refreshAction.triggered.connect(self.refresh) + self.__schemaAction.triggered.connect(self.showSchema) self.__connectionTree.addAction(refreshAction) self.__connectionTree.addAction(self.__schemaAction) @@ -169,4 +169,4 @@ self.__setBold(itm, True) self.__activeDb = QSqlDatabase.connectionNames()[ - self.__connectionTree.indexOfTopLevelItem(itm)] + self.__connectionTree.indexOfTopLevelItem(itm)] \ No newline at end of file
--- a/Tools/TRPreviewer.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Tools/TRPreviewer.py Wed Aug 04 08:54:52 2010 +0200 @@ -148,7 +148,7 @@ """<b>Open UI Files</b>""" """<p>This opens some UI files for display.</p>""" )) - self.connect(self.openUIAct, SIGNAL('triggered()'), self.__openWidget) + self.openUIAct.triggered.connect(self.__openWidget) self.openQMAct = QAction(UI.PixmapCache.getIcon("openQM.png"), self.trUtf8('Open &Translation Files...'), self) @@ -157,7 +157,7 @@ """<b>Open Translation Files</b>""" """<p>This opens some translation files for display.</p>""" )) - self.connect(self.openQMAct, SIGNAL('triggered()'), self.__openTranslation) + self.openQMAct.triggered.connect(self.__openTranslation) self.reloadAct = QAction(UI.PixmapCache.getIcon("reload.png"), self.trUtf8('&Reload Translations'), self) @@ -166,7 +166,7 @@ """<b>Reload Translations</b>""" """<p>This reloads the translations for the loaded languages.</p>""" )) - self.connect(self.reloadAct, SIGNAL('triggered()'), self.translations.reload) + self.reloadAct.triggered.connect(self.translations.reload) self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), self) @@ -191,7 +191,7 @@ """ dialogs, this feature can be accessed using the context help""" """ button in the titlebar.</p>""" )) - self.connect(self.whatsThisAct,SIGNAL('triggered()'),self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.aboutAct = QAction(self.trUtf8('&About'), self) self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) @@ -199,7 +199,7 @@ """<b>About</b>""" """<p>Display some information about this software.</p>""" )) - self.connect(self.aboutAct,SIGNAL('triggered()'),self.__about) + self.aboutAct.triggered.connect(self.__about) self.aboutQtAct = QAction(self.trUtf8('About &Qt'), self) self.aboutQtAct.setStatusTip(\ @@ -208,7 +208,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct,SIGNAL('triggered()'),self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) self.tileAct = QAction(self.trUtf8('&Tile'), self) self.tileAct.setStatusTip(self.trUtf8('Tile the windows')) @@ -216,7 +216,7 @@ """<b>Tile the windows</b>""" """<p>Rearrange and resize the windows so that they are tiled.</p>""" )) - self.connect(self.tileAct, SIGNAL('triggered()'),self.preview.tile) + self.tileAct.triggered.connect(self.preview.tile) self.cascadeAct = QAction(self.trUtf8('&Cascade'), self) self.cascadeAct.setStatusTip(self.trUtf8('Cascade the windows')) @@ -224,7 +224,7 @@ """<b>Cascade the windows</b>""" """<p>Rearrange and resize the windows so that they are cascaded.</p>""" )) - self.connect(self.cascadeAct, SIGNAL('triggered()'),self.preview.cascade) + self.cascadeAct.triggered.connect(self.preview.cascade) self.closeAct = QAction(UI.PixmapCache.getIcon("close.png"), self.trUtf8('&Close'), self) @@ -234,7 +234,7 @@ """<b>Close Window</b>""" """<p>Close the current window.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'),self.preview.closeWidget) + self.closeAct.triggered.connect(self.preview.closeWidget) self.closeAllAct = QAction(self.trUtf8('Clos&e All'), self) self.closeAllAct.setStatusTip(self.trUtf8('Close all windows')) @@ -242,8 +242,7 @@ """<b>Close All Windows</b>""" """<p>Close all windows.</p>""" )) - self.connect(self.closeAllAct, SIGNAL('triggered()'), - self.preview.closeAllWidgets) + self.closeAllAct.triggered.connect(self.preview.closeAllWidgets) def __initMenus(self): """ @@ -855,4 +854,4 @@ @return flag signaling if any widget was loaded (boolean) """ - return len(self.widgets) > 0 + return len(self.widgets) > 0 \ No newline at end of file
--- a/Tools/UIPreviewer.py Mon Aug 02 08:33:11 2010 +0200 +++ b/Tools/UIPreviewer.py Wed Aug 04 08:54:52 2010 +0200 @@ -119,7 +119,7 @@ """<b>Open File</b>""" """<p>This opens a new UI file for display.</p>""" )) - self.connect(self.openAct, SIGNAL('triggered()'), self.__openFile) + self.openAct.triggered.connect(self.__openFile) self.printAct = QAction(UI.PixmapCache.getIcon("print.png"), self.trUtf8('&Print'), self) @@ -129,7 +129,7 @@ """<b>Print</b>""" """<p>Print a screen capture.</p>""" )) - self.connect(self.printAct, SIGNAL('triggered()'), self.__printImage) + self.printAct.triggered.connect(self.__printImage) self.printPreviewAct = QAction(UI.PixmapCache.getIcon("printPreview.png"), self.trUtf8('Print Preview'), self) @@ -139,8 +139,7 @@ """<b>Print Preview</b>""" """<p>Print preview a screen capture.</p>""" )) - self.connect(self.printPreviewAct, SIGNAL('triggered()'), - self.__printPreviewImage) + self.printPreviewAct.triggered.connect(self.__printPreviewImage) self.imageAct = QAction(UI.PixmapCache.getIcon("screenCapture.png"), self.trUtf8('&Screen Capture'), self) @@ -151,7 +150,7 @@ """<b>Screen Capture</b>""" """<p>Save a screen capture to an image file.</p>""" )) - self.connect(self.imageAct, SIGNAL('triggered()'), self.__saveImage) + self.imageAct.triggered.connect(self.__saveImage) self.exitAct = QAction(UI.PixmapCache.getIcon("exit.png"), self.trUtf8('&Quit'), self) @@ -172,7 +171,7 @@ """<b>Copy</b>""" """<p>Copy screen capture to clipboard.</p>""" )) - self.connect(self.copyAct,SIGNAL('triggered()'),self.__copyImageToClipboard) + self.copyAct.triggered.connect(self.__copyImageToClipboard) self.whatsThisAct = QAction(UI.PixmapCache.getIcon("whatsThis.png"), self.trUtf8('&What\'s This?'), self) @@ -186,7 +185,7 @@ """ dialogs, this feature can be accessed using the context help""" """ button in the titlebar.</p>""" )) - self.connect(self.whatsThisAct,SIGNAL('triggered()'),self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.aboutAct = QAction(self.trUtf8('&About'), self) self.aboutAct.setStatusTip(self.trUtf8('Display information about this software')) @@ -194,7 +193,7 @@ """<b>About</b>""" """<p>Display some information about this software.</p>""" )) - self.connect(self.aboutAct,SIGNAL('triggered()'),self.__about) + self.aboutAct.triggered.connect(self.__about) self.aboutQtAct = QAction(self.trUtf8('About &Qt'), self) self.aboutQtAct.setStatusTip(\ @@ -203,7 +202,7 @@ """<b>About Qt</b>""" """<p>Display some information about the Qt toolkit.</p>""" )) - self.connect(self.aboutQtAct,SIGNAL('triggered()'),self.__aboutQt) + self.aboutQtAct.triggered.connect(self.__aboutQt) def __initMenus(self): """ @@ -552,4 +551,4 @@ p.drawImage(marginX, marginY, img.scaled(width, height, Qt.KeepAspectRatio, Qt.SmoothTransformation)) - p.end() + p.end() \ No newline at end of file
--- a/UI/UserInterface.py Mon Aug 02 08:33:11 2010 +0200 +++ b/UI/UserInterface.py Wed Aug 04 08:54:52 2010 +0200 @@ -1374,7 +1374,7 @@ """ Any Python program being debugged will be stopped and the""" """ preferences will be written to disc.</p>""" )) - self.connect(self.exitAct, SIGNAL('triggered()'), self.__quit) + self.exitAct.triggered.connect(self.__quit) self.actions.append(self.exitAct) self.viewProfileActGrp = createActionGroup(self, "viewprofiles", True) @@ -1391,7 +1391,7 @@ """ if this profile is active, may be configured with the""" """ "View Profile Configuration" dialog.</p>""" )) - self.connect(self.setEditProfileAct, SIGNAL('triggered()'), self.__setEditProfile) + self.setEditProfileAct.triggered.connect(self.__setEditProfile) self.actions.append(self.setEditProfileAct) self.setDebugProfileAct = E5Action(self.trUtf8('Debug Profile'), @@ -1407,7 +1407,7 @@ """ if this profile is active, may be configured with the""" """ "View Profile Configuration" dialog.</p>""" )) - self.connect(self.setDebugProfileAct, SIGNAL('triggered()'), self.setDebugProfile) + self.setDebugProfileAct.triggered.connect(self.setDebugProfile) self.actions.append(self.setDebugProfileAct) self.pbAct = E5Action(self.trUtf8('Project-Viewer'), @@ -1418,7 +1418,7 @@ """<p>If the Project-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.pbAct, SIGNAL('triggered()'), self.__toggleProjectBrowser) + self.pbAct.triggered.connect(self.__toggleProjectBrowser) self.actions.append(self.pbAct) self.pbActivateAct = E5Action(self.trUtf8('Activate Project-Viewer'), @@ -1426,8 +1426,7 @@ QKeySequence(self.trUtf8("Alt+Shift+P")), 0, self, 'project_viewer_activate', True) - self.connect(self.pbActivateAct, SIGNAL('triggered()'), - self.__activateProjectBrowser) + self.pbActivateAct.triggered.connect(self.__activateProjectBrowser) self.actions.append(self.pbActivateAct) self.addAction(self.pbActivateAct) @@ -1440,7 +1439,7 @@ """<p>If the Multiproject-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.mpbAct, SIGNAL('triggered()'), self.__toggleMultiProjectBrowser) + self.mpbAct.triggered.connect(self.__toggleMultiProjectBrowser) self.actions.append(self.mpbAct) self.mpbActivateAct = E5Action(self.trUtf8('Activate Multiproject-Viewer'), @@ -1448,8 +1447,7 @@ QKeySequence(self.trUtf8("Alt+Shift+M")), 0, self, 'multi_project_viewer_activate', True) - self.connect(self.mpbActivateAct, SIGNAL('triggered()'), - self.__activateMultiProjectBrowser) + self.mpbActivateAct.triggered.connect(self.__activateMultiProjectBrowser) self.actions.append(self.mpbActivateAct) self.addAction(self.mpbActivateAct) @@ -1461,7 +1459,7 @@ """<p>If the Debug-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.debugViewerAct, SIGNAL('triggered()'), self.__toggleDebugViewer) + self.debugViewerAct.triggered.connect(self.__toggleDebugViewer) self.actions.append(self.debugViewerAct) self.debugViewerActivateAct = E5Action(self.trUtf8('Activate Debug-Viewer'), @@ -1469,8 +1467,7 @@ QKeySequence(self.trUtf8("Alt+Shift+D")), 0, self, 'debug_viewer_activate', True) - self.connect(self.debugViewerActivateAct, SIGNAL('triggered()'), - self.__activateDebugViewer) + self.debugViewerActivateAct.triggered.connect(self.__activateDebugViewer) self.actions.append(self.debugViewerActivateAct) self.addAction(self.debugViewerActivateAct) @@ -1483,7 +1480,7 @@ """ If it is displayed then close it.</p>""" )) if not self.embeddedShell: - self.connect(self.shellAct, SIGNAL('triggered()'), self.__toggleShell) + self.shellAct.triggered.connect(self.__toggleShell) self.actions.append(self.shellAct) self.shellActivateAct = E5Action(self.trUtf8('Activate Shell'), @@ -1491,7 +1488,7 @@ QKeySequence(self.trUtf8("Alt+Shift+S")), 0, self, 'interprter_shell_activate', True) - self.connect(self.shellActivateAct, SIGNAL('triggered()'), self.__activateShell) + self.shellActivateAct.triggered.connect(self.__activateShell) self.actions.append(self.shellActivateAct) self.addAction(self.shellActivateAct) @@ -1503,7 +1500,7 @@ """<p>If the Terminal window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.terminalAct, SIGNAL('triggered()'), self.__toggleTerminal) + self.terminalAct.triggered.connect(self.__toggleTerminal) self.actions.append(self.terminalAct) self.terminalActivateAct = E5Action(self.trUtf8('Activate Terminal'), @@ -1511,8 +1508,7 @@ QKeySequence(self.trUtf8("Alt+Shift+R")), 0, self, 'terminal_activate', True) - self.connect(self.terminalActivateAct, SIGNAL('triggered()'), - self.__activateTerminal) + self.terminalActivateAct.triggered.connect(self.__activateTerminal) self.actions.append(self.terminalActivateAct) self.addAction(self.terminalActivateAct) @@ -1525,7 +1521,7 @@ """ If it is displayed then close it.</p>""" )) if not self.embeddedFileBrowser: - self.connect(self.browserAct, SIGNAL('triggered()'), self.__toggleBrowser) + self.browserAct.triggered.connect(self.__toggleBrowser) self.actions.append(self.browserAct) self.browserActivateAct = E5Action(self.trUtf8('Activate File-Browser'), @@ -1533,8 +1529,7 @@ QKeySequence(self.trUtf8("Alt+Shift+F")), 0, self, 'file_browser_activate', True) - self.connect(self.browserActivateAct, SIGNAL('triggered()'), - self.__activateBrowser) + self.browserActivateAct.triggered.connect(self.__activateBrowser) self.actions.append(self.browserActivateAct) self.addAction(self.browserActivateAct) @@ -1546,7 +1541,7 @@ """<p>If the Log-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.logViewerAct, SIGNAL('triggered()'), self.__toggleLogViewer) + self.logViewerAct.triggered.connect(self.__toggleLogViewer) self.actions.append(self.logViewerAct) self.logViewerActivateAct = E5Action(self.trUtf8('Activate Log-Viewer'), @@ -1554,8 +1549,7 @@ QKeySequence(self.trUtf8("Alt+Shift+G")), 0, self, 'log_viewer_activate', True) - self.connect(self.logViewerActivateAct, SIGNAL('triggered()'), - self.__activateLogViewer) + self.logViewerActivateAct.triggered.connect(self.__activateLogViewer) self.actions.append(self.logViewerActivateAct) self.addAction(self.logViewerActivateAct) @@ -1567,7 +1561,7 @@ """<p>If the Task-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.taskViewerAct, SIGNAL('triggered()'), self.__toggleTaskViewer) + self.taskViewerAct.triggered.connect(self.__toggleTaskViewer) self.actions.append(self.taskViewerAct) self.taskViewerActivateAct = E5Action(self.trUtf8('Activate Task-Viewer'), @@ -1575,8 +1569,7 @@ QKeySequence(self.trUtf8("Alt+Shift+T")), 0, self, 'task_viewer_activate',1) - self.connect(self.taskViewerActivateAct, SIGNAL('triggered()'), - self.__activateTaskViewer) + self.taskViewerActivateAct.triggered.connect(self.__activateTaskViewer) self.actions.append(self.taskViewerActivateAct) self.addAction(self.taskViewerActivateAct) @@ -1589,8 +1582,7 @@ """<p>If the Template-Viewer window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.templateViewerAct, SIGNAL('triggered()'), - self.__toggleTemplateViewer) + self.templateViewerAct.triggered.connect(self.__toggleTemplateViewer) self.actions.append(self.templateViewerAct) self.templateViewerActivateAct = E5Action(self.trUtf8('Activate Template-Viewer'), @@ -1598,8 +1590,7 @@ QKeySequence(self.trUtf8("Alt+Shift+A")), 0, self, 'template_viewer_activate',1) - self.connect(self.templateViewerActivateAct, SIGNAL('triggered()'), - self.__activateTemplateViewer) + self.templateViewerActivateAct.triggered.connect(self.__activateTemplateViewer) self.actions.append(self.templateViewerActivateAct) self.addAction(self.templateViewerActivateAct) @@ -1611,7 +1602,7 @@ """<p>If the Vertical Toolbox window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.vtAct, SIGNAL('triggered()'), self.__toggleVerticalToolbox) + self.vtAct.triggered.connect(self.__toggleVerticalToolbox) self.actions.append(self.vtAct) self.htAct = E5Action(self.trUtf8('Horizontal Toolbox'), @@ -1623,7 +1614,7 @@ """<p>If the Horizontal Toolbox window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.htAct, SIGNAL('triggered()'), self.__toggleHorizontalToolbox) + self.htAct.triggered.connect(self.__toggleHorizontalToolbox) self.actions.append(self.htAct) self.lsbAct = E5Action(self.trUtf8('Left Sidebar'), @@ -1634,7 +1625,7 @@ """<p>If the left sidebar window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.lsbAct, SIGNAL('triggered()'), self.__toggleLeftSidebar) + self.lsbAct.triggered.connect(self.__toggleLeftSidebar) self.actions.append(self.lsbAct) self.bsbAct = E5Action(self.trUtf8('Bottom Sidebar'), @@ -1646,7 +1637,7 @@ """<p>If the bottom sidebar window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.bsbAct, SIGNAL('triggered()'), self.__toggleBottomSidebar) + self.bsbAct.triggered.connect(self.__toggleBottomSidebar) self.actions.append(self.bsbAct) self.cooperationViewerAct = E5Action(self.trUtf8('Cooperation'), @@ -1658,8 +1649,7 @@ """<p>If the Cooperation window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.cooperationViewerAct, SIGNAL('triggered()'), - self.__toggleCooperationViewer) + self.cooperationViewerAct.triggered.connect(self.__toggleCooperationViewer) self.actions.append(self.cooperationViewerAct) self.cooperationViewerActivateAct = E5Action( @@ -1668,8 +1658,7 @@ QKeySequence(self.trUtf8("Alt+Shift+O")), 0, self, 'cooperation_viewer_activate', True) - self.connect(self.cooperationViewerActivateAct, SIGNAL('triggered()'), - self.__activateCooperationViewer) + self.cooperationViewerActivateAct.triggered.connect(self.__activateCooperationViewer) self.actions.append(self.cooperationViewerActivateAct) self.addAction(self.cooperationViewerActivateAct) @@ -1682,8 +1671,7 @@ """<p>If the Symbols window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.symbolsViewerAct, SIGNAL('triggered()'), - self.__toggleSymbolsViewer) + self.symbolsViewerAct.triggered.connect(self.__toggleSymbolsViewer) self.actions.append(self.symbolsViewerAct) self.symbolsViewerActivateAct = E5Action( @@ -1692,8 +1680,7 @@ QKeySequence(self.trUtf8("Alt+Shift+Y")), 0, self, 'symbols_viewer_activate', True) - self.connect(self.symbolsViewerActivateAct, SIGNAL('triggered()'), - self.__activateSymbolsViewer) + self.symbolsViewerActivateAct.triggered.connect(self.__activateSymbolsViewer) self.actions.append(self.symbolsViewerActivateAct) self.addAction(self.symbolsViewerActivateAct) @@ -1706,8 +1693,7 @@ """<p>If the Numbers window is hidden then display it.""" """ If it is displayed then close it.</p>""" )) - self.connect(self.numbersViewerAct, SIGNAL('triggered()'), - self.__toggleNumbersViewer) + self.numbersViewerAct.triggered.connect(self.__toggleNumbersViewer) self.actions.append(self.numbersViewerAct) self.numbersViewerActivateAct = E5Action( @@ -1716,8 +1702,7 @@ QKeySequence(self.trUtf8("Alt+Shift+B")), 0, self, 'numbers_viewer_activate', True) - self.connect(self.numbersViewerActivateAct, SIGNAL('triggered()'), - self.__activateNumbersViewer) + self.numbersViewerActivateAct.triggered.connect(self.__activateNumbersViewer) self.actions.append(self.numbersViewerActivateAct) self.addAction(self.numbersViewerActivateAct) @@ -1735,7 +1720,7 @@ """ feature can be accessed using the context help button in the""" """ titlebar.</p>""" )) - self.connect(self.whatsThisAct, SIGNAL('triggered()'), self.__whatsThis) + self.whatsThisAct.triggered.connect(self.__whatsThis) self.actions.append(self.whatsThisAct) self.helpviewerAct = E5Action(self.trUtf8('Helpviewer'), @@ -1753,7 +1738,7 @@ """ as well</p><p>If called with a word selected, this word is search""" """ in the Qt help collection.</p>""" )) - self.connect(self.helpviewerAct, SIGNAL('triggered()'), self.__helpViewer) + self.helpviewerAct.triggered.connect(self.__helpViewer) self.actions.append(self.helpviewerAct) self.__initQtDocActions() @@ -1768,7 +1753,7 @@ """<b>Show Versions</b>""" """<p>Display version information.</p>""" )) - self.connect(self.versionAct, SIGNAL('triggered()'), self.__showVersions) + self.versionAct.triggered.connect(self.__showVersions) self.actions.append(self.versionAct) self.checkUpdateAct = E5Action(self.trUtf8('Check for Updates'), @@ -1778,7 +1763,7 @@ """<b>Check for Updates...</b>""" """<p>Checks the internet for updates of eric5.</p>""" )) - self.connect(self.checkUpdateAct, SIGNAL('triggered()'), self.performVersionCheck) + self.checkUpdateAct.triggered.connect(self.performVersionCheck) self.actions.append(self.checkUpdateAct) self.showVersionsAct = E5Action(self.trUtf8('Show downloadable versions'), @@ -1791,8 +1776,7 @@ """<p>Shows the eric5 versions available for download """ """from the internet.</p>""" )) - self.connect(self.showVersionsAct, SIGNAL('triggered()'), - self.showAvailableVersionsInfo) + self.showVersionsAct.triggered.connect(self.showAvailableVersionsInfo) self.actions.append(self.showVersionsAct) self.reportBugAct = E5Action(self.trUtf8('Report Bug'), @@ -1802,7 +1786,7 @@ """<b>Report Bug...</b>""" """<p>Opens a dialog to report a bug.</p>""" )) - self.connect(self.reportBugAct, SIGNAL('triggered()'), self.__reportBug) + self.reportBugAct.triggered.connect(self.__reportBug) self.actions.append(self.reportBugAct) self.requestFeatureAct = E5Action(self.trUtf8('Request Feature'), @@ -1812,7 +1796,7 @@ """<b>Request Feature...</b>""" """<p>Opens a dialog to send a feature request.</p>""" )) - self.connect(self.requestFeatureAct, SIGNAL('triggered()'), self.__requestFeature) + self.requestFeatureAct.triggered.connect(self.__requestFeature) self.actions.append(self.requestFeatureAct) self.utActGrp = createActionGroup(self) @@ -1827,7 +1811,7 @@ """<p>Perform unit tests. The dialog gives you the""" """ ability to select and run a unittest suite.</p>""" )) - self.connect(self.utDialogAct, SIGNAL('triggered()'), self.__unittest) + self.utDialogAct.triggered.connect(self.__unittest) self.actions.append(self.utDialogAct) self.utRestartAct = E5Action(self.trUtf8('Unittest Restart'), @@ -1839,7 +1823,7 @@ """<b>Restart Unittest</b>""" """<p>Restart the unittest performed last.</p>""" )) - self.connect(self.utRestartAct, SIGNAL('triggered()'), self.__unittestRestart) + self.utRestartAct.triggered.connect(self.__unittestRestart) self.utRestartAct.setEnabled(False) self.actions.append(self.utRestartAct) @@ -1852,7 +1836,7 @@ """<b>Unittest Script</b>""" """<p>Run unittest with current script.</p>""" )) - self.connect(self.utScriptAct, SIGNAL('triggered()'), self.__unittestScript) + self.utScriptAct.triggered.connect(self.__unittestScript) self.utScriptAct.setEnabled(False) self.actions.append(self.utScriptAct) @@ -1865,7 +1849,7 @@ """<b>Unittest Project</b>""" """<p>Run unittest with current project.</p>""" )) - self.connect(self.utProjectAct, SIGNAL('triggered()'), self.__unittestProject) + self.utProjectAct.triggered.connect(self.__unittestProject) self.utProjectAct.setEnabled(False) self.actions.append(self.utProjectAct) @@ -1882,7 +1866,7 @@ """<b>Qt-Designer 4</b>""" """<p>Start Qt-Designer 4.</p>""" )) - self.connect(self.designer4Act, SIGNAL('triggered()'), self.__designer4) + self.designer4Act.triggered.connect(self.__designer4) self.actions.append(self.designer4Act) else: self.designer4Act = None @@ -1899,7 +1883,7 @@ """<b>Qt-Linguist 4</b>""" """<p>Start Qt-Linguist 4.</p>""" )) - self.connect(self.linguist4Act, SIGNAL('triggered()'), self.__linguist4) + self.linguist4Act.triggered.connect(self.__linguist4) self.actions.append(self.linguist4Act) else: self.linguist4Act = None @@ -1912,7 +1896,7 @@ """<b>UI Previewer</b>""" """<p>Start the UI Previewer.</p>""" )) - self.connect(self.uipreviewerAct, SIGNAL('triggered()'), self.__UIPreviewer) + self.uipreviewerAct.triggered.connect(self.__UIPreviewer) self.actions.append(self.uipreviewerAct) self.trpreviewerAct = E5Action(self.trUtf8('Translations Previewer'), @@ -1923,7 +1907,7 @@ """<b>Translations Previewer</b>""" """<p>Start the Translations Previewer.</p>""" )) - self.connect(self.trpreviewerAct, SIGNAL('triggered()'), self.__TRPreviewer) + self.trpreviewerAct.triggered.connect(self.__TRPreviewer) self.actions.append(self.trpreviewerAct) self.diffAct = E5Action(self.trUtf8('Compare Files'), @@ -1934,7 +1918,7 @@ """<b>Compare Files</b>""" """<p>Open a dialog to compare two files.</p>""" )) - self.connect(self.diffAct, SIGNAL('triggered()'), self.__compareFiles) + self.diffAct.triggered.connect(self.__compareFiles) self.actions.append(self.diffAct) self.compareAct = E5Action(self.trUtf8('Compare Files side by side'), @@ -1947,7 +1931,7 @@ """<p>Open a dialog to compare two files and show the result""" """ side by side.</p>""" )) - self.connect(self.compareAct, SIGNAL('triggered()'), self.__compareFilesSbs) + self.compareAct.triggered.connect(self.__compareFilesSbs) self.actions.append(self.compareAct) self.sqlBrowserAct = E5Action(self.trUtf8('SQL Browser'), @@ -1959,7 +1943,7 @@ """<b>SQL Browser</b>""" """<p>Browse a SQL database.</p>""" )) - self.connect(self.sqlBrowserAct, SIGNAL('triggered()'), self.__sqlBrowser) + self.sqlBrowserAct.triggered.connect(self.__sqlBrowser) self.actions.append(self.sqlBrowserAct) self.miniEditorAct = E5Action(self.trUtf8('Mini Editor'), @@ -1971,7 +1955,7 @@ """<b>Mini Editor</b>""" """<p>Open a dialog with a simplified editor.</p>""" )) - self.connect(self.miniEditorAct, SIGNAL('triggered()'), self.__openMiniEditor) + self.miniEditorAct.triggered.connect(self.__openMiniEditor) self.actions.append(self.miniEditorAct) self.webBrowserAct = E5Action(self.trUtf8('Web Browser'), @@ -1983,7 +1967,7 @@ """<b>Web Browser</b>""" """<p>Browse the Internet with the eric5 Web Browser.</p>""" )) - self.connect(self.webBrowserAct, SIGNAL('triggered()'), self.__startWebBrowser) + self.webBrowserAct.triggered.connect(self.__startWebBrowser) self.actions.append(self.webBrowserAct) self.iconEditorAct = E5Action(self.trUtf8('Icon Editor'), @@ -1995,7 +1979,7 @@ """<b>Icon Editor</b>""" """<p>Starts the eric5 Icon Editor for editing simple icons.</p>""" )) - self.connect(self.iconEditorAct, SIGNAL('triggered()'), self.__editPixmap) + self.iconEditorAct.triggered.connect(self.__editPixmap) self.actions.append(self.iconEditorAct) self.prefAct = E5Action(self.trUtf8('Preferences'), @@ -2007,7 +1991,7 @@ """<p>Set the configuration items of the application""" """ with your prefered values.</p>""" )) - self.connect(self.prefAct, SIGNAL('triggered()'), self.showPreferences) + self.prefAct.triggered.connect(self.showPreferences) self.actions.append(self.prefAct) self.prefExportAct = E5Action(self.trUtf8('Export Preferences'), @@ -2018,7 +2002,7 @@ """<b>Export Preferences</b>""" """<p>Export the current configuration to a file.</p>""" )) - self.connect(self.prefExportAct, SIGNAL('triggered()'), self.__exportPreferences) + self.prefExportAct.triggered.connect(self.__exportPreferences) self.actions.append(self.prefExportAct) self.prefImportAct = E5Action(self.trUtf8('Import Preferences'), @@ -2030,7 +2014,7 @@ """<b>Import Preferences</b>""" """<p>Import a previously exported configuration.</p>""" )) - self.connect(self.prefImportAct, SIGNAL('triggered()'), self.__importPreferences) + self.prefImportAct.triggered.connect(self.__importPreferences) self.actions.append(self.prefImportAct) self.reloadAPIsAct = E5Action(self.trUtf8('Reload APIs'), @@ -2040,7 +2024,7 @@ """<b>Reload APIs</b>""" """<p>Reload the API information.</p>""" )) - self.connect(self.reloadAPIsAct, SIGNAL('triggered()'), self.__reloadAPIs) + self.reloadAPIsAct.triggered.connect(self.__reloadAPIs) self.actions.append(self.reloadAPIsAct) self.showExternalToolsAct = E5Action(self.trUtf8('Show external tools'), @@ -2052,8 +2036,7 @@ """<p>Opens a dialog to show the path and versions of all""" """ extenal tools used by eric5.</p>""" )) - self.connect(self.showExternalToolsAct, SIGNAL('triggered()'), - self.__showExternalTools) + self.showExternalToolsAct.triggered.connect(self.__showExternalTools) self.actions.append(self.showExternalToolsAct) self.configViewProfilesAct = E5Action(self.trUtf8('View Profiles'), @@ -2066,8 +2049,7 @@ """ set the visibility of the various windows for the predetermined""" """ view profiles.</p>""" )) - self.connect(self.configViewProfilesAct, SIGNAL('triggered()'), - self.__configViewProfiles) + self.configViewProfilesAct.triggered.connect(self.__configViewProfiles) self.actions.append(self.configViewProfilesAct) self.configToolBarsAct = E5Action(self.trUtf8('Toolbars'), @@ -2080,7 +2062,7 @@ """ change the actions shown on the various toolbars and""" """ define your own toolbars.</p>""" )) - self.connect(self.configToolBarsAct, SIGNAL('triggered()'), self.__configToolBars) + self.configToolBarsAct.triggered.connect(self.__configToolBars) self.actions.append(self.configToolBarsAct) self.shortcutsAct = E5Action(self.trUtf8('Keyboard Shortcuts'), @@ -2092,7 +2074,7 @@ """<p>Set the keyboard shortcuts of the application""" """ with your prefered values.</p>""" )) - self.connect(self.shortcutsAct, SIGNAL('triggered()'), self.__configShortcuts) + self.shortcutsAct.triggered.connect(self.__configShortcuts) self.actions.append(self.shortcutsAct) self.exportShortcutsAct = E5Action(self.trUtf8('Export Keyboard Shortcuts'), @@ -2104,8 +2086,7 @@ """<b>Export Keyboard Shortcuts</b>""" """<p>Export the keyboard shortcuts of the application.</p>""" )) - self.connect(self.exportShortcutsAct, SIGNAL('triggered()'), - self.__exportShortcuts) + self.exportShortcutsAct.triggered.connect(self.__exportShortcuts) self.actions.append(self.exportShortcutsAct) self.importShortcutsAct = E5Action(self.trUtf8('Import Keyboard Shortcuts'), @@ -2117,8 +2098,7 @@ """<b>Import Keyboard Shortcuts</b>""" """<p>Import the keyboard shortcuts of the application.</p>""" )) - self.connect(self.importShortcutsAct, SIGNAL('triggered()'), - self.__importShortcuts) + self.importShortcutsAct.triggered.connect(self.__importShortcuts) self.actions.append(self.importShortcutsAct) self.viewmanagerActivateAct = E5Action(self.trUtf8('Activate current editor'), @@ -2126,8 +2106,7 @@ QKeySequence(self.trUtf8("Alt+Shift+E")), 0, self, 'viewmanager_activate',1) - self.connect(self.viewmanagerActivateAct, SIGNAL('triggered()'), - self.__activateViewmanager) + self.viewmanagerActivateAct.triggered.connect(self.__activateViewmanager) self.actions.append(self.viewmanagerActivateAct) self.addAction(self.viewmanagerActivateAct) @@ -2135,7 +2114,7 @@ self.trUtf8('Show next'), QKeySequence(self.trUtf8('Ctrl+Alt+Tab')), 0, self, 'view_next_tab') - self.connect(self.nextTabAct, SIGNAL('triggered()'), self.__showNext) + self.nextTabAct.triggered.connect(self.__showNext) self.actions.append(self.nextTabAct) self.addAction(self.nextTabAct) @@ -2143,7 +2122,7 @@ self.trUtf8('Show previous'), QKeySequence(self.trUtf8('Shift+Ctrl+Alt+Tab')), 0, self, 'view_previous_tab') - self.connect(self.prevTabAct, SIGNAL('triggered()'), self.__showPrevious) + self.prevTabAct.triggered.connect(self.__showPrevious) self.actions.append(self.prevTabAct) self.addAction(self.prevTabAct) @@ -2151,7 +2130,7 @@ self.trUtf8('Switch between tabs'), QKeySequence(self.trUtf8('Ctrl+1')), 0, self, 'switch_tabs') - self.connect(self.switchTabAct, SIGNAL('triggered()'), self.__switchTab) + self.switchTabAct.triggered.connect(self.__switchTab) self.actions.append(self.switchTabAct) self.addAction(self.switchTabAct) @@ -2164,7 +2143,7 @@ """<p>This opens a dialog, that show some information about""" """ loaded plugins.</p>""" )) - self.connect(self.pluginInfoAct, SIGNAL('triggered()'), self.__showPluginInfo) + self.pluginInfoAct.triggered.connect(self.__showPluginInfo) self.actions.append(self.pluginInfoAct) self.pluginInstallAct = E5Action(self.trUtf8('Install Plugins'), @@ -2175,7 +2154,7 @@ """<b>Install Plugins...</b>""" """<p>This opens a dialog to install or update plugins.</p>""" )) - self.connect(self.pluginInstallAct, SIGNAL('triggered()'), self.__installPlugins) + self.pluginInstallAct.triggered.connect(self.__installPlugins) self.actions.append(self.pluginInstallAct) self.pluginDeinstallAct = E5Action(self.trUtf8('Uninstall Plugin'), @@ -2186,8 +2165,7 @@ """<b>Uninstall Plugin...</b>""" """<p>This opens a dialog to uninstall a plugin.</p>""" )) - self.connect(self.pluginDeinstallAct, SIGNAL('triggered()'), - self.__deinstallPlugin) + self.pluginDeinstallAct.triggered.connect(self.__deinstallPlugin) self.actions.append(self.pluginDeinstallAct) self.pluginRepoAct = E5Action(self.trUtf8('Plugin Repository'), @@ -2200,8 +2178,7 @@ """<p>This opens a dialog, that shows a list of plugins """ """available on the Internet.</p>""" )) - self.connect(self.pluginRepoAct, SIGNAL('triggered()'), - self.__showPluginsAvailable) + self.pluginRepoAct.triggered.connect(self.__showPluginsAvailable) self.actions.append(self.pluginRepoAct) # initialize viewmanager actions @@ -2229,7 +2206,7 @@ """ will either show the help in Eric's internal help viewer, or execute""" """ a web browser or Qt Assistant. </p>""" )) - self.connect(self.qt4DocAct, SIGNAL('triggered()'), self.__showQt4Doc) + self.qt4DocAct.triggered.connect(self.__showQt4Doc) self.actions.append(self.qt4DocAct) self.pyqt4DocAct = E5Action(self.trUtf8('PyQt4 Documentation'), @@ -2241,7 +2218,7 @@ """ will either show the help in Eric's internal help viewer, or execute""" """ a web browser or Qt Assistant. </p>""" )) - self.connect(self.pyqt4DocAct, SIGNAL('triggered()'), self.__showPyQt4Doc) + self.pyqt4DocAct.triggered.connect(self.__showPyQt4Doc) self.actions.append(self.pyqt4DocAct) def __initPythonDocAction(self): @@ -2260,7 +2237,7 @@ """ Windows and <i>/usr/share/doc/packages/python/html</i> on Unix.""" """ Set PYTHONDOCDIR in your environment to override this. </p>""" )) - self.connect(self.pythonDocAct, SIGNAL('triggered()'), self.__showPythonDoc) + self.pythonDocAct.triggered.connect(self.__showPythonDoc) self.actions.append(self.pythonDocAct) def __initEricDocAction(self): @@ -2276,7 +2253,7 @@ """ The location for the documentation is the Documentation/Source""" """ subdirectory of the eric5 installation directory.</p>""" )) - self.connect(self.ericDocAct, SIGNAL('triggered()'), self.__showEricDoc) + self.ericDocAct.triggered.connect(self.__showEricDoc) self.actions.append(self.ericDocAct) def __initPySideDocActions(self): @@ -2294,7 +2271,7 @@ """this will either show the help in Eric's internal help viewer, or """ """execute a web browser or Qt Assistant. </p>""" )) - self.connect(self.pysideDocAct, SIGNAL('triggered()'), self.__showPySideDoc) + self.pysideDocAct.triggered.connect(self.__showPySideDoc) self.actions.append(self.pysideDocAct) del PySide except ImportError: @@ -2664,7 +2641,7 @@ self) act.setObjectName("{0}@@{1}".format(toolGroup[0], tool['menutext'])) - self.connect(act, SIGNAL("triggered()"), self.__toolActionTriggered) + act.triggered.connect(self.__toolActionTriggered) self.toolGroupActions[act.objectName()] = act self.toolbarManager.addAction(act, category) @@ -2691,8 +2668,7 @@ for key in groupActionKeys: if key not in ckeys: self.toolbarManager.removeAction(self.toolGroupActions[key]) - self.disconnect(self.toolGroupActions[key], SIGNAL("triggered()"), - self.__toolActionTriggered) + self.toolGroupActions[key].triggered.disconnect(self.__toolActionTriggered) del self.toolGroupActions[key] # step 4: add all newly configured tools @@ -2704,7 +2680,7 @@ act = QAction(UI.PixmapCache.getIcon(tool['icon']), tool['menutext'], self) act.setObjectName(key) - self.connect(act, SIGNAL("triggered()"), self.__toolActionTriggered) + act.triggered.connect(self.__toolActionTriggered) self.toolGroupActions[key] = act self.toolbarManager.addAction(act, category)
--- a/VCS/ProjectHelper.py Mon Aug 02 08:33:11 2010 +0200 +++ b/VCS/ProjectHelper.py Wed Aug 04 08:54:52 2010 +0200 @@ -70,7 +70,7 @@ """<b>New from repository</b>""" """<p>This creates a new local project from the VCS repository.</p>""" )) - self.connect(self.vcsNewAct, SIGNAL('triggered()'), self._vcsCheckout) + self.vcsNewAct.triggered.connect(self._vcsCheckout) self.actions.append(self.vcsNewAct) self.vcsExportAct = E5Action(self.trUtf8('Export from repository'), @@ -82,7 +82,7 @@ """<b>Export from repository</b>""" """<p>This exports a project from the repository.</p>""" )) - self.connect(self.vcsExportAct, SIGNAL('triggered()'), self._vcsExport) + self.vcsExportAct.triggered.connect(self._vcsExport) self.actions.append(self.vcsExportAct) self.vcsAddAct = E5Action(self.trUtf8('Add to repository'), @@ -94,7 +94,7 @@ """<b>Add to repository</b>""" """<p>This adds (imports) the local project to the VCS repository.</p>""" )) - self.connect(self.vcsAddAct, SIGNAL('triggered()'), self._vcsImport) + self.vcsAddAct.triggered.connect(self._vcsImport) self.actions.append(self.vcsAddAct) def initMenu(self, menu): @@ -469,4 +469,4 @@ """ info = self.vcs.vcsRepositoryInfos(self.project.ppath) dlg = VcsRepositoryInfoDialog(None, info) - dlg.exec_() + dlg.exec_() \ No newline at end of file
--- a/ViewManager/ViewManager.py Mon Aug 02 08:33:11 2010 +0200 +++ b/ViewManager/ViewManager.py Wed Aug 04 08:54:52 2010 +0200 @@ -469,7 +469,7 @@ """<b>New</b>""" """<p>An empty editor window will be created.</p>""" )) - self.connect(self.newAct, SIGNAL('triggered()'), self.newEditor) + self.newAct.triggered.connect(self.newEditor) self.fileActions.append(self.newAct) self.openAct = E5Action(QApplication.translate('ViewManager', 'Open'), @@ -484,7 +484,7 @@ """<p>You will be asked for the name of a file to be opened""" """ in an editor window.</p>""" )) - self.connect(self.openAct, SIGNAL('triggered()'), self.openFiles) + self.openAct.triggered.connect(self.openFiles) self.fileActions.append(self.openAct) self.closeActGrp = createActionGroup(self) @@ -501,7 +501,7 @@ """<b>Close Window</b>""" """<p>Close the current window.</p>""" )) - self.connect(self.closeAct, SIGNAL('triggered()'), self.closeCurrentWindow) + self.closeAct.triggered.connect(self.closeCurrentWindow) self.fileActions.append(self.closeAct) self.closeAllAct = E5Action(QApplication.translate('ViewManager', 'Close All'), @@ -513,7 +513,7 @@ """<b>Close All Windows</b>""" """<p>Close all editor windows.</p>""" )) - self.connect(self.closeAllAct, SIGNAL('triggered()'), self.closeAllWindows) + self.closeAllAct.triggered.connect(self.closeAllWindows) self.fileActions.append(self.closeAllAct) self.closeActGrp.setEnabled(False) @@ -532,7 +532,7 @@ """<b>Save File</b>""" """<p>Save the contents of current editor window.</p>""" )) - self.connect(self.saveAct, SIGNAL('triggered()'), self.saveCurrentEditor) + self.saveAct.triggered.connect(self.saveCurrentEditor) self.fileActions.append(self.saveAct) self.saveAsAct = E5Action(QApplication.translate('ViewManager', 'Save as'), @@ -548,7 +548,7 @@ """<p>Save the contents of current editor window to a new file.""" """ The file can be entered in a file selection dialog.</p>""" )) - self.connect(self.saveAsAct, SIGNAL('triggered()'), self.saveAsCurrentEditor) + self.saveAsAct.triggered.connect(self.saveAsCurrentEditor) self.fileActions.append(self.saveAsAct) self.saveAllAct = E5Action(QApplication.translate('ViewManager', 'Save all'), @@ -561,7 +561,7 @@ """<b>Save All Files</b>""" """<p>Save the contents of all editor windows.</p>""" )) - self.connect(self.saveAllAct, SIGNAL('triggered()'), self.saveAllEditors) + self.saveAllAct.triggered.connect(self.saveAllEditors) self.fileActions.append(self.saveAllAct) self.saveActGrp.setEnabled(False) @@ -579,8 +579,7 @@ """ current project. After the file has been saved, it is""" """ automatically added to the current project.</p>""" )) - self.connect(self.saveToProjectAct, SIGNAL('triggered()'), - self.saveCurrentEditorToProject) + self.saveToProjectAct.triggered.connect(self.saveCurrentEditorToProject) self.saveToProjectAct.setEnabled(False) self.fileActions.append(self.saveToProjectAct) @@ -596,7 +595,7 @@ """<b>Print File</b>""" """<p>Print the contents of current editor window.</p>""" )) - self.connect(self.printAct, SIGNAL('triggered()'), self.printCurrentEditor) + self.printAct.triggered.connect(self.printCurrentEditor) self.printAct.setEnabled(False) self.fileActions.append(self.printAct) @@ -611,8 +610,7 @@ """<b>Print Preview</b>""" """<p>Print preview of the current editor window.</p>""" )) - self.connect(self.printPreviewAct, SIGNAL('triggered()'), - self.printPreviewCurrentEditor) + self.printPreviewAct.triggered.connect(self.printPreviewCurrentEditor) self.printPreviewAct.setEnabled(False) self.fileActions.append(self.printPreviewAct) @@ -628,7 +626,7 @@ """<b>Search File</b>""" """<p>Search for a file.</p>""" )) - self.connect(self.findFileNameAct, SIGNAL('triggered()'), self.__findFileName) + self.findFileNameAct.triggered.connect(self.__findFileName) self.fileActions.append(self.findFileNameAct) def initFileMenu(self): @@ -746,7 +744,7 @@ """<b>Undo</b>""" """<p>Undo the last change done in the current editor.</p>""" )) - self.connect(self.undoAct, SIGNAL('triggered()'), self.__editUndo) + self.undoAct.triggered.connect(self.__editUndo) self.editActions.append(self.undoAct) self.redoAct = E5Action(QApplication.translate('ViewManager', 'Redo'), @@ -761,7 +759,7 @@ """<b>Redo</b>""" """<p>Redo the last change done in the current editor.</p>""" )) - self.connect(self.redoAct, SIGNAL('triggered()'), self.__editRedo) + self.redoAct.triggered.connect(self.__editRedo) self.editActions.append(self.redoAct) self.revertAct = E5Action(QApplication.translate('ViewManager', @@ -778,7 +776,7 @@ """<p>Undo all changes up to the last saved state""" """ of the current editor.</p>""" )) - self.connect(self.revertAct, SIGNAL('triggered()'), self.__editRevert) + self.revertAct.triggered.connect(self.__editRevert) self.editActions.append(self.revertAct) self.copyActGrp = createActionGroup(self.editActGrp) @@ -796,7 +794,7 @@ """<b>Cut</b>""" """<p>Cut the selected text of the current editor to the clipboard.</p>""" )) - self.connect(self.cutAct, SIGNAL('triggered()'), self.__editCut) + self.cutAct.triggered.connect(self.__editCut) self.editActions.append(self.cutAct) self.copyAct = E5Action(QApplication.translate('ViewManager', 'Copy'), @@ -813,7 +811,7 @@ """<b>Copy</b>""" """<p>Copy the selected text of the current editor to the clipboard.</p>""" )) - self.connect(self.copyAct, SIGNAL('triggered()'), self.__editCopy) + self.copyAct.triggered.connect(self.__editCopy) self.editActions.append(self.copyAct) self.pasteAct = E5Action(QApplication.translate('ViewManager', 'Paste'), @@ -831,7 +829,7 @@ """<p>Paste the last cut/copied text from the clipboard to""" """ the current editor.</p>""" )) - self.connect(self.pasteAct, SIGNAL('triggered()'), self.__editPaste) + self.pasteAct.triggered.connect(self.__editPaste) self.editActions.append(self.pasteAct) self.deleteAct = E5Action(QApplication.translate('ViewManager', 'Clear'), @@ -847,7 +845,7 @@ """<b>Clear</b>""" """<p>Delete all text of the current editor.</p>""" )) - self.connect(self.deleteAct, SIGNAL('triggered()'), self.__editDelete) + self.deleteAct.triggered.connect(self.__editDelete) self.editActions.append(self.deleteAct) self.indentAct = E5Action(QApplication.translate('ViewManager', 'Indent'), @@ -863,7 +861,7 @@ """<p>Indents the current line or the lines of the""" """ selection by one level.</p>""" )) - self.connect(self.indentAct, SIGNAL('triggered()'), self.__editIndent) + self.indentAct.triggered.connect(self.__editIndent) self.editActions.append(self.indentAct) self.unindentAct = E5Action(QApplication.translate('ViewManager', 'Unindent'), @@ -880,7 +878,7 @@ """<p>Unindents the current line or the lines of the""" """ selection by one level.</p>""" )) - self.connect(self.unindentAct, SIGNAL('triggered()'), self.__editUnindent) + self.unindentAct.triggered.connect(self.__editUnindent) self.editActions.append(self.unindentAct) self.smartIndentAct = E5Action(QApplication.translate('ViewManager', @@ -898,7 +896,7 @@ """<p>Indents the current line or the lines of the""" """ current selection smartly.</p>""" )) - self.connect(self.smartIndentAct, SIGNAL('triggered()'), self.__editSmartIndent) + self.smartIndentAct.triggered.connect(self.__editSmartIndent) self.editActions.append(self.smartIndentAct) self.commentAct = E5Action(QApplication.translate('ViewManager', 'Comment'), @@ -915,7 +913,7 @@ """<p>Comments the current line or the lines of the""" """ current selection.</p>""" )) - self.connect(self.commentAct, SIGNAL('triggered()'), self.__editComment) + self.commentAct.triggered.connect(self.__editComment) self.editActions.append(self.commentAct) self.uncommentAct = E5Action(QApplication.translate('ViewManager', 'Uncomment'), @@ -932,7 +930,7 @@ """<p>Uncomments the current line or the lines of the""" """ current selection.</p>""" )) - self.connect(self.uncommentAct, SIGNAL('triggered()'), self.__editUncomment) + self.uncommentAct.triggered.connect(self.__editUncomment) self.editActions.append(self.uncommentAct) self.streamCommentAct = E5Action(QApplication.translate('ViewManager', @@ -945,8 +943,7 @@ """<b>Stream Comment</b>""" """<p>Stream comments the current line or the current selection.</p>""" )) - self.connect(self.streamCommentAct, SIGNAL('triggered()'), - self.__editStreamComment) + self.streamCommentAct.triggered.connect(self.__editStreamComment) self.editActions.append(self.streamCommentAct) self.boxCommentAct = E5Action(QApplication.translate('ViewManager', @@ -960,7 +957,7 @@ """<p>Box comments the current line or the lines of the""" """ current selection.</p>""" )) - self.connect(self.boxCommentAct, SIGNAL('triggered()'), self.__editBoxComment) + self.boxCommentAct.triggered.connect(self.__editBoxComment) self.editActions.append(self.boxCommentAct) self.selectBraceAct = E5Action(QApplication.translate('ViewManager', @@ -976,7 +973,7 @@ """<b>Select to brace</b>""" """<p>Select text of the current editor to the matching brace.</p>""" )) - self.connect(self.selectBraceAct, SIGNAL('triggered()'), self.__editSelectBrace) + self.selectBraceAct.triggered.connect(self.__editSelectBrace) self.editActions.append(self.selectBraceAct) self.selectAllAct = E5Action(QApplication.translate('ViewManager', 'Select all'), @@ -991,7 +988,7 @@ """<b>Select All</b>""" """<p>Select all text of the current editor.</p>""" )) - self.connect(self.selectAllAct, SIGNAL('triggered()'), self.__editSelectAll) + self.selectAllAct.triggered.connect(self.__editSelectAll) self.editActions.append(self.selectAllAct) self.deselectAllAct = E5Action(QApplication.translate('ViewManager', @@ -1007,7 +1004,7 @@ """<b>Deselect All</b>""" """<p>Deselect all text of the current editor.</p>""" )) - self.connect(self.deselectAllAct, SIGNAL('triggered()'), self.__editDeselectAll) + self.deselectAllAct.triggered.connect(self.__editDeselectAll) self.editActions.append(self.deselectAllAct) self.convertEOLAct = E5Action(QApplication.translate('ViewManager', @@ -1020,7 +1017,7 @@ """<b>Convert Line End Characters</b>""" """<p>Convert the line end characters to the currently set type.</p>""" )) - self.connect(self.convertEOLAct, SIGNAL('triggered()'), self.__convertEOL) + self.convertEOLAct.triggered.connect(self.__convertEOL) self.editActions.append(self.convertEOLAct) self.shortenEmptyAct = E5Action(QApplication.translate('ViewManager', @@ -1033,8 +1030,7 @@ """<b>Shorten empty lines</b>""" """<p>Shorten lines consisting solely of whitespace characters.</p>""" )) - self.connect(self.shortenEmptyAct, SIGNAL('triggered()'), - self.__shortenEmptyLines) + self.shortenEmptyAct.triggered.connect(self.__shortenEmptyLines) self.editActions.append(self.shortenEmptyAct) self.autoCompleteAct = E5Action(QApplication.translate('ViewManager', @@ -1050,7 +1046,7 @@ """<b>Autocomplete</b>""" """<p>Performs an autocompletion of the word containing the cursor.</p>""" )) - self.connect(self.autoCompleteAct, SIGNAL('triggered()'), self.__editAutoComplete) + self.autoCompleteAct.triggered.connect(self.__editAutoComplete) self.editActions.append(self.autoCompleteAct) self.autoCompleteFromDocAct = E5Action(QApplication.translate('ViewManager', @@ -1066,8 +1062,7 @@ """<p>Performs an autocompletion from document of the word""" """ containing the cursor.</p>""" )) - self.connect(self.autoCompleteFromDocAct, SIGNAL('triggered()'), - self.__editAutoCompleteFromDoc) + self.autoCompleteFromDocAct.triggered.connect(self.__editAutoCompleteFromDoc) self.editActions.append(self.autoCompleteFromDocAct) self.autoCompleteFromAPIsAct = E5Action(QApplication.translate('ViewManager', @@ -1083,8 +1078,7 @@ """<p>Performs an autocompletion from APIs of the word containing""" """ the cursor.</p>""" )) - self.connect(self.autoCompleteFromAPIsAct, SIGNAL('triggered()'), - self.__editAutoCompleteFromAPIs) + self.autoCompleteFromAPIsAct.triggered.connect(self.__editAutoCompleteFromAPIs) self.editActions.append(self.autoCompleteFromAPIsAct) self.autoCompleteFromAllAct = E5Action(\ @@ -1102,8 +1096,7 @@ """<p>Performs an autocompletion from document and APIs""" """ of the word containing the cursor.</p>""" )) - self.connect(self.autoCompleteFromAllAct, SIGNAL('triggered()'), - self.__editAutoCompleteFromAll) + self.autoCompleteFromAllAct.triggered.connect(self.__editAutoCompleteFromAll) self.editActions.append(self.autoCompleteFromAllAct) self.calltipsAct = E5Action(QApplication.translate('ViewManager', @@ -1120,7 +1113,7 @@ """<p>Show calltips based on the characters immediately to the""" """ left of the cursor.</p>""" )) - self.connect(self.calltipsAct, SIGNAL('triggered()'), self.__editShowCallTips) + self.calltipsAct.triggered.connect(self.__editShowCallTips) self.editActions.append(self.calltipsAct) self.editActGrp.setEnabled(False) @@ -1140,7 +1133,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Left')), 0, self.editorActGrp, 'vm_edit_move_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one character'), @@ -1148,7 +1141,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Right')), 0, self.editorActGrp, 'vm_edit_move_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one line'), @@ -1156,7 +1149,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Up')), 0, self.editorActGrp, 'vm_edit_move_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one line'), @@ -1164,7 +1157,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Down')), 0, self.editorActGrp, 'vm_edit_move_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move left one word part'), @@ -1172,7 +1165,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one word part'), @@ -1180,7 +1173,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Right')), 0, self.editorActGrp, 'vm_edit_move_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move left one word'), @@ -1188,7 +1181,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Left')), 0, self.editorActGrp, 'vm_edit_move_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move right one word'), @@ -1197,7 +1190,7 @@ 0, self.editorActGrp, 'vm_edit_move_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1207,7 +1200,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Home')), 0, self.editorActGrp, 'vm_edit_move_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOME) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1217,7 +1210,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Home')), 0, self.editorActGrp, 'vm_edit_move_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to end of line'), @@ -1225,7 +1218,7 @@ QKeySequence(QApplication.translate('ViewManager', 'End')), 0, self.editorActGrp, 'vm_edit_move_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view down one line'), @@ -1233,7 +1226,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Down')), 0, self.editorActGrp, 'vm_edit_scroll_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Scroll view up one line'), @@ -1241,7 +1234,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Up')), 0, self.editorActGrp, 'vm_edit_scroll_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINESCROLLUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one paragraph'), @@ -1249,7 +1242,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Up')), 0, self.editorActGrp, 'vm_edit_move_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one paragraph'), @@ -1257,7 +1250,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+Down')), 0, self.editorActGrp, 'vm_edit_move_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move up one page'), @@ -1265,7 +1258,7 @@ QKeySequence(QApplication.translate('ViewManager', 'PgUp')), 0, self.editorActGrp, 'vm_edit_move_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUP) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move down one page'), @@ -1273,7 +1266,7 @@ QKeySequence(QApplication.translate('ViewManager', 'PgDown')), 0, self.editorActGrp, 'vm_edit_move_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWN) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to start of text'), @@ -1281,7 +1274,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Home')), 0, self.editorActGrp, 'vm_edit_move_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTART) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Move to end of text'), @@ -1289,7 +1282,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+End')), 0, self.editorActGrp, 'vm_edit_move_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Indent one level'), @@ -1297,7 +1290,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Tab')), 0, self.editorActGrp, 'vm_edit_indent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_TAB) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Unindent one level'), @@ -1305,7 +1298,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Tab')), 0, self.editorActGrp, 'vm_edit_unindent_one_level') self.esm.setMapping(act, QsciScintilla.SCI_BACKTAB) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1316,7 +1309,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1327,7 +1320,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1337,7 +1330,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Up')), 0, self.editorActGrp, 'vm_edit_extend_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1348,7 +1341,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1360,7 +1353,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1372,7 +1365,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_word_part') self.esm.setMapping(act, QsciScintilla.SCI_WORDPARTRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1384,7 +1377,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_left_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDLEFTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1396,7 +1389,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_right_word') self.esm.setMapping(act, QsciScintilla.SCI_WORDRIGHTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1407,7 +1400,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMEEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1419,7 +1412,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_start_line') self.esm.setMapping(act, QsciScintilla.SCI_HOMEDISPLAYEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1429,7 +1422,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+End')), 0, self.editorActGrp, 'vm_edit_extend_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1440,7 +1433,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_up_para') self.esm.setMapping(act, QsciScintilla.SCI_PARAUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1452,7 +1445,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_para') self.esm.setMapping(act, QsciScintilla.SCI_PARADOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1463,7 +1456,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1474,7 +1467,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1486,7 +1479,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_start_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTSTARTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1498,7 +1491,7 @@ 0, self.editorActGrp, 'vm_edit_extend_selection_end_text') self.esm.setMapping(act, QsciScintilla.SCI_DOCUMENTENDEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1509,7 +1502,7 @@ 'Shift+Backspace')), self.editorActGrp, 'vm_edit_delete_previous_char') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACK) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1519,7 +1512,7 @@ 0, 0, self.editorActGrp, 'vm_edit_delet_previous_char_not_line_start') self.esm.setMapping(act, QsciScintilla.SCI_DELETEBACKNOTLINE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete current character'), @@ -1527,7 +1520,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Del')), 0, self.editorActGrp, 'vm_edit_delete_current_char') self.esm.setMapping(act, QsciScintilla.SCI_CLEAR) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete word to left'), @@ -1537,7 +1530,7 @@ 0, self.editorActGrp, 'vm_edit_delete_word_left') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDLEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete word to right'), @@ -1545,7 +1538,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Del')), 0, self.editorActGrp, 'vm_edit_delete_word_right') self.esm.setMapping(act, QsciScintilla.SCI_DELWORDRIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete line to left'), @@ -1555,7 +1548,7 @@ 0, self.editorActGrp, 'vm_edit_delete_line_left') self.esm.setMapping(act, QsciScintilla.SCI_DELLINELEFT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete line to right'), @@ -1565,7 +1558,7 @@ 0, self.editorActGrp, 'vm_edit_delete_line_right') self.esm.setMapping(act, QsciScintilla.SCI_DELLINERIGHT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Insert new line'), @@ -1574,7 +1567,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Enter')), self.editorActGrp, 'vm_edit_insert_line') self.esm.setMapping(act, QsciScintilla.SCI_NEWLINE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1584,7 +1577,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Shift+Return')), QKeySequence(QApplication.translate('ViewManager', 'Shift+Enter')), self.editorActGrp, 'vm_edit_insert_line_below') - self.connect(act, SIGNAL('triggered()'), self.__newLineBelow) + act.triggered.connect(self.__newLineBelow) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Delete current line'), @@ -1593,7 +1586,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+Shift+L')), self.editorActGrp, 'vm_edit_delete_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDELETE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Duplicate current line'), @@ -1601,7 +1594,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+D')), 0, self.editorActGrp, 'vm_edit_duplicate_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDUPLICATE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1611,7 +1604,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ctrl+T')), 0, self.editorActGrp, 'vm_edit_swap_current_previous_line') self.esm.setMapping(act, QsciScintilla.SCI_LINETRANSPOSE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Cut current line'), @@ -1620,7 +1613,7 @@ 0, self.editorActGrp, 'vm_edit_cut_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECUT) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Copy current line'), @@ -1629,7 +1622,7 @@ 0, self.editorActGrp, 'vm_edit_copy_current_line') self.esm.setMapping(act, QsciScintilla.SCI_LINECOPY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Toggle insert/overtype'), @@ -1637,7 +1630,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Ins')), 0, self.editorActGrp, 'vm_edit_toggle_insert_overtype') self.esm.setMapping(act, QsciScintilla.SCI_EDITTOGGLEOVERTYPE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1648,7 +1641,7 @@ 0, self.editorActGrp, 'vm_edit_convert_selection_lower') self.esm.setMapping(act, QsciScintilla.SCI_LOWERCASE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1659,7 +1652,7 @@ 0, self.editorActGrp, 'vm_edit_convert_selection_upper') self.esm.setMapping(act, QsciScintilla.SCI_UPPERCASE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1669,7 +1662,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Alt+End')), 0, self.editorActGrp, 'vm_edit_move_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAY) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1679,7 +1672,7 @@ 0, 0, self.editorActGrp, 'vm_edit_extend_selection_end_displayed_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDDISPLAYEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Formfeed'), @@ -1687,7 +1680,7 @@ 0, 0, self.editorActGrp, 'vm_edit_formfeed') self.esm.setMapping(act, QsciScintilla.SCI_FORMFEED) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', 'Escape'), @@ -1695,7 +1688,7 @@ QKeySequence(QApplication.translate('ViewManager', 'Esc')), 0, self.editorActGrp, 'vm_edit_escape') self.esm.setMapping(act, QsciScintilla.SCI_CANCEL) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1707,7 +1700,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEDOWNRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1718,7 +1711,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEUPRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1730,7 +1723,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_left_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARLEFTRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1742,7 +1735,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_right_char') self.esm.setMapping(act, QsciScintilla.SCI_CHARRIGHTRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1757,7 +1750,7 @@ self.editorActGrp, 'vm_edit_extend_rect_selection_first_visible_char') self.esm.setMapping(act, QsciScintilla.SCI_VCHOMERECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1768,7 +1761,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_end_line') self.esm.setMapping(act, QsciScintilla.SCI_LINEENDRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1780,7 +1773,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_up_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEUPRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1792,7 +1785,7 @@ 0, self.editorActGrp, 'vm_edit_extend_rect_selection_down_page') self.esm.setMapping(act, QsciScintilla.SCI_PAGEDOWNRECTEXTEND) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) act = E5Action(QApplication.translate('ViewManager', @@ -1803,7 +1796,7 @@ 0, self.editorActGrp, 'vm_edit_duplicate_current_selection') self.esm.setMapping(act, QsciScintilla.SCI_SELECTIONDUPLICATE) - self.connect(act, SIGNAL('triggered()'), self.esm, SLOT('map()')) + act.triggered.connect(self.esm.map) self.editActions.append(act) self.editorActGrp.setEnabled(False) @@ -1931,7 +1924,7 @@ """ dialog is shown to enter the searchtext and options""" """ for the search.</p>""" )) - self.connect(self.searchAct, SIGNAL('triggered()'), self.__search) + self.searchAct.triggered.connect(self.__search) self.searchActions.append(self.searchAct) self.searchNextAct = E5Action(QApplication.translate('ViewManager', @@ -1949,7 +1942,7 @@ """<p>Search the next occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" )) - self.connect(self.searchNextAct, SIGNAL('triggered()'), self.searchDlg.findNext) + self.searchNextAct.triggered.connect(self.searchDlg.findNext) self.searchActions.append(self.searchNextAct) self.searchPrevAct = E5Action(QApplication.translate('ViewManager', @@ -1967,7 +1960,7 @@ """<p>Search the previous occurrence of some text in the current editor.""" """ The previously entered searchtext and options are reused.</p>""" )) - self.connect(self.searchPrevAct, SIGNAL('triggered()'), self.searchDlg.findPrev) + self.searchPrevAct.triggered.connect(self.searchDlg.findPrev) self.searchActions.append(self.searchPrevAct) self.searchClearMarkersAct = E5Action(QApplication.translate('ViewManager', @@ -1984,8 +1977,7 @@ """<b>Clear search markers</b>""" """<p>Clear all displayed search markers.</p>""" )) - self.connect(self.searchClearMarkersAct, SIGNAL('triggered()'), - self.__searchClearMarkers) + self.searchClearMarkersAct.triggered.connect(self.__searchClearMarkers) self.searchActions.append(self.searchClearMarkersAct) self.replaceAct = E5Action(QApplication.translate('ViewManager', 'Replace'), @@ -2002,7 +1994,7 @@ """ dialog is shown to enter the searchtext, the replacement text""" """ and options for the search and replace.</p>""" )) - self.connect(self.replaceAct, SIGNAL('triggered()'), self.__replace) + self.replaceAct.triggered.connect(self.__replace) self.searchActions.append(self.replaceAct) self.quickSearchAct = E5Action(QApplication.translate('ViewManager', @@ -2022,7 +2014,7 @@ """ is already active and contains text, it searches for the""" """ next occurrence of this text.</p>""" )) - self.connect(self.quickSearchAct, SIGNAL('triggered()'), self.__quickSearch) + self.quickSearchAct.triggered.connect(self.__quickSearch) self.searchActions.append(self.quickSearchAct) self.quickSearchBackAct = E5Action(QApplication.translate('ViewManager', @@ -2038,8 +2030,7 @@ """<b>Quicksearch backwards</b>""" """<p>This searches the previous occurrence of the quicksearch text.</p>""" )) - self.connect(self.quickSearchBackAct, SIGNAL('triggered()'), - self.__quickSearchPrev) + self.quickSearchBackAct.triggered.connect(self.__quickSearchPrev) self.searchActions.append(self.quickSearchBackAct) self.quickSearchExtendAct = E5Action(QApplication.translate('ViewManager', @@ -2057,8 +2048,7 @@ """<p>This extends the quicksearch text to the end of the word""" """ currently found.</p>""" )) - self.connect(self.quickSearchExtendAct, SIGNAL('triggered()'), - self.__quickSearchExtend) + self.quickSearchExtendAct.triggered.connect(self.__quickSearchExtend) self.searchActions.append(self.quickSearchExtendAct) self.gotoAct = E5Action(QApplication.translate('ViewManager', 'Goto Line'), @@ -2074,7 +2064,7 @@ """<p>Go to a specific line of text in the current editor.""" """ A dialog is shown to enter the linenumber.</p>""" )) - self.connect(self.gotoAct, SIGNAL('triggered()'), self.__goto) + self.gotoAct.triggered.connect(self.__goto) self.searchActions.append(self.gotoAct) self.gotoBraceAct = E5Action(QApplication.translate('ViewManager', 'Goto Brace'), @@ -2090,7 +2080,7 @@ """<b>Goto Brace</b>""" """<p>Go to the matching brace in the current editor.</p>""" )) - self.connect(self.gotoBraceAct, SIGNAL('triggered()'), self.__gotoBrace) + self.gotoBraceAct.triggered.connect(self.__gotoBrace) self.searchActions.append(self.gotoBraceAct) self.searchActGrp.setEnabled(False) @@ -2111,7 +2101,7 @@ """ or the project. A dialog is shown to enter the searchtext""" """ and options for the search and to display the result.</p>""" )) - self.connect(self.searchFilesAct, SIGNAL('triggered()'), self.__searchFiles) + self.searchFilesAct.triggered.connect(self.__searchFiles) self.searchActions.append(self.searchFilesAct) self.replaceFilesAct = E5Action(QApplication.translate('ViewManager', @@ -2130,7 +2120,7 @@ """ the searchtext, the replacement text and options for the""" """ search and to display the result.</p>""" )) - self.connect(self.replaceFilesAct, SIGNAL('triggered()'), self.__replaceFiles) + self.replaceFilesAct.triggered.connect(self.__replaceFiles) self.searchActions.append(self.replaceFilesAct) def initSearchToolbars(self, toolbarManager): @@ -2243,7 +2233,7 @@ """<b>Zoom in</b>""" """<p>Zoom in on the text. This makes the text bigger.</p>""" )) - self.connect(self.zoomInAct, SIGNAL('triggered()'), self.__zoomIn) + self.zoomInAct.triggered.connect(self.__zoomIn) self.viewActions.append(self.zoomInAct) self.zoomOutAct = E5Action(QApplication.translate('ViewManager', 'Zoom out'), @@ -2259,7 +2249,7 @@ """<b>Zoom out</b>""" """<p>Zoom out on the text. This makes the text smaller.</p>""" )) - self.connect(self.zoomOutAct, SIGNAL('triggered()'), self.__zoomOut) + self.zoomOutAct.triggered.connect(self.__zoomOut) self.viewActions.append(self.zoomOutAct) self.zoomToAct = E5Action(QApplication.translate('ViewManager', 'Zoom'), @@ -2276,7 +2266,7 @@ """<p>Zoom the text. This opens a dialog where the""" """ desired size can be entered.</p>""" )) - self.connect(self.zoomToAct, SIGNAL('triggered()'), self.__zoom) + self.zoomToAct.triggered.connect(self.__zoom) self.viewActions.append(self.zoomToAct) self.toggleAllAct = E5Action(QApplication.translate('ViewManager', @@ -2289,7 +2279,7 @@ """<b>Toggle all folds</b>""" """<p>Toggle all folds of the current editor.</p>""" )) - self.connect(self.toggleAllAct, SIGNAL('triggered()'), self.__toggleAll) + self.toggleAllAct.triggered.connect(self.__toggleAll) self.viewActions.append(self.toggleAllAct) self.toggleAllChildrenAct = \ @@ -2305,8 +2295,7 @@ """<p>Toggle all folds of the current editor including""" """ all children.</p>""" )) - self.connect(self.toggleAllChildrenAct, SIGNAL('triggered()'), - self.__toggleAllChildren) + self.toggleAllChildrenAct.triggered.connect(self.__toggleAllChildren) self.viewActions.append(self.toggleAllChildrenAct) self.toggleCurrentAct = E5Action(QApplication.translate('ViewManager', @@ -2319,7 +2308,7 @@ """<b>Toggle current fold</b>""" """<p>Toggle the folds of the current line of the current editor.</p>""" )) - self.connect(self.toggleCurrentAct, SIGNAL('triggered()'), self.__toggleCurrent) + self.toggleCurrentAct.triggered.connect(self.__toggleCurrent) self.viewActions.append(self.toggleCurrentAct) self.unhighlightAct = E5Action(QApplication.translate('ViewManager', @@ -2334,7 +2323,7 @@ """<b>Remove all highlights</b>""" """<p>Remove the highlights of all editors.</p>""" )) - self.connect(self.unhighlightAct, SIGNAL('triggered()'), self.unhighlight) + self.unhighlightAct.triggered.connect(self.unhighlight) self.viewActions.append(self.unhighlightAct) self.splitViewAct = E5Action(QApplication.translate('ViewManager', 'Split view'), @@ -2347,7 +2336,7 @@ """<b>Split view</b>""" """<p>Add a split to the view.</p>""" )) - self.connect(self.splitViewAct, SIGNAL('triggered()'), self.__splitView) + self.splitViewAct.triggered.connect(self.__splitView) self.viewActions.append(self.splitViewAct) self.splitOrientationAct = E5Action(QApplication.translate('ViewManager', @@ -2377,7 +2366,7 @@ """<b>Remove split</b>""" """<p>Remove the current split.</p>""" )) - self.connect(self.splitRemoveAct, SIGNAL('triggered()'), self.removeSplit) + self.splitRemoveAct.triggered.connect(self.removeSplit) self.viewActions.append(self.splitRemoveAct) self.nextSplitAct = E5Action(QApplication.translate('ViewManager', 'Next split'), @@ -2392,7 +2381,7 @@ """<b>Next split</b>""" """<p>Move to the next split.</p>""" )) - self.connect(self.nextSplitAct, SIGNAL('triggered()'), self.nextSplit) + self.nextSplitAct.triggered.connect(self.nextSplit) self.viewActions.append(self.nextSplitAct) self.prevSplitAct = E5Action(QApplication.translate('ViewManager', @@ -2407,7 +2396,7 @@ """<b>Previous split</b>""" """<p>Move to the previous split.</p>""" )) - self.connect(self.prevSplitAct, SIGNAL('triggered()'), self.prevSplit) + self.prevSplitAct.triggered.connect(self.prevSplit) self.viewActions.append(self.prevSplitAct) self.viewActGrp.setEnabled(False) @@ -2484,8 +2473,7 @@ """<b>Start Macro Recording</b>""" """<p>Start recording editor commands into a new macro.</p>""" )) - self.connect(self.macroStartRecAct, SIGNAL('triggered()'), - self.__macroStartRecording) + self.macroStartRecAct.triggered.connect(self.__macroStartRecording) self.macroActions.append(self.macroStartRecAct) self.macroStopRecAct = E5Action(QApplication.translate('ViewManager', @@ -2499,8 +2487,7 @@ """<b>Stop Macro Recording</b>""" """<p>Stop recording editor commands into a new macro.</p>""" )) - self.connect(self.macroStopRecAct, SIGNAL('triggered()'), - self.__macroStopRecording) + self.macroStopRecAct.triggered.connect(self.__macroStopRecording) self.macroActions.append(self.macroStopRecAct) self.macroRunAct = E5Action(QApplication.translate('ViewManager', 'Run Macro'), @@ -2511,7 +2498,7 @@ """<b>Run Macro</b>""" """<p>Run a previously recorded editor macro.</p>""" )) - self.connect(self.macroRunAct, SIGNAL('triggered()'), self.__macroRun) + self.macroRunAct.triggered.connect(self.__macroRun) self.macroActions.append(self.macroRunAct) self.macroDeleteAct = E5Action(QApplication.translate('ViewManager', @@ -2524,7 +2511,7 @@ """<b>Delete Macro</b>""" """<p>Delete a previously recorded editor macro.</p>""" )) - self.connect(self.macroDeleteAct, SIGNAL('triggered()'), self.__macroDelete) + self.macroDeleteAct.triggered.connect(self.__macroDelete) self.macroActions.append(self.macroDeleteAct) self.macroLoadAct = E5Action(QApplication.translate('ViewManager', 'Load Macro'), @@ -2536,7 +2523,7 @@ """<b>Load Macro</b>""" """<p>Load an editor macro from a file.</p>""" )) - self.connect(self.macroLoadAct, SIGNAL('triggered()'), self.__macroLoad) + self.macroLoadAct.triggered.connect(self.__macroLoad) self.macroActions.append(self.macroLoadAct) self.macroSaveAct = E5Action(QApplication.translate('ViewManager', 'Save Macro'), @@ -2548,7 +2535,7 @@ """<b>Save Macro</b>""" """<p>Save a previously recorded editor macro to a file.</p>""" )) - self.connect(self.macroSaveAct, SIGNAL('triggered()'), self.__macroSave) + self.macroSaveAct.triggered.connect(self.__macroSave) self.macroActions.append(self.macroSaveAct) self.macroActGrp.setEnabled(False) @@ -2588,7 +2575,7 @@ """<b>Toggle Bookmark</b>""" """<p>Toggle a bookmark at the current line of the current editor.</p>""" )) - self.connect(self.bookmarkToggleAct, SIGNAL('triggered()'), self.__toggleBookmark) + self.bookmarkToggleAct.triggered.connect(self.__toggleBookmark) self.bookmarkActions.append(self.bookmarkToggleAct) self.bookmarkNextAct = E5Action(QApplication.translate('ViewManager', @@ -2604,7 +2591,7 @@ """<b>Next Bookmark</b>""" """<p>Go to next bookmark of the current editor.</p>""" )) - self.connect(self.bookmarkNextAct, SIGNAL('triggered()'), self.__nextBookmark) + self.bookmarkNextAct.triggered.connect(self.__nextBookmark) self.bookmarkActions.append(self.bookmarkNextAct) self.bookmarkPreviousAct = E5Action(QApplication.translate('ViewManager', @@ -2620,8 +2607,7 @@ """<b>Previous Bookmark</b>""" """<p>Go to previous bookmark of the current editor.</p>""" )) - self.connect(self.bookmarkPreviousAct, SIGNAL('triggered()'), - self.__previousBookmark) + self.bookmarkPreviousAct.triggered.connect(self.__previousBookmark) self.bookmarkActions.append(self.bookmarkPreviousAct) self.bookmarkClearAct = E5Action(QApplication.translate('ViewManager', @@ -2637,8 +2623,7 @@ """<b>Clear Bookmarks</b>""" """<p>Clear bookmarks of all editors.</p>""" )) - self.connect(self.bookmarkClearAct, SIGNAL('triggered()'), - self.__clearAllBookmarks) + self.bookmarkClearAct.triggered.connect(self.__clearAllBookmarks) self.bookmarkActions.append(self.bookmarkClearAct) self.syntaxErrorGotoAct = E5Action(QApplication.translate('ViewManager', @@ -2653,8 +2638,7 @@ """<b>Goto Syntax Error</b>""" """<p>Go to next syntax error of the current editor.</p>""" )) - self.connect(self.syntaxErrorGotoAct, SIGNAL('triggered()'), - self.__gotoSyntaxError) + self.syntaxErrorGotoAct.triggered.connect(self.__gotoSyntaxError) self.bookmarkActions.append(self.syntaxErrorGotoAct) self.syntaxErrorClearAct = E5Action(QApplication.translate('ViewManager', @@ -2668,8 +2652,7 @@ """<b>Clear Syntax Errors</b>""" """<p>Clear syntax errors of all editors.</p>""" )) - self.connect(self.syntaxErrorClearAct, SIGNAL('triggered()'), - self.__clearAllSyntaxErrors) + self.syntaxErrorClearAct.triggered.connect(self.__clearAllSyntaxErrors) self.bookmarkActions.append(self.syntaxErrorClearAct) self.warningsNextAct = E5Action(QApplication.translate('ViewManager', @@ -2686,7 +2669,7 @@ """<p>Go to next line of the current editor""" """ having a py3flakes warning.</p>""" )) - self.connect(self.warningsNextAct, SIGNAL('triggered()'), self.__nextWarning) + self.warningsNextAct.triggered.connect(self.__nextWarning) self.bookmarkActions.append(self.warningsNextAct) self.warningsPreviousAct = E5Action(QApplication.translate('ViewManager', @@ -2703,8 +2686,7 @@ """<p>Go to previous line of the current editor""" """ having a py3flakes warning.</p>""" )) - self.connect(self.warningsPreviousAct, SIGNAL('triggered()'), - self.__previousWarning) + self.warningsPreviousAct.triggered.connect(self.__previousWarning) self.bookmarkActions.append(self.warningsPreviousAct) self.warningsClearAct = E5Action(QApplication.translate('ViewManager', @@ -2719,8 +2701,7 @@ """<b>Clear Warning Messages</b>""" """<p>Clear py3flakes warning messages of all editors.</p>""" )) - self.connect(self.warningsClearAct, SIGNAL('triggered()'), - self.__clearAllWarnings) + self.warningsClearAct.triggered.connect(self.__clearAllWarnings) self.bookmarkActions.append(self.warningsClearAct) self.notcoveredNextAct = E5Action(QApplication.translate('ViewManager', @@ -2735,7 +2716,7 @@ """<b>Next uncovered line</b>""" """<p>Go to next line of the current editor marked as not covered.</p>""" )) - self.connect(self.notcoveredNextAct, SIGNAL('triggered()'), self.__nextUncovered) + self.notcoveredNextAct.triggered.connect(self.__nextUncovered) self.bookmarkActions.append(self.notcoveredNextAct) self.notcoveredPreviousAct = E5Action(QApplication.translate('ViewManager', @@ -2752,8 +2733,7 @@ """<p>Go to previous line of the current editor marked""" """ as not covered.</p>""" )) - self.connect(self.notcoveredPreviousAct, SIGNAL('triggered()'), - self.__previousUncovered) + self.notcoveredPreviousAct.triggered.connect(self.__previousUncovered) self.bookmarkActions.append(self.notcoveredPreviousAct) self.taskNextAct = E5Action(QApplication.translate('ViewManager', @@ -2768,7 +2748,7 @@ """<b>Next Task</b>""" """<p>Go to next line of the current editor having a task.</p>""" )) - self.connect(self.taskNextAct, SIGNAL('triggered()'), self.__nextTask) + self.taskNextAct.triggered.connect(self.__nextTask) self.bookmarkActions.append(self.taskNextAct) self.taskPreviousAct = E5Action(QApplication.translate('ViewManager', @@ -2784,7 +2764,7 @@ """<b>Previous Task</b>""" """<p>Go to previous line of the current editor having a task.</p>""" )) - self.connect(self.taskPreviousAct, SIGNAL('triggered()'), self.__previousTask) + self.taskPreviousAct.triggered.connect(self.__previousTask) self.bookmarkActions.append(self.taskPreviousAct) self.bookmarkActGrp.setEnabled(False) @@ -2883,7 +2863,7 @@ """<b>Spell check</b>""" """<p>Perform a spell check of the current editor.</p>""" )) - self.connect(self.spellCheckAct, SIGNAL('triggered()'), self.__spellCheck) + self.spellCheckAct.triggered.connect(self.__spellCheck) self.spellingActions.append(self.spellCheckAct) self.autoSpellCheckAct = E5Action(QApplication.translate('ViewManager', @@ -2903,8 +2883,7 @@ self.autoSpellCheckAct.setCheckable(True) self.autoSpellCheckAct.setChecked( Preferences.getEditor("AutoSpellCheckingEnabled")) - self.connect(self.autoSpellCheckAct, SIGNAL('triggered()'), - self.__setAutoSpellChecking) + self.autoSpellCheckAct.triggered.connect(self.__setAutoSpellChecking) self.spellingActions.append(self.autoSpellCheckAct) self.__enableSpellingActions() @@ -5102,4 +5081,4 @@ if aw is not None: if aw.hasSelectedText(): txt = aw.selectedText() - return txt + return txt \ No newline at end of file
