#include "frontends/Alert.h"
#include "frontends/Application.h"
#include "frontends/FileDialog.h"
-#include "frontends/lyx_gui.h"
#include "support/filefilterlist.h"
#include "support/filetools.h"
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
-
//
// Menu callbacks
//
if (filename.empty()) {
- FileDialog fileDlg(lyx::to_utf8(_("Choose a filename to save document as")),
+ // FIXME UNICODE
+ FileDialog fileDlg(_("Choose a filename to save document as"),
LFUN_BUFFER_WRITE_AS,
- make_pair(string(lyx::to_utf8(_("Documents|#o#O"))),
- string(lyxrc.document_path)),
- make_pair(string(lyx::to_utf8(_("Templates|#T#t"))),
- string(lyxrc.template_path)));
+ make_pair(_("Documents|#o#O"), lyx::from_utf8(lyxrc.document_path)),
+ make_pair(_("Templates|#T#t"), lyx::from_utf8(lyxrc.template_path)));
if (!isLyXFilename(fname))
fname += ".lyx";
- FileFilterList const filter (lyx::to_utf8(_("LyX Documents (*.lyx)")));
+ FileFilterList const filter (_("LyX Documents (*.lyx)"));
FileDialog::Result result =
- fileDlg.save(onlyPath(fname),
+ fileDlg.save(lyx::from_utf8(onlyPath(fname)),
filter,
- onlyFilename(fname));
+ lyx::from_utf8(onlyFilename(fname)));
if (result.first == FileDialog::Later)
return false;
- fname = result.second;
+ fname = lyx::to_utf8(result.second);
if (fname.empty())
return false;
{
lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
- if (lyx_gui::use_gui) {
- if (!noask && !theApp->bufferList().quitWriteAll())
+ if (lyx::use_gui) {
+ if (!noask && !theBufferList().quitWriteAll())
return;
LyX::cref().session().writeFile();
quitting = true;
// close buffers first
- theApp->bufferList().closeAll();
+ theBufferList().closeAll();
// do any other cleanup procedures now
lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
Alert::warning(_("Unable to remove temporary directory"), msg);
}
- theApp->exit(0);
- // Restore original font resources after Application is destroyed.
- lyx::support::restoreFontResources();
+ if (lyx::use_gui) {
+ theApp->exit(0);
+
+ // Restore original font resources after Application is destroyed.
+ lyx::support::restoreFontResources();
+ }
}
string fname = f;
if (fname.empty()) {
- FileDialog fileDlg(lyx::to_utf8(_("Select file to insert")),
+ FileDialog fileDlg(_("Select file to insert"),
(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
FileDialog::Result result =
- fileDlg.open(bv->buffer()->filePath(),
- FileFilterList(), string());
+ fileDlg.open(lyx::from_utf8(bv->buffer()->filePath()),
+ FileFilterList(), docstring());
if (result.first == FileDialog::Later)
return string();
- fname = result.second;
+ fname = lyx::to_utf8(result.second);
if (fname.empty())
return string();