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 2020/01/15 23:31:52 UTC
[netbeans] branch master updated: [NETBEANS-3428] Remove
experimental from FlatLafDark
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 18e1168 [NETBEANS-3428] Remove experimental from FlatLafDark
18e1168 is described below
commit 18e11687eb7afb9d967a13e9a27acc15068722b1
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Tue Jan 14 23:25:18 2020 -0800
[NETBEANS-3428] Remove experimental from FlatLafDark
---
.../src/org/netbeans/swing/laf/flatlaf/Installer.java | 6 ++----
platform/o.n.swing.plaf/manifest.mf | 2 +-
platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java | 3 +++
.../src/org/netbeans/swing/plaf/aqua/AquaLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/metal/MetalLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/nimbus/NimbusLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/winclassic/WindowsLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/windows8/Windows8LFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/winvista/VistaLFCustoms.java | 1 +
.../src/org/netbeans/swing/plaf/winxp/XPLFCustoms.java | 1 +
11 files changed, 14 insertions(+), 5 deletions(-)
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Installer.java b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Installer.java
index 710ccea..c0a28bb 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Installer.java
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/Installer.java
@@ -25,8 +25,8 @@ import org.openide.modules.ModuleInstall;
import org.openide.util.*;
@NbBundle.Messages({
- "LBL_FLATLAF_LIGHT=FlatLaf Light (experimental)",
- "LBL_FLATLAF_DARK=FlatLaf Dark (experimental)"
+ "LBL_FLATLAF_LIGHT=FlatLaf Light",
+ "LBL_FLATLAF_DARK=FlatLaf Dark"
})
public class Installer extends ModuleInstall {
@@ -34,8 +34,6 @@ public class Installer extends ModuleInstall {
public void validate() throws IllegalStateException {
UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo(Bundle.LBL_FLATLAF_LIGHT(), FlatLightLaf.class.getName()));
UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo(Bundle.LBL_FLATLAF_DARK(), FlatDarkLaf.class.getName()));
-// UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo("Flat IntelliJ", FlatIntelliJLaf.class.getName()));
-// UIManager.installLookAndFeel(new UIManager.LookAndFeelInfo("Flat Darcula", FlatDarculaLaf.class.getName()));
}
}
diff --git a/platform/o.n.swing.plaf/manifest.mf b/platform/o.n.swing.plaf/manifest.mf
index 02d10d3..3a0f7a9 100644
--- a/platform/o.n.swing.plaf/manifest.mf
+++ b/platform/o.n.swing.plaf/manifest.mf
@@ -1,6 +1,6 @@
Manifest-Version: 1.0
OpenIDE-Module-Localizing-Bundle: org/netbeans/swing/plaf/Bundle.properties
OpenIDE-Module: org.netbeans.swing.plaf
-OpenIDE-Module-Specification-Version: 1.48
+OpenIDE-Module-Specification-Version: 1.49
AutoUpdate-Show-In-Client: false
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java
index 09fb0be..fb444d6 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/LFCustoms.java
@@ -311,6 +311,9 @@ public abstract class LFCustoms {
//custom fonts based on this value
protected static final String DEFAULT_FONT_SIZE = "nbDefaultFontSize"; //NOI18N
+ //Color Profile
+ protected static final String EDITOR_PREFERRED_COLOR_PROFILE = "nb.preferred.color.profile"; //NOI18N
+
//Editor
protected static final String EDITOR_STATUS_LEFT_BORDER = "Nb.Editor.Status.leftBorder"; //NOI18N
protected static final String EDITOR_STATUS_INNER_BORDER = "Nb.Editor.Status.innerBorder"; //NOI18N
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaLFCustoms.java
index a300812..83cf1fc 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/aqua/AquaLFCustoms.java
@@ -95,6 +95,7 @@ public final class AquaLFCustoms extends LFCustoms {
"org/netbeans/swing/plaf/resources/osx-folder.png"); //NOI18N
Object[] result = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
TOOLBAR_UI, "org.netbeans.swing.plaf.aqua.PlainAquaToolbarUI",
// XXX - EXPLORER_STATUS_BORDER,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
index dd461e3..0c11f30 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/gtk/GtkLFCustoms.java
@@ -74,6 +74,7 @@ public class GtkLFCustoms extends LFCustoms {
}
Object[] result = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
PROPSHEET_SELECTION_BACKGROUND, selBg,
PROPSHEET_SELECTION_FOREGROUND, selFg,
PROPSHEET_SELECTED_SET_BACKGROUND, selBg,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalLFCustoms.java
index c426231..8fea521 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/metal/MetalLFCustoms.java
@@ -50,6 +50,7 @@ public final class MetalLFCustoms extends LFCustoms {
Font controlFont = new Font("Dialog", Font.PLAIN, fontsize); //NOI18N
Object[] result = {
//The assorted standard NetBeans metal font customizations
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
CONTROLFONT, controlFont,
SYSTEMFONT, controlFont,
USERFONT, controlFont,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/NimbusLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/NimbusLFCustoms.java
index f5023f1..7679a6c 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/NimbusLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/nimbus/NimbusLFCustoms.java
@@ -79,6 +79,7 @@ public final class NimbusLFCustoms extends LFCustoms {
}*/
Object[] result = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
//UI Delegates for the tab control
EDITOR_TAB_DISPLAYER_UI,
"org.netbeans.swing.tabcontrol.plaf.NimbusEditorTabDisplayerUI", //NOI18N
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/WindowsLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/WindowsLFCustoms.java
index a7047db..fc54e9b 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/WindowsLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winclassic/WindowsLFCustoms.java
@@ -63,6 +63,7 @@ public final class WindowsLFCustoms extends LFCustoms {
public Object[] createApplicationSpecificKeysAndValues () {
Object propertySheetColorings = new WinClassicPropertySheetColorings();
Object[] result = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
DESKTOP_BORDER, new EmptyBorder(4, 2, 1, 2),
SCROLLPANE_BORDER, UIManager.get("ScrollPane.border"),
EXPLORER_STATUS_BORDER, new StatusLineBorder(StatusLineBorder.TOP),
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/Windows8LFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/Windows8LFCustoms.java
index 4d048ad..7b48937 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/Windows8LFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/windows8/Windows8LFCustoms.java
@@ -94,6 +94,7 @@ public final class Windows8LFCustoms extends LFCustoms {
Object[] constants = new Object[] {
"TextArea.font", textAreaFont, //NOI18N
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
EDITOR_ERRORSTRIPE_SCROLLBAR_INSETS, new Insets(17, 0, 17, 0),
/* NETBEANS-1249: Remove excessive spacing between menu items, which appeared going from
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/VistaLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/VistaLFCustoms.java
index 0b564a0..e4300d7 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/VistaLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winvista/VistaLFCustoms.java
@@ -89,6 +89,7 @@ public final class VistaLFCustoms extends LFCustoms {
Object propertySheetValues = new VistaPropertySheetColorings();
Object[] uiDefaults = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
EDITOR_TAB_DISPLAYER_UI, editorTabsUI,
VIEW_TAB_DISPLAYER_UI, viewTabsUI,
diff --git a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/XPLFCustoms.java b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/XPLFCustoms.java
index 3091eca..1dce6ba 100644
--- a/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/XPLFCustoms.java
+++ b/platform/o.n.swing.plaf/src/org/netbeans/swing/plaf/winxp/XPLFCustoms.java
@@ -88,6 +88,7 @@ public final class XPLFCustoms extends LFCustoms {
Object propertySheetValues = new XPPropertySheetColorings();
Object[] uiDefaults = {
+ EDITOR_PREFERRED_COLOR_PROFILE, "NetBeans", //NOI18N
EDITOR_TAB_DISPLAYER_UI, editorTabsUI,
VIEW_TAB_DISPLAYER_UI, viewTabsUI,
---------------------------------------------------------------------
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