Fix the tab ordering of GuiDocument components.

[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 a13eb8c7fd7923aeb0d72cc883e946114a04d8a9..59a3d67fd2e224aa0fe25cf5f4f0d5bdc72fc7fd 100644 (file)
--- a/src/frontends/qt4/qt_helpers.cpp
+++ b/src/frontends/qt4/qt_helpers.cpp
@@ -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>
 
@@ -48,7 +50,7 @@
 
 // for FileFilter.
 // FIXME: Remove
-#include <boost/regex.hpp>
+#include "support/regex.h"
 #include <boost/tokenizer.hpp>
 
 
@@ -64,6 +66,16 @@ FileName libFileSearch(QString const & dir, QString const & name,
 }
 
 
+FileName imageLibFileSearch(QString & dir, QString const & name,
+                               QString const & ext)
+{
+       string tmp = fromqstr(dir);
+       FileName fn = support::imageLibFileSearch(tmp, fromqstr(name), fromqstr(ext));
+       dir = toqstr(tmp);
+       return fn;
+}
+
+
 namespace frontend {
 
 string widgetsToLength(QLineEdit const * input, LengthCombo const * combo)
@@ -78,7 +90,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();
 }
 
 
@@ -101,7 +113,7 @@ Length widgetsToLength(QLineEdit const * input, QComboBox const * combo)
                }
        }
 
-       return Length(length.toDouble(), unit);
+       return Length(length.trimmed().toDouble(), unit);
 }
 
 
@@ -109,7 +121,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()));
 }
 
 
@@ -137,6 +151,40 @@ void lengthToWidgets(QLineEdit * input, LengthCombo * combo,
 }
 
 
+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) {
@@ -175,7 +223,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())));
 }
 
 
@@ -233,9 +281,9 @@ QString internalPath(const QString & str)
 }
 
 
-QString onlyFilename(const QString & str)
+QString onlyFileName(const QString & str)
 {
-       return toqstr(support::onlyFilename(fromqstr(str)));
+       return toqstr(support::onlyFileName(fromqstr(str)));
 }
 
 
@@ -280,7 +328,7 @@ QString getExtension(QString const & name)
 QString makeAbsPath(QString const & relpath, QString const & base)
 {
        return toqstr(support::makeAbsPath(fromqstr(relpath),
-               fromqstr(base)).absFilename());
+               fromqstr(base)).absFileName());
 }
 
 
@@ -299,18 +347,19 @@ QString makeAbsPath(QString const & relpath, QString const & base)
 static string const convert_brace_glob(string const & glob)
 {
        // Matches " *.{abc,def,ghi}", storing "*." as group 1 and
-       // "abc,def,ghi" as group 2.
-       static boost::regex const glob_re(" *([^ {]*)\\{([^ }]+)\\}");
-       // Matches "abc" and "abc,", storing "abc" as group 1.
-       static boost::regex const block_re("([^,}]+),?");
+       // "abc,def,ghi" as group 2, while allowing spaces in group 2.
+       static lyx::regex const glob_re(" *([^ {]*)\\{([^}]+)\\}");
+       // Matches "abc" and "abc,", storing "abc" as group 1,
+       // while ignoring surrounding spaces.
+       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;
@@ -327,7 +376,7 @@ static string const convert_brace_glob(string const & glob)
                // 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);
@@ -375,7 +424,7 @@ QString Filter::toString() const
 {
        QString s;
 
-       bool const has_description = desc_.empty();
+       bool const has_description = !desc_.empty();
 
        if (has_description) {
                s += toqstr(desc_);
@@ -436,14 +485,14 @@ FileFilterList::FileFilterList(docstring const & qt_style_filter)
 
        // 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;
                }
@@ -460,12 +509,12 @@ FileFilterList::FileFilterList(docstring const & qt_style_filter)
 
 void FileFilterList::parse_filter(string const & filter)
 {
-       // Matches "TeX documents (*.tex)",
-       // storing "TeX documents " as group 1 and "*.tex" as group 2.
-       static boost::regex const filter_re("([^(]*)\\(([^)]+)\\) *$");
+       // Matches "TeX documents (plain) (*.tex)",
+       // storing "TeX documents (plain) " as group 1 and "*.tex" as group 2.
+       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 {
@@ -512,7 +561,7 @@ QString guiName(string const & type, BufferParams const & bp)
        if (type == "listing")
                return qt_("List of Listings");
        if (type == "index")
-               return qt_("List of Indexes");
+               return qt_("List of Index Entries");
        if (type == "marginalnote")
                return qt_("List of Marginal notes");
        if (type == "note")