Mercurial Repositories > eric / changeset

--- a/Debugger/BreakPointViewer.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Debugger/BreakPointViewer.py	Fri Aug 06 14:41:22 2010 +0200
@@ -160,7 +160,7 @@
             self.backMenu.addAction(self.trUtf8("Disable all"), self.__disableAllBreaks)
         self.backMenuActions["DeleteAll"] = \
             self.backMenu.addAction(self.trUtf8("Delete all"), self.__deleteAllBreaks)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'), self.__showBackMenu)
+        self.backMenu.aboutToShow.connect(self.__showBackMenu)
         self.backMenu.addSeparator()
         self.backMenu.addAction(self.trUtf8("Configure..."), self.__configure)
 

--- a/Debugger/DebugUI.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Debugger/DebugUI.py	Fri Aug 06 14:41:22 2010 +0200
@@ -566,11 +566,10 @@
         dmenu.addAction(self.excFilterAct)
         dmenu.addAction(self.excIgnoreFilterAct)
         
-        self.connect(self.breakpointsMenu, SIGNAL('aboutToShow()'),
-            self.__showBreakpointsMenu)
+        self.breakpointsMenu.aboutToShow.connect(self.__showBreakpointsMenu)
         self.connect(self.breakpointsMenu, SIGNAL('triggered(QAction *)'),
             self.__breakpointSelected)
-        self.connect(dmenu, SIGNAL('aboutToShow()'), self.__showDebugMenu)
+        dmenu.aboutToShow.connect(self.__showDebugMenu)
         
         return smenu, dmenu
         
@@ -1988,4 +1987,4 @@
         
         @return list of all actions (list of E5Action)
         """
-        return self.actions[:]
\ No newline at end of file
+        return self.actions[:]

--- a/Debugger/WatchPointViewer.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Debugger/WatchPointViewer.py	Fri Aug 06 14:41:22 2010 +0200
@@ -159,7 +159,7 @@
                 self.__deleteAllWatchPoints)
         self.backMenu.addSeparator()
         self.backMenu.addAction(self.trUtf8("Configure..."), self.__configure)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'), self.__showBackMenu)
+        self.backMenu.aboutToShow.connect(self.__showBackMenu)
 
         self.multiMenu = QMenu()
         self.multiMenu.addAction(self.trUtf8("Add"), self.__addWatchPoint)

--- a/E5Gui/E5ModelMenu.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/E5Gui/E5ModelMenu.py	Fri Aug 06 14:41:22 2010 +0200
@@ -42,7 +42,7 @@
         self.__dropRow = -1
         self.__dropIndex = None
         
-        self.connect(self, SIGNAL("aboutToShow()"), self.__aboutToShow)
+        self.aboutToShow.connect(self.__aboutToShow)
         self.connect(self, SIGNAL("triggered(QAction*)"), self.__actionTriggered)
     
     def prePopulated(self):
@@ -387,7 +387,7 @@
             if not self.isAncestorOf(drag.target()):
                 self.close()
             else:
-                self.emit(SIGNAL("aboutToShow()"))
+                self.aboutToShow.emit()
     
     def mouseReleaseEvent(self, evt):
         """
@@ -414,4 +414,4 @@
         """
         row = idx.row()
         self.__model.removeRow(row, self.__root)
-        self.emit(SIGNAL("aboutToShow()"))
\ No newline at end of file
+        self.aboutToShow.emit()

--- a/Helpviewer/AdBlock/AdBlockDialog.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Fri Aug 06 14:41:22 2010 +0200
@@ -48,7 +48,7 @@
                      manager.setEnabled)
         
         menu = QMenu(self)
-        self.connect(menu, SIGNAL("aboutToShow()"), self.__aboutToShowActionMenu)
+        menu.aboutToShow.connect(self.__aboutToShowActionMenu)
         self.actionButton.setMenu(menu)
         self.actionButton.setIcon(UI.PixmapCache.getIcon("adBlockAction.png"))
         self.actionButton.setPopupMode(QToolButton.InstantPopup)
@@ -56,7 +56,8 @@
         if self.adBlockGroup.isChecked():
             subscription = manager.customRules()
             subscriptionIndex = self.__adBlockModel.subscriptionIndex(subscription)
-            self.subscriptionsTree.expand(self.__proxyModel.mapFromSource(subscriptionIndex))
+            self.subscriptionsTree.expand(
+                self.__proxyModel.mapFromSource(subscriptionIndex))
     
     def model(self):
         """

--- a/Helpviewer/HelpWebSearchWidget.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Helpviewer/HelpWebSearchWidget.py	Fri Aug 06 14:41:22 2010 +0200
@@ -81,7 +81,7 @@
                      self.__completerActivated)
         self.connect(self.__completer, SIGNAL("highlighted(const QModelIndex &)"), 
                      self.__completerHighlighted)
-        self.connect(self.__enginesMenu, SIGNAL("aboutToShow()"), self.__showEnginesMenu)
+        self.__enginesMenu.aboutToShow.connect(self.__showEnginesMenu)
         
         self.__suggestionsItem = None
         self.__suggestions = []
@@ -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())))
\ No newline at end of file
+            QIcon(QPixmap.fromImage(self.__openSearchManager.currentEngine().image())))

--- a/Helpviewer/HelpWindow.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Fri Aug 06 14:41:22 2010 +0200
@@ -172,8 +172,7 @@
             self.rightCornerWidgetLayout.setSpacing(0)
             
             self.__navigationMenu = QMenu(self)
-            self.connect(self.__navigationMenu, SIGNAL("aboutToShow()"), 
-                         self.__showNavigationMenu)
+            self.__navigationMenu.aboutToShow.connect(self.__showNavigationMenu)
             self.connect(self.__navigationMenu, SIGNAL("triggered(QAction*)"), 
                          self.__navigationMenuTriggered)
             
@@ -1141,8 +1140,8 @@
         menu.addAction(self.fullScreenAct)
         if hasattr(QWebSettings, 'defaultTextEncoding'):
             self.__textEncodingMenu = menu.addMenu(self.trUtf8("Text Encoding"))
-            self.connect(self.__textEncodingMenu, SIGNAL("aboutToShow()"), 
-                         self.__aboutToShowTextEncodingMenu)
+            self.__textEncodingMenu.aboutToShow.connect(
+                self.__aboutToShowTextEncodingMenu)
             self.connect(self.__textEncodingMenu, SIGNAL("triggered(QAction*)"), 
                          self.__setTextEncoding)
         
@@ -1385,7 +1384,7 @@
         gotb.addWidget(self.searchEdit)
         
         self.backMenu = QMenu(self)
-        self.connect(self.backMenu, SIGNAL("aboutToShow()"), self.__showBackMenu)
+        self.backMenu.aboutToShow.connect(self.__showBackMenu)
         self.connect(self.backMenu, SIGNAL("triggered(QAction*)"), 
                      self.__navigationMenuActionTriggered)
         backButton = gotb.widgetForAction(self.backAct)
@@ -1393,7 +1392,7 @@
         backButton.setPopupMode(QToolButton.MenuButtonPopup)
         
         self.forwardMenu = QMenu(self)
-        self.connect(self.forwardMenu, SIGNAL("aboutToShow()"), self.__showForwardMenu)
+        self.forwardMenu.aboutToShow.connect(self.__showForwardMenu)
         self.connect(self.forwardMenu, SIGNAL("triggered(QAction*)"), 
                      self.__navigationMenuActionTriggered)
         forwardButton = gotb.widgetForAction(self.forwardAct)

--- a/MultiProject/MultiProject.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/MultiProject/MultiProject.py	Fri Aug 06 14:41:22 2010 +0200
@@ -780,11 +780,10 @@
         }
         
         # connect the aboutToShow signals
-        self.connect(self.recentMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuRecent)
+        self.recentMenu.aboutToShow.connect(self.__showContextMenuRecent)
         self.connect(self.recentMenu, SIGNAL('triggered(QAction *)'),
                      self.__openRecent)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showMenu)
+        menu.aboutToShow.connect(self.__showMenu)
         
         # build the main menu
         menu.setTearOffEnabled(True)
@@ -976,4 +975,4 @@
         for project in self.projects:
             if not project['master']:
                 files.append(project['file'])
-        return files
\ No newline at end of file
+        return files

