* 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.
string const sec_bookmarks = "[bookmarks]";
string const sec_session = "[session info]";
string const sec_toolbars = "[toolbars]";
+string const sec_lastcommands = "[last commands]";
} // anon namespace
}
+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];
}
-void SessionInfoSection::read(istream & is)
+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 {
if (tmp == "" || tmp[0] == '#' || tmp[0] == ' ')
continue;
- try {
- // Read session info, saved as key/value pairs
- // would better yell if pos returns npos
- string::size_type pos = tmp.find_first_of(" = ");
- // silently ignore lines without " = "
- if (pos != string::npos) {
- string key = tmp.substr(0, pos);
- string value = tmp.substr(pos + 3);
- sessioninfo[key] = value;
- } else
- LYXERR(Debug::INIT, "LyX: Warning: Ignore session info: " << tmp);
- } catch (...) {
- LYXERR(Debug::INIT, "LyX: Warning: unknown Session info: " << tmp);
- }
+ lastcommands.push_back(tmp);
} while (is.good());
}
-void SessionInfoSection::write(ostream & os) const
+void LastCommandsSection::write(ostream & os) const
{
- os << '\n' << sec_session << '\n';
- for (MiscInfo::const_iterator val = sessioninfo.begin();
- val != sessioninfo.end(); ++val) {
- os << val->first << " = " << val->second << '\n';
+ 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 SessionInfoSection::save(string const & key, string const & value)
+void LastCommandsSection::add(std::string const & string)
{
- sessioninfo[key] = value;
+ lastcommands.push_back(string);
}
-string const SessionInfoSection::load(string const & key, bool release)
+void LastCommandsSection::clear()
{
- MiscInfo::const_iterator pos = sessioninfo.find(key);
- string value;
- if (pos != sessioninfo.end())
- value = pos->second;
- if (release)
- sessioninfo.erase(key);
- return value;
+ lastcommands.clear();
}
-Session::Session(unsigned int num) :
- last_files(num)
+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_session)
- sessionInfo().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);
- sessionInfo().write(os);
} else
LYXERR(Debug::INIT, "LyX: Warning: unable to save Session: "
<< session_file);