Enable OK/Apply buttons when resetting to class defaults.

[lyx.git] / src / BranchList.cpp

diff --git a/src/BranchList.cpp b/src/BranchList.cpp
index a593c5478fc91e9b421537f6cc849b32b2590238..4624f19f4da4c2091b0375112bf57d1343d64b77 100644 (file)
--- 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)
@@ -150,4 +177,36 @@ bool BranchList::remove(docstring const & s)
 }
 
 
+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;
+       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