X-Git-Url: https://git.lyx.org/gitweb/?a=blobdiff_plain;f=src%2FLColor.h;h=b9595e393f061cf3efe547bf27498bed369689df;hb=6688a55908e69456ea774cea04f4b318e9b2b64a;hp=1799d3f4c983f178fbd3db2e6da0e9b3e6b198ed;hpb=b60c06df7e3e2f9da35aead443e0b3fb82a3f544;p=lyx.git diff --git a/src/LColor.h b/src/LColor.h index 1799d3f4c9..b9595e393f 100644 --- a/src/LColor.h +++ b/src/LColor.h @@ -1,33 +1,33 @@ // -*- C++ -*- -/* This file is part of - * ====================================================== - * - * LyX, The Document Processor - * - * Copyright 1998-2001 The LyX Team +/** + * \file LColor.h + * This file is part of LyX, the document processor. + * Licence details can be found in the file COPYING. + * + * \author Asger Alstrup + * \author Lars Gullik Bjønnes + * \author Matthias Ettrich + * \author Jean-Marc Lasgouttes + * \author Angus Leeming + * \author John Levon + * \author André Pönitz + * \author Martin Vermeer * - *======================================================*/ + * Full author contact details are available in file CREDITS. + */ #ifndef LCOLOR_H #define LCOLOR_H -#ifdef __GNUG__ -#pragma interface -#endif - -#include - -#include "LString.h" -#include +#include +#include /** - This is a stateless class. - - It has one basic purposes: - To serve as a color-namespace container (the Color enum). - - - */ + * This is a stateless class. + * + * It has one basic purposes: + * To serve as a color-namespace container (the Color enum). + */ /** * \class LColor * @@ -39,8 +39,8 @@ * - A real, predefined color, such as black, white, red or green. * - A logical color, such as no color, inherit, math */ - -class LColor // : public boost::noncopyable { + +class LColor // made copyable for same reasons as LyXRC was made copyable. See there for // explanation. { @@ -78,11 +78,21 @@ public: selection, /// Text color in LaTeX mode latex, + /// The color used for previews + preview, /// Text color for notes note, /// Background color of notes notebg, + /// Text color for comments + comment, + /// Background color of comments + commentbg, + /// Text color for greyedout inset + greyedout, + /// Background color of greyedout inset + greyedoutbg, /// Color for the depth bars in the margin @@ -100,6 +110,8 @@ public: /// Special chars text color special, + /// Graphics inset background color + graphicsbg, /// Math inset text color math, /// Math inset background color @@ -108,14 +120,12 @@ public: mathmacrobg, /// Math inset frame color mathframe, - /// Math cursor color - mathcursor, /// Math line color mathline, /// caption frame color captionframe, - + /// collapsable insets text collapsable, /// collapsable insets frame @@ -130,10 +140,16 @@ public: error, /// EOL marker color eolmarker, - /// Appendix line color - appendixline, - /// VFill line color - vfillline, + /// Added space colour + added_space, + /// Appendix marker color + appendix, + /// changebar color + changebar, + /// strike-out color + strikeout, + /// added text color + newtext, /// Top and bottom line color topline, /// Table line color @@ -157,7 +173,7 @@ public: /// Color used for bottom background buttonbg, - // Logical attributes + // Logical attributes /// Color is inherited inherit, @@ -165,53 +181,71 @@ public: ignore }; + /// LColor(); - /// set the given LyX color to the color defined by the X11 name given - void setColor(LColor::color col, string const & x11name); - /// set the given LyX color to the color defined by the X11 name given - bool setColor(string const & lyxname, string const & x11name); - - /// Get GUI name of color - string const getGUIName(LColor::color c) const; - - /// Get X11 name of color - string const getX11Name(LColor::color c) const; - - /// Get LaTeX name of color - string const getLaTeXName(LColor::color c) const; - - /// Get LyX name of color - string const getLyXName(LColor::color c) const; - - /// get the color from the GUI name - LColor::color getFromGUIName(string const & guiname) const; - /// get the color from the LyX name - LColor::color getFromLyXName(string const & lyxname) const; -private: /// - struct information { - /// the name as it appears in the GUI - string guiname; - /// the name used in LaTeX - string latexname; - /// the name for X11 - string x11name; - /// the name for LyX - string lyxname; - }; + LColor(LColor const &); + /// + ~LColor(); + /// + LColor & operator=(LColor); + + /** set the given LyX color to the color defined by the X11 name given + * \returns true if successful. + */ + bool setColor(LColor::color col, std::string const & x11name); + + /** set the given LyX color to the color defined by the X11 + * name given \returns true if successful. A new color entry + * is created if the color is unknown + */ + bool setColor(std::string const & lyxname, std::string const & x11name); + + /// Get the GUI name of \c color. + std::string const getGUIName(LColor::color c) const; - /// initialise a color entry - void fill(LColor::color col, string const & gui, - string const & latex, string const & x11, - string const & lyx); + /// Get the X11 name of \c color. + std::string const getX11Name(LColor::color c) const; + /// Get the LaTeX name of \c color. + std::string const getLaTeXName(LColor::color c) const; + + /// Get the LyX name of \c color. + std::string const getLyXName(LColor::color c) const; + + /// \returns the LColor::color associated with the GUI name. + LColor::color getFromGUIName(std::string const & guiname) const; + /// \returns the LColor::color associated with the LyX name. + LColor::color getFromLyXName(std::string const & lyxname) const; + /// \returns the LColor::color associated with the LaTeX name. + LColor::color getFromLaTeXName(std::string const & latexname) const; +private: + /// + void addColor(LColor::color c, std::string const & lyxname) const; /// - typedef std::map InfoTab; - /// the table of color information - InfoTab infotab; + class Pimpl; + /// + boost::scoped_ptr pimpl_; +}; + + +/** \c LColor_color is a wrapper for LColor::color. It can be forward-declared and + * passed as a function argument without having to expose LColor.h. + */ +class LColor_color { + LColor::color val_; +public: + /** The default constructor is nasty, + * but allows us to use LColor_color in STL containers. + */ + LColor_color() : val_(static_cast(-1)) {} + + LColor_color(LColor::color val) : val_(val) {} + operator LColor::color() const{ return val_; } }; + /// the current color definitions extern LColor lcolor; /// the system color definitions