Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/EditorStylesPage.ui	Mon Dec 10 18:40:10 2012 +0100
+++ b/Preferences/ConfigurationPages/EditorStylesPage.ui	Mon Dec 10 20:15:52 2012 +0100
@@ -7,10 +7,10 @@
     <x>0</x>
     <y>0</y>
     <width>587</width>
-    <height>1874</height>
+    <height>1913</height>
    </rect>
   </property>
-  <layout class="QVBoxLayout" name="verticalLayout_4">
+  <layout class="QVBoxLayout" name="verticalLayout_5">
    <item>
     <widget class="QLabel" name="headerLabel">
      <property name="text">
@@ -900,30 +900,58 @@
      <property name="title">
       <string>End of Line</string>
      </property>
-     <layout class="QVBoxLayout" name="_10">
+     <layout class="QVBoxLayout" name="verticalLayout_4">
+      <item>
+       <widget class="QCheckBox" name="eolCheckBox">
+        <property name="toolTip">
+         <string>Select whether end of line shall be shown</string>
+        </property>
+        <property name="text">
+         <string>Show End of Line</string>
+        </property>
+       </widget>
+      </item>
       <item>
-       <layout class="QGridLayout" name="_11">
-        <item row="0" column="0">
-         <widget class="QCheckBox" name="eolCheckBox">
-          <property name="toolTip">
-           <string>Select whether end of line shall be shown</string>
-          </property>
-          <property name="text">
-           <string>Show End of Line</string>
-          </property>
-         </widget>
-        </item>
-        <item row="0" column="1">
-         <widget class="QCheckBox" name="wrapLongLinesCheckBox">
-          <property name="toolTip">
-           <string>Select, whether long lines should be wrapped</string>
-          </property>
-          <property name="text">
-           <string>Wrap long lines</string>
-          </property>
-         </widget>
-        </item>
-       </layout>
+       <widget class="QGroupBox" name="wrapLongLinesGroup">
+        <property name="toolTip">
+         <string/>
+        </property>
+        <property name="title">
+         <string>Wrap long lines</string>
+        </property>
+        <property name="checkable">
+         <bool>false</bool>
+        </property>
+        <layout class="QHBoxLayout" name="horizontalLayout_4">
+         <item>
+          <widget class="QLabel" name="textLabel1_15">
+           <property name="text">
+            <string>Mode:</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QComboBox" name="wrapModeComboBox">
+           <property name="toolTip">
+            <string>Select the wrap mode for long lines</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <spacer name="horizontalSpacer_2">
+           <property name="orientation">
+            <enum>Qt::Horizontal</enum>
+           </property>
+           <property name="sizeHint" stdset="0">
+            <size>
+             <width>400</width>
+             <height>20</height>
+            </size>
+           </property>
+          </spacer>
+         </item>
+        </layout>
+       </widget>
       </item>
       <item>
        <widget class="QGroupBox" name="groupBox_9">
@@ -1546,7 +1574,7 @@
   <tabstop>nonmatchingBracesButton</tabstop>
   <tabstop>nonmatchingBracesBackButton</tabstop>
   <tabstop>eolCheckBox</tabstop>
-  <tabstop>wrapLongLinesCheckBox</tabstop>
+  <tabstop>wrapModeComboBox</tabstop>
   <tabstop>edgeModeCombo</tabstop>
   <tabstop>edgeLineColumnSlider</tabstop>
   <tabstop>edgeBackgroundColorButton</tabstop>