diff -r 9986ec0e559a -r 10516539f238 Debugger/WatchPointViewer.py --- a/Debugger/WatchPointViewer.py Tue Oct 15 22:03:54 2013 +0200 +++ b/Debugger/WatchPointViewer.py Fri Oct 18 23:00:41 2013 +0200 @@ -10,8 +10,8 @@ from __future__ import unicode_literals # __IGNORE_WARNING__ from PyQt4.QtCore import Qt, QModelIndex, qVersion -from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, QSortFilterProxyModel, \ - QHeaderView, QItemSelectionModel, QDialog +from PyQt4.QtGui import QTreeView, QAbstractItemView, QMenu, \ + QSortFilterProxyModel, QHeaderView, QItemSelectionModel, QDialog from E5Gui.E5Application import e5App from E5Gui import E5MessageBox @@ -23,8 +23,8 @@ """ Class implementing the watch expression viewer widget. - Watch expressions will be shown with all their details. They can be modified through - the context menu of this widget. + Watch expressions will be shown with all their details. They can be + modified through the context menu of this widget. """ def __init__(self, parent=None): """ @@ -55,7 +55,7 @@ """ Public slot to set the watch expression model. - @param reference to the watch expression model (WatchPointModel) + @param model reference to the watch expression model (WatchPointModel) """ self.__model = model @@ -85,7 +85,8 @@ def __resizeColumns(self): """ - Private slot to resize the view when items get added, edited or deleted. + Private slot to resize the view when items get added, edited or + deleted. """ self.header().resizeSections(QHeaderView.ResizeToContents) self.header().setStretchLastSection(True) @@ -102,6 +103,7 @@ Private slot to convert an index to a source index. @param index index to be converted (QModelIndex) + @return mapped index (QModelIndex) """ return self.sortingModel.mapToSource(index) @@ -110,6 +112,7 @@ Private slot to convert a source index to an index. @param sindex source index to be converted (QModelIndex) + @return mapped index (QModelIndex) """ return self.sortingModel.mapFromSource(sindex) @@ -140,13 +143,16 @@ self.menu.addAction(self.trUtf8("Edit..."), self.__editWatchPoint) self.menu.addSeparator() self.menu.addAction(self.trUtf8("Enable"), self.__enableWatchPoint) - self.menu.addAction(self.trUtf8("Enable all"), self.__enableAllWatchPoints) + self.menu.addAction(self.trUtf8("Enable all"), + self.__enableAllWatchPoints) self.menu.addSeparator() self.menu.addAction(self.trUtf8("Disable"), self.__disableWatchPoint) - self.menu.addAction(self.trUtf8("Disable all"), self.__disableAllWatchPoints) + self.menu.addAction(self.trUtf8("Disable all"), + self.__disableAllWatchPoints) self.menu.addSeparator() self.menu.addAction(self.trUtf8("Delete"), self.__deleteWatchPoint) - self.menu.addAction(self.trUtf8("Delete all"), self.__deleteAllWatchPoints) + self.menu.addAction(self.trUtf8("Delete all"), + self.__deleteAllWatchPoints) self.menu.addSeparator() self.menu.addAction(self.trUtf8("Configure..."), self.__configure) @@ -155,13 +161,13 @@ self.backMenu.addAction(self.trUtf8("Add"), self.__addWatchPoint) self.backMenuActions["EnableAll"] = \ self.backMenu.addAction(self.trUtf8("Enable all"), - self.__enableAllWatchPoints) + self.__enableAllWatchPoints) self.backMenuActions["DisableAll"] = \ self.backMenu.addAction(self.trUtf8("Disable all"), - self.__disableAllWatchPoints) + self.__disableAllWatchPoints) self.backMenuActions["DeleteAll"] = \ self.backMenu.addAction(self.trUtf8("Delete all"), - self.__deleteAllWatchPoints) + self.__deleteAllWatchPoints) self.backMenu.addSeparator() self.backMenu.addAction(self.trUtf8("Configure..."), self.__configure) self.backMenu.aboutToShow.connect(self.__showBackMenu) @@ -170,16 +176,19 @@ self.multiMenu.addAction(self.trUtf8("Add"), self.__addWatchPoint) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8("Enable selected"), - self.__enableSelectedWatchPoints) - self.multiMenu.addAction(self.trUtf8("Enable all"), self.__enableAllWatchPoints) + self.__enableSelectedWatchPoints) + self.multiMenu.addAction(self.trUtf8("Enable all"), + self.__enableAllWatchPoints) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8("Disable selected"), - self.__disableSelectedWatchPoints) - self.multiMenu.addAction(self.trUtf8("Disable all"), self.__disableAllWatchPoints) + self.__disableSelectedWatchPoints) + self.multiMenu.addAction(self.trUtf8("Disable all"), + self.__disableAllWatchPoints) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8("Delete selected"), - self.__deleteSelectedWatchPoints) - self.multiMenu.addAction(self.trUtf8("Delete all"), self.__deleteAllWatchPoints) + self.__deleteSelectedWatchPoints) + self.multiMenu.addAction(self.trUtf8("Delete all"), + self.__deleteAllWatchPoints) self.multiMenu.addSeparator() self.multiMenu.addAction(self.trUtf8("Configure..."), self.__configure) @@ -210,7 +219,8 @@ for index in self.selectedIndexes(): self.__setRowSelected(index, False) - def __findDuplicates(self, cond, special, showMessage=False, index=QModelIndex()): + def __findDuplicates(self, cond, special, showMessage=False, + index=QModelIndex()): """ Private method to check, if an entry already exists. @@ -218,20 +228,23 @@ @param special special condition to check (string) @param showMessage flag indicating a message should be shown, if a duplicate entry is found (boolean) - @param index index that should not be considered duplicate (QModelIndex) + @param index index that should not be considered duplicate + (QModelIndex) @return flag indicating a duplicate entry (boolean) """ idx = self.__model.getWatchPointIndex(cond, special) - duplicate = idx.isValid() and idx.internalPointer() != index.internalPointer() + duplicate = idx.isValid() and \ + idx.internalPointer() != index.internalPointer() if showMessage and duplicate: if not special: msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'""" """ already exists.</p>""")\ .format(Utilities.html_encode(cond)) else: - msg = self.trUtf8("""<p>A watch expression '<b>{0}</b>'""" - """ for the variable <b>{1}</b> already exists.</p>""")\ - .format(special, Utilities.html_encode(cond)) + msg = self.trUtf8( + """<p>A watch expression '<b>{0}</b>'""" + """ for the variable <b>{1}</b> already exists.</p>""")\ + .format(special, Utilities.html_encode(cond)) E5MessageBox.warning(self, self.trUtf8("Watch expression already exists"), msg) @@ -247,7 +260,8 @@ if dlg.exec_() == QDialog.Accepted: cond, temp, enabled, ignorecount, special = dlg.getData() if not self.__findDuplicates(cond, special, True): - self.__model.addWatchPoint(cond, special, (temp, enabled, ignorecount)) + self.__model.addWatchPoint(cond, special, + (temp, enabled, ignorecount)) self.__resizeColumns() self.__resort() @@ -297,7 +311,8 @@ """ Private method to set the enabled status of a watch expression. - @param index index of watch expression to be enabled/disabled (QModelIndex) + @param index index of watch expression to be enabled/disabled + (QModelIndex) @param enabled flag indicating the enabled status to be set (boolean) """ sindex = self.__toSourceIndex(index) @@ -315,7 +330,8 @@ def __enableAllWatchPoints(self): """ - Private slot to handle the enable all watch expressions context menu entry. + Private slot to handle the enable all watch expressions context menu + entry. """ index = self.model().index(0, 0) while index.isValid(): @@ -326,7 +342,8 @@ def __enableSelectedWatchPoints(self): """ - Private slot to handle the enable selected watch expressions context menu entry. + Private slot to handle the enable selected watch expressions context + menu entry. """ for index in self.selectedIndexes(): if index.column() == 0: @@ -345,7 +362,8 @@ def __disableAllWatchPoints(self): """ - Private slot to handle the disable all watch expressions context menu entry. + Private slot to handle the disable all watch expressions context menu + entry. """ index = self.model().index(0, 0) while index.isValid(): @@ -356,7 +374,8 @@ def __disableSelectedWatchPoints(self): """ - Private slot to handle the disable selected watch expressions context menu entry. + Private slot to handle the disable selected watch expressions context + menu entry. """ for index in self.selectedIndexes(): if index.column() == 0: @@ -375,13 +394,15 @@ def __deleteAllWatchPoints(self): """ - Private slot to handle the delete all watch expressions context menu entry. + Private slot to handle the delete all watch expressions context menu + entry. """ self.__model.deleteAll() def __deleteSelectedWatchPoints(self): """ - Private slot to handle the delete selected watch expressions context menu entry. + Private slot to handle the delete selected watch expressions context + menu entry. """ idxList = [] for index in self.selectedIndexes(): @@ -417,4 +438,5 @@ """ Private method to open the configuration dialog. """ - e5App().getObject("UserInterface").showPreferences("debuggerGeneralPage") + e5App().getObject("UserInterface")\ + .showPreferences("debuggerGeneralPage")