* This file is part of LyX, the document processor.
* Licence details can be found in the file COPYING.
*
- * \author Lars Gullik Bjønnes
+ * \author Lars Gullik Bjønnes
* \author Bo Peng
*
* Full author contact details are available in file CREDITS.
#include "Session.h"
#include "support/debug.h"
-#include "support/FileNameList.h"
#include "support/filetools.h"
#include "support/Package.h"
string const sec_bookmarks = "[bookmarks]";
string const sec_session = "[session info]";
string const sec_toolbars = "[toolbars]";
+string const sec_lastcommands = "[last commands]";
} // anon namespace
}
-void LastOpenedSection::read(istream & /*is*/)
+void LastOpenedSection::read(istream & is)
{
- lastopened.clear();
- FileNameList list;// = theApp()->fileNameListFromSession("last_opened");
- for (size_t i = 0; i != list.size(); ++i) {
- FileName const & file = list[i];
- if (!file.isAbsolute() || !file.exists() || file.isDirectory())
- LYXERR(Debug::INIT, "Warning: invalid last opened file: " << file);
- else
+ string tmp;
+ do {
+ char c = is.peek();
+ if (c == '[')
+ break;
+ getline(is, tmp);
+ FileName const file(tmp);
+ if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ' || !file.isAbsolute())
+ continue;
+
+ if (file.exists() && !file.isDirectory())
lastopened.push_back(file);
- }
+ else
+ LYXERR(Debug::INIT, "LyX: Warning: Ignore last opened file: " << tmp);
+ } while (is.good());
}
-void LastOpenedSection::write(ostream & /*os*/) const
+void LastOpenedSection::write(ostream & os) const
{
- //theApp()->toSession(lastopened);
+ os << '\n' << sec_lastopened << '\n';
+ copy(lastopened.begin(), lastopened.end(),
+ ostream_iterator<FileName>(os, "\n"));
}
}
+bool BookmarksSection::hasValid() const
+{
+ for (size_t i = 1; i <= size(); ++i) {
+ if (isValid(i))
+ return true;
+ }
+ return false;
+}
+
+
BookmarksSection::Bookmark const & BookmarksSection::bookmark(unsigned int i) const
{
return bookmarks[i];
}
-Session::Session(unsigned int num) :
- last_files(num)
+LastCommandsSection::LastCommandsSection(unsigned int num) :
+ default_num_last_commands(30),
+ absolute_max_last_commands(100)
+{
+ setNumberOfLastCommands(num);
+}
+
+
+void LastCommandsSection::read(istream & is)
+{
+ string tmp;
+ do {
+ char c = is.peek();
+ if (c == '[')
+ break;
+ getline(is, tmp);
+ if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
+ continue;
+
+ lastcommands.push_back(tmp);
+ } while (is.good());
+}
+
+
+void LastCommandsSection::write(ostream & os) const
+{
+ os << '\n' << sec_lastcommands << '\n';
+ copy(lastcommands.begin(), lastcommands.end(),
+ ostream_iterator<std::string>(os, "\n"));
+}
+
+
+void LastCommandsSection::setNumberOfLastCommands(unsigned int no)
+{
+ if (0 < no && no <= absolute_max_last_commands)
+ num_lastcommands = no;
+ else {
+ LYXERR(Debug::INIT, "LyX: session: too many last commands\n"
+ << "\tdefault (=" << default_num_last_commands << ") used.");
+ num_lastcommands = default_num_last_commands;
+ }
+}
+
+
+void LastCommandsSection::add(std::string const & string)
+{
+ lastcommands.push_back(string);
+}
+
+
+void LastCommandsSection::clear()
+{
+ lastcommands.clear();
+}
+
+
+Session::Session(unsigned int num_last_files, unsigned int num_last_commands) :
+ last_files(num_last_files), last_commands(num_last_commands)
{
// locate the session file
// note that the session file name 'session' is hard-coded
lastFilePos().read(is);
else if (tmp == sec_bookmarks)
bookmarks().read(is);
+ else if (tmp == sec_lastcommands)
+ lastCommands().read(is);
+
else
LYXERR(Debug::INIT, "LyX: Warning: unknown Session section: " << tmp);
}
lastFiles().write(os);
lastOpened().write(os);
lastFilePos().write(os);
+ lastCommands().write(os);
bookmarks().write(os);
} else
LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "