anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-11 05:33:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

* InsetInclude::addToToc(): show embedded status if any in Navigator.

Browse Source 
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23657 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Abdelrazak Younes 2008-03-11 08:37:30 +00:00
parent 4f1d3f2162
commit b1742b5736
1 changed files with 13 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
src/insets/InsetInclude.cpp
View File

@ -470,13 +470,12 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
if (tmp->params().baseClass() != masterBuffer->params().baseClass()) { if (tmp->params().baseClass() != masterBuffer->params().baseClass()) {
// FIXME UNICODE // FIXME UNICODE
docstring text = bformat(_("Included file `%1$s'\n" docstring text = bformat(_("Included file `%1$s'\n"
"has textclass `%2$s'\n" "has textclass `%2$s'\n"
"while parent file has textclass `%3$s'."), "while parent file has textclass `%3$s'."),
included_file.displayName(), included_file.displayName(),
from_utf8(tmp->params().documentClass().name()), from_utf8(tmp->params().documentClass().name()),
from_utf8(masterBuffer->params().documentClass().name())); from_utf8(masterBuffer->params().documentClass().name()));
Alert::warning(_("Different textclasses"), text); Alert::warning(_("Different textclasses"), text);
//return 0;
} }
// Make sure modules used in child are all included in master // Make sure modules used in child are all included in master
@ -492,9 +491,9 @@ int InsetInclude::latex(odocstream & os, OutputParams const & runparams) const
find(masterModules.begin(), masterModules.end(), module); find(masterModules.begin(), masterModules.end(), module);
if (found != masterModules.end()) { if (found != masterModules.end()) {
docstring text = bformat(_("Included file `%1$s'\n" docstring text = bformat(_("Included file `%1$s'\n"
"uses module `%2$s'\n" "uses module `%2$s'\n"
"which is not used in parent file."), "which is not used in parent file."),
included_file.displayName(), from_utf8(module)); included_file.displayName(), from_utf8(module));
Alert::warning(_("Module not found"), text); Alert::warning(_("Module not found"), text);
} }
} }
@ -885,7 +884,10 @@ void InsetInclude::addToToc(ParConstIterator const & cpit) const
return; return;
Toc & toc = buffer().tocBackend().toc("child"); Toc & toc = buffer().tocBackend().toc("child");
toc.push_back(TocItem(cpit, 0, childbuffer->fileName().displayName())); docstring str = childbuffer->fileName().displayName();
if (!params()["embed"].empty())
str += _(" (embedded)");
toc.push_back(TocItem(cpit, 0, str));
TocList & toclist = buffer().tocBackend().tocs(); TocList & toclist = buffer().tocBackend().tocs();
TocList const & childtoclist = childbuffer->tocBackend().tocs(); TocList const & childtoclist = childbuffer->tocBackend().tocs();
@ -893,7 +895,7 @@ void InsetInclude::addToToc(ParConstIterator const & cpit) const
TocList::const_iterator const end = childtoclist.end(); TocList::const_iterator const end = childtoclist.end();
for(; it != end; ++it) for(; it != end; ++it)
toclist[it->first].insert(toclist[it->first].end(), toclist[it->first].insert(toclist[it->first].end(),
it->second.begin(), it->second.end()); it->second.begin(), it->second.end());
} }