X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2Finsets%2FInsetBranch.cpp;h=62f6a57dbca5944e9bb44445382871a831c82462;hb=b81c90adeef28a836d9786671849401b747e350b;hp=51758724bf605a3dc7adfbd958415a32e424085c;hpb=fc6ce7cd08562fd7bab4427880b46390bb7d2f07;p=lyx.git

diff --git a/src/insets/InsetBranch.cpp b/src/insets/InsetBranch.cpp
index 51758724bf..62f6a57dbc 100644
--- a/src/insets/InsetBranch.cpp
+++ b/src/insets/InsetBranch.cpp
@@ -22,7 +22,6 @@
 #include "gettext.h"
 #include "Color.h"
 #include "Lexer.h"
-#include "Paragraph.h"
 #include "OutputParams.h"
 
 #include <sstream>
@@ -98,22 +97,33 @@ void InsetBranch::setButtonLabel()
 	font.decSize();
 
 	docstring s = _("Branch: ") + params_.branch;
-	font.setColor(Color::foreground);
 	if (!params_.branch.empty()) {
 		// FIXME UNICODE
 		Color_color c = lcolor.getFromLyXName(to_utf8(params_.branch));
 		if (c == Color::none) {
-			c = Color::error;
 			s = _("Undef: ") + s;
 		}
-		setBackgroundColor(c);
-	} else
-		setBackgroundColor(Color::background);
+	}
+	font.setColor(Color::foreground);
 	setLabel(isOpen() ? s : getNewLabel(s) );
 	setLabelFont(font);
 }
 
 
+Color_color 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;
+		}
+		return c;
+	} else
+		return Inset::backgroundColor();
+}
+
+
 bool InsetBranch::showInsetDialog(BufferView * bv) const
 {
 	InsetBranchMailer(const_cast<InsetBranch &>(*this)).showDialog(bv);
@@ -152,7 +162,7 @@ void InsetBranch::doDispatch(Cursor & cur, FuncRequest & cmd)
 
 
 	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)
@@ -222,7 +232,7 @@ bool InsetBranch::isBranchSelected(Buffer const & buffer) const
 
 
 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;
@@ -230,12 +240,12 @@ int InsetBranch::latex(Buffer const & buf, odocstream & os,
 
 
 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]";
 
@@ -244,7 +254,7 @@ int InsetBranch::plaintext(Buffer const & buf, odocstream & os,
 
 
 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;
@@ -304,7 +314,7 @@ void InsetBranchMailer::string2params(string const & in,
 		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")