Skip to content

Commit 501333a

Browse files
agdlFederico Fissore
agdl
authored and
Federico Fissore
committed
new theme
1 parent 82b3269 commit 501333a

File tree

7 files changed

+168
-154
lines changed

7 files changed

+168
-154
lines changed

Diff for: ‎build/shared/lib/keywords.txt

+118-115
Original file line numberDiff line numberDiff line change
@@ -1,113 +1,60 @@
1-
# LITERAL1 specifies constants
1+
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD1
2+
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD2
3+
#STRUCTURE COLORS #728E00 - GREEN KEYWORD3
4+
#VARIABLES COLOR #00979C - BLUE LITERAL2
25

3-
HIGH LITERAL1 Constants
4-
LOW LITERAL1 Constants
5-
INPUT LITERAL1 Constants
6-
INPUT_PULLUP LITERAL1 Constants
7-
OUTPUT LITERAL1 Constants
8-
DEC LITERAL1 Serial_Print
9-
BIN LITERAL1 Serial_Print
10-
HEX LITERAL1 Serial_Print
11-
OCT LITERAL1 Serial_Print
12-
PI LITERAL1
13-
HALF_PI LITERAL1
14-
TWO_PI LITERAL1
15-
LSBFIRST LITERAL1 ShiftOut
16-
MSBFIRST LITERAL1 ShiftOut
17-
CHANGE LITERAL1 AttachInterrupt
18-
FALLING LITERAL1 AttachInterrupt
19-
RISING LITERAL1 AttachInterrupt
20-
DEFAULT LITERAL1 AnalogReference
21-
EXTERNAL LITERAL1 AnalogReference
22-
INTERNAL LITERAL1 AnalogReference
23-
INTERNAL1V1 LITERAL1 AnalogReference
24-
INTERNAL2V56 LITERAL1 AnalogReference
6+
# LITERAL2 specifies constants
257

26-
# KEYWORD1 specifies datatypes and C/C++ keywords
8+
HIGH LITERAL2 Constants
9+
LOW LITERAL2 Constants
10+
INPUT LITERAL2 Constants
11+
INPUT_PULLUP LITERAL2 Constants
12+
OUTPUT LITERAL2 Constants
13+
DEC LITERAL2 Serial_Print
14+
BIN LITERAL2 Serial_Print
15+
HEX LITERAL2 Serial_Print
16+
OCT LITERAL2 Serial_Print
17+
PI LITERAL2
18+
HALF_PI LITERAL2
19+
TWO_PI LITERAL2
20+
LSBFIRST LITERAL2 ShiftOut
21+
MSBFIRST LITERAL2 ShiftOut
22+
CHANGE LITERAL2 AttachInterrupt
23+
FALLING LITERAL2 AttachInterrupt
24+
RISING LITERAL2 AttachInterrupt
25+
DEFAULT LITERAL2 AnalogReference
26+
EXTERNAL LITERAL2 AnalogReference
27+
INTERNAL LITERAL2 AnalogReference
28+
INTERNAL1V1 LITERAL2 AnalogReference
29+
INTERNAL2V56 LITERAL2 AnalogReference
2730

28-
boolean KEYWORD1 BooleanVariables
29-
break KEYWORD1 Break
30-
byte KEYWORD1 Byte
31-
case KEYWORD1 SwitchCase
32-
char KEYWORD1 Char
33-
class KEYWORD1
34-
const KEYWORD1 Const
35-
continue KEYWORD1 Continue
36-
default KEYWORD1 SwitchCase
37-
do KEYWORD1 DoWhile
38-
double KEYWORD1 Double
39-
else KEYWORD1 Else
40-
false KEYWORD1 Constants
41-
float KEYWORD1 Float
42-
for KEYWORD1 For
43-
if KEYWORD1 If
44-
int KEYWORD1 Int
45-
long KEYWORD1 Long
46-
new KEYWORD1
47-
null KEYWORD1
48-
private KEYWORD1
49-
protected KEYWORD1
50-
public KEYWORD1
51-
register KEYWORD1
52-
return KEYWORD1 Return
53-
short KEYWORD1
54-
signed KEYWORD1
55-
static KEYWORD1 Static
56-
String KEYWORD1 String
57-
switch KEYWORD1 SwitchCase
58-
this KEYWORD1
59-
throw KEYWORD1
60-
try KEYWORD1
61-
true KEYWORD1
62-
unsigned KEYWORD1
63-
void KEYWORD1 Void
64-
while KEYWORD1 While
65-
word KEYWORD1 Word
31+
boolean LITERAL2 BooleanVariables
32+
byte LITERAL2 Byte
33+
const LITERAL2 Const
34+
false LITERAL2 Constants
35+
float LITERAL2 Float
36+
null LITERAL2
37+
int LITERAL2 Int
38+
long LITERAL2 Long
39+
new LITERAL2
40+
private LITERAL2
41+
protected LITERAL2
42+
public LITERAL2
43+
short LITERAL2
44+
signed LITERAL2
45+
static LITERAL2 Static
46+
String LITERAL2 String
47+
void LITERAL2 Void
48+
true LITERAL2
49+
unsigned LITERAL2
6650

