always have "All Files" as filter in the list

git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@8873 a592a061-630c-0410-9148-cb99ea01b6c8

diff --git a/src/support/globbing.C b/src/support/globbing.C
index b112db32ae0bd7174cddbd27f1a9dbd558c35af0..eb351cf12b8d549750cfa0981300d46bfc492466 100644 (file)
--- a/src/support/globbing.C
+++ b/src/support/globbing.C
@@ -114,8 +114,9 @@ vector<string> const expand_globs(string const & mask,
 
 FileFilterList::FileFilterList(string const & qt_style_filter)
 {
-       string const filter = qt_style_filter.empty() ?
-               _("All files (*)") : qt_style_filter;
+       string const filter = qt_style_filter 
+               + (qt_style_filter.empty() ? string() : ";;")
+               + _("All files (*)");
 
        // Split data such as "TeX documents (*.tex);;LyX Documents (*.lyx)"
        // into individual filters.

diff --git a/src/support/globbing.h b/src/support/globbing.h
index 08f117c47d68d6f4772e4591ecfc4fb76b2a8b2f..a5f7b04e58b29383236f65869c248755156515c5 100644 (file)
--- a/src/support/globbing.h
+++ b/src/support/globbing.h
@@ -68,8 +68,8 @@ public:
        };
 
        /** \param qt_style_filter a list of available file filters.
-        *  Eg. "TeX documents (*.tex);;LyX Documents (*.lyx)"
-        *  If empty, set to "All files (*)".
+        *  Eg. "TeX documents (*.tex);;LyX Documents (*.lyx)".
+        *  The "All files (*)" filter is always added to the list.
         */
        explicit FileFilterList(std::string const & qt_style_filter = std::string());
        std::vector<Filter> const & filters() const { return filters_; }