#include "Buffer.h"
#include "BufferParams.h"
#include "BranchList.h"
-#include "LCursor.h"
+#include "Color.h"
+#include "Counters.h"
+#include "Cursor.h"
#include "DispatchResult.h"
#include "FuncRequest.h"
#include "FuncStatus.h"
-#include "gettext.h"
-#include "LColor.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()
-{
- setInsetName(from_utf8("Branch"));
- 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()
}
-auto_ptr<InsetBase> InsetBranch::doClone() const
+Inset * InsetBranch::clone() const
{
- return auto_ptr<InsetBase>(new InsetBranch(*this));
+ return new InsetBranch(*this);
}
{
params_.read(lex);
InsetCollapsable::read(buf, lex);
- setButtonLabel();
}
void InsetBranch::setButtonLabel()
{
- LyXFont font(LyXFont::ALL_SANE);
- font.decSize();
- font.decSize();
-
docstring s = _("Branch: ") + params_.branch;
- font.setColor(LColor::foreground);
if (!params_.branch.empty()) {
// FIXME UNICODE
- LColor_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
- if (c == LColor::none) {
- c = LColor::error;
+ ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+ if (c == Color_none) {
s = _("Undef: ") + s;
}
- setBackgroundColor(c);
+ }
+ if (decoration() == Classic)
+ setLabel(isOpen() ? s : getNewLabel(s) );
+ else
+ setLabel(params_.branch + ": " + getNewLabel(s));
+}
+
+
+ColorCode InsetBranch::backgroundColor() const
+{
+ if (!params_.branch.empty()) {
+ // FIXME UNICODE
+ ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch));
+ if (c == Color_none) {
+ c = Color_error;
+ }
+ return c;
} else
- setBackgroundColor(LColor::background);
- setLabel(isOpen() ? s : getNewLabel(s) );
- setLabelFont(font);
+ return Inset::backgroundColor();
}
}
-void InsetBranch::doDispatch(LCursor & cur, FuncRequest & cmd)
+void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
{
switch (cmd.action) {
case LFUN_INSET_MODIFY: {
InsetBranchParams params;
InsetBranchMailer::string2params(to_utf8(cmd.argument()), params);
params_.branch = params.branch;
- setButtonLabel();
+ setLayout(cur.buffer().params());
break;
}
case LFUN_INSET_TOGGLE:
- if (cmd.argument() == "assign" || cmd.argument().empty()) {
+ if (cmd.argument() == "assign") {
// The branch inset uses "assign".
if (isBranchSelected(cur.buffer())) {
if (status() != Open)
}
-bool InsetBranch::getStatus(LCursor & cur, FuncRequest const & cmd,
+bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd,
FuncStatus & flag) const
{
switch (cmd.action) {
bool InsetBranch::isBranchSelected(Buffer const & buffer) 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;
}
+void InsetBranch::updateLabels(Buffer const & buf, ParIterator const & it)
+{
+ if (isBranchSelected(buf))
+ InsetCollapsable::updateLabels(buf, it);
+ else {
+ TextClass const & tclass = buf.params().getTextClass();
+ Counters savecnt = tclass.counters();
+ InsetCollapsable::updateLabels(buf, it);
+ tclass.counters() = savecnt;
+ }
+}
+
+
int InsetBranch::latex(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return isBranchSelected(buf) ?
InsetText::latex(buf, os, runparams) : 0;
int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
if (!isBranchSelected(buf))
return 0;
- os << '[' << _("branch") << ' ' << params_.branch << ":\n";
+ os << '[' << buf.B_("branch") << ' ' << params_.branch << ":\n";
InsetText::plaintext(buf, os, runparams);
os << "\n]";
int InsetBranch::docbook(Buffer const & buf, odocstream & os,
- OutputParams const & runparams) const
+ OutputParams const & runparams) const
{
return isBranchSelected(buf) ?
InsetText::docbook(buf, os, runparams) : 0;
}
+bool InsetBranch::isMacroScope(Buffer const & buf) const
+{
+ // Its own scope if not selected by buffer
+ return !isBranchSelected(buf);
+}
+
string const InsetBranchMailer::name_("branch");
return print_mailer_error("InsetBranchMailer", in, 1, name_);
// This is part of the inset proper that is usually swallowed
- // by LyXText::readInset
+ // by Text::readInset
string id;
lex >> id;
if (!lex || id != "Branch")