Fixed some lines that were too long. It compiled afterwards.

[lyx.git] / src / ToolbarBackend.h

diff --git a/src/ToolbarBackend.h b/src/ToolbarBackend.h
index 8169ea910a9f60d4541cf84c06f1f8a14a025791..95dc8900b726e9021a1ff9aabf19d1907c8ccb57 100644 (file)
--- a/src/ToolbarBackend.h
+++ b/src/ToolbarBackend.h
@@ -13,87 +13,127 @@
 #ifndef TOOLBAR_BACKEND_H
 #define TOOLBAR_BACKEND_H
 
-#include "funcrequest.h"
+#include "FuncRequest.h"
 
 #include <vector>
 
 
-class LyXLex;
+namespace lyx {
 
 
-///
-class ToolbarBackend {
+class Lexer;
+
+class ToolbarItem {
 public:
-       /// The special toolbar actions
-       enum ItemType {
+       enum Type {
+               /// command/action
+               COMMAND,
                /// the command buffer
-               MINIBUFFER = -3,
+               MINIBUFFER,
                /// adds space between buttons in the toolbar
-               SEPARATOR = -2,
+               SEPARATOR,
                /// a special combox insead of a button
-               LAYOUTS = -1,
+               LAYOUTS,
+               /// a special widget to insert tabulars
+               TABLEINSERT,
+               ///
+               POPUPMENU,
+               ///
+               ICONPALETTE
        };
 
-       /// action, tooltip
-       typedef std::pair<FuncRequest, std::string> Item;
+       ToolbarItem(Type type,
+                FuncRequest const & func,
+                docstring const & label = docstring());
+
+       ToolbarItem(Type type,
+                std::string const & name = std::string(),
+                docstring const & label = docstring());
+
+       ~ToolbarItem();
+
+       /// item type
+       Type type_;
+       /// action
+       FuncRequest func_;
+       /// label/tooltip
+       docstring label_;
+       /// name
+       std::string name_;
+};
 
-       /// the toolbar items
-       typedef std::vector<Item> Items;
 
+///
+class ToolbarInfo {
+public:
        /// toolbar flags
        enum Flags {
-               ON = 1, //< always shown
-               OFF = 2, //< never shown
-               MATH = 4, //< shown when in math
-               TABLE = 8, //< shown when in table
+               ON = 1, //< show
+               OFF = 2, //< do not show
+               MATH = 4, //< show when in math
+               TABLE = 8, //< show when in table
                TOP = 16, //< show at top
                BOTTOM = 32, //< show at bottom
                LEFT = 64, //< show at left
-               RIGHT = 128 //< show at right
+               RIGHT = 128, //< show at right
+               REVIEW = 256, //< show when change tracking is enabled
+               AUTO = 512  //< only if AUTO is set, when MATH, TABLE and REVIEW is used
        };
+       /// the toolbar items
+       typedef std::vector<ToolbarItem> Items;
 
-       /// a toolbar
-       struct Toolbar {
-               /// toolbar name
-               std::string name;
-               /// toolbar GUI name
-               std::string gui_name;
-               /// toolbar contents
-               Items items;
-               /// flags
-               Flags flags;
-       };
+       typedef Items::const_iterator item_iterator;
 
-       typedef std::vector<Toolbar> Toolbars;
+       explicit ToolbarInfo(std::string const & name = std::string())
+               : name(name) {}
 
-       typedef Items::const_iterator item_iterator;
+       /// toolbar name
+       std::string name;
+       /// toolbar GUI name
+       std::string gui_name;
+       /// toolbar contents
+       Items items;
+       /// flags
+       Flags flags;
+
+       /// read a toolbar from the file
+       ToolbarInfo & read(Lexer &);
+
+private:
+       /// add toolbar item
+       void add(ToolbarItem const &);
+};
+
+
+///
+class ToolbarBackend {
+public:
+       typedef std::vector<ToolbarInfo> Toolbars;
 
        ToolbarBackend();
 
        /// iterator for all toolbars
-       Toolbars::const_iterator begin() const {
-               return usedtoolbars.begin();
-       }
+       Toolbars::const_iterator begin() const { return usedtoolbars.begin(); }
 
-       Toolbars::const_iterator end() const {
-               return usedtoolbars.end();
-       }
+       Toolbars::const_iterator end() const { return usedtoolbars.end(); }
 
-       /// read a toolbar from the file
-       void read(LyXLex &);
+       Toolbars::iterator begin() { return usedtoolbars.begin(); }
 
-       /// read the used toolbars
-       void readToolbars(LyXLex &);
+       Toolbars::iterator end() { return usedtoolbars.end(); }
 
-       /// return a full path of an XPM for the given action
-       static std::string const getIcon(FuncRequest const &);
+       /// read toolbars from the file
+       void readToolbars(Lexer &);
 
-private:
-       /// add the given lfun with tooltip if relevant
-       void add(Toolbar & tb, FuncRequest const &,
-                std::string const & tooltip = std::string());
+       /// read ui toolbar settings
+       void readToolbarSettings(Lexer &);
+
+       ///
+       ToolbarInfo const * getDefinedToolbarInfo(std::string const & name) const;
+       ///
+       ToolbarInfo * getUsedToolbarInfo(std::string const & name);
 
-       /// all the toolbars
+private:
+       /// all the defined toolbars
        Toolbars toolbars;
 
        /// toolbars listed
@@ -104,4 +144,7 @@ private:
 extern ToolbarBackend toolbarbackend;
 
 
+
+} // namespace lyx
+
 #endif // TOOLBAR_BACKEND_H