commit d3fb82b2a01c6aeaa7272c8db56b8bdc7d800cbe
Author: Juergen Spitzmueller <[email protected]>
Date: Mon Jul 20 14:46:22 2026 +0200
Simplify
---
src/frontends/qt/GuiDocument.cpp | 150 +++++++++++++++------------------------
1 file changed, 58 insertions(+), 92 deletions(-)
diff --git a/src/frontends/qt/GuiDocument.cpp b/src/frontends/qt/GuiDocument.cpp
index eb920351c8..0da2865514 100644
--- a/src/frontends/qt/GuiDocument.cpp
+++ b/src/frontends/qt/GuiDocument.cpp
@@ -5281,123 +5281,89 @@ void GuiDocument::paramsToDialog()
QList<QTreeWidgetItem *> specialLangFontItems;
QList<QTreeWidgetItem *> specialScriptFontItems;
for (auto const & itt : bp_.special_fonts_roman) {
+ QTreeWidgetItem * item = new QTreeWidgetItem;
QString const scname = toqstr(itt.first);
- if (scname == scname.toLower()) {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->langFontsTW);
+ bool const is_language = scname == scname.toLower();
+ if (is_language) {
Language const * l = languages.getLanguage(itt.first);
if (l == nullptr)
continue;
item->setText(0, qt_(l->display()));
- item->setData(0, Qt::UserRole, scname);
- item->setText(1, qt_("Roman"));
- item->setData(1, Qt::UserRole, "rm");
- item->setText(2, toqstr(itt.second));
- // no scale here
- if (auto res =
bp_.special_fonts_roman_osf.find(itt.first); res !=
bp_.special_fonts_roman_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_roman_opts.find(itt.first); res !=
bp_.special_fonts_roman_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
- specialLangFontItems.append(item);
- } else {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->scriptFontsTW);
+ } else
item->setText(0, qt_(itt.first));
- item->setData(0, Qt::UserRole, toqstr(itt.first));
- item->setText(1, qt_("Roman"));
- item->setData(1, Qt::UserRole, "rm");
- item->setText(2, toqstr(itt.second));
- // no scale here
- if (auto res =
bp_.special_fonts_roman_osf.find(itt.first); res !=
bp_.special_fonts_roman_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_roman_opts.find(itt.first); res !=
bp_.special_fonts_roman_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
+ item->setData(0, Qt::UserRole, scname);
+ item->setText(1, qt_("Roman"));
+ item->setData(1, Qt::UserRole, "rm");
+ item->setText(2, toqstr(itt.second));
+ // no scale here
+ if (auto res = bp_.special_fonts_roman_osf.find(itt.first); res
!= bp_.special_fonts_roman_osf.end()
+ && res->second)
+ item->setCheckState(4, Qt::Checked);
+ if (auto res = bp_.special_fonts_roman_opts.find(itt.first);
res != bp_.special_fonts_roman_opts.end()
+ && !res->second.empty())
+ item->setText(5, toqstr(res->second));
+ if (is_language)
+ specialLangFontItems.append(item);
+ else
specialScriptFontItems.append(item);
- }
}
for (auto const & itt : bp_.special_fonts_sans) {
+ QTreeWidgetItem * item = new QTreeWidgetItem;
QString const scname = toqstr(itt.first);
- if (scname == scname.toLower()) {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->langFontsTW);
+ bool const is_language = scname == scname.toLower();
+ if (is_language) {
Language const * l = languages.getLanguage(itt.first);
if (l == nullptr)
continue;
item->setText(0, qt_(l->display()));
- item->setData(0, Qt::UserRole, scname);
- item->setText(1, qt_("Sans Serif"));
- item->setData(1, Qt::UserRole, "sf");
- item->setText(2, toqstr(itt.second));
- if (auto res =
bp_.special_fonts_sans_scale.find(itt.first); res !=
bp_.special_fonts_sans_scale.end()
- && res->second != 100)
- item->setText(3,
toqstr(convert<string>(res->second)));
- if (auto res =
bp_.special_fonts_sans_osf.find(itt.first); res !=
bp_.special_fonts_sans_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_sans_opts.find(itt.first); res !=
bp_.special_fonts_sans_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
- specialLangFontItems.append(item);
- } else {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->scriptFontsTW);
+ } else
item->setText(0, qt_(itt.first));
- item->setData(0, Qt::UserRole, toqstr(itt.first));
- item->setText(1, qt_("Sans Serif"));
- item->setData(1, Qt::UserRole, "sf");
- item->setText(2, toqstr(itt.second));
- if (auto res =
bp_.special_fonts_sans_scale.find(itt.first); res !=
bp_.special_fonts_sans_scale.end()
- && res->second != 100)
- item->setText(3,
toqstr(convert<string>(res->second)));
- if (auto res =
bp_.special_fonts_sans_osf.find(itt.first); res !=
bp_.special_fonts_sans_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_sans_opts.find(itt.first); res !=
bp_.special_fonts_sans_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
+ item->setData(0, Qt::UserRole, scname);
+ item->setText(1, qt_("Sans Serif"));
+ item->setData(1, Qt::UserRole, "sf");
+ item->setText(2, toqstr(itt.second));
+ if (auto res = bp_.special_fonts_sans_scale.find(itt.first);
res != bp_.special_fonts_sans_scale.end()
+ && res->second != 100)
+ item->setText(3, toqstr(convert<string>(res->second)));
+ if (auto res = bp_.special_fonts_sans_osf.find(itt.first); res
!= bp_.special_fonts_sans_osf.end()
+ && res->second)
+ item->setCheckState(4, Qt::Checked);
+ if (auto res = bp_.special_fonts_sans_opts.find(itt.first); res
!= bp_.special_fonts_sans_opts.end()
+ && !res->second.empty())
+ item->setText(5, toqstr(res->second));
+ if (is_language)
+ specialLangFontItems.append(item);
+ else
specialScriptFontItems.append(item);
- }
}
for (auto const & itt : bp_.special_fonts_typewriter) {
+ QTreeWidgetItem * item = new QTreeWidgetItem;
QString const scname = toqstr(itt.first);
- if (scname == scname.toLower()) {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->langFontsTW);
+ bool const is_language = scname == scname.toLower();
+ if (is_language) {
Language const * l = languages.getLanguage(itt.first);
if (l == nullptr)
continue;
item->setText(0, qt_(l->display()));
- item->setData(0, Qt::UserRole, scname);
- item->setText(1, qt_("Typewriter"));
- item->setData(1, Qt::UserRole, "sf");
- item->setText(2, toqstr(itt.second));
- if (auto res =
bp_.special_fonts_typewriter_scale.find(itt.first); res !=
bp_.special_fonts_typewriter_scale.end()
- && res->second != 100)
- item->setText(3,
toqstr(convert<string>(res->second)));
- if (auto res =
bp_.special_fonts_typewriter_osf.find(itt.first); res !=
bp_.special_fonts_typewriter_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_typewriter_opts.find(itt.first); res !=
bp_.special_fonts_typewriter_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
- specialLangFontItems.append(item);
- } else {
- QTreeWidgetItem * item = new
QTreeWidgetItem(fontSpecialModule->scriptFontsTW);
+ } else
item->setText(0, qt_(itt.first));
- item->setData(0, Qt::UserRole, toqstr(itt.first));
- item->setText(1, qt_("Typewriter"));
- item->setData(1, Qt::UserRole, "tt");
- item->setText(2, toqstr(itt.second));
- if (auto res =
bp_.special_fonts_typewriter_scale.find(itt.first); res !=
bp_.special_fonts_typewriter_scale.end()
- && res->second != 100)
- item->setText(3,
toqstr(convert<string>(res->second)));
- if (auto res =
bp_.special_fonts_typewriter_osf.find(itt.first); res !=
bp_.special_fonts_typewriter_osf.end()
- && res->second)
- item->setCheckState(4, Qt::Checked);
- if (auto res =
bp_.special_fonts_typewriter_opts.find(itt.first); res !=
bp_.special_fonts_typewriter_opts.end()
- && !res->second.empty())
- item->setText(5, toqstr(res->second));
+ item->setData(0, Qt::UserRole, scname);
+ item->setText(1, qt_("Typewriter"));
+ item->setData(1, Qt::UserRole, "sf");
+ item->setText(2, toqstr(itt.second));
+ if (auto res =
bp_.special_fonts_typewriter_scale.find(itt.first); res !=
bp_.special_fonts_typewriter_scale.end()
+ && res->second != 100)
+ item->setText(3, toqstr(convert<string>(res->second)));
+ if (auto res =
bp_.special_fonts_typewriter_osf.find(itt.first); res !=
bp_.special_fonts_typewriter_osf.end()
+ && res->second)
+ item->setCheckState(4, Qt::Checked);
+ if (auto res =
bp_.special_fonts_typewriter_opts.find(itt.first); res !=
bp_.special_fonts_typewriter_opts.end()
+ && !res->second.empty())
+ item->setText(5, toqstr(res->second));
+ if (is_language)
+ specialLangFontItems.append(item);
+ else
specialScriptFontItems.append(item);
- }
}
fontSpecialModule->langFontsTW->addTopLevelItems(specialLangFontItems);
fontSpecialModule->scriptFontsTW->addTopLevelItems(specialScriptFontItems);
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
