Introduce LFUN_PRINT.

[lyx.git] / src / frontends / xforms / FileDialog.C

diff --git a/src/frontends/xforms/FileDialog.C b/src/frontends/xforms/FileDialog.C
index c876ffc0a379773a767909bac41e2b173527a160..43ef10feb1ff2a7161a5f805ba42f8025c6c6ba9 100644 (file)
--- a/src/frontends/xforms/FileDialog.C
+++ b/src/frontends/xforms/FileDialog.C
@@ -1,45 +1,37 @@
 /**
- * \file FileDialog.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * \file xforms/FileDialog.C
+ * This file is part of LyX, the document processor.
+ * Licence details can be found in the file COPYING.
  *
  * \author John Levon
+ *
+ * Full author contact details are available in file CREDITS.
  */
 
-#ifdef __GNUG__
-#pragma implementation
-#endif
-
 #include <config.h>
-#include <gettext.h>
-#include <utility>
-
-#include "commandtags.h"
 
-#include "support/lstrings.h" 
-
-// temp. hack until Allow/prohibitInput is not
-// needed any more in src/ - for now it's simplest
-// to leave it there 
-#include "LyXView.h" 
-#include "bufferview_funcs.h"
- 
 #include "frontends/FileDialog.h"
-
 #include "FormFiledialog.h"
 
 #include "debug.h"
+#include "gettext.h"
+
+#include "support/globbing.h"
+#include "support/lstrings.h"
+
+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();
+       private_ = new FileDialog::Private;
 
-       private_->SetButton(0, b1.first, b1.second); 
+       private_->SetButton(0, b1.first, b1.second);
        private_->SetButton(1, b2.first, b2.second);
 }
 
@@ -47,34 +39,47 @@ FileDialog::FileDialog(LyXView *lv, string const &t, kb_action s, Button b1, But
 FileDialog::~FileDialog()
 {
        delete private_;
-       private_ = 0;
 }
 
 
-FileDialog::Result const FileDialog::Select(string const & path, string const & mask, string const & suggested)
+FileDialog::Result const FileDialog::save(string const & path,
+                                         FileFilterList const & filters,
+                                         string const & suggested)
 {
-       string filter = mask;
+       return open(path, filters, suggested);
+}
 
-       if (mask.empty())
-               filter = _("*");
-       else {
-               rsplit(mask, filter, '|');
-               if (filter.empty())
-                       filter = mask;
-       }
 
-       lyxerr[Debug::GUI] << "Select with path \"" << path << "\", mask \"" << filter << "\", suggested \"" << suggested << "\"" << endl;
+FileDialog::Result const FileDialog::opendir(string const & path, string const & suggested)
+{
+       lyxerr[Debug::GUI] << "filedialog open  with path \"" << path << "\", suggested \""
+               << suggested << '"' << endl;
 
        // no support for asynchronous selection yet
 
-       lv_->prohibitInput();
+       FileDialog::Result result;
+
+       result.first = FileDialog::Chosen;
+       result.second = private_->SelectDir(title_, path, suggested);
+
+       return result;
+}
+
+
+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;
 }