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

Allow entering localized lengths with unit (#11852)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2022-08-08 18:34:34 +02:00
parent 4296df9960
commit 1487b19803
3 changed files with 23 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
src/frontends/qt/Validator.cpp
View File

@ -72,8 +72,12 @@ QValidator::State LengthValidator::validate(QString & qtext, int &) const
GlueLength gl; GlueLength gl;
if (unsigned_ && gl.len().value() < 0) if (unsigned_ && gl.len().value() < 0)
return QValidator::Invalid; return QValidator::Invalid;
return (isValidGlueLength(text, &gl)) ? if (isValidGlueLength(text, &gl))
QValidator::Acceptable : QValidator::Intermediate; return QValidator::Acceptable;
// Also check for localized variant
if (isValidGlueLength(fromqstr(unlocString(qtext)), &gl))
return QValidator::Acceptable;
return QValidator::Intermediate;
} }
Length l; Length l;

14
src/frontends/qt/qt_helpers.cpp
View File

@ -99,6 +99,9 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
// Don't return unit-from-choice if the input(field) contains a unit // Don't return unit-from-choice if the input(field) contains a unit
if (isValidGlueLength(fromqstr(length))) if (isValidGlueLength(fromqstr(length)))
return fromqstr(length); return fromqstr(length);
// Also try with localized version
if (isValidGlueLength(fromqstr(unlocString(length))))
return fromqstr(unlocString(length));
Length::UNIT const unit = combo->currentLengthItem(); Length::UNIT const unit = combo->currentLengthItem();
@ -115,6 +118,9 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo)
// don't return unit-from-choice if the input(field) contains a unit // don't return unit-from-choice if the input(field) contains a unit
if (isValidGlueLength(fromqstr(length))) if (isValidGlueLength(fromqstr(length)))
return Length(fromqstr(length)); return Length(fromqstr(length));
// Also try with localized version
if (isValidGlueLength(fromqstr(unlocString(length))))
return Length(fromqstr(unlocString(length)));
Length::UNIT unit = Length::UNIT_NONE; Length::UNIT unit = Length::UNIT_NONE;
QString const item = combo->currentText(); QString const item = combo->currentText();
@ -208,6 +214,14 @@ QString formatLocFPNumber(double d)
} }
QString unlocString(QString const & str)
{
QLocale loc;
QString res = str;
return res.replace(loc.decimalPoint(), QString("."));
}
bool SortLocaleAware(QString const & lhs, QString const & rhs) bool SortLocaleAware(QString const & lhs, QString const & rhs)
{ {
return QString::localeAwareCompare(lhs, rhs) < 0; return QString::localeAwareCompare(lhs, rhs) < 0;

3
src/frontends/qt/qt_helpers.h
View File

@ -72,6 +72,9 @@ void doubleToWidget(QLineEdit * input, std::string const & value,
*/ */
QString formatLocFPNumber(double d); QString formatLocFPNumber(double d);
// Method to replace localized decimal separator by dot
QString unlocString(QString const & str);
/// Method to sort QStrings locale-aware (e.g. in combo widgets) /// Method to sort QStrings locale-aware (e.g. in combo widgets)
bool SortLocaleAware(QString const & lhs, QString const & rhs); bool SortLocaleAware(QString const & lhs, QString const & rhs);