* fix spelling in comments to please John.

[lyx.git] / src / frontends / qt4 / qt_helpers.cpp

diff --git a/src/frontends/qt4/qt_helpers.cpp b/src/frontends/qt4/qt_helpers.cpp
index ff64a08f52fdd70c05364f8574882fe3e19aab1a..92a052048747837b018e33543298cf6052cf0550 100644 (file)
--- 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>
 
@@ -78,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();
 }
 
 
@@ -92,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);
 }
 
 
@@ -102,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()));
 }
 
 
@@ -123,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)
+{
+       QLocale loc;
+       loc.setNumberOptions(QLocale::OmitGroupSeparator);
+       input->setText(loc.toString(value, f, prec));
+}
+
+
+void doubleToWidget(QLineEdit * input, string const & value, char f, int prec)
 {
-       if (len.value() == 0)
-               lengthToWidgets(input, combo, "auto", defaultUnit);
-       else
-               lengthToWidgets(input, combo, len, defaultUnit);
+       doubleToWidget(input, convert<double>(value), f, prec);
 }
 
 
@@ -171,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())));
 }