*
* \author John Levon
*
- * Full author contact details are available in file CREDITS
+ * Full author contact details are available in file CREDITS.
*/
#include <config.h>
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
-#include "FormFiledialog.h"
#include "frontends/FileDialog.h"
-// temp. hack until Allow/prohibitInput is not
-// needed any more in src/ - for now it's simplest
-// to leave it there
-#include "frontends/LyXView.h"
-#include "bufferview_funcs.h"
-#include "gettext.h"
-#include "commandtags.h"
+#include "FormFiledialog.h"
+
#include "debug.h"
+#include "gettext.h"
+
+#include "support/globbing.h"
#include "support/lstrings.h"
-#include <utility>
+using lyx::support::rsplit;
+using lyx::support::FileFilterList;
-using std::make_pair;
-using std::pair;
using std::endl;
+using std::string;
+
-FileDialog::FileDialog(LyXView *lv, string const &t, kb_action s, Button b1, Button b2)
- : private_(0), lv_(lv), title_(t), success_(s)
+FileDialog::FileDialog(string const &t, kb_action s, Button b1, Button b2)
+ : private_(0), title_(t), success_(s)
{
- private_ = new FileDialog::Private(lv->getDialogs());
+ 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)
{
- 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::opendir(string const & path, string const & suggested)
{
- string filter = mask;
+ lyxerr[Debug::GUI] << "filedialog open with path \"" << path << "\", suggested \""
+ << suggested << '"' << endl;
- if (mask.empty())
- filter = _("*");
- else {
- rsplit(mask, filter, '|');
- if (filter.empty())
- filter = mask;
- }
+ // no support for asynchronous selection yet
- lyxerr[Debug::GUI] << "filedialog open with path \"" << path << "\", mask \""
- << filter << "\", suggested \"" << suggested << "\"" << endl;
+ FileDialog::Result result;
- // no support for asynchronous selection yet
+ result.first = FileDialog::Chosen;
+ result.second = private_->SelectDir(title_, path, suggested);
+
+ return result;
+}
- lv_->prohibitInput();
+
+FileDialog::Result const FileDialog::open(string const & path,
+ FileFilterList const & filters,
+ string const & suggested)
+{
+ 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);
-
- lv_->allowInput();
+ result.second = private_->Select(title_, path, filters, suggested);
return result;
}