Mercurial Repositories > eric / file diff

--- a/Preferences/ConfigurationPages/ShellPage.ui	Sun Jul 09 19:42:44 2017 +0200
+++ b/Preferences/ConfigurationPages/ShellPage.ui	Sun Jul 09 19:44:33 2017 +0200
@@ -86,59 +86,71 @@
     </layout>
    </item>
    <item>
-    <layout class="QHBoxLayout">
-     <item>
-      <widget class="QLabel" name="textLabel1_20">
-       <property name="text">
-        <string>max. History Entries:</string>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <widget class="QSpinBox" name="shellHistorySpinBox">
-       <property name="toolTip">
-        <string>Enter the number of history entries allowed</string>
-       </property>
-       <property name="minimum">
-        <number>10</number>
-       </property>
-       <property name="maximum">
-        <number>1000</number>
-       </property>
-       <property name="singleStep">
-        <number>10</number>
-       </property>
-       <property name="value">
-        <number>100</number>
-       </property>
-      </widget>
-     </item>
-     <item>
-      <spacer>
-       <property name="orientation">
-        <enum>Qt::Horizontal</enum>
-       </property>
-       <property name="sizeType">
-        <enum>QSizePolicy::Expanding</enum>
-       </property>
-       <property name="sizeHint" stdset="0">
-        <size>
-         <width>40</width>
-         <height>20</height>
-        </size>
-       </property>
-      </spacer>
-     </item>
-    </layout>
-   </item>
-   <item>
-    <widget class="QCheckBox" name="stdOutErrCheckBox">
-     <property name="toolTip">
-      <string>Select to show debuggee stdout and stderr</string>
+    <widget class="QGroupBox" name="groupBox">
+     <property name="title">
+      <string>History</string>
      </property>
-     <property name="text">
-      <string>Show stdout and stderr of debuggee</string>
-     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="textLabel1_20">
+        <property name="text">
+         <string>max. History Entries:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QSpinBox" name="shellHistorySpinBox">
+        <property name="toolTip">
+         <string>Enter the number of history entries allowed</string>
+        </property>
+        <property name="alignment">
+         <set>Qt::AlignRight|Qt::AlignTrailing|Qt::AlignVCenter</set>
+        </property>
+        <property name="minimum">
+         <number>10</number>
+        </property>
+        <property name="maximum">
+         <number>1000</number>
+        </property>
+        <property name="singleStep">
+         <number>10</number>
+        </property>
+        <property name="value">
+         <number>100</number>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeType">
+         <enum>QSizePolicy::Expanding</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>343</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
+      <item row="1" column="0">
+       <widget class="QLabel" name="label">
+        <property name="text">
+         <string>Navigation Style:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="1" colspan="2">
+       <widget class="QComboBox" name="shellHistoryStyleComboBox">
+        <property name="toolTip">
+         <string>Select the history style</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
     </widget>
    </item>
    <item>
@@ -219,6 +231,16 @@
     </widget>
    </item>
    <item>
+    <widget class="QCheckBox" name="stdOutErrCheckBox">
+     <property name="toolTip">
+      <string>Select to show debuggee stdout and stderr</string>
+     </property>
+     <property name="text">
+      <string>Show stdout and stderr of debuggee</string>
+     </property>
+    </widget>
+   </item>
+   <item>
     <spacer>
      <property name="orientation">
       <enum>Qt::Vertical</enum>
@@ -240,6 +262,11 @@
   <tabstop>shellWordWrapCheckBox</tabstop>
   <tabstop>shellCTEnabledCheckBox</tabstop>
   <tabstop>shellHistorySpinBox</tabstop>
+  <tabstop>shellHistoryStyleComboBox</tabstop>
+  <tabstop>monospacedFontButton</tabstop>
+  <tabstop>monospacedCheckBox</tabstop>
+  <tabstop>linenumbersFontButton</tabstop>
+  <tabstop>stdOutErrCheckBox</tabstop>
  </tabstops>
  <resources/>
  <connections/>