Fix some issues with textmode. We'll let SetMode() handle as much of

[lyx.git] / src / BranchList.h

diff --git a/src/BranchList.h b/src/BranchList.h
index 403b3084ad1b51f682f0afaf64dd901cee6734ef..21f8d05303d6b4fd86791bbdbe4ea58c14d2613e 100644 (file)
--- a/src/BranchList.h
+++ b/src/BranchList.h
@@ -27,80 +27,108 @@
  */
 
 
-#ifndef BRANCHES_H
-#define BRANCHES_H
+#ifndef BRANCHLIST_H
+#define BRANCHLIST_H
+
+#include "ColorCode.h"
+
+#include "support/docstring.h"
 
-#include "support/std_string.h"
 #include <list>
 
+
+namespace lyx {
+
 class Branch {
 public:
        ///
-       string const getBranch() const;
-       ///
-       void setBranch(string const &);
-       ///
-       bool getSelected() const;
-       ///
-       void setSelected(bool);
-       ///
-       string const getColor() const;
-       ///
-       void setColor(string const &);
-
+       Branch();
+       ///
+       docstring const & branch() const;
+       ///
+       void setBranch(docstring const &);
+       ///
+       bool isSelected() const;
+       /** Select/deselect the branch.
+        *  \return true if the selection status changes.
+        */
+       bool setSelected(bool);
+       /** If true, the branch name will be appended
+        *  to the output file name.
+        */
+       bool hasFilenameSuffix() const;
+       /// Select/deselect filename suffix property.
+       void setFilenameSuffix(bool);
+       ///
+       RGBColor const & color() const;
+       ///
+       void setColor(RGBColor const &);
+       /**
+        * Set color from a string "#rrggbb".
+        * Use Color:background if the string is no valid color.
+        * This ensures compatibility with LyX 1.4.0 that had the symbolic
+        * color "none" that was displayed as Color:background.
+        */
+       void setColor(std::string const &);
 
 private:
        ///
-       string branch_;
+       docstring branch_;
        ///
        bool selected_;
        ///
-       string color_;
+       bool filenameSuffix_;
+       ///
+       RGBColor color_;
 };
 
 
 class BranchList {
-public:
-       ///
-       BranchList() : separator_("|") {}
-
        ///
        typedef std::list<Branch> List;
+public:
+       typedef List::const_iterator const_iterator;
 
        ///
-       void clear();
-       ///
-       bool empty() { return list.empty(); }
-       ///
-       bool size() const { return list.size(); }
-       ///
-       List::const_iterator begin() const { return list.begin(); }
-       ///
-       List::const_iterator end() const { return list.end(); }
-       ///
-       string getColor(string const &) const;
+       BranchList() : separator_(from_ascii("|")) {}
+
        ///
-       void setColor(string const &, string const &);
-       /// Select/deselect multiple branches given in '|'-separated string
-       void setSelected(string const &, bool);
-       /// Add multiple branches to list
-       void add(string const &);
-       /// remove a branch from list by name
-       void remove(string const &);
-       /// return whether this branch is selected
-       bool selected(string const &) const;
-       /// return, as a '|'-separated string, all branch names
-       string allBranches() const;
+       bool empty() const { return list.empty(); }
        ///
-       string allSelected() const;
+       void clear() { list.clear(); }
        ///
-       string const separator() const;
+       const_iterator begin() const { return list.begin(); }
+       const_iterator end() const { return list.end(); }
+
+       /** \returns the Branch with \c name. If not found, returns 0.
+        */
+       Branch * find(docstring const & name);
+       Branch const * find(docstring const & name) const;
+
+       /** Add (possibly multiple (separated by separator())) branches to list
+        *  \returns true if a branch is added.
+        */
+       bool add(docstring const &);
+       /** remove a branch from list by name
+        *  \returns true if a branch is removed.
+        */
+       bool remove(docstring const &);
+       /** rename an branch in list
+        *  \returns true if renaming succeeded.
+        * if \p merge is true, the branch will be removed
+        * if a branch with the newname already exists.
+        */
+       bool rename(docstring const &, docstring const &, bool const merge = false);
+       /// get the complete filename suffix
+       docstring getFilenameSuffix() const;
 
 private:
        ///
        List list;
        ///
-       string separator_;
+       docstring separator_;
 };
 
-#endif
+} // namespace lyx
+
+#endif // BRANCHLIST_H