Skip to content

Commit f79f2a6

Browse files
ebarboniebarboni
authored
Merge pull request #1941 from AlexFalappa/flatlaflight-colorprofile
FlatLaf Light editor color profile
2 parents 3139141 + 16bcb91 commit f79f2a6

File tree

6 files changed

+243
-4
lines changed

6 files changed

+243
-4
lines changed

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -22,3 +22,4 @@ OpenIDE-Module-Name=FlatLaf Look and Feel
2222
OpenIDE-Module-Short-Description=FlatLaf Look and Feels
2323

2424
Editors/FontsColors/FlatLafDark=FlatLaf Dark
25+
Editors/FontsColors/FlatLafLight=FlatLaf Light

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@
1515
# specific language governing permissions and limitations
1616
# under the License.
1717

18-
nb.preferred.color.profile=NetBeans
18+
nb.preferred.color.profile=FlatLaf Light
1919

2020
#---- EditorView ----
2121

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafLight-annotations.xml‎

Lines changed: 121 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,121 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
23+
<fontscolors>
24+
<fontcolor name="Breakpoint_broken" bgColor="dcdcd8"/>
25+
<fontcolor name="Breakpoint_stroke" bgColor="dcdcd8"/>
26+
<fontcolor name="Breakpoint" bgColor="fc9d9f"/>
27+
<fontcolor name="CallSite" bgColor="e7e1ef"/>
28+
<fontcolor name="ClassBreakpoint_stroke"/>
29+
<fontcolor name="ClassBreakpoint"/>
30+
<fontcolor name="CondBreakpoint_broken" bgColor="dcdcd8"/>
31+
<fontcolor name="CondBreakpoint_stroke" bgColor="dcdcd8"/>
32+
<fontcolor name="CondBreakpoint" bgColor="fc9d9f"/>
33+
<fontcolor name="CurrentExpression" bgColor="d1ffbc"/>
34+
<fontcolor name="CurrentExpressionLine_BP" bgColor="e9ffe6"/>
35+
<fontcolor name="CurrentExpressionLine_CBP" bgColor="e9ffe6"/>
36+
<fontcolor name="CurrentExpressionLine_DBP" bgColor="e9ffe6"/>
37+
<fontcolor name="CurrentExpressionLine_DCBP" bgColor="e9ffe6"/>
38+
<fontcolor name="CurrentExpressionLine" bgColor="e9ffe6"/>
39+
<fontcolor name="CurrentPC" bgColor="bde6aa"/>
40+
<fontcolor name="CurrentPC2_BP" bgColor="fc9d9f"/>
41+
<fontcolor name="CurrentPC2_DBP" bgColor="dcdcd8"/>
42+
<fontcolor name="CurrentPC2" bgColor="bde6aa"/>
43+
<fontcolor name="CurrentPC2LinePart" bgColor="bde6aa"/>
44+
<fontcolor name="CurrentPCLinePart" bgColor="bde6aa"/>
45+
<fontcolor name="debugger-mixed_BP_broken" bgColor="dcdcd8"/>
46+
<fontcolor name="debugger-mixed_BP" bgColor="fc9d9f"/>
47+
<fontcolor name="debugger-multi_BPCBP_broken" bgColor="dcdcd8"/>
48+
<fontcolor name="debugger-multi_BPCBP" bgColor="fc9d9f"/>
49+
<fontcolor name="debugger-multi_DBPCBP" bgColor="dcdcd8"/>
50+
<fontcolor name="debugger-PC_BP_broken" bgColor="bde6aa"/>
51+
<fontcolor name="debugger-PC_BP_stroke" bgColor="bde6aa"/>
52+
<fontcolor name="debugger-PC_BP" bgColor="bde6aa"/>
53+
<fontcolor name="debugger-PC_CBP_broken" bgColor="bde6aa"/>
54+
<fontcolor name="debugger-PC_CBP_stroke" bgColor="bde6aa"/>
55+
<fontcolor name="debugger-PC_CBP" bgColor="bde6aa"/>
56+
<fontcolor name="debugger-PC_DBP_stroke" bgColor="bde6aa"/>
57+
<fontcolor name="debugger-PC_DBP" bgColor="bde6aa"/>
58+
<fontcolor name="debugger-PC_DCBP_stroke" bgColor="bde6aa"/>
59+
<fontcolor name="debugger-PC_DCBP" bgColor="bde6aa"/>
60+
<fontcolor name="debugger-PC_mixedBP_broken" bgColor="bde6aa"/>
61+
<fontcolor name="debugger-PC_mixedBP" bgColor="bde6aa"/>
62+
<fontcolor name="debugger-PC_multi_BPCBP_broken" bgColor="bde6aa"/>
63+
<fontcolor name="debugger-PC_multi_BPCBP" bgColor="bde6aa"/>
64+
<fontcolor name="debugger-PC_multi_DBPCBP" bgColor="bde6aa"/>
65+
<fontcolor name="DisabledBreakpoint_stroke" bgColor="dcdcd8"/>
66+
<fontcolor name="DisabledBreakpoint" bgColor="dcdcd8"/>
67+
<fontcolor name="DisabledClassBreakpoint_stroke"/>
68+
<fontcolor name="DisabledClassBreakpoint"/>
69+
<fontcolor name="DisabledCondBreakpoint_stroke" bgColor="dcdcd8"/>
70+
<fontcolor name="DisabledCondBreakpoint" bgColor="dcdcd8"/>
71+
<fontcolor name="DisabledFieldBreakpoint_stroke"/>
72+
<fontcolor name="DisabledFieldBreakpoint"/>
73+
<fontcolor name="DisabledMethodBreakpoint_stroke"/>
74+
<fontcolor name="DisabledMethodBreakpoint"/>
75+
<fontcolor name="editor-bookmark"/>
76+
<fontcolor name="FieldBreakpoint_stroke"/>
77+
<fontcolor name="FieldBreakpoint"/>
78+
<fontcolor name="loadgenProfilingPoint" bgColor="b4e4fc"/>
79+
<fontcolor name="loadgenProfilingPointD" bgColor="dcdcd8"/>
80+
<fontcolor name="MethodBreakpoint_stroke"/>
81+
<fontcolor name="MethodBreakpoint"/>
82+
<fontcolor name="org-netbeans-modules-editor-annotations-has_implementations"/>
83+
<fontcolor name="org-netbeans-modules-editor-annotations-implements-has-implementations-combined"/>
84+
<fontcolor name="org-netbeans-modules-editor-annotations-implements-is-overridden-combined"/>
85+
<fontcolor name="org-netbeans-modules-editor-annotations-implements"/>
86+
<fontcolor name="org-netbeans-modules-editor-annotations-is_overridden"/>
87+
<fontcolor name="org-netbeans-modules-editor-annotations-override-is-overridden-combined"/>
88+
<fontcolor name="org-netbeans-modules-editor-annotations-overrides"/>
89+
<fontcolor name="org-netbeans-modules-git-Annotation"/>
90+
<fontcolor name="org-netbeans-modules-mercurial-Annotation"/>
91+
<fontcolor name="org-netbeans-modules-subversion-Annotation"/>
92+
<fontcolor name="org-netbeans-modules-versioning-annotate-Annotation"/>
93+
<fontcolor name="org-netbeans-modules-xml-error" bgColor="ffa0a0"/>
94+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err_fixable"/>
95+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_err"/>
96+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint_fixable"/>
97+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_hint"/>
98+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo_fixable"/>
99+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_todo"/>
100+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier_fixable"/>
101+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_verifier"/>
102+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn_fixable"/>
103+
<fontcolor name="org-netbeans-spi-editor-hints-parser_annotation_warn"/>
104+
<fontcolor name="OtherThread_BP_broken" bgColor="bde6aa"/>
105+
<fontcolor name="OtherThread_BP" bgColor="fc9d9f"/>
106+
<fontcolor name="OtherThread_DBP" bgColor="dcdcd8"/>
107+
<fontcolor name="OtherThread_PC_BP" bgColor="bde6aa"/>
108+
<fontcolor name="OtherThread_PC" bgColor="bde6aa"/>
109+
<fontcolor name="OtherThread"/>
110+
<fontcolor name="OtherThreads_BP_broken" bgColor="bde6aa"/>
111+
<fontcolor name="OtherThreads_BP" bgColor="fc9d9f"/>
112+
<fontcolor name="OtherThreads_DBP" bgColor="dcdcd8"/>
113+
<fontcolor name="OtherThreads_PC_BP" bgColor="bde6aa"/>
114+
<fontcolor name="OtherThreads"/>
115+
<fontcolor name="resetResultsProfilingPoint" bgColor="b4e4fc"/>
116+
<fontcolor name="resetResultsProfilingPointD" bgColor="dcdcd8"/>
117+
<fontcolor name="stopwatchProfilingPoint" bgColor="b4e4fc"/>
118+
<fontcolor name="stopwatchProfilingPointD" bgColor="dcdcd8"/>
119+
<fontcolor name="takeSnapshotProfilingPoint" bgColor="b4e4fc"/>
120+
<fontcolor name="takeSnapshotProfilingPointD" bgColor="dcdcd8"/>
121+
</fontscolors>

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafLight-highlights.xml‎

