Mercurial Repositories > eric / file comparison
comparison: src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py
- branch
- eric7
- changeset 9477
- 903ee653bf23
- parent 9473
- 3f23dbf37dbe
- child 9482
- a2bc06a54d9d
equal
deleted
inserted
replaced
| 9476:3238ffc4b3df | 9477:903ee653bf23 |
|---|---|
| 491 "ApplicationPackageNames": [], | 491 "ApplicationPackageNames": [], |
| 492 "BannedModules": [], | 492 "BannedModules": [], |
| 493 "BanRelativeImports": "", | 493 "BanRelativeImports": "", |
| 494 "SortOrder": "natural", | 494 "SortOrder": "natural", |
| 495 "SortCaseSensitive": False, | 495 "SortCaseSensitive": False, |
| 496 "CombinedAsImports": False, | |
| 497 "SortIgnoringStyle": False, | |
| 498 "SortFromFirst": False, | |
| 496 }, | 499 }, |
| 497 } | 500 } |
| 498 | 501 |
| 499 return defaults | 502 return defaults |
| 500 | 503 |
| 573 ]["ForceFutureAnnotations"], | 576 ]["ForceFutureAnnotations"], |
| 574 } | 577 } |
| 575 ) | 578 ) |
| 576 | 579 |
| 577 # Upgrading ImportsChecker from older data structures | 580 # Upgrading ImportsChecker from older data structures |
| 578 if "SortOrder" not in self.__data["ImportsChecker"]: | 581 if "CombinedAsImports" not in self.__data["ImportsChecker"]: |
| 579 self.__data["ImportsChecker"].update( | 582 self.__data["ImportsChecker"].update( |
| 580 { | 583 { |
| 581 "SortOrder": defaultParameters["ImportsChecker"]["SortOrder"], | 584 "SortOrder": defaultParameters["ImportsChecker"]["SortOrder"], |
| 582 "SortCaseSensitive": defaultParameters["ImportsChecker"][ | 585 "SortCaseSensitive": defaultParameters["ImportsChecker"][ |
| 583 "SortCaseSensitive" | 586 "SortCaseSensitive" |
| 587 ], | |
| 588 "CombinedAsImports": defaultParameters["ImportsChecker"][ | |
| 589 "CombinedAsImports" | |
| 590 ], | |
| 591 "SortIgnoringStyle": defaultParameters["ImportsChecker"][ | |
| 592 "SortIgnoringStyle" | |
| 593 ], | |
| 594 "SortFromFirst": defaultParameters["ImportsChecker"][ | |
| 595 "SortFromFirst" | |
| 584 ], | 596 ], |
| 585 } | 597 } |
| 586 ) | 598 ) |
| 587 | 599 |
| 588 self.__initCategoriesList(self.__data["EnabledCheckerCategories"]) | 600 self.__initCategoriesList(self.__data["EnabledCheckerCategories"]) |
| 700 self.sortOrderComboBox.setCurrentIndex( | 712 self.sortOrderComboBox.setCurrentIndex( |
| 701 self.sortOrderComboBox.findData(self.__data["ImportsChecker"]["SortOrder"]) | 713 self.sortOrderComboBox.findData(self.__data["ImportsChecker"]["SortOrder"]) |
| 702 ) | 714 ) |
| 703 self.sortCaseSensitiveCheckBox.setChecked( | 715 self.sortCaseSensitiveCheckBox.setChecked( |
| 704 self.__data["ImportsChecker"]["SortCaseSensitive"] | 716 self.__data["ImportsChecker"]["SortCaseSensitive"] |
| 717 ) | |
| 718 self.combinedAsImpotsCheckBox.setChecked( | |
| 719 self.__data["ImportsChecker"]["CombinedAsImports"] | |
| 720 ) | |
| 721 self.sortIgnoreStyleCheckBox.setChecked( | |
| 722 self.__data["ImportsChecker"]["SortIgnoringStyle"] | |
| 723 ) | |
| 724 self.sortFromFirstCheckBox.setChecked( | |
| 725 self.__data["ImportsChecker"]["SortFromFirst"] | |
| 705 ) | 726 ) |
| 706 | 727 |
| 707 self.__cleanupData() | 728 self.__cleanupData() |
| 708 | 729 |
| 709 def __prepareProgress(self): | 730 def __prepareProgress(self): |
| 880 ), | 901 ), |
| 881 "BannedModules": sorted(self.bannedModulesEdit.toPlainText().split()), | 902 "BannedModules": sorted(self.bannedModulesEdit.toPlainText().split()), |
| 882 "BanRelativeImports": self.__getBanRelativeImportsValue(), | 903 "BanRelativeImports": self.__getBanRelativeImportsValue(), |
| 883 "SortOrder": self.sortOrderComboBox.currentData(), | 904 "SortOrder": self.sortOrderComboBox.currentData(), |
| 884 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), | 905 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), |
| 906 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | |
| 907 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | |
| 908 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | |
| 885 } | 909 } |
| 886 | 910 |
| 887 self.__options = [ | 911 self.__options = [ |
| 888 excludeMessages, | 912 excludeMessages, |
| 889 includeMessages, | 913 includeMessages, |
| 1321 self.bannedModulesEdit.toPlainText().split() | 1345 self.bannedModulesEdit.toPlainText().split() |
| 1322 ), | 1346 ), |
| 1323 "BanRelativeImports": self.__getBanRelativeImportsValue(), | 1347 "BanRelativeImports": self.__getBanRelativeImportsValue(), |
| 1324 "SortOrder": self.sortOrderComboBox.currentData(), | 1348 "SortOrder": self.sortOrderComboBox.currentData(), |
| 1325 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), | 1349 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(), |
| 1350 "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(), | |
| 1351 "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(), | |
| 1352 "SortFromFirst": self.sortFromFirstCheckBox.isChecked(), | |
| 1326 }, | 1353 }, |
| 1327 } | 1354 } |
| 1328 if json.dumps(data, sort_keys=True) != json.dumps( | 1355 if json.dumps(data, sort_keys=True) != json.dumps( |
| 1329 self.__data, sort_keys=True | 1356 self.__data, sort_keys=True |
| 1330 ): | 1357 ): |
| 1866 "PEP8/SortCaseSensitive", | 1893 "PEP8/SortCaseSensitive", |
| 1867 defaultParameters["ImportsChecker"]["SortCaseSensitive"], | 1894 defaultParameters["ImportsChecker"]["SortCaseSensitive"], |
| 1868 ) | 1895 ) |
| 1869 ) | 1896 ) |
| 1870 ) | 1897 ) |
| 1898 self.combinedAsImpotsCheckBox.setChecked( | |
| 1899 Preferences.toBool( | |
| 1900 settings.value( | |
| 1901 "PEP8/CombinedAsImports", | |
| 1902 defaultParameters["ImportsChecker"]["CombinedAsImports"], | |
| 1903 ) | |
| 1904 ) | |
| 1905 ) | |
| 1906 self.sortIgnoreStyleCheckBox.setChecked( | |
| 1907 Preferences.toBool( | |
| 1908 settings.value( | |
| 1909 "PEP8/SortIgnoringStyle", | |
| 1910 defaultParameters["ImportsChecker"]["SortIgnoringStyle"], | |
| 1911 ) | |
| 1912 ) | |
| 1913 ) | |
| 1914 self.sortFromFirstCheckBox.setChecked( | |
| 1915 Preferences.toBool( | |
| 1916 settings.value( | |
| 1917 "PEP8/SortFromFirst", | |
| 1918 defaultParameters["ImportsChecker"]["SortFromFirst"], | |
| 1919 ) | |
| 1920 ) | |
| 1921 ) | |
| 1871 | 1922 |
| 1872 self.__cleanupData() | 1923 self.__cleanupData() |
| 1873 | 1924 |
| 1874 @pyqtSlot() | 1925 @pyqtSlot() |
| 1875 def on_storeDefaultButton_clicked(self): | 1926 def on_storeDefaultButton_clicked(self): |
| 2010 ) | 2061 ) |
| 2011 settings.setValue("PEP8/SortOrder", self.sortOrderComboBox.currentData()) | 2062 settings.setValue("PEP8/SortOrder", self.sortOrderComboBox.currentData()) |
| 2012 settings.setValue( | 2063 settings.setValue( |
| 2013 "PEP8/SortCaseSensitive", self.sortCaseSensitiveCheckBox.isChecked() | 2064 "PEP8/SortCaseSensitive", self.sortCaseSensitiveCheckBox.isChecked() |
| 2014 ) | 2065 ) |
| 2066 settings.setValue( | |
| 2067 "PEP8/CombinedAsImports", self.combinedAsImpotsCheckBox.isChecked() | |
| 2068 ) | |
| 2069 settings.setValue( | |
| 2070 "PEP8/SortIgnoringStyle", self.sortIgnoreStyleCheckBox.isChecked() | |
| 2071 ) | |
| 2072 settings.setValue( | |
| 2073 "PEP8/SortFromFirst", self.sortFromFirstCheckBox.isChecked() | |
| 2074 ) | |
| 2015 | 2075 |
| 2016 @pyqtSlot() | 2076 @pyqtSlot() |
| 2017 def on_resetDefaultButton_clicked(self): | 2077 def on_resetDefaultButton_clicked(self): |
| 2018 """ | 2078 """ |
| 2019 Private slot to reset the configuration values to their default values. | 2079 Private slot to reset the configuration values to their default values. |
| 2178 defaultParameters["ImportsChecker"]["SortOrder"], | 2238 defaultParameters["ImportsChecker"]["SortOrder"], |
| 2179 ) | 2239 ) |
| 2180 settings.setValue( | 2240 settings.setValue( |
| 2181 "PEP8/SortCaseSensitive", | 2241 "PEP8/SortCaseSensitive", |
| 2182 defaultParameters["ImportsChecker"]["SortCaseSensitive"], | 2242 defaultParameters["ImportsChecker"]["SortCaseSensitive"], |
| 2243 ) | |
| 2244 settings.setValue( | |
| 2245 "PEP8/CombinedAsImports", | |
| 2246 defaultParameters["ImportsChecker"]["CombinedAsImports"], | |
| 2247 ) | |
| 2248 settings.setValue( | |
| 2249 "PEP8/SortIgnoringStyle", | |
| 2250 defaultParameters["ImportsChecker"]["SortIgnoringStyle"], | |
| 2251 ) | |
| 2252 settings.setValue( | |
| 2253 "PEP8/SortFromFirst", | |
| 2254 defaultParameters["ImportsChecker"]["SortFromFirst"], | |
| 2183 ) | 2255 ) |
| 2184 | 2256 |
| 2185 # Update UI with default values | 2257 # Update UI with default values |
| 2186 self.on_loadDefaultButton_clicked() | 2258 self.on_loadDefaultButton_clicked() |
| 2187 | 2259 |
