Mercurial Repositories > eric / file diff

--- a/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Sat May 20 19:50:13 2023 +0200
+++ b/src/eric7/Plugins/CheckerPlugins/CodeStyleChecker/CodeStyleCheckerDialog.ui	Sun May 21 15:26:11 2023 +0200
@@ -261,7 +261,7 @@
               <property name="geometry">
                <rect>
                 <x>0</x>
-                <y>0</y>
+                <y>-373</y>
                 <width>611</width>
                 <height>923</height>
                </rect>
@@ -1411,9 +1411,29 @@
             </widget>
            </item>
            <item>
+            <spacer name="verticalSpacer_7">
+             <property name="orientation">
+              <enum>Qt::Vertical</enum>
+             </property>
+             <property name="sizeHint" stdset="0">
+              <size>
+               <width>20</width>
+               <height>737</height>
+              </size>
+             </property>
+            </spacer>
+           </item>
+          </layout>
+         </widget>
+         <widget class="QWidget" name="nameOrderOptionsTab">
+          <attribute name="title">
+           <string>Name Order</string>
+          </attribute>
+          <layout class="QVBoxLayout" name="verticalLayout_19">
+           <item>
             <widget class="QGroupBox" name="groupBox_18">
              <property name="title">
-              <string>Imports Sorting</string>
+              <string>Name Sorting</string>
              </property>
              <layout class="QGridLayout" name="gridLayout_10">
               <item row="0" column="0">
@@ -1463,7 +1483,16 @@
                 </property>
                </widget>
               </item>
-              <item row="1" column="2">
+             </layout>
+            </widget>
+           </item>
+           <item>
+            <widget class="QGroupBox" name="groupBox_19">
+             <property name="title">
+              <string>Imports Sorting</string>
+             </property>
+             <layout class="QHBoxLayout" name="horizontalLayout_13">
+              <item>
                <widget class="QCheckBox" name="sortFromFirstCheckBox">
                 <property name="toolTip">
                  <string>Select to place from imports first then straight ones</string>
@@ -1473,28 +1502,41 @@
                 </property>
                </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="horizontalSpacer_11">
+                <property name="orientation">
+                 <enum>Qt::Horizontal</enum>
+                </property>
+                <property name="sizeHint" stdset="0">
+                 <size>
+                  <width>313</width>
+                  <height>20</height>
+                 </size>
+                </property>
+               </spacer>
+              </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">
+            <spacer name="verticalSpacer_10">
              <property name="orientation">
               <enum>Qt::Vertical</enum>
              </property>
              <property name="sizeHint" stdset="0">
               <size>
                <width>20</width>
-               <height>737</height>
+               <height>365</height>
               </size>
              </property>
             </spacer>
@@ -1883,6 +1925,7 @@
   <tabstop>mypyInitReturnCheckBox</tabstop>
   <tabstop>allowStarArgAnyCheckBox</tabstop>
   <tabstop>forceFutureAnnotationsCheckBox</tabstop>
+  <tabstop>simplifiedTypesCheckBox</tabstop>
   <tabstop>dispatchDecoratorEdit</tabstop>
   <tabstop>overloadDecoratorEdit</tabstop>
   <tabstop>tmpDirectoriesEdit</tabstop>