Further encoding GUI improvements

diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 0800829a1ce2a900da8ec153582b9b60295e6c8f..9e01c0c20af7b3b401141cdf8ec5206d4263822a 100644 (file)
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -963,7 +963,7 @@ GuiDocument::GuiDocument(GuiView & lv)
        langModule->encodingCO->addItem(qt_("ASCII"), toqstr("ascii"));
        langModule->encodingCO->addItem(qt_("Custom"), toqstr("custom"));
        // Always put the default encoding in the first position.
-       langModule->customEncodingCO->addItem(qt_("Language Default (no inputenc)"),
+       langModule->customEncodingCO->addItem(qt_("Class Default"),
                                              toqstr("auto-legacy-plain"));
        QMap<QString,QString> encodingmap;
        for (auto const & encvar : encodings) {

diff --git a/src/frontends/qt4/ui/LanguageUi.ui b/src/frontends/qt4/ui/LanguageUi.ui
index 66778df11a089f5ba2aa0f79c790eaea89ae1942..77d5496cfeb47cd4c6c7c733b93906a5ad018296 100644 (file)
--- a/src/frontends/qt4/ui/LanguageUi.ui
+++ b/src/frontends/qt4/ui/LanguageUi.ui
@@ -7,43 +7,61 @@
     <x>0</x>
     <y>0</y>
     <width>431</width>
-    <height>286</height>
+    <height>253</height>
    </rect>
   </property>
   <property name="windowTitle">
    <string/>
   </property>
-  <layout class="QGridLayout" name="gridLayout">
-   <item row="5" column="1">
-    <spacer>
-     <property name="orientation">
-      <enum>Qt::Vertical</enum>
-     </property>
-     <property name="sizeType">
-      <enum>QSizePolicy::Expanding</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>71</width>
-       <height>171</height>
-      </size>
-     </property>
-    </spacer>
-   </item>
-   <item row="4" column="3">
-    <spacer name="horizontalSpacer">
-     <property name="orientation">
-      <enum>Qt::Horizontal</enum>
-     </property>
-     <property name="sizeHint" stdset="0">
-      <size>
-       <width>38</width>
-       <height>20</height>
-      </size>
-     </property>
-    </spacer>
+  <layout class="QGridLayout" name="gridLayout_3">
+   <item row="0" column="0">
+    <layout class="QGridLayout" name="gridLayout_2">
+     <item row="0" column="0">
+      <widget class="QLabel" name="languageL">
+       <property name="text">
+        <string>&amp;Language:</string>
+       </property>
+       <property name="buddy">
+        <cstring>languageCO</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="languageCO">
+       <property name="maxVisibleItems">
+        <number>20</number>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
+      <widget class="QLabel" name="typeL">
+       <property name="text">
+        <string>&amp;Quote style:</string>
+       </property>
+       <property name="buddy">
+        <cstring>quoteStyleCO</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="1">
+      <widget class="QComboBox" name="quoteStyleCO"/>
+     </item>
+     <item row="2" column="0">
+      <layout class="QHBoxLayout" name="horizontalLayout"/>
+     </item>
+     <item row="2" column="1">
+      <widget class="QCheckBox" name="dynamicQuotesCB">
+       <property name="toolTip">
+        <string>Output quotation marks that automatically adapt to the style selected above. If this is not selected, the quotation marks will stick with the style they have been inserted with.</string>
+       </property>
+       <property name="text">
+        <string>Use d&amp;ynamic quotation marks</string>
+       </property>
+      </widget>
+     </item>
+    </layout>
    </item>
-   <item row="0" column="2">
+   <item row="0" column="1" colspan="2">
     <spacer>
      <property name="orientation">
       <enum>Qt::Horizontal</enum>
@@ -59,26 +77,42 @@
      </property>
     </spacer>
    </item>
-   <item row="0" column="1">
-    <widget class="QComboBox" name="languageCO">
-     <property name="maxVisibleItems">
-      <number>20</number>
-     </property>
-    </widget>
-   </item>
-   <item row="1" column="0">
-    <widget class="QLabel" name="typeL">
-     <property name="text">
-      <string>&amp;Quote style:</string>
-     </property>
-     <property name="buddy">
-      <cstring>quoteStyleCO</cstring>
-     </property>
-    </widget>
-   </item>
-   <item row="4" column="0" colspan="3">
-    <layout class="QHBoxLayout" name="horizontalLayout">
-     <item>
+   <item row="1" column="0" colspan="2">
+    <layout class="QGridLayout" name="gridLayout">
+     <item row="0" column="0">
+      <widget class="QLabel" name="encodingLA">
+       <property name="text">
+        <string>&amp;Encoding:</string>
+       </property>
+       <property name="buddy">
+        <cstring>encodingCO</cstring>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="1">
+      <widget class="QComboBox" name="encodingCO">
+       <property name="enabled">
+        <bool>true</bool>
+       </property>
+       <property name="toolTip">
+        <string>Here you might adjust the output encoding (used for LaTeX files)</string>
+       </property>
+       <property name="duplicatesEnabled">
+        <bool>false</bool>
+       </property>
+      </widget>
+     </item>
+     <item row="0" column="2">
+      <widget class="QComboBox" name="customEncodingCO">
+       <property name="enabled">
+        <bool>false</bool>
+       </property>
+       <property name="toolTip">
+        <string>If you selected a custom output encoding to the left, yo can specifiy it here</string>
+       </property>
+      </widget>
+     </item>
+     <item row="1" column="0">
       <widget class="QLabel" name="languagePackageLA">
        <property name="text">
         <string>Language pa&amp;ckage:</string>
@@ -88,14 +122,14 @@
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="1">
       <widget class="QComboBox" name="languagePackageCO">
        <property name="toolTip">
         <string>Select which language package LyX should use</string>
        </property>
       </widget>
      </item>
-     <item>
+     <item row="1" column="2">
       <widget class="QLineEdit" name="languagePackageLE">
        <property name="toolTip">
         <string>Enter the command to load the language package (default: \usepackage{babel})</string>
@@ -104,91 +138,34 @@
      </item>
     </layout>
    </item>
-   <item row="1" column="1">
-    <widget class="QComboBox" name="quoteStyleCO"/>
-   </item>
-   <item row="0" column="0">
-    <widget class="QLabel" name="languageL">
-     <property name="text">
-      <string>&amp;Language:</string>
+   <item row="1" column="2">
+    <spacer name="horizontalSpacer">
+     <property name="orientation">
+      <enum>Qt::Horizontal</enum>
      </property>
-     <property name="buddy">
-      <cstring>languageCO</cstring>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>38</width>
+       <height>20</height>
+      </size>
      </property>
-    </widget>
+    </spacer>
    </item>
-   <item row="3" column="0" colspan="3">
-    <widget class="QGroupBox" name="groupBox">
-     <property name="title">
-      <string>&amp;Encoding</string>
-     </property>
-     <property name="flat">
-      <bool>true</bool>
+   <item row="2" column="0">
+    <spacer>
+     <property name="orientation">
+      <enum>Qt::Vertical</enum>
      </property>
-     <layout class="QGridLayout">
-      <property name="leftMargin">
-       <number>9</number>
-      </property>
-      <property name="topMargin">
-       <number>9</number>
-      </property>
-      <property name="rightMargin">
-       <number>9</number>
-      </property>
-      <property name="bottomMargin">
-       <number>9</number>
-      </property>
-      <property name="spacing">
-       <number>6</number>
-      </property>
-      <item row="0" column="0">
-       <widget class="QComboBox" name="encodingCO">
-        <property name="enabled">
-         <bool>true</bool>
-        </property>
-        <property name="toolTip">
-         <string>Here you might adjust the output encoding (used for LaTeX files)</string>
-        </property>
-        <property name="duplicatesEnabled">
-         <bool>false</bool>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="1">
-       <widget class="QComboBox" name="customEncodingCO">
-        <property name="enabled">
-         <bool>false</bool>
-        </property>
-        <property name="toolTip">
-         <string>If you selected a custom output encoding to the left, yo can specifiy it here</string>
-        </property>
-       </widget>
-      </item>
-      <item row="0" column="2">
-       <spacer name="horizontalSpacer_2">
-        <property name="orientation">
-         <enum>Qt::Horizontal</enum>
-        </property>
-        <property name="sizeHint" stdset="0">
-         <size>
-          <width>40</width>
-          <height>20</height>
-         </size>
-        </property>
-       </spacer>
-      </item>
-     </layout>
-    </widget>
-   </item>
-   <item row="2" column="1">
-    <widget class="QCheckBox" name="dynamicQuotesCB">
-     <property name="toolTip">
-      <string>Output quotation marks that automatically adapt to the style selected above. If this is not selected, the quotation marks will stick with the style they have been inserted with.</string>
+     <property name="sizeType">
+      <enum>QSizePolicy::Expanding</enum>
      </property>
-     <property name="text">
-      <string>Use d&amp;ynamic quotation marks</string>
+     <property name="sizeHint" stdset="0">
+      <size>
+       <width>71</width>
+       <height>171</height>
+      </size>
      </property>
-    </widget>
+    </spacer>
    </item>
   </layout>
  </widget>