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

GuiBox.cpp: add a comment and a string conversion

Browse Source
This commit is contained in:
Uwe Stöhr 2015-05-16 03:54:51 +02:00
parent a49f24767a
commit 0140063c8e
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -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