Mercurial Repositories > eric / file diff

--- a/eric6/Preferences/ConfigurationPages/EditorTypingPage.ui	Sat May 04 14:01:19 2019 +0200
+++ b/eric6/Preferences/ConfigurationPages/EditorTypingPage.ui	Sat May 04 14:34:51 2019 +0200
@@ -162,10 +162,10 @@
           <item>
            <widget class="QCheckBox" name="pythonIndentBraceCheckBox">
             <property name="toolTip">
-             <string>Select to indent to the brace level after typing 'return'</string>
+             <string>Select to indent after typing 'return'</string>
             </property>
             <property name="text">
-             <string>After '(' indent to its level</string>
+             <string>Automatic indent after '('</string>
             </property>
            </widget>
           </item>
@@ -200,6 +200,16 @@
            </widget>
           </item>
           <item>
+           <widget class="QCheckBox" name="pythonInsertImportCheckBox">
+            <property name="toolTip">
+             <string>Select to insert the 'import ' string when the line starts with 'from ...'</string>
+            </property>
+            <property name="text">
+             <string>Automatic insertion of the 'import' string on 'from xxx'</string>
+            </property>
+           </widget>
+          </item>
+          <item>
            <layout class="QHBoxLayout">
             <item>
              <spacer>
@@ -218,15 +228,15 @@
              </spacer>
             </item>
             <item>
-             <widget class="QCheckBox" name="pythonDedentExceptPy24CheckBox">
+             <widget class="QCheckBox" name="pythonImportBraceTypeCheckBox">
               <property name="enabled">
                <bool>false</bool>
               </property>
               <property name="toolTip">
-               <string>Select to treat code as Python 2.4 code</string>
+               <string>Select to create import statements of the form 'from ... import (...)'</string>
               </property>
               <property name="text">
-               <string>Python 2.4 style 'try:' blocks</string>
+               <string>Generate '(...)' type import</string>
               </property>
              </widget>
             </item>
@@ -246,16 +256,6 @@
            </layout>
           </item>
           <item>
-           <widget class="QCheckBox" name="pythonInsertImportCheckBox">
-            <property name="toolTip">
-             <string>Select to insert the 'import' string</string>
-            </property>
-            <property name="text">
-             <string>Automatic insertion of the 'import' string on 'from xxx'</string>
-            </property>
-           </widget>
-          </item>
-          <item>
            <widget class="QCheckBox" name="pythonInsertSelfCheckBox">
             <property name="toolTip">
              <string>Select to insert the 'self' string when declaring a method</string>
@@ -349,10 +349,10 @@
           <item>
            <widget class="QCheckBox" name="rubyIndentBraceCheckBox">
             <property name="toolTip">
-             <string>Select to indent to the brace level after typing 'return'</string>
+             <string>Select to indent after typing 'return'</string>
             </property>
             <property name="text">
-             <string>After '(' indent to its level</string>
+             <string>Automatic indent after '('</string>
             </property>
            </widget>
           </item>
@@ -441,8 +441,8 @@
   <tabstop>pythonInsertQuoteCheckBox</tabstop>
   <tabstop>pythonDedentElseCheckBox</tabstop>
   <tabstop>pythonDedentExceptCheckBox</tabstop>
-  <tabstop>pythonDedentExceptPy24CheckBox</tabstop>
   <tabstop>pythonInsertImportCheckBox</tabstop>
+  <tabstop>pythonImportBraceTypeCheckBox</tabstop>
   <tabstop>pythonInsertSelfCheckBox</tabstop>
   <tabstop>pythonInsertBlankCheckBox</tabstop>
   <tabstop>pythonDedentDefCheckBox</tabstop>
@@ -464,12 +464,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>99</x>
-     <y>114</y>
+     <x>118</x>
+     <y>113</y>
     </hint>
     <hint type="destinationlabel">
-     <x>116</x>
-     <y>144</y>
+     <x>162</x>
+     <y>139</y>
     </hint>
    </hints>
   </connection>
@@ -480,8 +480,8 @@
    <slot>setChecked(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>196</x>
-     <y>114</y>
+     <x>215</x>
+     <y>113</y>
     </hint>
     <hint type="destinationlabel">
      <x>198</x>
@@ -490,18 +490,18 @@
    </hints>
   </connection>
   <connection>
-   <sender>pythonDedentExceptCheckBox</sender>
+   <sender>pythonInsertImportCheckBox</sender>
    <signal>toggled(bool)</signal>
-   <receiver>pythonDedentExceptPy24CheckBox</receiver>
+   <receiver>pythonImportBraceTypeCheckBox</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>69</x>
-     <y>279</y>
+     <x>82</x>
+     <y>271</y>
     </hint>
     <hint type="destinationlabel">
-     <x>80</x>
-     <y>305</y>
+     <x>92</x>
+     <y>297</y>
     </hint>
    </hints>
   </connection>