Mercurial Repositories > eric / file diff

--- a/Helpviewer/HelpWindow.py	Tue Aug 10 19:40:44 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Wed Aug 11 09:42:20 2010 +0200
@@ -67,6 +67,9 @@
     @signal zoomTextOnlyChanged(bool) emitted after the zoom text only setting was
             changed
     """
+    zoomTextOnlyChanged = pyqtSignal(bool)
+    helpClosed = pyqtSignal()
+    
     helpwindows = []
 
     maxMenuFilePathLen = 75
@@ -243,9 +246,7 @@
             # index window
             self.connect(self.__indexWindow, SIGNAL("linkActivated(const QUrl&)"), 
                          self.__linkActivated)
-            self.connect(self.__indexWindow, 
-                         SIGNAL("linksActivated"),
-                         self.__linksActivated)
+            self.__indexWindow.linksActivated.connect(self.__linksActivated)
             self.connect(self.__indexWindow, SIGNAL("escapePressed()"), 
                          self.__activateCurrentBrowser)
             # search window
@@ -2126,8 +2127,7 @@
         """
         browser = HelpBrowser(self)
         
-        self.connect(browser, SIGNAL('sourceChanged(const QUrl &)'),
-                     self.__sourceChanged)
+        browser.sourceChanged.connect(self.__sourceChanged)
         self.connect(browser, SIGNAL("titleChanged(const QString&)"), self.__titleChanged)
         
         index = self.tabWidget.addTab(browser, self.trUtf8("..."))
@@ -2146,18 +2146,14 @@
                     self.__elide(browser.documentTitle().replace("&", "&&")))
                 self.tabWidget.setTabToolTip(index, browser.documentTitle())
         
-        self.connect(browser, SIGNAL('highlighted(const QString&)'),
-                     self.statusBar(), SLOT('showMessage(const QString&)'))
-        self.connect(browser, SIGNAL('backwardAvailable(bool)'),
-                     self.__setBackwardAvailable)
-        self.connect(browser, SIGNAL('forwardAvailable(bool)'),
-                     self.__setForwardAvailable)
+        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)
-        self.connect(browser, SIGNAL("search(const QUrl &)"), 
-                     self.newTab)
+        browser.search.connect(self.newTab)
         
         self.closeAct.setEnabled(True)
         self.closeAllAct.setEnabled(True)
@@ -3013,4 +3009,4 @@
         else:
             print(codecs[offset])
             QWebSettings.globalSettings().setDefaultTextEncoding(codecs[offset])
-            Preferences.setHelp("DefaultTextEncoding", codecs[offset])
\ No newline at end of file
+            Preferences.setHelp("DefaultTextEncoding", codecs[offset])