X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.cpp;h=9c0078b316ef52afb4ae7df2d85e73a8c0da929a;hb=4732da8dc2ffb44a418b0e776ff607079720736a;hp=5ca0fd58fc62cba233dbeff99a590c311bb559a2;hpb=9abb7db46800e554f57e865a3e768602ffd9d6f1;p=lyx.git

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 5ca0fd58fc..9c0078b316 100644
--- a/src/BranchList.cpp
+++ b/src/BranchList.cpp
@@ -4,6 +4,7 @@
  * Licence details can be found in the file COPYING.
  *
  * \author Martin Vermeer
+ * \author Jürgen Spitzmüller
  *
  * Full author contact details are available in file CREDITS.
  */
@@ -15,22 +16,47 @@
 
 #include "frontends/Application.h"
 
+#include "support/lstrings.h"
+
 #include <algorithm>
 
 using namespace std;
 
+
 namespace lyx {
 
+namespace {
 
-Branch::Branch() : selected_(false)
+class BranchNamesEqual : public std::unary_function<Branch, bool>
+{
+public:
+	BranchNamesEqual(docstring const & name)
+		: name_(name)
+	{}
+
+	bool operator()(Branch const & branch) const
+	{
+		return branch.branch() == name_;
+	}
+private:
+	docstring name_;
+};
+
+} // namespace
+
+
+Branch::Branch()
+	: selected_(false), filenameSuffix_(false)
 {
 	// no theApp() with command line export
 	if (theApp())
 		theApp()->getRgbColor(Color_background, color_);
+	else
+		frontend::Application::getRgbColorUncached(Color_background, color_);
 }
 
 
-docstring const & Branch::getBranch() const
+docstring const & Branch::branch() const
 {
 	return branch_;
 }
@@ -42,7 +68,7 @@ void Branch::setBranch(docstring const & s)
 }
 
 
-bool Branch::getSelected() const
+bool Branch::isSelected() const
 {
 	return selected_;
 }
@@ -57,7 +83,19 @@ bool Branch::setSelected(bool b)
 }
 
 
-RGBColor const & Branch::getColor() const
+bool Branch::hasFileNameSuffix() const
+{
+	return filenameSuffix_;
+}
+
+
+void Branch::setFileNameSuffix(bool b)
+{
+	filenameSuffix_ = b;
+}
+
+
+RGBColor const & Branch::color() const
 {
 	return color_;
 }
@@ -73,34 +111,39 @@ void Branch::setColor(string const & str)
 {
 	if (str.size() == 7 && str[0] == '#')
 		color_ = rgbFromHexName(str);
-	else
+	else {
 		// no color set or invalid color - use normal background
-		theApp()->getRgbColor(Color_background, color_);
+		// no theApp() with command line export
+		if (theApp())
+			theApp()->getRgbColor(Color_background, color_);
+		else
+			frontend::Application::getRgbColorUncached(Color_background, color_);
+	}
 }
 
 
 Branch * BranchList::find(docstring const & name)
 {
 	List::iterator it =
-		find_if(list.begin(), list.end(), BranchNamesEqual(name));
-	return it == list.end() ? 0 : &*it;
+		find_if(list_.begin(), list_.end(), BranchNamesEqual(name));
+	return it == list_.end() ? 0 : &*it;
 }
 
 
 Branch const * BranchList::find(docstring const & name) const
 {
 	List::const_iterator it =
-		find_if(list.begin(), list.end(), BranchNamesEqual(name));
-	return it == list.end() ? 0 : &*it;
+		find_if(list_.begin(), list_.end(), BranchNamesEqual(name));
+	return it == list_.end() ? 0 : &*it;
 }
 
 
 bool BranchList::add(docstring const & s)
 {
 	bool added = false;
-	docstring::size_type i = 0;
+	size_t i = 0;
 	while (true) {
-		docstring::size_type const j = s.find_first_of(separator_, i);
+		size_t const j = s.find_first_of(separator_, i);
 		docstring name;
 		if (j == docstring::npos)
 			name = s.substr(i);
@@ -108,14 +151,15 @@ bool BranchList::add(docstring const & s)
 			name = s.substr(i, j - i);
 		// Is this name already in the list?
 		bool const already =
-			find_if(list.begin(), list.end(),
-				     BranchNamesEqual(name)) != list.end();
+			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);
+			br.setFileNameSuffix(false);
+			list_.push_back(br);
 		}
 		if (j == docstring::npos)
 			break;
@@ -127,10 +171,41 @@ bool BranchList::add(docstring const & s)
 
 bool BranchList::remove(docstring const & s)
 {
-	size_t const size = list.size();
-	list.remove_if(BranchNamesEqual(s));
-	return size != list.size();
+	size_t const size = list_.size();
+	list_.remove_if(BranchNamesEqual(s));
+	return size != list_.size();
 }
 
 
+bool BranchList::rename(docstring const & oldname,
+	docstring const & newname, bool const merge)
+{
+	if (newname.empty())
+		return false;
+	if (find_if(list_.begin(), list_.end(),
+			BranchNamesEqual(newname)) != list_.end()) {
+		// new name already taken
+		if (merge)
+		      return remove(oldname);
+		return false;
+	}
+
+	Branch * branch = find(oldname);
+	if (!branch)
+		return false;
+	branch->setBranch(newname);
+	return true;
+}
+
+
+docstring BranchList::getFileNameSuffix() const
+{
+	docstring result;
+	for (auto const & br : list_) {
+		if (br.isSelected() && br.hasFileNameSuffix())
+			result += "-" + br.branch();
+	}
+	return support::subst(result, from_ascii("/"), from_ascii("_"));
+}
+
 } // namespace lyx