[LyX/master] GuiBox.cpp: add a comment and a string conversion

[Uwe Stöhr]

commit 0140063c8eb893defa8db94c8c4162fe66ba7f02
Author: Uwe Stöhr <uwesto...@lyx.org>
Date:   Sat May 16 03:54:51 2015 +0200

    GuiBox.cpp: add a comment and a string conversion

diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp
index 2deb45f..1e0abd6 100644
--- a/src/frontends/qt4/GuiBox.cpp
+++ b/src/frontends/qt4/GuiBox.cpp
@@ -110,7 +110,7 @@ void fillComboColor(QComboBox * combo, QList<T> const & 
list, bool const is_none
        QColor color;
        // frameColorCO cannot be uncolored
        if (is_none)
-               combo->addItem("none");
+               combo->addItem(qt_("none"));
        typename QList<T>::const_iterator cit = list.begin() + 1;
        for (; cit != list.end(); ++cit) {
                color = QColor(guiApp->colorCache().get(cit->second, false));
@@ -494,10 +494,11 @@ docstring GuiBox::dialogToParams() const
        else
                params.shadowsize = Length("4pt");
        if (frameColorCO->isEnabled())
-               params.framecolor = fromqstr( 
color[frameColorCO->currentIndex() + 1].first );
+               params.framecolor = fromqstr(color[frameColorCO->currentIndex() 
+ 1].first);
        else
                params.framecolor = "black";
        if (backgroundColorCO->isEnabled()) {
+               // only if the framecolor is black the backgroundcolor has the 
entry "none"
                if (frameColorCO->currentText() != qt_("black"))
                        params.backgroundcolor = 
fromqstr(color[backgroundColorCO->currentIndex() + 1].first);
                else