*
* Therefore there is a tradeoff in enabling or disabling this (JMarc)
*/
-#if defined(Q_WS_MACX) || (defined(Q_WS_WIN) && !defined(Q_OS_CYGWIN))
+#if defined(Q_OS_MAC) || defined(Q_OS_WIN)
#define USE_NATIVE_FILEDIALOG 1
#endif
};
-FileDialog::FileDialog(QString const & t, FuncCode s)
- : private_(new FileDialog::Private), title_(t), success_(s)
+FileDialog::FileDialog(QString const & t)
+ : private_(new FileDialog::Private), title_(t)
{}
FileDialog::Result FileDialog::save(QString const & path,
QStringList const & filters, QString const & suggested,
- QString & selectedFilter)
+ QString * selectedFilter)
{
LYXERR(Debug::GUI, "Select with path \"" << path
<< "\", mask \"" << filters.join(";;")
QString const startsWith = makeAbsPath(suggested, path);
QString const name =
QFileDialog::getSaveFileName(qApp->focusWidget(),
- title_, startsWith, filters.join(";;"),
- &selectedFilter, QFileDialog::DontConfirmOverwrite);
+ 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);
-#if QT_VERSION != 0x040203
dlg.setFileMode(QFileDialog::AnyFile);
-#endif
dlg.setAcceptMode(QFileDialog::AcceptSave);
dlg.setConfirmOverwrite(false);
+ if (selectedFilter != 0 && !selectedFilter->isEmpty())
+ dlg.selectNameFilter(*selectedFilter);
if (!suggested.isEmpty())
dlg.selectFile(suggested);
result.second = internalPath(dlg.selectedFiles()[0]);
else
result.first = FileDialog::Later;
- selectedFilter = dlg.selectedNameFilter();
+ if (selectedFilter != 0)
+ *selectedFilter = dlg.selectedNameFilter();
dlg.hide();
#endif
return result;
FileDialog::Result FileDialog::save(QString const & path,
QStringList const & filters, QString const & suggested)
{
- QString selectedFilter;
- return save(path, filters, suggested, selectedFilter);
+ return save(path, filters, suggested, 0);
}