X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.cpp;h=77af2829e1a70421e319ea01bcbc03068aad03d5;hb=cf6ff2cac79d09adafa63e3a1ec02dfb09f707b9;hp=e966de29ea431eade918129e383227ce44966487;hpb=3588f2f69675df8dbf829800b0ed6e4a455c68b4;p=lyx.git diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp index e966de29ea..77af2829e1 100644 --- a/src/insets/InsetBranch.cpp +++ b/src/insets/InsetBranch.cpp @@ -33,6 +33,7 @@ #include "support/gettext.h" #include "support/lstrings.h" +#include "frontends/alert.h" #include "frontends/Application.h" #include @@ -43,7 +44,7 @@ using namespace std; namespace lyx { InsetBranch::InsetBranch(Buffer * buf, InsetBranchParams const & params) - : InsetCollapsable(buf, InsetText::DefaultLayout), params_(params) + : InsetCollapsible(buf, InsetText::DefaultLayout), params_(params) {} @@ -52,14 +53,14 @@ void InsetBranch::write(ostream & os) const os << "Branch "; params_.write(os); os << '\n'; - InsetCollapsable::write(os); + InsetCollapsible::write(os); } void InsetBranch::read(Lexer & lex) { params_.read(lex); - InsetCollapsable::read(lex); + InsetCollapsible::read(lex); } @@ -71,45 +72,61 @@ docstring InsetBranch::toolTip(BufferView const & bv, int, int) const _("active") : _("non-active"); docstring const status = (masterstatus == childstatus) ? masterstatus : - support::bformat(_("master: %1$s, child: %2$s"), + support::bformat(_("master %1$s, child %2$s"), masterstatus, childstatus); - docstring const heading = - support::bformat(_("Branch (%1$s): %2$s"), status, params_.branch); + + docstring const masteron = producesOutput() ? + _("on") : _("off"); + docstring const childon = + (isBranchSelected(true) != params_.inverted) ? + _("on") : _("off"); + docstring const onoff = (masteron == childon) ? + masteron : + support::bformat(_("master %1$s, child %2$s"), + masteron, childon); + + docstring const heading = + support::bformat(_("Branch Name: %1$s\nBranch Status: %2$s\nInset Status: %3$s"), + params_.branch, status, onoff); + if (isOpen(bv)) return heading; return toolTipText(heading + from_ascii("\n")); } -docstring const InsetBranch::buttonLabel(BufferView const & bv) const +docstring const InsetBranch::buttonLabel(BufferView const &) const { - docstring s = _("Branch: ") + params_.branch; + static char_type const tick = 0x2714; // ✔ U+2714 HEAVY CHECK MARK + static char_type const cross = 0x2716; // ✖ U+2716 HEAVY MULTIPLICATION X + Buffer const & realbuffer = *buffer().masterBuffer(); BranchList const & branchlist = realbuffer.params().branchlist(); 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 (inmaster && !inchild) - s = _("Branch (master only): ") + params_.branch; - else if (!inmaster) - s = _("Branch (undefined): ") + params_.branch; - if (!params_.branch.empty()) { - // FIXME UNICODE - ColorCode c = lcolor.getFromLyXName(to_utf8(params_.branch)); - if (c == Color_none) - s = _("Undef: ") + s; - } - bool const master_selected = isBranchSelected(); - bool const child_selected = isBranchSelected(true); - docstring symb = docstring(1, char_type(master_selected ? 0x2714 : 0x2716)); + + bool const master_selected = producesOutput(); + bool const child_selected = isBranchSelected(true) != params_.inverted; + + docstring symb = docstring(1, master_selected ? tick : cross); 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 - return params_.branch + ": " + getNewLabel(s); + symb += (child_selected ? tick : cross); + + if (decoration() == InsetLayout::MINIMALISTIC) + return symb + params_.branch; + + docstring s; + if (inmaster && inchild) + s = _("Branch: "); + else if (inchild) // && !inmaster + s = _("Branch (child): "); + else if (inmaster) // && !inchild + s = _("Branch (master): "); + else // !inmaster && !inchild + s = _("Branch (undefined): "); + s += params_.branch; + + return symb + s; } @@ -132,8 +149,9 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) InsetBranchParams params; InsetBranch::string2params(to_utf8(cmd.argument()), params); - cur.recordUndoInset(ATOMIC_UNDO, this); + cur.recordUndoInset(this); params_.branch = params.branch; + params_.inverted = params.inverted; // what we really want here is a TOC update, but that means // a full buffer update cur.forceBufferUpdate(); @@ -159,13 +177,29 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) // 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. + // An option would be to check if the master is hidden. + // If it is, unhide. if (!master) - buffer().undo().recordUndoFullDocument(cur); + buffer().undo().recordUndoBufferParams(cur); + else + // at least issue a warning for now (ugly, but better than dataloss). + frontend::Alert::warning(_("Branch state changes in master document"), + lyx::support::bformat(_("The state of the branch '%1$s' " + "was changed in the master file. " + "Please make sure to save the master."), params_.branch), true); our_branch->setSelected(activate); - cur.forceBufferUpdate(); + // cur.forceBufferUpdate() is not enough + buf->updateBuffer(); } break; } + case LFUN_BRANCH_INVERT: + cur.recordUndoInset(this); + params_.inverted = !params_.inverted; + // what we really want here is a TOC update, but that means + // a full buffer update + cur.forceBufferUpdate(); + break; case LFUN_BRANCH_ADD: lyx::dispatch(FuncRequest(LFUN_BRANCH_ADD, params_.branch)); break; @@ -173,11 +207,11 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd) if (cmd.argument() == "assign") setStatus(cur, isBranchSelected() ? Open : Collapsed); else - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; default: - InsetCollapsable::doDispatch(cur, cmd); + InsetCollapsible::doDispatch(cur, cmd); break; } } @@ -198,6 +232,11 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, flag.setEnabled(known_branch && !isBranchSelected(true)); break; + case LFUN_BRANCH_INVERT: + flag.setEnabled(true); + flag.setOnOff(params_.inverted); + break; + case LFUN_BRANCH_ADD: flag.setEnabled(!known_branch); break; @@ -220,11 +259,11 @@ bool InsetBranch::getStatus(Cursor & cur, FuncRequest const & cmd, if (cmd.argument() == "assign") flag.setEnabled(true); else - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); break; default: - return InsetCollapsable::getStatus(cur, cmd, flag); + return InsetCollapsible::getStatus(cur, cmd, flag); } return true; } @@ -246,20 +285,26 @@ bool InsetBranch::isBranchSelected(bool const child) const } +bool InsetBranch::producesOutput() const +{ + return isBranchSelected() != params_.inverted; +} + + void InsetBranch::latex(otexstream & os, OutputParams const & runparams) const { - if (isBranchSelected()) + if (producesOutput()) InsetText::latex(os, runparams); } -int InsetBranch::plaintext(odocstream & os, - OutputParams const & runparams) const +int InsetBranch::plaintext(odocstringstream & os, + OutputParams const & runparams, size_t max_length) const { - if (!isBranchSelected()) + if (!producesOutput()) return 0; - int len = InsetText::plaintext(os, runparams); + int len = InsetText::plaintext(os, runparams, max_length); return len; } @@ -267,13 +312,13 @@ int InsetBranch::plaintext(odocstream & os, int InsetBranch::docbook(odocstream & os, OutputParams const & runparams) const { - return isBranchSelected() ? InsetText::docbook(os, runparams) : 0; + return producesOutput() ? InsetText::docbook(os, runparams) : 0; } docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const { - if (isBranchSelected()) { + if (producesOutput()) { OutputParams newrp = rp; newrp.par_begin = 0; newrp.par_end = text().paragraphs().size(); @@ -285,22 +330,23 @@ docstring InsetBranch::xhtml(XHTMLStream & xs, OutputParams const & rp) const void InsetBranch::toString(odocstream & os) const { - if (isBranchSelected()) - InsetCollapsable::toString(os); + if (producesOutput()) + InsetCollapsible::toString(os); } -void InsetBranch::forToc(docstring & os, size_t maxlen) const +void InsetBranch::forOutliner(docstring & os, size_t const maxlen, + bool const shorten) const { - if (isBranchSelected()) - InsetCollapsable::forToc(os, maxlen); + if (producesOutput()) + InsetCollapsible::forOutliner(os, maxlen, shorten); } void InsetBranch::validate(LaTeXFeatures & features) const { - if (isBranchSelected()) - InsetCollapsable::validate(features); + if (producesOutput()) + InsetCollapsible::validate(features); } @@ -310,10 +356,10 @@ string InsetBranch::contextMenuName() const } -bool InsetBranch::isMacroScope() const +bool InsetBranch::isMacroScope() const { // Its own scope if not selected by buffer - return !isBranchSelected(); + return !producesOutput(); } @@ -339,30 +385,26 @@ void InsetBranch::string2params(string const & in, InsetBranchParams & params) } -void InsetBranch::addToToc(DocIterator const & cpit) const +void InsetBranch::updateBuffer(ParIterator const & it, UpdateType utype) { - DocIterator pit = cpit; - pit.push_back(CursorSlice(const_cast(*this))); - - Toc & toc = buffer().tocBackend().toc("branch"); - 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); + setLabel(params_.branch + (params_.inverted ? " (-)" : "")); + InsetCollapsible::updateBuffer(it, utype); } void InsetBranchParams::write(ostream & os) const { - os << to_utf8(branch); + os << to_utf8(branch) + << '\n' + << "inverted " + << inverted; } void InsetBranchParams::read(Lexer & lex) { - lex.eatLine(); - branch = lex.getDocString(); + lex >> branch; + lex >> "inverted" >> inverted; } } // namespace lyx