diff -r 08ca9b336a43 -r 36839e2c6945 src/eric7/Preferences/ConfigurationPages/EditorStylesPage.ui
--- a/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.ui Tue Jul 25 13:14:27 2023 +0200
+++ b/src/eric7/Preferences/ConfigurationPages/EditorStylesPage.ui Tue Jul 25 16:41:52 2023 +0200
@@ -7,10 +7,10 @@
<x>0</x>
<y>0</y>
<width>578</width>
- <height>3217</height>
+ <height>3473</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
+ <layout class="QVBoxLayout" name="verticalLayout_13">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
@@ -42,7 +42,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_12">
+ <widget class="QGroupBox" name="colorsGroup">
<property name="title">
<string>Colors</string>
</property>
@@ -171,7 +171,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_5">
+ <widget class="QGroupBox" name="fontsGroup">
<property name="title">
<string>Fonts</string>
</property>
@@ -242,57 +242,185 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox">
+ <widget class="QGroupBox" name="marginsGroup">
<property name="title">
<string>Margins</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout">
+ <layout class="QVBoxLayout" name="verticalLayout_12">
<item>
- <layout class="QGridLayout" name="gridLayout_2">
- <item row="0" column="0">
- <widget class="QCheckBox" name="linenoCheckBox">
- <property name="toolTip">
- <string>Select whether line numbers margin should be shown.</string>
- </property>
- <property name="text">
- <string>Show Line Numbers Margin</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QCheckBox" name="foldingCheckBox">
- <property name="toolTip">
- <string>Select whether the fold margin should be shown.</string>
- </property>
- <property name="text">
- <string>Show Fold Margin</string>
- </property>
- </widget>
- </item>
- </layout>
+ <widget class="QGroupBox" name="marginsGeneralGroup">
+ <property name="title">
+ <string>General</string>
+ </property>
+ <layout class="QGridLayout" name="gridLayout">
+ <item row="0" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_6">
+ <property name="text">
+ <string>Margins foreground:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="marginsForegroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the foreground color for the margins</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_7">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>266</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_7">
+ <property name="text">
+ <string>Margins background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="marginsBackgroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the background color for the margins</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </widget>
</item>
<item>
- <layout class="QHBoxLayout">
- <item>
- <widget class="QLabel" name="TextLabel1_4_2_2">
- <property name="text">
- <string>Folding style:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QComboBox" name="foldingStyleComboBox">
- <property name="sizePolicy">
- <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
- <horstretch>0</horstretch>
- <verstretch>0</verstretch>
- </sizepolicy>
- </property>
- <property name="toolTip">
- <string>Select the folding style to be used in the folding margin</string>
- </property>
- <property name="whatsThis">
- <string><b>Folding style</b>
+ <widget class="QGroupBox" name="lineNumbersGroup">
+ <property name="title">
+ <string>Line Numbers Margin</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout_5">
+ <item>
+ <widget class="QCheckBox" name="linenoCheckBox">
+ <property name="toolTip">
+ <string>Select whether line numbers margin should be shown.</string>
+ </property>
+ <property name="text">
+ <string>Show Line Numbers Margin</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout" name="horizontalLayout">
+ <item>
+ <widget class="QPushButton" name="linenumbersFontButton">
+ <property name="toolTip">
+ <string>Press to select the font for the editor line numbers</string>
+ </property>
+ <property name="text">
+ <string>Line Numbers Font</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QLineEdit" name="marginsFontSample">
+ <property name="minimumSize">
+ <size>
+ <width>200</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="focusPolicy">
+ <enum>Qt::NoFocus</enum>
+ </property>
+ <property name="text">
+ <string>2345</string>
+ </property>
+ <property name="alignment">
+ <set>Qt::AlignHCenter</set>
+ </property>
+ <property name="readOnly">
+ <bool>true</bool>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <spacer name="horizontalSpacer">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
+ </item>
+ <item>
+ <widget class="QGroupBox" name="foldMarginGroup">
+ <property name="title">
+ <string>Fold Margin</string>
+ </property>
+ <layout class="QVBoxLayout" name="verticalLayout">
+ <item>
+ <widget class="QCheckBox" name="foldingCheckBox">
+ <property name="toolTip">
+ <string>Select whether the fold margin should be shown.</string>
+ </property>
+ <property name="text">
+ <string>Show Fold Margin</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <layout class="QHBoxLayout">
+ <item>
+ <widget class="QLabel" name="TextLabel1_4_2_2">
+ <property name="text">
+ <string>Folding style:</string>
+ </property>
+ </widget>
+ </item>
+ <item>
+ <widget class="QComboBox" name="foldingStyleComboBox">
+ <property name="sizePolicy">
+ <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+ <horstretch>0</horstretch>
+ <verstretch>0</verstretch>
+ </sizepolicy>
+ </property>
+ <property name="toolTip">
+ <string>Select the folding style to be used in the folding margin</string>
+ </property>
+ <property name="whatsThis">
+ <string><b>Folding style</b>
<p>Select the desired folding style to be used in the folding margin.</p>
<p>The available styles are:
<ul>
@@ -303,232 +431,140 @@
<li>Boxed Tree - boxed plus and minus symbols and flattened tree with rectangled corners</li>
</ul>
</p></string>
- </property>
- <item>
- <property name="text">
- <string>Plain</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Circled</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Boxed</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Circled Tree</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Boxed Tree</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Arrow</string>
- </property>
- </item>
- <item>
- <property name="text">
- <string>Arrow Tree</string>
- </property>
- </item>
- </widget>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QGridLayout" name="gridLayout">
- <item row="3" column="0">
- <widget class="QLabel" name="label">
- <property name="text">
- <string>Foldmarkers foreground:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="1">
- <widget class="QPushButton" name="marginsForegroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the foreground color for the margins</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
- <widget class="QLabel" name="TextLabel2_2_2_2_2_8">
- <property name="text">
- <string>Foldmargin background:</string>
- </property>
- </widget>
- </item>
- <item row="2" column="1">
- <widget class="QPushButton" name="foldmarginBackgroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the background color for the foldmargin</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="1" column="0">
- <widget class="QLabel" name="TextLabel2_2_2_2_2_7">
- <property name="text">
- <string>Margins background:</string>
- </property>
- </widget>
- </item>
- <item row="3" column="1">
- <widget class="QPushButton" name="foldmarkersForegroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the foreground color of the foldmarkers</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="0">
- <widget class="QLabel" name="TextLabel2_2_2_2_2_6">
- <property name="text">
- <string>Margins foreground:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="1">
- <widget class="QPushButton" name="marginsBackgroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the background color for the margins</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="4" column="0">
- <widget class="QLabel" name="label_2">
- <property name="text">
- <string>Foldmarkers background:</string>
- </property>
- </widget>
- </item>
- <item row="4" column="1">
- <widget class="QPushButton" name="foldmarkersBackgroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the background color of the foldmarkers</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="0" column="2">
- <spacer name="horizontalSpacer_7">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
- </item>
- <item>
- <layout class="QHBoxLayout" name="horizontalLayout">
- <item>
- <widget class="QPushButton" name="linenumbersFontButton">
- <property name="toolTip">
- <string>Press to select the font for the editor line numbers</string>
- </property>
- <property name="text">
- <string>Line Numbers Font</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLineEdit" name="marginsFontSample">
- <property name="minimumSize">
- <size>
- <width>200</width>
- <height>0</height>
- </size>
- </property>
- <property name="focusPolicy">
- <enum>Qt::NoFocus</enum>
- </property>
- <property name="text">
- <string>2345</string>
- </property>
- <property name="alignment">
- <set>Qt::AlignHCenter</set>
- </property>
- <property name="readOnly">
- <bool>true</bool>
- </property>
- </widget>
- </item>
- <item>
- <spacer name="horizontalSpacer">
- <property name="orientation">
- <enum>Qt::Horizontal</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>40</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
- </layout>
+ </property>
+ <item>
+ <property name="text">
+ <string>Plain</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Circled</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Boxed</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Circled Tree</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Boxed Tree</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Arrow</string>
+ </property>
+ </item>
+ <item>
+ <property name="text">
+ <string>Arrow Tree</string>
+ </property>
+ </item>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ <item>
+ <layout class="QGridLayout" name="gridLayout_16">
+ <item row="0" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_8">
+ <property name="text">
+ <string>Foldmargin background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="1">
+ <widget class="QPushButton" name="foldmarginBackgroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the background color for the foldmargin</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_14">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>40</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
+ <widget class="QLabel" name="label">
+ <property name="text">
+ <string>Foldmarkers foreground:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="foldmarkersForegroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the foreground color of the foldmarkers</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="label_2">
+ <property name="text">
+ <string>Foldmarkers background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="foldmarkersBackgroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the background color of the foldmarkers</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ </layout>
+ </item>
+ </layout>
+ </widget>
</item>
</layout>
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_3">
+ <widget class="QGroupBox" name="selectionGroup">
<property name="title">
<string>Selection</string>
</property>
@@ -637,13 +673,13 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_4">
+ <widget class="QGroupBox" name="caretGroup">
<property name="title">
<string>Caret</string>
</property>
<layout class="QVBoxLayout" name="verticalLayout_9">
<item>
- <widget class="QGroupBox" name="groupBox_18">
+ <widget class="QGroupBox" name="caretGeneralGroup">
<property name="title">
<string>Caret</string>
</property>
@@ -711,7 +747,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_19">
+ <widget class="QGroupBox" name="caretLineGroup">
<property name="title">
<string>Caret Line</string>
</property>
@@ -826,7 +862,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_2">
+ <widget class="QGroupBox" name="debuggingGroup">
<property name="title">
<string>Debugging Line Markers</string>
</property>
@@ -904,7 +940,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_6">
+ <widget class="QGroupBox" name="bracesGroup">
<property name="title">
<string>Braces</string>
</property>
@@ -1028,7 +1064,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_7">
+ <widget class="QGroupBox" name="eolGroup">
<property name="title">
<string>End of Line</string>
</property>
@@ -1140,7 +1176,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_9">
+ <widget class="QGroupBox" name="edgeModeGroup">
<property name="title">
<string>Edge Mode</string>
</property>
@@ -1296,7 +1332,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_8">
+ <widget class="QGroupBox" name="zoomGroup">
<property name="title">
<string>Zoom</string>
</property>
@@ -1504,7 +1540,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_13">
+ <widget class="QGroupBox" name="changeTracingGroup">
<property name="title">
<string>Change Tracing</string>
</property>
@@ -1638,7 +1674,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_11">
+ <widget class="QGroupBox" name="whitespaceGroup">
<property name="title">
<string>Whitespace</string>
</property>
@@ -1760,7 +1796,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_15">
+ <widget class="QGroupBox" name="indentationsGroup">
<property name="title">
<string>Indentation Guides</string>
</property>
@@ -1838,7 +1874,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_14">
+ <widget class="QGroupBox" name="markerMapGroup">
<property name="title">
<string>Marker Map</string>
</property>
@@ -2172,7 +2208,7 @@
</widget>
</item>
<item>
- <widget class="QGroupBox" name="groupBox_10">
+ <widget class="QGroupBox" name="variousGroup">
<property name="title">
<string>Various</string>
</property>
@@ -2200,6 +2236,19 @@
</layout>
</widget>
</item>
+ <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>
</layout>
</widget>
<tabstops>
@@ -2210,15 +2259,15 @@
<tabstop>defaultFontButton</tabstop>
<tabstop>monospacedFontButton</tabstop>
<tabstop>monospacedCheckBox</tabstop>
+ <tabstop>marginsForegroundButton</tabstop>
+ <tabstop>marginsBackgroundButton</tabstop>
<tabstop>linenoCheckBox</tabstop>
+ <tabstop>linenumbersFontButton</tabstop>
<tabstop>foldingCheckBox</tabstop>
<tabstop>foldingStyleComboBox</tabstop>
- <tabstop>marginsForegroundButton</tabstop>
- <tabstop>marginsBackgroundButton</tabstop>
<tabstop>foldmarginBackgroundButton</tabstop>
<tabstop>foldmarkersForegroundButton</tabstop>
<tabstop>foldmarkersBackgroundButton</tabstop>
- <tabstop>linenumbersFontButton</tabstop>
<tabstop>customSelColourCheckBox</tabstop>
<tabstop>colourizeSelTextCheckBox</tabstop>
<tabstop>extentSelEolCheckBox</tabstop>
