Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Sun Apr 07 19:55:21 2019 +0200
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Mon Apr 08 19:08:44 2019 +0200
@@ -10,7 +10,7 @@
     <height>2891</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_10">
+  <layout class="QVBoxLayout" name="verticalLayout_11">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -46,74 +46,113 @@
      <property name="title">
       <string>Colours</string>
      </property>
-     <layout class="QGridLayout" name="gridLayout_6">
-      <item row="0" column="0" colspan="4">
-       <widget class="QCheckBox" name="editAreaOverrideCheckBox">
+     <layout class="QVBoxLayout" name="verticalLayout_10">
+      <item>
+       <widget class="QGroupBox" name="editAreaOverrideCheckBox">
         <property name="toolTip">
          <string>Select to set the colour of the edit area different to the default style</string>
         </property>
-        <property name="text">
+        <property name="title">
          <string>Override edit area colours</string>
         </property>
-       </widget>
-      </item>
-      <item row="1" column="0">
-       <widget class="QLabel" name="TextLabel2_2_2_2_2_12">
-        <property name="enabled">
-         <bool>false</bool>
+        <property name="checkable">
+         <bool>true</bool>
         </property>
-        <property name="text">
-         <string>Edit area foreground:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="1">
-       <widget class="QPushButton" name="editAreaForegroundButton">
-        <property name="enabled">
+        <property name="checked">
          <bool>false</bool>
         </property>
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the foreground colour for the edit area.</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_7">
+         <item>
+          <widget class="QLabel" name="TextLabel2_2_2_2_2_12">
+           <property name="text">
+            <string>Edit area foreground:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="editAreaForegroundButton">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Select the foreground colour for the edit area.</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLabel" name="TextLabel2_2_2_2_2_11">
+           <property name="text">
+            <string>Edit area background:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QPushButton" name="editAreaBackgroundButton">
+           <property name="minimumSize">
+            <size>
+             <width>100</width>
+             <height>0</height>
+            </size>
+           </property>
+           <property name="toolTip">
+            <string>Select the background colour for the edit area.</string>
+           </property>
+           <property name="text">
+            <string/>
+           </property>
+          </widget>
+         </item>
+        </layout>
        </widget>
       </item>
-      <item row="1" column="2">
-       <widget class="QLabel" name="TextLabel2_2_2_2_2_11">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="text">
-         <string>Edit area background:</string>
-        </property>
-       </widget>
-      </item>
-      <item row="1" column="3">
-       <widget class="QPushButton" name="editAreaBackgroundButton">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="minimumSize">
-         <size>
-          <width>100</width>
-          <height>0</height>
-         </size>
-        </property>
-        <property name="toolTip">
-         <string>Select the background colour for the edit area.</string>
-        </property>
-        <property name="text">
-         <string/>
-        </property>
-       </widget>
+      <item>
+       <layout class="QHBoxLayout" name="horizontalLayout_8">
+        <item>
+         <widget class="QLabel" name="label_20">
+          <property name="text">
+           <string>Highlighting:</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="highlightingBackgroundButton">
+          <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 name="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>
       </item>
      </layout>
     </widget>
@@ -2080,6 +2119,7 @@
   <tabstop>editAreaOverrideCheckBox</tabstop>
   <tabstop>editAreaForegroundButton</tabstop>
   <tabstop>editAreaBackgroundButton</tabstop>
+  <tabstop>highlightingBackgroundButton</tabstop>
   <tabstop>defaultFontButton</tabstop>
   <tabstop>monospacedFontButton</tabstop>
   <tabstop>monospacedCheckBox</tabstop>
@@ -2169,8 +2209,8 @@
      <y>1144</y>
     </hint>
     <hint type="destinationlabel">
-     <x>544</x>
-     <y>1148</y>
+     <x>625</x>
+     <y>1164</y>
     </hint>
    </hints>
   </connection>
@@ -2185,72 +2225,8 @@
      <y>1265</y>
     </hint>
     <hint type="destinationlabel">
-     <x>555</x>
-     <y>1269</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>editAreaOverrideCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>TextLabel2_2_2_2_2_12</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>75</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>75</x>
-     <y>137</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>editAreaOverrideCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>editAreaForegroundButton</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>201</x>
-     <y>115</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>209</x>
-     <y>140</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>editAreaOverrideCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>TextLabel2_2_2_2_2_11</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>313</x>
-     <y>112</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>348</x>
-     <y>141</y>
-    </hint>
-   </hints>
-  </connection>
-  <connection>
-   <sender>editAreaOverrideCheckBox</sender>
-   <signal>toggled(bool)</signal>
-   <receiver>editAreaBackgroundButton</receiver>
-   <slot>setEnabled(bool)</slot>
-   <hints>
-    <hint type="sourcelabel">
-     <x>447</x>
-     <y>117</y>
-    </hint>
-    <hint type="destinationlabel">
-     <x>489</x>
-     <y>142</y>
+     <x>635</x>
+     <y>1273</y>
     </hint>
    </hints>
   </connection>