#include "buffer.h"
#include "bufferlist.h"
#include "BufferView.h"
+#include "buffer_funcs.h"
#include "cursor.h"
#include "debug.h"
#include "gettext.h"
-#include "lastfiles.h"
+#include "session.h"
+#include "LaTeXFeatures.h"
#include "lyx_main.h"
#include "lyxlayout.h"
#include "lyxrc.h"
#include "paragraph.h"
#include "frontends/Alert.h"
+#include "frontends/Application.h"
#include "frontends/FileDialog.h"
-#include "frontends/lyx_gui.h"
-#include "frontends/LyXView.h"
#include "support/filefilterlist.h"
-#include "support/FileInfo.h"
#include "support/filetools.h"
+#include "support/fontutils.h"
#include "support/forkedcall.h"
+#include "support/fs_extras.h"
#include "support/lyxlib.h"
-#include "support/os.h"
+#include "support/package.h"
#include "support/path.h"
-#include "support/path_defines.h"
#include "support/systemcall.h"
+#if !defined (HAVE_FORK)
+# define fork() -1
+#endif
+
#include <boost/shared_ptr.hpp>
+#include <boost/filesystem/operations.hpp>
#include <cerrno>
#include <fstream>
-using lyx::support::AddName;
+using lyx::docstring;
+using lyx::support::addName;
using lyx::support::bformat;
using lyx::support::destroyDir;
using lyx::support::FileFilterList;
-using lyx::support::FileInfo;
using lyx::support::ForkedProcess;
-using lyx::support::IsLyXFilename;
-using lyx::support::LibFileSearch;
-using lyx::support::MakeAbsPath;
-using lyx::support::MakeDisplayPath;
-using lyx::support::OnlyFilename;
-using lyx::support::OnlyPath;
-using lyx::support::Path;
-using lyx::support::QuoteName;
+using lyx::support::isLyXFilename;
+using lyx::support::libFileSearch;
+using lyx::support::makeAbsPath;
+using lyx::support::makeDisplayPath;
+using lyx::support::onlyFilename;
+using lyx::support::onlyPath;
+using lyx::support::package;
using lyx::support::removeAutosaveFile;
using lyx::support::rename;
using lyx::support::split;
-using lyx::support::system_lyxdir;
using lyx::support::Systemcall;
using lyx::support::tempName;
using lyx::support::unlink;
-using lyx::support::user_lyxdir;
-
-namespace os = lyx::support::os;
using boost::shared_ptr;
+namespace Alert = lyx::frontend::Alert;
+namespace fs = boost::filesystem;
+
using std::back_inserter;
using std::copy;
using std::endl;
using std::istream_iterator;
-extern BufferList bufferlist;
// this should be static, but I need it in buffer.C
bool quitting; // flag, that we are quitting the program
-
//
// Menu callbacks
//
-bool MenuWrite(Buffer * buffer)
+bool menuWrite(Buffer * buffer)
{
if (buffer->save()) {
- LyX::ref().lastfiles().newFile(buffer->fileName());
+ LyX::ref().session().addLastFile(buffer->fileName());
return true;
}
// FIXME: we don't tell the user *WHY* the save failed !!
- string const file = MakeDisplayPath(buffer->fileName(), 30);
+ docstring const file = makeDisplayPath(buffer->fileName(), 30);
- string text = bformat(_("The document %1$s could not be saved.\n\n"
- "Do you want to rename the document and try again?"), file);
+ docstring text = bformat(_("The document %1$s could not be saved.\n\n"
+ "Do you want to rename the document and try again?"), file);
int const ret = Alert::prompt(_("Rename and save?"),
text, 0, 1, _("&Rename"), _("&Cancel"));
if (ret == 0)
- return WriteAs(buffer);
+ return writeAs(buffer);
return false;
}
-bool WriteAs(Buffer * buffer, string const & filename)
+bool writeAs(Buffer * buffer, string const & filename)
{
string fname = buffer->fileName();
string const oldname = fname;
if (filename.empty()) {
+ // FIXME UNICODE
FileDialog fileDlg(_("Choose a filename to save document as"),
- LFUN_WRITEAS,
- make_pair(string(_("Documents|#o#O")),
- string(lyxrc.document_path)),
- make_pair(string(_("Templates|#T#t")),
- string(lyxrc.template_path)));
+ LFUN_BUFFER_WRITE_AS,
+ 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))
+ if (!isLyXFilename(fname))
fname += ".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;
// Make sure the absolute filename ends with appropriate suffix
- fname = MakeAbsPath(fname);
- if (!IsLyXFilename(fname))
+ fname = makeAbsPath(fname);
+ if (!isLyXFilename(fname))
fname += ".lyx";
} else
fname = filename;
- FileInfo const myfile(fname);
- if (myfile.isOK()) {
- string const file = MakeDisplayPath(fname, 30);
- string text = bformat(_("The document %1$s already exists.\n\n"
- "Do you want to over-write that document?"), file);
+ if (fs::exists(fname)) {
+ docstring const file = makeDisplayPath(fname, 30);
+ docstring text = bformat(_("The document %1$s already exists.\n\n"
+ "Do you want to over-write that document?"), file);
int const ret = Alert::prompt(_("Over-write document?"),
text, 0, 1, _("&Over-write"), _("&Cancel"));
bool unnamed = buffer->isUnnamed();
buffer->setUnnamed(false);
- if (!MenuWrite(buffer)) {
+ if (!menuWrite(buffer)) {
buffer->setFileName(oldname);
buffer->setUnnamed(unnamed);
return false;
}
-void QuitLyX()
+void quitLyX(bool noask)
{
lyxerr[Debug::INFO] << "Running QuitLyX." << endl;
- if (lyx_gui::use_gui) {
- if (!bufferlist.quitWriteAll())
+ if (lyx::use_gui) {
+ if (!noask && !theBufferList().quitWriteAll())
return;
- LyX::cref().lastfiles().writeFile(lyxrc.lastfiles);
+ LyX::cref().session().writeFile();
}
// Set a flag that we do quitting from the program,
quitting = true;
// close buffers first
- bufferlist.closeAll();
+ theBufferList().closeAll();
// do any other cleanup procedures now
- lyxerr[Debug::INFO] << "Deleting tmp dir " << os::getTmpDir() << endl;
+ lyxerr[Debug::INFO] << "Deleting tmp dir " << package().temp_dir() << endl;
- if (destroyDir(os::getTmpDir()) != 0) {
- string msg = bformat(_("Could not remove the temporary directory %1$s"),
- os::getTmpDir());
- Alert::warning(_("Could not remove temporary directory"), msg);
+ if (!destroyDir(package().temp_dir())) {
+ docstring const msg =
+ bformat(_("Unable to remove the temporary directory %1$s"),
+ lyx::from_utf8(package().temp_dir()));
+ Alert::warning(_("Unable to remove temporary directory"), msg);
}
- lyx_gui::exit();
+ if (lyx::use_gui) {
+ theApp->exit(0);
+
+ // Restore original font resources after Application is destroyed.
+ lyx::support::restoreFontResources();
+ }
}
int AutoSaveBuffer::start()
{
- command_ = bformat(_("Auto-saving %1$s"), fname_);
+ command_ = lyx::to_utf8(bformat(_("Auto-saving %1$s"), lyx::from_utf8(fname_)));
return run(DontWait);
}
// It is dangerous to do this in the child,
// but safe in the parent, so...
if (pid == -1)
- bv_.owner()->message(_("Autosave failed!"));
+ // emit message signal.
+ bv_.buffer()->message(_("Autosave failed!"));
}
}
if (pid == 0) { // we are the child so...
} // namespace anon
-void AutoSave(BufferView * bv)
+void autoSave(BufferView * bv)
// should probably be moved into BufferList (Lgb)
// Perfect target for a thread...
{
- if (!bv->available())
+ if (!bv->buffer())
return;
if (bv->buffer()->isBakClean() || bv->buffer()->isReadonly()) {
// We don't save now, but we'll try again later
- bv->owner()->resetAutosaveTimer();
+ bv->buffer()->resetAutosaveTimers();
return;
}
- bv->owner()->message(_("Autosaving current document..."));
+ // emit message signal.
+ bv->buffer()->message(_("Autosaving current document..."));
// create autosave filename
string fname = bv->buffer()->filePath();
fname += '#';
- fname += OnlyFilename(bv->buffer()->fileName());
+ fname += onlyFilename(bv->buffer()->fileName());
fname += '#';
AutoSaveBuffer autosave(*bv, fname);
autosave.start();
bv->buffer()->markBakClean();
- bv->owner()->resetAutosaveTimer();
+ bv->buffer()->resetAutosaveTimers();
}
// create new file with template
// SERVERCMD !
//
-void NewFile(BufferView * bv, string const & filename)
+void newFile(BufferView * bv, string const & filename)
{
// Split argument by :
string name;
string tmpname = split(filename, name, ':');
-#ifdef __EMX__ // Fix me! lyx_cb.C may not be low level enough to allow this.
- if (name.length() == 1
- && isalpha(static_cast<unsigned char>(name[0]))
- && (prefixIs(tmpname, "/") || prefixIs(tmpname, "\\"))) {
- name += ':';
- name += token(tmpname, ':', 0);
- tmpname = split(tmpname, ':');
- }
-#endif
lyxerr[Debug::INFO] << "Arg is " << filename
<< "\nName is " << name
<< "\nTemplate is " << tmpname << endl;
- bv->newFile(name, tmpname);
+ Buffer * const b = newFile(name, tmpname);
+ if (b)
+ bv->setBuffer(b);
}
// Insert ascii file (if filename is empty, prompt for one)
-void InsertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
+void insertAsciiFile(BufferView * bv, string const & f, bool asParagraph)
{
- if (!bv->available())
+ if (!bv->buffer())
return;
- string const tmpstr = getContentsOfAsciiFile(bv, f, asParagraph);
+ // FIXME: We don't know the encoding of the file
+ docstring const tmpstr = lyx::from_utf8(getContentsOfAsciiFile(bv, f, asParagraph));
if (tmpstr.empty())
return;
// clear the selection
- if (bv->text() == bv->getLyXText())
+ LyXText const & text = bv->buffer()->text();
+ if (&text == bv->getLyXText())
bv->cursor().clearSelection();
if (asParagraph)
bv->getLyXText()->insertStringAsParagraphs(bv->cursor(), tmpstr);
(asParagraph) ? LFUN_FILE_INSERT_ASCII_PARA : LFUN_FILE_INSERT_ASCII);
FileDialog::Result result =
- fileDlg.open(bv->owner()->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();
}
- FileInfo fi(fname);
-
- if (!fi.readable()) {
- string const error = strerror(errno);
- string const file = MakeDisplayPath(fname, 50);
- string const text = bformat(_("Could not read the specified document\n"
- "%1$s\ndue to the error: %2$s"), file, error);
+ if (!fs::is_readable(fname)) {
+ docstring const error = lyx::from_ascii(strerror(errno));
+ docstring const file = makeDisplayPath(fname, 50);
+ docstring const text = bformat(_("Could not read the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not read file"), text);
return string();
}
ifstream ifs(fname.c_str());
if (!ifs) {
- string const error = strerror(errno);
- string const file = MakeDisplayPath(fname, 50);
- string const text = bformat(_("Could not open the specified document\n"
- "%1$s\ndue to the error: %2$s"), file, error);
+ docstring const error = lyx::from_ascii(strerror(errno));
+ docstring const file = makeDisplayPath(fname, 50);
+ docstring const text = bformat(_("Could not open the specified document\n"
+ "%1$s\ndue to the error: %2$s"), file, error);
Alert::error(_("Could not open file"), text);
return string();
}
// This function runs "configure" and then rereads lyx.defaults to
// reconfigure the automatic settings.
-void Reconfigure(BufferView * bv)
+void reconfigure(BufferView * bv)
{
- bv->owner()->message(_("Running configure..."));
+ // emit message signal.
+ bv->buffer()->message(_("Running configure..."));
// Run configure in user lyx directory
- Path p(user_lyxdir());
- string const configure_script = AddName(system_lyxdir(), "configure");
- string const configure_command = "sh " + QuoteName(configure_script);
+ lyx::support::Path p(package().user_support());
+ string const configure_command = package().configure_command();
Systemcall one;
one.startscript(Systemcall::Wait, configure_command);
p.pop();
- bv->owner()->message(_("Reloading configuration..."));
- lyxrc.read(LibFileSearch(string(), "lyxrc.defaults"));
+ // emit message signal.
+ bv->buffer()->message(_("Reloading configuration..."));
+ lyxrc.read(libFileSearch(string(), "lyxrc.defaults"));
+ // Re-read packages.lst
+ LaTeXFeatures::getAvailable();
Alert::information(_("System reconfigured"),
- _("The system has been reconfigured.\n"
- "You need to restart LyX to make use of any\n"
- "updated document class specifications."));
+ _("The system has been reconfigured.\n"
+ "You need to restart LyX to make use of any\n"
+ "updated document class specifications."));
}
projects / lyx.git / blobdiff