X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2Fqt_helpers.cpp;h=92a052048747837b018e33543298cf6052cf0550;hb=425d092204118ea6c24c28e85fdf03fcf2bb51a4;hp=fc9bf190e815b3bc00959513f2948390be0565de;hpb=ebcc4db6de8e0cac9a807936b3c998eac1bed573;p=lyx.git

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index fc9bf190e8..92a0520487 100644
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -4,7 +4,7 @@
  * 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.
@@ -25,6 +25,7 @@
 #include "Length.h"
 #include "TextClass.h"
 
+#include "support/convert.h"
 #include "support/debug.h"
 #include "support/filetools.h"
 #include "support/foreach.h"
@@ -39,6 +40,7 @@
 #include <QCheckBox>
 #include <QComboBox>
 #include <QLineEdit>
+#include <QLocale>
 #include <QPalette>
 #include <QSet>
 
@@ -57,12 +59,6 @@ using namespace lyx::support;
 
 namespace lyx {
 
-LyXErr & operator<<(LyXErr & err, QString const & str)
-{
-	return err << fromqstr(str);
-}
-
-
 FileName libFileSearch(QString const & dir, QString const & name,
 				QString const & ext)
 {
@@ -84,7 +80,7 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
 
 	Length::UNIT const unit = combo->currentLengthItem();
 
-	return Length(length.toDouble(), unit).asString();
+	return Length(length.trimmed().toDouble(), unit).asString();
 }
 
 
@@ -98,9 +94,16 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo)
 	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);
 }
 
 
@@ -108,7 +111,9 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
                      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()));
 }
 
 
@@ -129,13 +134,44 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
 }
 
 
-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);
 }
 
 
@@ -177,7 +213,7 @@ void rescanTexStyles()
 		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())));
 }
 
 
@@ -207,6 +243,27 @@ QStringList texFileList(QString const & filename)
 	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)
 {
@@ -504,6 +561,8 @@ QString guiName(string const & type, BufferParams const & bp)
 		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))