Merged remote changes.

Fri, 06 Aug 2010 18:54:40 +0200

author
Detlev Offenbach <detlev@die-offenbachs.de>
date
Fri, 06 Aug 2010 18:54:40 +0200
changeset 474
376734960668
parent 473
b314592e3d79 (current diff)
parent 461
34528aaedf1c (diff)
child 475
94b3fdd34c60

Merged remote changes.

--- a/Debugger/BreakPointModel.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/BreakPointModel.py	Fri Aug 06 18:54:40 2010 +0200
@@ -13,6 +13,8 @@
     """
     Class implementing a custom model for breakpoints.
     """
+    dataAboutToBeChanged = pyqtSignal(QModelIndex, QModelIndex)
+    
     def __init__(self, parent = None):
         """
         Constructor
@@ -180,15 +182,12 @@
             index1 = self.createIndex(row, 0, self.breakpoints[row])
             index2 = self.createIndex(row, len(self.breakpoints[row]), 
                      self.breakpoints[row])
-            self.emit(\
-                SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
-                index1, index2)
+            self.dataAboutToBeChanged.emit(index1, index2)
             i = 0
             for value in [fn, line] + list(properties):
                 self.breakpoints[row][i] = value
                 i += 1
-            self.emit(SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-                      index1, index2)
+            self.dataChanged.emit(index1, index2)
 
     def setBreakPointEnabledByIndex(self, index, enabled):
         """
@@ -201,12 +200,9 @@
             row = index.row()
             col = 4
             index1 = self.createIndex(row, col, self.breakpoints[row])
-            self.emit(\
-                SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
-                index1, index1)
+            self.dataAboutToBeChanged.emit(index1, index1)
             self.breakpoints[row][col] = enabled
-            self.emit(SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-                      index1, index1)
+            self.dataChanged.emit(index1, index1)
     
     def deleteBreakPointByIndex(self, index):
         """
--- a/Debugger/BreakPointViewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/BreakPointViewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -43,8 +43,7 @@
         self.setWindowTitle(self.trUtf8("Breakpoints"))
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self,SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self,SIGNAL('doubleClicked(const QModelIndex &)'),
                      self.__doubleClicked)
         
@@ -161,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)
 
@@ -436,4 +435,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage")
--- a/Debugger/DebugServer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/DebugServer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -131,31 +131,17 @@
         self.connect(self, SIGNAL("clientClearWatch"), self.__clientClearWatchPoint)
         self.connect(self, SIGNAL("newConnection()"), self.__newConnection)
         
-        self.connect(self.breakpointModel, 
-            SIGNAL("rowsAboutToBeRemoved(const QModelIndex &, int, int)"), 
-            self.__deleteBreakPoints)
-        self.connect(self.breakpointModel,
-            SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
+        self.breakpointModel.rowsAboutToBeRemoved.connect(self.__deleteBreakPoints)
+        self.breakpointModel.dataAboutToBeChanged.connect(
             self.__breakPointDataAboutToBeChanged)
-        self.connect(self.breakpointModel,
-            SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-            self.__changeBreakPoints)
-        self.connect(self.breakpointModel,
-            SIGNAL("rowsInserted(const QModelIndex &, int, int)"),
-            self.__addBreakPoints)
+        self.breakpointModel.dataChanged.connect(self.__changeBreakPoints)
+        self.breakpointModel.rowsInserted.connect(self.__addBreakPoints)
         
-        self.connect(self.watchpointModel, 
-            SIGNAL("rowsAboutToBeRemoved(const QModelIndex &, int, int)"), 
-            self.__deleteWatchPoints)
-        self.connect(self.watchpointModel,
-            SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
+        self.watchpointModel.rowsAboutToBeRemoved.connect(self.__deleteWatchPoints)
+        self.watchpointModel.dataAboutToBeChanged.connect(
             self.__watchPointDataAboutToBeChanged)
-        self.connect(self.watchpointModel, 
-            SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-            self.__changeWatchPoints)
-        self.connect(self.watchpointModel,
-            SIGNAL("rowsInserted(const QModelIndex &, int, int)"),
-            self.__addWatchPoints)
+        self.watchpointModel.dataChanged.connect(self.__changeWatchPoints)
+        self.watchpointModel.rowsInserted.connect(self.__addWatchPoints)
         
         self.__registerDebuggerInterfaces()
         
--- a/Debugger/DebugUI.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/DebugUI.py	Fri Aug 06 18:54:40 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/ExceptionLogger.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/ExceptionLogger.py	Fri Aug 06 18:54:40 2010 +0200
@@ -39,8 +39,7 @@
         self.setSortingEnabled(False)
 
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self,SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self,SIGNAL('itemDoubleClicked(QTreeWidgetItem *, int)'),
                      self.__itemDoubleClicked)
 
--- a/Debugger/VariablesViewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/VariablesViewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -308,8 +308,7 @@
         
         self.__createPopupMenus()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self,SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         
         self.connect(self, SIGNAL("itemExpanded(QTreeWidgetItem *)"), 
             self.__expandItemSignal)
--- a/Debugger/WatchPointModel.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/WatchPointModel.py	Fri Aug 06 18:54:40 2010 +0200
@@ -13,6 +13,8 @@
     """
     Class implementing a custom model for watch expressions.
     """
+    dataAboutToBeChanged = pyqtSignal(QModelIndex, QModelIndex)
+    
     def __init__(self, parent = None):
         """
         Constructor
