LengthValidator::LengthValidator(QWidget * parent)
: QValidator(parent),
- no_bottom_(true), glue_length_(false)
+ no_bottom_(true), glue_length_(false), unsigned_(false)
{}
QValidator::State LengthValidator::validate(QString & qtext, int &) const
{
+ QLocale loc;
bool ok;
- qtext.trimmed().toDouble(&ok);
- if (qtext.isEmpty() || ok)
+ double d = loc.toDouble(qtext.trimmed(), &ok);
+ // QLocale::toDouble accepts something like "1."
+ // We don't.
+ bool dp = qtext.endsWith(loc.decimalPoint());
+ if (!ok) {
+ // Fall back to C
+ QLocale c(QLocale::C);
+ d = c.toDouble(qtext.trimmed(), &ok);
+ dp = qtext.endsWith(c.decimalPoint());
+ }
+
+ if (ok && unsigned_ && d < 0)
+ return QValidator::Invalid;
+
+ if (qtext.isEmpty() || (ok && !dp))
return QValidator::Acceptable;
string const text = fromqstr(qtext);
if (glue_length_) {
GlueLength gl;
+ if (unsigned_ && gl.len().value() < 0)
+ return QValidator::Invalid;
return (isValidGlueLength(text, &gl)) ?
QValidator::Acceptable : QValidator::Intermediate;
}
if (no_bottom_)
return QValidator::Acceptable;
+ if (unsigned_ && l.value() < 0)
+ return QValidator::Invalid;
+
return b_.inPixels(100) <= l.inPixels(100) ?
QValidator::Acceptable : QValidator::Intermediate;
}
{
LengthValidator * v = new LengthValidator(ed);
v->setBottom(Length());
+ v->setUnsigned(true);
return v;
}
{
LengthValidator * v = new LengthValidator(ed);
v->setBottom(GlueLength());
+ v->setUnsigned(true);
return v;
}
-LengthAutoValidator::LengthAutoValidator(QWidget * parent, QString const autotext)
+LengthAutoValidator::LengthAutoValidator(QWidget * parent, QString const & autotext)
: LengthValidator(parent),
autotext_(autotext)
{}
}
-LengthAutoValidator * unsignedLengthAutoValidator(QLineEdit * ed, QString const autotext)
+LengthAutoValidator * unsignedLengthAutoValidator(QLineEdit * ed, QString const & autotext)
{
LengthAutoValidator * v = new LengthAutoValidator(ed, autotext);
v->setBottom(Length());
+ v->setUnsigned(true);
return v;
}
-DoubleAutoValidator::DoubleAutoValidator(QWidget * parent, QString const autotext)
+DoubleAutoValidator::DoubleAutoValidator(QWidget * parent, QString const & autotext)
: QDoubleValidator(parent),
autotext_(autotext)
{}