You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@netbeans.apache.org by em...@apache.org on 2018/07/07 19:18:23 UTC

[incubator-netbeans] 01/02: Adds an Apache Incubator link and logo on the Start Page

This is an automated email from the ASF dual-hosted git repository.

emi pushed a commit to branch release90
in repository https://gitbox.apache.org/repos/asf/incubator-netbeans.git

commit e24634c2271ae3434d10d508d574aff591fac4f7
Author: Emilian Bold <em...@apache.org>
AuthorDate: Sat Jul 7 22:02:29 2018 +0300

    Adds an Apache Incubator link and logo on the Start Page
    
    Apache Incubator logo PNG exported manually from the SVG variant
---
 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/incubator_logo.png         | Bin 0 -> 1727 bytes
 .../modules/welcome/resources/incubator_logo_dark.png    | Bin 0 -> 1727 bytes
 .../org/netbeans/modules/welcome/resources/java_logo.png | Bin 3842 -> 0 bytes
 .../modules/welcome/resources/java_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 d97a4a7..a40ee1a 100644
--- a/welcome/licenseinfo.xml
+++ b/welcome/licenseinfo.xml
@@ -33,8 +33,8 @@
         <file>src/org/netbeans/modules/welcome/resources/btn_right.png</file>
         <file>src/org/netbeans/modules/welcome/resources/content_banner.png</file>
         <file>src/org/netbeans/modules/welcome/resources/nb_logo.png</file>
-        <file>src/org/netbeans/modules/welcome/resources/java_logo.png</file>
-        <file>src/org/netbeans/modules/welcome/resources/java_logo_dark.png</file>
+        <file>src/org/netbeans/modules/welcome/resources/incubator_logo.png</file>
+        <file>src/org/netbeans/modules/welcome/resources/incubator_logo_dark.png</file>
         <file>src/org/netbeans/modules/welcome/resources/broken_image.gif</file>
         <file>src/org/netbeans/modules/welcome/resources/tab_rollover.png</file>
         <file>src/org/netbeans/modules/welcome/resources/picture_frame.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 f8390f1..53d8ad6 100644
--- a/welcome/src/org/netbeans/modules/welcome/content/Constants.java
+++ b/welcome/src/org/netbeans/modules/welcome/content/Constants.java
@@ -54,7 +54,7 @@ public interface Constants {
     static final Font CONTENT_HEADER_FONT = new Font( FONT_NAME, Font.BOLD, FONT_SIZE+13 ) ; //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 INCUBATOR_LOGO_IMAGE = "org/netbeans/modules/welcome/resources/incubator_logo.png"; // NOI18N
     static final String NETBEANS_LOGO_IMAGE = "org/netbeans/modules/welcome/resources/nb_logo.png"; // NOI18N
 
     static final String IMAGE_CONTENT_BANNER = "org/netbeans/modules/welcome/resources/content_banner.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 2e91b8e..aab99a6 100644
--- a/welcome/src/org/netbeans/modules/welcome/content/Logo.java
+++ b/welcome/src/org/netbeans/modules/welcome/content/Logo.java
@@ -46,8 +46,8 @@ public class Logo extends JPanel implements Constants, MouseListener {
         return new Logo( APACHE_LOGO_IMAGE, BundleSupport.getURL( "ApacheLogo" ) ); // NOI18N
     }
 
-    public static Logo createJavaLogo() {
-        return new Logo( JAVA_LOGO_IMAGE, BundleSupport.getURL( "JavaLogo" ) ); // NOI18N
+    public static Logo createIncubatorLogo() {
+        return new Logo( INCUBATOR_LOGO_IMAGE, BundleSupport.getURL( "IncubatorLogo" ) ); // NOI18N
     }
 
     public static Logo createNetBeansLogo() {
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
index 23292b5..b30cde3 100644
--- a/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
+++ b/welcome/src/org/netbeans/modules/welcome/resources/Bundle.properties
@@ -93,7 +93,7 @@ ACN_ShowOnStartup=Show Welcome Screen on startup
 ACD_ShowOnStartup=Checkbox to show or hide the Welcome Screen on next NetBeans startup
 
 #NOI18N
-URL_JavaLogo=http://www.oracle.com/technetwork/java/index.html
+URL_IncubatorLogo=http://incubator.apache.org
 #NOI18N
 URL_ApacheLogo=http://www.apache.org
 #NOI18N
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo.png b/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo.png
new file mode 100644
index 0000000..812da03
Binary files /dev/null and b/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo.png differ
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo_dark.png b/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo_dark.png
new file mode 100644
index 0000000..812da03
Binary files /dev/null and b/welcome/src/org/netbeans/modules/welcome/resources/incubator_logo_dark.png differ
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png b/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png
deleted file mode 100644
index d616821..0000000
Binary files a/welcome/src/org/netbeans/modules/welcome/resources/java_logo.png and /dev/null differ
diff --git a/welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png b/welcome/src/org/netbeans/modules/welcome/resources/java_logo_dark.png
deleted file mode 100644
index d616821..0000000
Binary files a/welcome/src/org/netbeans/modules/welcome/resources/java_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 fb9de55..fc22502 100644
--- a/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
+++ b/welcome/src/org/netbeans/modules/welcome/ui/BottomBar.java
@@ -45,7 +45,7 @@ class BottomBar extends JPanel {
         add( new JLabel(), new GridBagConstraints(1,0,1,1,1.0,0.0,
                 GridBagConstraints.CENTER,GridBagConstraints.NONE,new Insets(0,0,0,0),0,0 ) );
         
-        add( Logo.createJavaLogo(), new GridBagConstraints(4,0,1,1,0.0,0.0,
+        add( Logo.createIncubatorLogo(), new GridBagConstraints(4,0,1,1,0.0,0.0,
                 GridBagConstraints.EAST,GridBagConstraints.NONE,new Insets(5,5,5,12),0,0 ) );
     }
 


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