--- a/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Sat Oct 03 18:11:45 2020 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorStylesPage.ui Sun Oct 04 15:25:17 2020 +0200
@@ -6,11 +6,11 @@
<rect>
<x>0</x>
<y>0</y>
- <width>655</width>
- <height>2891</height>
+ <width>578</width>
+ <height>3217</height>
</rect>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_11">
+ <layout class="QVBoxLayout" name="verticalLayout_5">
<item>
<widget class="QLabel" name="headerLabel">
<property name="text">
@@ -61,15 +61,15 @@
<property name="checked">
<bool>false</bool>
</property>
- <layout class="QHBoxLayout" name="horizontalLayout_7">
- <item>
+ <layout class="QGridLayout" name="gridLayout_6">
+ <item row="0" column="0">
<widget class="QLabel" name="TextLabel2_2_2_2_2_12">
<property name="text">
<string>Edit area foreground:</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QPushButton" name="editAreaForegroundButton">
<property name="minimumSize">
<size>
@@ -85,14 +85,27 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_6">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>263</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="1" column="0">
<widget class="QLabel" name="TextLabel2_2_2_2_2_11">
<property name="text">
<string>Edit area background:</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QPushButton" name="editAreaBackgroundButton">
<property name="minimumSize">
<size>
@@ -163,16 +176,6 @@
<string>Fonts</string>
</property>
<layout class="QGridLayout">
- <item row="1" column="2">
- <widget class="QCheckBox" name="monospacedCheckBox">
- <property name="toolTip">
- <string>Select, whether the monospaced font should be used as default</string>
- </property>
- <property name="text">
- <string>Use monospaced as default</string>
- </property>
- </widget>
- </item>
<item row="0" column="1">
<widget class="QLineEdit" name="defaultFontSample">
<property name="focusPolicy">
@@ -225,6 +228,16 @@
</property>
</widget>
</item>
+ <item row="2" column="0" colspan="2">
+ <widget class="QCheckBox" name="monospacedCheckBox">
+ <property name="toolTip">
+ <string>Select, whether the monospaced font should be used as default</string>
+ </property>
+ <property name="text">
+ <string>Use monospaced as default</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -332,10 +345,10 @@
</item>
<item>
<layout class="QGridLayout" name="gridLayout">
- <item row="0" column="0">
- <widget class="QLabel" name="TextLabel2_2_2_2_2_6">
+ <item row="3" column="0">
+ <widget class="QLabel" name="label">
<property name="text">
- <string>Margins foreground:</string>
+ <string>Foldmarkers foreground:</string>
</property>
</widget>
</item>
@@ -355,37 +368,14 @@
</property>
</widget>
</item>
- <item row="0" column="2">
- <widget class="QLabel" name="TextLabel2_2_2_2_2_7">
- <property name="text">
- <string>Margins background:</string>
- </property>
- </widget>
- </item>
- <item row="0" column="3">
- <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="1" column="0">
+ <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="1" column="1">
+ <item row="2" column="1">
<widget class="QPushButton" name="foldmarginBackgroundButton">
<property name="minimumSize">
<size>
@@ -401,14 +391,14 @@
</property>
</widget>
</item>
- <item row="2" column="0">
- <widget class="QLabel" name="label">
+ <item row="1" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_7">
<property name="text">
- <string>Foldmarkers foreground:</string>
+ <string>Margins background:</string>
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QPushButton" name="foldmarkersForegroundButton">
<property name="minimumSize">
<size>
@@ -424,14 +414,37 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <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="2" column="3">
+ <item row="4" column="1">
<widget class="QPushButton" name="foldmarkersBackgroundButton">
<property name="minimumSize">
<size>
@@ -447,6 +460,19 @@
</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>
@@ -506,7 +532,7 @@
<property name="title">
<string>Selection</string>
</property>
- <layout class="QVBoxLayout" name="_2">
+ <layout class="QVBoxLayout" name="verticalLayout_11">
<item>
<layout class="QGridLayout" name="_3">
<item row="0" column="0">
@@ -545,15 +571,15 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="_4">
- <item>
+ <layout class="QGridLayout" name="gridLayout_12">
+ <item row="0" column="0">
<widget class="QLabel" name="TextLabel2_2_2_2_2_4">
<property name="text">
<string>Selection foreground:</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QPushButton" name="selectionForegroundButton">
<property name="minimumSize">
<size>
@@ -569,14 +595,27 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_8">
+ <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="TextLabel2_2_2_2_2_5">
<property name="text">
<string>Selection background:</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QPushButton" name="selectionBackgroundButton">
<property name="minimumSize">
<size>
@@ -792,16 +831,6 @@
<string>Debugging Line Markers</string>
</property>
<layout class="QGridLayout" name="gridLayout_10">
- <item row="0" column="0" colspan="4">
- <widget class="QCheckBox" name="debugMarkerBackgroundCheckBox">
- <property name="toolTip">
- <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string>
- </property>
- <property name="text">
- <string>Use background colors</string>
- </property>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel3_2_2">
<property name="text">
@@ -825,14 +854,37 @@
</property>
</widget>
</item>
- <item row="1" column="2">
+ <item row="0" column="0" colspan="4">
+ <widget class="QCheckBox" name="debugMarkerBackgroundCheckBox">
+ <property name="toolTip">
+ <string>Select to indicate the debug markers using colored line backgrounds, arrow indicators otherwise</string>
+ </property>
+ <property name="text">
+ <string>Use background colors</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="0">
<widget class="QLabel" name="TextLabel4_2_2">
<property name="text">
<string>Error line marker:</string>
</property>
</widget>
</item>
- <item row="1" column="3">
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_11">
+ <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="2" column="1">
<widget class="QPushButton" name="errorMarkerButton">
<property name="minimumSize">
<size>
@@ -857,16 +909,6 @@
<string>Braces</string>
</property>
<layout class="QGridLayout" name="_9">
- <item row="0" column="0" colspan="2">
- <widget class="QCheckBox" name="bracehighlightingCheckBox">
- <property name="toolTip">
- <string>Select whether matching and bad braces shall be highlighted.</string>
- </property>
- <property name="text">
- <string>Highlight braces</string>
- </property>
- </widget>
- </item>
<item row="1" column="0">
<widget class="QLabel" name="TextLabel1_3_2">
<property name="text">
@@ -874,6 +916,35 @@
</property>
</widget>
</item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_10">
+ <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="2" column="1">
+ <widget class="QPushButton" name="matchingBracesBackButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the background color for highlighting matching braces.</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
<item row="1" column="1">
<widget class="QPushButton" name="matchingBracesButton">
<property name="minimumSize">
@@ -890,30 +961,7 @@
</property>
</widget>
</item>
- <item row="1" column="2">
- <widget class="QLabel" name="TextLabel1_3_2_2">
- <property name="text">
- <string>Matched braces background:</string>
- </property>
- </widget>
- </item>
- <item row="1" column="3">
- <widget class="QPushButton" name="matchingBracesBackButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the background color for highlighting matching braces.</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item row="2" column="0">
+ <item row="3" column="0">
<widget class="QLabel" name="TextLabel2_2_2">
<property name="minimumSize">
<size>
@@ -926,7 +974,7 @@
</property>
</widget>
</item>
- <item row="2" column="1">
+ <item row="3" column="1">
<widget class="QPushButton" name="nonmatchingBracesButton">
<property name="toolTip">
<string>Select the color for highlighting nonmatching braces.</string>
@@ -936,7 +984,14 @@
</property>
</widget>
</item>
- <item row="2" column="2">
+ <item row="2" column="0">
+ <widget class="QLabel" name="TextLabel1_3_2_2">
+ <property name="text">
+ <string>Matched braces background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="4" column="0">
<widget class="QLabel" name="TextLabel2_2_2_3">
<property name="minimumSize">
<size>
@@ -949,7 +1004,7 @@
</property>
</widget>
</item>
- <item row="2" column="3">
+ <item row="4" column="1">
<widget class="QPushButton" name="nonmatchingBracesBackButton">
<property name="toolTip">
<string>Select the background color for highlighting nonmatching braces.</string>
@@ -959,6 +1014,16 @@
</property>
</widget>
</item>
+ <item row="0" column="0" colspan="3">
+ <widget class="QCheckBox" name="bracehighlightingCheckBox">
+ <property name="toolTip">
+ <string>Select whether matching and bad braces shall be highlighted.</string>
+ </property>
+ <property name="text">
+ <string>Highlight braces</string>
+ </property>
+ </widget>
+ </item>
</layout>
</widget>
</item>
@@ -1507,15 +1572,15 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="horizontalLayout_3">
- <item>
+ <layout class="QGridLayout" name="gridLayout_14">
+ <item row="0" column="0">
<widget class="QLabel" name="TextLabel13_3_2_3">
<property name="text">
<string>Unsaved changes color:</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QPushButton" name="changeMarkerUnsavedColorButton">
<property name="minimumSize">
<size>
@@ -1531,14 +1596,27 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_12">
+ <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="TextLabel13_3_2_4">
<property name="text">
<string>Saved changes color:</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QPushButton" name="changeMarkerSavedColorButton">
<property name="minimumSize">
<size>
@@ -1616,15 +1694,15 @@
</layout>
</item>
<item>
- <layout class="QHBoxLayout" name="_15">
- <item>
+ <layout class="QGridLayout" name="gridLayout_15">
+ <item row="0" column="0">
<widget class="QLabel" name="TextLabel2_2_2_2_2_9">
<property name="text">
<string>Whitespace foreground:</string>
</property>
</widget>
</item>
- <item>
+ <item row="0" column="1">
<widget class="QPushButton" name="whitespaceForegroundButton">
<property name="minimumSize">
<size>
@@ -1640,14 +1718,27 @@
</property>
</widget>
</item>
- <item>
+ <item row="0" column="2">
+ <spacer name="horizontalSpacer_13">
+ <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="TextLabel2_2_2_2_2_10">
<property name="text">
<string>Whitespace background:</string>
</property>
</widget>
</item>
- <item>
+ <item row="1" column="1">
<widget class="QPushButton" name="whitespaceBackgroundButton">
<property name="minimumSize">
<size>
@@ -1673,8 +1764,8 @@
<property name="title">
<string>Indentation Guides</string>
</property>
- <layout class="QVBoxLayout" name="verticalLayout_5">
- <item>
+ <layout class="QGridLayout" name="gridLayout_13">
+ <item row="0" column="0" colspan="3">
<widget class="QCheckBox" name="indentguidesCheckBox">
<property name="toolTip">
<string>Select whether indentation guides should be shown.</string>
@@ -1684,55 +1775,64 @@
</property>
</widget>
</item>
- <item>
- <layout class="QHBoxLayout" name="_18">
- <item>
- <widget class="QLabel" name="TextLabel2_2_2_2_2_13">
- <property name="text">
- <string>Indentation Guides foreground:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="indentationGuidesForegroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the foreground color for indentation guides</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QLabel" name="TextLabel2_2_2_2_2_14">
- <property name="text">
- <string>Indentation Guides background:</string>
- </property>
- </widget>
- </item>
- <item>
- <widget class="QPushButton" name="indentationGuidesBackgroundButton">
- <property name="minimumSize">
- <size>
- <width>100</width>
- <height>0</height>
- </size>
- </property>
- <property name="toolTip">
- <string>Select the background color for indentation guides</string>
- </property>
- <property name="text">
- <string/>
- </property>
- </widget>
- </item>
- </layout>
+ <item row="1" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_13">
+ <property name="text">
+ <string>Indentation Guides foreground:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="1">
+ <widget class="QPushButton" name="indentationGuidesForegroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the foreground color for indentation guides</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
+ </item>
+ <item row="1" column="2">
+ <spacer name="horizontalSpacer_9">
+ <property name="orientation">
+ <enum>Qt::Horizontal</enum>
+ </property>
+ <property name="sizeHint" stdset="0">
+ <size>
+ <width>223</width>
+ <height>20</height>
+ </size>
+ </property>
+ </spacer>
+ </item>
+ <item row="2" column="0">
+ <widget class="QLabel" name="TextLabel2_2_2_2_2_14">
+ <property name="text">
+ <string>Indentation Guides background:</string>
+ </property>
+ </widget>
+ </item>
+ <item row="2" column="1">
+ <widget class="QPushButton" name="indentationGuidesBackgroundButton">
+ <property name="minimumSize">
+ <size>
+ <width>100</width>
+ <height>0</height>
+ </size>
+ </property>
+ <property name="toolTip">
+ <string>Select the background color for indentation guides</string>
+ </property>
+ <property name="text">
+ <string/>
+ </property>
+ </widget>
</item>
</layout>
</widget>
@@ -2100,19 +2200,6 @@
</layout>
</widget>
</item>
- <item>
- <spacer>
- <property name="orientation">
- <enum>Qt::Vertical</enum>
- </property>
- <property name="sizeHint" stdset="0">
- <size>
- <width>558</width>
- <height>20</height>
- </size>
- </property>
- </spacer>
- </item>
</layout>
</widget>
<tabstops>
