Fri, 04 Nov 2016 22:07:05 +0100
Avoid exception and be able to close the code style dialog if no file found because of filter settings.
Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py | file | annotate | diff | comparison | revisions |
--- a/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Fri Nov 04 22:05:33 2016 +0100 +++ b/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py Fri Nov 04 22:07:05 2016 +0100 @@ -32,6 +32,10 @@ except Exception: basestring = str # define for Python3 +NO_RESULTS = 0 +NO_FILES = 1 +HAS_RESULTS = 2 + class CodeStyleCheckerDialog(QDialog, Ui_CodeStyleCheckerDialog): """ @@ -101,9 +105,10 @@ self.styleCheckService.error.connect(self.__processError) self.filename = None - self.noResults = True + self.results = NO_RESULTS self.cancelled = False self.__lastFileItem = None + self.__batch = False self.__finished = True self.__errorItem = None @@ -441,6 +446,10 @@ else: self.__batch = True self.checkBatch() + else: + self.results = NO_FILES + self.__finished = False + self.__finish() def __modifyOptions(self, source): """ @@ -499,7 +508,7 @@ self.filename) source = source.splitlines(True) except (UnicodeError, IOError) as msg: - self.noResults = False + self.results = HAS_RESULTS self.__createResultItem( self.filename, 1, 1, self.tr("Error: {0}").format(str(msg)) @@ -550,7 +559,7 @@ filename) source = source.splitlines(True) except (UnicodeError, IOError) as msg: - self.noResults = False + self.results = HAS_RESULTS self.__createResultItem( filename, 1, 1, self.tr("Error: {0}").format(str(msg)) @@ -647,7 +656,7 @@ text = self.tr("{0} (ignored)").format(text) else: continue - self.noResults = False + self.results = HAS_RESULTS self.__createResultItem( fn, lineno, position, text, fixed, autofixing, ignored) @@ -690,8 +699,14 @@ self.showButton.setEnabled(True) self.startButton.setEnabled(True) - if self.noResults: - QTreeWidgetItem(self.resultList, [self.tr('No issues found.')]) + if self.results < HAS_RESULTS: + if self.results == NO_RESULTS: + QTreeWidgetItem( + self.resultList, [self.tr('No issues found.')]) + else: + QTreeWidgetItem( + self.resultList, + [self.tr('No files found (check your ignore list).')]) QApplication.processEvents() self.showButton.setEnabled(False) else: @@ -747,7 +762,7 @@ self.__data) self.resultList.clear() - self.noResults = True + self.results = NO_RESULTS self.cancelled = False self.start(self.__fileOrFileList) @@ -804,7 +819,7 @@ @param item reference to the activated item (QTreeWidgetItem) @param column column the item was activated in (integer) """ - if self.noResults: + if self.results < HAS_RESULTS: return if item.parent():