Lines changed: 59 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,59 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
23+
<fontscolors>
24+
<fontcolor name="block-search" foreColor="black" bgColor="E0E8F1"/>
25+
<fontcolor name="caret-color-insert-mode" foreColor="black"/>
26+
<fontcolor name="caret-color-overwrite-mode" foreColor="black"/>
27+
<fontcolor name="code-folding-bar" foreColor="8C8C8C"/>
28+
<fontcolor name="code-folding-border" foreColor="8C8C8C"/>
29+
<fontcolor name="code-folding" foreColor="8C8C8C"/>
30+
<fontcolor name="guarded" bgColor="DFDFDF"/>
31+
<fontcolor name="highlight-caret-row" bgColor="F9F4E0"/>
32+
<fontcolor name="highlight-search" foreColor="black" bgColor="FFB442"/>
33+
<fontcolor name="hyperlinks" foreColor="185ADD" underline="185ADD"/>
34+
<fontcolor name="inc-search" foreColor="black" bgColor="FFB442"/>
35+
<fontcolor name="indent-guide-lines" foreColor="D3D3D3"/>
36+
<fontcolor name="indent-whitespace" foreColor="lightGray"/>
37+
<fontcolor name="line-number" foreColor="darkGray" bgColor="E9E8E2"/>
38+
<fontcolor name="nbeditor-bracesMatching-match-multichar" bgColor="CCFFCC"/>
39+
<fontcolor name="nbeditor-bracesMatching-match" bgColor="CCFFCC"/>
40+
<fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="D83636"/>
41+
<fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="D83636"/>
42+
<fontcolor name="nbeditor-bracesMatching-sidebar" foreColor="6B8EB2"/>
43+
<fontcolor name="readonly-files" bgColor="DFDFDF"/>
44+
<fontcolor name="selection" bgColor="89BCED"/>
45+
<fontcolor name="status-bar-bold" foreColor="DD2A2A"/>
46+
<fontcolor name="status-bar"/>
47+
<fontcolor name="synchronized-text-blocks-ext-slave" foreColor="996600"/>
48+
<fontcolor name="synchronized-text-blocks-ext" foreColor="CC0099"/>
49+
<fontcolor name="synchronized-text-blocks" bgColor="8AC0EC"/>
50+
<fontcolor name="text-limit-line-color" foreColor="D2ACCB"/>
51+
<fontcolor name="trailing-whitespace" foreColor="lightGray"/>
52+
<fontcolor name="west-sidebars-color"/>
53+
<!-- <fontcolor name="coverage-covered" bgColor="005000"/>
54+
<fontcolor name="coverage-uncovered" bgColor="813438"/>
55+
<fontcolor name="coverage-inferred" bgColor="1c501c"/>
56+
<fontcolor name="coverage-partial" bgColor="707000"/>
57+
<fontcolor name="remove-surround-code-delete" foreColor="ff5A5A5A" bgColor="ff323232"/>
58+
<fontcolor name="remove-surround-code-remain" bgColor="ff143C00"/> -->
59+
</fontscolors>

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafLight-tokenColorings.xml‎

