Mercurial Repositories > eric / file diff

--- a/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui	Sun Feb 23 15:24:28 2014 +0100
+++ b/Plugins/VcsPlugins/vcsMercurial/ConfigurationPage/MercurialPage.ui	Sun Feb 23 19:20:43 2014 +0100
@@ -6,8 +6,8 @@
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>408</width>
-    <height>657</height>
+    <width>609</width>
+    <height>751</height>
    </rect>
   </property>
   <layout class="QVBoxLayout" name="verticalLayout_5">
@@ -32,6 +32,62 @@
     </widget>
    </item>
    <item>
+    <widget class="QGroupBox" name="groupBox_8">
+     <property name="title">
+      <string>Global Options</string>
+     </property>
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QLabel" name="label_4">
+        <property name="text">
+         <string>Encoding:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="1">
+       <widget class="QComboBox" name="encodingComboBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Select the encoding to be used by Mercurial</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="2">
+       <widget class="QLabel" name="label_5">
+        <property name="text">
+         <string>Encoding Mode:</string>
+        </property>
+       </widget>
+      </item>
+      <item row="0" column="3">
+       <widget class="QComboBox" name="encodingModeComboBox">
+        <property name="sizePolicy">
+         <sizepolicy hsizetype="Expanding" vsizetype="Fixed">
+          <horstretch>0</horstretch>
+          <verstretch>0</verstretch>
+         </sizepolicy>
+        </property>
+        <property name="toolTip">
+         <string>Select the encoding mode</string>
+        </property>
+       </widget>
+      </item>
+      <item row="1" column="0" colspan="2">
+       <widget class="QCheckBox" name="hiddenChangesetsCheckBox">
+        <property name="text">
+         <string>Consider hidden changesets</string>
+        </property>
+       </widget>
+      </item>
+     </layout>
+    </widget>
+   </item>
+   <item>
     <widget class="QGroupBox" name="groupBox">
      <property name="title">
       <string>Log</string>
@@ -261,6 +317,9 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>encodingComboBox</tabstop>
+  <tabstop>encodingModeComboBox</tabstop>
+  <tabstop>hiddenChangesetsCheckBox</tabstop>
   <tabstop>logSpinBox</tabstop>
   <tabstop>commitSpinBox</tabstop>
   <tabstop>logBrowserCheckBox</tabstop>