X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FBranchList.cpp;h=4624f19f4da4c2091b0375112bf57d1343d64b77;hb=6de3c19fd63f810eed90ef3bc4469faf28e949c2;hp=02f8b8688d4d377976588f7d58ec7fa7c0bdfca6;hpb=5fdd2daa9c30c70a6c049376bd293addb05b5aad;p=lyx.git

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index 02f8b8688d..4624f19f4d 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,6 +16,8 @@
 
 #include "frontends/Application.h"
 
+#include "support/lstrings.h"
+
 #include <algorithm>
 
 using namespace std;
@@ -27,7 +30,9 @@ namespace {
 class BranchNamesEqual : public std::unary_function<Branch, bool>
 {
 public:
-	BranchNamesEqual(docstring const & name) : name_(name) {}
+	BranchNamesEqual(docstring const & name)
+		: name_(name)
+	{}
 
 	bool operator()(Branch const & branch) const
 	{
@@ -36,14 +41,18 @@ public:
 private:
 	docstring name_;
 };
+
 }
 
 
-Branch::Branch() : selected_(false)
+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_);
 }
 
 
@@ -74,6 +83,18 @@ bool Branch::setSelected(bool b)
 }
 
 
+bool Branch::hasFileNameSuffix() const
+{
+	return filenameSuffix_;
+}
+
+
+void Branch::setFileNameSuffix(bool b)
+{
+	filenameSuffix_ = b;
+}
+
+
 RGBColor const & Branch::color() const
 {
 	return color_;
@@ -90,9 +111,14 @@ 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_);
+	}
 }
 
 
@@ -132,6 +158,7 @@ bool BranchList::add(docstring const & s)
 			Branch br;
 			br.setBranch(name);
 			br.setSelected(false);
+			br.setFileNameSuffix(false);
 			list.push_back(br);
 		}
 		if (j == docstring::npos)
@@ -171,4 +198,15 @@ bool BranchList::rename(docstring const & oldname,
 }
 
 
+docstring BranchList::getFileNameSuffix() const
+{
+	docstring result;
+	List::const_iterator it = list.begin();
+	for (; it != list.end(); ++it) {
+		if (it->isSelected() && it->hasFileNameSuffix())
+			result += "-" + it->branch();
+	}
+	return support::subst(result, from_ascii("/"), from_ascii("_"));
+}
+
 } // namespace lyx