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 {
Length::UNIT const unit = combo->currentLengthItem();
- return Length(length.trimmed().toDouble(), unit).asString();
+ return Length(locstringToDouble(length.trimmed()), unit).asString();
}
}
}
- return Length(length.trimmed().toDouble(), unit);
+ return Length(locstringToDouble(length.trimmed()), unit);
}
void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
- Length const & len, Length::UNIT /*defaultUnit*/)
+ Length const & len, Length::UNIT /*defaultUnit*/)
{
- combo->setCurrentItem(len.unit());
- QLocale loc;
- loc.setNumberOptions(QLocale::OmitGroupSeparator);
- input->setText(loc.toString(Length(len).value()));
+ if (len.empty()) {
+ // no length (UNIT_NONE)
+ combo->setCurrentItem(Length::defaultUnit());
+ input->setText("");
+ } else {
+ combo->setCurrentItem(len.unit());
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(loc.toString(Length(len).value()));
+ }
}
QString const text = input->text();
if (text.isEmpty())
return 0.0;
-
- return text.trimmed().toDouble();
+
+ return locstringToDouble(text.trimmed());
}
string widgetToDoubleStr(QLineEdit const * input)
{
- QString const text = input->text();
- if (text.isEmpty())
- return string();
-
- return convert<string>(text.trimmed().toDouble());
+ return convert<string>(widgetToDouble(input));
}
}
+QString const qt_(QString const & qstr)
+{
+ return toqstr(_(fromqstr(qstr)));
+}
+
+
void rescanTexStyles(string const & arg)
{
// Run rescan in user lyx directory