#include <config.h>
#include "BranchList.h"
+#include "LColor.h"
+
+#include "frontends/Application.h"
+
+#include <algorithm>
+
+
+namespace lyx {
using std::string;
-string const & Branch::getBranch() const
+Branch::Branch()
+{
+ theApp()->getRgbColor(LColor::background, color_);
+}
+
+
+docstring const & Branch::getBranch() const
{
return branch_;
}
-void Branch::setBranch(string const & s)
+void Branch::setBranch(docstring const & s)
{
branch_ = s;
}
}
-string const & Branch::getColor() const
+RGBColor const & Branch::getColor() const
{
return color_;
}
-void Branch::setColor(string const & c)
+void Branch::setColor(RGBColor const & c)
{
color_ = c;
}
-Branch * BranchList::find(std::string const & name)
+void Branch::setColor(string const & c)
+{
+ if (c.size() == 7 && c[0] == '#')
+ color_ = RGBColor(c);
+ else
+ // no color set or invalid color - use normal background
+ theApp()->getRgbColor(LColor::background, color_);
+}
+
+
+Branch * BranchList::find(docstring const & name)
{
List::iterator it =
std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
}
-Branch const * BranchList::find(std::string const & name) const
+Branch const * BranchList::find(docstring const & name) const
{
List::const_iterator it =
std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
}
-bool BranchList::add(string const & s)
+bool BranchList::add(docstring const & s)
{
bool added = false;
- string::size_type i = 0;
+ docstring::size_type i = 0;
while (true) {
- string::size_type const j = s.find_first_of(separator_, i);
- string name;
- if (j == string::npos)
+ docstring::size_type const j = s.find_first_of(separator_, i);
+ docstring name;
+ if (j == docstring::npos)
name = s.substr(i);
else
name = s.substr(i, j - i);
Branch br;
br.setBranch(name);
br.setSelected(false);
- br.setColor("none");
list.push_back(br);
}
- if (j == string::npos)
+ if (j == docstring::npos)
break;
i = j + 1;
}
}
-bool BranchList::remove(string const & s)
+bool BranchList::remove(docstring const & s)
{
- List::size_type const size = list.size();
+ size_t const size = list.size();
list.remove_if(BranchNamesEqual(s));
return size != list.size();
}
+
+
+} // namespace lyx