Mercurial Repositories > eric / file diff

diff -r 4db8023ccf32 -r 4c09d3d75768 Preferences/ConfigurationPages/EditorGeneralPage.ui
--- a/Preferences/ConfigurationPages/EditorGeneralPage.ui	Sat Mar 14 14:29:22 2015 +0100
+++ b/Preferences/ConfigurationPages/EditorGeneralPage.ui	Sat Mar 14 14:36:52 2015 +0100
@@ -10,7 +10,7 @@
     <height>593</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_2">
+  <layout class="QVBoxLayout" name="verticalLayout_3">
    <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">
+     <layout class="QVBoxLayout" name="verticalLayout_2">
       <item>
        <layout class="QGridLayout">
         <item row="0" column="0">
@@ -138,14 +138,14 @@
        </layout>
       </item>
       <item>
-       <layout class="QGridLayout">
+       <layout class="QGridLayout" name="gridLayout_2">
         <item row="0" column="0">
-         <widget class="QCheckBox" name="indentguidesCheckBox">
+         <widget class="QCheckBox" name="autoindentCheckBox">
           <property name="toolTip">
-           <string>Select whether indentation guides should be shown.</string>
+           <string>Select whether autoindentation shall be enabled</string>
           </property>
           <property name="text">
-           <string>Show Indentation Guides</string>
+           <string>Auto indentation</string>
           </property>
          </widget>
         </item>
@@ -160,12 +160,12 @@
          </widget>
         </item>
         <item row="1" column="0">
-         <widget class="QCheckBox" name="autoindentCheckBox">
+         <widget class="QCheckBox" name="tabindentsCheckBox">
           <property name="toolTip">
-           <string>Select whether autoindentation shall be enabled</string>
+           <string>Select whether pressing the tab key indents.</string>
           </property>
           <property name="text">
-           <string>Auto indentation</string>
+           <string>Tab key indents</string>
           </property>
          </widget>
         </item>
@@ -179,16 +179,6 @@
           </property>
          </widget>
         </item>
-        <item row="2" column="0">
-         <widget class="QCheckBox" name="tabindentsCheckBox">
-          <property name="toolTip">
-           <string>Select whether pressing the tab key indents.</string>
-          </property>
-          <property name="text">
-           <string>Tab key indents</string>
-          </property>
-         </widget>
-        </item>
        </layout>
       </item>
      </layout>
@@ -273,7 +263,6 @@
  <tabstops>
   <tabstop>tabwidthSlider</tabstop>
   <tabstop>indentwidthSlider</tabstop>
-  <tabstop>indentguidesCheckBox</tabstop>
   <tabstop>autoindentCheckBox</tabstop>
   <tabstop>tabindentsCheckBox</tabstop>
   <tabstop>tabforindentationCheckBox</tabstop>