@@ -175,15 +177,12 @@
             index1 = self.createIndex(row, 0, self.watchpoints[row])
             index2 = self.createIndex(row, len(self.watchpoints[row]), 
                      self.watchpoints[row])
-            self.emit(\
-                SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
-                index1, index2)
+            self.dataAboutToBeChanged.emit(index1, index2)
             i = 0
             for value in [cond, special] + list(properties):
                 self.watchpoints[row][i] = value
                 i += 1
-            self.emit(SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-                      index1, index2)
+            self.dataChanged.emit(index1, index2)
 
     def setWatchPointEnabledByIndex(self, index, enabled):
         """
@@ -196,12 +195,9 @@
             row = index.row()
             col = 3
             index1 = self.createIndex(row, col, self.watchpoints[row])
-            self.emit(\
-                SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
-                index1, index1)
+            self.dataAboutToBeChanged.emit(index1, index1)
             self.watchpoints[row][col] = enabled
-            self.emit(SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
-                      index1, index1)
+            self.dataChanged.emit(index1, index1)
     
     def deleteWatchPointByIndex(self, index):
         """
--- a/Debugger/WatchPointViewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Debugger/WatchPointViewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -43,8 +43,7 @@
         self.setWindowTitle(self.trUtf8("Watchpoints"))
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self,SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self,SIGNAL('doubleClicked(const QModelIndex &)'),
                      self.__doubleClicked)
         
@@ -160,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 18:53:43 2010 +0200
+++ b/E5Gui/E5ModelMenu.py	Fri Aug 06 18:54:40 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/E5Gui/E5TabWidget.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/E5Gui/E5TabWidget.py	Fri Aug 06 18:54:40 2010 +0200
@@ -8,7 +8,7 @@
 """
 
 from PyQt4.QtGui import QTabWidget, QTabBar, QApplication, QDrag, QStyle, QLabel, QMovie
-from PyQt4.QtCore import Qt, SIGNAL, QPoint, QMimeData, QByteArray
+from PyQt4.QtCore import Qt, SIGNAL, QPoint, QMimeData, QByteArray, pyqtSignal
 
 class E5WheelTabBar(QTabBar):
     """
@@ -124,6 +124,8 @@
     @signal customTabContextMenuRequested(const QPoint & point, int index) emitted when
         a context menu for a tab is requested
     """
+    customTabContextMenuRequested = pyqtSignal(QPoint, int)
+    
     def __init__(self, parent = None, dnd = False):
         """
         Constructor
