LastFiles::iterator it = find(lastfiles.begin(), lastfiles.end(), file);
if (it != lastfiles.end())
lastfiles.erase(it);
- lastfiles.push_front(file);
+ lastfiles.insert(lastfiles.begin(), file);
if (lastfiles.size() > num_lastfiles)
lastfiles.pop_back();
}
if (c == '[')
break;
getline(is, tmp);
- if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ' || !FileName::isAbsolute(tmp))
+ if (tmp.empty() || tmp[0] == '#' || tmp[0] == ' ')
continue;
- FileName const file(tmp);
- if (file.exists() && !file.isDirectory())
- lastopened.push_back(file);
- else
- LYXERR(Debug::INIT, "LyX: Warning: Ignore last opened file: " << tmp);
+ try {
+ LastOpenedFile lof;
+ istringstream itmp(tmp);
+ itmp >> lof.active;
+ itmp.ignore(2); // ignore ", "
+ string fname;
+ getline(itmp, fname);
+ if (!FileName::isAbsolute(fname))
+ continue;
+
+ FileName const file(fname);
+ if (file.exists() && !file.isDirectory()) {
+ lof.file_name = file;
+ lastopened.push_back(lof);
+ } else {
+ LYXERR(Debug::INIT,
+ "LyX: Warning: Ignore last opened file: " << tmp);
+ }
+ } catch (...) {
+ LYXERR(Debug::INIT,
+ "LyX: Warning: unknown state of last opened file: " << tmp);
+ }
} while (is.good());
}
void LastOpenedSection::write(ostream & os) const
{
os << '\n' << sec_lastopened << '\n';
- copy(lastopened.begin(), lastopened.end(),
- ostream_iterator<FileName>(os, "\n"));
+ for (size_t i = 0; i < lastopened.size(); ++i)
+ os << lastopened[i].active << ", " << lastopened[i].file_name << '\n';
}
-void LastOpenedSection::add(FileName const & file)
+void LastOpenedSection::add(FileName const & file, bool active)
{
- lastopened.push_back(file);
+ LastOpenedFile lof(file, active);
+ lastopened.push_back(lof);
}
void BookmarksSection::write(ostream & os) const
{
os << '\n' << sec_bookmarks << '\n';
- for (size_t i = 1; i <= max_bookmarks; ++i) {
+ for (size_t i = 0; i <= max_bookmarks; ++i) {
if (isValid(i))
os << i << ", "
<< bookmarks[i].bottom_pit << ", "
{
// locate the session file
// note that the session file name 'session' is hard-coded
- session_file = FileName(addName(package().user_support().absFilename(), "session"));
+ session_file = FileName(addName(package().user_support().absFileName(), "session"));
//
readFile();
}