diff -r 88ac13e691d6 -r 4cd6e4b1db12 src/eric7/CodeFormatting/IsortConfigurationDialog.ui
--- a/src/eric7/CodeFormatting/IsortConfigurationDialog.ui Tue Dec 20 11:09:04 2022 +0100
+++ b/src/eric7/CodeFormatting/IsortConfigurationDialog.ui Wed Dec 21 10:53:45 2022 +0100
@@ -64,96 +64,122 @@
<property name="title">
<string>Sorting</string>
</property>
- <layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="label_14">
- <property name="text">
- <string>Sort Order:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QComboBox" name="sortOrderComboBox">
- <property name="toolTip">
- <string>Select the sort order (empty for default).</string>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <widget class="QLabel" name="label_15">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="text">
- <string><a href="https://pycqa.github.io/isort/docs/configuration/options.html#sort-order">Defined Sort Orders</a></string>
- </property>
- <property name="openExternalLinks">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <widget class="QLabel" name="label_10">
- <property name="text">
- <string>Sections:</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
- </property>
- </widget>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <layout class="QVBoxLayout" name="verticalLayout_3">
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QLabel" name="label_14">
+ <property name="text">
+ <string>Sort Order:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="sortOrderComboBox">
+ <property name="toolTip">
+ <string>Select the sort order (empty for default).</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <widget class="QLabel" name="label_15">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Preferred">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="text">
+ <string><a href="https://pycqa.github.io/isort/docs/configuration/options.html#sort-order">Defined Sort Orders</a></string>
+ </property>
+ <property name="openExternalLinks">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QCheckBox" name="sortCaseSensitiveCheckBox">
+ <property name="toolTip">
+ <string>Select to sort imports observing the case.</string>
+ </property>
+ <property name="text">
+ <string>Sort Case Sensitively</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <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>
+ <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>
+ <item>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>13</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
</item>
- <item row="0" column="4" rowspan="5">
- <widget class="QPlainTextEdit" name="sectionsEdit">
- <property name="toolTip">
- <string>Enter the order of sections (one per line).</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0" colspan="3">
- <widget class="QCheckBox" name="sortCaseSensitiveCheckBox">
- <property name="toolTip">
- <string>Select to sort imports observing the case.</string>
- </property>
- <property name="text">
- <string>Sort Case Sensitively</string>
- </property>
- </widget>
- </item>
- <item row="2" column="0" colspan="3">
- <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="3" column="0" colspan="3">
- <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>
- <item row="4" column="0">
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>0</height>
- </size>
- </property>
- </spacer>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_10">
+ <property name="text">
+ <string>Sections:</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignLeading|Qt::AlignLeft|Qt::AlignTop</set>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QLabel" name="label_17">
+ <property name="text">
+ <string>Known First Party Packages:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QPlainTextEdit" name="sectionsEdit">
+ <property name="toolTip">
+ <string>Enter the order of sections (one per line).</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPlainTextEdit" name="firstPartyEdit">
+ <property name="toolTip">
+ <string>Enter the known first party package names (one per line).</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
</item>
</layout>
</widget>
@@ -215,10 +241,10 @@
<layout class="QVBoxLayout" name="verticalLayout">
<item>
<layout class="QGridLayout" name="gridLayout_4">
- <item row="0" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Profile:</string>
+ <item row="2" column="1">
+ <widget class="QComboBox" name="multiLineComboBox">
+ <property name="toolTip">
+ <string>Select the type of multi line import statements (see isort documentation).</string>
</property>
</widget>
</item>
@@ -232,6 +258,20 @@
</property>
</widget>
</item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Target Version:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QComboBox" name="pythonComboBox">
+ <property name="toolTip">
+ <string>Select the target Python version.</string>
+ </property>
+ </widget>
+ </item>
<item row="0" column="2">
<widget class="QLabel" name="label_13">
<property name="sizePolicy">
@@ -248,17 +288,10 @@
</property>
</widget>
</item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_4">
<property name="text">
- <string>Target Version:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QComboBox" name="pythonComboBox">
- <property name="toolTip">
- <string>Select the target Python version.</string>
+ <string>Multi Line Output:</string>
</property>
</widget>
</item>
@@ -275,17 +308,10 @@
</property>
</spacer>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label_4">
+ <item row="0" column="0">
+ <widget class="QLabel" name="label_2">
<property name="text">
- <string>Multi Line Output:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QComboBox" name="multiLineComboBox">
- <property name="toolTip">
- <string>Select the type of multi line import statements (see isort documentation).</string>
+ <string>Profile:</string>
</property>
</widget>
</item>
@@ -553,15 +579,19 @@
<tabstops>
<tabstop>sourceComboBox</tabstop>
<tabstop>sortOrderComboBox</tabstop>
- <tabstop>sectionsEdit</tabstop>
+ <tabstop>label_15</tabstop>
<tabstop>sortCaseSensitiveCheckBox</tabstop>
<tabstop>sortIgnoreStyleCheckBox</tabstop>
<tabstop>sortFromFirstCheckBox</tabstop>
+ <tabstop>sectionsEdit</tabstop>
+ <tabstop>firstPartyEdit</tabstop>
<tabstop>extensionsEdit</tabstop>
<tabstop>excludeEdit</tabstop>
<tabstop>profileComboBox</tabstop>
+ <tabstop>label_13</tabstop>
<tabstop>pythonComboBox</tabstop>
<tabstop>multiLineComboBox</tabstop>
+ <tabstop>label_12</tabstop>
<tabstop>lineLengthSpinBox</tabstop>
<tabstop>linesBeforeImportsSpinBox</tabstop>
<tabstop>linesAfterImportsSpinBox</tabstop>
@@ -569,6 +599,7 @@
<tabstop>linesBetweenTypesSpinBox</tabstop>
<tabstop>trailingCommaCheckBox</tabstop>
<tabstop>parenthesesCheckBox</tabstop>
+ <tabstop>combineAsCheckBox</tabstop>
</tabstops>
<resources/>
<connections>