@@ -203,12 +205,10 @@
         """
         self.tabBar().setContextMenuPolicy(policy)
         if policy == Qt.CustomContextMenu:
-            self.connect(self.tabBar(), 
-                SIGNAL("customContextMenuRequested(const QPoint &)"),
+            self.tabBar().customContextMenuRequested.connect(
                 self.__handleTabCustomContextMenuRequested)
         else:
-            self.disconnect(self.tabBar(), 
-                SIGNAL("customContextMenuRequested(const QPoint &)"),
+            self.tabBar().customContextMenuRequested.disconnect(
                 self.__handleTabCustomContextMenuRequested)
 
     def __handleTabCustomContextMenuRequested(self, point):
@@ -221,8 +221,7 @@
         for index in range(_tabbar.count()):
             rect = _tabbar.tabRect(index)
             if rect.contains(point):
-                self.emit(SIGNAL("customTabContextMenuRequested(const QPoint &, int)"), 
-                          _tabbar.mapToParent(point), index)
+                self.customTabContextMenuRequested.emit(_tabbar.mapToParent(point), index)
                 break
     
     def selectTab(self, pos):
--- a/Graphics/PixmapDiagram.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Graphics/PixmapDiagram.py	Fri Aug 06 18:54:40 2010 +0200
@@ -114,8 +114,7 @@
         self.__menu.addAction(self.zoomResetAct)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         
     def __showContextMenu(self, coord):
         """
@@ -324,4 +323,4 @@
         painter.setViewport(marginX + 5, marginY + 5, size.width(), size.height())
         painter.setWindow(self.pixmapLabel.pixmap().rect())
         painter.drawPixmap(0, 0, self.pixmapLabel.pixmap())
-        painter.end()
\ No newline at end of file
+        painter.end()
--- a/Graphics/SvgDiagram.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Graphics/SvgDiagram.py	Fri Aug 06 18:54:40 2010 +0200
@@ -115,8 +115,7 @@
         self.__menu.addAction(self.zoomResetAct)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         
     def __showContextMenu(self, coord):
         """
@@ -294,4 +293,4 @@
         # render the diagram
         painter.setViewport(marginX, marginY, width, height)
         self.svgWidget.renderer().render(painter)
-        painter.end()
\ No newline at end of file
+        painter.end()
--- a/Graphics/UMLGraphicsView.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Graphics/UMLGraphicsView.py	Fri Aug 06 18:54:40 2010 +0200
@@ -54,6 +54,9 @@
         """
         Private method to initialize the view actions.
         """
+        self.alignMapper = QSignalMapper(self)
+        self.alignMapper.mapped[int].connect(self.__alignShapes)
+        
         self.deleteShapeAct = \
             QAction(UI.PixmapCache.getIcon("deleteShape.png"),
                     self.trUtf8("Delete shapes"), self)
@@ -131,38 +134,38 @@
         self.alignLeftAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignLeft"), 
                     self.trUtf8("Align Left"), self)
-        self.connect(self.alignLeftAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignLeft: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignLeftAct, Qt.AlignLeft)
+        self.alignLeftAct.triggered[()].connect(self.alignMapper.map)
         
         self.alignHCenterAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignHCenter"), 
                     self.trUtf8("Align Center Horizontal"), self)
-        self.connect(self.alignHCenterAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignHCenter: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignHCenterAct, Qt.AlignHCenter)
+        self.alignHCenterAct.triggered[()].connect(self.alignMapper.map)
         
         self.alignRightAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignRight"), 
                     self.trUtf8("Align Right"), self)
-        self.connect(self.alignRightAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignRight: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignRightAct, Qt.AlignRight)
+        self.alignRightAct.triggered[()].connect(self.alignMapper.map)
         
         self.alignTopAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignTop"), 
                     self.trUtf8("Align Top"), self)
-        self.connect(self.alignTopAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignTop: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignTopAct, Qt.AlignTop)
+        self.alignTopAct.triggered[()].connect(self.alignMapper.map)
         
         self.alignVCenterAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignVCenter"), 
                     self.trUtf8("Align Center Vertical"), self)
-        self.connect(self.alignVCenterAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignVCenter: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignVCenterAct, Qt.AlignVCenter)
+        self.alignVCenterAct.triggered[()].connect(self.alignMapper.map)
         
         self.alignBottomAct = \
             QAction(UI.PixmapCache.getIcon("shapesAlignBottom"), 
                     self.trUtf8("Align Bottom"), self)
-        self.connect(self.alignBottomAct, SIGNAL("triggered()"), 
-            lambda align=Qt.AlignBottom: self.__alignShapes(align))
+        self.alignMapper.setMapping(self.alignBottomAct, Qt.AlignBottom)
+        self.alignBottomAct.triggered[()].connect(self.alignMapper.map)
         
     def __checkSizeActions(self):
         """