Lines changed: 44 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,44 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
<!--
3+
4+
Licensed to the Apache Software Foundation (ASF) under one
5+
or more contributor license agreements. See the NOTICE file
6+
distributed with this work for additional information
7+
regarding copyright ownership. The ASF licenses this file
8+
to you under the Apache License, Version 2.0 (the
9+
"License"); you may not use this file except in compliance
10+
with the License. You may obtain a copy of the License at
11+
12+
http://www.apache.org/licenses/LICENSE-2.0
13+
14+
Unless required by applicable law or agreed to in writing,
15+
software distributed under the License is distributed on an
16+
"AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
17+
KIND, either express or implied. See the License for the
18+
specific language governing permissions and limitations
19+
under the License.
20+
21+
-->
22+
<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.1//EN" "http://www.netbeans.org/dtds/EditorFontsColors-1_1.dtd">
23+
<fontscolors>
24+
<fontcolor name="char" foreColor="1E9347"/>
25+
<fontcolor name="comment" foreColor="969696"/>
26+
<fontcolor name="default" foreColor="black" bgColor="white"/>
27+
<fontcolor name="entity-reference" foreColor="black" default="default"><font style="bold"/></fontcolor>
28+
<fontcolor name="error" waveUnderlined="red"/>
29+
<fontcolor name="field" foreColor="CE54B8" default="identifier"/>
30+
<fontcolor name="identifier"/>
31+
<fontcolor name="keyword" foreColor="336BDD"/>
32+
<fontcolor name="mark-occurrences" bgColor="D7E6CB"/>
33+
<fontcolor name="markup-attribute" default="field"/>
34+
<fontcolor name="markup-attribute-value" default="string"/>
35+
<fontcolor name="markup-element" default="keyword"/>
36+
<fontcolor name="method" default="identifier"/>
37+
<fontcolor name="number" foreColor="black"/>
38+
<fontcolor name="operator"/>
39+
<fontcolor name="separator"/>
40+
<fontcolor name="string" foreColor="1E9347"/>
41+
<fontcolor name="url" foreColor="287BDE" underline="287BDE"/>
42+
<fontcolor name="warning" waveUnderlined="FFA500"/>
43+
<fontcolor name="whitespace" foreColor="black"/>
44+
</fontscolors>