--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Aug 06 14:41:22 2010 +0200
@@ -171,8 +171,7 @@
         self.rightCornerWidgetLayout.setSpacing(0)
         
         self.__navigationMenu = QMenu(self)
-        self.connect(self.__navigationMenu, SIGNAL("aboutToShow()"), 
-                     self.__showNavigationMenu)
+        self.__navigationMenu.aboutToShow.connect(self.__showNavigationMenu)
         self.connect(self.__navigationMenu, SIGNAL("triggered(QAction*)"), 
                      self.__navigationMenuTriggered)
         

--- a/Project/Project.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/Project.py	Fri Aug 06 14:41:22 2010 +0200
@@ -3755,21 +3755,16 @@
         }
         
         # connect the aboutToShow signals
-        self.connect(self.recentMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuRecent)
+        self.recentMenu.aboutToShow.connect(self.__showContextMenuRecent)
         self.connect(self.recentMenu, SIGNAL('triggered(QAction *)'),
                      self.__openRecent)
-        self.connect(self.vcsMenu, SIGNAL('aboutToShow()'), self.__showContextMenuVCS)
-        self.connect(self.checksMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuChecks)
-        self.connect(self.showMenu, SIGNAL('aboutToShow()'), self.__showContextMenuShow)
-        self.connect(self.graphicsMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuGraphics)
-        self.connect(self.apidocMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuApiDoc)
-        self.connect(self.packagersMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuPackagers)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showMenu)
+        self.vcsMenu.aboutToShow.connect(self.__showContextMenuVCS)
+        self.checksMenu.aboutToShow.connect(self.__showContextMenuChecks)
+        self.showMenu.aboutToShow.connect(self.__showContextMenuShow)
+        self.graphicsMenu.aboutToShow.connect(self.__showContextMenuGraphics)
+        self.apidocMenu.aboutToShow.connect(self.__showContextMenuApiDoc)
+        self.packagersMenu.aboutToShow.connect(self.__showContextMenuPackagers)
+        menu.aboutToShow.connect(self.__showMenu)
         
         # build the show menu
         self.showMenu.setTearOffEnabled(True)
@@ -4698,4 +4693,4 @@
                             .replace('"', "").replace("'", "")
                 break
         
-        return version
\ No newline at end of file
+        return version

--- a/Project/ProjectFormsBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectFormsBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -276,16 +276,11 @@
         self.dirMultiMenu.addSeparator()
         self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
