Use QFontMetrics information for underlines (and friends) width and position

[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 fdd12a10ffd3da26f2457925db2082382a98d539..a395abf6b0ccdd40b433104181278367de14717b 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -21,13 +21,13 @@
 
 #include "BufferParams.h"
 #include "FloatList.h"
+#include "IndicesList.h"
 #include "Language.h"
 #include "Length.h"
 #include "TextClass.h"
 
 #include "support/convert.h"
 #include "support/debug.h"
-#include "support/filetools.h"
 #include "support/foreach.h"
 #include "support/gettext.h"
 #include "support/lstrings.h"
@@ -60,21 +60,38 @@ using namespace lyx::support;
 namespace lyx {
 
 FileName libFileSearch(QString const & dir, QString const & name,
-                               QString const & ext)
+                               QString const & ext, search_mode mode)
 {
-       return support::libFileSearch(fromqstr(dir), fromqstr(name), fromqstr(ext));
+       return support::libFileSearch(fromqstr(dir), fromqstr(name), fromqstr(ext), mode);
 }
 
 
 FileName imageLibFileSearch(QString & dir, QString const & name,
-                               QString const & ext)
+                               QString const & ext, search_mode mode)
 {
        string tmp = fromqstr(dir);
-       FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext));
+       FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext), mode);
        dir = toqstr(tmp);
        return fn;
 }
 
+namespace {
+
+double locstringToDouble(QString const & str)
+{
+       QLocale loc;
+       bool ok;
+       double res = loc.toDouble(str, &ok);
+       if (!ok) {
+               // Fall back to C
+               QLocale c(QLocale::C);
+               res = c.toDouble(str);
+       }
+       return res;
+}
+
+} // namespace anon
+
 
 namespace frontend {
 
@@ -90,7 +107,7 @@ string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
 
        Length::UNIT const unit = combo->currentLengthItem();
 
-       return Length(length.trimmed().toDouble(), unit).asString();
+       return Length(locstringToDouble(length.trimmed()), unit).asString();
 }
 
 
@@ -113,7 +130,7 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo)
                }
        }
 
-       return Length(length.trimmed().toDouble(), unit);
+       return Length(locstringToDouble(length.trimmed()), unit);
 }
 
 
@@ -128,7 +145,7 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
                combo->setCurrentItem(len.unit());
                QLocale loc;
                loc.setNumberOptions(QLocale::OmitGroupSeparator);
-               input->setText(loc.toString(Length(len).value()));
+               input->setText(formatLocFPNumber(Length(len).value()));
        }
 }
 
@@ -163,23 +180,19 @@ double widgetToDouble(QLineEdit const * input)
        if (text.isEmpty())
                return 0.0;
 
-       return text.trimmed().toDouble();
+       return locstringToDouble(text.trimmed());
 }
 
 
 string widgetToDoubleStr(QLineEdit const * input)
 {
-       QString const text = input->text();
-       if (text.isEmpty())
-               return string();
-
-       return convert<string>(text.trimmed().toDouble());
+       return convert<string>(widgetToDouble(input));
 }
 
 
 void doubleToWidget(QLineEdit * input, double const & value, char f, int prec)
 {
-       QLocale loc("C");
+       QLocale loc;
        loc.setNumberOptions(QLocale::OmitGroupSeparator);
        input->setText(loc.toString(value, f, prec));
 }
@@ -191,6 +204,15 @@ void doubleToWidget(QLineEdit * input, string const & value, char f, int prec)
 }
 
 
+QString formatLocFPNumber(double d)
+{
+       QString result = toqstr(formatFPNumber(d));
+       QLocale loc;
+       result.replace('.', loc.decimalPoint());
+       return result;
+}
+
+
 void setValid(QWidget * widget, bool valid)
 {
        if (valid) {
@@ -285,10 +307,10 @@ QStringList texFileList(QString const & filename)
 
 QString const externalLineEnding(docstring const & str)
 {
-#ifdef Q_WS_MACX
+#ifdef Q_OS_MAC
        // The MAC clipboard uses \r for lineendings, and we use \n
        return toqstr(subst(str, '\n', '\r'));
-#elif defined(Q_WS_WIN)
+#elif defined(Q_OS_WIN) || defined(Q_CYGWIN_WIN)
        // Windows clipboard uses \r\n for lineendings, and we use \n
        return toqstr(subst(str, from_ascii("\n"), from_ascii("\r\n")));
 #else
@@ -606,6 +628,15 @@ QString guiName(string const & type, BufferParams const & bp)
                return qt_("Branches");
        if (type == "change")
                return qt_("Changes");
+       if (prefixIs(type, "index:")) {
+               string const itype = split(type, ':');
+               IndicesList const & indiceslist = bp.indiceslist();
+               Index const * index = indiceslist.findShortcut(from_utf8(itype));
+               docstring indextype = _("unknown type!");
+               if (index)
+                       indextype = index->index();
+               return toqstr(bformat(_("Index Entries (%1$s)"), indextype));
+       }
 
        FloatList const & floats = bp.documentClass().floats();
        if (floats.typeExist(type))