#include "frontends/Application.h"
+#include "support/convert.h"
#include "support/lstrings.h"
#include <algorithm>
namespace lyx {
-Branch::Branch()
- : selected_(false), filenameSuffix_(false)
-{
- lmcolor_ = "background";
- dmcolor_ = "background";
-}
-
-
docstring const & Branch::branch() const
{
return branch_;
else if (lmcolor.size() != 7 || lmcolor[0] != '#')
lmcolor = lcolor.getX11HexName(lcolor.getFromLyXName(lmcolor));
if (dmcolor == "none")
- lmcolor = lcolor.getX11HexName(Color_background, true);
+ dmcolor = lcolor.getX11HexName(Color_background, true);
else if (dmcolor.size() != 7 || dmcolor[0] != '#')
dmcolor = lcolor.getX11HexName(lcolor.getFromLyXName(dmcolor), true);
// FIXME UNICODE
- lcolor.setColor(to_utf8(branch_), lmcolor, dmcolor);
+ lcolor.setColor("branch" + convert<string>(branch_list_id_)
+ + to_utf8(branch_), lmcolor, dmcolor);
}
br.setBranch(name);
br.setSelected(false);
br.setFileNameSuffix(false);
+ br.setListID(id_);
list_.push_back(br);
}
if (j == docstring::npos)
if (find(newname)) {
// new name already taken
if (merge)
- return remove(oldname);
+ return remove(oldname);
return false;
}