Fri, 06 Aug 2010 12:39:40 +0200
Continued porting signal/slot usage to the new API.
--- a/Debugger/BreakPointViewer.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Debugger/BreakPointViewer.py Fri Aug 06 12:39: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) @@ -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/ExceptionLogger.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Debugger/ExceptionLogger.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Debugger/VariablesViewer.py Fri Aug 06 12:39: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/WatchPointViewer.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Debugger/WatchPointViewer.py Fri Aug 06 12:39: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)
--- a/E5Gui/E5TabWidget.py Thu Aug 05 08:39:56 2010 +0200 +++ b/E5Gui/E5TabWidget.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Graphics/PixmapDiagram.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Graphics/SvgDiagram.py Fri Aug 06 12:39: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/Helpviewer/Bookmarks/BookmarksDialog.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksDialog.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksMenu.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/Bookmarks/BookmarksToolBar.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/HelpTocWidget.py Fri Aug 06 12:39: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/HelpWindow.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/HelpWindow.py Fri Aug 06 12:39: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() @@ -3016,4 +3014,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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Helpviewer/History/HistoryDialog.py Fri Aug 06 12:39: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/MultiProject/MultiProjectBrowser.py Thu Aug 05 08:39:56 2010 +0200 +++ b/MultiProject/MultiProjectBrowser.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/PluginManager/PluginInfoDialog.py Fri Aug 06 12:39:40 2010 +0200 @@ -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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Plugins/VcsPlugins/vcsMercurial/HgStatusDialog.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Plugins/VcsPlugins/vcsPySvn/SvnStatusDialog.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Plugins/VcsPlugins/vcsSubversion/SvnStatusDialog.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Plugins/ViewManagerPlugins/Listspace/Listspace.py Fri Aug 06 12:39: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/Tabview/Tabview.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Plugins/ViewManagerPlugins/Tabview/Tabview.py Fri Aug 06 12:39:40 2010 +0200 @@ -205,8 +205,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/ProjectBaseBrowser.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Project/ProjectBaseBrowser.py Fri Aug 06 12:39: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/QScintilla/MiniEditor.py Thu Aug 05 08:39:56 2010 +0200 +++ b/QScintilla/MiniEditor.py Fri Aug 06 12:39: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()"), @@ -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/Tasks/TaskViewer.py Thu Aug 05 08:39:56 2010 +0200 +++ b/Tasks/TaskViewer.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/Templates/TemplateViewer.py Fri Aug 06 12:39: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/UI/Browser.py Thu Aug 05 08:39:56 2010 +0200 +++ b/UI/Browser.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/UI/FindFileDialog.py Fri Aug 06 12:39: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 Thu Aug 05 08:39:56 2010 +0200 +++ b/UI/LogView.py Fri Aug 06 12:39: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/VCS/StatusMonitorLed.py Thu Aug 05 08:39:56 2010 +0200 +++ b/VCS/StatusMonitorLed.py Fri Aug 06 12:39: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()