From: Juergen Spitzmueller <spitz@lyx.org>
Date: Wed, 26 Jun 2019 06:57:05 +0000 (+0200)
Subject: Improve encoding GUI string
X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=fce7bdedb6f147ece9d2371cc31b1886fee73d00;p=features.git

Improve encoding GUI string
---

diff --git a/lib/encodings b/lib/encodings
index 71aee7670c..ca47cf1822 100644
--- a/lib/encodings
+++ b/lib/encodings
@@ -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)
diff --git a/src/frontends/qt4/GuiDocument.cpp b/src/frontends/qt4/GuiDocument.cpp
index 008d074848..e890f8d020 100644
--- a/src/frontends/qt4/GuiDocument.cpp
+++ b/src/frontends/qt4/GuiDocument.cpp
@@ -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()