git://source.jalview.org / jalview.git / commitdiff
? search:
summary | shortlog | log | commit | commitdiff | tree
raw | patch | inline | side by side (parent: 7daa9e8)
JAL-1130 new logo in help, splash screen and web services spinner
authorjprocter <jprocter@compbio.dundee.ac.uk>
Tue, 18 Sep 2012 15:27:52 +0000 (16:27 +0100)
committerjprocter <jprocter@compbio.dundee.ac.uk>
Wed, 19 Sep 2012 12:17:30 +0000 (13:17 +0100)
build.xml patch | blob | history
help/html/Jalview_Logo.png [new file with mode: 0644] patch | blob
help/html/index.html patch | blob | history
help/html/whatsNew.html patch | blob | history
src/jalview/gui/SplashScreen.java patch | blob | history
src/jalview/gui/WebserviceInfo.java patch | blob | history

diff --git a/build.xml b/build.xml
index 6e3a2f2..ee0542d 100755 (executable)
--- a/build.xml
+++ b/build.xml
@@ -243,8 +243,8 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="logo_big.gif" />
-                               <offline_allowed />
+                               <icon href="JalviewLogo_big.png" />
+                               <offline_allowed/>
                        </information>
                        <resources>
                                <j2se version="${j2sev}" initial_heap_size="10M"  />
@@ -271,7 +271,7 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="logo_big.gif" />
+                               <icon href="JalviewLogo_big.png" />
                                <offline_allowed />
                        </information>
                        <resources>
@@ -299,7 +299,7 @@
                                <homepage href="http://www.jalview.org" />
                                <description>Jalview Multiple Alignment Editor</description>
                                <description kind="short">Jalview</description>
-                               <icon href="logo_big.gif" />
+                               <icon href="JalviewLogo_big.png" />
                                <offline_allowed />
                        </information>
                        <resources>
diff --git a/help/html/Jalview_Logo.png b/help/html/Jalview_Logo.png
new file mode 100644 (file)
index 0000000..06429d9
Binary files /dev/null and b/help/html/Jalview_Logo.png differ
diff --git a/help/html/index.html b/help/html/index.html
index cfa8cb3..c89bbc2 100755 (executable)
--- a/help/html/index.html
+++ b/help/html/index.html
@@ -19,7 +19,7 @@
 <head><title>Jalview Documentation</title></head>
 
 <body>
-<IMG src="align.jpg"><font size="4">
+<IMG src="Jalview_Logo.png"><font size="4">
 <br><br>
 <strong>Jalview Documentation</strong></font>
 <br><br>
diff --git a/help/html/whatsNew.html b/help/html/whatsNew.html
index f623685..7f1637c 100755 (executable)
--- a/help/html/whatsNew.html
+++ b/help/html/whatsNew.html
@@ -24,13 +24,17 @@
                <strong>What's new ?</strong>
        </p>
        <p>
-               The Jalview 2.8 release features (tbc)
-               <br /> For full
-               details see the <a href="releases.html#Jalview2.7.1">Jalview 2.7.1
-                       release history</a>.
+       Jalview 2.8 includes a brand new logo, which you'll see in file browsers, splash screens, and also on the new look Jalview site.
        </p>
        <p>
-               <strong>Highlights in Jalview Desktop Version 2.7.1</strong>
+               In addition to our new look, Jalview 2.8 includes a number of new
+               features.. some of which have been in development since July 2010. The
+               highlights are below, and - as usual, for a comprehensive list, take a
+               look at the <a href="releases.html#Jalview2.8">Jalview 2.8 Release
+                       Notes</a>.
+       </p>
+       <p>
+               <strong>Highlights in Jalview Desktop Version 2.8</strong>
        </p>
        <ul>
 
diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java
index 97a2a24..297a5e0 100755 (executable)
--- a/src/jalview/gui/SplashScreen.java
+++ b/src/jalview/gui/SplashScreen.java
@@ -93,7 +93,7 @@ public class SplashScreen extends JPanel implements Runnable, HyperlinkListener
     addMouseListener(closer);
     try
     {
-      java.net.URL url = getClass().getResource("/images/logo_v2.jpeg");
+      java.net.URL url = getClass().getResource("/images/Jalviewlogo.png");
 
       if (url != null)
       {
diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 6696a3a..78a3d59 100755 (executable)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -296,7 +296,7 @@ public class WebserviceInfo extends GWebserviceInfo implements
     this.title = title;
     setInfoText(info);
 
-    java.net.URL url = getClass().getResource("/images/logo_v2_square.jpg");
+    java.net.URL url = getClass().getResource("/images/Jalviewlogo_small.png");
     image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
 
     MediaTracker mt = new MediaTracker(this);