Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Nov 05 13:02:04 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.py	Sat Nov 05 13:03:31 2022 +0100
@@ -493,6 +493,9 @@
                 "BanRelativeImports": "",
                 "SortOrder": "natural",
                 "SortCaseSensitive": False,
+                "CombinedAsImports": False,
+                "SortIgnoringStyle": False,
+                "SortFromFirst": False,
             },
         }
 
@@ -575,13 +578,22 @@
                 )
 
             # Upgrading ImportsChecker from older data structures
-            if "SortOrder" not in self.__data["ImportsChecker"]:
+            if "CombinedAsImports" not in self.__data["ImportsChecker"]:
                 self.__data["ImportsChecker"].update(
                     {
                         "SortOrder": defaultParameters["ImportsChecker"]["SortOrder"],
                         "SortCaseSensitive": defaultParameters["ImportsChecker"][
                             "SortCaseSensitive"
                         ],
+                        "CombinedAsImports": defaultParameters["ImportsChecker"][
+                            "CombinedAsImports"
+                        ],
+                        "SortIgnoringStyle": defaultParameters["ImportsChecker"][
+                            "SortIgnoringStyle"
+                        ],
+                        "SortFromFirst": defaultParameters["ImportsChecker"][
+                            "SortFromFirst"
+                        ],
                     }
                 )
 
@@ -703,6 +715,15 @@
         self.sortCaseSensitiveCheckBox.setChecked(
             self.__data["ImportsChecker"]["SortCaseSensitive"]
         )
+        self.combinedAsImpotsCheckBox.setChecked(
+            self.__data["ImportsChecker"]["CombinedAsImports"]
+        )
+        self.sortIgnoreStyleCheckBox.setChecked(
+            self.__data["ImportsChecker"]["SortIgnoringStyle"]
+        )
+        self.sortFromFirstCheckBox.setChecked(
+            self.__data["ImportsChecker"]["SortFromFirst"]
+        )
 
         self.__cleanupData()
 
@@ -882,6 +903,9 @@
                 "BanRelativeImports": self.__getBanRelativeImportsValue(),
                 "SortOrder": self.sortOrderComboBox.currentData(),
                 "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(),
+                "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(),
+                "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(),
+                "SortFromFirst": self.sortFromFirstCheckBox.isChecked(),
             }
 
             self.__options = [
@@ -1323,6 +1347,9 @@
                     "BanRelativeImports": self.__getBanRelativeImportsValue(),
                     "SortOrder": self.sortOrderComboBox.currentData(),
                     "SortCaseSensitive": self.sortCaseSensitiveCheckBox.isChecked(),
+                    "CombinedAsImports": self.combinedAsImpotsCheckBox.isChecked(),
+                    "SortIgnoringStyle": self.sortIgnoreStyleCheckBox.isChecked(),
+                    "SortFromFirst": self.sortFromFirstCheckBox.isChecked(),
                 },
             }
             if json.dumps(data, sort_keys=True) != json.dumps(
@@ -1868,6 +1895,30 @@
                 )
             )
         )
+        self.combinedAsImpotsCheckBox.setChecked(
+            Preferences.toBool(
+                settings.value(
+                    "PEP8/CombinedAsImports",
+                    defaultParameters["ImportsChecker"]["CombinedAsImports"],
+                )
+            )
+        )
+        self.sortIgnoreStyleCheckBox.setChecked(
+            Preferences.toBool(
+                settings.value(
+                    "PEP8/SortIgnoringStyle",
+                    defaultParameters["ImportsChecker"]["SortIgnoringStyle"],
+                )
+            )
+        )
+        self.sortFromFirstCheckBox.setChecked(
+            Preferences.toBool(
+                settings.value(
+                    "PEP8/SortFromFirst",
+                    defaultParameters["ImportsChecker"]["SortFromFirst"],
+                )
+            )
+        )
 
         self.__cleanupData()
 
@@ -2012,6 +2063,15 @@
         settings.setValue(
             "PEP8/SortCaseSensitive", self.sortCaseSensitiveCheckBox.isChecked()
         )
+        settings.setValue(
+            "PEP8/CombinedAsImports", self.combinedAsImpotsCheckBox.isChecked()
+        )
+        settings.setValue(
+            "PEP8/SortIgnoringStyle", self.sortIgnoreStyleCheckBox.isChecked()
+        )
+        settings.setValue(
+            "PEP8/SortFromFirst", self.sortFromFirstCheckBox.isChecked()
+        )
 
     @pyqtSlot()
     def on_resetDefaultButton_clicked(self):
@@ -2181,6 +2241,18 @@
             "PEP8/SortCaseSensitive",
             defaultParameters["ImportsChecker"]["SortCaseSensitive"],
         )
+        settings.setValue(
+            "PEP8/CombinedAsImports",
+            defaultParameters["ImportsChecker"]["CombinedAsImports"],
+        )
+        settings.setValue(
+            "PEP8/SortIgnoringStyle",
+            defaultParameters["ImportsChecker"]["SortIgnoringStyle"],
+        )
+        settings.setValue(
+            "PEP8/SortFromFirst",
+            defaultParameters["ImportsChecker"]["SortFromFirst"],
+        )
 
         # Update UI with default values
         self.on_loadDefaultButton_clicked()