--- a/Helpviewer/AdBlock/AdBlockDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/AdBlock/AdBlockDialog.py	Fri Aug 06 18:54:40 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/Bookmarks/BookmarksDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/Bookmarks/BookmarksDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -62,9 +62,8 @@
         
         self.connect(self.bookmarksTree, SIGNAL("activated(const QModelIndex&)"), 
                      self.__activated)
-        self.connect(self.bookmarksTree, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"), 
-                     self.__customContextMenuRequested)
+        self.bookmarksTree.customContextMenuRequested.connect(
+            self.__customContextMenuRequested)
         
         self.connect(self.removeButton, SIGNAL("clicked()"), 
                      self.bookmarksTree.removeSelected)
@@ -237,4 +236,4 @@
         parent = self.__bookmarksModel.node(idx)
         node = BookmarkNode(BookmarkNode.Folder)
         node.title = self.trUtf8("New Folder")
-        self.__bookmarksManager.addBookmark(parent, node, row)
\ No newline at end of file
+        self.__bookmarksManager.addBookmark(parent, node, row)
--- a/Helpviewer/Bookmarks/BookmarksMenu.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/Bookmarks/BookmarksMenu.py	Fri Aug 06 18:54:40 2010 +0200
@@ -38,8 +38,7 @@
         self.setSeparatorRole(BookmarksModel.SeparatorRole)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"), 
-                     self.__contextMenuRequested)
+        self.customContextMenuRequested.connect(self.__contextMenuRequested)
     
     def createBaseMenu(self):
         """
@@ -229,4 +228,4 @@
         """
         self.__initialActions = actions[:]
         for act in self.__initialActions:
-            self.addAction(act)
\ No newline at end of file
+            self.addAction(act)
--- a/Helpviewer/Bookmarks/BookmarksToolBar.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/Bookmarks/BookmarksToolBar.py	Fri Aug 06 18:54:40 2010 +0200
@@ -43,8 +43,7 @@
             Helpviewer.HelpWindow.HelpWindow.bookmarksManager().toolbar()))
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"), 
-                     self.__contextMenuRequested)
+        self.customContextMenuRequested.connect(self.__contextMenuRequested)
         self.connect(self, SIGNAL("activated(const QModelIndex &)"), 
                      self.__bookmarkActivated)
         
--- a/Helpviewer/HelpTocWidget.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/HelpTocWidget.py	Fri Aug 06 18:54:40 2010 +0200
@@ -38,8 +38,7 @@
         self.__layout = QVBoxLayout(self)
         self.__layout.addWidget(self.__tocWidget)
         
-        self.connect(self.__tocWidget, SIGNAL("customContextMenuRequested(QPoint)"), 
-                     self.__showContextMenu)
+        self.__tocWidget.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self.__tocWidget, SIGNAL("linkActivated(const QUrl&)"), 
                      self, SIGNAL("linkActivated(const QUrl&)"))
         
@@ -153,4 +152,4 @@
         if act == curTab:
             self.emit(SIGNAL("linkActivated(const QUrl&)"), itm.url())
         elif act == newTab:
-            self.__mw.newTab(itm.url())
\ No newline at end of file
+            self.__mw.newTab(itm.url())
--- a/Helpviewer/HelpWebSearchWidget.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/HelpWebSearchWidget.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Fri Aug 06 18:54:40 2010 +0200
@@ -123,9 +123,7 @@
             self.connect(self.tabWidget, SIGNAL('currentChanged(int)'),
                 self.__currentChanged)
             self.tabWidget.setTabContextMenuPolicy(Qt.CustomContextMenu)
-            self.connect(self.tabWidget, 
-                         SIGNAL('customTabContextMenuRequested(const QPoint &, int)'),
-                         self.__showContextMenu)
+            self.tabWidget.customTabContextMenuRequested.connect(self.__showContextMenu)
             
             self.findDlg = SearchWidget(self, self)
             centralWidget = QWidget()
@@ -174,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)
             
@@ -546,8 +543,7 @@
         if self.fromEric:
             self.exitAct.triggered[()].connect(self.close)
         else:
