Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Sat Nov 05 13:02:04 2022 +0100
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Sat Nov 05 13:03:31 2022 +0100
@@ -262,7 +262,7 @@
                <rect>
                 <x>0</x>
                 <y>0</y>
-                <width>611</width>
+                <width>389</width>
                 <height>923</height>
                </rect>
               </property>
@@ -1421,6 +1421,16 @@
                </widget>
               </item>
               <item row="0" column="2">
+               <widget class="QCheckBox" name="sortIgnoreStyleCheckBox">
+                <property name="toolTip">
+                 <string>Select to sort the imports by module, independent of import style</string>
+                </property>
+                <property name="text">
+                 <string>Sort Ignoring Style</string>
+                </property>
+               </widget>
+              </item>
+              <item row="0" column="3">
                <spacer name="horizontalSpacer_4">
                 <property name="orientation">
                  <enum>Qt::Horizontal</enum>
@@ -1433,7 +1443,7 @@
                 </property>
                </spacer>
               </item>
-              <item row="1" column="0" colspan="3">
+              <item row="1" column="0" colspan="2">
                <widget class="QCheckBox" name="sortCaseSensitiveCheckBox">
                 <property name="toolTip">
                  <string>Select to sort imports observing the case</string>
@@ -1443,10 +1453,30 @@
                 </property>
                </widget>
               </item>
+              <item row="1" column="2">
+               <widget class="QCheckBox" name="sortFromFirstCheckBox">
+                <property name="toolTip">
+                 <string>Select to place from imports first then straight ones</string>
+                </property>
+                <property name="text">
+                 <string>Sort From First</string>
+                </property>
+               </widget>
+              </item>
              </layout>
             </widget>
            </item>
            <item>
+            <widget class="QCheckBox" name="combinedAsImpotsCheckBox">
+             <property name="toolTip">
+              <string>Select to allow combined as imports (e.g. from foo import bar, baz as bas)</string>
+             </property>
+             <property name="text">
+              <string>Combined As Imports</string>
+             </property>
+            </widget>
+           </item>
+           <item>
             <spacer name="verticalSpacer_7">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
@@ -1861,7 +1891,10 @@
   <tabstop>banParentsButton</tabstop>
   <tabstop>banAllButton</tabstop>
   <tabstop>sortOrderComboBox</tabstop>
+  <tabstop>sortIgnoreStyleCheckBox</tabstop>
   <tabstop>sortCaseSensitiveCheckBox</tabstop>
+  <tabstop>sortFromFirstCheckBox</tabstop>
+  <tabstop>combinedAsImpotsCheckBox</tabstop>
   <tabstop>startButton</tabstop>
   <tabstop>loadDefaultButton</tabstop>
   <tabstop>storeDefaultButton</tabstop>