better selection and scrolling behaviour

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

diff --git a/src/frontends/qt2/FileDialog.C b/src/frontends/qt2/FileDialog.C
index a5c319502adf7fe3be8afa57272273cd0aa51761..040039d8ff85f2b60e44ac9be55c054312f8fa93 100644 (file)
--- a/src/frontends/qt2/FileDialog.C
+++ b/src/frontends/qt2/FileDialog.C
@@ -1,9 +1,11 @@
 /**
  * \file qt2/FileDialog.C
- * Copyright 2001 the LyX Team
- * Read the file COPYING
+ * 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__
@@ -11,28 +13,32 @@
 #endif
 
 #include <config.h>
-#include <gettext.h>
-#include <utility>
 
 #include "commandtags.h"
 #include "LString.h"
 #include "frontends/FileDialog.h"
 #include "FileDialog_private.h"
 #include "debug.h"
+#include "gettext.h"
 
 #include <qapplication.h>
- 
+
+#include <utility>
+
 using std::make_pair;
 using std::pair;
 using std::endl;
 
-struct FileDialog::Private { 
+
+struct FileDialog::Private {
        Button b1;
        Button b2;
 };
- 
-FileDialog::FileDialog(LyXView *lv, string const & t, kb_action s, Button b1, Button b2)
-       : private_(new FileDialog::Private()), lv_(lv), title_(t), success_(s)
+
+
+FileDialog::FileDialog(LyXView * lv, string const & t,
+                      kb_action s, Button b1, Button b2)
+       : private_(new FileDialog::Private), lv_(lv), title_(t), success_(s)
 {
        private_->b1 = b1;
        private_->b2 = b2;
@@ -45,24 +51,52 @@ FileDialog::~FileDialog()
 }
 
 
-FileDialog::Result const FileDialog::Select(string const & path, string const & mask, string const & suggested)
+FileDialog::Result const FileDialog::save(string const & path,
+                                           string const & mask,
+                                           string const & suggested)
 {
-       string filter = mask;
+       string filter(mask);
        if (mask.empty())
-               filter = _("*|All files");
+               filter = _("All files (*)");
 
        LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2);
-       lyxerr[Debug::GUI] << "Select with path \"" << path << "\", mask \"" << filter << "\", suggested \"" << suggested << endl;
+       lyxerr[Debug::GUI] << "Select with path \"" << path
+                          << "\", mask \"" << filter
+                          << "\", suggested \"" << suggested << endl;
 
        dlg.setMode(QFileDialog::AnyFile);
- 
+
+       if (!suggested.empty())
+               dlg.setSelection(suggested.c_str());
+
+       FileDialog::Result result;
+       lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
+       result.first = FileDialog::Chosen;
+       int res = dlg.exec();
+       lyxerr[Debug::GUI] << "result " << res << endl;
+       if (res == QDialog::Accepted)
+               result.second = string(dlg.selectedFile().data());
+       dlg.hide();
+       return result;
+}
+
+
+FileDialog::Result const FileDialog::open(string const & path,
+                                           string const & mask,
+                                           string const & suggested)
+{
+       string filter(mask);
+       if (mask.empty())
+               filter = _("*|All files");
+
+       LyXFileDialog dlg(path, filter, title_, private_->b1, private_->b2);
+       lyxerr[Debug::GUI] << "Select with path \"" << path
+                          << "\", mask \"" << filter
+                          << "\", suggested \"" << suggested << endl;
+
        if (!suggested.empty())
                dlg.setSelection(suggested.c_str());
 
-       // This code relies on DestructiveClose which is broken
-       // in Qt < 3.0.5. So we just don't allow it for now.
-       //if (success_ == LFUN_SELECT_FILE_SYNC) {
- 
        FileDialog::Result result;
        lyxerr[Debug::GUI] << "Synchronous FileDialog : " << endl;
        result.first = FileDialog::Chosen;
@@ -72,8 +106,4 @@ FileDialog::Result const FileDialog::Select(string const & path, string const &
                result.second = string(dlg.selectedFile().data());
        dlg.hide();
        return result;
-#if 0
-       dlg->show();
-       return make_pair(FileDialog::Later, string());
-#endif
 }