-            self.connect(self.exitAct, SIGNAL('triggered()'), 
-                         qApp, SLOT('closeAllWindows()'))
+            self.exitAct.triggered[()].connect(qApp.closeAllWindows)
         self.__actions.append(self.exitAct)
         
         self.backAct = E5Action(self.trUtf8('Backward'), 
@@ -1144,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)
         
@@ -1388,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)
@@ -1396,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)
@@ -3017,4 +3013,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])
--- a/Helpviewer/History/HistoryDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Helpviewer/History/HistoryDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -58,9 +58,8 @@
         
         self.connect(self.historyTree, SIGNAL("activated(const QModelIndex&)"), 
                      self.__activated)
-        self.connect(self.historyTree, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"), 
-                     self.__customContextMenuRequested)
+        self.historyTree.customContextMenuRequested.connect(
+            self.__customContextMenuRequested)
         
         self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), 
                      self.__proxyModel.setFilterFixedString)
@@ -141,4 +140,4 @@
         url = idx.data(HistoryModel.UrlStringRole)
         
         clipboard = QApplication.clipboard()
-        clipboard.setText(url)
\ No newline at end of file
+        clipboard.setText(url)
--- a/IconEditor/IconEditorWindow.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/IconEditor/IconEditorWindow.py	Fri Aug 06 18:54:40 2010 +0200
@@ -265,8 +265,7 @@
         if self.fromEric:
             self.exitAct.triggered[()].connect(self.close)
         else:
-            self.connect(self.exitAct, SIGNAL('triggered()'), 
-                         qApp, SLOT('closeAllWindows()'))
+            self.exitAct.triggered[()].connect(qApp.closeAllWindows)
         self.__actions.append(self.exitAct)
     
     def __initEditActions(self):
--- a/MultiProject/MultiProject.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/MultiProject/MultiProject.py	Fri Aug 06 18:54:40 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/MultiProject/MultiProjectBrowser.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/MultiProject/MultiProjectBrowser.py	Fri Aug 06 18:54:40 2010 +0200
@@ -50,8 +50,7 @@
         
         self.__createPopupMenu()
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__contextMenuRequested)
+        self.customContextMenuRequested.connect(self.__contextMenuRequested)
         self.connect(self, SIGNAL("itemActivated(QListWidgetItem*)"), self.__openItem)
     
     ############################################################################
@@ -246,4 +245,4 @@
         """
         Private method to open the configuration dialog.
         """
-        e5App().getObject("UserInterface").showPreferences("multiProjectPage")
\ No newline at end of file
+        e5App().getObject("UserInterface").showPreferences("multiProjectPage")
--- a/PluginManager/PluginInfoDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/PluginManager/PluginInfoDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -8,7 +8,7 @@
 Module implementing the Plugin Info Dialog.
 """
 
-from PyQt4.QtCore import Qt,  SIGNAL
+from PyQt4.QtCore import Qt
 from PyQt4.QtGui import QDialog, QTreeWidgetItem, QHeaderView, QMenu, QBrush
 from PyQt4.QtCore import pyqtSlot
 
@@ -48,9 +48,7 @@
         self.__deactivateAct = \
             self.__menu.addAction(self.trUtf8('Deactivate'), self.__deactivatePlugin)
         self.pluginList.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.pluginList, 
-                     SIGNAL('customContextMenuRequested(const QPoint &)'),
-                     self.__showContextMenu)
+        self.pluginList.customContextMenuRequested.connect(self.__showContextMenu)
     
     def __populateList(self):
         """
@@ -145,4 +143,4 @@
         moduleName = itm.text(0)
         self.pm.deactivatePlugin(moduleName)
         # repopulate the list
-        self.__populateList()
\ No newline at end of file
+        self.__populateList()
--- a/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -69,9 +69,7 @@
             act.setEnabled(False)
         
         self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.statusList, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showContextMenu)
+        self.statusList.customContextMenuRequested.connect(self.__showContextMenu)
         
         self.modifiedIndicators = [
             self.trUtf8('added'), 
--- a/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -91,9 +91,7 @@
             act.setEnabled(False)
         
         self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.statusList, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showContextMenu)
