Change string

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

diff --git a/src/insets/InsetCollapsable.cpp b/src/insets/InsetCollapsable.cpp
index 96f6765195261fbd36c8335f36847a7d2b290eed..7d7cc9a23fe8d9823262969efb86a8f2dc0d30bb 100644 (file)
--- a/src/insets/InsetCollapsable.cpp
+++ b/src/insets/InsetCollapsable.cpp
@@ -30,7 +30,6 @@
 #include "MetricsInfo.h"
 #include "ParagraphParameters.h"
 #include "TextClass.h"
-#include "TextClassList.h"
 
 #include "frontends/FontMetrics.h"
 #include "frontends/Painter.h"
@@ -54,13 +53,9 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 {
        switch (decoration()) {
        case InsetLayout::Classic:
-               if (status() == Open) {
-                       if (openinlined_)
-                               return LeftButton;
-                       else
-                               return TopButton;
-               } else
-                       return ButtonOnly;
+               if (status() == Open)
+                       return openinlined_ ? LeftButton : TopButton;
+               return ButtonOnly;
 
        case InsetLayout::Minimalistic:
                return status() == Open ? NoButton : ButtonOnly ;
@@ -78,22 +73,21 @@ InsetCollapsable::Geometry InsetCollapsable::geometry() const
 }
 
 
-InsetCollapsable::InsetCollapsable(BufferParams const & bp,
-               CollapseStatus status, TextClassIndex tc)
-       : InsetText(bp), textClass_(tc), status_(status),
+InsetCollapsable::InsetCollapsable(Buffer const & buf,
+               CollapseStatus status, DocumentClass * dc)
+       : InsetText(buf), status_(status),
          openinlined_(false), autoOpen_(false), mouse_hover_(false)
 {
-       setLayout(tc);
+       setLayout(dc);
        setAutoBreakRows(true);
        setDrawFrame(true);
        setFrameColor(Color_collapsableframe);
-       paragraphs().back().layout(bp.textClass().emptyLayout());
+       paragraphs().back().setLayout(buf.params().documentClass().emptyLayout());
 }
 
 
 InsetCollapsable::InsetCollapsable(InsetCollapsable const & rhs)
        : InsetText(rhs),
-               textClass_(rhs.textClass_),
                layout_(rhs.layout_),
                labelstring_(rhs.labelstring_),
                button_dim(rhs.button_dim),
@@ -126,18 +120,17 @@ docstring InsetCollapsable::toolTip(BufferView const & bv, int x, int y) const
 
 void InsetCollapsable::setLayout(BufferParams const & bp)
 {
-       setLayout(bp.textClassIndex());
+       setLayout(bp.documentClassPtr());
 }
 
 
-void InsetCollapsable::setLayout(TextClassIndex tcindex)
+void InsetCollapsable::setLayout(DocumentClass const * const dc)
 {
-       textClass_ = tcindex;
-       if (tcindex != TextClassIndex(-1)) {
-               layout_ = &textclasslist[tcindex].insetlayout(name());
+       if (dc) {
+               layout_ = &(dc->insetLayout(name()));
                labelstring_ = layout_->labelstring();
        } else {
-               layout_ = &TextClass::emptyInsetLayout();
+               layout_ = &DocumentClass::emptyInsetLayout();
                labelstring_ = _("UNDEFINED");
        }
 
@@ -145,7 +138,7 @@ void InsetCollapsable::setLayout(TextClassIndex tcindex)
 }
 
 
-void InsetCollapsable::write(Buffer const & buf, ostream & os) const
+void InsetCollapsable::write(ostream & os) const
 {
        os << "status ";
        switch (status_) {
@@ -157,11 +150,11 @@ void InsetCollapsable::write(Buffer const & buf, ostream & os) const
                break;
        }
        os << "\n";
-       text_.write(buf, os);
+       text_.write(buffer(), os);
 }
 
 
-void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
+void InsetCollapsable::read(Lexer & lex)
 {
        bool token_found = false;
        if (lex.isOK()) {
@@ -189,11 +182,10 @@ void InsetCollapsable::read(Buffer const & buf, Lexer & lex)
                        lex.pushToken(token);
                }
        }
-
        // this must be set before we enter InsetText::read()
-       setLayout(buf.params());
+       setLayout(buffer().params());
 
-       InsetText::read(buf, lex);
+       InsetText::read(lex);
 
        if (!token_found)
                status_ = isOpen() ? Open : Collapsed;
@@ -712,7 +704,6 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
        case LFUN_FONT_STATE:
        case LFUN_FONT_UNDERLINE:
        case LFUN_FOOTNOTE_INSERT:
-       case LFUN_HFILL_INSERT:
        case LFUN_HYPERLINK_INSERT:
        case LFUN_INDEX_INSERT:
        case LFUN_INDEX_PRINT:
@@ -753,12 +744,13 @@ bool InsetCollapsable::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (layout_->isPassThru()) {
                        flag.enabled(false);
                        return true;
-               }
-               return InsetText::getStatus(cur, cmd, flag);
+               } else
+                       return InsetText::getStatus(cur, cmd, flag);
 
        case LFUN_INSET_TOGGLE:
-               if (cmd.argument() == "open" || cmd.argument() == "close" ||
-                   cmd.argument() == "toggle")
+               if ((cmd.argument() == "open" && status_ == Open)
+                       || (cmd.argument() == "close" && status_ != Open)
+                       || cmd.argument() == "toggle")
                        flag.enabled(true);
                else
                        flag.enabled(false);
@@ -797,7 +789,7 @@ void InsetCollapsable::setStatus(Cursor & cur, CollapseStatus status)
 docstring InsetCollapsable::floatName(
                string const & type, BufferParams const & bp) const
 {
-       FloatList const & floats = bp.textClass().floats();
+       FloatList const & floats = bp.documentClass().floats();
        FloatList::const_iterator it = floats[type];
        // FIXME UNICODE
        return (it == floats.end()) ? from_ascii(type) : bp.B_(it->second.name());
@@ -818,29 +810,12 @@ InsetLayout::InsetDecoration InsetCollapsable::decoration() const
                break;
        }
        if (lyxCode() == FLEX_CODE)
-               // FIXME: Is this really necessary?
                return InsetLayout::Conglomerate;
        return InsetLayout::Classic;
 }
 
 
