Mercurial Repositories > eric / changeset
changeset
Continued porting signal/slot usage to the new API.
Tue, 10 Aug 2010 16:16:23 +0200
- author
- Detlev Offenbach <detlev@die-offenbachs.de>
- date
- Tue, 10 Aug 2010 16:16:23 +0200
- changeset 483
- ca7d8599a575
- parent 482
- 4650a72c307a
- child 484
- 49be3c487f49
Continued porting signal/slot usage to the new API.
--- a/Graphics/ApplicationDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/ApplicationDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -44,7 +44,7 @@ else: self.setObjectName(name) - self.connect(self.umlView, SIGNAL("relayout()"), self.relayout) + self.umlView.relayout.connect(self.relayout) def __buildModulesDict(self): """
--- a/Graphics/ImportsDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/ImportsDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -56,7 +56,7 @@ else: self.setObjectName(name) - self.connect(self.umlView, SIGNAL("relayout()"), self.relayout) + self.umlView.relayout.connect(self.relayout) def __buildModulesDict(self): """
--- a/Graphics/PackageDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/PackageDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -47,7 +47,7 @@ else: self.setObjectName(name) - self.connect(self.umlView, SIGNAL("relayout()"), self.relayout) + self.umlView.relayout.connect(self.relayout) def __getCurrentShape(self, name): """
--- a/Graphics/PixmapDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/PixmapDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -274,7 +274,7 @@ printer.setPrinterName(Preferences.getPrinter("PrinterName")) preview = QPrintPreviewDialog(printer, self) - self.connect(preview, SIGNAL("paintRequested(QPrinter*)"), self.__print) + preview.paintRequested[QPrinter].connect(self.__print) preview.exec_() def __print(self, printer):
--- a/Graphics/SvgDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/SvgDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -248,7 +248,7 @@ printer.setPrinterName(Preferences.getPrinter("PrinterName")) preview = QPrintPreviewDialog(printer, self) - self.connect(preview, SIGNAL("paintRequested(QPrinter*)"), self.__print) + preview.paintRequested[QPrinter].connect(self.__print) preview.exec_() def __print(self, printer):
--- a/Graphics/UMLClassDiagram.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/UMLClassDiagram.py Tue Aug 10 16:16:23 2010 +0200 @@ -45,7 +45,7 @@ self.allClasses = {} self.allModules = {} - self.connect(self.umlView, SIGNAL("relayout()"), self.relayout) + self.umlView.relayout.connect(self.relayout) def __getCurrentShape(self, name): """
--- a/Graphics/UMLGraphicsView.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Graphics/UMLGraphicsView.py Tue Aug 10 16:16:23 2010 +0200 @@ -28,6 +28,8 @@ @signal relayout() emitted to indicate a relayout of the diagram is requested """ + relayout = pyqtSignal() + def __init__(self, scene, diagramName = "Unnamed", parent = None, name = None): """ Constructor @@ -48,7 +50,7 @@ self.__initActions() - self.connect(scene, SIGNAL("changed(const QList<QRectF> &)"), self.__sceneChanged) + scene.changed.connect(self.__sceneChanged) def __initActions(self): """ @@ -359,7 +361,7 @@ for itm in list(scene.items())[:]: if itm.scene() == scene: scene.removeItem(itm) - self.emit(SIGNAL("relayout()")) + self.relayout.emit() def __printDiagram(self): """ @@ -400,7 +402,7 @@ printer.setPrinterName(Preferences.getPrinter("PrinterName")) preview = QPrintPreviewDialog(printer, self) - self.connect(preview, SIGNAL("paintRequested(QPrinter*)"), self.printDiagram) + preview.paintRequested[QPrinter].connect(self.printDiagram) preview.exec_() def __zoom(self): @@ -485,4 +487,4 @@ (itemrect.y() + itemrect.height() // 2) item.moveBy(xOffset, yOffset) - self.scene().update() \ No newline at end of file + self.scene().update()
--- a/Helpviewer/AdBlock/AdBlockDialog.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockDialog.py Tue Aug 10 16:16:23 2010 +0200 @@ -39,13 +39,11 @@ self.__proxyModel.setSourceModel(self.__adBlockModel) self.subscriptionsTree.setModel(self.__proxyModel) - self.connect(self.searchEdit, SIGNAL("textChanged(QString)"), - self.__proxyModel.setFilterFixedString) + self.searchEdit.textChanged.connect(self.__proxyModel.setFilterFixedString) manager = Helpviewer.HelpWindow.HelpWindow.adblockManager() self.adBlockGroup.setChecked(manager.isEnabled()) - self.connect(self.adBlockGroup, SIGNAL("toggled(bool)"), - manager.setEnabled) + self.adBlockGroup.toggled[bool].connect(manager.setEnabled) menu = QMenu(self) menu.aboutToShow.connect(self.__aboutToShowActionMenu)
--- a/Helpviewer/AdBlock/AdBlockManager.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockManager.py Tue Aug 10 16:16:23 2010 +0200 @@ -26,6 +26,8 @@ @signal rulesChanged() emitted after some rule has changed """ + rulesChanged = pyqtSignal() + def __init__(self, parent = None): """ Constructor @@ -43,7 +45,7 @@ self.__subscriptions = [] self.__saveTimer = AutoSaver(self, self.save) - self.connect(self, SIGNAL("rulesChanged()"), self.__saveTimer.changeOccurred) + self.rulesChanged.connect(self.__saveTimer.changeOccurred) def close(self): """ @@ -74,7 +76,7 @@ self.__enabled = enabled if enabled: self.__loadSubscriptions() - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() def network(self): """ @@ -160,7 +162,7 @@ self.__subscriptions.remove(subscription) rulesFileName = subscription.rulesFileName() QFile.remove(rulesFileName) - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() except ValueError: pass @@ -175,12 +177,10 @@ self.__subscriptions.append(subscription) - self.connect(subscription, SIGNAL("rulesChanged()"), - self, SIGNAL("rulesChanged()")) - self.connect(subscription, SIGNAL("changed()"), - self, SIGNAL("rulesChanged()")) + subscription.rulesChanged.connect(self.rulesChanged) + subscription.changed.connect(self.rulesChanged) - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() def save(self): """ @@ -231,10 +231,8 @@ for subscription in subscriptions: url = QUrl.fromEncoded(subscription.encode()) adBlockSubscription = AdBlockSubscription(url, self) - self.connect(adBlockSubscription, SIGNAL("rulesChanged()"), - self, SIGNAL("rulesChanged()")) - self.connect(adBlockSubscription, SIGNAL("changed()"), - self, SIGNAL("rulesChanged()")) + adBlockSubscription.rulesChanged.connect(self.rulesChanged) + adBlockSubscription.changed.connect(self.rulesChanged) self.__subscriptions.append(adBlockSubscription) self.__subscriptionsLoaded = True
--- a/Helpviewer/AdBlock/AdBlockModel.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockModel.py Tue Aug 10 16:16:23 2010 +0200 @@ -25,7 +25,7 @@ QAbstractItemModel.__init__(self, parent) self.__manager = Helpviewer.HelpWindow.HelpWindow.adblockManager() - self.connect(self.__manager, SIGNAL("rulesChanged()"), self.__rulesChanged) + self.__manager.rulesChanged.connect(self.__rulesChanged) def __rulesChanged(self): """ @@ -230,26 +230,22 @@ return False if not parent.isValid(): - self.disconnect(self.__manager, SIGNAL("rulesChanged()"), - self.__rulesChanged) + self.__manager.rulesChanged.disconnect(self.__rulesChanged) self.beginRemoveRows(QModelIndex(), row, row + count - 1) for subscription in self.__manager.subscriptions()[row:row + count]: self.__manager.removeSubscription(subscription) self.endRemoveRows() - self.connect(self.__manager, SIGNAL("rulesChanged()"), - self.__rulesChanged) + self.__manager.rulesChanged.connect(self.__rulesChanged) return True else: sub = self.subscription(parent) if sub is not None: - self.disconnect(self.__manager, SIGNAL("rulesChanged()"), - self.__rulesChanged) + self.__manager.rulesChanged.disconnect(self.__rulesChanged) self.beginRemoveRows(parent, row, row + count - 1) for i in reversed(list(range(row, row + count))): sub.removeRule(i) self.endRemoveRows() - self.connect(self.__manager, SIGNAL("rulesChanged()"), - self.__rulesChanged) + self.__manager.rulesChanged.connect(self.__rulesChanged) return True return False @@ -269,7 +265,7 @@ (self.flags(index) & Qt.ItemIsEditable) == 0: return False - self.disconnect(self.__manager, SIGNAL("rulesChanged()"), self.__rulesChanged) + self.__manager.rulesChanged.disconnect(self.__rulesChanged) changed = False if role in [Qt.EditRole, Qt.DisplayRole]: @@ -279,15 +275,13 @@ r = self.rule(index) r.setFilter(value) sub.replaceRule(r, index.row()) - self.emit(SIGNAL("dataChanged(const QModelIndex&, const QModelIndex&)"), - index, index) + self.dataChanged.emit(index, index) changed = True else: sub = self.subscription(index) if sub is not None: sub.setTitle(value) - self.emit(SIGNAL("dataChanged(const QModelIndex&, const QModelIndex&)"), - index, index) + self.dataChanged.emit(index, index) changed = True elif role == Qt.CheckStateRole: @@ -297,18 +291,16 @@ r = self.rule(index) r.setEnabled(value == Qt.Checked) sub.replaceRule(r, index.row()) - self.emit(SIGNAL("dataChanged(const QModelIndex&, const QModelIndex&)"), - index, index) + self.dataChanged.emit(index, index) changed = True else: sub = self.subscription(index) if sub is not None: sub.setEnabled(value == Qt.Checked) - self.emit(SIGNAL("dataChanged(const QModelIndex&, const QModelIndex&)"), - index, index) + self.dataChanged.emit(index, index) changed = True - self.connect(self.__manager, SIGNAL("rulesChanged()"), self.__rulesChanged) + self.__manager.rulesChanged.connect(self.__rulesChanged) return changed def hasChildren(self, parent = QModelIndex()):
--- a/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/AdBlock/AdBlockSubscription.py Tue Aug 10 16:16:23 2010 +0200 @@ -26,6 +26,9 @@ @signal changed() emitted after the subscription has changed @signal rulesChanged() emitted after the subscription's rules have changed """ + changed = pyqtSignal() + rulesChanged = pyqtSignal() + def __init__(self, url, parent = None): """ Constructor @@ -116,7 +119,7 @@ self.__enabled = enabled self.__populateCache() - self.emit(SIGNAL("changed()")) + self.changed.emit() def title(self): """ @@ -136,7 +139,7 @@ return self.__title = title - self.emit(SIGNAL("changed()")) + self.changed.emit() def location(self): """ @@ -157,7 +160,7 @@ self.__location = url.toEncoded() self.__lastUpdate = QDateTime() - self.emit(SIGNAL("changed()")) + self.changed.emit() def lastUpdate(self): """ @@ -218,7 +221,7 @@ line = textStream.readLine() self.__rules.append(AdBlockRule(line)) self.__populateCache() - self.emit(SIGNAL("changed()")) + self.changed.emit() if not self.__lastUpdate.isValid() or \ self.__lastUpdate.addDays(7) < QDateTime.currentDateTime(): @@ -237,7 +240,7 @@ if self.location().scheme() == "file": self.__lastUpdate = QDateTime.currentDateTime() self.__loadRules() - self.emit(SIGNAL("changed()")) + self.changed.emit() return request = QNetworkRequest(self.location()) @@ -287,7 +290,7 @@ f.write(response) self.__lastUpdate = QDateTime.currentDateTime() self.__loadRules() - self.emit(SIGNAL("changed()")) + self.changed.emit() self.__downloading = None def saveRules(self): @@ -359,7 +362,7 @@ """ self.__rules.append(rule) self.__populateCache() - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() def removeRule(self, offset): """ @@ -372,7 +375,7 @@ del self.__rules[offset] self.__populateCache() - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() def replaceRule(self, rule, offset): """ @@ -383,7 +386,7 @@ """ self.__rules[offset] = rule self.__populateCache() - self.emit(SIGNAL("rulesChanged()")) + self.rulesChanged.emit() def __populateCache(self): """ @@ -404,4 +407,4 @@ elif rule.isException(): self.__networkExceptionRules.append(rule) else: - self.__networkBlockRules.append(rule) \ No newline at end of file + self.__networkBlockRules.append(rule)
--- 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)
--- a/Helpviewer/Bookmarks/BookmarksManager.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksManager.py Tue Aug 10 16:16:23 2010 +0200 @@ -90,6 +90,10 @@ node has been removed @signal entryChanged emitted after a bookmark node has been changed """ + entryAdded = pyqtSignal(BookmarkNode) + entryRemoved = pyqtSignal(BookmarkNode, int, BookmarkNode) + entryChanged = pyqtSignal(BookmarkNode) + def __init__(self, parent = None): """ Constructor @@ -106,12 +110,9 @@ self.__bookmarksModel = None self.__commands = QUndoStack() - self.connect(self, SIGNAL("entryAdded"), - self.__saveTimer.changeOccurred) - self.connect(self, SIGNAL("entryRemoved"), - self.__saveTimer.changeOccurred) - self.connect(self, SIGNAL("entryChanged"), - self.__saveTimer.changeOccurred) + self.entryAdded.connect(self.__saveTimer.changeOccurred) + self.entryRemoved.connect(self.__saveTimer.changeOccurred) + self.entryChanged.connect(self.__saveTimer.changeOccurred) def close(self): """ @@ -447,16 +448,14 @@ Public slot to perform the undo action. """ self._parent.add(self._node, self._row) - self._bookmarksManager.emit(SIGNAL("entryAdded"), self._node) + self._bookmarksManager.entryAdded.emit(self._node) def redo(self): """ Public slot to perform the redo action. """ self._parent.remove(self._node) - self._bookmarksManager.emit( - SIGNAL("entryRemoved"), - self._parent, self._row, self._node) + self._bookmarksManager.entryRemoved.emit(self._parent, self._row, self._node) class InsertBookmarksCommand(RemoveBookmarksCommand): """ @@ -523,7 +522,7 @@ self._node.title = self._oldValue else: self._node.url = self._oldValue - self._bookmarksManager.emit(SIGNAL("entryChanged"), self._node) + self._bookmarksManager.entryChanged.emit(self._node) def redo(self): """ @@ -533,4 +532,4 @@ self._node.title = self._newValue else: self._node.url = self._newValue - self._bookmarksManager.emit(SIGNAL("entryChanged"), self._node) + self._bookmarksManager.entryChanged.emit(self._node)
--- a/Helpviewer/Bookmarks/BookmarksMenu.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Tue Aug 10 16:16:23 2010 +0200 @@ -25,6 +25,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): """ Constructor @@ -33,7 +36,7 @@ """ E5ModelMenu.__init__(self, parent) - self.connect(self, SIGNAL("activated(const QModelIndex&)"), self.__activated) + self.activated.connect(self.__activated) self.setStatusBarTextRole(BookmarksModel.UrlStringRole) self.setSeparatorRole(BookmarksModel.SeparatorRole) @@ -47,10 +50,8 @@ @return reference to the menu (BookmarksMenu) """ menu = BookmarksMenu(self) - self.connect(menu, SIGNAL("openUrl(const QUrl&, const QString&)"), - self, SIGNAL("openUrl(const QUrl&, const QString&)")) - self.connect(menu, SIGNAL("newUrl(const QUrl&, const QString&)"), - self, SIGNAL("newUrl(const QUrl&, const QString&)")) + menu.openUrl.connect(self.openUrl) + menu.newUrl.connect(self.newUrl) return menu def __activated(self, idx): @@ -60,13 +61,13 @@ @param idx index of the activated item (QModelIndex) """ if self._keyboardModifiers & Qt.ControlModifier: - self.emit(SIGNAL("newUrl(const QUrl&, const QString&)"), - idx.data(BookmarksModel.UrlRole), - idx.data(Qt.DisplayRole)) + self.newUrl.emit( + idx.data(BookmarksModel.UrlRole), + idx.data(Qt.DisplayRole)) else: - self.emit(SIGNAL("openUrl(const QUrl&, const QString&)"), - idx.data(BookmarksModel.UrlRole), - idx.data(Qt.DisplayRole)) + self.openUrl.emit( + idx.data(BookmarksModel.UrlRole), + idx.data(Qt.DisplayRole)) self.resetFlags() def postPopulated(self): @@ -113,13 +114,13 @@ continue if i == 0: - self.emit(SIGNAL("openUrl(const QUrl&, const QString&)"), - child.data(BookmarksModel.UrlRole), - child.data(Qt.DisplayRole)) + self.openUrl.emit( + child.data(BookmarksModel.UrlRole), + child.data(Qt.DisplayRole)) else: - self.emit(SIGNAL("newUrl(const QUrl&, const QString&)"), - child.data(BookmarksModel.UrlRole), - child.data(Qt.DisplayRole)) + self.newUrl.emit( + child.data(BookmarksModel.UrlRole), + child.data(Qt.DisplayRole)) def __contextMenuRequested(self, pos): """ @@ -159,9 +160,9 @@ """ idx = self.index(self.sender()) - self.emit(SIGNAL("openUrl(const QUrl&, const QString&)"), - idx.data(BookmarksModel.UrlRole), - idx.data(Qt.DisplayRole)) + self.openUrl.emit( + idx.data(BookmarksModel.UrlRole), + idx.data(Qt.DisplayRole)) def __openBookmarkInNewTab(self): """ @@ -169,9 +170,9 @@ """ idx = self.index(self.sender()) - self.emit(SIGNAL("newUrl(const QUrl&, const QString&)"), - idx.data(BookmarksModel.UrlRole), - idx.data(Qt.DisplayRole)) + self.newUrl.emit( + idx.data(BookmarksModel.UrlRole), + idx.data(Qt.DisplayRole)) def __removeBookmark(self): """
--- a/Helpviewer/Bookmarks/BookmarksModel.py Tue Aug 10 14:17:54 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksModel.py Tue Aug 10 16:16:23 2010 +0200 @@ -40,15 +40,9 @@ self.__endMacro = False self.__bookmarksManager = manager - self.connect(manager, - SIGNAL("entryAdded"), - self.entryAdded) - self.connect(manager, - SIGNAL("entryRemoved"), - self.entryRemoved) - self.connect(manager, - SIGNAL("entryChanged"), - self.entryChanged) + manager.entryAdded.connect(self.entryAdded) + manager.entryRemoved.connect(self.entryRemoved) + manager.entryChanged.connect(self.entryChanged) self.__headers = [ self.trUtf8("Title"), @@ -113,8 +107,7 @@ @param node reference to the bookmark node to change (BookmarkNode) """ idx = self.nodeIndex(node) - self.emit(SIGNAL("dataChanged(const QModelIndex&, const QModelIndex&)"), - idx, idx) + self.dataChanged.emit(idx, idx) def removeRows(self, row, count, parent = QModelIndex()): """
