anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-22 13:18:28 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

GuiBox.cpp: fix bug introduced by [bec3f7bc/lyxgit]

Browse Source 
There were now 2 entries named "none" in backgroundcolorCO

- delete the fixmes; the LateX name is used as parameter to save unnecessary conversions for the LateX output; please ask me before adding fixmes
This commit is contained in:
Uwe Stöhr 2015-05-17 01:45:56 +02:00
parent 51e3b026b2
commit 8dd217c983
1 changed files with 1 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
src/frontends/qt4/GuiBox.cpp
View File

@ -242,7 +242,7 @@ void GuiBox::on_frameColorCO_currentIndexChanged(int index)
backgroundColorCO->removeItem(n); backgroundColorCO->removeItem(n);
} }
} else { } else {
if (backgroundColorCO->findData("none") == -1) if (backgroundColorCO->count() == color_codes_.count() - 1)
backgroundColorCO->insertItem(0, toqstr(translateIfPossible((lcolor.getGUIName(Color_none)))), backgroundColorCO->insertItem(0, toqstr(translateIfPossible((lcolor.getGUIName(Color_none)))),
toqstr(lcolor.getLaTeXName(Color_none))); toqstr(lcolor.getLaTeXName(Color_none)));
} }
@ -402,7 +402,6 @@ void GuiBox::paramsToDialog(Inset const * inset)
lengthToWidgets(shadowsizeED, shadowsizeUnitsLC, lengthToWidgets(shadowsizeED, shadowsizeUnitsLC,
(params.shadowsize).asString(), default_unit); (params.shadowsize).asString(), default_unit);
// set color // set color
// FIXME: Why use LaTeXName here, not LyXName? (spitz)
frameColorCO->setCurrentIndex(frameColorCO->findData(toqstr(params.framecolor))); frameColorCO->setCurrentIndex(frameColorCO->findData(toqstr(params.framecolor)));
backgroundColorCO->setCurrentIndex(backgroundColorCO->findData(toqstr(params.backgroundcolor))); backgroundColorCO->setCurrentIndex(backgroundColorCO->findData(toqstr(params.backgroundcolor)));
} }
@ -486,7 +485,6 @@ docstring GuiBox::dialogToParams() const
params.shadowsize = Length(widgetsToLength(shadowsizeED, shadowsizeUnitsLC)); params.shadowsize = Length(widgetsToLength(shadowsizeED, shadowsizeUnitsLC));
else else
params.shadowsize = Length("4pt"); params.shadowsize = Length("4pt");
// FIXME: Why use LaTeXName here, not LyXName? (spitz)
if (frameColorCO->isEnabled()) if (frameColorCO->isEnabled())
params.framecolor = params.framecolor =
fromqstr(frameColorCO->itemData(frameColorCO->currentIndex()).toString()); fromqstr(frameColorCO->itemData(frameColorCO->currentIndex()).toString());