docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
{
- docstring const status = isBranchSelected() ?
+ docstring const masterstatus = isBranchSelected() ?
_("active") : _("non-active");
+ docstring const childstatus = isBranchSelected(true) ?
+ _("active") : _("non-active");
+ docstring const status = (masterstatus == childstatus) ?
+ masterstatus :
+ support::bformat(_("master: %1$s, child: %2$s"),
+ masterstatus, childstatus);
docstring const heading =
support::bformat(_("Branch (%1$s): %2$s"), status, params_.branch);
if (isOpen(bv))
docstring s = _("Branch: ") + params_.branch;
Buffer const & realbuffer = *buffer().masterBuffer();
BranchList const & branchlist = realbuffer.params().branchlist();
- if (!branchlist.find(params_.branch)
- && buffer().params().branchlist().find(params_.branch))
+ bool const inmaster = branchlist.find(params_.branch);
+ bool const inchild = buffer().params().branchlist().find(params_.branch);
+ if (!inmaster && inchild)
s = _("Branch (child only): ") + params_.branch;
- else if (!branchlist.find(params_.branch))
+ else if (inmaster && !inchild)
+ s = _("Branch (master only): ") + params_.branch;
+ else if (!inmaster)
s = _("Branch (undefined): ") + params_.branch;
if (!params_.branch.empty()) {
// FIXME UNICODE
if (c == Color_none)
s = _("Undef: ") + s;
}
- s = char_type(isBranchSelected() ? 0x2714 : 0x2716) + s;
+ bool const master_selected = isBranchSelected();
+ bool const child_selected = isBranchSelected(true);
+ docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716));
+ if (inchild && master_selected != child_selected)
+ symb += char_type(child_selected ? 0x2714 : 0x2716);
+ s = symb + s;
if (decoration() == InsetLayout::CLASSIC)
return isOpen(bv) ? s : getNewLabel(s);
else
case LFUN_INSET_MODIFY: {
InsetBranchParams params;
InsetBranch::string2params(to_utf8(cmd.argument()), params);
+
+ cur.recordUndoInset(ATOMIC_UNDO, this);
params_.branch = params.branch;
// what we really want here is a TOC update, but that means
// a full buffer update
break;
}
case LFUN_BRANCH_ACTIVATE:
- case LFUN_BRANCH_DEACTIVATE: {
- // FIXME: I do not like this cast, but have no other idea...
- Buffer const * buf = buffer().masterBuffer();
- BranchList const & branchlist = buf->params().branchlist();
- Branch * our_branch = const_cast<Branch *>(branchlist.find(params_.branch));
- if (!our_branch) {
- // child only?
- our_branch = buffer().params().branchlist().find(params_.branch);
- if (!our_branch)
- break;
- }
- bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE);
+ case LFUN_BRANCH_DEACTIVATE:
+ case LFUN_BRANCH_MASTER_ACTIVATE:
+ case LFUN_BRANCH_MASTER_DEACTIVATE: {
+ bool const master = (cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE
+ || cmd.action() == LFUN_BRANCH_MASTER_DEACTIVATE);
+ Buffer * buf = master ? const_cast<Buffer *>(buffer().masterBuffer())
+ : &buffer();
+
+ Branch * our_branch = buf->params().branchlist().find(params_.branch);
+ if (!our_branch)
+ break;
+
+ bool const activate = (cmd.action() == LFUN_BRANCH_ACTIVATE
+ || cmd.action() == LFUN_BRANCH_MASTER_ACTIVATE);
if (our_branch->isSelected() != activate) {
+ // FIXME If the branch is in the master document, we cannot
+ // call recordUndo..., because the master may be hidden, and
+ // the code presently assumes that hidden documents can never
+ // be dirty. See GuiView::closeBufferAll(), for example.
+ if (!master)
+ buffer().undo().recordUndoFullDocument(cur);
our_branch->setSelected(activate);
cur.forceBufferUpdate();
}
break;
case LFUN_BRANCH_ACTIVATE:
- flag.setEnabled(!isBranchSelected());
+ flag.setEnabled(!isBranchSelected(true));
break;
case LFUN_BRANCH_DEACTIVATE:
- flag.setEnabled(isBranchSelected());
+ flag.setEnabled(isBranchSelected(true));
+ break;
+
+ case LFUN_BRANCH_MASTER_ACTIVATE:
+ flag.setEnabled(buffer().parent() && !isBranchSelected());
+ break;
+
+ case LFUN_BRANCH_MASTER_DEACTIVATE:
+ flag.setEnabled(buffer().parent() && isBranchSelected());
break;
case LFUN_INSET_TOGGLE:
flag.setEnabled(true);
else
return InsetCollapsable::getStatus(cur, cmd, flag);
+ break;
default:
return InsetCollapsable::getStatus(cur, cmd, flag);
}
-bool InsetBranch::isBranchSelected() const
+bool InsetBranch::isBranchSelected(bool const child) const
{
- Buffer const & realbuffer = *buffer().masterBuffer();
+ Buffer const & realbuffer = child ? buffer() : *buffer().masterBuffer();
BranchList const & branchlist = realbuffer.params().branchlist();
Branch const * ourBranch = branchlist.find(params_.branch);
}
-int InsetBranch::latex(odocstream & os, OutputParams const & runparams) const
+void InsetBranch::latex(otexstream & os, OutputParams const & runparams) const
{
- return isBranchSelected() ? InsetText::latex(os, runparams) : 0;
+ if (isBranchSelected())
+ InsetText::latex(os, runparams);
}
if (!isBranchSelected())
return 0;
- os << '[' << buffer().B_("branch") << ' ' << params_.branch << ":\n";
- InsetText::plaintext(os, runparams);
- os << "\n]";
-
- return PLAINTEXT_NEWLINE + 1; // one char on a separate line
+ int len = InsetText::plaintext(os, runparams);
+ return len;
}
docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const
{
- if (isBranchSelected())
- return InsetText::xhtml(xs, rp);
+ if (isBranchSelected()) {
+ OutputParams newrp = rp;
+ newrp.par_begin = 0;
+ newrp.par_end = text().paragraphs().size();
+ xhtmlParagraphs(text(), buffer(), xs, newrp);
+ }
return docstring();
}
-void InsetBranch::tocString(odocstream & os) const
+void InsetBranch::toString(odocstream & os) const
+{
+ if (isBranchSelected())
+ InsetCollapsable::toString(os);
+}
+
+
+void InsetBranch::forToc(docstring & os, size_t maxlen) const
{
if (isBranchSelected())
- InsetCollapsable::tocString(os);
+ InsetCollapsable::forToc(os, maxlen);
}
}
-docstring InsetBranch::contextMenu(BufferView const &, int, int) const
+string InsetBranch::contextMenuName() const
{
- return from_ascii("context-branch");
+ return "context-branch";
}
}
-void InsetBranch::addToToc(DocIterator const & cpit)
+void InsetBranch::addToToc(DocIterator const & cpit) const
{
DocIterator pit = cpit;
- pit.push_back(CursorSlice(*this));
+ pit.push_back(CursorSlice(const_cast<InsetBranch &>(*this)));
Toc & toc = buffer().tocBackend().toc("branch");
- docstring const str = params_.branch + ": " + text().getPar(0).asString();
- toc.push_back(TocItem(pit, 0, str, toolTipText()));
+ docstring str = params_.branch + ": ";
+ text().forToc(str, TOC_ENTRY_LENGTH);
+ toc.push_back(TocItem(pit, 0, str, toolTipText(docstring(), 3, 60)));
// Proceed with the rest of the inset.
InsetCollapsable::addToToc(cpit);
}
void InsetBranchParams::read(Lexer & lex)
{
- lex >> branch;
+ lex.eatLine();
+ branch = lex.getDocString();
}
} // namespace lyx
projects / features.git / blobdiff