mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-12-26 22:17:41 +00:00
399e6e788c
* src/frontends/xforms/Color.[Ch]: move to src * src/Color.[Ch] (getRGBColor): move to src/frontends/*/lyx_gui.C * src/BranchList.h (Branch::color_): change type to lyx::RGBColor * src/BranchList.[Ch] (Branch): new constrcutor, set color_ to LColor::background (getColor, setColor): adapt to type change of color_ * src/bufferparams.C (BufferParams::writeFile): adapt to type change of branch color * src/frontends/lyx_gui.h * src/frontends/gtk/lyx_gui.C * src/frontends/qt2/lyx_gui.C * src/frontends/qt4/lyx_gui.C * src/frontends/xforms/lyx_gui.C (getRGBColor): move from src/Color.[Ch] here * src/frontends/gtk/lyx_gui.C * src/frontends/xforms/lyx_gui.C (hexname): use getRGBColor * src/frontends/gtk/GDocument.C (update): adapt to type change of branch color (apply): add comment about color chooser * src/frontends/qt2/QDocumentDialog.C (updateBranchView): adapt to type change of branch color (toggleBranchColor): ditto * src/frontends/qt2/lcolorcache.[Ch] * src/frontends/qt4/lcolorcache.[Ch] (rgb2qcolor): new utility function * src/frontends/qt4/QBranches.C (QBranches::update): adapt to type change of branch color (QBranches::on_colorPB_clicked): ditto * src/frontends/xforms/FormDocument.C (get_current_color): adapt to type change of branch color (FormDocument::branch_update): * src/frontends/xforms/FormPreferences.C (FormPreferences::Colors::LoadBrowse): adapt to RGBColor changes * src/frontends/xforms/FormPreferences.h: remove unneeded RGBColor forward declaration * src/frontends/xforms/XWorkArea.C (XWorkArea::XWorkArea): adapt to RGBColor changes * src/frontends/xforms/Makefile.am: remove Color.[Ch] * src/frontends/xforms/FormColorpicker.[Ch]: adapt to RGBColor changes * src/frontends/xforms/xformsImage.C: adapt to RGBColor changes * src/frontends/controllers/ControlDocument.C (ControlDocument::dispatchParams): adapt to type change of branch color * src/Makefile.am: add Color.[Ch] git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@13466 a592a061-630c-0410-9148-cb99ea01b6c8
128 lines
2.2 KiB
C
128 lines
2.2 KiB
C
/**
|
|
* \file BranchList.C
|
|
* This file is part of LyX, the document processor.
|
|
* Licence details can be found in the file COPYING.
|
|
*
|
|
* \author Martin Vermeer
|
|
*
|
|
* Full author contact details are available in file CREDITS.
|
|
*/
|
|
|
|
#include <config.h>
|
|
|
|
#include "BranchList.h"
|
|
#include "LColor.h"
|
|
#include "frontends/lyx_gui.h"
|
|
#include <algorithm>
|
|
|
|
using std::string;
|
|
|
|
|
|
Branch::Branch()
|
|
{
|
|
lyx_gui::getRGBColor(LColor::background, color_);
|
|
}
|
|
|
|
|
|
string const & Branch::getBranch() const
|
|
{
|
|
return branch_;
|
|
}
|
|
|
|
|
|
void Branch::setBranch(string const & s)
|
|
{
|
|
branch_ = s;
|
|
}
|
|
|
|
|
|
bool Branch::getSelected() const
|
|
{
|
|
return selected_;
|
|
}
|
|
|
|
|
|
bool Branch::setSelected(bool b)
|
|
{
|
|
if (b == selected_)
|
|
return false;
|
|
selected_ = b;
|
|
return true;
|
|
}
|
|
|
|
|
|
lyx::RGBColor const & Branch::getColor() const
|
|
{
|
|
return color_;
|
|
}
|
|
|
|
|
|
void Branch::setColor(lyx::RGBColor const & c)
|
|
{
|
|
color_ = c;
|
|
}
|
|
|
|
|
|
void Branch::setColor(string const & c)
|
|
{
|
|
if (c.size() == 7 && c[0] == '#')
|
|
color_ = lyx::RGBColor(c);
|
|
else
|
|
// no color set or invalid color - use normal background
|
|
lyx_gui::getRGBColor(LColor::background, color_);
|
|
}
|
|
|
|
|
|
Branch * BranchList::find(std::string const & name)
|
|
{
|
|
List::iterator it =
|
|
std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
|
|
return it == list.end() ? 0 : &*it;
|
|
}
|
|
|
|
|
|
Branch const * BranchList::find(std::string const & name) const
|
|
{
|
|
List::const_iterator it =
|
|
std::find_if(list.begin(), list.end(), BranchNamesEqual(name));
|
|
return it == list.end() ? 0 : &*it;
|
|
}
|
|
|
|
|
|
bool BranchList::add(string const & s)
|
|
{
|
|
bool added = false;
|
|
string::size_type i = 0;
|
|
while (true) {
|
|
string::size_type const j = s.find_first_of(separator_, i);
|
|
string name;
|
|
if (j == string::npos)
|
|
name = s.substr(i);
|
|
else
|
|
name = s.substr(i, j - i);
|
|
// Is this name already in the list?
|
|
bool const already =
|
|
std::find_if(list.begin(), list.end(),
|
|
BranchNamesEqual(name)) != list.end();
|
|
if (!already) {
|
|
added = true;
|
|
Branch br;
|
|
br.setBranch(name);
|
|
br.setSelected(false);
|
|
list.push_back(br);
|
|
}
|
|
if (j == string::npos)
|
|
break;
|
|
i = j + 1;
|
|
}
|
|
return added;
|
|
}
|
|
|
|
|
|
bool BranchList::remove(string const & s)
|
|
{
|
|
List::size_type const size = list.size();
|
|
list.remove_if(BranchNamesEqual(s));
|
|
return size != list.size();
|
|
}
|