X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fui%2FPrefLanguageUi.ui;h=1027e7faceda166e2fb7c5d9e748d1ddae438cb8;hb=a4a610221ae62897b792ef2e5fb9bb6f65e7b1df;hp=9372f5080ed823fd95086ccd58c71016c58c36c3;hpb=89bdacdeec1f0729cdd82004594dc404aa6e2eeb;p=lyx.git

diff --git a/src/frontends/qt4/ui/PrefLanguageUi.ui b/src/frontends/qt4/ui/PrefLanguageUi.ui
index 9372f5080e..1027e7face 100644
--- a/src/frontends/qt4/ui/PrefLanguageUi.ui
+++ b/src/frontends/qt4/ui/PrefLanguageUi.ui
@@ -1,254 +1,299 @@
-<ui version="4.0" >
+<ui version="4.0">
  <class>PrefLanguageUi</class>
- <widget class="QWidget" name="PrefLanguageUi" >
-  <property name="geometry" >
+ <widget class="QWidget" name="PrefLanguageUi">
+  <property name="geometry">
    <rect>
     <x>0</x>
     <y>0</y>
-    <width>326</width>
-    <height>411</height>
+    <width>475</width>
+    <height>362</height>
    </rect>
   </property>
-  <property name="windowTitle" >
+  <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" >
-   <property name="margin" >
-    <number>9</number>
-   </property>
-   <property name="spacing" >
-    <number>6</number>
-   </property>
-   <item row="0" column="0" colspan="2" >
-    <widget class="QLabel" name="uiLanguageLA" >
-     <property name="text" >
+  <layout class="QGridLayout" name="gridLayout_2">
+   <item row="0" column="0">
+    <widget class="QLabel" name="uiLanguageLA">
+     <property name="text">
       <string>User &amp;interface language:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>uiLanguageCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="0" column="2" >
-    <widget class="QComboBox" name="uiLanguageCO" >
-     <property name="toolTip" >
+   <item row="0" column="1">
+    <widget class="QComboBox" name="uiLanguageCO">
+     <property name="toolTip">
       <string>Select the language of the user interface (menus, dialogs, etc.)</string>
      </property>
-     <property name="maxVisibleItems" >
+     <property name="maxVisibleItems">
       <number>20</number>
      </property>
     </widget>
    </item>
-   <item row="1" column="0" colspan="2" >
-    <widget class="QLabel" name="languagePackageLA" >
-     <property name="text" >
-      <string>Language pac&amp;kage:</string>
+   <item row="1" column="0">
+    <widget class="QLabel" name="languagePackageLA">
+     <property name="text">
+      <string>Language &amp;package:</string>
      </property>
-     <property name="buddy" >
-      <cstring>languagePackageED</cstring>
+     <property name="buddy">
+      <cstring>languagePackageCO</cstring>
      </property>
     </widget>
    </item>
-   <item row="1" column="2" >
-    <widget class="QLineEdit" name="languagePackageED" >
-     <property name="toolTip" >
-      <string>Enter the command to load the language package (default: babel)</string>
-     </property>
-    </widget>
+   <item row="1" column="1" colspan="2">
+    <layout class="QHBoxLayout" name="horizontalLayout">
+     <item>
+      <widget class="QComboBox" name="languagePackageCO">
+       <property name="toolTip">
+        <string>Select which language package LyX should use</string>
+       </property>
+       <item>
+        <property name="text">
+         <string>Automatic</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Always Babel</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>Custom</string>
+        </property>
+       </item>
+       <item>
+        <property name="text">
+         <string>None[[language package]]</string>
+        </property>
+       </item>
+      </widget>
+     </item>
+     <item>
+      <widget class="QLineEdit" name="languagePackageED">
+       <property name="toolTip">
+        <string>Enter the command to load the language package (default: \usepackage{babel})</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="2" column="0" colspan="2" >
-    <widget class="QLabel" name="startCommandLA" >
-     <property name="text" >
+   <item row="2" column="0">
+    <widget class="QLabel" name="startCommandLA">
+     <property name="text">
       <string>Command s&amp;tart:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>startCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="2" column="2" >
-    <widget class="QLineEdit" name="startCommandED" >
-     <property name="toolTip" >
+   <item row="2" column="1">
+    <widget class="QLineEdit" name="startCommandED">
+     <property name="toolTip">
       <string>The LaTeX command that starts a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="3" column="0" colspan="2" >
-    <widget class="QLabel" name="endCommandLA" >
-     <property name="text" >
+   <item row="2" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
+     </property>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>102</width>
+       <height>20</height>
+      </size>
+     </property>
+    </spacer>
+   </item>
+   <item row="3" column="0">
+    <widget class="QLabel" name="endCommandLA">
+     <property name="text">
       <string>Command e&amp;nd:</string>
      </property>
