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

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

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