anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2024-11-09 18:31:04 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Add dark theme colors to semantic colors (#8325)

Browse Source
This commit is contained in:
Juergen Spitzmueller 2020-12-12 10:56:05 +01:00
parent a2e4ce1803
commit 704331fdcd
9 changed files with 194 additions and 133 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
lib/scripts/prefs2prefs_prefs.py
View File

@ -137,6 +137,10 @@
# Incremented to format 34, by yuriy
# Rename *.kmap files for Cyrillic languages
# Incremented to format 35, by spitz
# \set_color now takes three arguments
# \set_color lyxname x11hexname x11darkhexname
# NOTE: The format should also be updated in LYXRC.cpp and
# in configure.py.
@ -499,5 +503,6 @@ conversions = [
[ 31, []],
[ 32, []],
[ 33, []],
[ 34, [rename_cyrillic_kmap_files]]
[ 34, [rename_cyrillic_kmap_files]],
[ 35, []]
]

245
src/Color.cpp
View File

@ -42,6 +42,7 @@ struct ColorSet::ColorEntry {
char const * guiname;
char const * latexname;
char const * x11hexname;
char const * x11darkhexname;
char const * lyxname;
};
@ -225,115 +226,115 @@ ColorSet::ColorSet()
char const * RoyalBlue = "#4169e1";
//char const * grey90 = "#e5e5e5";
// ColorCode, gui, latex, x11hexname, lyx
// ColorCode, gui, latex, x11hexname, x11darkhexname, lyx
// Warning: several of these entries are overridden in GuiApplication constructor
static ColorEntry const items[] = {
{ Color_none, N_("none"), "none", black, "none" },
{ Color_black, N_("black"), "black", black, "black" },
{ Color_white, N_("white"), "white", white, "white" },
{ Color_blue, N_("blue"), "blue", blue, "blue" },
{ Color_brown, N_("brown"), "brown", brown, "brown" },
{ Color_cyan, N_("cyan"), "cyan", cyan, "cyan" },
{ Color_darkgray, N_("darkgray"), "darkgray", darkgray, "darkgray" },
{ Color_gray, N_("gray"), "gray", gray, "gray" },
{ Color_green, N_("green"), "green", green, "green" },
{ Color_lightgray, N_("lightgray"), "lightgray", lightgray, "lightgray" },
{ Color_lime, N_("lime"), "lime", lime, "lime" },
{ Color_magenta, N_("magenta"), "magenta", magenta, "magenta" },
{ Color_olive, N_("olive"), "olive", olive, "olive" },
{ Color_orange, N_("orange"), "orange", orange, "orange" },
{ Color_pink, N_("pink"), "pink", pink, "pink" },
{ Color_purple, N_("purple"), "purple", purple, "purple" },
{ Color_red, N_("red"), "red", red, "red" },
{ Color_teal, N_("teal"), "teal", teal, "teal" },
{ Color_violet, N_("violet"), "violet", violet, "violet" },
{ Color_yellow, N_("yellow"), "yellow", yellow, "yellow" },
{ Color_cursor, N_("cursor"), "cursor", black, "cursor" },
{ Color_background, N_("background"), "background", Linen, "background" },
{ Color_foreground, N_("text"), "foreground", black, "foreground" },
{ Color_selection, N_("selection"), "selection", "#add8e6", "selection" },
{ Color_selectiontext, N_("selected text"), "selectiontext", black, "selectiontext" },
{ Color_latex, N_("LaTeX text"), "latex", DarkRed, "latex" },
{ Color_textlabel1, N_("Text label 1"), "textlabel1", blue, "textlabel1" },
{ Color_textlabel2, N_("Text label 2"), "textlabel2", Green, "textlabel2" },
{ Color_textlabel3, N_("Text label 3"), "textlabel3", magenta, "textlabel3" },
{ Color_none, N_("none"), "none", black, black, "none" },
{ Color_black, N_("black"), "black", black, black, "black" },
{ Color_white, N_("white"), "white", white, white, "white" },
{ Color_blue, N_("blue"), "blue", blue, blue, "blue" },
{ Color_brown, N_("brown"), "brown", brown, brown, "brown" },
{ Color_cyan, N_("cyan"), "cyan", cyan, cyan, "cyan" },
{ Color_darkgray, N_("darkgray"), "darkgray", darkgray, darkgray, "darkgray" },
{ Color_gray, N_("gray"), "gray", gray, gray, "gray" },
{ Color_green, N_("green"), "green", green, green, "green" },
{ Color_lightgray, N_("lightgray"), "lightgray", lightgray, lightgray, "lightgray" },
{ Color_lime, N_("lime"), "lime", lime, lime, "lime" },
{ Color_magenta, N_("magenta"), "magenta", magenta, magenta, "magenta" },
{ Color_olive, N_("olive"), "olive", olive, olive, "olive" },
{ Color_orange, N_("orange"), "orange", orange, orange, "orange" },
{ Color_pink, N_("pink"), "pink", pink, pink, "pink" },
{ Color_purple, N_("purple"), "purple", purple, purple, "purple" },
{ Color_red, N_("red"), "red", red, red, "red" },
{ Color_teal, N_("teal"), "teal", teal, teal, "teal" },
{ Color_violet, N_("violet"), "violet", violet, violet, "violet" },
{ Color_yellow, N_("yellow"), "yellow", yellow, yellow, "yellow" },
{ Color_cursor, N_("cursor"), "cursor", black, Linen, "cursor" },
{ Color_background, N_("background"), "background", Linen, black, "background" },
{ Color_foreground, N_("text"), "foreground", black, Linen, "foreground" },
{ Color_selection, N_("selection"), "selection", "#add8e6", "#add8e6", "selection" },
{ Color_selectiontext, N_("selected text"), "selectiontext", black, black, "selectiontext" },
{ Color_latex, N_("LaTeX text"), "latex", DarkRed, "#f2af7d", "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_inlinecompletion, N_("inline completion"),
"inlinecompletion", grey60, "inlinecompletion" },
"inlinecompletion", grey60, grey40, "inlinecompletion" },
{ Color_nonunique_inlinecompletion, N_("non-unique inline completion"),
"nonuniqueinlinecompletion", grey80, "nonuniqueinlinecompletion" },
{ Color_preview, N_("previewed snippet"), "preview", black, "preview" },
{ Color_notelabel, N_("note label"), "note", yellow, "note" },
{ Color_notebg, N_("note background"), "notebg", yellow, "notebg" },
{ Color_commentlabel, N_("comment label"), "comment", magenta, "comment" },
{ Color_commentbg, N_("comment background"), "commentbg", Linen, "commentbg" },
{ Color_greyedoutlabel, N_("greyedout inset label"), "greyedout", "#ff0080", "greyedout" },
{ Color_greyedouttext, N_("greyedout inset text"), "greyedouttext", grey80, "greyedouttext" },
{ Color_greyedoutbg, N_("greyedout inset background"), "greyedoutbg", Linen, "greyedoutbg" },
{ Color_phantomtext, N_("phantom inset text"), "phantomtext", "#7f7f7f", "phantomtext" },
{ Color_shadedbg, N_("shaded box"), "shaded", "#ff0000", "shaded" },
{ Color_listingsbg, N_("listings background"), "listingsbg", white, "listingsbg" },
{ 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_scroll, N_("scroll indicator"), "scroll", IndianRed, "scroll" },
{ Color_language, N_("language"), "language", blue, "language" },
{ Color_command, N_("command inset"), "command", black, "command" },
{ Color_commandbg, N_("command inset background"), "commandbg", "#f0ffff", "commandbg" },
{ Color_commandframe, N_("command inset frame"), "commandframe", black, "commandframe" },
{ Color_command_broken, N_("command inset (broken reference)"), "command", white, "command_broken" },
{ Color_buttonbg_broken, N_("button background (broken reference)"), "commandbg", red, "commandbg_broken" },
{ Color_buttonframe_broken, N_("button frame (broken reference)"), "commandframe", red, "commandframe_broken" },
{ Color_buttonhoverbg_broken, N_("button background (broken reference) under focus"), "buttonhoverbg", "#DB0B0B", "buttonhoverbg_broken" },
{ Color_special, N_("special character"), "special", RoyalBlue, "special" },
{ Color_math, N_("math"), "math", "#00008B", "math" },
{ Color_mathbg, N_("math background"), "mathbg", Linen, "mathbg" },
{ Color_graphicsbg, N_("graphics background"), "graphicsbg", Linen, "graphicsbg" },
{ Color_mathmacrobg, N_("math macro background"), "mathmacrobg", Linen, "mathmacrobg" },
{ Color_mathframe, N_("math frame"), "mathframe", magenta, "mathframe" },
{ Color_mathcorners, N_("math corners"), "mathcorners", Linen, "mathcorners" },
{ Color_mathline, N_("math line"), "mathline", blue, "mathline" },
{ Color_mathmacrobg, N_("math macro background"), "mathmacrobg", "#ede2d8", "mathmacrobg" },
{ 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", black, "mathmacroblend" },
{ Color_mathmacrooldarg, N_("math macro old parameter"), "mathmacrooldarg", grey80, "mathmacrooldarg" },
{ Color_mathmacronewarg, N_("math macro new parameter"), "mathmacronewarg", black, "mathmacronewarg" },
{ Color_collapsible, N_("collapsible inset text"), "collapsible", DarkRed, "collapsible" },
{ Color_collapsibleframe, N_("collapsible inset frame"), "collapsibleframe", IndianRed, "collapsibleframe" },
{ Color_insetbg, N_("inset background"), "insetbg", grey80, "insetbg" },
{ Color_insetframe, N_("inset frame"), "insetframe", IndianRed, "insetframe" },
{ Color_error, N_("LaTeX error"), "error", red, "error" },
{ 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 (output)"), "deletedtext", "#ff0000", "deletedtext" },
{ Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" },
{ Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
{ Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
{ Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
{ Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
{ Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
{ Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "deletedtextmodifier", white, "deletedtextmodifier" },
{ Color_added_space, N_("added space markers"), "added_space", Brown, "added_space" },
{ Color_tabularline, N_("table line"), "tabularline", black, "tabularline" },
{ Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "#b0c4de", "tabularonoffline" },
{ 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_("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"), "regexpframe", Green, "regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", black, "ignore" },
{ Color_ignore, nullptr, nullptr, nullptr, nullptr }
"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" },
{ Color_commentbg, N_("comment background"), "commentbg", Linen, black, "commentbg" },
{ 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" },
{ Color_footlabel, N_("footnote label"), "footlabel", "#00aaff", blue, "footlabel" },
{ Color_indexlabel, N_("index label"), "indexlabel", Green, teal, "indexlabel" },
{ Color_marginlabel, N_("margin note label"), "marginlabel", "#aa55ff", violet, "marginlabel" },
{ Color_urllabel, N_("URL label"), "urllabel", blue, blue, "urllabel" },
{ 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" },
{ Color_language, N_("language"), "language", blue, "#86a4ff", "language" },
{ 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_math, N_("math"), "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_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_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_insetframe, N_("inset frame"), "insetframe", IndianRed, IndianRed, "insetframe" },
{ Color_error, N_("LaTeX error"), "error", red, DarkRed, "error" },
{ Color_eolmarker, N_("end-of-line marker"), "eolmarker", Brown, Brown, "eolmarker" },
{ Color_appendix, N_("appendix marker"), "appendix", Brown, Brown, "appendix" },
{ Color_changebar, N_("change bar"), "changebar", blue, "#86a4ff", "changebar" },
{ Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "#ff0000", "deletedtext" },
{ Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "#0000ff", "addedtext" },
{ Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "#86a4ff", "changedtextauthor1" },
{ Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "#ee86ee", "changedtextauthor2" },
{ Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "#ea8989", "changedtextauthor3" },
{ Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "#c371ec", "changedtextauthor4" },
{ Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "#acd780", "changedtextauthor5" },
{ Color_deletedtextmodifier, N_("deleted text modifier (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" },
{ Color_newpage, N_("new page"), "newpage", blue, "#86a4ff", "newpage" },
{ Color_pagebreak, N_("page break / line break"), "pagebreak", RoyalBlue, RoyalBlue, "pagebreak" },
{ 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_paragraphmarker, N_("paragraph marker"), "paragraphmarker", grey80, grey40, "paragraphmarker"},
{ Color_previewframe, N_("preview frame"), "previewframe", black, Linen, "previewframe"},
{ Color_inherit, N_("inherit"), "inherit", black, Linen, "inherit" },
{ Color_regexpframe, N_("regexp frame"), "regexpframe", Green, green, "regexpframe" },
{ Color_ignore, N_("ignore"), "ignore", black, Linen, "ignore" },
{ Color_ignore, nullptr, nullptr, nullptr, nullptr, nullptr }
};
for (int i = 0; items[i].guiname; ++i)
@ -348,6 +349,7 @@ void ColorSet::fill(ColorEntry const & entry)
in.lyxname = entry.lyxname;
in.latexname = entry.latexname;
in.x11hexname = entry.x11hexname;
in.x11darkhexname = entry.x11darkhexname;
in.guiname = entry.guiname;
infotab[entry.lcolor] = in;
lyxcolors[entry.lyxname] = entry.lcolor;
@ -364,16 +366,29 @@ docstring const ColorSet::getGUIName(ColorCode c) const
}
string const ColorSet::getX11HexName(ColorCode c) const
string const ColorSet::getX11HexName(ColorCode c, bool const darkmode) const
{
InfoTab::const_iterator it = infotab.find(c);
if (it != infotab.end())
return it->second.x11hexname;
return darkmode ? it->second.x11darkhexname : it->second.x11hexname;
lyxerr << "LyX internal error: Missing color"
" entry in Color.cpp for " << c << '\n'
<< "Using black." << endl;
return "black";
return darkmode ? "#faf0e6" : "black";
}
pair<string, string> const ColorSet::getAllX11HexNames(ColorCode c) const
{
InfoTab::const_iterator it = infotab.find(c);
if (it != infotab.end())
return make_pair(it->second.x11hexname, it->second.x11darkhexname);
lyxerr << "LyX internal error: Missing color"
" entry in Color.cpp for " << c << '\n'
<< "Using black." << endl;
return make_pair("black", "#faf0e6");
}
@ -395,7 +410,8 @@ string const ColorSet::getLyXName(ColorCode c) const
}
bool ColorSet::setColor(ColorCode col, string const & x11hexname)
bool ColorSet::setColor(ColorCode col, string const & x11hexname,
string const & x11darkhexname)
{
InfoTab::iterator it = infotab.find(col);
if (it == infotab.end()) {
@ -410,12 +426,15 @@ bool ColorSet::setColor(ColorCode col, string const & x11hexname)
return false;
}
it->second.x11hexname = x11hexname;
if (!x11hexname.empty())
it->second.x11hexname = x11hexname;
it->second.x11darkhexname = (x11darkhexname.empty()) ? x11hexname : x11darkhexname;
return true;
}
bool ColorSet::setColor(string const & lyxname, string const & x11hexname)
bool ColorSet::setColor(string const & lyxname, string const & x11hexname,
string const & x11darkhexname)
{
string const lcname = ascii_lowercase(lyxname);
if (lyxcolors.find(lcname) == lyxcolors.end()) {
@ -424,13 +443,13 @@ bool ColorSet::setColor(string const & lyxname, string const & x11hexname)
addColor(static_cast<ColorCode>(infotab.size()), lcname);
}
return setColor(lyxcolors[lcname], x11hexname);
return setColor(lyxcolors[lcname], x11hexname, x11darkhexname);
}
void ColorSet::addColor(ColorCode c, string const & lyxname)
{
ColorEntry ce = { c, "", "", "", lyxname.c_str() };
ColorEntry ce = { c, "", "", "", "", lyxname.c_str() };
fill(ce);
}

19
src/ColorSet.h
View File

@ -49,21 +49,28 @@ public:
ColorSet();
/** set the given LyX color to the color defined by the X11 hex name given
* \returns true if successful.
* \returns true if successful. The optional third argument passes
* a color for dark mode.
*/
bool setColor(ColorCode col, std::string const & x11hexname);
bool setColor(ColorCode col, std::string const & x11hexname,
std::string const & x11darkhexname = std::string());
/** set the given LyX color to the color defined by the X11
* hex name given \returns true if successful. A new color entry
* is created if the color is unknown
* is created if the color is unknown. The optional third argument passes
* a color for dark mode.
*/
bool setColor(std::string const & lyxname, std::string const & x11hexname);
bool setColor(std::string const & lyxname, std::string const & x11hexname,
std::string const & x11darkhexname = std::string());
/// Get the GUI name of \c color.
docstring const getGUIName(ColorCode c) const;
/// Get the X11 hexname of \c color.
std::string const getX11HexName(ColorCode c) const;
std::string const getX11HexName(ColorCode c, bool const darkmode = false) const;
/// Get the X11 hexname of \c color.
std::pair<std::string, std::string> const getAllX11HexNames(ColorCode c) const;
/// Get the LaTeX name of \c color.
std::string const getLaTeXName(ColorCode c) const;
@ -88,6 +95,8 @@ private:
std::string latexname;
/// the name for X11
std::string x11hexname;
/// matching X11 color for dark mode
std::string x11darkhexname;
/// the name for LyX
std::string lyxname;
};

5
src/LyXAction.cpp
View File

@ -3680,10 +3680,11 @@ void LyXAction::init()
/*!
* \var lyx::FuncCode lyx::LFUN_SET_COLOR
* \li Action: Set the given LyX color to the color defined by the X11 name given.
* \li Action: Set the given LyX color to the color defined by the X11 name given,
* and optionally a specific color for dark mode.
* \li Notion: A new color entry is created if the color is unknown.
Color names can be stored as a part of user settings.
* \li Syntax: set-color <LYX_NAME> <X11_NAME>
* \li Syntax: set-color <LYX_NAME> <X11_NAME> [<X11_DARKNAME>]
* \li Origin: SLior, 11 Jun 2000
* \endvar
*/

20
src/LyXRC.cpp
View File

@ -60,7 +60,7 @@ namespace {
// The format should also be updated in configure.py, and conversion code
// should be added to prefs2prefs_prefs.py.
static unsigned int const LYXRC_FILEFORMAT = 34; // yuriy: rename kmap files
static unsigned int const LYXRC_FILEFORMAT = 35; // spitz: dark mode colors
// when adding something to this array keep it sorted!
LexerKeyword lyxrcTags[] = {
{ "\\accept_compound", LyXRC::RC_ACCEPT_COMPOUND },
@ -657,6 +657,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
}
string const x11_name = lexrc.getString();
string x11_darkname = x11_name;
if (lexrc.next())
x11_darkname = lexrc.getString();
ColorCode const col =
lcolor.getFromLyXName(lyx_name);
if (col == Color_none ||
@ -664,9 +668,10 @@ LyXRC::ReturnValues LyXRC::read(Lexer & lexrc, bool check_format)
col == Color_ignore)
break;
if (!lcolor.setColor(col, x11_name))
if (!lcolor.setColor(col, x11_name, x11_darkname))
LYXERR0("Bad lyxrc set_color for " << lyx_name);
LYXERR(Debug::LYXRC, "Set " << lyx_name << "(" << col << ") to " << x11_name);
LYXERR(Debug::LYXRC, "Set " << lyx_name << "(" << col << ") to "
<< x11_name << " and " << x11_darkname);
break;
}
@ -1987,12 +1992,15 @@ void LyXRC::write(ostream & os, bool ignore_system_lyxrc, string const & name) c
case RC_SET_COLOR:
for (int i = 0; i < Color_ignore; ++i) {
ColorCode lc = static_cast<ColorCode>(i);
string const col = lcolor.getX11HexName(lc);
string const col = lcolor.getAllX11HexNames(lc).first;
string const darkcol = lcolor.getAllX11HexNames(lc).second;
if (ignore_system_lyxrc
|| col != system_lcolor.getX11HexName(lc)) {
|| col != system_lcolor.getAllX11HexNames(lc).first
|| darkcol != system_lcolor.getAllX11HexNames(lc).second) {
os << "\\set_color \""
<< lcolor.getLyXName(lc) << "\" \""
<< col << "\"\n";
<< col << "\" \""
<< darkcol << "\"\n";
}
}
if (tag != RC_LAST)

14
src/frontends/qt/ColorCache.cpp
View File

@ -62,7 +62,7 @@ QPalette::ColorRole role(ColorCode col)
void ColorCache::init()
{
for (int col = 0; col <= Color_ignore; ++col) {
lcolors_[col] = QColor(lcolor.getX11HexName(ColorCode(col)).c_str());
lcolors_[col] = QColor(lcolor.getX11HexName(ColorCode(col), isDarkMode()).c_str());
}
initialized_ = true;
@ -104,7 +104,7 @@ QColor ColorCache::get(Color const & color, bool syscolors) const
(base_color.blue() + merge_color.blue()) / 2);
}
// used by branches
return QColor(lcolor.getX11HexName(color.baseColor).c_str());
return QColor(lcolor.getX11HexName(color.baseColor, isDarkMode()).c_str());
}
@ -119,6 +119,16 @@ bool ColorCache::isSystem(ColorCode const color) const
}
bool ColorCache::isDarkMode() const
{
QPalette palette = QPalette();
QColor text_color = palette.color(QPalette::Active, QPalette::WindowText);
QColor bg_color = palette.color(QPalette::Active, QPalette::Window);
return (text_color.black() < bg_color.black());
}
QColor const rgb2qcolor(RGBColor const & rgb)
{
return QColor(rgb.r, rgb.g, rgb.b);

3
src/frontends/qt/ColorCache.h
View File

@ -39,6 +39,9 @@ public:
/// is this color replaced when LyXRC::use_system_color is true?
bool isSystem(ColorCode color) const;
/// guess whether we are in dark mode
bool isDarkMode() const;
/// change the undelying palette
void setPalette(QPalette const pal) { pal_ = pal; clear(); }

11
src/frontends/qt/GuiApplication.cpp
View File

@ -1807,11 +1807,12 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
case LFUN_SET_COLOR: {
string const lyx_name = cmd.getArg(0);
string const x11_name = cmd.getArg(1);
string x11_name = cmd.getArg(1);
string x11_darkname = cmd.getArg(2);
if (lyx_name.empty() || x11_name.empty()) {
if (current_view_)
current_view_->message(
_("Syntax: set-color <lyx_name> <x11_name>"));
_("Syntax: set-color <lyx_name> <x11_name> <x11_darkname>"));
break;
}
@ -1824,7 +1825,11 @@ void GuiApplication::dispatch(FuncRequest const & cmd, DispatchResult & dr)
graphics::GCache::get().changeDisplay(true);
#endif
if (!lcolor.setColor(lyx_name, x11_name)) {
if (x11_darkname.empty() && colorCache().isDarkMode()) {
x11_darkname = x11_name;
x11_name.clear();
}
if (!lcolor.setColor(lyx_name, x11_name, x11_darkname)) {
if (current_view_)
current_view_->message(
bformat(_("Set-color \"%1$s\" failed "

3
src/frontends/qt/GuiPrefs.cpp
View File

@ -1251,7 +1251,8 @@ bool PrefColors::isDefaultColor(int const row, QString const & color)
QColor PrefColors::getDefaultColorByRow(int const row)
{
ColorSet const defaultcolor;
return defaultcolor.getX11HexName(lcolors_[size_t(row)]).c_str();
return defaultcolor.getX11HexName(lcolors_[size_t(row)],
guiApp->colorCache().isDarkMode()).c_str();
}