X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Ffrontends%2Fqt4%2FFileDialog.cpp;h=ee5f3503da873129ebb72718d4ce356a65fc8b54;hb=b6eacd8d4f86734e8abef3335b190ce12a6a11b5;hp=da79152377fdb13bdd9c52c2694f6c9880c72dcb;hpb=6c26624d39122e96ed29694d1440384c8ae37a3c;p=lyx.git diff --git a/src/frontends/qt4/FileDialog.cpp b/src/frontends/qt4/FileDialog.cpp index da79152377..ee5f3503da 100644 --- a/src/frontends/qt4/FileDialog.cpp +++ b/src/frontends/qt4/FileDialog.cpp @@ -11,44 +11,38 @@ #include -#include "frontends/FileDialog.h" +#include "FileDialog.h" #include "LyXFileDialog.h" #include "qt_helpers.h" -#include "debug.h" -#include "gettext.h" +#include "LyXRC.h" -#include "support/FileFilterList.h" +#include "support/debug.h" +#include "support/FileName.h" +#include "support/filetools.h" +#include "support/gettext.h" #include "support/os.h" -/** when this is defined, the code will use +#include + +#include + +/** when LyXRC::use_native_filedialog is true, we use * QFileDialog::getOpenFileName and friends to create filedialogs. * Effects: * - the dialog does not use the quick directory buttons (Button * 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)) -#define USE_NATIVE_FILEDIALOG 1 -#endif - -#ifdef USE_NATIVE_FILEDIALOG -#include -#include "support/filetools.h" - -using lyx::support::makeAbsPath; -#endif namespace lyx { -using support::FileFilterList; -using support::os::internal_path; -using std::endl; +using namespace support; class FileDialog::Private { @@ -58,13 +52,9 @@ public: }; -FileDialog::FileDialog(docstring const & t, - kb_action s, Button b1, Button b2) - : private_(new FileDialog::Private), title_(t), success_(s) -{ - private_->b1 = b1; - private_->b2 = b2; -} +FileDialog::FileDialog(QString const & t) + : private_(new FileDialog::Private), title_(t) +{} FileDialog::~FileDialog() @@ -73,116 +63,145 @@ FileDialog::~FileDialog() } -FileDialog::Result const FileDialog::save(docstring const & path, - FileFilterList const & filters, - docstring const & suggested) +void FileDialog::setButton1(QString const & label, QString const & dir) { - LYXERR(Debug::GUI) << "Select with path \"" << to_utf8(path) - << "\", mask \"" << to_utf8(filters.as_string()) - << "\", suggested \"" << to_utf8(suggested) << '"' << endl; + private_->b1.first = label; + private_->b1.second = dir; +} + + +void FileDialog::setButton2(QString const & label, QString const & dir) +{ + private_->b2.first = label; + private_->b2.second = dir; +} + + +FileDialog::Result FileDialog::save(QString const & path, + QStringList const & filters, QString const & suggested, + QString * selectedFilter) +{ + LYXERR(Debug::GUI, "Select with path \"" << path + << "\", mask \"" << filters.join(";;") + << "\", suggested \"" << suggested << '"'); + FileDialog::Result result; result.first = FileDialog::Chosen; -#ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = from_utf8( - makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename()); - QString const name = - QFileDialog::getSaveFileName(qApp->focusWidget(), - toqstr(title_), - toqstr(startsWith), - toqstr(filters.as_string()), - 0, - QFileDialog::DontConfirmOverwrite); - result.second = from_utf8(internal_path(fromqstr(name))); -#else - LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2); -#if QT_VERSION != 0x040203 - dlg.setFileMode(QFileDialog::AnyFile); -#endif - dlg.setAcceptMode(QFileDialog::AcceptSave); - dlg.setConfirmOverwrite(false); - - if (!suggested.empty()) - dlg.selectFile(toqstr(suggested)); - - LYXERR(Debug::GUI) << "Synchronous FileDialog: " << endl; - int res = dlg.exec(); - LYXERR(Debug::GUI) << "result " << res << endl; - if (res == QDialog::Accepted) - result.second = from_utf8(internal_path( - fromqstr(dlg.selectedFiles()[0]))); - dlg.hide(); -#endif + if (lyxrc.use_native_filedialog) { + QString const startsWith = makeAbsPath(suggested, path); + QString const name = + QFileDialog::getSaveFileName(qApp->focusWidget(), + title_, startsWith, filters.join(";;"), + selectedFilter, 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); + dlg.setFileMode(QFileDialog::AnyFile); + dlg.setAcceptMode(QFileDialog::AcceptSave); + dlg.setConfirmOverwrite(false); + if (selectedFilter != 0 && !selectedFilter->isEmpty()) + dlg.selectNameFilter(*selectedFilter); + + if (!suggested.isEmpty()) + dlg.selectFile(suggested); + + LYXERR(Debug::GUI, "Synchronous FileDialog: "); + int res = dlg.exec(); + LYXERR(Debug::GUI, "result " << res); + if (res == QDialog::Accepted) + result.second = internalPath(dlg.selectedFiles()[0]); + else + result.first = FileDialog::Later; + if (selectedFilter != 0) + *selectedFilter = dlg.selectedNameFilter(); + dlg.hide(); + } return result; } -FileDialog::Result const FileDialog::open(docstring const & path, - FileFilterList const & filters, - docstring const & suggested) +FileDialog::Result FileDialog::save(QString const & path, + QStringList const & filters, QString const & suggested) +{ + return save(path, filters, suggested, 0); +} + + +FileDialog::Result FileDialog::open(QString const & path, + QStringList const & filters, QString const & suggested) { - LYXERR(Debug::GUI) << "Select with path \"" << to_utf8(path) - << "\", mask \"" << to_utf8(filters.as_string()) - << "\", suggested \"" << to_utf8(suggested) << '"' << endl; + LYXERR(Debug::GUI, "Select with path \"" << path + << "\", mask \"" << filters.join(";;") + << "\", suggested \"" << suggested << '"'); FileDialog::Result result; result.first = FileDialog::Chosen; -#ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = from_utf8( - makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename()); - result.second = from_utf8(internal_path(fromqstr( - QFileDialog::getOpenFileName(qApp->focusWidget(), - toqstr(title_), toqstr(startsWith), toqstr(filters.as_string()) )))); -#else - LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2); - - if (!suggested.empty()) - dlg.selectFile(toqstr(suggested)); - - LYXERR(Debug::GUI) << "Synchronous FileDialog: " << endl; - int res = dlg.exec(); - LYXERR(Debug::GUI) << "result " << res << endl; - if (res == QDialog::Accepted) - result.second = from_utf8(internal_path( - fromqstr(dlg.selectedFiles()[0]))); - dlg.hide(); -#endif + if (lyxrc.use_native_filedialog) { + 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); + + if (!suggested.isEmpty()) + dlg.selectFile(suggested); + + LYXERR(Debug::GUI, "Synchronous FileDialog: "); + int res = dlg.exec(); + LYXERR(Debug::GUI, "result " << res); + if (res == QDialog::Accepted) + result.second = internalPath(dlg.selectedFiles()[0]); + else + result.first = FileDialog::Later; + dlg.hide(); + } return result; } -FileDialog::Result const FileDialog::opendir(docstring const & path, - docstring const & suggested) +FileDialog::Result FileDialog::opendir(QString const & path, + QString const & suggested) { - LYXERR(Debug::GUI) << "Select with path \"" << to_utf8(path) - << "\", suggested \"" << to_utf8(suggested) << '"' << endl; + LYXERR(Debug::GUI, "Select with path \"" << path + << "\", suggested \"" << suggested << '"'); FileDialog::Result result; result.first = FileDialog::Chosen; -#ifdef USE_NATIVE_FILEDIALOG - docstring const startsWith = from_utf8( - makeAbsPath(to_utf8(suggested), to_utf8(path)).absFilename()); - result.second = from_utf8(internal_path(fromqstr( - QFileDialog::getExistingDirectory(qApp->focusWidget(), - toqstr(title_),toqstr(startsWith))))); -#else - FileFilterList const filter(_("Directories")); - - LyXFileDialog dlg(title_, path, filter, private_->b1, private_->b2); - - dlg.setFileMode(QFileDialog::DirectoryOnly); - - if (!suggested.empty()) - dlg.selectFile(toqstr(suggested)); - - LYXERR(Debug::GUI) << "Synchronous FileDialog: " << endl; - int res = dlg.exec(); - LYXERR(Debug::GUI) << "result " << res << endl; - if (res == QDialog::Accepted) - result.second = from_utf8(internal_path( - fromqstr(dlg.selectedFiles()[0]))); - dlg.hide(); -#endif + if (lyxrc.use_native_filedialog) { + 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 { + LyXFileDialog dlg(title_, path, QStringList(qt_("Directories")), + private_->b1, private_->b2); + + dlg.setFileMode(QFileDialog::DirectoryOnly); + + if (!suggested.isEmpty()) + dlg.selectFile(suggested); + + LYXERR(Debug::GUI, "Synchronous FileDialog: "); + int res = dlg.exec(); + LYXERR(Debug::GUI, "result " << res); + if (res == QDialog::Accepted) + result.second = internalPath(dlg.selectedFiles()[0]); + else + result.first = FileDialog::Later; + dlg.hide(); + } return result; }