67-
# operators aren't highlighted, but may have documentation
68-
69-
+= IncrementCompound
70-
+ Arithmetic
71-
[] arrayaccess
72-
= assign
73-
& BitwiseAnd
74-
| BitwiseAnd
75-
,
76-
// Comments
77-
?:
78-
{} Braces
79-
-- Increment
80-
/ Arithmetic
81-
/* Comments
82-
. dot
83-
==
84-
< greaterthan
85-
<= greaterthanorequalto
86-
++ Increment
87-
!= inequality
88-
<< Bitshift
89-
< lessthan
90-
<= lessthanorequalto
91-
&& Boolean
92-
! Boolean
93-
|| Boolean
94-
- Arithmetic
95-
% Modulo
96-
* Arithmetic
97-
() parentheses
98-
>> Bitshift
99-
; SemiColon
100-
-= IncrementCompound
101-
102-
# these are datatypes, but we've also defined functions to cast to them
103-
104-
boolean KEYWORD2 boolean_
105-
byte KEYWORD2 byte_
106-
char KEYWORD2 char_
107-
float KEYWORD2 float_
108-
int KEYWORD2 int_
109-
long KEYWORD2 long_
110-
word KEYWORD2 word_
51+
boolean LITERAL2 boolean_
52+
byte LITERAL2 byte_
53+
char LITERAL2 char_
54+
float LITERAL2 float_
55+
int LITERAL2 int_
56+
long LITERAL2 long_
57+
word LITERAL2 word_
11158

11259
# KEYWORD2 specifies methods and functions
11360

@@ -165,11 +112,11 @@ shiftOut KEYWORD2 ShiftOut
165112
tone KEYWORD2 Tone
166113
yield KEYWORD2 Yield
167114

168-
Serial KEYWORD3 Serial
169-
Serial1 KEYWORD3 Serial
170-
Serial2 KEYWORD3 Serial
171-
Serial3 KEYWORD3 Serial
172-
SerialUSB KEYWORD3 Serial
115+
Serial KEYWORD1 Serial
116+
Serial1 KEYWORD1 Serial
117+
Serial2 KEYWORD1 Serial
118+
Serial3 KEYWORD1 Serial
119+
SerialUSB KEYWORD1 Serial
173120
begin KEYWORD2 Serial_Begin
174121
end KEYWORD2 Serial_End
175122
peek KEYWORD2 Serial_Peek
@@ -208,10 +155,8 @@ substring KEYWORD2
208155
toCharArray KEYWORD2
209156
toInt KEYWORD2
210157

211-
# USB-related keywords
212-
213-
Keyboard KEYWORD3
214-
Mouse KEYWORD3
158+
Keyboard KEYWORD1
159+
Mouse KEYWORD1
215160
press KEYWORD2
216161
release KEYWORD2
217162
releaseAll KEYWORD2
@@ -220,5 +165,63 @@ click KEYWORD2
220165
move KEYWORD2
221166
isPressed KEYWORD2
222167

168+
# KEYWORD3 specifies structures
169+
170+
break KEYWORD3 Break
171+
case KEYWORD3 SwitchCase
172+
char KEYWORD3 Char
173+
class KEYWORD3
174+
continue KEYWORD3 Continue
175+
default KEYWORD3 SwitchCase
176+
do KEYWORD3 DoWhile
177+
double KEYWORD3 Double
178+
else KEYWORD3 Else
179+
for KEYWORD3 For
180+
if KEYWORD3 If
181+
register KEYWORD3
182+
return KEYWORD3 Return
183+
184+
switch KEYWORD3 SwitchCase
185+
this KEYWORD3
186+
throw KEYWORD3
187+
try KEYWORD3
188+
while KEYWORD3 While
189+
word KEYWORD3 Word
190+
223191
setup KEYWORD3 Setup
224192
loop KEYWORD3 Loop
193+
194+
# operators aren't highlighted, but may have documentation
195+
196+
+= IncrementCompound
197+
+ Arithmetic
198+
[] arrayaccess
199+
= assign
200+
& BitwiseAnd
201+
| BitwiseAnd
202+
,
203+
// Comments
204+
?:
205+
{} Braces
206+
-- Increment
207+
/ Arithmetic
208+
/* Comments
209+
. dot
210+
==
211+
< greaterthan
212+
<= greaterthanorequalto
213+
++ Increment
214+
!= inequality
215+
<< Bitshift
216+
< lessthan
217+
<= lessthanorequalto
218+
&& Boolean
219+
! Boolean
220+
|| Boolean
221+
- Arithmetic
222+
% Modulo
223+
* Arithmetic
224+
() parentheses
225+
>> Bitshift
226+
; SemiColon
227+
-= IncrementCompound

Diff for: ‎build/shared/lib/theme/theme.txt

+23-12
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,13 @@
1+
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD1
2+
#FUNCTIONS COLOR #D35400 - ORANGE KEYWORD2
3+
#STRUCTURE COLORS #728E00 - GREEN KEYWORD3
4+
#VARIABLES COLOR #00979C - BLUE LITERAL1
5+
6+
#ERROR COLOR #A61717 - RED
7+
#COMMENTS // COLOR #95A5A6 - LIGHT GREY
8+
#COMMENTS /**/ COLOR #434F54 - DARK GREY
9+
10+
111
# GUI - STATUS
212
status.notice.fgcolor = #002325
313
status.notice.bgcolor = #17A1A5
@@ -20,7 +30,7 @@ console.font = Monospaced,plain,11
2030
console.font.macosx = Monaco,plain,10
2131
console.color = #000000
2232
console.output.color = #eeeeee
23-
console.error.color = #E34C00
33+
console.error.color = #A61717
2434

