Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui	Fri Sep 27 14:49:42 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorGeneralPage.ui	Sat Sep 28 18:44:48 2019 +0200
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>559</width>
-    <height>593</height>
+    <height>771</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_3">
+  <layout class="QVBoxLayout" name="verticalLayout_4">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -36,7 +36,7 @@
      <property name="title">
       <string>Tabs &amp;&amp; Indentation</string>
      </property>
-     <layout class="QVBoxLayout" name="verticalLayout_2">
+     <layout class="QVBoxLayout" name="verticalLayout_3">
       <item>
        <layout class="QGridLayout">
         <item row="0" column="0">
@@ -138,6 +138,97 @@
        </layout>
       </item>
       <item>
+       <layout class="QHBoxLayout" name="horizontalLayout">
+        <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>
+          </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"> </string>
+           </property>
+          </column>
+         </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>
+        </item>
+       </layout>
+      </item>
+      <item>
        <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
          <widget class="QCheckBox" name="autoindentCheckBox">
@@ -263,10 +354,17 @@
  <tabstops>
   <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>tabforindentationCheckBox</tabstop>
   <tabstop>converttabsCheckBox</tabstop>
+  <tabstop>comment0CheckBox</tabstop>
+  <tabstop>vsSelectionCheckBox</tabstop>
+  <tabstop>vsUserCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections>