Mercurial Repositories > eric / file diff

--- a/Helpviewer/Bookmarks/BookmarksDialog.py	Tue Aug 10 14:17:54 2010 +0200
+++ b/Helpviewer/Bookmarks/BookmarksDialog.py	Tue Aug 10 16:16:23 2010 +0200
@@ -28,6 +28,9 @@
             tab
     @signal newUrl(const QUrl&, const QString&) emitted to open a URL in a new tab
     """
+    openUrl = pyqtSignal(QUrl, str)
+    newUrl = pyqtSignal(QUrl, str)
+    
     def __init__(self, parent = None, manager = None):
         """
         Constructor
@@ -49,8 +52,7 @@
         self.__proxyModel.setFilterKeyColumn(-1)
         self.__proxyModel.setSourceModel(self.__bookmarksModel)
         
-        self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), 
-                     self.__proxyModel.setFilterFixedString)
+        self.searchEdit.textChanged.connect(self.__proxyModel.setFilterFixedString)
         
         self.bookmarksTree.setModel(self.__proxyModel)
         self.bookmarksTree.setExpanded(self.__proxyModel.index(0, 0), True)
@@ -60,8 +62,7 @@
         self.bookmarksTree.header().setStretchLastSection(True)
         self.bookmarksTree.setContextMenuPolicy(Qt.CustomContextMenu)
         
-        self.connect(self.bookmarksTree, SIGNAL("activated(const QModelIndex&)"), 
-                     self.__activated)
+        self.bookmarksTree.activated.connect(self.__activated)
         self.bookmarksTree.customContextMenuRequested.connect(
             self.__customContextMenuRequested)
         
@@ -185,13 +186,13 @@
            node.type() == BookmarkNode.Folder:
             return
         if newTab:
-            self.emit(SIGNAL("newUrl(const QUrl&, const QString&)"), 
-                      idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), 
-                      idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
+            self.newUrl.emit(
+                idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), 
+                idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
         else:
-            self.emit(SIGNAL("openUrl(const QUrl&, const QString&)"), 
-                      idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), 
-                      idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
+            self.openUrl.emit(
+                idx.sibling(idx.row(), 1).data(BookmarksModel.UrlRole), 
+                idx.sibling(idx.row(), 0).data(Qt.DisplayRole))
     
     def __editName(self):
         """
@@ -234,4 +235,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)