Continued porting signal/slot usage to the new API.

Wed, 11 Aug 2010 17:12:04 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Wed, 11 Aug 2010 17:12:04 +0200
changeset 492
01f3384d535a
parent 491
ac476c22d392
child 495
b31b0bffa5b0

Continued porting signal/slot usage to the new API.

Helpviewer/HelpWindow.py file | annotate | diff | comparison | revisions
Helpviewer/OpenSearch/OpenSearchManager.py file | annotate | diff | comparison | revisions
Helpviewer/Passwords/PasswordManager.py file | annotate | diff | comparison | revisions
Preferences/ConfigurationDialog.py file | annotate | diff | comparison | revisions
UI/UserInterface.py file | annotate | diff | comparison | revisions
--- a/Helpviewer/HelpWindow.py	Wed Aug 11 14:54:13 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Wed Aug 11 17:12:04 2010 +0200
@@ -114,8 +114,7 @@
             self.__helpEngine = \
                 QHelpEngine(os.path.join(Utilities.getConfigDir(), 
                                          "browser", "eric5help.qhc"), self)
-            self.connect(self.__helpEngine, SIGNAL("warning(const QString&)"), 
-                         self.__warning)
+            self.__helpEngine.warning.connect(self.__warning)
             self.__helpInstaller = None
             
             # Attributes for WebKit based browser
@@ -123,8 +122,7 @@
             
             self.tabContextMenuIndex = -1
             self.tabWidget = E5TabWidget(self, dnd = True)
-            self.connect(self.tabWidget, SIGNAL('currentChanged(int)'),
-                self.__currentChanged)
+            self.tabWidget.currentChanged[int].connect(self.__currentChanged)
             self.tabWidget.setTabContextMenuPolicy(Qt.CustomContextMenu)
             self.tabWidget.customTabContextMenuRequested.connect(self.__showContextMenu)
             
@@ -159,10 +157,8 @@
             self.__indexing = False
             self.__indexingProgress = None
             self.__searchEngine = self.__helpEngine.searchEngine()
-            self.connect(self.__searchEngine, SIGNAL("indexingStarted()"), 
-                         self.__indexingStarted)
-            self.connect(self.__searchEngine, SIGNAL("indexingFinished()"), 
-                         self.__indexingFinished)
+            self.__searchEngine.indexingStarted.connect(self.__indexingStarted)
+            self.__searchEngine.indexingFinished.connect(self.__indexingFinished)
             self.__searchWindow = HelpSearchWidget(self.__searchEngine, self)
             self.__searchDock = QDockWidget(self.trUtf8("Search"), self)
             self.__searchDock.setObjectName("SearchWindow")
@@ -176,8 +172,7 @@
             
             self.__navigationMenu = QMenu(self)
             self.__navigationMenu.aboutToShow.connect(self.__showNavigationMenu)
-            self.connect(self.__navigationMenu, SIGNAL("triggered(QAction*)"), 
-                         self.__navigationMenuTriggered)
+            self.__navigationMenu.triggered.connect(self.__navigationMenuTriggered)
             
             self.navigationButton = QToolButton(self.tabWidget)
             self.navigationButton.setIcon(UI.PixmapCache.getIcon("1downarrow.png"))
@@ -197,8 +192,7 @@
                 self.rightCornerWidgetLayout.addWidget(self.closeButton)
             else:
                 self.tabWidget.setTabsClosable(True)
-                self.connect(self.tabWidget, SIGNAL("tabCloseRequested(int)"), 
-                    self.__closeAt)
+                self.tabWidget.tabCloseRequested.connect(self.__closeAt)
                 self.closeButton = None
             
             self.tabWidget.setCornerWidget(self.rightCornerWidget, Qt.TopRightCorner)
@@ -239,21 +233,15 @@
             
             # setup connections
             # TOC window
-            self.connect(self.__tocWindow, SIGNAL("linkActivated(const QUrl&)"), 
-                         self.__linkActivated)
-            self.connect(self.__tocWindow, SIGNAL("escapePressed()"), 
-                         self.__activateCurrentBrowser)
+            self.__tocWindow.linkActivated.connect(self.__linkActivated)
+            self.__tocWindow.escapePressed.connect(self.__activateCurrentBrowser)
             # index window
