Mercurial Repositories > eric / changeset

--- a/Graphics/UMLGraphicsView.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/Graphics/UMLGraphicsView.py	Wed Aug 04 14:03:01 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):
         """
@@ -482,4 +485,4 @@
                           (itemrect.y() + itemrect.height() // 2)
             item.moveBy(xOffset, yOffset)
         
-        self.scene().update()
\ No newline at end of file
+        self.scene().update()

--- a/Helpviewer/HelpWindow.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/Helpviewer/HelpWindow.py	Wed Aug 04 14:03:01 2010 +0200
@@ -544,10 +544,9 @@
                 """<p>Quit the web browser.</p>"""
         ))
         if self.fromEric:
-            self.exitAct.triggered.connect(self, SLOT('close()'))
+            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'), 
@@ -3017,4 +3016,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/IconEditor/IconEditorWindow.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/IconEditor/IconEditorWindow.py	Wed Aug 04 14:03:01 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):
@@ -1231,4 +1230,4 @@
         """
         Private slot called in to enter Whats This mode.
         """
-        QWhatsThis.enterWhatsThisMode()
\ No newline at end of file
+        QWhatsThis.enterWhatsThisMode()

--- a/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/Plugins/ViewManagerPlugins/MdiArea/MdiArea.py	Wed Aug 04 14:03:01 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
         
@@ -364,4 +363,4 @@
         Private slot to iconize all windows.
         """
         for win in self.subWindowList():
-            win.showMinimized()
\ No newline at end of file
+            win.showMinimized()

--- a/SqlBrowser/SqlBrowser.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/SqlBrowser/SqlBrowser.py	Wed Aug 04 14:03:01 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'), 
@@ -177,4 +176,4 @@
         """
         Private slot to show info about Qt.
         """
-        QMessageBox.aboutQt(self, self.trUtf8("SQL Browser"))
\ No newline at end of file
+        QMessageBox.aboutQt(self, self.trUtf8("SQL Browser"))

--- a/Tools/TRPreviewer.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/Tools/TRPreviewer.py	Wed Aug 04 14:03:01 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)
@@ -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/UIPreviewer.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/Tools/UIPreviewer.py	Wed Aug 04 14:03:01 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)
@@ -551,4 +550,4 @@
         p.drawImage(marginX, marginY, 
                     img.scaled(width, height, 
                                Qt.KeepAspectRatio, Qt.SmoothTransformation))
-        p.end()
\ No newline at end of file
+        p.end()

--- a/UI/UserInterface.py	Wed Aug 04 08:54:52 2010 +0200
+++ b/UI/UserInterface.py	Wed Aug 04 14:03:01 2010 +0200
@@ -2668,7 +2668,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