You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by lk...@apache.org on 2019/12/08 18:51:36 UTC
[netbeans] 02/02: Moved config xml-s into fontcolors folder
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch flatlaf-fontscolors
in repository https://gitbox.apache.org/repos/asf/netbeans.git
commit 6e88a13960cfd59ff0d509b0e4f306ede95a8d4a
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Sun Dec 8 10:50:54 2019 -0800
Moved config xml-s into fontcolors folder
---
.../laf/flatlaf/fontcolors/FlatLafDark-editor.xml | 76 --------------------
.../FlatLaf-Properties-fontsColors.xml | 0
.../FlatLafDark-Java-fontsColors.xml | 0
.../laf/flatlaf/fontscolors/FlatLafDark-editor.xml | 83 ++++++++++++++++++++++
.../FlatLafDark-fontsColorsDefaults.xml | 17 +++--
.../src/org/netbeans/swing/laf/flatlaf/layer.xml | 8 +--
6 files changed, 95 insertions(+), 89 deletions(-)
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-editor.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-editor.xml
deleted file mode 100644
index 5c88663..0000000
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-editor.xml
+++ /dev/null
@@ -1,76 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!--
-
- Licensed to the Apache Software Foundation (ASF) under one
- or more contributor license agreements. See the NOTICE file
- distributed with this work for additional information
- regarding copyright ownership. The ASF licenses this file
- to you under the Apache License, Version 2.0 (the
- "License"); you may not use this file except in compliance
- with the License. You may obtain a copy of the License at
-
- http://www.apache.org/licenses/LICENSE-2.0
-
- Unless required by applicable law or agreed to in writing,
- software distributed under the License is distributed on an
- "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
- KIND, either express or implied. See the License for the
- specific language governing permissions and limitations
- under the License.
-
--->
-<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.2//EN" "http://netbeans.apache.org/dtds/EditorFontsColors-1_2.dtd">
-
-<fontscolors>
- <colordef name="bg0_hard" color="1d2021"/>
- <colordef name="bg0" color="282828"/>
- <colordef name="bg1" color="3c3836"/>
- <colordef name="bg2" color="504945"/>
- <colordef name="bg3" color="665c54"/>
- <colordef name="bg4" color="7c6f64"/>
-
- <colordef name="gray" color="928374"/>
-
- <colordef name="fg0" color="fbf1c7"/>
- <colordef name="fg1" color="ebdbb2"/>
- <colordef name="fg2" color="d5c4a1"/>
- <colordef name="fg3" color="bdae93"/>
- <colordef name="fg4" color="a89984"/>
-
- <colordef name="red" color="fb4934"/>
- <colordef name="green" color="b8bb26"/>
- <colordef name="yellow" color="fabd2f"/>
- <colordef name="blue" color="83a598"/>
- <colordef name="purple" color="d3869b"/>
- <colordef name="aqua" color="8ec07c"/>
- <colordef name="orange" color="fe8019"/>
-
- <fontcolor name="code-folding" foreColor="gray"/>
- <fontcolor name="code-folding-bar" foreColor="gray"/>
- <fontcolor name="highlight-caret-row" bgColor="bg1"/>
- <fontcolor name="nbeditor-bracesMatching-match" foreColor="fg0" bgColor="bg3"/>
- <fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="red" foreColor="bg0"/>
- <fontcolor name="nbeditor-bracesMatching-match-multichar" foreColor="fg0" bgColor="bg3"/>
- <fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="red" foreColor="bg0"/>
- <fontcolor name="line-number" foreColor="gray" bgColor="bg0_hard"/>
- <fontcolor name="selection" bgColor="bg3"/>
- <fontcolor name="text-limit-line-color" foreColor="fg1"/>
- <fontcolor name="hyperlinks" foreColor="fg4" underline="fg4"/>
- <fontcolor name="indent-guide-lines" foreColor="bg2"/>
- <fontcolor name="caret-color-insert-mode" foreColor="fg0" bgColor="bg0"/>
- <fontcolor name="caret-color-overwrite-mode" foreColor="fg0" bgColor="bg0"/>
- <fontcolor name="nbeditor-bracesMatching-sidebar" foreColor="gray"/>
- <fontcolor name="indent-whitespace"/>
- <fontcolor name="trailing-whitespace" bgColor="bg0_hard"/>
- <fontcolor name="highlight-search" foreColor="bg0" bgColor="yellow"/>
- <fontcolor name="block-search" foreColor="fg1" bgColor="bg2"/>
- <fontcolor name="inc-search" bgColor="orange"/>
-
- <fontcolor name="guarded" bgColor="bg0_hard"/>
- <fontcolor name="readonly-files" bgColor="bg0_hard"/>
- <fontcolor name="status-bar"/>
- <fontcolor name="status-bar-bold" foreColor="red"/>
-
- <fontcolor name="synchronized-text-blocks-ext" foreColor="orange"/>
- <fontcolor name="synchronized-text-blocks-ext-slave" foreColor="yellow"/>
-</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLaf-Properties-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
similarity index 100%
rename from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLaf-Properties-fontsColors.xml
rename to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLaf-Properties-fontsColors.xml
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-Java-fontsColors.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-fontsColors.xml
similarity index 100%
rename from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-Java-fontsColors.xml
rename to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-Java-fontsColors.xml
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml
new file mode 100644
index 0000000..92d1670
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-editor.xml
@@ -0,0 +1,83 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<!--
+
+ Licensed to the Apache Software Foundation (ASF) under one
+ or more contributor license agreements. See the NOTICE file
+ distributed with this work for additional information
+ regarding copyright ownership. The ASF licenses this file
+ to you under the Apache License, Version 2.0 (the
+ "License"); you may not use this file except in compliance
+ with the License. You may obtain a copy of the License at
+
+ http://www.apache.org/licenses/LICENSE-2.0
+
+ Unless required by applicable law or agreed to in writing,
+ software distributed under the License is distributed on an
+ "AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY
+ KIND, either express or implied. See the License for the
+ specific language governing permissions and limitations
+ under the License.
+
+-->
+<!DOCTYPE fontscolors PUBLIC "-//NetBeans//DTD Editor Fonts and Colors settings 1.2//EN" "http://netbeans.apache.org/dtds/EditorFontsColors-1_2.dtd">
+
+<fontscolors>
+ <colordef name="bg0_hard" color="1d2021"/>
+
+
+
+ <colordef name="fg2" color="d5c4a1"/>
+ <colordef name="fg3" color="bdae93"/>
+
+ <colordef name="purple" color="d3869b"/>
+ <!-- defined -->
+ <colordef name="bg0" color="2b2b2b"/>
+ <colordef name="bg1" color="323232"/>
+ <colordef name="bg2" color="888888"/>
+ <colordef name="bg3" color="214283"/>
+ <colordef name="bg4" color="3b514d"/>
+ <colordef name="bg5" color="313335"/>
+
+ <colordef name="fg0" color="a9b7c6"/>
+ <colordef name="fg1" color="bbbbbb"/>
+ <colordef name="fg4" color="888888"/>
+ <colordef name="fg5" color="555555"/>
+
+ <colordef name="red" color="9e2927"/>
+ <colordef name="green" color="32593D"/>
+ <colordef name="blue" color="6897bb"/>
+ <colordef name="yellow" color="e8bf6a"/>
+ <colordef name="orange" color="cc7832"/>
+ <colordef name="levander" color="9876aa"/>
+
+ <fontcolor name="default" foreColor="fg0" bgColor="bg0"/>
+
+ <fontcolor name="code-folding" foreColor="8c8c8c"/>
+ <fontcolor name="code-folding-bar" foreColor="8c8c8c"/>
+ <fontcolor name="highlight-caret-row" bgColor="bg1"/>
+ <fontcolor name="nbeditor-bracesMatching-match" foreColor="yellow" bgColor="bg4"/>
+ <fontcolor name="nbeditor-bracesMatching-match-multichar" bgColor="bg4"/>
+ <fontcolor name="nbeditor-bracesMatching-mismatch" bgColor="red"/>
+ <fontcolor name="nbeditor-bracesMatching-mismatch-multichar" bgColor="red"/>
+ <fontcolor name="line-number" foreColor="fg4" bgColor="bg5"/>
+ <fontcolor name="selection" bgColor="bg3"/>
+ <fontcolor name="text-limit-line-color" foreColor="fg5"/>
+ <fontcolor name="hyperlinks" foreColor="287BDE" underline="287BDE"/>
+ <fontcolor name="indent-guide-lines" foreColor="404040"/>
+ <fontcolor name="caret-color-insert-mode" foreColor="fg1"/>
+ <fontcolor name="caret-color-overwrite-mode" foreColor="fg1"/>
+ <fontcolor name="nbeditor-bracesMatching-sidebar" foreColor="blue"/>
+ <fontcolor name="indent-whitespace"/>
+ <fontcolor name="trailing-whitespace"/>
+ <fontcolor name="highlight-search" bgColor="green"/>
+ <fontcolor name="block-search" foreColor="black" bgColor="E0E8F1"/>
+ <fontcolor name="inc-search" bgColor="FFB442"/>
+
+ <fontcolor name="guarded" bgColor="bg1"/>
+ <fontcolor name="readonly-files" bgColor="bg1"/>
+ <fontcolor name="status-bar"/>
+ <fontcolor name="status-bar-bold" foreColor="red"/>
+
+ <fontcolor name="synchronized-text-blocks-ext" foreColor="CC0099"/>
+ <fontcolor name="synchronized-text-blocks-ext-slave" foreColor="996600"/>
+</fontscolors>
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-fontsColorsDefaults.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml
similarity index 88%
rename from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-fontsColorsDefaults.xml
rename to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml
index 39b6ddd..64894ca 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontcolors/FlatLafDark-fontsColorsDefaults.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/fontscolors/FlatLafDark-fontsColorsDefaults.xml
@@ -24,23 +24,22 @@
<fontscolors>
<colordef name="bg0_hard" color="1d2021"/>
- <colordef name="bg1" color="3c3836"/>
- <colordef name="bg2" color="504945"/>
- <colordef name="bg3" color="665c54"/>
- <colordef name="bg4" color="7c6f64"/>
- <colordef name="gray" color="928374"/>
<colordef name="fg1" color="ebdbb2"/>
<colordef name="fg2" color="d5c4a1"/>
<colordef name="fg3" color="bdae93"/>
- <colordef name="fg4" color="a89984"/>
<colordef name="purple" color="d3869b"/>
<!-- defined -->
<colordef name="bg0" color="2b2b2b"/>
+ <colordef name="bg1" color="323232"/>
+ <colordef name="bg2" color="888888"/>
+ <colordef name="bg3" color="214283"/>
+ <colordef name="bg4" color="3b514d"/>
<colordef name="fg0" color="a9b7c6"/>
+ <colordef name="fg4" color="888888"/>
<colordef name="red" color="9e2927"/>
<colordef name="green" color="6a8759"/>
@@ -66,17 +65,17 @@
<fontcolor name="whitespace"/>
<fontcolor name="markup-element"/>
- <fontcolor name="markup-attribute" foreColor="aqua"/>
+ <fontcolor name="markup-attribute" foreColor="levander"/>
<fontcolor name="markup-attribute-value" foreColor="green"/>
<fontcolor name="entity-reference" foreColor="cyan"/>
<fontcolor name="mark-occurrences" bgColor="bg3"/>
<!-- semantic colorings -->
- <fontcolor name="constructor" foreColor="aqua">
+ <fontcolor name="constructor" foreColor="levander">
<font style="bold" />
</fontcolor>
- <fontcolor name="method" foreColor="aqua">
+ <fontcolor name="method" foreColor="levander">
<font style="bold" />
</fontcolor>
<fontcolor name="field" foreColor="blue">
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
index b1a6ac8..7bf12aa 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/layer.xml
@@ -26,10 +26,10 @@
<folder name="FlatLafDark">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
<folder name="Defaults">
- <file name="org-netbeans-modules-defaults-token-colorings.xml" url="fontcolors/FlatLaf-fontsColorsDefaults.xml">
+ <file name="org-netbeans-modules-defaults-token-colorings.xml" url="fontscolors/FlatLafDark-fontsColorsDefaults.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
</file>
- <file name="org-netbeans-modules-defaults-highlight-colorings.xml" url="FlatLafDark-editor.xml">
+ <file name="org-netbeans-modules-defaults-highlight-colorings.xml" url="fontcolors/FlatLafDark-editor.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
<attr name="nbeditor-settings-ColoringType" stringvalue="highlight"/>
</file>
@@ -41,7 +41,7 @@
<folder name="FontsColors">
<folder name="FlatLafDark">
<folder name="Defaults">
- <file name="org-netbeans-modules-properties-syntax-token-colorings.xml" url="fontcolors/FlatLaf-Properties-fontsColors.xml">
+ <file name="org-netbeans-modules-properties-syntax-token-colorings.xml" url="fontscolors/FlatLaf-Properties-fontsColors.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
</file>
</folder>
@@ -52,7 +52,7 @@
<folder name="FontsColors">
<folder name="FlatLafDark">
<folder name="Defaults">
- <file name="org-netbeans-modules-editor-java-token-colorings.xml" url="fontcolors/FlatLafDark-Java-fontsColors.xml">
+ <file name="org-netbeans-modules-editor-java-token-colorings.xml" url="fontscolors/FlatLafDark-Java-fontsColors.xml">
<attr name="SystemFileSystem.localizingBundle" stringvalue="org.netbeans.swing.laf.flatlaf.Bundle"/>
</file>
</folder>
---------------------------------------------------------------------
To unsubscribe, e-mail: commits-unsubscribe@netbeans.apache.org
For additional commands, e-mail: commits-help@netbeans.apache.org
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists