anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-22 10:00:33 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fix bug #10213 as discussed there: We now display the same button

Browse Source 
whether the branch is open or closed.

(cherry picked from commit 3573b7270c)
This commit is contained in:
Richard Heck 2016-06-14 18:55:18 +01:00
parent 41f7f1d237
commit d1c11283a3
3 changed files with 25 additions and 20 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

38
src/insets/InsetBranch.cpp
View File

@ -82,36 +82,38 @@ docstring InsetBranch::toolTip(BufferView const & bv, int, int) const
}
docstring const InsetBranch::buttonLabel(BufferView const & bv) const
docstring const InsetBranch::buttonLabel(BufferView const &) const
{
static char_type const tick = 0x2714; // ✔ U+2714 HEAVY CHECK MARK
static char_type const cross = 0x2716; // ✖ U+2716 HEAVY MULTIPLICATION X
docstring s = _("Branch: ") + params_.branch;
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, master_selected ? tick : cross);
if (inchild && master_selected != child_selected)
symb += child_selected ? tick : cross;
if (decoration() == InsetLayout::CLASSIC)
return symb + (isOpen(bv) ? s : getNewLabel(s));
else
return symb + params_.branch + ": " + getNewLabel(s);
if (decoration() == InsetLayout::MINIMALISTIC)
return symb + params_.branch;
docstring s;
if (inmaster && inchild)
s = _("Branch: ");
else if (inchild) // && !inmaster
s = _("Branch (child only): ");
else if (inmaster) // && !inchild
s = _("Branch (master only): ");
else // !inmaster && !inchild
s = _("Branch (undefined): ");
s += params_.branch;
return symb + s;
}

2
src/insets/InsetBranch.h
View File

@ -61,7 +61,7 @@ private:
///
void read(Lexer & lex);
///
docstring const buttonLabel(BufferView const & bv) const;
docstring const buttonLabel(BufferView const &) const;
///
ColorCode backgroundColor(PainterInfo const &) const;
///

5
status.22x
View File

@ -23,7 +23,10 @@ What's new
* USER INTERFACE
- Syntax highlighting in the preamble and and the source view has been made
compatible with dark themes (#8325)
compatible with dark themes (bug 8325).
- Changed the display of buttons for collapsed branches. We now display the
same thing as if the branches were open (bug 10213).
- Added a new module "Title and Preamble Hacks".