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/10 20:12:18 UTC

[netbeans] branch flatlaf-fontscolors updated: Move UIDefaults to properties.

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


The following commit(s) were added to refs/heads/flatlaf-fontscolors by this push:
     new cff7594  Move UIDefaults to properties.
     new 0694673  Merge branch 'flatlaf-fontscolors' of github.com:apache/netbeans into flatlaf-fontscolors
cff7594 is described below

commit cff75942257f4e6854547c06839f2ecbf5d33e6f
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Mon Dec 9 11:31:19 2019 -0800

    Move UIDefaults to properties.
---
 .../src/org/netbeans/swing/laf/flatlaf/Bundle.properties       |  2 +-
 .../src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java      | 10 ----------
 .../flatlaf/{Bundle.properties => NbFlatDarkLaf.properties}    |  9 ++-------
 3 files changed, 3 insertions(+), 18 deletions(-)

diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties
index 88d7d27..11ea533 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties
@@ -21,4 +21,4 @@ OpenIDE-Module-Long-Description=\
 OpenIDE-Module-Name=FlatLaf Look and Feel
 OpenIDE-Module-Short-Description=FlatLaf Look and Feels
 
-Editors/FontsColors/FlatLafDark=FlatLaf Dark
\ No newline at end of file
+Editors/FontsColors/FlatLafDark=FlatLaf Dark
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
index d229d21..e6fa07d 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.java
@@ -19,7 +19,6 @@
 package org.netbeans.swing.laf.flatlaf;
 
 import com.formdev.flatlaf.FlatDarkLaf;
-import javax.swing.UIDefaults;
 
 /**
  *
@@ -27,13 +26,4 @@ import javax.swing.UIDefaults;
  */
 public class NbFlatDarkLaf extends FlatDarkLaf {
 
-    @Override
-    public UIDefaults getDefaults() {
-        UIDefaults ret = super.getDefaults();
-        ret.put( "nb.dark.theme", Boolean.TRUE );
-        return ret;
-    }
-
-
-
 }
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.properties
similarity index 76%
copy from platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties
copy to platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.properties
index 88d7d27..6badeae 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Bundle.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/NbFlatDarkLaf.properties
@@ -15,10 +15,5 @@
 # specific language governing permissions and limitations
 # under the License.
 
-OpenIDE-Module-Display-Category=Swing
-OpenIDE-Module-Long-Description=\
-    FlatLaf Look and Feels
-OpenIDE-Module-Name=FlatLaf Look and Feel
-OpenIDE-Module-Short-Description=FlatLaf Look and Feels
-
-Editors/FontsColors/FlatLafDark=FlatLaf Dark
\ No newline at end of file
+nb.dark.theme=true
+nb.preferred.color.profile=FlatLaf Dark
\ No newline at end of file


---------------------------------------------------------------------
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