mirror of
https://git.lyx.org/repos/lyx.git
synced 2024-11-25 19:07:45 +00:00
faster compile of LColor.C
git-svn-id: svn://svn.lyx.org/lyx/lyx-devel/trunk@771 a592a061-630c-0410-9148-cb99ea01b6c8
This commit is contained in:
Lars Gullik Bjønnes
parent
59323f5154
commit
a11982d114
@ -1,6 +1,9 @@
|
|||||||
2000-05-25 Lars Gullik Bjřnnes <larsbj@lyx.org>
|
2000-05-25 Lars Gullik Bjřnnes <larsbj@lyx.org>
|
||||||
|
|
||||||
* src/LColor.C (LColor): change a couple of grey40 to grey60
|
* src/LColor.C (LColor): change a couple of grey40 to grey60
|
||||||
|
(LColor): rewore initalization to make compiles go some magnitude
|
||||||
|
faster.
|
||||||
|
(getGUIName): don't use gettext until we need the string.
|
||||||
|
|
||||||
2000-05-09 Dekel Tsur <dekel@math.tau.ac.il>
|
2000-05-09 Dekel Tsur <dekel@math.tau.ac.il>
|
||||||
|
|
||||||
|
|||||||
134
src/LColor.C
134
src/LColor.C
@ -35,67 +35,85 @@ void LColor::fill(LColor::color col, string const & gui,
|
|||||||
infotab[col] = in;
|
infotab[col] = in;
|
||||||
}
|
}
|
||||||
|
|
||||||
|
struct ColorEntry {
|
||||||
|
LColor::color lcolor;
|
||||||
|
char const * guiname;
|
||||||
|
char const * latexname;
|
||||||
|
char const * x11name;
|
||||||
|
char const * lyxname;
|
||||||
|
};
|
||||||
|
|
||||||
|
|
||||||
LColor::LColor()
|
LColor::LColor()
|
||||||
{
|
{
|
||||||
// LColor::color, gui, latex, x11, lyx
|
// LColor::color, gui, latex, x11, lyx
|
||||||
fill(none, _("none"), "none", "black", "none");
|
ColorEntry items[] = {
|
||||||
fill(black, _("black"), "black", "black", "black");
|
{ none, N_("none"), "none", "black", "none" },
|
||||||
fill(white, _("white"), "white", "white", "white");
|
{ black, N_("black"), "black", "black", "black" },
|
||||||
fill(red, _("red"), "red", "red", "red");
|
{ white, N_("white"), "white", "white", "white" },
|
||||||
fill(green, _("green"), "green", "green", "green");
|
{ red, N_("red"), "red", "red", "red" },
|
||||||
fill(blue, _("blue"), "blue", "blue", "blue");
|
{ green, N_("green"), "green", "green", "green" },
|
||||||
fill(cyan, _("cyan"), "cyan", "cyan", "cyan");
|
{ blue, N_("blue"), "blue", "blue", "blue" },
|
||||||
fill(magenta, _("magenta"), "magenta", "magenta", "magenta");
|
{ cyan, N_("cyan"), "cyan", "cyan", "cyan" },
|
||||||
fill(yellow, _("yellow"), "yellow", "yellow", "yellow");
|
{ magenta, N_("magenta"), "magenta", "magenta", "magenta" },
|
||||||
fill(background, _("background"), "background", "linen", "background");
|
{ yellow, N_("yellow"), "yellow", "yellow", "yellow" },
|
||||||
fill(foreground, _("foreground"), "foreground", "black", "foreground");
|
{ background, N_("background"), "background", "linen", "background" },
|
||||||
fill(selection, _("selection"), "selection", "LightBlue", "selection");
|
{ foreground, N_("foreground"), "foreground", "black", "foreground" },
|
||||||
fill(latex, _("latex"), "latex", "DarkRed", "latex");
|
{ selection, N_("selection"), "selection", "LightBlue", "selection" },
|
||||||
fill(floats, _("floats"), "floats", "red", "floats");
|
{ latex, N_("latex"), "latex", "DarkRed", "latex" },
|
||||||
fill(note, _("note"), "note", "black", "note");
|
{ floats, N_("floats"), "floats", "red", "floats" },
|
||||||
fill(notebg, _("note background"), "notebg", "yellow", "notebg");
|
{ note, N_("note"), "note", "black", "note" },
|
||||||
fill(noteframe, _("note frame"), "noteframe", "black", "noteframe");
|
{ notebg, N_("note background"), "notebg", "yellow", "notebg" },
|
||||||
fill(depthbar, _("depth bar"), "depthbar", "IndianRed", "depthbar");
|
{ noteframe, N_("note frame"), "noteframe", "black", "noteframe" },
|
||||||
fill(command, _("command-inset"), "command", "black", "command");
|
{ depthbar, N_("depth bar"), "depthbar", "IndianRed", "depthbar" },
|
||||||
fill(commandbg, _("command-inset background"), "commandbg", "grey80", "commandbg");
|
{ command, N_("command-inset"), "command", "black", "command" },
|
||||||
fill(commandframe, _("inset frame"), "commandframe", "black", "commandframe");
|
{ commandbg, N_("command-inset background"), "commandbg", "grey80", "commandbg" },
|
||||||
fill(accent, _("accent"), "accent", "black", "accent");
|
{ commandframe, N_("inset frame"), "commandframe", "black", "commandframe" },
|
||||||
fill(accentbg, _("accent background"), "accentbg", "offwhite", "accentbg");
|
{ accent, N_("accent"), "accent", "black", "accent" },
|
||||||
fill(accentframe, _("accent frame"), "accentframe", "linen", "accentframe");
|
{ accentbg, N_("accent background"), "accentbg", "offwhite", "accentbg" },
|
||||||
fill(minipageline, _("minipage line"), "minipageline", "violet", "minipageline");
|
{ accentframe, N_("accent frame"), "accentframe", "linen", "accentframe" },
|
||||||
fill(special, _("special char"), "special", "RoyalBlue", "special");
|
{ minipageline, N_("minipage line"), "minipageline", "violet", "minipageline" },
|
||||||
fill(math, _("math"), "math", "DarkBlue", "math");
|
{ special, N_("special char"), "special", "RoyalBlue", "special" },
|
||||||
fill(mathbg, _("math background"), "mathbg", "AntiqueWhite", "mathbg");
|
{ math, N_("math"), "math", "DarkBlue", "math" },
|
||||||
fill(mathframe, _("math frame"), "mathframe", "Magenta", "mathframe");
|
{ mathbg, N_("math background"), "mathbg", "AntiqueWhite", "mathbg" },
|
||||||
fill(mathcursor, _("math cursor"), "mathcursor", "black", "mathcursor");
|
{ mathframe, N_("math frame"), "mathframe", "Magenta", "mathframe" },
|
||||||
fill(mathline, _("math line"), "mathline", "Blue", "mathline");
|
{ mathcursor, N_("math cursor"), "mathcursor", "black", "mathcursor" },
|
||||||
fill(footnote, _("footnote"), "footnote", "DarkRed", "footnote");
|
{ mathline, N_("math line"), "mathline", "Blue", "mathline" },
|
||||||
fill(footnotebg, _("footnote background"), "footnotebg", "grey60", "footnotebg");
|
{ footnote, N_("footnote"), "footnote", "DarkRed", "footnote" },
|
||||||
fill(footnoteframe, _("footnote frame"), "footnoteframe", "IndianRed", "footnoteframe");
|
{ footnotebg, N_("footnote background"), "footnotebg", "grey60", "footnotebg" },
|
||||||
fill(ert, _("ert"), "ert", "DarkRed", "ert");
|
{ footnoteframe, N_("footnote frame"), "footnoteframe", "IndianRed", "footnoteframe" },
|
||||||
fill(inset, _("inset"), "inset", "black", "inset");
|
{ ert, N_("ert"), "ert", "DarkRed", "ert" },
|
||||||
fill(insetbg, _("inset background"), "insetbg", "grey60", "insetbg");
|
{ inset, N_("inset"), "inset", "black", "inset" },
|
||||||
fill(insetframe, _("inset frame"), "insetframe", "IndianRed", "insetframe");
|
{ insetbg, N_("inset background"), "insetbg", "grey60", "insetbg" },
|
||||||
fill(error, _("error"), "error", "Red", "error");
|
{ insetframe, N_("inset frame"), "insetframe", "IndianRed", "insetframe" },
|
||||||
fill(eolmarker, _("end-of-line marker"), "eolmarker", "Brown", "eolmarker");
|
{ error, N_("error"), "error", "Red", "error" },
|
||||||
fill(appendixline, _("appendix line"), "appendixline", "Brown", "appendixline");
|
{ eolmarker, N_("end-of-line marker"), "eolmarker", "Brown", "eolmarker" },
|
||||||
fill(vfillline, _("vfill line"), "vfillline", "Brown", "vfillline");
|
{ appendixline, N_("appendix line"), "appendixline", "Brown", "appendixline" },
|
||||||
fill(topline, _("top/bottom line"), "topline", "Brown", "topline");
|
{ vfillline, N_("vfill line"), "vfillline", "Brown", "vfillline" },
|
||||||
fill(tableline, _("table line"), "tableline", "black", "tableline");
|
{ topline, N_("top/bottom line"), "topline", "Brown", "topline" },
|
||||||
fill(tabularline, _("tabular line"), "tabularline", "black",
|
{ tableline, N_("table line"), "tableline", "black", "tableline" },
|
||||||
"tabularline");
|
{ tabularline, N_("tabular line"), "tabularline", "black",
|
||||||
fill(tabularonoffline, _("tabularonoff line"), "tabularonoffline",
|
"tabularline" },
|
||||||
"LightSteelBlue", "tabularonoffline");
|
{ tabularonoffline, N_("tabularonoff line"), "tabularonoffline",
|
||||||
fill(bottomarea, _("bottom area"), "bottomarea", "grey40", "bottomarea");
|
"LightSteelBlue", "tabularonoffline" },
|
||||||
fill(pagebreak, _("page break"), "pagebreak", "RoyalBlue", "pagebreak");
|
{ bottomarea, N_("bottom area"), "bottomarea", "grey40", "bottomarea" },
|
||||||
fill(top, _("top of button"), "top", "grey80", "top");
|
{ pagebreak, N_("page break"), "pagebreak", "RoyalBlue", "pagebreak" },
|
||||||
fill(bottom, _("bottom of button"), "bottom", "grey40", "bottom");
|
{ top, N_("top of button"), "top", "grey80", "top" },
|
||||||
fill(left, _("left of button"), "left", "grey80", "left");
|
{ bottom, N_("bottom of button"), "bottom", "grey40", "bottom" },
|
||||||
fill(right, _("right of button"), "right", "grey40", "right");
|
{ left, N_("left of button"), "left", "grey80", "left" },
|
||||||
fill(buttonbg, _("button background"), "buttonbg", "grey60", "buttonbg");
|
{ right, N_("right of button"), "right", "grey40", "right" },
|
||||||
fill(inherit, _("inherit"), "inherit", "black", "inherit");
|
{ buttonbg, N_("button background"), "buttonbg", "grey60", "buttonbg" },
|
||||||
fill(ignore, _("ignore"), "ignore", "black", "ignore");
|
{ inherit, N_("inherit"), "inherit", "black", "inherit" },
|
||||||
|
{ ignore, N_("ignore"), "ignore", "black", "ignore" },
|
||||||
|
{ ignore, 0, 0, 0, 0 }
|
||||||
|
};
|
||||||
|
|
||||||
|
int i = 0;
|
||||||
|
while (items[i].guiname) {
|
||||||
|
fill(items[i].lcolor, items[i].guiname, items[i].latexname,
|
||||||
|
items[i].x11name, items[i].lyxname);
|
||||||
|
++i;
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
@ -103,7 +121,7 @@ string LColor::getGUIName(LColor::color c) const
|
|||||||
{
|
{
|
||||||
InfoTab::const_iterator ici = infotab.find(c);
|
InfoTab::const_iterator ici = infotab.find(c);
|
||||||
if (ici != infotab.end())
|
if (ici != infotab.end())
|
||||||
return (*ici).second.guiname;
|
return _((*ici).second.guiname.c_str());
|
||||||
|
|
||||||
return "none";
|
return "none";
|
||||||
}
|
}
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user