-            self.connect(self.__indexWindow, SIGNAL("linkActivated(const QUrl&)"), 
-                         self.__linkActivated)
+            self.__indexWindow.linkActivated.connect(self.__linkActivated)
             self.__indexWindow.linksActivated.connect(self.__linksActivated)
-            self.connect(self.__indexWindow, SIGNAL("escapePressed()"), 
-                         self.__activateCurrentBrowser)
+            self.__indexWindow.escapePressed.connect(self.__activateCurrentBrowser)
             # search window
-            self.connect(self.__searchWindow, SIGNAL("linkActivated(const QUrl&)"), 
-                         self.__linkActivated)
-            self.connect(self.__searchWindow, SIGNAL("escapePressed()"), 
-                         self.__activateCurrentBrowser)
+            self.__searchWindow.linkActivated.connect(self.__linkActivated)
+            self.__searchWindow.escapePressed.connect(self.__activateCurrentBrowser)
             
             state = Preferences.getHelp("HelpViewerState")
             self.restoreState(state)
@@ -816,8 +804,7 @@
                     """<b>Zoom text only</b>"""
                     """<p>Zoom text only; pictures remain constant.</p>"""
             ))
-            self.connect(self.zoomTextOnlyAct, SIGNAL('triggered(bool)'), 
-                self.__zoomTextOnly)
+            self.zoomTextOnlyAct.triggered[bool].connect(self.__zoomTextOnly)
             self.__actions.append(self.zoomTextOnlyAct)
         else:
             self.zoomTextOnlyAct = None
@@ -1143,8 +1130,7 @@
             self.__textEncodingMenu = menu.addMenu(self.trUtf8("Text Encoding"))
             self.__textEncodingMenu.aboutToShow.connect(
                 self.__aboutToShowTextEncodingMenu)
-            self.connect(self.__textEncodingMenu, SIGNAL("triggered(QAction*)"), 
-                         self.__setTextEncoding)
+            self.__textEncodingMenu.triggered.connect(self.__setTextEncoding)
         
         menu = mb.addMenu(self.trUtf8('&Go'))
         menu.setTearOffEnabled(True)
@@ -1160,19 +1146,15 @@
         self.historyMenu = HistoryMenu(self)
         self.historyMenu.setTearOffEnabled(True)
         self.historyMenu.setTitle(self.trUtf8('H&istory'))
-        self.connect(self.historyMenu, SIGNAL("openUrl(const QUrl&, const QString&)"), 
-                     self.__openUrl)
-        self.connect(self.historyMenu, SIGNAL("newUrl(const QUrl&, const QString&)"), 
-                     self.__openUrlNewTab)
+        self.historyMenu.openUrl.connect(self.__openUrl)
+        self.historyMenu.newUrl.connect(self.__openUrlNewTab)
         mb.addMenu(self.historyMenu)
         
         self.bookmarksMenu = BookmarksMenuBarMenu(self)
         self.bookmarksMenu.setTearOffEnabled(True)
         self.bookmarksMenu.setTitle(self.trUtf8('&Bookmarks'))
-        self.connect(self.bookmarksMenu, SIGNAL("openUrl(const QUrl&, const QString&)"), 
-                     self.__openUrl)
-        self.connect(self.bookmarksMenu, SIGNAL("newUrl(const QUrl&, const QString&)"), 
-                     self.__openUrlNewTab)
+        self.bookmarksMenu.openUrl.connect(self.__openUrl)
+        self.bookmarksMenu.newUrl.connect(self.__openUrlNewTab)
         mb.addMenu(self.bookmarksMenu)
         
         bookmarksActions = []
@@ -1309,10 +1291,8 @@
             QFontMetrics(QFont()).width("ComboBoxWithEnoughWidth"))
         filtertb.addWidget(QLabel(self.trUtf8("Filtered by: ")))
         filtertb.addWidget(self.filterCombo)
-        self.connect(self.__helpEngine, SIGNAL("setupFinished()"), 
-                     self.__setupFilterCombo)
-        self.connect(self.filterCombo, SIGNAL("activated(const QString&)"), 
-                     self.__filterQtHelpDocumentation)
+        self.__helpEngine.setupFinished.connect(self.__setupFilterCombo)
+        self.filterCombo.activated[str].connect(self.__filterQtHelpDocumentation)
         self.__setupFilterCombo()
         
         settingstb = self.addToolBar(self.trUtf8("Settings"))
