#include "Length.h"
#include "TextClass.h"
+#include "support/convert.h"
#include "support/debug.h"
#include "support/filetools.h"
#include "support/foreach.h"
#include <QCheckBox>
#include <QComboBox>
#include <QLineEdit>
+#include <QLocale>
#include <QPalette>
#include <QSet>
// for FileFilter.
// FIXME: Remove
-#include <boost/regex.hpp>
+#include "support/regex.h"
#include <boost/tokenizer.hpp>
Length::UNIT const unit = combo->currentLengthItem();
- return Length(length.toDouble(), unit).asString();
+ return Length(length.trimmed().toDouble(), unit).asString();
}
}
}
- return Length(length.toDouble(), unit);
+ return Length(length.trimmed().toDouble(), unit);
}
Length const & len, Length::UNIT /*defaultUnit*/)
{
combo->setCurrentItem(len.unit());
- input->setText(QString::number(Length(len).value()));
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(loc.toString(Length(len).value()));
}
}
+double widgetToDouble(QLineEdit const * input)
+{
+ QString const text = input->text();
+ if (text.isEmpty())
+ return 0.0;
+
+ return text.trimmed().toDouble();
+}
+
+
+string widgetToDoubleStr(QLineEdit const * input)
+{
+ QString const text = input->text();
+ if (text.isEmpty())
+ return string();
+
+ return convert<string>(text.trimmed().toDouble());
+}
+
+
+void doubleToWidget(QLineEdit * input, double const & value, char f, int prec)
+{
+ QLocale loc;
+ loc.setNumberOptions(QLocale::OmitGroupSeparator);
+ input->setText(loc.toString(value, f, prec));
+}
+
+
+void doubleToWidget(QLineEdit * input, string const & value, char f, int prec)
+{
+ doubleToWidget(input, convert<double>(value), f, prec);
+}
+
+
void setValid(QWidget * widget, bool valid)
{
if (valid) {
return;
// FIXME UNICODE
frontend::Alert::error(_("Could not update TeX information"),
- bformat(_("The script `%s' failed."), from_utf8(command.absFilename())));
+ bformat(_("The script `%1$s' failed."), from_utf8(command.absFileName())));
}
}
-QString onlyFilename(const QString & str)
+QString onlyFileName(const QString & str)
{
- return toqstr(support::onlyFilename(fromqstr(str)));
+ return toqstr(support::onlyFileName(fromqstr(str)));
}
QString makeAbsPath(QString const & relpath, QString const & base)
{
return toqstr(support::makeAbsPath(fromqstr(relpath),
- fromqstr(base)).absFilename());
+ fromqstr(base)).absFileName());
}
{
// Matches " *.{abc,def,ghi}", storing "*." as group 1 and
// "abc,def,ghi" as group 2.
- static boost::regex const glob_re(" *([^ {]*)\\{([^ }]+)\\}");
+ static lyx::regex const glob_re(" *([^ {]*)\\{([^ }]+)\\}");
// Matches "abc" and "abc,", storing "abc" as group 1.
- static boost::regex const block_re("([^,}]+),?");
+ static lyx::regex const block_re("([^,}]+),?");
string pattern;
string::const_iterator it = glob.begin();
string::const_iterator const end = glob.end();
while (true) {
- boost::match_results<string::const_iterator> what;
- if (!boost::regex_search(it, end, what, glob_re)) {
+ match_results<string::const_iterator> what;
+ if (!regex_search(it, end, what, glob_re)) {
// Ensure that no information is lost.
pattern += string(it, end);
break;
// Split the ','-separated chunks of tail so that
// $head{$chunk1,$chunk2} becomes "$head$chunk1 $head$chunk2".
string const fmt = " " + head + "$1";
- pattern += boost::regex_merge(tail, block_re, fmt);
+ pattern += regex_replace(tail, block_re, fmt);
// Increment the iterator to the end of the match.
it += distance(it, what[0].second);
// Split data such as "TeX documents (*.tex);;LyX Documents (*.lyx)"
// into individual filters.
- static boost::regex const separator_re(";;");
+ static lyx::regex const separator_re(";;");
string::const_iterator it = filter.begin();
string::const_iterator const end = filter.end();
while (true) {
- boost::match_results<string::const_iterator> what;
+ match_results<string::const_iterator> what;
- if (!boost::regex_search(it, end, what, separator_re)) {
+ if (!lyx::regex_search(it, end, what, separator_re)) {
parse_filter(string(it, end));
break;
}
{
// Matches "TeX documents (*.tex)",
// storing "TeX documents " as group 1 and "*.tex" as group 2.
- static boost::regex const filter_re("([^(]*)\\(([^)]+)\\) *$");
+ static lyx::regex const filter_re("([^(]*)\\(([^)]+)\\) *$");
- boost::match_results<string::const_iterator> what;
- if (!boost::regex_search(filter, what, filter_re)) {
+ match_results<string::const_iterator> what;
+ if (!lyx::regex_search(filter, what, filter_re)) {
// Just a glob, no description.
filters_.push_back(Filter(docstring(), trim(filter)));
} else {