+        self.statusList.customContextMenuRequested.connect(self.__showContextMenu)
         
         self.modifiedIndicators = [
             self.trUtf8(svnStatusMap[pysvn.wc_status_kind.added]), 
--- a/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -87,9 +87,7 @@
             act.setEnabled(False)
         
         self.statusList.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.statusList, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showContextMenu)
+        self.statusList.customContextMenuRequested.connect(self.__showContextMenu)
         
         self.modifiedIndicators = [
             self.trUtf8('added'), 
--- a/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py	Fri Aug 06 18:54:40 2010 +0200
@@ -146,8 +146,7 @@
                      self.__showSelectedView)
         self.connect(self.viewlist, SIGNAL("itemClicked(QListWidgetItem*)"),
                      self.__showSelectedView)
-        self.connect(self.viewlist, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showMenu)
+        self.viewlist.customContextMenuRequested.connect(self.__showMenu)
         
         self.stackArea = QSplitter(self)
         self.addWidget(self.stackArea)
--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Fri Aug 06 18:54:40 2010 +0200
@@ -192,8 +192,7 @@
             elif idx < 36:
                 accel = "&{0}. ".format(chr(idx - 9 + ord("@")))
             act = menu.addAction("{0}{1}".format(accel, txt))
-            self.connect(act, SIGNAL("triggered()"), 
-                         self.__windowMapper, SLOT("map()"))
+            act.triggered[()].connect(self.__windowMapper.map)
             self.__windowMapper.setMapping(act, subWindow)
             idx += 1
         
--- a/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py	Fri Aug 06 18:54:40 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)
         
@@ -205,8 +204,7 @@
         self.contextMenuIndex = -1
         
         self.setTabContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL('customTabContextMenuRequested(const QPoint &, int)'),
-                     self.__showContextMenu)
+        self.customTabContextMenuRequested.connect(self.__showContextMenu)
         
         ericPic = QPixmap(os.path.join(getConfig('ericPixDir'), 'eric_small.png'))
         self.emptyLabel = QLabel()
--- a/Project/Project.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Project/Project.py	Fri Aug 06 18:54:40 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/ProjectBaseBrowser.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Project/ProjectBaseBrowser.py	Fri Aug 06 18:54:40 2010 +0200
@@ -54,8 +54,7 @@
             QItemSelectionModel.Deselect | QItemSelectionModel.Rows)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self._contextMenuRequested)
+        self.customContextMenuRequested.connect(self._contextMenuRequested)
         self.connect(self, SIGNAL("activated(const QModelIndex &)"), self._openItem)
         self.connect(self._model, SIGNAL("rowsInserted(const QModelIndex &, int, int)"),
                      self.__modelRowsInserted)
--- a/Project/ProjectFormsBrowser.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Project/ProjectFormsBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Project/ProjectInterfacesBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Project/ProjectOthersBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Project/ProjectResourcesBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Project/ProjectSourcesBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/Project/ProjectTranslationsBrowser.py	Fri Aug 06 18:54:40 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 18:53:43 2010 +0200
+++ b/QScintilla/Editor.py	Fri Aug 06 18:54:40 2010 +0200
@@ -366,17 +366,13 @@
         # breakpoint handling
         self.breakpointModel = self.dbs.getBreakPointModel()
         self.__restoreBreakpoints()
