--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Fri Jan 22 14:14:15 2021 +0100
+++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui Fri Jan 22 16:48:43 2021 +0100
@@ -7,10 +7,10 @@
<x>0</x>
<y>0</y>
<width>550</width>
- <height>700</height>
+ <height>863</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_4">
+ <layout class="QVBoxLayout" name="verticalLayout_3">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
@@ -36,9 +36,53 @@
<property name="title">
<string>Tabs && Indentation</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_3">
- <item>
- <layout class="QGridLayout">
+ <layout class="QGridLayout" name="gridLayout_5">
+ <item row="0" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_2">
+ <item row="0" column="0">
+ <widget class="QCheckBox" name="autoindentCheckBox">
+ <property name="toolTip">
+ <string>Select whether autoindentation shall be enabled</string>
+ </property>
+ <property name="text">
+ <string>Auto indentation</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QCheckBox" name="tabforindentationCheckBox">
+ <property name="toolTip">
+ <string>Select whether tab characters are used for indentations.</string>
+ </property>
+ <property name="text">
+ <string>Use tabs for indentations</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="0">
+ <widget class="QCheckBox" name="tabindentsCheckBox">
+ <property name="toolTip">
+ <string>Select whether pressing the tab key indents.</string>
+ </property>
+ <property name="text">
+ <string>Tab key indents</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QCheckBox" name="converttabsCheckBox">
+ <property name="toolTip">
+ <string>Select whether tabs shall be converted upon opening the file</string>
+ </property>
+ <property name="text">
+ <string>Convert tabs upon open</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item row="1" column="0" colspan="2">
+ <layout class="QGridLayout" name="gridLayout_4">
<item row="0" column="0">
<widget class="QLabel" name="TextLabel13_3">
<property name="text">
@@ -137,138 +181,96 @@
</item>
</layout>
</item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
+ <item row="2" column="0">
+ <widget class="QTreeWidget" name="languageOverrideWidget">
+ <property name="minimumSize">
+ <size>
+ <width>0</width>
+ <height>150</height>
+ </size>
+ </property>
+ <property name="alternatingRowColors">
+ <bool>true</bool>
+ </property>
+ <property name="selectionMode">
+ <enum>QAbstractItemView::ExtendedSelection</enum>
+ </property>
+ <property name="rootIsDecorated">
+ <bool>false</bool>
+ </property>
+ <property name="itemsExpandable">
+ <bool>false</bool>
+ </property>
+ <column>
+ <property name="text">
+ <string>Language</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Tab Width</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string>Indent Width</string>
+ </property>
+ </column>
+ <column>
+ <property name="text">
+ <string notr="true"/>
+ </property>
+ </column>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <layout class="QVBoxLayout" name="verticalLayout_2">
<item>
- <widget class="QTreeWidget" name="languageOverrideWidget">
- <property name="alternatingRowColors">
- <bool>true</bool>
- </property>
- <property name="selectionMode">
- <enum>QAbstractItemView::ExtendedSelection</enum>
- </property>
- <property name="rootIsDecorated">
- <bool>false</bool>
- </property>
- <property name="itemsExpandable">
- <bool>false</bool>
+ <spacer name="verticalSpacer">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <column>
- <property name="text">
- <string>Language</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Tab Width</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string>Indent Width</string>
- </property>
- </column>
- <column>
- <property name="text">
- <string notr="true"/>
- </property>
- </column>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item>
+ <widget class="QToolButton" name="addButton">
+ <property name="toolTip">
+ <string>Press to add a language specific override</string>
+ </property>
</widget>
</item>
<item>
- <layout class="QVBoxLayout" name="verticalLayout_2">
- <item>
- <spacer name="verticalSpacer">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- <item>
- <widget class="QToolButton" name="addButton">
- <property name="toolTip">
- <string>Press to add a language specific override</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="deleteButton">
- <property name="toolTip">
- <string>Press to delete the selected language specific override</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QToolButton" name="editButton">
- <property name="toolTip">
- <string>Press to edit the selected language specific override</string>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="verticalSpacer_2">
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>20</width>
- <height>40</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ <widget class="QToolButton" name="deleteButton">
+ <property name="toolTip">
+ <string>Press to delete the selected language specific override</string>
+ </property>
+ </widget>
</item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QCheckBox" name="autoindentCheckBox">
+ <item>
+ <widget class="QToolButton" name="editButton">
<property name="toolTip">
- <string>Select whether autoindentation shall be enabled</string>
- </property>
- <property name="text">
- <string>Auto indentation</string>
+ <string>Press to edit the selected language specific override</string>
</property>
</widget>
</item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="tabforindentationCheckBox">
- <property name="toolTip">
- <string>Select whether tab characters are used for indentations.</string>
- </property>
- <property name="text">
- <string>Use tabs for indentations</string>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QCheckBox" name="tabindentsCheckBox">
- <property name="toolTip">
- <string>Select whether pressing the tab key indents.</string>
+ <item>
+ <spacer name="verticalSpacer_2">
+ <property name="orientation">
+ <enum>Qt::Vertical</enum>
</property>
- <property name="text">
- <string>Tab key indents</string>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>20</width>
+ <height>40</height>
+ </size>
</property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QCheckBox" name="converttabsCheckBox">
- <property name="toolTip">
- <string>Select whether tabs shall be converted upon opening the file</string>
- </property>
- <property name="text">
- <string>Convert tabs upon open</string>
- </property>
- </widget>
+ </spacer>
</item>
</layout>
</item>
@@ -294,26 +296,6 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>345</width>
- <height>17</height>
- </size>
- </property>
- </spacer>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="label_3">
- <property name="text">
- <string>Width Step Size:</string>
- </property>
- </widget>
- </item>
<item row="0" column="1">
<widget class="QSpinBox" name="sourceOutlineWidthSpinBox">
<property name="toolTip">
@@ -333,7 +315,14 @@
</property>
</widget>
</item>
- <item row="1" column="1">
+ <item row="0" column="2">
+ <widget class="QLabel" name="label_3">
+ <property name="text">
+ <string>Width Step Size:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="3">
<widget class="QSpinBox" name="sourceOutlineWidthStepSpinBox">
<property name="toolTip">
<string>Enter the amount of pixels the width of the outline should be increased or decreased</string>
@@ -352,7 +341,20 @@
</property>
</widget>
</item>
- <item row="2" column="0" colspan="3">
+ <item row="0" column="4">
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>345</width>
+ <height>17</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0" colspan="5">
<widget class="QCheckBox" name="sourceOutlineShowCodingCheckBox">
<property name="toolTip">
<string>Select to show the source code encoding</string>
@@ -388,6 +390,35 @@
</widget>
</item>
<item>
+ <widget class="QGroupBox" name="groupBox_3">
+ <property name="title">
+ <string>Docstring</string>
+ </property>
+ <layout class="QHBoxLayout" name="horizontalLayout_2">
+ <item>
+ <widget class="QLabel" name="label_4">
+ <property name="text">
+ <string>Docstring Style:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="docstringStyleComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Select the docstring style to be used</string>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
<widget class="QGroupBox" name="groupBox_2">
<property name="title">
<string>Virtual Space</string>
@@ -429,21 +460,22 @@
</layout>
</widget>
<tabstops>
+ <tabstop>autoindentCheckBox</tabstop>
+ <tabstop>tabforindentationCheckBox</tabstop>
+ <tabstop>tabindentsCheckBox</tabstop>
+ <tabstop>converttabsCheckBox</tabstop>
<tabstop>tabwidthSlider</tabstop>
<tabstop>indentwidthSlider</tabstop>
<tabstop>languageOverrideWidget</tabstop>
<tabstop>addButton</tabstop>
<tabstop>deleteButton</tabstop>
<tabstop>editButton</tabstop>
- <tabstop>autoindentCheckBox</tabstop>
- <tabstop>tabforindentationCheckBox</tabstop>
- <tabstop>tabindentsCheckBox</tabstop>
- <tabstop>converttabsCheckBox</tabstop>
<tabstop>sourceOutlineGroupBox</tabstop>
<tabstop>sourceOutlineWidthSpinBox</tabstop>
<tabstop>sourceOutlineWidthStepSpinBox</tabstop>
<tabstop>sourceOutlineShowCodingCheckBox</tabstop>
<tabstop>comment0CheckBox</tabstop>
+ <tabstop>docstringStyleComboBox</tabstop>
<tabstop>vsSelectionCheckBox</tabstop>
<tabstop>vsUserCheckBox</tabstop>
</tabstops>
