From: Uwe Stöhr Date: Fri, 15 Feb 2008 23:38:16 +0000 (+0000) Subject: Color.cpp, ColorCode.h: define new colors for inset labels and insets text X-Git-Tag: 1.6.10~6248 X-Git-Url: https://git.lyx.org/gitweb/?a=commitdiff_plain;h=f35ff8f60d8658cec15429f4d2fdb01ed55c0525;p=features.git Color.cpp, ColorCode.h: define new colors for inset labels and insets text stdinsets: use the new colors to allow the users to customize them git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@23029 a592a061-630c-0410-9148-cb99ea01b6c8 --- diff --git a/lib/layouts/stdinsets.inc b/lib/layouts/stdinsets.inc index 1efa5ce1f7..a83f82cd39 100644 --- a/lib/layouts/stdinsets.inc +++ b/lib/layouts/stdinsets.inc @@ -66,7 +66,7 @@ InsetLayout Marginal Misc No_Bar EndFont LabelFont - Color Red + Color marginlabel Size Small EndFont MultiPar true @@ -87,7 +87,7 @@ InsetLayout Foot Misc No_Bar EndFont LabelFont - Color Green + Color footlabel Size Small EndFont MultiPar true @@ -170,7 +170,7 @@ End InsetLayout Branch Decoration classic LabelFont - Color Red + Color branchlabel Size Small EndFont MultiPar true @@ -182,7 +182,7 @@ InsetLayout Index LatexName index Decoration classic Font - Color Green + Color latex Size Small Family Roman Shape Up @@ -192,7 +192,7 @@ InsetLayout Index Misc No_Bar EndFont LabelFont - Color Green + Color indexlabel Size Small EndFont MultiPar false @@ -253,11 +253,11 @@ InsetLayout URL ForceLTR true Font Family Typewriter - Color Blue + Color urltext EndFont LabelFont Family Typewriter - Color Blue + Color urllabel Size Small EndFont Requires url diff --git a/src/Color.cpp b/src/Color.cpp index 6752ff8ad3..29290161e0 100644 --- a/src/Color.cpp +++ b/src/Color.cpp @@ -104,13 +104,19 @@ ColorSet::ColorSet() { Color_selection, N_("selection"), "selection", "LightBlue", "selection" }, { Color_latex, N_("LaTeX text"), "latex", "DarkRed", "latex" }, { Color_preview, N_("previewed snippet"), "preview", "black", "preview" }, - { Color_note, N_("note"), "note", "blue", "note" }, + { Color_note, N_("note"), "note", "yellow", "note" }, { Color_notebg, N_("note background"), "notebg", "yellow", "notebg" }, { Color_comment, N_("comment"), "comment", "magenta", "comment" }, { Color_commentbg, N_("comment background"), "commentbg", "linen", "commentbg" }, { Color_greyedout, N_("greyedout inset"), "greyedout", "red", "greyedout" }, { Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", "linen", "greyedoutbg" }, - { Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" }, + { Color_shadedbg, N_("shaded box"), "shaded", "red", "shaded" }, + { Color_branchlabel, N_("branch label"), "branchlabel", "#c88000", "branchlabel" }, + { Color_footlabel, N_("footnote label"), "footlabel", "#00aaff", "footlabel" }, + { Color_indexlabel, N_("index label"), "indexlabel", "green", "indexlabel" }, + { Color_marginlabel, N_("margin note label"), "marginlabel", "#aa55ff", "marginlabel" }, + { Color_urllabel, N_("URL label"), "urllabel", "blue", "urllabel" }, + { Color_urltext, N_("URL text"), "urltext", "blue", "urltext" }, { Color_depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" }, { Color_language, N_("language"), "language", "Blue", "language" }, { Color_command, N_("command inset"), "command", "black", "command" }, @@ -128,7 +134,7 @@ ColorSet::ColorSet() { Color_mathmacrohoverbg, N_("Math macro hovered background"), "mathmacrohoverbg", "#cdc3b8", "mathmacrohoverbg" }, { Color_mathmacrolabel, N_("Math macro label"), "mathmacrolabel", "#a19992", "mathmacrolabel" }, { Color_mathmacroframe, N_("Math macro frame"), "mathmacroframe", "#ede2d8", "mathmacroframe" }, - { Color_mathmacroblend, N_("Math macro blended out"), "mathmacroblend", "#000000", "mathmacroblend" }, + { Color_mathmacroblend, N_("Math macro blended out"), "mathmacroblend", "black", "mathmacroblend" }, { Color_captionframe, N_("caption frame"), "captionframe", "DarkRed", "captionframe" }, { Color_collapsable, N_("collapsable inset text"), "collapsable", "DarkRed", "collapsable" }, { Color_collapsableframe, N_("collapsable inset frame"), "collapsableframe", "IndianRed", "collapsableframe" }, @@ -138,8 +144,8 @@ ColorSet::ColorSet() { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" }, { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" }, { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" }, - { Color_deletedtext, N_("Deleted text"), "deletedtext", "#ff0000", "deletedtext" }, - { Color_addedtext, N_("Added text"), "addedtext", "#0000ff", "addedtext" }, + { Color_deletedtext, N_("Deleted text"), "deletedtext", "red", "deletedtext" }, + { Color_addedtext, N_("Added text"), "addedtext", "blue", "addedtext" }, { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, { Color_topline, N_("top/bottom line"), "topline", "Brown", "topline" }, { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" }, diff --git a/src/ColorCode.h b/src/ColorCode.h index 240c9e58a2..275c60bda8 100644 --- a/src/ColorCode.h +++ b/src/ColorCode.h @@ -64,6 +64,19 @@ enum ColorCode /// Shaded box background Color_shadedbg, + /// Label color for branches + Color_branchlabel, + /// Label color for footnotes + Color_footlabel, + /// Label color for index insets + Color_indexlabel, + /// Label color for margin notes + Color_marginlabel, + /// Label color for URL insets + Color_urllabel, + /// Label color for URL text + Color_urltext, + /// Color for the depth bars in the margin Color_depthbar, /// Color for marking foreign language words