-        self.connect(self.menu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.dirMultiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDirMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.menu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.dirMultiMenu.aboutToShow.connect(self.__showContextMenuDirMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.menu
         
     def _contextMenuRequested(self, coord):

--- a/Project/ProjectInterfacesBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectInterfacesBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -214,16 +214,11 @@
         self.dirMultiMenu.addAction(self.trUtf8('Configure CORBA...'), 
                                     self.__configureCorba)
         
-        self.connect(self.sourceMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.dirMultiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDirMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.sourceMenu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.dirMultiMenu.aboutToShow.connect(self.__showContextMenuDirMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.sourceMenu
         
     def _contextMenuRequested(self, coord):

--- a/Project/ProjectOthersBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectOthersBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -121,12 +121,9 @@
         self.multiMenu.addSeparator()
         self.multiMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
-        self.connect(self.menu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.menu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.menu
         
     def _contextMenuRequested(self, coord):

--- a/Project/ProjectResourcesBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectResourcesBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -233,16 +233,11 @@
         self.dirMultiMenu.addSeparator()
         self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
-        self.connect(self.menu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.dirMultiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDirMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.menu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.dirMultiMenu.aboutToShow.connect(self.__showContextMenuDirMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.menu
         
     def _contextMenuRequested(self, coord):

--- a/Project/ProjectSourcesBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectSourcesBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -111,8 +111,7 @@
         Privat method to generate the popup menus for a Python project.
         """
         self.checksMenu = QMenu(self.trUtf8('Check'))
-        self.connect(self.checksMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuCheck)
+        self.checksMenu.aboutToShow.connect(self.__showContextMenuCheck)
         
         self.showMenu = QMenu(self.trUtf8('Show'))
         self.showMenu.addAction(self.trUtf8('Code metrics...'), self.__showCodeMetrics)
@@ -120,7 +119,7 @@
             self.trUtf8('Code coverage...'), self.__showCodeCoverage)
         self.profileMenuAction = self.showMenu.addAction(\
             self.trUtf8('Profile data...'), self.__showProfileData)
-        self.connect(self.showMenu, SIGNAL('aboutToShow()'), self.__showContextMenuShow)
+        self.showMenu.aboutToShow.connect(self.__showContextMenuShow)
         
         self.graphicsMenu = QMenu(self.trUtf8('Diagrams'))
         self.classDiagramAction = self.graphicsMenu.addAction(\
@@ -131,8 +130,7 @@
             self.trUtf8("Imports Diagram..."), self.__showImportsDiagram)
         self.graphicsMenu.addAction(\
             self.trUtf8("Application Diagram..."), self.__showApplicationDiagram)
-        self.connect(self.graphicsMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuGraphics)
+        self.graphicsMenu.aboutToShow.connect(self.__showContextMenuGraphics)
         
         self.unittestAction = self.sourceMenu.addAction(\
             self.trUtf8('Run unittest...'), self.handleUnittest)
@@ -245,16 +243,11 @@
         self.dirMultiMenu.addSeparator()
         self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
-        self.connect(self.sourceMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.dirMultiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDirMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.sourceMenu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.dirMultiMenu.aboutToShow.connect(self.__showContextMenuDirMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.sourceMenu
         
     def __createRubyPopupMenus(self):
@@ -357,16 +350,11 @@
         self.dirMultiMenu.addSeparator()
         self.dirMultiMenu.addAction(self.trUtf8('Configure...'), self._configure)
         
-        self.connect(self.sourceMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.dirMultiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDirMulti)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.sourceMenu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.dirMultiMenu.aboutToShow.connect(self.__showContextMenuDirMulti)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.sourceMenu
         
     def _contextMenuRequested(self, coord):

--- a/Project/ProjectTranslationsBrowser.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Fri Aug 06 14:41:22 2010 +0200
@@ -379,14 +379,10 @@
         
         self.dirMultiMenu = None
         
-        self.connect(self.menu, SIGNAL('aboutToShow()'),
-            self.__showContextMenu)
-        self.connect(self.multiMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuMulti)
-        self.connect(self.dirMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuDir)
-        self.connect(self.backMenu, SIGNAL('aboutToShow()'),
-            self.__showContextMenuBack)
+        self.menu.aboutToShow.connect(self.__showContextMenu)
+        self.multiMenu.aboutToShow.connect(self.__showContextMenuMulti)
+        self.dirMenu.aboutToShow.connect(self.__showContextMenuDir)
+        self.backMenu.aboutToShow.connect(self.__showContextMenuBack)
         self.mainMenu = self.menu
         
     def _contextMenuRequested(self, coord):

--- a/QScintilla/Editor.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/QScintilla/Editor.py	Fri Aug 06 14:41:22 2010 +0200
@@ -658,13 +658,12 @@
             self.menu.addAction(UI.PixmapCache.getIcon("print.png"),
                 self.trUtf8('Print'), self.printFile)
         
-        self.connect(self.menu, SIGNAL('aboutToShow()'), self.__showContextMenu)
+        self.menu.aboutToShow.connect(self.__showContextMenu)
         
         self.spellingMenu = QMenu()
         self.__menus["Spelling"] = self.spellingMenu
         
-        self.connect(self.spellingMenu, SIGNAL('aboutToShow()'), 
-                     self.__showContextMenuSpelling)
+        self.spellingMenu.aboutToShow.connect(self.__showContextMenuSpelling)
         self.connect(self.spellingMenu, SIGNAL('triggered(QAction *)'), 
                      self.__contextMenuSpellingTriggered)
 
@@ -690,7 +689,7 @@
         self.menuActs["calltip"] = \
             menu.addAction(self.trUtf8('Calltip'), self.callTip)
         
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuAutocompletion)
+        menu.aboutToShow.connect(self.__showContextMenuAutocompletion)
         
         return menu
 
@@ -699,7 +698,7 @@
         Private method used to setup the Checks context sub menu.
         """
         menu = QMenu(self.trUtf8('Check'))
-        self.connect(menu, SIGNAL("aboutToShow()"), self.__showContextMenuChecks)
+        menu.aboutToShow.connect(self.__showContextMenuChecks)
         return menu
 
     def __initContextMenuShow(self):
@@ -720,7 +719,7 @@
         self.profileMenuAct = \
             menu.addAction(self.trUtf8('Profile data...'), self.__showProfileData)
         
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuShow)
+        menu.aboutToShow.connect(self.__showContextMenuShow)
         
         return menu
         
@@ -740,7 +739,7 @@
             menu.addAction(self.trUtf8('Application Diagram...'), 
                 self.__showApplicationDiagram)
         
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuGraphics)
+        menu.aboutToShow.connect(self.__showContextMenuGraphics)
         
         return menu
 
@@ -778,7 +777,7 @@
         self.pygmentsSelAct.setData("Alternatives")
         
         self.connect(menu, SIGNAL('triggered(QAction *)'), self.__languageMenuTriggered)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuLanguages)
+        menu.aboutToShow.connect(self.__showContextMenuLanguages)
         
         return menu
         
@@ -800,7 +799,7 @@
             self.encodingsActGrp.addAction(act)
         
         self.connect(menu, SIGNAL('triggered(QAction *)'), self.__encodingsMenuTriggered)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuEncodings)
+        menu.aboutToShow.connect(self.__showContextMenuEncodings)
         
         return menu
         
@@ -833,7 +832,7 @@
         self.eolActGrp.addAction(act)
         
         self.connect(menu, SIGNAL('triggered(QAction *)'), self.__eolMenuTriggered)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuEol)
+        menu.aboutToShow.connect(self.__showContextMenuEol)
         
         return menu
         
@@ -883,8 +882,7 @@
             self.bmMarginMenu.addAction(self.trUtf8('Clear all bookmarks'),
                 self.clearBookmarks)
         
-        self.connect(self.bmMarginMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuMargin)
+        self.bmMarginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
         # breakpoint margin
         self.bpMarginMenu = QMenu()
@@ -911,8 +909,7 @@
             self.bpMarginMenu.addAction(self.trUtf8('Clear all breakpoints'), 
                 self.__menuClearBreakpoints)
         
-        self.connect(self.bpMarginMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuMargin)
+        self.bpMarginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
         # indicator margin
         self.indicMarginMenu = QMenu()
@@ -954,8 +951,7 @@
             self.indicMarginMenu.addAction(self.trUtf8('Previous task'),
                 self.previousTask)
         
-        self.connect(self.indicMarginMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuMargin)
+        self.indicMarginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
     def __initContextMenuUnifiedMargins(self):
         """
@@ -1045,8 +1041,7 @@
         self.marginMenuActs["LMBbreakpoints"].setCheckable(True)
         self.marginMenuActs["LMBbreakpoints"].setChecked(True)
         
-        self.connect(self.marginMenu, SIGNAL('aboutToShow()'), 
-            self.__showContextMenuMargin)
+        self.marginMenu.aboutToShow.connect(self.__showContextMenuMargin)
         
     def __exportMenuTriggered(self, act):
         """
@@ -5018,7 +5013,7 @@
         menu.addAction(self.trUtf8('Add resource frame'),
             self.__addResourceFrame)
         
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuResources)
+        menu.aboutToShow.connect(self.__showContextMenuResources)
         
         return menu
         

--- a/QScintilla/MiniEditor.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/QScintilla/MiniEditor.py	Fri Aug 06 14:41:22 2010 +0200
@@ -1919,7 +1919,7 @@
         self.pygmentsSelAct.setData("Alternatives")
         
         self.connect(menu, SIGNAL('triggered(QAction *)'), self.__languageMenuTriggered)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showContextMenuLanguages)
