]> git.lyx.org Git - lyx.git/blobdiff - src/frontends/qt4/qt_helpers.cpp
Amend f441590c
[lyx.git] / src / frontends / qt4 / qt_helpers.cpp
index eb495f56fd7d85a02056328e428969cbc576756d..c1294e56df2d4a869af0d390c5379e4f0fdb18e2 100644 (file)
@@ -145,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()));
        }
 }
 
@@ -204,6 +204,21 @@ 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;
+}
+
+
+bool ColorSorter(ColorCode lhs, ColorCode rhs)
+{
+       return compare_no_case(lcolor.getGUIName(lhs), lcolor.getGUIName(rhs)) < 0;
+}
+
+
 void setValid(QWidget * widget, bool valid)
 {
        if (valid) {
@@ -457,7 +472,6 @@ Filter::Filter(docstring const & description, string const & globs)
        string const expanded_globs = convert_brace_glob(globs);
 
        // Split into individual globs.
-       vector<string> matches;
        Tokenizer const tokens(expanded_globs, separator);
        globs_ = vector<string>(tokens.begin(), tokens.end());
 }
@@ -599,6 +613,8 @@ QString guiName(string const & type, BufferParams const & bp)
                return qt_("Graphics");
        if (type == "equation")
                return qt_("Equations");
+       if (type == "external")
+               return qt_("External material");
        if (type == "footnote")
                return qt_("Footnotes");
        if (type == "listing")
@@ -607,6 +623,8 @@ QString guiName(string const & type, BufferParams const & bp)
                return qt_("Index Entries");
        if (type == "marginalnote")
                return qt_("Marginal notes");
+       if (type == "math-macro")
+               return qt_("Math macros");
        if (type == "nomencl")
                return qt_("Nomenclature Entries");
        if (type == "note")
@@ -619,6 +637,8 @@ QString guiName(string const & type, BufferParams const & bp)
                return qt_("Branches");
        if (type == "change")
                return qt_("Changes");
+       if (type == "senseless")
+               return qt_("Senseless");
        if (prefixIs(type, "index:")) {
                string const itype = split(type, ':');
                IndicesList const & indiceslist = bp.indiceslist();