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

Silence warning when unappropriate

Browse Source
This commit is contained in:
Juergen Spitzmueller 2023-02-12 14:33:27 +01:00
parent c0bca65635
commit ced6c591fb
3 changed files with 13 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/frontends/qt/CategorizedCombo.cpp
View File

@ -449,7 +449,7 @@ void CategorizedCombo::setIconSize(QSize size)
}
bool CategorizedCombo::set(QString const & item)
bool CategorizedCombo::set(QString const & item, bool const report_missing)
{
d->resetFilter();
@ -464,7 +464,8 @@ bool CategorizedCombo::set(QString const & item)
QList<QStandardItem *> r = d->model_->findItems(item, Qt::MatchExactly, 1);
if (r.empty()) {
LYXERR0("Trying to select non existent layout type " << item);
if (report_missing)
LYXERR0("Trying to select non existent layout type " << item);
return false;
}

2
src/frontends/qt/CategorizedCombo.h
View File

@ -38,7 +38,7 @@ public:
~CategorizedCombo();
/// select an item in the combobox. Returns false if item does not exist
bool set(QString const & cc);
bool set(QString const & cc, bool const report_missing = true);
/// Reset the combobox.
void reset();
/// Reset the combobox filter.

15
src/frontends/qt/GuiDocument.cpp
View File

@ -2474,9 +2474,12 @@ void GuiDocument::osFontsChanged(bool nontexfonts)
outputModule->defaultFormatCO->setCurrentIndex(index);
// try to restore fonts which were selected two toggles ago
fontModule->fontsRomanCO->set(fontModule->font_roman);
fontModule->fontsSansCO->set(fontModule->font_sans);
fontModule->fontsTypewriterCO->set(fontModule->font_typewriter);
if (!fontModule->font_roman.isEmpty())
fontModule->fontsRomanCO->set(fontModule->font_roman);
if (!fontModule->font_sans.isEmpty())
fontModule->fontsSansCO->set(fontModule->font_sans);
if (!fontModule->font_typewriter.isEmpty())
fontModule->fontsTypewriterCO->set(fontModule->font_typewriter);
index = fontModule->fontsMathCO->findData(fontModule->font_math);
if (index != -1)
fontModule->fontsMathCO->setCurrentIndex(index);
@ -4399,7 +4402,7 @@ void GuiDocument::paramsToDialog()
bp_.fontsize);
QString font = toqstr(bp_.fontsRoman());
bool foundfont = fontModule->fontsRomanCO->set(font);
bool foundfont = fontModule->fontsRomanCO->set(font, false);
if (!foundfont) {
fontModule->fontsRomanCO->addItemSort(font, font + qt_(" (not installed)"),
qt_("Uninstalled used fonts"),
@ -4410,7 +4413,7 @@ void GuiDocument::paramsToDialog()
fontModule->font_roman = toqstr(bp_.fonts_roman[!bp_.useNonTeXFonts]);
font = toqstr(bp_.fontsSans());
foundfont = fontModule->fontsSansCO->set(font);
foundfont = fontModule->fontsSansCO->set(font, false);
if (!foundfont ) {
fontModule->fontsSansCO->addItemSort(font, font + qt_(" (not installed)"),
qt_("Uninstalled used fonts"),
@ -4421,7 +4424,7 @@ void GuiDocument::paramsToDialog()
fontModule->font_sans = toqstr(bp_.fonts_sans[!bp_.useNonTeXFonts]);
font = toqstr(bp_.fontsTypewriter());
foundfont = fontModule->fontsTypewriterCO->set(font);
foundfont = fontModule->fontsTypewriterCO->set(font, false);
if (!foundfont) {
fontModule->fontsTypewriterCO->addItemSort(font, font + qt_(" (not installed)"),
qt_("Uninstalled used fonts"),