+        menu.aboutToShow.connect(self.__showContextMenuLanguages)
         
         return menu
     

--- a/Tools/TRPreviewer.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Tools/TRPreviewer.py	Fri Aug 06 14:41:22 2010 +0200
@@ -262,7 +262,7 @@
         
         self.windowMenu = mb.addMenu(self.trUtf8('&Window'))
         self.windowMenu.setTearOffEnabled(True)
-        self.connect(self.windowMenu, SIGNAL('aboutToShow()'), self.__showWindowMenu)
+        self.windowMenu.aboutToShow.connect(self.__showWindowMenu)
         self.connect(self.windowMenu, SIGNAL('triggered(QAction *)'),
                      self.preview.toggleSelectedWidget)
         
@@ -853,4 +853,4 @@
         
         @return flag signaling if any widget was loaded (boolean)
         """
-        return len(self.widgets) > 0
\ No newline at end of file
+        return len(self.widgets) > 0

--- a/Tools/TrayStarter.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/Tools/TrayStarter.py	Fri Aug 06 14:41:22 2010 +0200
@@ -50,21 +50,19 @@
         self.__menu = QMenu(self.trUtf8("Eric5 tray starter"))
         
         self.recentProjectsMenu = QMenu(self.trUtf8('Recent Projects'), self.__menu)
-        self.connect(self.recentProjectsMenu, SIGNAL('aboutToShow()'), 
-                     self.__showRecentProjectsMenu)
+        self.recentProjectsMenu.aboutToShow.connect(self.__showRecentProjectsMenu)
         self.connect(self.recentProjectsMenu, SIGNAL('triggered(QAction *)'),
                      self.__openRecent)
         
         self.recentMultiProjectsMenu = \
             QMenu(self.trUtf8('Recent Multiprojects'), self.__menu)
-        self.connect(self.recentMultiProjectsMenu, SIGNAL('aboutToShow()'), 
-                     self.__showRecentMultiProjectsMenu)
+        self.recentMultiProjectsMenu.aboutToShow.connect(
+            self.__showRecentMultiProjectsMenu)
         self.connect(self.recentMultiProjectsMenu, SIGNAL('triggered(QAction *)'),
                      self.__openRecent)
         
         self.recentFilesMenu = QMenu(self.trUtf8('Recent Files'), self.__menu)
-        self.connect(self.recentFilesMenu, SIGNAL('aboutToShow()'), 
-                     self.__showRecentFilesMenu)
+        self.recentFilesMenu.aboutToShow.connect(self.__showRecentFilesMenu)
         self.connect(self.recentFilesMenu, SIGNAL('triggered(QAction *)'),
                      self.__openRecent)
         

--- a/UI/UserInterface.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/UI/UserInterface.py	Fri Aug 06 14:41:22 2010 +0200
@@ -2288,7 +2288,7 @@
         mb.addMenu(self.__menus["file"])
         self.__menus["file"].addSeparator()
         self.__menus["file"].addAction(self.exitAct)
-        self.connect(self.__menus["file"], SIGNAL('aboutToShow()'), self.__showFileMenu)
+        self.__menus["file"].aboutToShow.connect(self.__showFileMenu)
         
         self.__menus["edit"] = self.viewmanager.initEditMenu()
         mb.addMenu(self.__menus["edit"])
@@ -2317,26 +2317,22 @@
         
         self.__menus["extras"] = QMenu(self.trUtf8('E&xtras'), self)
         self.__menus["extras"].setTearOffEnabled(True)
-        self.connect(self.__menus["extras"], SIGNAL('aboutToShow()'), 
-            self.__showExtrasMenu)
+        self.__menus["extras"].aboutToShow.connect(self.__showExtrasMenu)
         mb.addMenu(self.__menus["extras"])
         self.viewmanager.addToExtrasMenu(self.__menus["extras"])
         self.__menus["wizards"] = QMenu(self.trUtf8('Wi&zards'), self)
         self.__menus["wizards"].setTearOffEnabled(True)
-        self.connect(self.__menus["wizards"], SIGNAL('aboutToShow()'), 
-            self.__showWizardsMenu)
+        self.__menus["wizards"].aboutToShow.connect(self.__showWizardsMenu)
         self.wizardsMenuAct = self.__menus["extras"].addMenu(self.__menus["wizards"])
         self.wizardsMenuAct.setEnabled(False)
         self.__menus["macros"] = self.viewmanager.initMacroMenu()
         self.__menus["extras"].addMenu(self.__menus["macros"])
         self.__menus["tools"] = QMenu(self.trUtf8('&Tools'), self)
-        self.connect(self.__menus["tools"], SIGNAL('aboutToShow()'), 
-            self.__showToolsMenu)
+        self.__menus["tools"].aboutToShow.connect(self.__showToolsMenu)
         self.connect(self.__menus["tools"], SIGNAL('triggered(QAction *)'),
             self.__toolExecute)
         self.toolGroupsMenu = QMenu(self.trUtf8("Select Tool Group"), self)
-        self.connect(self.toolGroupsMenu, SIGNAL('aboutToShow()'), 
-            self.__showToolGroupsMenu)
+        self.toolGroupsMenu.aboutToShow.connect(self.__showToolGroupsMenu)
         self.connect(self.toolGroupsMenu, SIGNAL('triggered(QAction *)'),
             self.__toolGroupSelected)
         self.toolGroupsMenuTriggered = False
@@ -2363,14 +2359,12 @@
         self.__menus["window"] = QMenu(self.trUtf8('&Window'), self)
         mb.addMenu(self.__menus["window"])
         self.__menus["window"].setTearOffEnabled(True)
-        self.connect(self.__menus["window"], SIGNAL('aboutToShow()'), 
-            self.__showWindowMenu)
+        self.__menus["window"].aboutToShow.connect(self.__showWindowMenu)
         
         self.__menus["toolbars"] = \
             QMenu(self.trUtf8("&Toolbars"), self.__menus["window"])
         self.__menus["toolbars"].setTearOffEnabled(True)
-        self.connect(self.__menus["toolbars"], SIGNAL('aboutToShow()'), 
-            self.__showToolbarsMenu)
+        self.__menus["toolbars"].aboutToShow.connect(self.__showToolbarsMenu)
         self.connect(self.__menus["toolbars"], SIGNAL('triggered(QAction *)'),
             self.__TBMenuTriggered)
         
@@ -2415,8 +2409,7 @@
         self.__menus["help"].addAction(self.requestFeatureAct)
         self.__menus["help"].addSeparator()
         self.__menus["help"].addAction(self.whatsThisAct)
-        self.connect(self.__menus["help"], SIGNAL('aboutToShow()'), 
-            self.__showHelpMenu)
+        self.__menus["help"].aboutToShow.connect(self.__showHelpMenu)
     
     def getToolBarIconSize(self):
         """