-        self.connect(self.breakpointModel, 
-            SIGNAL("rowsAboutToBeRemoved(const QModelIndex &, int, int)"), 
+        self.breakpointModel.rowsAboutToBeRemoved.connect(
             self.__deleteBreakPoints)
-        self.connect(self.breakpointModel,
-            SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
+        self.breakpointModel.dataAboutToBeChanged.connect(
             self.__breakPointDataAboutToBeChanged)
-        self.connect(self.breakpointModel,
-            SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
+        self.breakpointModel.dataChanged.connect(
             self.__changeBreakPoints)
-        self.connect(self.breakpointModel,
-            SIGNAL("rowsInserted(const QModelIndex &, int, int)"),
+        self.breakpointModel.rowsInserted.connect(
             self.__addBreakPoints)
         self.connect(self, SIGNAL("linesChanged()"), self.__linesChanged)
         
@@ -662,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)
 
@@ -694,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
 
@@ -703,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):
@@ -724,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
         
@@ -744,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
 
@@ -782,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
         
@@ -804,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
         
@@ -837,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
         
@@ -887,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()
@@ -915,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()
@@ -958,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):
         """
@@ -1049,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):
         """
@@ -4723,17 +4714,13 @@
             self.removeClone(clone)
             clone.removeClone(self)
         
-        self.disconnect(self.breakpointModel, 
-            SIGNAL("rowsAboutToBeRemoved(const QModelIndex &, int, int)"), 
+        self.breakpointModel.rowsAboutToBeRemoved.disconnect(
             self.__deleteBreakPoints)
-        self.disconnect(self.breakpointModel,
-            SIGNAL("dataAboutToBeChanged(const QModelIndex &, const QModelIndex &)"),
+        self.breakpointModel.dataAboutToBeChanged.disconnect(
             self.__breakPointDataAboutToBeChanged)
-        self.disconnect(self.breakpointModel,
-            SIGNAL("dataChanged(const QModelIndex &, const QModelIndex &)"),
+        self.breakpointModel.dataChanged.disconnect(
             self.__changeBreakPoints)
-        self.disconnect(self.breakpointModel,
-            SIGNAL("rowsInserted(const QModelIndex &, int, int)"),
+        self.breakpointModel.rowsInserted.disconnect(
             self.__addBreakPoints)
         
         self.disconnect(self.project, SIGNAL("projectPropertiesChanged"), 
@@ -5026,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 18:53:43 2010 +0200
+++ b/QScintilla/MiniEditor.py	Fri Aug 06 18:54:40 2010 +0200
@@ -164,9 +164,7 @@
                      self.__cursorPositionChanged)
         
         self.__textEdit.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self.__textEdit, 
-                     SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__contextMenuRequested)
+        self.__textEdit.customContextMenuRequested.connect(self.__contextMenuRequested)
         
         self.connect(self.__textEdit, 
                      SIGNAL("selectionChanged()"), 
@@ -1921,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
     
@@ -2298,4 +2296,4 @@
         fileEol = self.__textEdit.detectEolString(txt)
         self.__textEdit.setEolModeByEolString(fileEol)
         
-        self.__textEdit.setModified(False)
\ No newline at end of file
+        self.__textEdit.setModified(False)
--- a/SqlBrowser/SqlBrowser.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/SqlBrowser/SqlBrowser.py	Fri Aug 06 18:54:40 2010 +0200
@@ -106,8 +106,7 @@
                 """<b>Quit</b>"""
                 """<p>Quit the SQL browser.</p>"""
         ))
-        self.connect(self.exitAct, SIGNAL('triggered()'), 
-                     qApp, SLOT('closeAllWindows()'))
+        self.exitAct.triggered[()].connect(qApp.closeAllWindows)
         
         self.aboutAct = E5Action(self.trUtf8('About'), 
             self.trUtf8('&About'), 
--- a/Tasks/TaskViewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Tasks/TaskViewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -420,8 +420,7 @@
         self.__backMenu.addAction(self.trUtf8("Configure..."), self.__configure)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self, SIGNAL("itemActivated(QTreeWidgetItem *, int)"),
                      self.__taskItemActivated)
         
--- a/Templates/TemplateViewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Templates/TemplateViewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -417,8 +417,7 @@
         self.__backMenu.addAction(self.trUtf8("Configure..."), self.__configure)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self.__showContextMenu)
+        self.customContextMenuRequested.connect(self.__showContextMenu)
         self.connect(self, SIGNAL("itemActivated(QTreeWidgetItem *, int)"),
                      self.__templateItemActivated)
         
--- a/Tools/TRPreviewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Tools/TRPreviewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -176,8 +176,7 @@
                 """<b>Quit</b>"""
                 """<p>Quit the application.</p>"""
         ))
-        self.connect(self.exitAct, SIGNAL('triggered()'), 
-                     qApp, SLOT('closeAllWindows()'))
+        self.exitAct.triggered[()].connect(qApp.closeAllWindows)
         
         self.whatsThisAct = QAction(UI.PixmapCache.getIcon("whatsThis.png"),
                                 self.trUtf8('&What\'s This?'), self)