2535
# GUI - BUTTONS
2636
buttons.bgcolor = #006468
@@ -65,38 +75,39 @@ editor.brackethighlight.color = #006699
6575

6676
# TEXT - KEYWORDS
6777

68-
# e.g abstract, final, private
69-
editor.keyword1.style = #cc6600,plain
78+
# FUNCTIONS
79+
editor.keyword1.style = #d35400,bold
7080

71-
# e.g. beginShape, point, line
72-
editor.keyword2.style = #cc6600,plain
81+
# METHODS
82+
editor.keyword2.style = #D35400,plain
7383

74-
# e.g. byte, char, short, color
75-
editor.keyword3.style = #cc6600,bold
84+
# STRUCTURES
85+
editor.keyword3.style = #728e00,plain
7686

7787

7888
# TEXT - LITERALS
7989

80-
# constants: e.g. null, true, this, RGB, TWO_PI
90+
# constants & datatypes
8191
editor.literal1.style = #006699,plain
8292

8393
# p5 built in variables: e.g. mouseX, width, pixels
84-
editor.literal2.style = #006699,plain
94+
editor.literal2.style = #00979C,plain
8595

8696
# http://arduino.cc/
8797
editor.url.style = #0000ff,underlined
8898

8999
# e.g. + - = /
90-
editor.operator.style = #000000,plain
100+
editor.operator.style = #434f54,plain
101+
91102

92103
# ?? maybe this is for words followed by a colon
93104
# like in case statements or goto
94105
editor.label.style = #7e7e7e,bold
95106

96107

97108
# TEXT - COMMENTS
98-
editor.comment1.style = #7e7e7e,plain
99-
editor.comment2.style = #7e7e7e,plain
109+
editor.comment1.style = #434F54,plain
110+
editor.comment2.style = #95a5a6,plain
100111

101112

102113
# LINE STATUS - editor line number status bar at the bottom of the screen

Diff for: ‎libraries/Bridge/keywords.txt

+10-10
Original file line numberDiff line numberDiff line change
@@ -3,18 +3,18 @@
33
#######################################
44

55
#######################################
6-
# Class (KEYWORD3)
6+
# Class (KEYWORD1)
77
#######################################
88

9-
Bridge KEYWORD3
10-
FileIO KEYWORD3
11-
FileSystem KEYWORD3
12-
Console KEYWORD3
13-
Process KEYWORD3
14-
Mailbox KEYWORD3
15-
HttpClient KEYWORD3
16-
YunServer KEYWORD3
17-
YunClient KEYWORD3
9+
Bridge KEYWORD1
10+
FileIO KEYWORD4
11+
FileSystem KEYWORD1
12+
Console KEYWORD1
13+
Process KEYWORD1
14+
Mailbox KEYWORD1
15+
HttpClient KEYWORD1
16+
YunServer KEYWORD1
17+
YunClient KEYWORD1
1818

1919
#######################################
2020
# Methods and Functions (KEYWORD2)

Diff for: ‎libraries/Esplora/keywords.txt

+1-1
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
# Class
55
#######################################
66

7-
Esplora KEYWORD3
7+
Esplora KEYWORD1
88

99
#######################################
1010
# Methods and Functions

0 commit comments

Comments
 (0)