From: Ben Soares Date: Wed, 9 Dec 2020 18:23:02 +0000 (+0000) Subject: JAL-3594 Images for splash screen X-Git-Tag: Develop-2_11_2_0-d20201215~12^2~2 X-Git-Url: http://source.jalview.org/gitweb/?p=jalview.git;a=commitdiff_plain;h=04e2d97b71fad3d9d02abbe292ea1fa9ba6d1438 JAL-3594 Images for splash screen --- diff --git a/resources/default_images/UoD_banner-28.png b/resources/default_images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/resources/default_images/UoD_banner-28.png differ diff --git a/resources/default_images/UoD_banner-30.png b/resources/default_images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/resources/default_images/UoD_banner-30.png differ diff --git a/resources/default_images/UoD_banner-32.png b/resources/default_images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/resources/default_images/UoD_banner-32.png differ diff --git a/resources/default_images/UoD_banner.png b/resources/default_images/UoD_banner.png deleted file mode 100644 index 2aff7e2..0000000 Binary files a/resources/default_images/UoD_banner.png and /dev/null differ diff --git a/resources/default_images/barton_group-28.png b/resources/default_images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/resources/default_images/barton_group-28.png differ diff --git a/resources/default_images/barton_group-30.png b/resources/default_images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/resources/default_images/barton_group-30.png differ diff --git a/resources/default_images/barton_group-32.png b/resources/default_images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/resources/default_images/barton_group-32.png differ diff --git a/resources/default_images/barton_group-62.png b/resources/default_images/barton_group-62.png deleted file mode 100644 index 542acd9..0000000 Binary files a/resources/default_images/barton_group-62.png and /dev/null differ diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java index 0f5a931..39c68a0 100644 --- a/src/jalview/gui/Desktop.java +++ b/src/jalview/gui/Desktop.java @@ -137,12 +137,35 @@ public class Desktop extends jalview.jbgui.GDesktop implements DropTargetListener, ClipboardOwner, IProgressIndicator, jalview.api.StructureSelectionManagerProvider { - private static final String CITATION = "

Development managed by The Barton Group, University of Dundee, Scotland, UK.
" - + "

For help, see the FAQ at www.jalview.org/faq and/or join the jalview-discuss@jalview.org mailing list" - + "

