anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-26 03:11:59 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Further encoding GUI improvements

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-05-11 12:16:52 +02:00
parent e020a5f341
commit 83a62a6d74
2 changed files with 112 additions and 135 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/frontends/qt4/GuiDocument.cpp
View File

@ -963,7 +963,7 @@ GuiDocument::GuiDocument(GuiView & lv)
langModule->encodingCO->addItem(qt_("ASCII"), toqstr("ascii")); langModule->encodingCO->addItem(qt_("ASCII"), toqstr("ascii"));
langModule->encodingCO->addItem(qt_("Custom"), toqstr("custom")); langModule->encodingCO->addItem(qt_("Custom"), toqstr("custom"));
// Always put the default encoding in the first position. // 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")); toqstr("auto-legacy-plain"));
QMap<QString,QString> encodingmap; QMap<QString,QString> encodingmap;
for (auto const & encvar : encodings) { for (auto const & encvar : encodings) {

197
src/frontends/qt4/ui/LanguageUi.ui
View File

@ -7,57 +7,24 @@
<x>0</x> <x>0</x>
<y>0</y> <y>0</y>
<width>431</width> <width>431</width>
<height>286</height> <height>253</height>
</rect> </rect>
</property> </property>
<property name="windowTitle"> <property name="windowTitle">
<string/> <string/>
</property> </property>
<layout class="QGridLayout" name="gridLayout"> <layout class="QGridLayout" name="gridLayout_3">
<item row="5" column="1"> <item row="0" column="0">
<spacer> <layout class="QGridLayout" name="gridLayout_2">
<property name="orientation"> <item row="0" column="0">
<enum>Qt::Vertical</enum> <widget class="QLabel" name="languageL">
<property name="text">
<string>&amp;Language:</string>
</property> </property>
<property name="sizeType"> <property name="buddy">
<enum>QSizePolicy::Expanding</enum> <cstring>languageCO</cstring>
</property> </property>
<property name="sizeHint" stdset="0"> </widget>
<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>
</item>
<item row="0" column="2">
<spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>23</height>
</size>
</property>
</spacer>
</item> </item>
<item row="0" column="1"> <item row="0" column="1">
<widget class="QComboBox" name="languageCO"> <widget class="QComboBox" name="languageCO">
@ -76,72 +43,53 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="4" column="0" colspan="3"> <item row="1" column="1">
<layout class="QHBoxLayout" name="horizontalLayout"> <widget class="QComboBox" name="quoteStyleCO"/>
<item> </item>
<widget class="QLabel" name="languagePackageLA"> <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"> <property name="text">
<string>Language pa&amp;ckage:</string> <string>Use d&amp;ynamic quotation marks</string>
</property>
<property name="buddy">
<cstring>languagePackageCO</cstring>
</property>
</widget>
</item>
<item>
<widget class="QComboBox" name="languagePackageCO">
<property name="toolTip">
<string>Select which language package LyX should use</string>
</property>
</widget>
</item>
<item>
<widget class="QLineEdit" name="languagePackageLE">
<property name="toolTip">
<string>Enter the command to load the language package (default: \usepackage{babel})</string>
</property> </property>
</widget> </widget>
</item> </item>
</layout> </layout>
</item> </item>
<item row="1" column="1"> <item row="0" column="1" colspan="2">
<widget class="QComboBox" name="quoteStyleCO"/> <spacer>
<property name="orientation">
<enum>Qt::Horizontal</enum>
</property>
<property name="sizeType">
<enum>QSizePolicy::MinimumExpanding</enum>
</property>
<property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>23</height>
</size>
</property>
</spacer>
</item> </item>
<item row="1" column="0" colspan="2">
<layout class="QGridLayout" name="gridLayout">
<item row="0" column="0"> <item row="0" column="0">
<widget class="QLabel" name="languageL"> <widget class="QLabel" name="encodingLA">
<property name="text"> <property name="text">
<string>&amp;Language:</string> <string>&amp;Encoding:</string>
</property> </property>
<property name="buddy"> <property name="buddy">
<cstring>languageCO</cstring> <cstring>encodingCO</cstring>
</property> </property>
</widget> </widget>
</item> </item>
<item row="3" column="0" colspan="3"> <item row="0" column="1">
<widget class="QGroupBox" name="groupBox">
<property name="title">
<string>&amp;Encoding</string>
</property>
<property name="flat">
<bool>true</bool>
</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"> <widget class="QComboBox" name="encodingCO">
<property name="enabled"> <property name="enabled">
<bool>true</bool> <bool>true</bool>
@ -154,7 +102,7 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="1"> <item row="0" column="2">
<widget class="QComboBox" name="customEncodingCO"> <widget class="QComboBox" name="customEncodingCO">
<property name="enabled"> <property name="enabled">
<bool>false</bool> <bool>false</bool>
@ -164,31 +112,60 @@
</property> </property>
</widget> </widget>
</item> </item>
<item row="0" column="2"> <item row="1" column="0">
<spacer name="horizontalSpacer_2"> <widget class="QLabel" name="languagePackageLA">
<property name="text">
<string>Language pa&amp;ckage:</string>
</property>
<property name="buddy">
<cstring>languagePackageCO</cstring>
</property>
</widget>
</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 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>
</property>
</widget>
</item>
</layout>
</item>
<item row="1" column="2">
<spacer name="horizontalSpacer">
<property name="orientation"> <property name="orientation">
<enum>Qt::Horizontal</enum> <enum>Qt::Horizontal</enum>
</property> </property>
<property name="sizeHint" stdset="0"> <property name="sizeHint" stdset="0">
<size> <size>
<width>40</width> <width>38</width>
<height>20</height> <height>20</height>
</size> </size>
</property> </property>
</spacer> </spacer>
</item> </item>
</layout> <item row="2" column="0">
</widget> <spacer>
</item> <property name="orientation">
<item row="2" column="1"> <enum>Qt::Vertical</enum>
<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>
<property name="text"> <property name="sizeType">
<string>Use d&amp;ynamic quotation marks</string> <enum>QSizePolicy::Expanding</enum>
</property> </property>
</widget> <property name="sizeHint" stdset="0">
<size>
<width>71</width>
<height>171</height>
</size>
</property>
</spacer>
</item> </item>
</layout> </layout>
</widget> </widget>