vitalif
/
openscad
mirror of https://github.com/vitalif/openscad
1
0
Fork 0
Code Issues Releases Wiki Activity

Merge branch 'master' of github.com:openscad/openscad

master
Marius Kintel 2015-01-03 16:44:16 -05:00
parent d997226f3c 7cefaa7300
commit 86daffdfd7
9 changed files with 0 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
color-schemes/editor/dark-background.json
View File

@ -19,7 +19,6 @@
"number" : "#ff0000",
"string" : "#e6db74",
"operator" : "#e8b609",
"whitespace-background" : "#222222",
"whitespace-foreground" : "#e0e0e0",
"selection-foreground" : "#ffffff",
"selection-background" : "#4a90d9",

1
color-schemes/editor/light-background.json
View File

@ -19,7 +19,6 @@
"number" : "DarkRed",
"string" : "DarkMagenta",
"operator" : "Blue",
"whitespace-background" : "#ffffff",
"whitespace-foreground" : "#272822",
"selection-foreground" : "#ffffff",
"selection-background" : "#4a90d9",

1
color-schemes/editor/monokai.json
View File

@ -19,7 +19,6 @@
"number" : "#ae81ff",
"string" : "#e6db74",
"operator" : "#f8f8f2",
"whitespace-background" : "#272822",
"whitespace-foreground" : "#f8f8f2",
"selection-foreground" : "#272822",
"selection-background" : "#f8f8f2",

1
color-schemes/editor/solarized-dark.json
View File

@ -19,7 +19,6 @@
"number" : "#d33682",
"string" : "#b58900",
"operator" : "#cb4b16",
"whitespace-background" : "#002b36",
"whitespace-foreground" : "#839496",
"selection-foreground" : "#fdf6e3",
"selection-background" : "#657b83",

1
color-schemes/editor/solarized-light.json
View File

@ -19,7 +19,6 @@
"number" : "#d33682",
"string" : "#b58900",
"operator" : "#cb4b16",
"whitespace-background" : "#fdf6e3",
"whitespace-foreground" : "#657b83",
"selection-foreground" : "#fdf6e3",
"selection-background" : "#657b83",

1
color-schemes/editor/tomorrow-night.json
View File

@ -19,7 +19,6 @@
"number" : "#cc6666",
"string" : "#b5bd68",
"operator" : "#8abeb7",
"whitespace-background" : "#1d1f21",
"whitespace-foreground" : "#c5c8c6",
"selection-foreground" : "#373b41",
"selection-background" : "#c5c8c6",

1
color-schemes/editor/tomorrow.json
View File

@ -19,7 +19,6 @@
"number" : "#c82829",
"string" : "#718c00",
"operator" : "#3e999f",
"whitespace-background" : "#f8f8f8",
"whitespace-foreground" : "#4d4d4c",
"selection-foreground" : "#4d4d4c",
"selection-background" : "#d6d6d6",

1
color-schemes/editor/visualstudio.json
View File

@ -19,7 +19,6 @@
"number" : "DarkRed",
"string" : "#A31515",
"operator" : "Blue",
"whitespace-background" : "#ffffff",
"whitespace-foreground" : "#101010",
"selection-foreground" : "black",
"selection-background" : "lightblue",

1
src/scintillaeditor.cpp
View File

@ -304,7 +304,6 @@ void ScintillaEditor::setColormap(const EditorColorScheme *colorScheme)
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->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->setMarginsBackgroundColor(readColor(colors, "margin-background", paperColor));
qsci->setMarginsForegroundColor(readColor(colors, "margin-foreground", textColor));