@@ -1348,8 +1328,7 @@
         self.pathCombo.setInsertPolicy(QComboBox.InsertAtTop)
         self.pathCombo.setEditable(1)
         self.pathCombo.setAutoCompletion(True)
-        self.connect(self.pathCombo, SIGNAL('activated(const QString&)'),
-                     self.__pathSelected)
+        self.pathCombo.activated[str].connect(self.__pathSelected)
         self.pathCombo.setWhatsThis(self.trUtf8(
                 """<p>Enter the help file to be displayed directly into this"""
                 """ edit field. Select a previously shown help file from the"""
@@ -1367,8 +1346,7 @@
         self.__historyCompletionModel.setSourceModel(
             self.historyManager().historyFilterModel())
         self.__historyCompleter = HistoryCompleter(self.__historyCompletionModel, self)
-        self.connect(self.__historyCompleter, SIGNAL("activated(const QString&)"), 
-                     self.__pathSelected)
+        self.__historyCompleter.activated[str].connect(self.__pathSelected)
         self.pathCombo.setCompleter(self.__historyCompleter)
         
         self.privacyLabel = QLabel()
@@ -1381,21 +1359,19 @@
         sizePolicy.setVerticalStretch(0)
         sizePolicy.setHeightForWidth(self.searchEdit.sizePolicy().hasHeightForWidth())
         self.searchEdit.setSizePolicy(sizePolicy)
-        self.connect(self.searchEdit, SIGNAL("search"), self.__linkActivated)
+        self.searchEdit.search.connect(self.__linkActivated)
         gotb.addWidget(self.searchEdit)
         
         self.backMenu = QMenu(self)
         self.backMenu.aboutToShow.connect(self.__showBackMenu)
-        self.connect(self.backMenu, SIGNAL("triggered(QAction*)"), 
-                     self.__navigationMenuActionTriggered)
+        self.backMenu.triggered.connect(self.__navigationMenuActionTriggered)
         backButton = gotb.widgetForAction(self.backAct)
         backButton.setMenu(self.backMenu)
         backButton.setPopupMode(QToolButton.MenuButtonPopup)
         
         self.forwardMenu = QMenu(self)
         self.forwardMenu.aboutToShow.connect(self.__showForwardMenu)
-        self.connect(self.forwardMenu, SIGNAL("triggered(QAction*)"), 
-                     self.__navigationMenuActionTriggered)
+        self.forwardMenu.triggered.connect(self.__navigationMenuActionTriggered)
         forwardButton = gotb.widgetForAction(self.forwardAct)
         forwardButton.setMenu(self.forwardMenu)
         forwardButton.setPopupMode(QToolButton.MenuButtonPopup)
@@ -1404,12 +1380,8 @@
         self.bookmarksToolBar = BookmarksToolBar(bookmarksModel)
         self.bookmarksToolBar.setObjectName("BookmarksToolBar")
         self.bookmarksToolBar.setIconSize(UI.Config.ToolBarIconSize)
-        self.connect(self.bookmarksToolBar, 
-                     SIGNAL("openUrl(const QUrl&, const QString&)"), 
-                     self.__openUrl)
-        self.connect(self.bookmarksToolBar, 
-                     SIGNAL("newUrl(const QUrl&, const QString&)"), 
-                     self.__openUrlNewTab)
+        self.bookmarksToolBar.openUrl.connect(self.__openUrl)
+        self.bookmarksToolBar.newUrl.connect(self.__openUrlNewTab)
         self.addToolBarBreak()
         self.addToolBar(self.bookmarksToolBar)
         
@@ -1746,7 +1718,7 @@
         
         self.__printPreviewBrowser = browser
         preview = QPrintPreviewDialog(printer, self)
-        self.connect(preview, SIGNAL("paintRequested(QPrinter*)"), self.__printPreview)
+        preview.paintRequested.connect(self.__printPreview)
         preview.exec_()
         
     def __printPreview(self, printer):
@@ -1837,12 +1809,8 @@
         """
         self.__bookmarksDialog = BookmarksDialog(self)
         self.__bookmarksDialog.setAttribute(Qt.WA_DeleteOnClose)
-        self.connect(self.__bookmarksDialog, 
-                     SIGNAL("openUrl(const QUrl&, const QString&)"), 
-                     self.__openUrl)
-        self.connect(self.__bookmarksDialog, 
-                     SIGNAL("newUrl(const QUrl&, const QString&)"), 
-                     self.__openUrlNewTab)
+        self.__bookmarksDialog.openUrl.connect(self.__openUrl)
+        self.__bookmarksDialog.newUrl.connect(self.__openUrlNewTab)
         self.__bookmarksDialog.show()
         
     def __bookmarkAll(self):
@@ -1926,7 +1894,7 @@
             Preferences.syncPreferences()
         
         e.accept()
-        self.emit(SIGNAL("helpClosed"))
+        self.helpClosed.emit()
 
     def __backward(self):
         """
@@ -1983,7 +1951,7 @@
         @param textOnly flag indicating to zoom text only (boolean)
         """
         QWebSettings.globalSettings().setAttribute(QWebSettings.ZoomTextOnly, textOnly)
-        self.emit(SIGNAL("zoomTextOnlyChanged(bool)"), textOnly)
+        self.zoomTextOnlyChanged.emit(textOnly)
     
     def __viewFullScreen(self,):
         """
@@ -2128,7 +2096,7 @@
         browser = HelpBrowser(self)
         
         browser.sourceChanged.connect(self.__sourceChanged)
-        self.connect(browser, SIGNAL("titleChanged(const QString&)"), self.__titleChanged)
+        browser.titleChanged.connect(self.__titleChanged)
         
         index = self.tabWidget.addTab(browser, self.trUtf8("..."))
         self.tabWidget.setCurrentIndex(index)
@@ -2149,10 +2117,8 @@
         browser.highlighted.connect(self.statusBar().showMessage)
         browser.backwardAvailable.connect(self.__setBackwardAvailable)
         browser.forwardAvailable.connect(self.__setForwardAvailable)
-        self.connect(browser.page(), SIGNAL('windowCloseRequested()'), 
-                     self.__windowCloseRequested)
-        self.connect(browser.page(), SIGNAL('printRequested(QWebFrame*)'), 
-                     self.__printRequested)
+        browser.page().windowCloseRequested.connect(self.__windowCloseRequested)
+        browser.page().printRequested.connect(self.__printRequested)
         browser.search.connect(self.newTab)
         
         self.closeAct.setEnabled(True)
@@ -2271,8 +2237,7 @@
         dlg = ConfigurationDialog(self, 'Configuration', True, 
                                   fromEric = self.fromEric, 
                                   helpBrowserMode = True)
-        self.connect(dlg, SIGNAL('preferencesChanged'), 
-                     self.preferencesChanged)
+        dlg.preferencesChanged.connect(self.preferencesChanged)
         dlg.show()
         dlg.showConfigurationPageByName("empty")
         dlg.exec_()
@@ -2628,10 +2593,8 @@
         help database.
         """
         self.__helpInstaller = HelpDocsInstaller(self.__helpEngine.collectionFile())
-        self.connect(self.__helpInstaller, SIGNAL("errorMessage(const QString&)"), 
-                     self.__showInstallationError)
-        self.connect(self.__helpInstaller, SIGNAL("docsInstalled(bool)"), 
-                     self.__docsInstalled)
+        self.__helpInstaller.errorMessage.connect(self.__showInstallationError)
+        self.__helpInstaller.docsInstalled.connect(self.__docsInstalled)
         
         self.statusBar().showMessage(self.trUtf8("Looking for Documentation..."))
         self.__helpInstaller.installDocs()
--- a/Helpviewer/OpenSearch/OpenSearchManager.py	Wed Aug 11 14:54:13 2010 +0200
+++ b/Helpviewer/OpenSearch/OpenSearchManager.py	Wed Aug 11 17:12:04 2010 +0200
@@ -52,7 +52,7 @@
         self.__loading = False
         self.__saveTimer = AutoSaver(self, self.save)
         
-        self.connect(self, SIGNAL("changed()"), self.__saveTimer.changeOccurred)
+        self.changed.connect(self.__saveTimer.changeOccurred)
         
         self.load()
     
@@ -80,8 +80,8 @@
             return
         
         self.__current = name
-        self.emit(SIGNAL("currentEngineChanged()"))
-        self.emit(SIGNAL("changed()"))
+        self.currentEngineChanged.emit()
+        self.changed.emit()
     
     def currentEngine(self):
         """
@@ -217,7 +217,7 @@
         engine.setParent(self)
         self.__engines[engine.name()] = engine
         
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
         
         return True
     
@@ -244,7 +244,7 @@
         if name == self.__current:
             self.setCurrentEngineName(list(self.__engines.keys())[0])
         
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
     
     def generateEngineFileName(self, engineName):
         """
@@ -346,7 +346,7 @@
             self.__current = list(self.__engines.keys())[0]
         
         self.__loading = False
-        self.emit(SIGNAL("currentEngineChanged()"))
+        self.currentEngineChanged.emit()
     
     def restoreDefaults(self):
         """
@@ -481,7 +481,7 @@
         else:
             self.__keywords[keyword] = engine
         
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
     
     def keywordsForEngine(self, engine):
         """
@@ -511,10 +511,10 @@
             
             self.__keywords[keyword] = engine
         
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
     
     def enginesChanged(self):
         """
         Public slot to tell the search engine manager, that something has changed.
         """
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
--- a/Helpviewer/Passwords/PasswordManager.py	Wed Aug 11 14:54:13 2010 +0200
+++ b/Helpviewer/Passwords/PasswordManager.py	Wed Aug 11 17:12:04 2010 +0200
@@ -76,6 +76,8 @@
     
     @signal changed() emitted to indicate a change
     """
+    changed = pyqtSignal()
+    
     SEPARATOR = "===================="
     FORMS = "=====FORMS====="
     NEVER = "=====NEVER====="
@@ -94,7 +96,7 @@
         self.__loaded = False
         self.__saveTimer = AutoSaver(self, self.save)
         
-        self.connect(self, SIGNAL("changed()"), self.__saveTimer.changeOccurred)
+        self.changed.connect(self.__saveTimer.changeOccurred)
     
     def clear(self):
         """
@@ -109,7 +111,7 @@
         self.__saveTimer.changeOccurred()
         self.__saveTimer.saveIfNeccessary()
         
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
     
     def getLogin(self, url, realm):
         """
@@ -142,7 +144,7 @@
         
         key = self.__createKey(url, realm)
         self.__logins[key] = (username, Utilities.pwEncode(password))
-        self.emit(SIGNAL("changed()"))
+        self.changed.emit()
     
     def __createKey(self, url, realm):
         """
@@ -266,7 +268,7 @@
             del self.__logins[site]
             if site in self.__loginForms:
                 del self.__loginForms[site]
-            self.emit(SIGNAL("changed()"))
+            self.changed.emit()
     
     def allSiteNames(self):
         """
@@ -403,7 +405,7 @@
         if user and password:
             self.__logins[key] = (user, Utilities.pwEncode(password))
             self.__loginForms[key] = form
-            self.emit(SIGNAL("changed()"))
+            self.changed.emit()
     
     def __stripUrl(self, url):
         """
--- a/Preferences/ConfigurationDialog.py	Wed Aug 11 14:54:13 2010 +0200
+++ b/Preferences/ConfigurationDialog.py	Wed Aug 11 17:12:04 2010 +0200
@@ -56,6 +56,8 @@
     
     @signal preferencesChanged emitted after settings have been changed
     """
+    preferencesChanged = pyqtSignal()
+    
     def __init__(self, parent = None, fromEric = True, helpBrowserMode = False):
         """
         Constructor
@@ -555,7 +557,7 @@
             page = self.configStack.currentWidget()
             savedState = page.saveState()
             page.save()
-            self.emit(SIGNAL('preferencesChanged'))
+            self.preferencesChanged.emit()
             if savedState is not None:
                 page.setState(savedState)
         
@@ -583,6 +585,8 @@
     
     @signal preferencesChanged emitted after settings have been changed
     """
+    preferencesChanged = pyqtSignal()
+    
     def __init__(self, parent = None, name = None, modal = False, 
                  fromEric = True, helpBrowserMode = False):
         """
@@ -612,14 +616,13 @@
         
         self.cw.buttonBox.accepted[()].connect(self.accept)
         self.cw.buttonBox.rejected[()].connect(self.reject)
-        self.connect(self.cw, SIGNAL('preferencesChanged'), 
-                     self.__preferencesChanged)
+        self.cw.preferencesChanged.connect(self.__preferencesChanged)
         
     def __preferencesChanged(self):
         """
         Private slot to handle a change of the preferences.
         """
-        self.emit(SIGNAL('preferencesChanged'))
+        self.preferencesChanged.emit()
         
     def showConfigurationPageByName(self, pageName):
         """
@@ -670,4 +673,4 @@
         self.cw.setPreferences()
         Preferences.saveResetLayout()
         Preferences.syncPreferences()
-        self.close()
\ No newline at end of file
+        self.close()
--- a/UI/UserInterface.py	Wed Aug 11 14:54:13 2010 +0200
+++ b/UI/UserInterface.py	Wed Aug 11 17:12:04 2010 +0200
@@ -171,6 +171,8 @@
     @signal showMenu(string, QMenu) emitted when a menu is about to be shown. The name
             of the menu and a reference to the menu are given.
     """
+    preferencesChanged = pyqtSignal()
+    
     maxFilePathLen = 100
     maxSbFilePathLen = 150
     maxMenuFilePathLen = 75
@@ -415,46 +417,35 @@
         self.connect(self.stderr, SIGNAL('appendStderr'),
                      self.appendToStderr)
         
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.viewmanager.preferencesChanged)
+        self.preferencesChanged.connect(self.viewmanager.preferencesChanged)
         self.connect(self, SIGNAL('reloadAPIs'),
                      self.viewmanager.getAPIsManager().reloadAPIs)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.logViewer.preferencesChanged)
+        self.preferencesChanged.connect(self.logViewer.preferencesChanged)
         self.connect(self, SIGNAL('appendStdout'),
                      self.logViewer.appendToStdout)
         self.connect(self, SIGNAL('appendStderr'),
                      self.logViewer.appendToStderr)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.shell.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.terminal.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.project.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.psBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.pfBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.prBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.ptBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.piBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.projectBrowser.poBrowser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.browser.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.taskViewer.handlePreferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.pluginManager.preferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     debugServer.preferencesChanged)
-        self.connect(self, SIGNAL('preferencesChanged'),
-                     self.cooperation.preferencesChanged)
+        self.preferencesChanged.connect(self.shell.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.terminal.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.project.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.projectBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.psBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.pfBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.prBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.ptBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.piBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(
+            self.projectBrowser.poBrowser.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.browser.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.taskViewer.handlePreferencesChanged)
+        self.preferencesChanged.connect(self.pluginManager.preferencesChanged)
+        self.preferencesChanged.connect(debugServer.preferencesChanged)
+        self.preferencesChanged.connect(self.cooperation.preferencesChanged)
         
         self.connect(self.viewmanager, SIGNAL('editorSaved'),
                      self.project.repopulateItem)
@@ -4799,9 +4790,8 @@
             
             if Preferences.getHelp("SingleHelpWindow"):
                 self.helpWindow = help
-                self.connect(self.helpWindow, SIGNAL("helpClosed"), self.__helpClosed)
-                self.connect(self, SIGNAL("preferencesChanged"), 
-                             self.helpWindow.preferencesChanged)
+                self.helpWindow.helpClosed.connect(self.__helpClosed)
+                self.preferencesChanged.connect(self.helpWindow.preferencesChanged)
         elif searchWord is not None:
             self.helpWindow.search(searchWord)
             self.helpWindow.raise_()
@@ -4814,8 +4804,7 @@
         Private slot to handle the helpClosed signal of the help window.
         """
         if Preferences.getHelp("SingleHelpWindow"):
-            self.disconnect(self, SIGNAL("preferencesChanged"), 
-                            self.helpWindow.preferencesChanged)
+            self.preferencesChanged.disconnect(self.helpWindow.preferencesChanged)
             self.helpWindow = None
     
     def __helpViewer(self):
@@ -4841,8 +4830,7 @@
         @param pageName name of the configuration page to show (string)
         """
         dlg = ConfigurationDialog(self, 'Configuration', True)
-        self.connect(dlg, SIGNAL('preferencesChanged'), 
-                     self.__preferencesChanged)
+        dlg.preferencesChanged.connect(self.__preferencesChanged)
         dlg.show()
         if pageName is not None:
             dlg.showConfigurationPageByName(pageName)
@@ -4902,7 +4890,7 @@
         SpellChecker.setDefaultLanguage(
             Preferences.getEditor("SpellCheckingDefaultLanguage"))
         
-        self.emit(SIGNAL('preferencesChanged'))
+        self.preferencesChanged.emit()
         
     def __reloadAPIs(self):
         """

eric ide

mercurial