-     <property name="buddy" >
+     <property name="buddy">
       <cstring>endCommandED</cstring>
      </property>
     </widget>
    </item>
-   <item row="3" column="2" >
-    <widget class="QLineEdit" name="endCommandED" >
-     <property name="toolTip" >
+   <item row="3" column="1">
+    <widget class="QLineEdit" name="endCommandED">
+     <property name="toolTip">
       <string>The LaTeX command that ends a switch to a foreign language</string>
      </property>
     </widget>
    </item>
-   <item row="4" column="0" colspan="3" >
-    <widget class="QCheckBox" name="useBabelCB" >
-     <property name="toolTip" >
-      <string>Use the babel package for multilingual support</string>
+   <item row="4" column="0">
+    <widget class="QLabel" name="decimalPointL">
+     <property name="text">
+      <string>Default Decimal &amp;Separator:</string>
+     </property>
+     <property name="buddy">
+      <cstring>defaultDecimalPointLE</cstring>
+     </property>
+    </widget>
+   </item>
+   <item row="4" column="1">
+    <widget class="QLineEdit" name="defaultDecimalPointLE">
+     <property name="maximumSize">
+      <size>
+       <width>20</width>
+       <height>16777215</height>
+      </size>
+     </property>
+     <property name="inputMask">
+      <string/>
      </property>
-     <property name="text" >
-      <string>&amp;Use babel</string>
+     <property name="alignment">
+      <set>Qt::AlignCenter</set>
      </property>
     </widget>
    </item>
-   <item row="5" column="0" colspan="3" >
-    <widget class="QCheckBox" name="globalCB" >
-     <property name="toolTip" >
+    <item row="5" column="0">
+      <widget class="QLabel" name="defaultLengthUnitLA">
+        <property name="text">
+          <string>Default length &amp;unit:</string>
+        </property>
+        <property name="buddy">
+          <cstring>defaultLengthUnitCO</cstring>
+        </property>
+      </widget>
+    </item>
+    <item row="5" column="1">
+      <widget class="QComboBox" name="defaultLengthUnitCO" />
+    </item>
+    <item row="6" column="0" colspan="2">
+    <widget class="QCheckBox" name="globalCB">
+     <property name="toolTip">
       <string>Check to pass the language globally (to the document class), not locally (to the language package)</string>
      </property>
-     <property name="text" >
-      <string>&amp;Global</string>
+     <property name="text">
+      <string>Set languages &amp;globally</string>
      </property>
     </widget>
    </item>
-   <item row="6" column="0" colspan="3" >
-    <widget class="QCheckBox" name="autoBeginCB" >
-     <property name="toolTip" >
+   <item row="7" column="0">
+    <widget class="QCheckBox" name="autoBeginCB">
+     <property name="toolTip">
       <string>If checked, the document language is not explicitly set by a language switch command</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Auto &amp;begin</string>
      </property>
     </widget>
    </item>
-   <item row="7" column="0" colspan="3" >
-    <widget class="QCheckBox" name="autoEndCB" >
-     <property name="toolTip" >
+   <item row="8" column="0">
+    <widget class="QCheckBox" name="autoEndCB">
+     <property name="toolTip">
       <string>If checked, the document language is not explicitly closed by a language switch command</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Auto &amp;end</string>
      </property>
     </widget>
    </item>
-   <item row="8" column="0" colspan="3" >
-    <widget class="QCheckBox" name="markForeignCB" >
-     <property name="toolTip" >
+   <item row="9" column="0" colspan="2">
+    <widget class="QCheckBox" name="markForeignCB">
+     <property name="toolTip">
       <string>Check to highlight foreign languages visually in the work area</string>
      </property>
-     <property name="text" >
+     <property name="text">
       <string>Mark &amp;foreign languages</string>
      </property>
     </widget>
    </item>
-   <item row="9" column="0" >
-    <spacer>
-     <property name="orientation" >
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType" >
-      <enum>QSizePolicy::Fixed</enum>
-     </property>
-     <property name="sizeHint" >
-      <size>
-       <width>20</width>
-       <height>16</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="10" column="0" colspan="3" >
-    <widget class="QGroupBox" name="rtlGB2" >
-     <property name="toolTip" >
+   <item row="10" column="0" colspan="3">
+    <widget class="QGroupBox" name="rtlGB2">
+     <property name="toolTip">
       <string/>
      </property>
-     <property name="title" >
+     <property name="title">
       <string>Right-to-left language support</string>
      </property>
-     <property name="flat" >
+     <property name="flat">
       <bool>true</bool>
      </property>
-     <property name="checkable" >
+     <property name="checkable">
       <bool>false</bool>
      </property>
