From 0140063c8eb893defa8db94c8c4162fe66ba7f02 Mon Sep 17 00:00:00 2001 From: =?utf8?q?Uwe=20St=C3=B6hr?= Date: Sat, 16 May 2015 03:54:51 +0200 Subject: [PATCH] GuiBox.cpp: add a comment and a string conversion --- src/frontends/qt4/GuiBox.cpp | 5 +++-- 1 file changed, 3 insertions(+), 2 deletions(-) diff --git a/src/frontends/qt4/GuiBox.cpp b/src/frontends/qt4/GuiBox.cpp index 2deb45f9b0..1e0abd6259 100644 --- a/src/frontends/qt4/GuiBox.cpp +++ b/src/frontends/qt4/GuiBox.cpp @@ -110,7 +110,7 @@ void fillComboColor(QComboBox * combo, QList const & list, bool const is_none QColor color; // frameColorCO cannot be uncolored if (is_none) - combo->addItem("none"); + combo->addItem(qt_("none")); typename QList::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 -- 2.39.5