mirror of https://github.com/vitalif/openscad
Merge branch 'master' of github.com:openscad/openscad
commit
86daffdfd7
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#ff0000",
|
"number" : "#ff0000",
|
||||||
"string" : "#e6db74",
|
"string" : "#e6db74",
|
||||||
"operator" : "#e8b609",
|
"operator" : "#e8b609",
|
||||||
"whitespace-background" : "#222222",
|
|
||||||
"whitespace-foreground" : "#e0e0e0",
|
"whitespace-foreground" : "#e0e0e0",
|
||||||
"selection-foreground" : "#ffffff",
|
"selection-foreground" : "#ffffff",
|
||||||
"selection-background" : "#4a90d9",
|
"selection-background" : "#4a90d9",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "DarkRed",
|
"number" : "DarkRed",
|
||||||
"string" : "DarkMagenta",
|
"string" : "DarkMagenta",
|
||||||
"operator" : "Blue",
|
"operator" : "Blue",
|
||||||
"whitespace-background" : "#ffffff",
|
|
||||||
"whitespace-foreground" : "#272822",
|
"whitespace-foreground" : "#272822",
|
||||||
"selection-foreground" : "#ffffff",
|
"selection-foreground" : "#ffffff",
|
||||||
"selection-background" : "#4a90d9",
|
"selection-background" : "#4a90d9",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#ae81ff",
|
"number" : "#ae81ff",
|
||||||
"string" : "#e6db74",
|
"string" : "#e6db74",
|
||||||
"operator" : "#f8f8f2",
|
"operator" : "#f8f8f2",
|
||||||
"whitespace-background" : "#272822",
|
|
||||||
"whitespace-foreground" : "#f8f8f2",
|
"whitespace-foreground" : "#f8f8f2",
|
||||||
"selection-foreground" : "#272822",
|
"selection-foreground" : "#272822",
|
||||||
"selection-background" : "#f8f8f2",
|
"selection-background" : "#f8f8f2",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#d33682",
|
"number" : "#d33682",
|
||||||
"string" : "#b58900",
|
"string" : "#b58900",
|
||||||
"operator" : "#cb4b16",
|
"operator" : "#cb4b16",
|
||||||
"whitespace-background" : "#002b36",
|
|
||||||
"whitespace-foreground" : "#839496",
|
"whitespace-foreground" : "#839496",
|
||||||
"selection-foreground" : "#fdf6e3",
|
"selection-foreground" : "#fdf6e3",
|
||||||
"selection-background" : "#657b83",
|
"selection-background" : "#657b83",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#d33682",
|
"number" : "#d33682",
|
||||||
"string" : "#b58900",
|
"string" : "#b58900",
|
||||||
"operator" : "#cb4b16",
|
"operator" : "#cb4b16",
|
||||||
"whitespace-background" : "#fdf6e3",
|
|
||||||
"whitespace-foreground" : "#657b83",
|
"whitespace-foreground" : "#657b83",
|
||||||
"selection-foreground" : "#fdf6e3",
|
"selection-foreground" : "#fdf6e3",
|
||||||
"selection-background" : "#657b83",
|
"selection-background" : "#657b83",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#cc6666",
|
"number" : "#cc6666",
|
||||||
"string" : "#b5bd68",
|
"string" : "#b5bd68",
|
||||||
"operator" : "#8abeb7",
|
"operator" : "#8abeb7",
|
||||||
"whitespace-background" : "#1d1f21",
|
|
||||||
"whitespace-foreground" : "#c5c8c6",
|
"whitespace-foreground" : "#c5c8c6",
|
||||||
"selection-foreground" : "#373b41",
|
"selection-foreground" : "#373b41",
|
||||||
"selection-background" : "#c5c8c6",
|
"selection-background" : "#c5c8c6",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "#c82829",
|
"number" : "#c82829",
|
||||||
"string" : "#718c00",
|
"string" : "#718c00",
|
||||||
"operator" : "#3e999f",
|
"operator" : "#3e999f",
|
||||||
"whitespace-background" : "#f8f8f8",
|
|
||||||
"whitespace-foreground" : "#4d4d4c",
|
"whitespace-foreground" : "#4d4d4c",
|
||||||
"selection-foreground" : "#4d4d4c",
|
"selection-foreground" : "#4d4d4c",
|
||||||
"selection-background" : "#d6d6d6",
|
"selection-background" : "#d6d6d6",
|
||||||
|
|
|
@ -19,7 +19,6 @@
|
||||||
"number" : "DarkRed",
|
"number" : "DarkRed",
|
||||||
"string" : "#A31515",
|
"string" : "#A31515",
|
||||||
"operator" : "Blue",
|
"operator" : "Blue",
|
||||||
"whitespace-background" : "#ffffff",
|
|
||||||
"whitespace-foreground" : "#101010",
|
"whitespace-foreground" : "#101010",
|
||||||
"selection-foreground" : "black",
|
"selection-foreground" : "black",
|
||||||
"selection-background" : "lightblue",
|
"selection-background" : "lightblue",
|
||||||
|
|
|
@ -304,7 +304,6 @@ void ScintillaEditor::setColormap(const EditorColorScheme *colorScheme)
|
||||||
qsci->setMarkerBackgroundColor(readColor(colors, "error-marker", QColor(255, 0, 0, 100)), markerNumber);
|
qsci->setMarkerBackgroundColor(readColor(colors, "error-marker", QColor(255, 0, 0, 100)), markerNumber);
|
||||||
qsci->setIndicatorForegroundColor(readColor(colors, "error-indicator", QColor(255, 0, 0, 100)), indicatorNumber);
|
qsci->setIndicatorForegroundColor(readColor(colors, "error-indicator", QColor(255, 0, 0, 100)), indicatorNumber);
|
||||||
qsci->setIndicatorOutlineColor(readColor(colors, "error-indicator-outline", QColor(255, 0, 0, 100)), indicatorNumber);
|
qsci->setIndicatorOutlineColor(readColor(colors, "error-indicator-outline", QColor(255, 0, 0, 100)), indicatorNumber);
|
||||||
qsci->setWhitespaceBackgroundColor(readColor(colors, "whitespace-background", paperColor));
|
|
||||||
qsci->setWhitespaceForegroundColor(readColor(colors, "whitespace-foreground", textColor));
|
qsci->setWhitespaceForegroundColor(readColor(colors, "whitespace-foreground", textColor));
|
||||||
qsci->setMarginsBackgroundColor(readColor(colors, "margin-background", paperColor));
|
qsci->setMarginsBackgroundColor(readColor(colors, "margin-background", paperColor));
|
||||||
qsci->setMarginsForegroundColor(readColor(colors, "margin-foreground", textColor));
|
qsci->setMarginsForegroundColor(readColor(colors, "margin-foreground", textColor));
|
||||||
|
|
Loading…
Reference in New Issue