anne/lyx_mirror
1
0
Fork 0
mirror of https://git.lyx.org/repos/lyx.git synced 2025-01-20 14:40:25 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Clarify change text color descriptors

Browse Source 
Addresses #11704
This commit is contained in:
Juergen Spitzmueller 2019-12-24 08:37:27 +01:00
parent a5a8c6731c
commit 0139bcf48f
3 changed files with 24 additions and 25 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Changes.cpp
View File

@ -72,19 +72,19 @@ Color Change::color() const
Color color = Color_none; Color color = Color_none;
switch (author % 5) { switch (author % 5) {
case 0: case 0:
color = Color_changedtextauthor1; color = Color_addedtextauthor1;
break; break;
case 1: case 1:
color = Color_changedtextauthor2; color = Color_addedtextauthor2;
break; break;
case 2: case 2:
color = Color_changedtextauthor3; color = Color_addedtextauthor3;
break; break;
case 3: case 3:
color = Color_changedtextauthor4; color = Color_addedtextauthor4;
break; break;
case 4: case 4:
color = Color_changedtextauthor5; color = Color_addedtextauthor5;
break; break;
} }

19
src/Color.cpp
View File

@ -277,18 +277,17 @@ ColorSet::ColorSet()
{ Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" }, { Color_eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
{ Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" }, { Color_appendix, N_("appendix marker"), "appendix", "Brown", "appendix" },
{ Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" }, { Color_changebar, N_("change bar"), "changebar", "Blue", "changebar" },
{ Color_deletedtext, N_("deleted text"), "deletedtext", "#ff0000", "deletedtext" }, { Color_deletedtext, N_("deleted text (output)"), "deletedtext", "#ff0000", "deletedtext" },
{ Color_addedtext, N_("added text"), "addedtext", "#0000ff", "addedtext" }, { Color_addedtext, N_("added text (output)"), "addedtext", "#0000ff", "addedtext" },
{ Color_changedtextauthor1, N_("changed text 1st author"), "changedtextauthor1", "#0000ff", "changedtextauthor1" }, { Color_addedtextauthor1, N_("added text (workarea, 1st author)"), "changedtextauthor1", "#0000ff", "changedtextauthor1" },
{ Color_changedtextauthor2, N_("changed text 2nd author"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" }, { Color_addedtextauthor2, N_("added text (workarea, 2nd author)"), "changedtextauthor2", "#ff00ff", "changedtextauthor2" },
{ Color_changedtextauthor3, N_("changed text 3rd author"), "changedtextauthor3", "#ff0000", "changedtextauthor3" }, { Color_addedtextauthor3, N_("added text (workarea, 3rd author)"), "changedtextauthor3", "#ff0000", "changedtextauthor3" },
{ Color_changedtextauthor4, N_("changed text 4th author"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" }, { Color_addedtextauthor4, N_("added text (workarea, 4th author)"), "changedtextauthor4", "#aa00ff", "changedtextauthor4" },
{ Color_changedtextauthor5, N_("changed text 5th author"), "changedtextauthor5", "#55aa00", "changedtextauthor5" }, { Color_addedtextauthor5, N_("added text (workarea, 5th author)"), "changedtextauthor5", "#55aa00", "changedtextauthor5" },
{ Color_deletedtextmodifier, N_("deleted text modifier"), "deletedtextmodifier", "white", "deletedtextmodifier" }, { Color_deletedtextmodifier, N_("deleted text modifier (workarea)"), "deletedtextmodifier", "white", "deletedtextmodifier" },
{ Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" }, { Color_added_space, N_("added space markers"), "added_space", "Brown", "added_space" },
{ Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" }, { Color_tabularline, N_("table line"), "tabularline", "black", "tabularline" },
{ Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", { Color_tabularonoffline, N_("table on/off line"), "tabularonoffline", "LightSteelBlue", "tabularonoffline" },
"LightSteelBlue", "tabularonoffline" },
{ Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" }, { Color_bottomarea, N_("bottom area"), "bottomarea", grey40, "bottomarea" },
{ Color_newpage, N_("new page"), "newpage", "Blue", "newpage" }, { Color_newpage, N_("new page"), "newpage", "Blue", "newpage" },
{ Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" }, { Color_pagebreak, N_("page break / line break"), "pagebreak", "RoyalBlue", "pagebreak" },

20
src/ColorCode.h
View File

@ -179,16 +179,16 @@ enum ColorCode {
Color_deletedtext, Color_deletedtext,
/// Added text color /// Added text color
Color_addedtext, Color_addedtext,
/// Changed text color author 1 /// Added text color author 1
Color_changedtextauthor1, Color_addedtextauthor1,
/// Changed text color author 2 /// Added text color author 2
Color_changedtextauthor2, Color_addedtextauthor2,
/// Changed text color author 3 /// Added text color author 3
Color_changedtextauthor3, Color_addedtextauthor3,
/// Changed text color author 4 /// Added text color author 4
Color_changedtextauthor4, Color_addedtextauthor4,
/// Changed text color author 5 /// Added text color author 5
Color_changedtextauthor5, Color_addedtextauthor5,
/// Deleted text modifying color /// Deleted text modifying color
Color_deletedtextmodifier, Color_deletedtextmodifier,
/// Table line color /// Table line color