#include <config.h>
-
-#include "FormFiledialog.h"
#include "frontends/FileDialog.h"
-#include "frontends/LyXView.h"
-#include "bufferview_funcs.h"
-#include "gettext.h"
-#include "lfuns.h"
+#include "FormFiledialog.h"
+
#include "debug.h"
+#include "gettext.h"
+
+#include "support/globbing.h"
#include "support/lstrings.h"
-#include <utility>
-using namespace lyx::support;
+using lyx::support::rsplit;
+using lyx::support::FileFilterList;
-using std::make_pair;
-using std::pair;
using std::endl;
+using std::string;
+
FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)
: private_(0), title_(t), success_(s)
{
- private_ = new FileDialog::Private();
+ private_ = new FileDialog::Private;
private_->SetButton(0, b1.first, b1.second);
private_->SetButton(1, b2.first, b2.second);
}
-FileDialog::Result const FileDialog::save(string const & path, string const & mask, string const & suggested)
+FileDialog::Result const FileDialog::save(string const & path,
+ FileFilterList const & filters,
+ string const & suggested)
{
- return open(path, mask, suggested);
+ return open(path, filters, suggested);
}
}
-FileDialog::Result const FileDialog::open(string const & path, string const & mask, string const & suggested)
+FileDialog::Result const FileDialog::open(string const & path,
+ FileFilterList const & filters,
+ string const & suggested)
{
- string filter = mask;
-
- if (mask.empty())
- filter = _("*");
- else {
- rsplit(mask, filter, '|');
- if (filter.empty())
- filter = mask;
- }
-
- lyxerr[Debug::GUI] << "filedialog open with path \"" << path << "\", mask \""
- << filter << "\", suggested \"" << suggested << '"' << endl;
+ lyxerr[Debug::GUI] << "filedialog open with path \"" << path
+ << "\", mask \"" << filters.str(false)
+ << "\", suggested \"" << suggested << '"' << endl;
// no support for asynchronous selection yet
FileDialog::Result result;
result.first = FileDialog::Chosen;
- result.second = private_->Select(title_, path, filter, suggested);
+ result.second = private_->Select(title_, path, filters, suggested);
return result;
}