E5Gui/E5TabWidget.py

changeset 482
4650a72c307a
parent 458
1695e7a2db54
child 634
7b84cbd2f752
--- a/E5Gui/E5TabWidget.py	Tue Aug 10 13:15:03 2010 +0200
+++ b/E5Gui/E5TabWidget.py	Tue Aug 10 14:17:54 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, pyqtSignal
+from PyQt4.QtCore import Qt, QPoint, QMimeData, QByteArray, pyqtSignal
 
 class E5WheelTabBar(QTabBar):
     """
@@ -46,6 +46,8 @@
     @signal tabMoveRequested(int, int) emitted to signal a tab move request giving
         the old and new index position
     """
+    tabMoveRequested = pyqtSignal(int, int)
+    
     def __init__(self, parent = None):
         """
         Constructor
@@ -110,7 +112,7 @@
         fromIndex = self.tabAt(self.__dragStartPos)
         toIndex = self.tabAt(event.pos())
         if fromIndex != toIndex:
-            self.emit(SIGNAL("tabMoveRequested(int, int)"), fromIndex, toIndex)
+            self.tabMoveRequested.emit(fromIndex, toIndex)
             event.acceptProposedAction()
         E5WheelTabBar.dropEvent(self, event)
 
@@ -138,8 +140,7 @@
         if dnd:
             if not hasattr(self, 'setMovable'):
                 self.__tabBar = E5DnDTabBar(self)
-                self.connect(self.__tabBar, SIGNAL("tabMoveRequested(int, int)"), 
-                             self.moveTab)
+                self.__tabBar.tabMoveRequested.connect(self.moveTab)
                 self.setTabBar(self.__tabBar)
             else:
                 self.__tabBar = E5WheelTabBar(self)
@@ -151,7 +152,7 @@
         
         self.__lastCurrentIndex = -1
         self.__currentIndex = -1
-        self.connect(self, SIGNAL("currentChanged(int)"), self.__currentChanged)
+        self.currentChanged.connect(self.__currentChanged)
     
     def __currentChanged(self, index):
         """

eric ide

mercurial