]> git.lyx.org Git - lyx.git/blobdiff - src/insets/InsetBranch.cpp
Fix GRAPHICS_EDIT of InsetGraphics
[lyx.git] / src / insets / InsetBranch.cpp
index 67ef02f193f4511d8662bf814d9182591d1b3690..852b04fc0cee4e993a3196ec898db45527bc88a5 100644 (file)
 #include "Buffer.h"
 #include "BufferParams.h"
 #include "BranchList.h"
+#include "Color.h"
+#include "Counters.h"
 #include "Cursor.h"
 #include "DispatchResult.h"
 #include "FuncRequest.h"
 #include "FuncStatus.h"
-#include "gettext.h"
-#include "Color.h"
+#include "support/gettext.h"
 #include "Lexer.h"
-#include "Paragraph.h"
 #include "OutputParams.h"
+#include "TextClass.h"
 
 #include <sstream>
 
+using namespace std;
 
 namespace lyx {
 
-using std::string;
-using std::auto_ptr;
-using std::istringstream;
-using std::ostream;
-using std::ostringstream;
-
-
-void InsetBranch::init()
-{
-       setButtonLabel();
-}
 
-
-InsetBranch::InsetBranch(BufferParams const & bp,
-                        InsetBranchParams const & params)
-       : InsetCollapsable(bp), params_(params)
-{
-       init();
-}
-
-
-InsetBranch::InsetBranch(InsetBranch const & in)
-       : InsetCollapsable(in), params_(in.params_)
-{
-       init();
-}
+InsetBranch::InsetBranch(Buffer const & buf, InsetBranchParams const & params)
+       : InsetCollapsable(buf), params_(params)
+{}
 
 
 InsetBranch::~InsetBranch()
@@ -64,60 +44,56 @@ InsetBranch::~InsetBranch()
 }
 
 
-auto_ptr<Inset> InsetBranch::doClone() const
+docstring InsetBranch::editMessage() const
 {
-       return auto_ptr<Inset>(new InsetBranch(*this));
+       return _("Opened Branch Inset");
 }
 
 
-docstring const InsetBranch::editMessage() const
+void InsetBranch::write(ostream & os) const
 {
-       return _("Opened Branch Inset");
+       params_.write(os);
+       InsetCollapsable::write(os);
 }
 
 
-void InsetBranch::write(Buffer const & buf, ostream & os) const
+void InsetBranch::read(Lexer & lex)
 {
-       params_.write(os);
-       InsetCollapsable::write(buf, os);
+       params_.read(lex);
+       InsetCollapsable::read(lex);
 }
 
 
