This is an automated email from the ASF dual-hosted git repository.
emi pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git
The following commit(s) were added to refs/heads/master by this push:
new 462079a Adds Apache feather and hyperlink in Start Page
462079a is described below
commit 462079a28a6f137c0822df033373898df49a599a
Author: Emilian Bold <[email protected]>
AuthorDate: Fri Jun 15 13:32:26 2018 +0300
Adds Apache feather and hyperlink in Start Page
Review: https://reviews.apache.org/r/67570/
---
welcome/licenseinfo.xml | 4 ++--
.../org/netbeans/modules/welcome/content/Constants.java | 2 +-
.../src/org/netbeans/modules/welcome/content/Logo.java | 4 ++--
.../netbeans/modules/welcome/resources/Bundle.properties | 2 +-
.../modules/welcome/resources/apache_feather.png | Bin 0 -> 582 bytes
.../modules/welcome/resources/apache_feather_dark.png | Bin 0 -> 582 bytes
.../netbeans/modules/welcome/resources/oracle_logo.png | Bin 3842 -> 0 bytes
.../modules/welcome/resources/oracle_logo_dark.png | Bin 3842 -> 0 bytes
.../src/org/netbeans/modules/welcome/ui/BottomBar.java | 2 +-
9 files changed, 7 insertions(+), 7 deletions(-)
diff --git a/welcome/licenseinfo.xml b/welcome/licenseinfo.xml
index 23e18b1..af28e73 100644
--- a/welcome/licenseinfo.xml
+++ b/welcome/licenseinfo.xml
@@ -44,13 +44,13 @@
<file>src/org/netbeans/modules/welcome/resources/picture_frame.png</file>
<file>src/org/netbeans/modules/welcome/resources/btn_left.png</file>
<file>src/org/netbeans/modules/welcome/resources/welcome.gif</file>
-
<file>src/org/netbeans/modules/welcome/resources/oracle_logo_dark.png</file>
+
<file>src/org/netbeans/modules/welcome/resources/apache_feather_dark.png</file>
<file>src/org/netbeans/modules/welcome/resources/startpage.gif</file>
<file>src/org/netbeans/modules/welcome/resources/sel_btn_center.png</file>
<file>src/org/netbeans/modules/welcome/resources/tab_selected_dark.png</file>
<file>src/org/netbeans/modules/welcome/resources/nb_logo_dark.png</file>
<file>src/org/netbeans/modules/welcome/resources/sel_btn_left.png</file>
- <file>src/org/netbeans/modules/welcome/resources/oracle_logo.png</file>
+
<file>src/org/netbeans/modules/welcome/resources/apache_feather.png</file>
<file>src/org/netbeans/modules/welcome/resources/tab_rollover_dark.png</file>
<file>src/org/netbeans/modules/welcome/resources/tab_selected.png</file>
<file>src/org/netbeans/modules/welcome/resources/content_banner_dark.png</file>
diff --git a/welcome/src/org/netbeans/modules/welcome/content/Constants.java
b/welcome/src/org/netbeans/modules/welcome/content/Constants.java
index bf93dbb..f8390f1 100644
--- a/welcome/src/org/netbeans/modules/welcome/content/Constants.java
+++ b/welcome/src/org/netbeans/modules/welcome/content/Constants.java
@@ -53,7 +53,7 @@ public interface Constants {
static final Font GET_STARTED_FONT = new Font( FONT_NAME, Font.PLAIN,
FONT_SIZE+1 ) ; //NOI18N
static final Font CONTENT_HEADER_FONT = new Font( FONT_NAME, Font.BOLD,
FONT_SIZE+13 ) ; //NOI18N
- static final String ORACLE_LOGO_IMAGE =
"org/netbeans/modules/welcome/resources/oracle_logo.png"; // NOI18N
+ static final String APACHE_LOGO_IMAGE =
"org/netbeans/modules/welcome/resources/apache_feather.png"; // NOI18N
static final String JAVA_LOGO_IMAGE =
"org/netbeans/modules/welcome/resources/java_logo.png"; // NOI18N
static final String NETBEANS_LOGO_IMAGE =
"org/netbeans/modules/welcome/resources/nb_logo.png"; // NOI18N
diff --git a/welcome/src/org/netbeans/modules/welcome/content/Logo.java
b/welcome/src/org/netbeans/modules/welcome/content/Logo.java
index c77132b..2e91b8e 100644
--- a/welcome/src/org/netbeans/modules/welcome/content/Logo.java
+++ b/welcome/src/org/netbeans/modules/welcome/content/Logo.java
@@ -42,8 +42,8 @@ public class Logo extends JPanel implements Constants,
MouseListener {
private String url;
- public static Logo createOracleLogo() {
- return new Logo( ORACLE_LOGO_IMAGE, BundleSupport.getURL( "OracleLogo"
) ); // NOI18N
+ public static Logo createApacheLogo() {
+ return new Logo( APACHE_LOGO_IMAGE, BundleSupport.getURL( "ApacheLogo"
) ); // NOI18N
}
public static Logo createJavaLogo() {
diff --git
a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
index 782ffab..2c38c1b 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
+++ b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
@@ -95,7 +95,7 @@ ACD_ShowOnStartup=Checkbox to show or hide the Welcome Screen
on next NetBeans s
#NOI18N
URL_JavaLogo=http://www.oracle.com/technetwork/java/index.html
#NOI18N
-URL_OracleLogo=http://www.oracle.com
+URL_ApacheLogo=http://www.apache.org
#NOI18N
URL_NetBeansLogo=http://netbeans.org?utm_source=netbeans&utm_campaign=welcomepage
diff --git
a/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png
b/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png
new file mode 100644
index 0000000..ffa1d2f
Binary files /dev/null and
b/welcome/src/org/netbeans/modules/welcome/resources/apache_feather.png differ
diff --git
a/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
b/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
new file mode 100644
index 0000000..ffa1d2f
Binary files /dev/null and
b/welcome/src/org/netbeans/modules/welcome/resources/apache_feather_dark.png
differ
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo.png
b/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo.png
deleted file mode 100644
index d616821..0000000
Binary files
a/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo.png and
/dev/null differ
diff --git
a/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo_dark.png
b/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo_dark.png
deleted file mode 100644
index d616821..0000000
Binary files
a/welcome/src/org/netbeans/modules/welcome/resources/oracle_logo_dark.png and
/dev/null differ
diff --git a/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
b/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
index e74df09..fb9de55 100644
--- a/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
+++ b/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
@@ -39,7 +39,7 @@ class BottomBar extends JPanel {
setOpaque(true);
setBackground( Utils.getBottomBarColor() );
- add( Logo.createOracleLogo(), new GridBagConstraints(0,0,1,1,0.0,0.0,
+ add( Logo.createApacheLogo(), new GridBagConstraints(0,0,1,1,0.0,0.0,
GridBagConstraints.WEST,GridBagConstraints.NONE,new
Insets(0,12,0,5),0,0 ) );
add( new JLabel(), new GridBagConstraints(1,0,1,1,1.0,0.0,
--
To stop receiving notification emails like this one, please contact
[email protected].
---------------------------------------------------------------------
To unsubscribe, e-mail: [email protected]
For additional commands, e-mail: [email protected]
For further information about the NetBeans mailing lists, visit:
https://cwiki.apache.org/confluence/display/NETBEANS/Mailing+lists
