Mercurial Repositories > eric / file diff

diff -r 01f3384d535a -r b31b0bffa5b0 Plugins/PluginTabnanny.py
--- a/Plugins/PluginTabnanny.py	Wed Aug 11 17:12:04 2010 +0200
+++ b/Plugins/PluginTabnanny.py	Wed Aug 11 19:55:34 2010 +0200
@@ -9,7 +9,7 @@
 
 import os
 
-from PyQt4.QtCore import QObject, SIGNAL
+from PyQt4.QtCore import QObject
 
 from E5Gui.E5Application import e5App
 
@@ -96,14 +96,11 @@
         ))
         self.__editorAct.triggered[()].connect(self.__editorTabnanny)
         
-        self.connect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                     self.__projectShowMenu)
-        self.connect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                     SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                     self.__editorOpened)
-        self.connect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                     self.__editorClosed)
+        e5App().getObject("Project").showMenu.connect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.connect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.connect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.connect(self.__editorClosed)
         
         for editor in e5App().getObject("ViewManager").getOpenEditors():
             self.__editorOpened(editor)
@@ -114,14 +111,11 @@
         """
         Public method to deactivate this plugin.
         """
-        self.disconnect(e5App().getObject("Project"), SIGNAL("showMenu"), 
-                        self.__projectShowMenu)
-        self.disconnect(e5App().getObject("ProjectBrowser").getProjectBrowser("sources"), 
-                        SIGNAL("showMenu"), self.__projectBrowserShowMenu)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorOpenedEd"), 
-                        self.__editorOpened)
-        self.disconnect(e5App().getObject("ViewManager"), SIGNAL("editorClosedEd"), 
-                        self.__editorClosed)
+        e5App().getObject("Project").showMenu.disconnect(self.__projectShowMenu)
+        e5App().getObject("ProjectBrowser").getProjectBrowser("sources")\
+            .showMenu.disconnect(self.__projectBrowserShowMenu)
+        e5App().getObject("ViewManager").editorOpenedEd.disconnect(self.__editorOpened)
+        e5App().getObject("ViewManager").editorClosedEd.disconnect(self.__editorClosed)
         
         menu = e5App().getObject("Project").getMenu("Checks")
         if menu:
@@ -132,7 +126,7 @@
                 self.__projectBrowserMenu.removeAction(self.__projectBrowserAct)
         
         for editor in self.__editors:
-            self.disconnect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.disconnect(self.__editorShowMenu)
             menu = editor.getMenu("Checks")
             if menu is not None:
                 menu.removeAction(self.__editorAct)
@@ -214,7 +208,7 @@
         menu = editor.getMenu("Checks")
         if menu is not None:
             menu.addAction(self.__editorAct)
-            self.connect(editor, SIGNAL("showMenu"), self.__editorShowMenu)
+            editor.showMenu.connect(self.__editorShowMenu)
             self.__editors.append(editor)
     
     def __editorClosed(self, editor):
@@ -253,4 +247,4 @@
             
             self.__editorTabnannyDialog = TabnannyDialog()
             self.__editorTabnannyDialog.show()
-            self.__editorTabnannyDialog.start(editor.getFileName())
\ No newline at end of file
+            self.__editorTabnannyDialog.start(editor.getFileName())