commit d7e6facfd72f96d3af29813962952245029013d0
Author: Juergen Spitzmueller <[email protected]>
Date: Sat May 16 12:21:07 2026 +0200
Sort colors and remove a ducplicated entry
---
src/Color.cpp | 39 ++++++++++++++++++++-------------------
1 file changed, 20 insertions(+), 19 deletions(-)
diff --git a/src/Color.cpp b/src/Color.cpp
index 4e33541db8..19b37f5e5f 100644
--- a/src/Color.cpp
+++ b/src/Color.cpp
@@ -273,14 +273,11 @@ ColorSet::ColorSet()
{ Color_preeditbg, N_("preedit background"), "preeditbg", Linen, black,
"preeditbg" },
{ Color_preedittext, N_("preedit text"), "preedittext", black, Linen,
"preedittext" },
{ Color_latex, N_("LaTeX text"), "latex", DarkRed, "#D66613", "latex" },
- { Color_textlabel1, N_("Text label 1"), "textlabel1", blue, "#86a4ff",
"textlabel1" },
- { Color_textlabel2, N_("Text label 2"), "textlabel2", Green, green,
"textlabel2" },
- { Color_textlabel3, N_("Text label 3"), "textlabel3", magenta, magenta,
"textlabel3" },
+ { Color_preview, N_("previewed snippet"), "preview", black, Linen,
"preview" },
{ Color_inlinecompletion, N_("inline completion"),
"inlinecompletion", grey60, grey40, "inlinecompletion" },
{ Color_nonunique_inlinecompletion, N_("inline completion
(non-unique)"),
"nonuniqueinlinecompletion", grey80, grey60,
"nonuniqueinlinecompletion" },
- { Color_preview, N_("previewed snippet"), "preview", black, Linen,
"preview" },
{ Color_notelabel, N_("note label"), "note", yellow, "#FF6200", "note"
},
{ Color_notebg, N_("note background"), "notebg", yellow, "#5b5903",
"notebg" },
{ Color_commentlabel, N_("comment label"), "comment", magenta, olive,
"comment" },
@@ -288,7 +285,6 @@ ColorSet::ColorSet()
{ Color_greyedoutlabel, N_("greyedout inset label"), "greyedout",
"#ff0080", "#ff0080", "greyedout" },
{ Color_greyedouttext, N_("greyedout inset text"), "greyedouttext",
grey80, grey40, "greyedouttext" },
{ Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg",
Linen, black, "greyedoutbg" },
- { Color_phantomtext, N_("phantom inset text"), "phantomtext",
"#7f7f7f", "#7f7f7f", "phantomtext" },
{ Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "#f2af7d",
"shaded" },
{ Color_listingsbg, N_("listings background"), "listingsbg", white,
black, "listingsbg" },
{ Color_branchlabel, N_("branch label"), "branchlabel", "#c88000",
"#c88000", "branchlabel" },
@@ -296,7 +292,11 @@ ColorSet::ColorSet()
{ Color_indexlabel, N_("index label"), "indexlabel", Green, teal,
"indexlabel" },
{ Color_marginlabel, N_("margin note label"), "marginlabel", "#aa55ff",
violet, "marginlabel" },
{ Color_nomlabel, N_("nomenclature label"), "nomlabel", "#ff6d2f",
"#ff6d2f", "nomlabel" },
+ { Color_phantomtext, N_("phantom inset text"), "phantomtext",
"#7f7f7f", "#7f7f7f", "phantomtext" },
{ Color_urllabel, N_("URL label"), "urllabel", blue, blue, "urllabel" },
+ { Color_textlabel1, N_("Text label 1"), "textlabel1", blue, "#86a4ff",
"textlabel1" },
+ { Color_textlabel2, N_("Text label 2"), "textlabel2", Green, green,
"textlabel2" },
+ { Color_textlabel3, N_("Text label 3"), "textlabel3", magenta, magenta,
"textlabel3" },
{ Color_urltext, N_("URL text"), "urltext", blue, "#86a4ff", "urltext"
},
{ Color_depthbar, N_("depth bar"), "depthbar", IndianRed, IndianRed,
"depthbar" },
{ Color_scroll, N_("scroll indicator"), "scroll", IndianRed, IndianRed,
"scroll" },
@@ -304,32 +304,29 @@ ColorSet::ColorSet()
{ Color_command, N_("command inset"), "command", black, black,
"command" },
{ Color_commandbg, N_("command inset background"), "commandbg",
"#f0ffff", "#f0ffff", "commandbg" },
{ Color_commandframe, N_("command inset frame"), "commandframe", black,
Linen, "commandframe" },
- { Color_command_broken, N_("command inset (broken reference)"),
"command", white, white, "command_broken" },
- { Color_buttonbg_broken, N_("button background (broken reference)"),
"commandbg", red, red, "commandbg_broken" },
- { Color_buttonframe_broken, N_("button frame (broken reference)"),
"commandframe", red, red, "commandframe_broken" },
- { Color_buttonhoverbg_broken, N_("button background (broken reference)
under focus"), "buttonhoverbg", "#DB0B0B", "#DB0B0B", "buttonhoverbg_broken" },
{ Color_special, N_("special character"), "special", RoyalBlue,
RoyalBlue, "special" },
+ { Color_graphicsbg, N_("graphics background"), "graphicsbg", Linen,
black, "graphicsbg" },
{ Color_math, N_("math text"), "math", "#00008B", "#85F0FE", "math" },
{ Color_mathbg, N_("math background"), "mathbg", Linen, black, "mathbg"
},
- { Color_graphicsbg, N_("graphics background"), "graphicsbg", Linen,
black, "graphicsbg" },
{ Color_mathmacrobg, N_("math macro background"), "mathmacrobg", Linen,
black, "mathmacrobg" },
- { Color_mathframe, N_("math frame"), "mathframe", magenta, magenta,
"mathframe" },
- { Color_mathcorners, N_("math corners"), "mathcorners", Linen, black,
"mathcorners" },
- { Color_mathline, N_("math line"), "mathline", blue, "#86a4ff",
"mathline" },
- { Color_mathmacrobg, N_("math macro background"), "mathmacrobg",
"#ede2d8", black, "mathmacrobg" },
- { Color_mathmacrohoverbg, N_("math macro hovered background"),
"mathmacrohoverbg", "#cdc3b8", grey80, "mathmacrohoverbg" },
+ { Color_mathmacrohoverbg, N_("math macro hovered background"),
"mathmacrohoverbg", "#cdc3b8",
+ grey80, "mathmacrohoverbg" },
{ Color_mathmacrolabel, N_("math macro label"), "mathmacrolabel",
"#a19992", "#a19992", "mathmacrolabel" },
{ Color_mathmacroframe, N_("math macro frame"), "mathmacroframe",
"#ede2d8", black, "mathmacroframe" },
{ Color_mathmacroblend, N_("math macro blended out"), "mathmacroblend",
black, Linen, "mathmacroblend" },
{ Color_mathmacrooldarg, N_("math macro old parameter"),
"mathmacrooldarg", grey80, grey40, "mathmacrooldarg" },
{ Color_mathmacronewarg, N_("math macro new parameter"),
"mathmacronewarg", black, Linen, "mathmacronewarg" },
+ { Color_mathframe, N_("math frame"), "mathframe", magenta, magenta,
"mathframe" },
+ { Color_mathcorners, N_("math corners"), "mathcorners", Linen, black,
"mathcorners" },
+ { Color_mathline, N_("math line"), "mathline", blue, "#86a4ff",
"mathline" },
{ Color_collapsible, N_("collapsible inset text"), "collapsible",
DarkRed, DarkRed, "collapsible" },
{ Color_collapsibleframe, N_("collapsible inset frame"),
"collapsibleframe", IndianRed, IndianRed, "collapsibleframe" },
{ Color_insetbg, N_("inset background"), "insetbg", grey80, grey80,
"insetbg" },
- { Color_insetlabel, N_("inset label"), "insetlabel", black, black,
"insetlabel" },
{ Color_insetframe, N_("inset frame"), "insetframe", IndianRed,
IndianRed, "insetframe" },
+ { Color_insetlabel, N_("inset label"), "insetlabel", black, black,
"insetlabel" },
{ Color_error, N_("LaTeX error"), "error", red, DarkRed, "error" },
{ Color_eolmarker, N_("end-of-line marker"), "eolmarker", Brown, Brown,
"eolmarker" },
+ { Color_added_space, N_("added space markers"), "added_space", Brown,
Brown, "added_space" },
{ Color_appendix, N_("appendix marker"), "appendix", Brown, Brown,
"appendix" },
{ Color_changebar, N_("change bar"), "changebar", blue, "#86a4ff",
"changebar" },
{ Color_deletedtext_output, N_("changes - deleted text (exported
output)"), "deletedtext", "#ff0000", "#ff0000", "deletedtext" },
@@ -341,7 +338,6 @@ ColorSet::ColorSet()
{ Color_changedtext_workarea_author5, N_("changed text (workarea, 5th
author)"), "changedtextauthor5", "#55aa00", "#acd780", "changedtextauthor5" },
{ Color_changedtext_workarea_comparison, N_("changed text (workarea,
document comparison)"), "changedtextcomparison", "#008080", "#719FB0",
"changedtextcomparison" },
{ Color_deletedtext_workarea_modifier, N_("changes - deleted text
brightness (workarea)"), "deletedtextmodifier", white, white,
"deletedtextmodifier" },
- { Color_added_space, N_("added space markers"), "added_space", Brown,
Brown, "added_space" },
{ Color_tabularline, N_("table line"), "tabularline", black, Linen,
"tabularline" },
{ Color_tabularonoffline, N_("table on/off line"), "tabularonoffline",
"#b0c4de", "#23497b", "tabularonoffline" },
{ Color_bottomarea, N_("bottom area"), "bottomarea", grey40, grey80,
"bottomarea" },
@@ -350,13 +346,18 @@ ColorSet::ColorSet()
{ Color_buttonframe, N_("button frame"), "buttonframe", "#dcd2c8",
"#dcd2c8", "buttonframe" },
{ Color_buttonbg, N_("button background"), "buttonbg", "#dcd2c8",
"#dcd2c8", "buttonbg" },
{ Color_buttonhoverbg, N_("button background under focus"),
"buttonhoverbg", "#C7C7CA", "#C7C7CA", "buttonhoverbg" },
+ { Color_command_broken, N_("command inset (broken reference)"),
"command", white, white, "command_broken" },
+ { Color_buttonbg_broken, N_("button background (broken reference)"),
"commandbg", red, red, "commandbg_broken" },
+ { Color_buttonframe_broken, N_("button frame (broken reference)"),
"commandframe", red, red, "commandframe_broken" },
+ { Color_buttonhoverbg_broken, N_("button background (broken reference)
under focus"),
+ "buttonhoverbg", "#DB0B0B", "#DB0B0B", "buttonhoverbg_broken" },
{ Color_paragraphmarker, N_("paragraph marker"), "paragraphmarker",
grey80, grey40, "paragraphmarker"},
{ Color_previewframe, N_("preview frame"), "previewframe", black,
Linen, "previewframe"},
- { Color_regexpframe, N_("regexp frame"), "regexpframe", Green, green,
"regexpframe" },
{ Color_bookmark, N_("bookmark"), "bookmark", RoyalBlue, RoyalBlue,
"bookmark" },
+ { Color_regexpframe, N_("regexp frame"), "regexpframe", Green, green,
"regexpframe" },
{ Color_inherit, N_("inherit"), "inherit", black, Linen, "inherit" },
{ Color_ignore, N_("ignore"), "ignore", black, Linen, "ignore" },
- { Color_ignore, nullptr, nullptr, nullptr, nullptr, nullptr }
+ { Color_max, nullptr, nullptr, nullptr, nullptr, nullptr }
};
for (int i = 0; items[i].guiname; ++i)
--
lyx-cvs mailing list
[email protected]
https://lists.lyx.org/mailman/listinfo/lyx-cvs