--- a/ViewManager/ViewManager.py	Fri Aug 06 12:55:39 2010 +0200
+++ b/ViewManager/ViewManager.py	Fri Aug 06 14:41:22 2010 +0200
@@ -662,15 +662,13 @@
         menu.addAction(self.printPreviewAct)
         menu.addAction(self.printAct)
         
-        self.connect(self.recentMenu, SIGNAL('aboutToShow()'), 
-            self.__showRecentMenu)
+        self.recentMenu.aboutToShow.connect(self.__showRecentMenu)
         self.connect(self.recentMenu, SIGNAL('triggered(QAction *)'),
             self.__openSourceFile)
-        self.connect(self.bookmarkedMenu, SIGNAL('aboutToShow()'), 
-            self.__showBookmarkedMenu)
+        self.bookmarkedMenu.aboutToShow.connect(self.__showBookmarkedMenu)
         self.connect(self.bookmarkedMenu, SIGNAL('triggered(QAction *)'),
             self.__openSourceFile)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showFileMenu)
+        menu.aboutToShow.connect(self.__showFileMenu)
         
         self.exportersMenuAct.setEnabled(False)
         
@@ -2800,11 +2798,10 @@
         menu.addAction(self.taskNextAct)
         menu.addAction(self.taskPreviousAct)
         
-        self.connect(self.bookmarksMenu, SIGNAL('aboutToShow()'), 
-            self.__showBookmarksMenu)
+        self.bookmarksMenu.aboutToShow.connect(self.__showBookmarksMenu)
         self.connect(self.bookmarksMenu, SIGNAL('triggered(QAction *)'), 
             self.__bookmarkSelected)
-        self.connect(menu, SIGNAL('aboutToShow()'), self.__showBookmarkMenu)
+        menu.aboutToShow.connect(self.__showBookmarkMenu)
         
         return menu
         
@@ -5081,4 +5078,4 @@
             if aw is not None:
                 if aw.hasSelectedText():
                     txt = aw.selectedText()
-        return txt
\ No newline at end of file
+        return txt