If you use Jalview, please cite:" - + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" - + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" - + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"; + private static final String CITATION; + static + { + URL bg_logo_url = ChannelProperties.getImageURL( + "bg_logo." + String.valueOf(SplashScreen.logoSize)); + URL uod_logo_url = ChannelProperties.getImageURL( + "uod_banner." + String.valueOf(SplashScreen.logoSize)); + boolean logo = (bg_logo_url != null || uod_logo_url != null); + StringBuilder sb = new StringBuilder(); + sb.append( + "

Development managed by The Barton Group, University of Dundee, Scotland, UK."); + if (logo) + { + sb.append("
"); + } + sb.append(bg_logo_url == null ? "" + : "\"Barton"); + sb.append(uod_logo_url == null ? "" + : " \"University"); + sb.append( + "

For help, see the FAQ at www.jalview.org/faq and/or join the jalview-discuss@jalview.org mailing list"); + sb.append("

If you use Jalview, please cite:" + + "
Waterhouse, A.M., Procter, J.B., Martin, D.M.A, Clamp, M. and Barton, G. J. (2009)" + + "
Jalview Version 2 - a multiple sequence alignment editor and analysis workbench" + + "
Bioinformatics doi: 10.1093/bioinformatics/btp033"); + CITATION = sb.toString(); + } private static final String DEFAULT_AUTHORS = "The Jalview Authors (See AUTHORS file for current list)"; @@ -962,7 +985,7 @@ public class Desktop extends jalview.jbgui.GDesktop } catch (java.lang.ClassCastException cex) { Cache.log.warn( - "Squashed a possible GUI implementation error. If you can recreate this, please look at http://issues.jalview.org/browse/JAL-869", + "Squashed a possible GUI implementation error. If you can recreate this, please look at https://issues.jalview.org/browse/JAL-869", cex); } } @@ -1174,7 +1197,7 @@ public class Desktop extends jalview.jbgui.GDesktop * JS: (pending JAL-3038) a plain text field */ JComponent history; - String urlBase = "http://www."; + String urlBase = "https://www."; if (Platform.isJS()) { history = new JTextField(urlBase, 35); @@ -1368,7 +1391,8 @@ public class Desktop extends jalview.jbgui.GDesktop public String getAboutMessage() { StringBuilder message = new StringBuilder(1024); - message.append("

Version: ") + message.append("
") + .append("

Version: ") .append(Cache.getProperty("VERSION")).append("

") .append("Built: ") .append(Cache.getDefault("BUILD_DATE", "unknown")) @@ -1397,7 +1421,7 @@ public class Desktop extends jalview.jbgui.GDesktop .append(Cache.getDefault("LATEST_VERSION", "..Checking..")) .append(" is available for download from ") .append(Cache.getDefault("www.jalview.org", - "http://www.jalview.org")) + "https://www.jalview.org")) .append(" !!"); if (red) { @@ -1408,6 +1432,8 @@ public class Desktop extends jalview.jbgui.GDesktop message.append(Cache.getDefault("AUTHORFNAMES", DEFAULT_AUTHORS)); message.append(CITATION); + message.append("
"); + return message.toString(); } @@ -1421,7 +1447,7 @@ public class Desktop extends jalview.jbgui.GDesktop { if (Platform.isJS()) { - BrowserLauncher.openURL("http://www.jalview.org/help.html"); + BrowserLauncher.openURL("https://www.jalview.org/help.html"); } else /** diff --git a/src/jalview/gui/SplashScreen.java b/src/jalview/gui/SplashScreen.java index 9dfd1d5..a8a849e 100755 --- a/src/jalview/gui/SplashScreen.java +++ b/src/jalview/gui/SplashScreen.java @@ -59,6 +59,13 @@ public class SplashScreen extends JPanel private JPanel iconimg = new JPanel(new BorderLayout()); + // could change fg, bg, font later to use ChannelProperties + private static Color bg = Color.WHITE; + + private static Color fg = Color.BLACK; + + private static Font font = new Font("SansSerif", Font.PLAIN, FONT_SIZE); + /* * as JTextPane in Java, JLabel in javascript */ @@ -72,6 +79,8 @@ public class SplashScreen extends JPanel private long oldTextLength = -1; + public static int logoSize = 32; + /* * allow click in the initial splash screen to dismiss it * immediately (not if opened from About menu) @@ -119,6 +128,9 @@ public class SplashScreen extends JPanel */ { splashText = new JTextPane(); + splashText.setBackground(bg); + splashText.setForeground(fg); + splashText.setFont(font); Thread t = new Thread(this); t.start(); } @@ -167,12 +179,20 @@ public class SplashScreen extends JPanel { } + this.setBackground(bg); + this.setForeground(fg); + this.setFont(font); + iframe = new JInternalFrame(); iframe.setFrameIcon(null); iframe.setClosable(true); this.setLayout(new BorderLayout()); iframe.setContentPane(this); iframe.setLayer(JLayeredPane.PALETTE_LAYER); + iframe.setBackground(bg); + iframe.setForeground(fg); + iframe.setFont(font); + if (Platform.isJS()) { // ignore in JavaScript @@ -185,9 +205,13 @@ public class SplashScreen extends JPanel */ { ((JTextPane) splashText).setEditable(false); + splashText.setBackground(bg); + splashText.setForeground(fg); + splashText.setFont(font); SplashImage splashimg = new SplashImage(image); - iconimg.add(splashimg, BorderLayout.CENTER); + iconimg.add(splashimg, BorderLayout.LINE_START); + iconimg.setBackground(bg); add(iconimg, BorderLayout.NORTH); } add(splashText, BorderLayout.CENTER); @@ -229,6 +253,9 @@ public class SplashScreen extends JPanel { JTextPane jtp = new JTextPane(); jtp.setEditable(false); + jtp.setBackground(bg); + jtp.setForeground(fg); + jtp.setFont(font); jtp.setContentType("text/html"); jtp.setText("" + newtext + ""); jtp.addHyperlinkListener(this); @@ -237,7 +264,10 @@ public class SplashScreen extends JPanel splashText.addMouseListener(closer); splashText.setVisible(true); - splashText.setSize(new Dimension(750, 375)); + splashText.setSize(new Dimension(750, 375 + logoSize)); + splashText.setBackground(bg); + splashText.setForeground(fg); + splashText.setFont(font); add(splashText, BorderLayout.CENTER); revalidate(); iframe.setBounds((Desktop.instance.getWidth() - 750) / 2, @@ -327,10 +357,10 @@ public class SplashScreen extends JPanel @Override public void paintComponent(Graphics g) { - g.setColor(Color.white); + g.setColor(bg); g.fillRect(0, 0, getWidth(), getHeight()); - g.setColor(Color.black); - g.setFont(new Font("Verdana", Font.BOLD, FONT_SIZE + 6)); + g.setColor(fg); + g.setFont(new Font(font.getFontName(), Font.BOLD, FONT_SIZE + 6)); if (image != null) { diff --git a/src/jalview/util/ChannelProperties.java b/src/jalview/util/ChannelProperties.java index 2194c4d..c33198b 100644 --- a/src/jalview/util/ChannelProperties.java +++ b/src/jalview/util/ChannelProperties.java @@ -26,6 +26,8 @@ public class ChannelProperties private static Map imageMap = new HashMap(); + private static Map urlMap = new HashMap(); + private static final ArrayList iconList; static @@ -45,8 +47,12 @@ public class ChannelProperties defaultProps.put("logo.512", "/default_images/jalview_logo-512.png"); defaultProps.put("rotatable_logo.48", "/default_images/rotatable_jalview_logo-38.png"); - defaultProps.put("bg_logo.62", "/default_images/barton_group-62.png"); - defaultProps.put("uod_banner", "/default_images/UoD_banner.png"); + defaultProps.put("bg_logo.28", "/default_images/barton_group-28.png"); + defaultProps.put("bg_logo.30", "/default_images/barton_group-30.png"); + defaultProps.put("bg_logo.32", "/default_images/barton_group-32.png"); + defaultProps.put("uod_banner.28", "/default_images/UoD_banner-28.png"); + defaultProps.put("uod_banner.30", "/default_images/UoD_banner-30.png"); + defaultProps.put("uod_banner.32", "/default_images/UoD_banner-32.png"); defaultProps.put("default_appbase", "https://www.jalview.org/getdown/release/1.8"); @@ -122,6 +128,11 @@ public class ChannelProperties return imageMap; } + private static Map urlMap() + { + return urlMap; + } + /* * getProperty(key) will get property value from channel_properties for key. * If no property for key is found, it will fall back to using the defaultProps defined for this class. @@ -217,12 +228,30 @@ public class ChannelProperties else { imageMap().put(key, img); + urlMap.put(key, imageURL); } } return img; } /* + * Public method to get the URL object pointing to a cached image. + */ + public static URL getImageURL(String key) + { + if (getImage(key) != null) + { + if (urlMap().containsKey(key)) + { + return urlMap().getOrDefault(key, null); + } + System.err.println( + "Do not use getImageURL(key) before using getImage(key...)"); + } + return null; + } + + /* * Get a List of Icon images of different sizes. */ public static ArrayList getIconList() diff --git a/utils/channels/default/images/UoD_banner-28.png b/utils/channels/default/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/default/images/UoD_banner-28.png differ diff --git a/utils/channels/default/images/UoD_banner-30.png b/utils/channels/default/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/default/images/UoD_banner-30.png differ diff --git a/utils/channels/default/images/UoD_banner-32.png b/utils/channels/default/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/default/images/UoD_banner-32.png differ diff --git a/utils/channels/default/images/UoD_banner-65.png b/utils/channels/default/images/UoD_banner-65.png new file mode 100644 index 0000000..45f7d29 Binary files /dev/null and b/utils/channels/default/images/UoD_banner-65.png differ diff --git a/utils/channels/default/images/UoD_banner.svg b/utils/channels/default/images/UoD_banner.svg new file mode 100644 index 0000000..27cae5d --- /dev/null +++ b/utils/channels/default/images/UoD_banner.svg @@ -0,0 +1,62 @@ + +image/svg+xml diff --git a/utils/channels/default/images/barton_group-28.png b/utils/channels/default/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/default/images/barton_group-28.png differ diff --git a/utils/channels/default/images/barton_group-30.png b/utils/channels/default/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/default/images/barton_group-30.png differ diff --git a/utils/channels/default/images/barton_group-32.png b/utils/channels/default/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/default/images/barton_group-32.png differ diff --git a/utils/channels/default/resources/channel_properties b/utils/channels/default/resources/channel_properties index a581120..4e6d27a 100644 --- a/utils/channels/default/resources/channel_properties +++ b/utils/channels/default/resources/channel_properties @@ -9,6 +9,10 @@ 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-38.png -bg_logo.62=/images/barton_group-62.png -uod_banner=/images/UoD_banner.png +bg_logo.28=/images/barton_group-28.png +bg_logo.30=/images/barton_group-30.png +bg_logo.32=/images/barton_group-32.png +uod_banner.28=/images/UoD_banner-28.png +uod_banner.30=/images/UoD_banner-30.png +uod_banner.32=/images/UoD_banner-32.png default_appbase=https://www.jalview.org/getdown/release/1.8 diff --git a/utils/channels/default/resources/images/UoD_banner-28.png b/utils/channels/default/resources/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-28.png differ diff --git a/utils/channels/default/resources/images/UoD_banner-30.png b/utils/channels/default/resources/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-30.png differ diff --git a/utils/channels/default/resources/images/UoD_banner-32.png b/utils/channels/default/resources/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/default/resources/images/UoD_banner-32.png differ diff --git a/utils/channels/default/resources/images/barton_group-28.png b/utils/channels/default/resources/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-28.png differ diff --git a/utils/channels/default/resources/images/barton_group-30.png b/utils/channels/default/resources/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-30.png differ diff --git a/utils/channels/default/resources/images/barton_group-32.png b/utils/channels/default/resources/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/default/resources/images/barton_group-32.png differ diff --git a/utils/channels/default/resources/images/barton_group-62.png b/utils/channels/default/resources/images/barton_group-62.png deleted file mode 100644 index 542acd9..0000000 Binary files a/utils/channels/default/resources/images/barton_group-62.png and /dev/null differ diff --git a/utils/channels/develop/images/UoD_banner-28.png b/utils/channels/develop/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/develop/images/UoD_banner-28.png differ diff --git a/utils/channels/develop/images/UoD_banner-32.png b/utils/channels/develop/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/develop/images/UoD_banner-32.png differ diff --git a/utils/channels/develop/images/barton_group-30.png b/utils/channels/develop/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/develop/images/barton_group-30.png differ diff --git a/utils/channels/develop/resources/channel_properties b/utils/channels/develop/resources/channel_properties index 606cc5f..fa848de 100644 --- a/utils/channels/develop/resources/channel_properties +++ b/utils/channels/develop/resources/channel_properties @@ -9,6 +9,10 @@ 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-38.png -bg_logo.62=/images/barton_group-62.png -uod_banner=/images/UoD_banner.png +bg_logo.28=/images/barton_group-28.png +bg_logo.30=/images/barton_group-30.png +bg_logo.32=/images/barton_group-32.png +uod_banner.28=/images/UoD_banner-28.png +uod_banner.30=/images/UoD_banner-30.png +uod_banner.32=/images/UoD_banner-32.png default_appbase=https://www.jalview.org/getdown/develop/11 diff --git a/utils/channels/develop/resources/images/UoD_banner-28.png b/utils/channels/develop/resources/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-28.png differ diff --git a/utils/channels/develop/resources/images/UoD_banner-30.png b/utils/channels/develop/resources/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-30.png differ diff --git a/utils/channels/develop/resources/images/UoD_banner-32.png b/utils/channels/develop/resources/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/develop/resources/images/UoD_banner-32.png differ diff --git a/utils/channels/develop/resources/images/barton_group-28.png b/utils/channels/develop/resources/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-28.png differ diff --git a/utils/channels/develop/resources/images/barton_group-30.png b/utils/channels/develop/resources/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-30.png differ diff --git a/utils/channels/develop/resources/images/barton_group-32.png b/utils/channels/develop/resources/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/develop/resources/images/barton_group-32.png differ diff --git a/utils/channels/develop/resources/images/barton_group-62.png b/utils/channels/develop/resources/images/barton_group-62.png deleted file mode 100644 index 542acd9..0000000 Binary files a/utils/channels/develop/resources/images/barton_group-62.png and /dev/null differ diff --git a/utils/channels/release/images/UoD_banner-28.png b/utils/channels/release/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/release/images/UoD_banner-28.png differ diff --git a/utils/channels/release/images/UoD_banner-30.png b/utils/channels/release/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/release/images/UoD_banner-30.png differ diff --git a/utils/channels/release/images/UoD_banner-32.png b/utils/channels/release/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/release/images/UoD_banner-32.png differ diff --git a/utils/channels/release/images/UoD_banner-65.png b/utils/channels/release/images/UoD_banner-65.png new file mode 100644 index 0000000..45f7d29 Binary files /dev/null and b/utils/channels/release/images/UoD_banner-65.png differ diff --git a/utils/channels/release/images/UoD_banner.svg b/utils/channels/release/images/UoD_banner.svg new file mode 100644 index 0000000..27cae5d --- /dev/null +++ b/utils/channels/release/images/UoD_banner.svg @@ -0,0 +1,62 @@ + +image/svg+xml diff --git a/utils/channels/release/images/barton_group-28.png b/utils/channels/release/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/release/images/barton_group-28.png differ diff --git a/utils/channels/release/images/barton_group-30.png b/utils/channels/release/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/release/images/barton_group-30.png differ diff --git a/utils/channels/release/images/barton_group-32.png b/utils/channels/release/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/release/images/barton_group-32.png differ diff --git a/utils/channels/release/resources/channel_properties b/utils/channels/release/resources/channel_properties index 69a1339..d19b281 100644 --- a/utils/channels/release/resources/channel_properties +++ b/utils/channels/release/resources/channel_properties @@ -9,6 +9,10 @@ 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-38.png -bg_logo.62=/images/barton_group-62.png -uod_banner=/images/UoD_banner.png +bg_logo.28=/images/barton_group-28.png +bg_logo.30=/images/barton_group-30.png +bg_logo.32=/images/barton_group-32.png +uod_banner.28=/images/UoD_banner-28.png +uod_banner.30=/images/UoD_banner-30.png +uod_banner.32=/images/UoD_banner-32.png default_appbase=https://www.jalview.org/getdown/release/1.8 diff --git a/utils/channels/release/resources/images/UoD_banner-28.png b/utils/channels/release/resources/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-28.png differ diff --git a/utils/channels/release/resources/images/UoD_banner-30.png b/utils/channels/release/resources/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-30.png differ diff --git a/utils/channels/release/resources/images/UoD_banner-32.png b/utils/channels/release/resources/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/release/resources/images/UoD_banner-32.png differ diff --git a/utils/channels/release/resources/images/UoD_banner.png b/utils/channels/release/resources/images/UoD_banner.png deleted file mode 100644 index 2aff7e2..0000000 Binary files a/utils/channels/release/resources/images/UoD_banner.png and /dev/null differ diff --git a/utils/channels/release/resources/images/barton_group-28.png b/utils/channels/release/resources/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-28.png differ diff --git a/utils/channels/release/resources/images/barton_group-30.png b/utils/channels/release/resources/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-30.png differ diff --git a/utils/channels/release/resources/images/barton_group-32.png b/utils/channels/release/resources/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/release/resources/images/barton_group-32.png differ diff --git a/utils/channels/release/resources/images/barton_group-62.png b/utils/channels/release/resources/images/barton_group-62.png deleted file mode 100644 index 542acd9..0000000 Binary files a/utils/channels/release/resources/images/barton_group-62.png and /dev/null differ diff --git a/utils/channels/test-release/images/UoD_banner-28.png b/utils/channels/test-release/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/test-release/images/UoD_banner-28.png differ diff --git a/utils/channels/test-release/images/UoD_banner-32.png b/utils/channels/test-release/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/test-release/images/UoD_banner-32.png differ diff --git a/utils/channels/test-release/images/barton_group-30.png b/utils/channels/test-release/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/test-release/images/barton_group-30.png differ diff --git a/utils/channels/test-release/resources/channel_properties b/utils/channels/test-release/resources/channel_properties index 3a4dcb6..6351a8b 100644 --- a/utils/channels/test-release/resources/channel_properties +++ b/utils/channels/test-release/resources/channel_properties @@ -9,6 +9,10 @@ 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-38.png -bg_logo.62=/images/barton_group-62.png -uod_banner=/images/UoD_banner.png +bg_logo.28=/images/barton_group-28.png +bg_logo.30=/images/barton_group-30.png +bg_logo.32=/images/barton_group-32.png +uod_banner.28=/images/UoD_banner-28.png +uod_banner.30=/images/UoD_banner-30.png +uod_banner.32=/images/UoD_banner-32.png default_appbase=https://www.jalview.org/getdown/release/1.8 diff --git a/utils/channels/test-release/resources/images/UoD_banner-28.png b/utils/channels/test-release/resources/images/UoD_banner-28.png new file mode 100644 index 0000000..5a7a940 Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-28.png differ diff --git a/utils/channels/test-release/resources/images/UoD_banner-30.png b/utils/channels/test-release/resources/images/UoD_banner-30.png new file mode 100644 index 0000000..3f56b13 Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-30.png differ diff --git a/utils/channels/test-release/resources/images/UoD_banner-32.png b/utils/channels/test-release/resources/images/UoD_banner-32.png new file mode 100644 index 0000000..d7dd5d2 Binary files /dev/null and b/utils/channels/test-release/resources/images/UoD_banner-32.png differ diff --git a/utils/channels/test-release/resources/images/barton_group-28.png b/utils/channels/test-release/resources/images/barton_group-28.png new file mode 100644 index 0000000..8d95482 Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-28.png differ diff --git a/utils/channels/test-release/resources/images/barton_group-30.png b/utils/channels/test-release/resources/images/barton_group-30.png new file mode 100644 index 0000000..40c95d5 Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-30.png differ diff --git a/utils/channels/test-release/resources/images/barton_group-32.png b/utils/channels/test-release/resources/images/barton_group-32.png new file mode 100644 index 0000000..70de633 Binary files /dev/null and b/utils/channels/test-release/resources/images/barton_group-32.png differ diff --git a/utils/channels/test-release/resources/images/barton_group-62.png b/utils/channels/test-release/resources/images/barton_group-62.png deleted file mode 100644 index 542acd9..0000000 Binary files a/utils/channels/test-release/resources/images/barton_group-62.png and /dev/null differ