Use default btprint value in the UI if none is given.

[lyx.git] / src / Color.cpp

diff --git a/src/Color.cpp b/src/Color.cpp
index f08c9fbf53807a10e7d025fc20b62f4531169f1e..6d5b73883eba312fbdb65a6c1628962d52431a42 100644 (file)
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -90,7 +90,7 @@ RGBColor rgbFromHexName(string const & x11hexname)
 string const outputLaTeXColor(RGBColor const & color)
 {
        // this routine returns a LaTeX readable color string in the form
-       // "red, green, blue" where the colors are a number in the range 0-1 
+       // "red, green, blue" where the colors are a number in the range 0-1
        int red = color.r;
        int green = color.g;
        int blue = color.b;
@@ -152,7 +152,7 @@ RGBColor const RGBColorFromLaTeX(string const & color)
 }
 
 
-Color::Color(ColorCode base_color) : baseColor(base_color), 
+Color::Color(ColorCode base_color) : baseColor(base_color),
        mergeColor(Color_ignore)
 {}
 
@@ -163,7 +163,7 @@ bool Color::operator==(Color const & color) const
 }
 
 
-bool Color::operator!=(Color const & color) const      
+bool Color::operator!=(Color const & color) const
 {
        return baseColor != color.baseColor;
 }
@@ -292,13 +292,13 @@ ColorSet::ColorSet()
        { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
        { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
        { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },
-       { Color_buttonframe, N_("frame of button"), "buttonframe", "#dcd2c8", "buttonframe" },
+       { Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8", "buttonframe" },
        { Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8", "buttonbg" },
        { Color_buttonhoverbg, N_("button background under focus"), "buttonhoverbg", "#C7C7CA", "buttonhoverbg" },
        { Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, "paragraphmarker"},
        { Color_previewframe, N_("preview frame"), "previewframe", "black", "previewframe"},
        { Color_inherit, N_("inherit"), "inherit", "black", "inherit" },
-       { Color_regexpframe, N_("regexp frame"), "green", "green", "green" },
+       { Color_regexpframe, N_("regexp frame"), "regexpframe", "green", "regexpframe" },
        { Color_ignore, N_("ignore"), "ignore", "black", "ignore" },
        { Color_ignore, 0, 0, 0, 0 }
        };