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

Improve encoding GUI string

Browse Source
This commit is contained in:
Juergen Spitzmueller 2019-06-26 08:57:05 +02:00
parent 642b4acca1
commit 0a8294d426
2 changed files with 10 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
lib/encodings
View File

@ -239,7 +239,7 @@ End
# A plain utf8 encoding that does not use the inputenc package
# nor the LyX-added conversions in lib/unicodesymbols.
# Such an encoding is required for XeTeX and LuaTeX.
Encoding utf8-plain utf8-plain "Pass-Through" UTF-8 variable none
Encoding utf8-plain utf8-plain "Direct" UTF-8 variable none
End
# Pure 7bit ASCII encoding (partially hardcoded in LyX)

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

@ -978,9 +978,9 @@ GuiDocument::GuiDocument(GuiView & lv)
// basic Unicode encodings: keep order
const QStringList utf8_base_encodings = {"utf8", "utf8-plain", "utf8x"};
for (auto const & i : utf8_base_encodings) {
langModule->unicodeEncodingCO->addItem(
toqstr(encodings.fromLyXName(fromqstr(i))->guiName()), i);
for (auto const & i : utf8_base_encodings) {
langModule->unicodeEncodingCO->addItem(
toqstr(encodings.fromLyXName(fromqstr(i))->guiName()), i);
}
langModule->unicodeEncodingCO->setItemData(0,
"Standard Unicode support by the ``inputenc'' package.",
@ -1012,8 +1012,8 @@ GuiDocument::GuiDocument(GuiView & lv)
|| utf8_base_encodings.contains(toqstr(encvar.name())))
continue;
if (std::string(encvar.name()).find("utf8") == 0)
encodingmap_utf8.insert(toqstr(encvar.guiName()), toqstr(encvar.name()));
else
encodingmap_utf8.insert(toqstr(encvar.guiName()), toqstr(encvar.name()));
else
encodingmap.insert(toqstr(encvar.guiName()), toqstr(encvar.name()));
}
for (auto const & i : encodingmap_utf8.keys()) {
@ -2343,6 +2343,10 @@ void GuiDocument::encodingSwitched(int i)
langModule->unicodeEncodingCO->setVisible(i == EncodingSets::unicode);
langModule->autoEncodingCO->setVisible(i == EncodingSets::legacy);
langModule->customEncodingCO->setVisible(i == EncodingSets::custom);
if (tex_fonts)
langModule->unicodeEncodingCO->setItemText(1, qt_("Direct (No inputenc)"));
else
langModule->unicodeEncodingCO->setItemText(1, qt_("Direct (XeTeX/LuaTeX)"));
}
void GuiDocument::inputencodingToDialog()