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: enable color features also for non-English locales

Browse Source 
stupid me, I used a translatable string as box parameter. Therefore the feature only worked correctly with English locale. Now it works for every locale.
This commit is contained in:
Uwe Stöhr 2015-05-16 05:22:22 +02:00
parent 0140063c8e
commit bd80617cdb
1 changed files with 16 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -17,6 +17,7 @@
#include "GuiApplication.h" #include "GuiApplication.h"
#include "ColorCache.h" #include "ColorCache.h"
#include "ColorSet.h"
#include "LengthCombo.h" #include "LengthCombo.h"
#include "Length.h" #include "Length.h"
#include "qt_helpers.h" #include "qt_helpers.h"
@ -230,7 +231,7 @@ void GuiBox::on_typeCO_activated(int index)
} }
// assure that the frame color is black for frameless boxes to // assure that the frame color is black for frameless boxes to
// provide the color "none" // provide the color "none"
if (frameless && frameColorCO->currentText() != qt_("black")) if (frameless && frameColorCO->currentIndex() != 0)
frameColorCO->setCurrentIndex(0); frameColorCO->setCurrentIndex(0);
changed(); changed();
} }
@ -238,14 +239,16 @@ void GuiBox::on_typeCO_activated(int index)
void GuiBox::on_frameColorCO_currentIndexChanged(int /* index */) void GuiBox::on_frameColorCO_currentIndexChanged(int /* index */)
{ {
// if there is a special frme color the background canot be uncolored // if there is a non-black frame color the background canot be uncolored
if (frameColorCO->currentText() != qt_("black")) { // therefore remove the entry "none" in this case
if (backgroundColorCO->currentText() == qt_("none")) if (frameColorCO->currentIndex() != 0) {
backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_("white"))); if (backgroundColorCO->count() == color.count()) {
if (backgroundColorCO->itemText(0) == qt_("none")) if (backgroundColorCO->currentIndex() == 0)
backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_("white")));
backgroundColorCO->removeItem(0); backgroundColorCO->removeItem(0);
}
} else { } else {
if (backgroundColorCO->itemText(0) != qt_("none")) if (backgroundColorCO->count() == color.count() - 1)
backgroundColorCO->insertItem(0, qt_("none")); backgroundColorCO->insertItem(0, qt_("none"));
} }
changed(); changed();
@ -270,9 +273,6 @@ void GuiBox::initDialog()
// LaTeX's default for \shadowsize is 4 pt // LaTeX's default for \shadowsize is 4 pt
shadowsizeED->setText("4"); shadowsizeED->setText("4");
shadowsizeUnitsLC->setCurrentItem(Length::PT); shadowsizeUnitsLC->setCurrentItem(Length::PT);
// the default color is black and none
frameColorCO->setCurrentIndex(findPos2nd(color, qt_("black")) - 1);
backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_("none")));
} }
@ -408,7 +408,8 @@ void GuiBox::paramsToDialog(Inset const * inset)
(params.shadowsize).asString(), default_unit); (params.shadowsize).asString(), default_unit);
// set color // set color
frameColorCO->setCurrentIndex(findPos2nd(color, qt_(params.framecolor)) - 1); frameColorCO->setCurrentIndex(findPos2nd(color, qt_(params.framecolor)) - 1);
if (frameColorCO->currentText() != qt_("black")) // only if the framecolor is black the backgroundcolor has the entry "none"
if (frameColorCO->currentIndex() != 0)
backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_(params.backgroundcolor)) - 1); backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_(params.backgroundcolor)) - 1);
else else
backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_(params.backgroundcolor))); backgroundColorCO->setCurrentIndex(findPos2nd(color, qt_(params.backgroundcolor)));
@ -494,15 +495,15 @@ docstring GuiBox::dialogToParams() const
else else
params.shadowsize = Length("4pt"); params.shadowsize = Length("4pt");
if (frameColorCO->isEnabled()) if (frameColorCO->isEnabled())
params.framecolor = fromqstr(color[frameColorCO->currentIndex() + 1].first); params.framecolor = lcolor.getLaTeXName(color[frameColorCO->currentIndex() + 1].second);
else else
params.framecolor = "black"; params.framecolor = "black";
if (backgroundColorCO->isEnabled()) { if (backgroundColorCO->isEnabled()) {
// only if the framecolor is black the backgroundcolor has the entry "none" // only if the framecolor is black the backgroundcolor has the entry "none"
if (frameColorCO->currentText() != qt_("black")) if (frameColorCO->currentIndex() != 0)
params.backgroundcolor = fromqstr(color[backgroundColorCO->currentIndex() + 1].first); params.backgroundcolor = lcolor.getLaTeXName(color[backgroundColorCO->currentIndex() + 1].second);
else else
params.backgroundcolor = fromqstr(color[backgroundColorCO->currentIndex()].first); params.backgroundcolor = lcolor.getLaTeXName(color[backgroundColorCO->currentIndex()].second);
} else } else
params.backgroundcolor = "none"; params.backgroundcolor = "none";