‎platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml‎

Lines changed: 17 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -27,13 +27,27 @@
2727
<folder name="FlatLafDark">
2828
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
2929
<folder name="Defaults">
30-
<file name="org-netbeans-modules-editor-annotations-colorings.xml" url="fontscolors/FlatLafDark-annotations.xml">
30+
<file name="org-netbeans-modules-editor-annotations-flatlafdark.xml" url="fontscolors/FlatLafDark-annotations.xml">
3131
<attr name="nbeditor-settings-ColoringType" stringvalue="annotation"/>
3232
</file>
33-
<file name="org-netbeans-modules-defaults-highlight-colorings.xml" url="fontscolors/FlatLafDark-highlights.xml">
33+
<file name="org-netbeans-modules-defaults-highlight-flatlafdark.xml" url="fontscolors/FlatLafDark-highlights.xml">
3434
<attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
3535
</file>
36-
<file name="org-netbeans-modules-defaults-token-colorings.xml" url="fontscolors/FlatLafDark-tokenColorings.xml">
36+
<file name="org-netbeans-modules-defaults-token-flatlafdark.xml" url="fontscolors/FlatLafDark-tokenColorings.xml">
37+
<attr name="nbeditor-settings-ColoringType" stringvalue="token"/>
38+
</file>
39+
</folder>
40+
</folder>
41+
<folder name="FlatLafLight">
42+
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
43+
<folder name="Defaults">
44+
<file name="org-netbeans-modules-editor-annotations-flatlaflight.xml" url="fontscolors/FlatLafLight-annotations.xml">
45+
<attr name="nbeditor-settings-ColoringType" stringvalue="annotation"/>
46+
</file>
47+
<file name="org-netbeans-modules-defaults-highlight-flatlaflight.xml" url="fontscolors/FlatLafLight-highlights.xml">
48+
<attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
49+
</file>
50+
<file name="org-netbeans-modules-defaults-token-flatlaflight.xml" url="fontscolors/FlatLafLight-tokenColorings.xml">
3751
<attr name="nbeditor-settings-ColoringType" stringvalue="token"/>
3852
</file>
3953
</folder>

0 commit comments

Comments
 (0)