Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Tue Mar 05 19:50:32 2019 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Wed Mar 06 18:44:29 2019 +0100
@@ -10,7 +10,7 @@
     <height>2891</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_9">
+  <layout class="QVBoxLayout" name="verticalLayout_10">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -563,133 +563,186 @@
      <property name="title">
       <string>Caret</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_6">
+     <layout class="QVBoxLayout" name="verticalLayout_9">
       <item>
-       <layout class="QHBoxLayout" name="horizontalLayout_4">
-        <item>
-         <widget class="QCheckBox" name="caretlineVisibleCheckBox">
-          <property name="toolTip">
-           <string>Select, whether the caretline should be highlighted</string>
-          </property>
-          <property name="text">
-           <string>Caretline visible</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QCheckBox" name="caretlineAlwaysVisibleCheckBox">
-          <property name="toolTip">
-           <string>Select, whether the caretline should be highlighted even if the editor doesn't have the focus</string>
-          </property>
-          <property name="text">
-           <string>Caretline always visible</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer name="horizontalSpacer_3">
-          <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>
+       <widget class="QGroupBox" name="groupBox_18">
+        <property name="title">
+         <string>Caret</string>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_5">
+         <item>
+          <widget class="QLabel" name="textLabel1_7">
+           <property name="text">
+            <string>Width:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QSpinBox" name="caretWidthSpinBox">
+           <property name="toolTip">
+            <string>Select caret width (1, 2 or 3 pixels)</string>
+           </property>
+           <property name="minimum">
+            <number>1</number>
+           </property>
+           <property name="maximum">
+            <number>3</number>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="TextLabel2_2_2_2_2_2">
+           <property name="text">
+            <string>Foreground:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="caretForegroundButton">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Select the colour for the caret.</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer>
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeType">
+            <enum>QSizePolicy::Expanding</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>347</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
       </item>
       <item>
-       <layout class="QHBoxLayout" name="_6">
-        <item>
-         <widget class="QLabel" name="textLabel1_7">
-          <property name="text">
-           <string>Caret width:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QSpinBox" name="caretWidthSpinBox">
-          <property name="toolTip">
-           <string>Select caret width (1, 2 or 3 pixels)</string>
-          </property>
-          <property name="minimum">
-           <number>1</number>
-          </property>
-          <property name="maximum">
-           <number>3</number>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <spacer>
-          <property name="orientation">
-           <enum>Qt::Horizontal</enum>
-          </property>
-          <property name="sizeType">
-           <enum>QSizePolicy::Expanding</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="_7">
-        <item>
-         <widget class="QLabel" name="TextLabel2_2_2_2_2_2">
-          <property name="text">
-           <string>Caret foreground:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="caretForegroundButton">
-          <property name="minimumSize">
-           <size>
-            <width>100</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Select the colour for the caret.</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QLabel" name="TextLabel2_2_2_2_2_3">
-          <property name="text">
-           <string>Caretline background:</string>
-          </property>
-         </widget>
-        </item>
-        <item>
-         <widget class="QPushButton" name="caretlineBackgroundButton">
-          <property name="minimumSize">
-           <size>
-            <width>100</width>
-            <height>0</height>
-           </size>
-          </property>
-          <property name="toolTip">
-           <string>Select the background colour for the line containing the caret.</string>
-          </property>
-          <property name="text">
-           <string/>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <widget class="QGroupBox" name="groupBox_19">
+        <property name="title">
+         <string>Caret Line</string>
+        </property>
+        <layout class="QVBoxLayout" name="verticalLayout_6">
+         <item>
+          <layout class="QHBoxLayout" name="horizontalLayout_4">
+           <item>
+            <widget class="QCheckBox" name="caretlineVisibleCheckBox">
+             <property name="toolTip">
+              <string>Select, whether the caret line should be highlighted</string>
+             </property>
+             <property name="text">
+              <string>Caret line visible</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QCheckBox" name="caretlineAlwaysVisibleCheckBox">
+             <property name="toolTip">
+              <string>Select, whether the caret line should be highlighted even if the editor doesn't have the focus</string>
+             </property>
+             <property name="text">
+              <string>Caret line always visible</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_3">
+             <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_6">
+           <item>
+            <widget class="QLabel" name="label_19">
+             <property name="text">
+              <string>Frame Width:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QSpinBox" name="caretlineFrameWidthSpinBox">
+             <property name="toolTip">
+              <string>Select caret line frame width (off, 1, 2 or 3 pixels)</string>
+             </property>
+             <property name="specialValueText">
+              <string>Off</string>
+             </property>
+             <property name="minimum">
+              <number>0</number>
+             </property>
+             <property name="maximum">
+              <number>3</number>
+             </property>
+             <property name="value">
+              <number>0</number>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QLabel" name="TextLabel2_2_2_2_2_3">
+             <property name="text">
+              <string>Background:</string>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <widget class="QPushButton" name="caretlineBackgroundButton">
+             <property name="minimumSize">
+              <size>
+               <width>100</width>
+               <height>0</height>
+              </size>
+             </property>
+             <property name="toolTip">
+              <string>Select the background colour for the line containing the caret.</string>
+             </property>
+             <property name="text">
+              <string/>
+             </property>
+            </widget>
+           </item>
+           <item>
+            <spacer name="horizontalSpacer_5">
+             <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>
      </layout>
     </widget>
@@ -912,7 +965,7 @@
            </property>
           </widget>
          </item>
-         <item row="0" column="2">
+         <item row="0" column="2" colspan="2">
           <spacer name="horizontalSpacer_2">
            <property name="orientation">
             <enum>Qt::Horizontal</enum>
@@ -953,6 +1006,32 @@
            </property>
           </widget>
          </item>
+         <item row="2" column="2">
+          <widget class="QSpinBox" name="wrapStartIndentSpinBox">
+           <property name="toolTip">
+            <string>Enter the number of characters to indent (only used for 'Fixed')</string>
+           </property>
+           <property name="suffix">
+            <string> characters</string>
+           </property>
+           <property name="maximum">
+            <number>9</number>
+           </property>
+          </widget>
+         </item>
+         <item row="2" column="3">
+          <spacer name="horizontalSpacer_4">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>362</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
         </layout>
        </widget>
       </item>
@@ -2018,10 +2097,11 @@
   <tabstop>extentSelEolCheckBox</tabstop>
   <tabstop>selectionForegroundButton</tabstop>
   <tabstop>selectionBackgroundButton</tabstop>
+  <tabstop>caretWidthSpinBox</tabstop>
+  <tabstop>caretForegroundButton</tabstop>
   <tabstop>caretlineVisibleCheckBox</tabstop>
   <tabstop>caretlineAlwaysVisibleCheckBox</tabstop>
-  <tabstop>caretWidthSpinBox</tabstop>
-  <tabstop>caretForegroundButton</tabstop>
+  <tabstop>caretlineFrameWidthSpinBox</tabstop>
   <tabstop>caretlineBackgroundButton</tabstop>
   <tabstop>debugMarkerBackgroundCheckBox</tabstop>
   <tabstop>currentLineMarkerButton</tabstop>
@@ -2035,6 +2115,7 @@
   <tabstop>wrapModeComboBox</tabstop>
   <tabstop>wrapVisualComboBox</tabstop>
   <tabstop>wrapIndentComboBox</tabstop>
+  <tabstop>wrapStartIndentSpinBox</tabstop>
   <tabstop>edgeModeCombo</tabstop>
   <tabstop>edgeLineColumnSlider</tabstop>
   <tabstop>edgeBackgroundColorButton</tabstop>