--- 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)