anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-29 05:01:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix the fix to the decimal separator problem with Qt5

Browse Source
This commit is contained in:
Juergen Spitzmueller 2013-07-27 11:18:16 +02:00
parent d14297b5d5
commit 138bb4d14f
1 changed files with 22 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -75,6 +75,23 @@ FileName imageLibFileSearch(QString & dir, QString const & name,
return fn; return fn;
} }
namespace {
double locstringToDouble(QString const str)
{
QLocale loc;
bool ok;
double res = loc.toDouble(str, &ok);
if (!ok) {
// Fall back to C
QLocale c(QLocale::C);
res = c.toDouble(str);
}
return res;
}
} // namespace anon
namespace frontend { namespace frontend {
@ -90,7 +107,7 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
Length::UNIT const unit = combo->currentLengthItem(); Length::UNIT const unit = combo->currentLengthItem();
return Length(length.trimmed().toDouble(), unit).asString(); return Length(locstringToDouble(length.trimmed()), unit).asString();
} }
@ -113,7 +130,7 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo)
} }
} }
return Length(length.trimmed().toDouble(), unit); return Length(locstringToDouble(length.trimmed()), unit);
} }
@ -163,23 +180,19 @@ double widgetToDouble(QLineEdit const * input)
if (text.isEmpty()) if (text.isEmpty())
return 0.0; return 0.0;
return text.trimmed().toDouble(); return locstringToDouble(text.trimmed());
} }
string widgetToDoubleStr(QLineEdit const * input) string widgetToDoubleStr(QLineEdit const * input)
{ {
QString const text = input->text(); return convert<string>(widgetToDouble(input));
if (text.isEmpty())
return string();
return convert<string>(text.trimmed().toDouble());
} }
void doubleToWidget(QLineEdit * input, double const & value, char f, int prec) void doubleToWidget(QLineEdit * input, double const & value, char f, int prec)
{ {
QLocale loc("C"); QLocale loc;
loc.setNumberOptions(QLocale::OmitGroupSeparator); loc.setNumberOptions(QLocale::OmitGroupSeparator);
input->setText(loc.toString(value, f, prec)); input->setText(loc.toString(value, f, prec));
} }