@@ -263,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)
         
@@ -854,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 18:53:43 2010 +0200
+++ b/Tools/TrayStarter.py	Fri Aug 06 18:54:40 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/Tools/UIPreviewer.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/Tools/UIPreviewer.py	Fri Aug 06 18:54:40 2010 +0200
@@ -160,8 +160,7 @@
                 """<b>Quit</b>"""
                 """<p>Quit the application.</p>"""
         ))
-        self.connect(self.exitAct, SIGNAL('triggered()'), 
-                     qApp, SLOT('closeAllWindows()'))
+        self.exitAct.triggered[()].connect(qApp.closeAllWindows)
         
         self.copyAct = QAction(UI.PixmapCache.getIcon("editCopy.png"),
                             self.trUtf8('&Copy'), self)
--- a/UI/Browser.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/UI/Browser.py	Fri Aug 06 18:54:40 2010 +0200
@@ -64,8 +64,7 @@
         self.selectedItemsFilter = [BrowserFileItem]
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self._contextMenuRequested)
+        self.customContextMenuRequested.connect(self._contextMenuRequested)
         self.connect(self, SIGNAL("activated(const QModelIndex &)"), self._openItem)
         self.connect(self, SIGNAL("expanded(const QModelIndex &)"), self._resizeColumns)
         self.connect(self, SIGNAL("collapsed(const QModelIndex &)"), self._resizeColumns)
--- a/UI/FindFileDialog.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/UI/FindFileDialog.py	Fri Aug 06 18:54:40 2010 +0200
@@ -110,8 +110,7 @@
         self.__populating = False
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"), 
-                     self.__contextMenuRequested)
+        self.customContextMenuRequested.connect(self.__contextMenuRequested)
         
     def __createItem(self, file, line, text, start, end, replTxt = ""):
         """
--- a/UI/LogView.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/UI/LogView.py	Fri Aug 06 18:54:40 2010 +0200
@@ -42,8 +42,7 @@
         self.__menu.addAction(self.trUtf8("Configure..."), self.__configure)
         
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-            self.__handleShowContextMenu)
+        self.customContextMenuRequested.connect(self.__handleShowContextMenu)
         
         self.cNormalFormat = self.currentCharFormat()
         self.cErrorFormat = self.currentCharFormat()
--- a/UI/UserInterface.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/UI/UserInterface.py	Fri Aug 06 18:54:40 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):
         """
@@ -2668,7 +2661,8 @@
         for key in groupActionKeys:
             if key not in ckeys:
                 self.toolbarManager.removeAction(self.toolGroupActions[key])
-                self.toolGroupActions[key].triggered[()].disconnect(self.__toolActionTriggered)
+                self.toolGroupActions[key].triggered[()].disconnect(
+                    self.__toolActionTriggered)
                 del self.toolGroupActions[key]
         
         # step 4: add all newly configured tools
@@ -5787,4 +5781,4 @@
         if self.__startup:
             if Preferences.getGeometry("MainMaximized"):
                 self.setWindowState(Qt.WindowStates(Qt.WindowMaximized))
-            self.__startup = False
\ No newline at end of file
+            self.__startup = False
--- a/VCS/StatusMonitorLed.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/VCS/StatusMonitorLed.py	Fri Aug 06 18:54:40 2010 +0200
@@ -66,8 +66,7 @@
         
         # connect signals to our slots
         self.setContextMenuPolicy(Qt.CustomContextMenu)
-        self.connect(self, SIGNAL("customContextMenuRequested(const QPoint &)"),
-                     self._showContextMenu)
+        self.customContextMenuRequested.connect(self._showContextMenu)
         self.connect(self.project, SIGNAL('vcsStatusMonitorStatus(QString, QString)'),
                      self.__projectVcsMonitorStatus)
     
@@ -137,4 +136,4 @@
         """
         Private slot to switch the status monitor thread to Off.
         """
-        self.project.stopStatusMonitor()
\ No newline at end of file
+        self.project.stopStatusMonitor()
--- a/ViewManager/ViewManager.py	Fri Aug 06 18:53:43 2010 +0200
+++ b/ViewManager/ViewManager.py	Fri Aug 06 18:54:40 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

eric ide

mercurial