From 2aff7c97f9fb681e40c6d154854c2a9145042760 Mon Sep 17 00:00:00 2001 From: Karl Tauber Date: Sat, 8 Jan 2022 18:42:59 +0100 Subject: [PATCH] Demo: changed theme names from "Flat *" to "FlatLaf *" --- .../main/java/com/formdev/flatlaf/demo/ControlBar.java | 8 ++++---- .../flatlaf/demo/intellijthemes/IJThemesPanel.java | 8 ++++---- flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt | 4 ++-- .../com/formdev/flatlaf/testing/FlatTestFrame.java | 10 +++++----- .../java/com/formdev/flatlaf/testing/FlatTestLaf.java | 4 ++-- 5 files changed, 17 insertions(+), 17 deletions(-) diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java index 0c2addd7..bb35a39c 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/ControlBar.java @@ -62,10 +62,10 @@ class ControlBar // initialize look and feels combo box DefaultComboBoxModel lafModel = new DefaultComboBoxModel<>(); - lafModel.addElement( new LookAndFeelInfo( "Flat Light (F1)", FlatLightLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat Dark (F2)", FlatDarkLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat IntelliJ (F3)", FlatIntelliJLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat Darcula (F4)", FlatDarculaLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Light (F1)", FlatLightLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Dark (F2)", FlatDarkLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf IntelliJ (F3)", FlatIntelliJLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Darcula (F4)", FlatDarculaLaf.class.getName() ) ); UIManager.LookAndFeelInfo[] lookAndFeels = UIManager.getInstalledLookAndFeels(); for( UIManager.LookAndFeelInfo lookAndFeel : lookAndFeels ) { diff --git a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java index ee89f571..f1dd5bd1 100644 --- a/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java +++ b/flatlaf-demo/src/main/java/com/formdev/flatlaf/demo/intellijthemes/IJThemesPanel.java @@ -144,13 +144,13 @@ public class IJThemesPanel // add core themes at beginning categories.put( themes.size(), "Core Themes" ); if( showLight ) - themes.add( new IJThemeInfo( "Flat Light", null, false, null, null, null, null, null, FlatLightLaf.class.getName() ) ); + themes.add( new IJThemeInfo( "FlatLaf Light", null, false, null, null, null, null, null, FlatLightLaf.class.getName() ) ); if( showDark ) - themes.add( new IJThemeInfo( "Flat Dark", null, true, null, null, null, null, null, FlatDarkLaf.class.getName() ) ); + themes.add( new IJThemeInfo( "FlatLaf Dark", null, true, null, null, null, null, null, FlatDarkLaf.class.getName() ) ); if( showLight ) - themes.add( new IJThemeInfo( "Flat IntelliJ", null, false, null, null, null, null, null, FlatIntelliJLaf.class.getName() ) ); + themes.add( new IJThemeInfo( "FlatLaf IntelliJ", null, false, null, null, null, null, null, FlatIntelliJLaf.class.getName() ) ); if( showDark ) - themes.add( new IJThemeInfo( "Flat Darcula", null, true, null, null, null, null, null, FlatDarculaLaf.class.getName() ) ); + themes.add( new IJThemeInfo( "FlatLaf Darcula", null, true, null, null, null, null, null, FlatDarculaLaf.class.getName() ) ); // add themes from directory categories.put( themes.size(), "Current Directory" ); diff --git a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt index e1879044..c1cd5772 100644 --- a/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt +++ b/flatlaf-testing/dumps/uidefaults/FlatTestLaf_1.8.0.txt @@ -1,6 +1,6 @@ Class com.formdev.flatlaf.testing.FlatTestLaf -ID FlatLaf - Flat Test -Name Flat Test +ID FlatLaf - FlatLaf Test +Name FlatLaf Test Java 1.8.0_202 OS Windows 10 diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java index 07d3e630..d0f66b87 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestFrame.java @@ -111,11 +111,11 @@ public class FlatTestFrame // initialize look and feels combo box DefaultComboBoxModel lafModel = new DefaultComboBoxModel<>(); - lafModel.addElement( new LookAndFeelInfo( "Flat Light (F1)", FlatLightLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat Dark (F2)", FlatDarkLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat IntelliJ (F3)", FlatIntelliJLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat Darcula (F4)", FlatDarculaLaf.class.getName() ) ); - lafModel.addElement( new LookAndFeelInfo( "Flat Test (F8)", FlatTestLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Light (F1)", FlatLightLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Dark (F2)", FlatDarkLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf IntelliJ (F3)", FlatIntelliJLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Darcula (F4)", FlatDarculaLaf.class.getName() ) ); + lafModel.addElement( new LookAndFeelInfo( "FlatLaf Test (F8)", FlatTestLaf.class.getName() ) ); UIManager.LookAndFeelInfo[] lookAndFeels = UIManager.getInstalledLookAndFeels(); for( UIManager.LookAndFeelInfo lookAndFeel : lookAndFeels ) { diff --git a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java index d35d51e0..6fb84ab3 100644 --- a/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java +++ b/flatlaf-testing/src/main/java/com/formdev/flatlaf/testing/FlatTestLaf.java @@ -32,12 +32,12 @@ public class FlatTestLaf { @Override public String getName() { - return "Flat Test"; + return "FlatLaf Test"; } @Override public String getDescription() { - return "Flat Test Look and Feel"; + return "FlatLaf Test Look and Feel"; } @Override