* Licence details can be found in the file COPYING.
*
* \author Dekel Tsur
- * \author Jürgen Spitzmüller
+ * \author Jürgen Spitzmüller
* \author Richard Heck
*
* Full author contact details are available in file CREDITS.
#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>
namespace lyx {
-LyXErr & operator<<(LyXErr & err, QString const & str)
-{
- return err << fromqstr(str);
-}
-
-
FileName libFileSearch(QString const & dir, QString const & name,
QString const & ext)
{
Length::UNIT const unit = combo->currentLengthItem();
- return Length(length.toDouble(), unit).asString();
+ return Length(length.trimmed().toDouble(), unit).asString();
}
if (isValidGlueLength(fromqstr(length)))
return Length(fromqstr(length));
- Length::UNIT const unit = unitFromString(fromqstr(combo->currentText()));
+ Length::UNIT unit = Length::UNIT_NONE;
+ QString const item = combo->currentText();
+ for (int i = 0; i < num_units; i++) {
+ if (qt_(lyx::unit_name_gui[i]) == item) {
+ unit = unitFromString(unit_name[i]);
+ break;
+ }
+ }
- 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()));
}
}
-void lengthAutoToWidgets(QLineEdit * input, LengthCombo * combo,
- Length const & len, Length::UNIT defaultUnit)
+void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
+ docstring const & len, Length::UNIT defaultUnit)
+{
+ lengthToWidgets(input, combo, to_utf8(len), defaultUnit);
+}
+
+
+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)
{
- if (len.value() == 0)
- lengthToWidgets(input, combo, "auto", defaultUnit);
- else
- lengthToWidgets(input, combo, len, defaultUnit);
+ 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);
}
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())));
}
return QList<QString>::fromSet(set);
}
+QString const externalLineEnding(docstring const & str)
+{
+#ifdef Q_WS_MACX
+ // The MAC clipboard uses \r for lineendings, and we use \n
+ return toqstr(subst(str, '\n', '\r'));
+#elif defined(Q_WS_WIN)
+ // Windows clipboard uses \r\n for lineendings, and we use \n
+ return toqstr(subst(str, from_ascii("\n"), from_ascii("\r\n")));
+#else
+ return toqstr(str);
+#endif
+}
+
+
+docstring const internalLineEnding(QString const & str)
+{
+ docstring const s = subst(qstring_to_ucs4(str),
+ from_ascii("\r\n"), from_ascii("\n"));
+ return subst(s, '\r', '\n');
+}
+
QString internalPath(const QString & str)
{
return qt_("List of Citations");
if (type == "label")
return qt_("Labels and References");
+ if (type == "branch")
+ return qt_("List of Branches");
+ if (type == "change")
+ return qt_("List of Changes");
FloatList const & floats = bp.documentClass().floats();
if (floats.typeExist(type))