Change glob() API to accept a dir parameter.

[lyx.git] / src / frontends / xforms / FormFiledialog.h

diff --git a/src/frontends/xforms/FormFiledialog.h b/src/frontends/xforms/FormFiledialog.h
index 9c79303c2bc73ad9971a94cfd9a0204033f7ebb1..9d6cee29bf255c6826df0687cd90ce9b6925bd35 100644 (file)
--- a/src/frontends/xforms/FormFiledialog.h
+++ b/src/frontends/xforms/FormFiledialog.h
@@ -24,6 +24,18 @@
 
 class Dialogs;
 
+
+namespace lyx {
+
+namespace support {
+
+class FileFilterList;
+
+} // namespace support
+
+
+namespace frontend {
+
 /// DirEntry internal structure definition
 class DirEntry {
 public:
@@ -45,6 +57,10 @@ public:
 
 class FD_filedialog;
 
+} // namespace frontend
+} // namespace lyx
+
+
 class FileDialog::Private : public boost::signals::trackable {
 public:
        ///
@@ -58,10 +74,10 @@ public:
        /// gets last dialog directory
        std::string const GetDirectory() const;
        /// launches dialog and returns selected file
-       std::string const Select(std::string const & pszTitle = std::string(),
-                      std::string const & pszPath = std::string(),
-                      std::string const & pszMask = std::string(),
-                      std::string const & pszSuggested = std::string());
+       std::string const Select(std::string const & pszTitle,
+                                std::string const & pszPath,
+                                lyx::support::FileFilterList const & filters,
+                                std::string const & pszSuggested);
        /// launches dialog and returns selected directory
        std::string const SelectDir(std::string const & pszTitle = std::string(),
                       std::string const & pszPath = std::string(),
@@ -75,7 +91,7 @@ public:
 
 private:
        /// data
-       static FD_filedialog * file_dlg_form_;
+       static lyx::frontend::FD_filedialog * file_dlg_form_;
        ///
        static FileDialog::Private * current_dlg_;
        ///
@@ -101,7 +117,7 @@ private:
        ///
        std::string info_line_;
        ///
-       typedef std::vector<DirEntry> DirEntries;
+       typedef std::vector<lyx::frontend::DirEntry> DirEntries;
        ///
        DirEntries dir_entries_;
        ///
@@ -118,7 +134,8 @@ private:
        /// sets dialog current directory
        void SetDirectory(std::string const & pszPath);
        /// sets dialog file mask
-       void SetMask(std::string const & pszNewMask);
+       void SetFilters(std::string const & filters);
+       void SetFilters(lyx::support::FileFilterList const & filters);
        /// sets dialog information line
        void SetInfoLine(std::string const & pszLine);
        /// handle dialog during file selection