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/01 08:17:42 UTC
[netbeans] branch master updated (c4e9608 -> 4934ffd)
This is an automated email from the ASF dual-hosted git repository.
lkishalmi pushed a change to branch master
in repository https://gitbox.apache.org/repos/asf/netbeans.git.
from c4e9608 Fixed an incorreclty filled-in apichanges.xml in the previously merged PR.
new e7592f0 [NETBEANS-3644] Support to change Welcome Screen Top bar font color from LAF
new 4934ffd [NETBEANS-3644] Adjusted Welcome Screen Colors to FlatLAF
The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails. The revisions
listed as "add" were already present in the repository and have only
been added to this reference.
Summary of changes:
.../modules/welcome/content/Constants.java | 1 +
.../netbeans/modules/welcome/content/Utils.java | 7 +++++
.../modules/welcome/resources/Bundle.properties | 4 +--
.../netbeans/modules/welcome/ui/ContentHeader.java | 2 +-
.../netbeans/modules/welcome/ui/ShowNextTime.java | 2 +-
.../netbeans/modules/welcome/ui/TabbedPane.java | 2 +-
platform/o.n.swing.laf.flatlaf/licenseinfo.xml | 32 +++++++++++++++++++++
.../swing/laf/flatlaf/FlatDarkLaf.properties | 21 ++++++++++++++
.../netbeans/swing/laf/flatlaf/FlatLaf.properties | 19 ++++++++++++
.../swing/laf/flatlaf/FlatLightLaf.properties | 2 ++
.../laf/flatlaf/resources/welcome_tab_rollover.png | Bin 0 -> 74 bytes
.../resources/welcome_tab_rollover_dark.png | Bin 0 -> 73 bytes
.../laf/flatlaf/resources/welcome_tab_selected.png | Bin 0 -> 84 bytes
.../resources/welcome_tab_selected_dark.png | Bin 0 -> 83 bytes
14 files changed, 86 insertions(+), 6 deletions(-)
create mode 100644 platform/o.n.swing.laf.flatlaf/licenseinfo.xml
create mode 100644 platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png
create mode 100644 platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover_dark.png
create mode 100644 platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png
create mode 100644 platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected_dark.png
---------------------------------------------------------------------
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
[netbeans] 01/02: [NETBEANS-3644] Support to change Welcome Screen
Top bar font color from LAF
Posted by lk...@apache.org.
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
commit e7592f01f35a363b88f12efc076b136f44a17817
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Fri Dec 27 16:58:09 2019 -0800
[NETBEANS-3644] Support to change Welcome Screen Top bar font color from LAF
---
nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java | 1 +
nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java | 7 +++++++
.../src/org/netbeans/modules/welcome/resources/Bundle.properties | 4 +---
nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java | 2 +-
nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java | 2 +-
nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java | 2 +-
6 files changed, 12 insertions(+), 6 deletions(-)
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java b/nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java
index 53d8ad6..e1e4585 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/content/Constants.java
@@ -39,6 +39,7 @@ public interface Constants {
static final String COLOR_TAB_BACKGROUND = "TabBackgroundColor"; //NOI18N
static final String COLOR_TAB_BORDER1 = "TabBorder1Color"; //NOI18N
static final String COLOR_TAB_BORDER2 = "TabBorder2Color"; //NOI18N
+ static final String COLOR_TAB_FOREGROUND = "TabForegroundColor"; //NOI18N
static final String COLOR_RSS_DATE = "RssDateTimeColor"; //NOI18N
static final String COLOR_RSS_DETAILS = "RssDetailsColor"; //NOI18N
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java b/nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java
index cf13a54..743a450 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/content/Utils.java
@@ -146,6 +146,13 @@ public class Utils {
return res;
}
+ public static Color getTopBarForeground() {
+ Color res = UIManager.getColor("nb.startpage.topbar.foreground"); //NOI18N
+ if( null == res )
+ res = getColor( Constants.COLOR_TAB_BACKGROUND );
+ return res;
+ }
+
public static Color getTopBarColor() {
Color res = UIManager.getColor("nb.startpage.topbar.background"); //NOI18N
if( null == res )
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties b/nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
index 0049517..362c818 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
+++ b/nb/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
@@ -144,9 +144,7 @@ LBL_ActivateFeaturesDescrFullIDE=<html>NetBeans turns on functionality as you us
#NOI18N
ScreenBackgroundColor=0xFFFFFF
#NOI18N
-TabSelForegroundColor=0x1D2153
-#NOI18N
-TabUnselForegroundColor=0xFFFFFF
+TabForegroundColor=0xFFFFFF
#NOI18N
MouseOverTabColor=0xE5E5E5
#NOI18N
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
index be9ee8b..838f30d 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/ContentHeader.java
@@ -67,7 +67,7 @@ public class ContentHeader extends JPanel implements Constants {
setLayout( new BorderLayout() );
lblTitle.setText( title );
lblTitle.setFont( CONTENT_HEADER_FONT );
- lblTitle.setForeground( Color.white );
+ lblTitle.setForeground( Utils.getTopBarForeground() );
add( lblTitle, BorderLayout.WEST );
setBorder( BorderFactory.createEmptyBorder( 12+18, 34, 15, 34 ) );
}
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
index 35cbf97..ea86890 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/ShowNextTime.java
@@ -50,7 +50,7 @@ class ShowNextTime extends JPanel
button = new JCheckBox( BundleSupport.getLabel( "ShowOnStartup" ) ); // NOI18N
button.setSelected( WelcomeOptions.getDefault().isShowOnStartup() );
button.setOpaque( false );
- button.setForeground( Color.white );
+ button.setForeground( Utils.getTopBarForeground() );
button.setHorizontalTextPosition( SwingConstants.LEFT );
BundleSupport.setAccessibilityProperties( button, "ShowOnStartup" ); //NOI18N
add( button, BorderLayout.CENTER );
diff --git a/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
index 4ebbfab..f1aab46 100644
--- a/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
+++ b/nb/welcome/src/org/netbeans/modules/welcome/ui/TabbedPane.java
@@ -186,7 +186,7 @@ class TabbedPane extends JPanel implements Constants {// , Scrollable {
this.tabIndex = tabIndex;
setOpaque( true );
lblTitle.setFont( TAB_FONT );
- lblTitle.setForeground( Color.white );
+ lblTitle.setForeground( Utils.getTopBarForeground() );
lblTitle.setHorizontalAlignment( JLabel.CENTER );
setFocusable(true);
setBackground( colBackground );
---------------------------------------------------------------------
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
[netbeans] 02/02: [NETBEANS-3644] Adjusted Welcome Screen Colors to
FlatLAF
Posted by lk...@apache.org.
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
commit 4934ffd63b3460f16de53aa4561e91bd4febacf8
Author: Laszlo Kishalmi <la...@gmail.com>
AuthorDate: Fri Dec 27 16:59:03 2019 -0800
[NETBEANS-3644] Adjusted Welcome Screen Colors to FlatLAF
---
platform/o.n.swing.laf.flatlaf/licenseinfo.xml | 32 +++++++++++++++++++++
.../swing/laf/flatlaf/FlatDarkLaf.properties | 21 ++++++++++++++
.../netbeans/swing/laf/flatlaf/FlatLaf.properties | 19 ++++++++++++
.../swing/laf/flatlaf/FlatLightLaf.properties | 2 ++
.../laf/flatlaf/resources/welcome_tab_rollover.png | Bin 0 -> 74 bytes
.../resources/welcome_tab_rollover_dark.png | Bin 0 -> 73 bytes
.../laf/flatlaf/resources/welcome_tab_selected.png | Bin 0 -> 84 bytes
.../resources/welcome_tab_selected_dark.png | Bin 0 -> 83 bytes
8 files changed, 74 insertions(+)
diff --git a/platform/o.n.swing.laf.flatlaf/licenseinfo.xml b/platform/o.n.swing.laf.flatlaf/licenseinfo.xml
new file mode 100644
index 0000000..64b38e3
--- /dev/null
+++ b/platform/o.n.swing.laf.flatlaf/licenseinfo.xml
@@ -0,0 +1,32 @@
+<?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.
+
+-->
+<licenseinfo>
+ <fileset>
+ <file>src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png</file>
+ <file>src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover_dark.png</file>
+ <file>src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png</file>
+ <file>src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected_dark.png</file>
+ <license ref="Apache-2.0-ASF" />
+ <comment type="COMMENT_UNSUPPORTED" />
+ </fileset>
+</licenseinfo>
+
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
index 0e62aa8..531629f 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatDarkLaf.properties
@@ -79,3 +79,24 @@ nb.heapview.grid4.end=@textComponentBackground
# heap
nb.heapview.mintick.color=#adc386
nb.heapview.maxtick.color=#958f17
+
+# startpage
+nb.startpage.defaultbackground=true
+# Darkred and darkblue from NB Icon palette
+nb.startpage.contentheader.color1=#a5073e
+nb.startpage.contentheader.color2=#1b6Ac8
+
+# wizard
+nb.wizard.hideimage=true
+
+# output
+nb.output.foreground=@foreground
+nb.output.backgorund=#2B2B2B
+nb.output.err.foreground=#FF4040
+nb.output.input=#CC7832
+nb.output.link.foreground=$Component.linkColor
+nb.output.link.foreground.important=$Component.linkColor
+nb.output.warning.foreground=#FFC66D
+nb.output.failure.foreground=#FF4040
+nb.output.success.foreground=#A8C023
+nb.output.debug.foreground=#808080
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
index 1cb933c..44998d8 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLaf.properties
@@ -51,3 +51,22 @@ TabControlIcon.pressedBackground=$Button.toolbar.pressedBackground
TabControlIcon.close.rolloverBackground=#c74f50
TabControlIcon.close.rolloverForeground=#fff
TabControlIcon.arc=2
+
+nb.html.link.foreground=$Component.linkColor
+nb.html.link.foreground.focus=$Component.linkColor
+nb.html.link.foreground.visited=#628FB5
+
+# Start Page
+nb.startpage.bottombar.background=$TabbedPane.focusColor
+nb.startpage.topbar.background=@background
+nb.startpage.topbar.foreground=@foreground
+nb.startpage.border.color=@background
+nb.startpage.tab.border1.color=@background
+nb.startpage.tab.border2.color=@background
+nb.startpage.rss.header.color=$Component.linkColor
+nb.startpage.rss.details.color=@foreground
+nb.startpage.rss.date.color=#cc7832
+
+nb.startpage.tab.imagename.rollover=org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png
+nb.startpage.tab.imagename.selected=org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png
+
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
index 2d7eb26..1db9df3 100644
--- a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
+++ b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/FlatLightLaf.properties
@@ -15,6 +15,8 @@
# specific language governing permissions and limitations
# under the License.
+nb.preferred.color.profile=NetBeans
+
#---- EditorTab ----
EditorTab.background=@background
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png
new file mode 100644
index 0000000..47ad987
Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover.png differ
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover_dark.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover_dark.png
new file mode 100644
index 0000000..43b9a6d
Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_rollover_dark.png differ
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png
new file mode 100644
index 0000000..4e85b5a
Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected.png differ
diff --git a/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected_dark.png b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected_dark.png
new file mode 100644
index 0000000..0261fa2
Binary files /dev/null and b/platform/o.n.swing.laf.flatlaf/src/org/netbeans/swing/laf/flatlaf/resources/welcome_tab_selected_dark.png differ
---------------------------------------------------------------------
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