-void InsetBranch::read(Buffer const & buf, Lexer & lex)
+docstring InsetBranch::toolTip(BufferView const &, int, int) const
 {
-       params_.read(lex);
-       InsetCollapsable::read(buf, lex);
-       setButtonLabel();
+       return _("Branch: ") + params_.branch;
 }
 
 
 void InsetBranch::setButtonLabel()
 {
-       Font font(Font::ALL_SANE);
-       font.decSize();
-       font.decSize();
-
        docstring s = _("Branch: ") + params_.branch;
        if (!params_.branch.empty()) {
                // FIXME UNICODE
-               Color_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
-               if (c == Color::none) {
+               ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+               if (c == Color_none) {
                        s = _("Undef: ") + s;
                }
        }
-       font.setColor(Color::foreground);
-       setLabel(isOpen() ? s : getNewLabel(s) );
-       setLabelFont(font);
+       if (decoration() == InsetLayout::Classic)
+               setLabel(isOpen() ? s : getNewLabel(s) );
+       else
+               setLabel(params_.branch + ": " + getNewLabel(s));
 }
 
 
-Color_color InsetBranch::backgroundColor() const
+ColorCode InsetBranch::backgroundColor() const
 {
        if (!params_.branch.empty()) {
                // FIXME UNICODE
-               Color_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
-               if (c == Color::none) {
-                       c = Color::error;
+               ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+               if (c == Color_none) {
+                       c = Color_error;
                }
                return c;
        } else
@@ -139,7 +115,7 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
                InsetBranchParams params;
                InsetBranchMailer::string2params(to_utf8(cmd.argument()), params);
                params_.branch = params.branch;
-               setButtonLabel();
+               setLayout(cur.buffer().params());
                break;
        }
 
@@ -165,7 +141,7 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
        case LFUN_INSET_TOGGLE:
                if (cmd.argument() == "assign") {
                        // The branch inset uses "assign".
-                       if (isBranchSelected(cur.buffer())) {
+                       if (isBranchSelected()) {
                                if (status() != Open)
                                        setStatus(cur, Open);
                                else
@@ -201,9 +177,8 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
                if (cmd.argument() == "open" || cmd.argument() == "close" ||
                    cmd.argument() == "toggle")
                        flag.enabled(true);
-               else if (cmd.argument() == "assign"
-                          || cmd.argument().empty()) {
-                       if (isBranchSelected(cur.buffer()))
+               else if (cmd.argument() == "assign" || cmd.argument().empty()) {
+                       if (isBranchSelected())
                                flag.enabled(status() != Open);
                        else
                                flag.enabled(status() != Collapsed);
@@ -218,13 +193,13 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
 }
 
 
-bool InsetBranch::isBranchSelected(Buffer const & buffer) const
+bool InsetBranch::isBranchSelected() const
 {
-       Buffer const & realbuffer = *buffer.getMasterBuffer();
+       Buffer const & realbuffer = *buffer().masterBuffer();
        BranchList const & branchlist = realbuffer.params().branchlist();
        BranchList::const_iterator const end = branchlist.end();
        BranchList::const_iterator it =
-               std::find_if(branchlist.begin(), end,
+               find_if(branchlist.begin(), end,
                             BranchNamesEqual(params_.branch));
        if (it == end)
                return false;
@@ -232,40 +207,50 @@ bool InsetBranch::isBranchSelected(Buffer const & buffer) const
 }
 
 
-int InsetBranch::latex(Buffer const & buf, odocstream & os,
-                      OutputParams const & runparams) const
+void InsetBranch::updateLabels(ParIterator const & it)
+{
+       if (isBranchSelected())
+               InsetCollapsable::updateLabels(it);
+       else {
+               DocumentClass const & tclass = buffer().params().documentClass();
+               Counters savecnt = tclass.counters();
+               InsetCollapsable::updateLabels(it);
+               tclass.counters() = savecnt;
+       }
+}
+
+
+int InsetBranch::latex(odocstream & os, OutputParams const & runparams) const
 {
-       return isBranchSelected(buf) ?
-               InsetText::latex(buf, os, runparams) : 0;
+       return isBranchSelected() ?  InsetText::latex(os, runparams) : 0;
 }
 
 
-int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
+int InsetBranch::plaintext(odocstream & os,
                           OutputParams const & runparams) const
 {
-       if (!isBranchSelected(buf))
+       if (!isBranchSelected())
                return 0;
 
-       os << '[' << buf.B_("branch") << ' ' << params_.branch << ":\n";
-       InsetText::plaintext(buf, os, runparams);
+       os << '[' << buffer().B_("branch") << ' ' << params_.branch << ":\n";
+       InsetText::plaintext(os, runparams);
        os << "\n]";
 
        return PLAINTEXT_NEWLINE + 1; // one char on a separate line
 }
 
 
-int InsetBranch::docbook(Buffer const & buf, odocstream & os,
+int InsetBranch::docbook(odocstream & os,
                         OutputParams const & runparams) const
 {
-       return isBranchSelected(buf) ?
-               InsetText::docbook(buf, os, runparams) : 0;
+       return isBranchSelected() ?  InsetText::docbook(os, runparams) : 0;
 }
 
 
-void InsetBranch::textString(Buffer const & buf, odocstream & os) const
+void InsetBranch::textString(odocstream & os) const
 {
-       if (isBranchSelected(buf))
-               os << paragraphs().begin()->asString(buf, true);
+       if (isBranchSelected())
+               os << paragraphs().begin()->asString(true);
 }
 
 
@@ -275,6 +260,12 @@ void InsetBranch::validate(LaTeXFeatures & features) const
 }
 
 
+bool InsetBranch::isMacroScope() const 
+{
+       // Its own scope if not selected by buffer
+       return !isBranchSelected();
+}
+
 
 string const InsetBranchMailer::name_("branch");