-bool InsetCollapsable::isMacroScope(Buffer const &) const
-{
-       // layout_ == 0 leads to no latex output, so ignore 
-       // the macros outside
-       if (!layout_)
-               return true;
-
-       // see InsetCollapsable::latex(...) below. In these case
-       // an environment is opened there
-       if (!layout_->latexname().empty())
-               return true;
-
-       return false;
-}
-
-
-int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
+int InsetCollapsable::latex(odocstream & os,
                          OutputParams const & runparams) const
 {
        // FIXME: What should we do layout_ is 0?
@@ -873,7 +848,7 @@ int InsetCollapsable::latex(Buffer const & buf, odocstream & os,
                rp.verbatim = true;
        if (layout_->isNeedProtect())
                rp.moving_arg = true;
-       int i = InsetText::latex(buf, os, rp);
+       int i = InsetText::latex(os, rp);
        if (!layout_->latexname().empty()) {
                if (layout_->latextype() == "command") {
                        os << "}";
@@ -900,8 +875,23 @@ void InsetCollapsable::validate(LaTeXFeatures & features) const
 bool InsetCollapsable::undefined() const
 {
        docstring const & n = getLayout().name();
-       return n.empty() || n == TextClass::emptyInsetLayout().name();
+       return n.empty() || n == DocumentClass::emptyInsetLayout().name();
 }
 
 
+docstring InsetCollapsable::contextMenu(BufferView const & bv, int x,
+       int y) const
+{
+       if (geometry() == NoButton)
+               return from_ascii("context-collapsable");
+
+       Dimension dim = dimensionCollapsed();
+       if (x < xo(bv) + dim.wid && y < yo(bv) + dim.des)
+               //FIXME: We should offer the "context-collapsable" menu here too but
+               // this is not possible right now because the cursor must be set first.
+               return docstring();
+
+       return InsetText::contextMenu(bv, x, y);
+}
+
 } // namespace lyx