anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-12-23 13:31:49 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

compile fix

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@24405 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
André Pönitz 2008-04-21 06:30:46 +00:00
parent d4355c552b
commit 0d47ef086c
2 changed files with 14 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
src/frontends/qt4/FileDialog.cpp
View File

@ -18,9 +18,12 @@
#include "support/debug.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:
@ -42,7 +45,7 @@
namespace lyx {
using support::os::internal_path;
using namespace support;
class FileDialog::Private {
@ -91,8 +94,9 @@ FileDialog::Result FileDialog::save(QString const & path,
QString const startsWith = makeAbsPath(suggested, path);
QString const name =
QFileDialog::getSaveFileName(qApp->focusWidget(),
title_, startsWith, filters, 0, QFileDialog::DontConfirmOverwrite);
result.second = toqstr(internal_path(fromqstr(name)));
title_, startsWith, filters.join(";;"),
0, QFileDialog::DontConfirmOverwrite);
result.second = toqstr(os::internal_path(fromqstr(name)));
#else
LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
#if QT_VERSION != 0x040203
@ -126,9 +130,9 @@ FileDialog::Result FileDialog::open(QString const & path,
#ifdef USE_NATIVE_FILEDIALOG
QString const startsWith = makeAbsPath(suggested, path);
result.second = internalPath(
QFileDialog::getOpenFileName(qApp->focusWidget(),
title_, startsWith, filters));
QString const file = QFileDialog::getOpenFileName(qApp->focusWidget(),
title_, startsWith, filters.join(";;"));
result.second = internalPath(file);
#else
LyXFileDialog dlg(title_, path, filters, private_->b1, private_->b2);
@ -155,8 +159,9 @@ FileDialog::Result FileDialog::opendir(QString const & path,
result.first = FileDialog::Chosen;
#ifdef USE_NATIVE_FILEDIALOG
QString const startsWith = makeAbsPath(suggested, path);
result.second = toqstr(internal_path(fromqstr(
QString const startsWith = toqstr(makeAbsPath(fromqstr(suggested),
fromqstr(path)).absFilename());
result.second = toqstr(os::internal_path(fromqstr(
QFileDialog::getExistingDirectory(qApp->focusWidget(),
title_, startsWith))));
#else

1
src/frontends/qt4/qt_helpers.h
View File

@ -125,6 +125,7 @@ QString addExtension(QString const & name, QString const & extension);
/// Return the extension of the file (not including the .)
QString getExtension(QString const & name);
QString makeAbsPath(QString const & relpath, QString const & base);
} // namespace lyx