-     <layout class="QGridLayout" >
-      <property name="margin" >
-       <number>9</number>
-      </property>
-      <property name="spacing" >
-       <number>6</number>
-      </property>
-      <item row="0" column="0" >
-       <widget class="QCheckBox" name="rtlGB" >
-        <property name="toolTip" >
+     <layout class="QGridLayout" name="gridLayout">
+      <item row="0" column="0">
+       <widget class="QCheckBox" name="rtlGB">
+        <property name="toolTip">
          <string>Select to enable support of right-to-left languages (e.g. Hebrew, Arabic).</string>
         </property>
-        <property name="text" >
-         <string>Enable RTL su&amp;pport</string>
+        <property name="text">
+         <string>Enable &amp;RTL support</string>
         </property>
        </widget>
       </item>
-      <item row="1" column="1" >
-       <spacer>
-        <property name="orientation" >
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" >
-         <size>
-          <width>101</width>
-          <height>20</height>
-         </size>
+      <item row="1" column="0">
+       <layout class="QHBoxLayout">
+        <property name="spacing">
+         <number>6</number>
         </property>
-       </spacer>
-      </item>
-      <item row="1" column="0" >
-       <layout class="QHBoxLayout" >
-        <property name="margin" >
+        <property name="margin">
          <number>0</number>
         </property>
-        <property name="spacing" >
-         <number>6</number>
-        </property>
         <item>
-         <widget class="QLabel" name="cursorMovementLA" >
-          <property name="text" >
+         <widget class="QLabel" name="cursorMovementLA">
+          <property name="text">
            <string>Cursor movement:</string>
           </property>
-          <property name="scaledContents" >
+          <property name="scaledContents">
            <bool>false</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="logicalCursorRB" >
-          <property name="text" >
+         <widget class="QRadioButton" name="logicalCursorRB">
+          <property name="text">
            <string>&amp;Logical</string>
           </property>
-          <property name="checked" >
+          <property name="checked">
            <bool>true</bool>
           </property>
          </widget>
         </item>
         <item>
-         <widget class="QRadioButton" name="visualCursorRB" >
-          <property name="text" >
+         <widget class="QRadioButton" name="visualCursorRB">
+          <property name="text">
            <string>&amp;Visual</string>
           </property>
          </widget>
         </item>
        </layout>
       </item>
+      <item row="1" column="1">
+       <spacer>
+        <property name="orientation">
+         <enum>Qt::Horizontal</enum>
+        </property>
+        <property name="sizeHint" stdset="0">
+         <size>
+          <width>101</width>
+          <height>20</height>
+         </size>
+        </property>
+       </spacer>
+      </item>
      </layout>
     </widget>
    </item>
-   <item row="11" column="1" >
+   <item row="11" column="0">
     <spacer>
-     <property name="orientation" >
+     <property name="orientation">
       <enum>Qt::Vertical</enum>
      </property>
-     <property name="sizeType" >
+     <property name="sizeType">
       <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="sizeHint" >
+     <property name="sizeHint" stdset="0">
       <size>
        <width>20</width>
        <height>20</height>
@@ -259,17 +304,22 @@
   </layout>
  </widget>
  <tabstops>
+  <tabstop>uiLanguageCO</tabstop>
+  <tabstop>languagePackageCO</tabstop>
   <tabstop>languagePackageED</tabstop>
   <tabstop>startCommandED</tabstop>
   <tabstop>endCommandED</tabstop>
-  <tabstop>useBabelCB</tabstop>
+  <tabstop>defaultDecimalPointLE</tabstop>
   <tabstop>globalCB</tabstop>
   <tabstop>autoBeginCB</tabstop>
   <tabstop>autoEndCB</tabstop>
   <tabstop>markForeignCB</tabstop>
+  <tabstop>rtlGB</tabstop>
+  <tabstop>logicalCursorRB</tabstop>
+  <tabstop>visualCursorRB</tabstop>
  </tabstops>
  <includes>
-  <include location="local" >qt_i18n.h</include>
+  <include location="local">qt_i18n.h</include>
  </includes>
  <resources/>
  <connections>
@@ -279,11 +329,11 @@
    <receiver>logicalCursorRB</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>162</x>
      <y>348</y>
     </hint>
@@ -295,11 +345,11 @@
    <receiver>visualCursorRB</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>228</x>
      <y>348</y>
     </hint>
@@ -311,11 +361,11 @@
    <receiver>cursorMovementLA</receiver>
    <slot>setEnabled(bool)</slot>
    <hints>
-    <hint type="sourcelabel" >
+    <hint type="sourcelabel">
      <x>139</x>
      <y>317</y>
     </hint>
-    <hint type="destinationlabel" >
+    <hint type="destinationlabel">
      <x>72</x>
      <y>348</y>
     </hint>