JAL-3594 Added rotating logo png

diff --git a/src/jalview/gui/WebserviceInfo.java b/src/jalview/gui/WebserviceInfo.java
index 25ade21..0773a7b 100644 (file)
--- a/src/jalview/gui/WebserviceInfo.java
+++ b/src/jalview/gui/WebserviceInfo.java
@@ -20,10 +20,6 @@
  */
 package jalview.gui;
 
-import jalview.jbgui.GWebserviceInfo;
-import jalview.util.MessageManager;
-import jalview.ws.WSClientI;
-
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Dimension;
@@ -51,6 +47,11 @@ import javax.swing.event.InternalFrameEvent;
 import javax.swing.text.html.HTMLEditorKit;
 import javax.swing.text.html.StyleSheet;
 
+import jalview.jbgui.GWebserviceInfo;
+import jalview.util.ChannelProperties;
+import jalview.util.MessageManager;
+import jalview.ws.WSClientI;
+
 /**
  * Base class for web service client thread and gui TODO: create StAX parser to
  * extract html body content reliably when preparing html formatted job statuses
@@ -330,9 +331,7 @@ public class WebserviceInfo extends GWebserviceInfo
     this.title = title;
     setInfoText(info);
 
-    java.net.URL url = getClass()
-            .getResource("/images/Jalview_Logo_small_with_border.png");
-    image = java.awt.Toolkit.getDefaultToolkit().createImage(url);
+    image = ChannelProperties.getImage("rotatable_logo.48");
 
     MediaTracker mt = new MediaTracker(this);
     mt.addImage(image, 0);
@@ -353,20 +352,19 @@ public class WebserviceInfo extends GWebserviceInfo
     Thread thread = new Thread(ap);
     thread.start();
     final WebserviceInfo thisinfo = this;
-    frame.addInternalFrameListener(
-            new InternalFrameAdapter()
-            {
-              @Override
-              public void internalFrameClosed(InternalFrameEvent evt)
-              {
-                // System.out.println("Shutting down webservice client");
-                WSClientI service = thisinfo.getthisService();
-                if (service != null && service.isCancellable())
-                {
-                  service.cancelJob();
-                }
-              }
-            });
+    frame.addInternalFrameListener(new InternalFrameAdapter()
+    {
+      @Override
+      public void internalFrameClosed(InternalFrameEvent evt)
+      {
+        // System.out.println("Shutting down webservice client");
+        WSClientI service = thisinfo.getthisService();
+        if (service != null && service.isCancellable())
+        {
+          service.cancelJob();
+        }
+      }
+    });
     frame.validate();
 
   }
@@ -897,7 +895,7 @@ public class WebserviceInfo extends GWebserviceInfo
     }
 
     @Override
-       public void paintComponent(Graphics g1)
+    public void paintComponent(Graphics g1)
     {
       drawPanel();
 
@@ -913,7 +911,7 @@ public class WebserviceInfo extends GWebserviceInfo
   }
 
   @Override
-public void hyperlinkUpdate(HyperlinkEvent e)
+  public void hyperlinkUpdate(HyperlinkEvent e)
   {
     Desktop.hyperlinkUpdate(e);
   }

diff --git a/utils/channels/develop/resources/channel_properties b/utils/channels/develop/resources/channel_properties
index 5216005..487c3e8 100644 (file)
--- a/utils/channels/develop/resources/channel_properties
+++ b/utils/channels/develop/resources/channel_properties
@@ -2,10 +2,11 @@ app_name=Jalview Develop
 banner=/images/jalview_develop_banner.png
 logo.16=/images/jalview_develop_logo-16.png
 logo.32=/images/jalview_develop_logo-32.png
+logo.38=/images/jalview_develop_logo-38.png
 logo.48=/images/jalview_develop_logo-48.png
 logo.64=/images/jalview_develop_logo-64.png
 logo.128=/images/jalview_develop_logo-128.png
 logo.256=/images/jalview_develop_logo-256.png
 logo.512=/images/jalview_develop_logo-512.png
-rotatable_logo.48=/images/rotatable_jalview_develop_logo-48.png
+rotatable_logo.48=/images/rotatable_jalview_develop_logo-38.png
 default_appbase=https://www.jalview.org/getdown/develop/11

diff --git a/utils/channels/develop/resources/images/jalview_develop_logo-38.png b/utils/channels/develop/resources/images/jalview_develop_logo-38.png
new file mode 100644 (file)
index 0000000..671f776
Binary files /dev/null and b/utils/channels/develop/resources/images/jalview_develop_logo-38.png differ

diff --git a/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-38.png b/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-38.png
new file mode 100644 (file)
index 0000000..2cdb8dc
Binary files /dev/null and b/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-38.png differ

diff --git a/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png b/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png
deleted file mode 100644 (file)
index f8d0a1f..0000000
Binary files a/utils/channels/develop/resources/images/rotatable_jalview_develop_logo-48.png and /dev/null differ

diff --git a/utils/channels/release/resources/channel_properties b/utils/channels/release/resources/channel_properties
index 2f63a1c..3170933 100644 (file)
--- a/utils/channels/release/resources/channel_properties
+++ b/utils/channels/release/resources/channel_properties
@@ -2,10 +2,11 @@ app_name=Jalview
 banner=/images/jalview_banner.png
 logo.16=/images/jalview_logo-16.png
 logo.32=/images/jalview_logo-32.png
+logo.38=/images/jalview_logo-38.png
 logo.48=/images/jalview_logo-48.png
 logo.64=/images/jalview_logo-64.png
 logo.128=/images/jalview_logo-128.png
 logo.256=/images/jalview_logo-256.png
 logo.512=/images/jalview_logo-512.png
-rotatable_logo.48=/images/rotatable_jalview_logo-48.png
+rotatable_logo.48=/images/rotatable_jalview_logo-38.png
 default_appbase=https://www.jalview.org/getdown/release/1.8

diff --git a/utils/channels/release/resources/images/jalview_logo-38.png b/utils/channels/release/resources/images/jalview_logo-38.png
new file mode 100644 (file)
index 0000000..0b60196
Binary files /dev/null and b/utils/channels/release/resources/images/jalview_logo-38.png differ

diff --git a/utils/channels/release/resources/images/rotatable_jalview_logo-38.png b/utils/channels/release/resources/images/rotatable_jalview_logo-38.png
new file mode 100644 (file)
index 0000000..e584298
Binary files /dev/null and b/utils/channels/release/resources/images/rotatable_jalview_logo-38.png differ

diff --git a/utils/channels/release/resources/images/rotatable_jalview_logo-48.png b/utils/channels/release/resources/images/rotatable_jalview_logo-48.png
deleted file mode 100644 (file)
index 5fec791..0000000
Binary files a/utils/channels/release/resources/images/rotatable_jalview_logo-48.png and /dev/null differ

diff --git a/utils/create_iconfiles.sh b/utils/create_iconfiles.sh
index 2eb3ff0..241c195 100755 (executable)
--- a/utils/create_iconfiles.sh
+++ b/utils/create_iconfiles.sh
@@ -25,7 +25,7 @@ for ARG in $*; do
   NUM=${NUM%px*}
   NUM=${NUM%x*}
   NUM=${NUM%.*}
-  if [ x$NUM != x64 ]; then
+  if [ x$NUM != x64 -a x$NUM != x38 ]; then
     ICNSARGS="${ICNSARGS} $ARG"
   fi
 done

diff --git a/utils/install4j/README_convert_PNG_to_ICNS_and_ICO b/utils/install4j/README_convert_PNG_to_ICNS_and_ICO
index b50eb1a..cf71c06 100644 (file)
--- a/utils/install4j/README_convert_PNG_to_ICNS_and_ICO
+++ b/utils/install4j/README_convert_PNG_to_ICNS_and_ICO
@@ -27,5 +27,5 @@ This icon is used by the web services progress window, with the rotating Jalview
 It requires some small margin of white pixels around the logo to enable antialiasing around the edge of the logo.
 You can make one form a 48x48 transparent logo with
 ```
-convert jalview_logo-48.png -gravity center -background white -extent 60x60 rotatable_jalview_logo-48.png
+convert jalview_logo-38.png -gravity center -background white -extent 60x60 rotatable_jalview_logo-38.png
 ```