return false;
}
+
+Buffer * checkAndLoadLyXFile(FileName const & filename)
+{
+ // File already open?
+ if (theBufferList().exists(filename.absFilename())) {
+ docstring const file = makeDisplayPath(filename.absFilename(), 20);
+ docstring text = bformat(_("The document %1$s is already "
+ "loaded.\n\nDo you want to revert "
+ "to the saved version?"), file);
+ if (Alert::prompt(_("Revert to saved document?"),
+ text, 0, 1, _("&Revert"), _("&Switch to document")))
+ return theBufferList().getBuffer(filename.absFilename());
+
+ // FIXME: should be LFUN_REVERT
+ if (theBufferList().close(theBufferList().getBuffer(filename.absFilename()), false))
+ // Load it again.
+ return checkAndLoadLyXFile(filename);
+ else
+ // The file could not be closed.
+ return 0;
+ }
+
+ if (isFileReadable(filename)) {
+ Buffer * b = theBufferList().newBuffer(filename.absFilename());
+ if (!lyx::loadLyXFile(b, filename)) {
+ theBufferList().release(b);
+ return 0;
+ }
+ return b;
+ }
+
+ docstring text = bformat(_("The document %1$s does not yet "
+ "exist.\n\nDo you want to create a new document?"),
+ from_utf8(filename.absFilename()));
+ if (!Alert::prompt(_("Create new document?"),
+ text, 0, 1, _("&Create"), _("Cancel")))
+ return newFile(filename.absFilename(), string(), true);
+
+ return 0;
+}
+
// FIXME newFile() should probably be a member method of Application...
Buffer * newFile(string const & filename, string const & templatename,
bool const isNamed)
void setCaptionLabels(Inset & inset, string const & type,
docstring const label, Counters & counters)
{
- LyXText * text = inset.getText(0);
+ Text * text = inset.getText(0);
if (!text)
return;
setCaptionLabels(icap, type, label, counters);
if (icap.lyxCode() == Inset::CAPTION_CODE) {
// We found a caption!
- counters.step(counter);
+ counters.step(counter);
int number = counters.value(counter);
InsetCaption & ic = static_cast<InsetCaption &>(icap);
ic.setType(type);
InsetList::iterator end = par.insetlist.end();
for (; it != end; ++it) {
Inset & inset = *it->inset;
- if (inset.lyxCode() == Inset::FLOAT_CODE
+ if (inset.lyxCode() == Inset::FLOAT_CODE
|| inset.lyxCode() == Inset::WRAP_CODE) {
- docstring const & name = inset.insetName();
+ docstring const name = inset.name();
if (name.empty())
continue;
// FIXME: are "table" and "Table" the correct type and label?
setCaptionLabels(inset, "table", from_ascii("Table"), counters);
}
+ else if (inset.lyxCode() == Inset::LISTINGS_CODE)
+ setCaptionLabels(inset, "listing", from_ascii("Listing"), counters);
+ else if (inset.lyxCode() == Inset::INCLUDE_CODE)
+ // if this include inset contains lstinputlisting, and has a caption
+ // it will increase the 'listing' counter by one
+ static_cast<InsetInclude &>(inset).updateCounter(counters);
}
}
break;
}
}
- // FIXME Can insetName() return an empty name for wide or
+ // FIXME Can Inset::name() return an empty name for wide or
// float insets? If not we can put the definition of type
// inside the if (in) clause and use that instead of
// if (!type.empty()).
docstring type;
if (in)
- type = in->insetName();
+ type = in->name();
if (!type.empty()) {
Floating const & fl = textclass.floats().getType(to_ascii(type));
if (it == par_iterator_end(buf.inset()))
return false;
-// if (it.lastpit == 0 && LyXText::isMainText(buf))
+// if (it.lastpit == 0 && Text::isMainText(buf))
// return false;
switch (it->layout()->labeltype) {
Buffer & cbuf = const_cast<Buffer &>(buf);
cbuf.tocBackend().update();
- cbuf.structureChanged();
+ if (!childonly)
+ cbuf.structureChanged();
}
void checkBufferStructure(Buffer & buffer, ParIterator const & par_it)
{
- if (par_it->layout()->labeltype == LABEL_COUNTER
- && par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
- buffer.tocBackend().updateItem(par_it);
- buffer.structureChanged();
+ if (par_it->layout()->toclevel != Layout::NOT_IN_TOC) {
+ Buffer * master = buffer.getMasterBuffer();
+ master->tocBackend().updateItem(par_it);
+ master->structureChanged();
}
}