Change inset label from ": filename" to "Program Listing: filename" for listings...

[lyx.git] / src / insets / InsetInclude.cpp

diff --git a/src/insets/InsetInclude.cpp b/src/insets/InsetInclude.cpp
index d22db7c5df3349e1225864a3b3b2a7c752533415..c0f10af568b3508656ae8a40404674ace52596c5 100644 (file)
--- a/src/insets/InsetInclude.cpp
+++ b/src/insets/InsetInclude.cpp
@@ -23,10 +23,12 @@
 #include "DispatchResult.h"
 #include "ErrorList.h"
 #include "Exporter.h"
+#include "Format.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
 #include "LaTeXFeatures.h"
 #include "LyX.h"
+#include "LyXFunc.h"
 #include "LyXRC.h"
 #include "Lexer.h"
 #include "MetricsInfo.h"
@@ -44,7 +46,7 @@
 #include "insets/InsetListingsParams.h"
 #include "insets/RenderPreview.h"
 
-#include "support/assert.h"
+#include "support/lassert.h"
 #include "support/debug.h"
 #include "support/docstream.h"
 #include "support/FileNameList.h"
@@ -241,9 +243,18 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
        LASSERT(&cur.buffer() == &buffer(), /**/);
        switch (cmd.action) {
 
+       case LFUN_INSET_EDIT: {
+               editIncluded(to_utf8(params()["filename"]));
+               break;
+       }
+
        case LFUN_INSET_MODIFY: {
                InsetCommandParams p(INCLUDE_CODE);
-               InsetCommand::string2params("include", to_utf8(cmd.argument()), p);
+               if (cmd.getArg(0) == "changetype") {
+                       InsetCommand::doDispatch(cur, cmd);
+                       p = params();
+               } else
+                       InsetCommand::string2params("include", to_utf8(cmd.argument()), p);
                if (!p.getCmdName().empty()) {
                        if (isListings(p)){
                                InsetListingsParams new_params(to_utf8(p["lstparams"]));
@@ -272,6 +283,36 @@ void InsetInclude::doDispatch(Cursor & cur, FuncRequest & cmd)
 }
 
 
+void InsetInclude::editIncluded(string const & file)
+{
+       string const ext = support::getExtension(file);
+       if (ext == "lyx") {
+               FuncRequest fr(LFUN_BUFFER_CHILD_OPEN, file);
+               lyx::dispatch(fr);
+       } else
+               // tex file or other text file in verbatim mode
+               formats.edit(buffer(),
+                       support::makeAbsPath(file, support::onlyPath(buffer().absFileName())),
+                       "text");
+}
+
+
+bool InsetInclude::getStatus(Cursor & cur, FuncRequest const & cmd,
+               FuncStatus & flag) const
+{
+       switch (cmd.action) {
+
+       case LFUN_INSET_EDIT:
+       case LFUN_INSET_MODIFY:
+               flag.setEnabled(true);
+               return true;
+
+       default:
+               return InsetCommand::getStatus(cur, cmd, flag);
+       }
+}
+
+
 void InsetInclude::setParams(InsetCommandParams const & p)
 {
        InsetCommand::setParams(p);
@@ -761,6 +802,12 @@ void InsetInclude::draw(PainterInfo & pi, int x, int y) const
 }
 
 
+docstring InsetInclude::contextMenu(BufferView const &, int, int) const
+{
+       return from_ascii("context-include");
+}
+
+
 Inset::DisplayType InsetInclude::display() const
 {
        return type(params()) == INPUT ? Inline : AlignCenter;
@@ -834,7 +881,7 @@ void InsetInclude::addPreview(graphics::PreviewLoader & ploader) const
 }
 
 
-void InsetInclude::addToToc(ParConstIterator const & cpit) const
+void InsetInclude::addToToc(DocIterator const & cpit)
 {
        TocBackend & backend = buffer().tocBackend();
 
@@ -849,8 +896,7 @@ void InsetInclude::addToToc(ParConstIterator const & cpit) const
                Toc & toc = backend.toc("listing");
                docstring str = convert<docstring>(toc.size() + 1)
                        + ". " +  from_utf8(caption);
-               ParConstIterator pit = cpit;
-               pit.push_back(*this);
+               DocIterator pit = cpit;
                toc.push_back(TocItem(pit, 0, str));
                return;
        }
@@ -863,6 +909,7 @@ void InsetInclude::addToToc(ParConstIterator const & cpit) const
        toc.push_back(TocItem(cpit, 0, str));
 
        TocList & toclist = backend.tocs();
+       childbuffer->tocBackend().update();
        TocList const & childtoclist = childbuffer->tocBackend().tocs();
        TocList::const_iterator it = childtoclist.begin();
        TocList::const_iterator const end = childtoclist.end();
@@ -887,12 +934,13 @@ void InsetInclude::updateLabels(ParIterator const & it)
 
        InsetListingsParams const par(to_utf8(params()["lstparams"]));
        if (par.getParamValue("caption").empty()) {
-               listings_label_.clear();
+               listings_label_ = buffer().B_("Program Listing");
                return;
        }
-       Counters & counters = buffer().params().documentClass().counters();
+       Buffer const & master = *buffer().masterBuffer();
+       Counters & counters = master.params().documentClass().counters();
        docstring const cnt = from_ascii("listing");
-       listings_label_ = buffer().B_("Program Listing");
+       listings_label_ = master.B_("Program Listing");
        if (counters.hasCounter(cnt)) {
                counters.step(cnt);
                listings_label_ += " " + convert<docstring>(counters.value(cnt));