#include "qt_helpers.h"
#include "support/debug.h"
-#include "support/FileFilterList.h"
#include "support/FileName.h"
+#include "support/filetools.h"
#include "support/gettext.h"
#include "support/os.h"
+#include <string>
+
/** when this is defined, the code will use
* QFileDialog::getOpenFileName and friends to create filedialogs.
* Effects:
* parameters);
* - with Qt/Mac or Qt/Win, the dialogs native to the environment are used.
* - with Qt/Win and Qt <= 4.3.0, there was a number of bugs with our own
- * file dialog (http://bugzilla.lyx.org/show_bug.cgi?id=3907).
+ * file dialog (http://www.lyx.org/trac/ticket/3907).
*
* Therefore there is a tradeoff in enabling or disabling this (JMarc)
*/
-#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_CYGWIN_WIN))
+#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
#define USE_NATIVE_FILEDIALOG 1
#endif
#ifdef USE_NATIVE_FILEDIALOG
#include <QApplication>
-#include "support/filetools.h"
-
-using lyx::support::makeAbsPath;
#endif
namespace lyx {
-using support::FileFilterList;
-using support::os::internal_path;
+using namespace support;
class FileDialog::Private {
};
-FileDialog::FileDialog(QString const & t, kb_action s)
+FileDialog::FileDialog(QString const & t, FuncCode s)
: private_(new FileDialog::Private), title_(t), success_(s)
{}
FileDialog::Result FileDialog::save(QString const & path,
- FileFilterList const & filters,
- QString const & suggested)
+ QStringList const & filters, QString const & suggested)
{
- LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
- << "\", mask \"" << to_utf8(filters.as_string())
- << "\", suggested \"" << fromqstr(suggested) << '"');
+ LYXERR(Debug::GUI, "Select with path \"" << path
+ << "\", mask \"" << filters.join(";;")
+ << "\", suggested \"" << suggested << '"');
+
FileDialog::Result result;
result.first = FileDialog::Chosen;
#ifdef USE_NATIVE_FILEDIALOG
- QString const startsWith = toqstr(
- makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
+ QString const startsWith = makeAbsPath(suggested, path);
QString const name =
QFileDialog::getSaveFileName(qApp->focusWidget(),
- title_,
- startsWith,
- toqstr(filters.as_string()),
- 0,
- QFileDialog::DontConfirmOverwrite);
- result.second = toqstr(internal_path(fromqstr(name)));
+ title_, startsWith, filters.join(";;"),
+ 0, QFileDialog::DontConfirmOverwrite);
+ if (name.isNull())
+ result.first = FileDialog::Later;
+ else
+ result.second = toqstr(os::internal_path(fromqstr(name)));
#else
LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
#if QT_VERSION != 0x040203
LYXERR(Debug::GUI, "result " << res);
if (res == QDialog::Accepted)
result.second = internalPath(dlg.selectedFiles()[0]);
+ else
+ result.first = FileDialog::Later;
dlg.hide();
#endif
return result;
FileDialog::Result FileDialog::open(QString const & path,
- FileFilterList const & filters,
- QString const & suggested)
+ QStringList const & filters, QString const & suggested)
{
- LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
- << "\", mask \"" << filters.as_string()
- << "\", suggested \"" << fromqstr(suggested) << '"');
+ LYXERR(Debug::GUI, "Select with path \"" << path
+ << "\", mask \"" << filters.join(";;")
+ << "\", suggested \"" << suggested << '"');
FileDialog::Result result;
result.first = FileDialog::Chosen;
#ifdef USE_NATIVE_FILEDIALOG
- QString const startsWith = toqstr(
- makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
- result.second = internalPath(
- QFileDialog::getOpenFileName(qApp->focusWidget(),
- title_, startsWith, toqstr(filters.as_string()) ));
+ QString const startsWith = makeAbsPath(suggested, path);
+ QString const file = QFileDialog::getOpenFileName(qApp->focusWidget(),
+ title_, startsWith, filters.join(";;"));
+ if (file.isNull())
+ result.first = FileDialog::Later;
+ else
+ result.second = internalPath(file);
#else
LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
LYXERR(Debug::GUI, "result " << res);
if (res == QDialog::Accepted)
result.second = internalPath(dlg.selectedFiles()[0]);
+ else
+ result.first = FileDialog::Later;
dlg.hide();
#endif
return result;
FileDialog::Result FileDialog::opendir(QString const & path,
- QString const & suggested)
+ QString const & suggested)
{
- LYXERR(Debug::GUI, "Select with path \"" << fromqstr(path)
- << "\", suggested \"" << fromqstr(suggested) << '"');
+ LYXERR(Debug::GUI, "Select with path \"" << path
+ << "\", suggested \"" << suggested << '"');
FileDialog::Result result;
result.first = FileDialog::Chosen;
#ifdef USE_NATIVE_FILEDIALOG
- QString const startsWith = toqstr(
- makeAbsPath(fromqstr(suggested), fromqstr(path)).absFilename());
- result.second = toqstr(internal_path(fromqstr(
- QFileDialog::getExistingDirectory(qApp->focusWidget(),
- title_, startsWith))));
+ QString const startsWith = toqstr(makeAbsPath(fromqstr(suggested),
+ fromqstr(path)).absFileName());
+ QString const dir = QFileDialog::getExistingDirectory(qApp->focusWidget(),
+ title_, startsWith);
+ if (dir.isNull())
+ result.first = FileDialog::Later;
+ else
+ result.second = toqstr(os::internal_path(fromqstr(dir)));
#else
- FileFilterList const filter(_("Directories"));
-
- LyXFileDialog dlg(title_, path, filter, private_->b1, private_->b2);
+ LyXFileDialog dlg(title_, path, QStringList(qt_("Directories")),
+ private_->b1, private_->b2);
dlg.setFileMode(QFileDialog::DirectoryOnly);
LYXERR(Debug::GUI, "result " << res);
if (res == QDialog::Accepted)
result.second = internalPath(dlg.selectedFiles()[0]);
+ else
+ result.first = FileDialog::Later;
dlg.hide();
#endif
return result;