# HG changeset patch # User Tom Gottfried # Date 1682592533 -7200 # Node ID 672cfb8502296c6f14a255e342159cfe0e11f420 # Parent 7df65516ee8b7bf83c05680b2ba56631d6964c60 Update logo and reduce number of image copies diff -r 7df65516ee8b -r 672cfb850229 artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Thu Apr 27 11:55:46 2023 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/DiagramGenerator.java Thu Apr 27 12:48:53 2023 +0200 @@ -289,7 +289,7 @@ java.net.URL imageURL; if (logo.equals("BfG")) { imageURL = DiagramGenerator.class.getResource( - "/images/bfg_logo.gif"); + "/images/bfg_logo.png"); } else { return; } diff -r 7df65516ee8b -r 672cfb850229 artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java Thu Apr 27 11:55:46 2023 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/TimeseriesChartGenerator.java Thu Apr 27 12:48:53 2023 +0200 @@ -181,7 +181,7 @@ java.net.URL imageURL; if (logo.equals("BfG")) { imageURL = XYChartGenerator.class.getResource( - "/images/bfg_logo.gif"); + "/images/bfg_logo.png"); } else { return; } diff -r 7df65516ee8b -r 672cfb850229 artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java --- a/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Thu Apr 27 11:55:46 2023 +0200 +++ b/artifacts/src/main/java/org/dive4elements/river/exports/XYChartGenerator.java Thu Apr 27 12:48:53 2023 +0200 @@ -204,7 +204,7 @@ java.net.URL imageURL; if (logo.equals("BfG")) { imageURL = XYChartGenerator.class.getResource( - "/images/bfg_logo.gif"); + "/images/bfg_logo.png"); } else { return; } diff -r 7df65516ee8b -r 672cfb850229 artifacts/src/main/resources/images/bfg_logo.gif Binary file artifacts/src/main/resources/images/bfg_logo.gif has changed diff -r 7df65516ee8b -r 672cfb850229 artifacts/src/main/resources/images/bfg_logo.png Binary file artifacts/src/main/resources/images/bfg_logo.png has changed diff -r 7df65516ee8b -r 672cfb850229 gwt-client/config/mapfish/images/bfg_logo.gif Binary file gwt-client/config/mapfish/images/bfg_logo.gif has changed diff -r 7df65516ee8b -r 672cfb850229 gwt-client/config/mapfish/images/bfg_logo.png Binary file gwt-client/config/mapfish/images/bfg_logo.png has changed diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Apr 27 11:55:46 2023 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants.properties Thu Apr 27 12:48:53 2023 +0200 @@ -93,7 +93,7 @@ welcome_open_or_create = Please open a project from the project list or create a # Header images flysLogo = images/flys_logo.gif -bfgLogo = images/bfg_logo.gif +bfgLogo = images/bfg_logo.png bfgLogoSmall = images/bfg_logo_small.png # Images diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Apr 27 11:55:46 2023 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_de.properties Thu Apr 27 12:48:53 2023 +0200 @@ -95,7 +95,7 @@ # Header images flysLogo = images/flys_logo.gif -bfgLogo = images/bfg_logo.gif +bfgLogo = images/bfg_logo.png bfgLogoSmall = images/bfg_logo_small.png # Images diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Apr 27 11:55:46 2023 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/FLYSConstants_en.properties Thu Apr 27 12:48:53 2023 +0200 @@ -94,7 +94,7 @@ # Header images flysLogo = images/flys_logo.gif -bfgLogo = images/bfg_logo.gif +bfgLogo = images/bfg_logo.png bfgLogoSmall = images/bfg_logo_small.png # Images diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java --- a/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java Thu Apr 27 11:55:46 2023 +0200 +++ b/gwt-client/src/main/java/org/dive4elements/river/client/client/ui/chart/ChartPropertiesEditor.java Thu Apr 27 12:48:53 2023 +0200 @@ -391,8 +391,7 @@ if (choiceAttribute != null && choiceAttribute.equals("logo")) { SelectItem logoChooser = new SelectItem(); - logoChooser.setImageURLPrefix( - GWT.getHostPageBaseURL() + "images/logo-"); + logoChooser.setImageURLPrefix(GWT.getHostPageBaseURL()); logoChooser.setValueIconHeight(50); logoChooser.setValueIconWidth(100); @@ -411,7 +410,7 @@ flys-client/src/main/webapp/images/ */ valueMap.put("BfG", ""); - valueIcons.put("BfG", "bfg.gif"); + valueIcons.put("BfG", MSG.bfgLogo()); logoChooser.setValueIcons(valueIcons); logoChooser.setValueMap(valueMap); logoChooser.setTitleStyle("color:#000;"); diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/webapp/images/bfg_logo.gif Binary file gwt-client/src/main/webapp/images/bfg_logo.gif has changed diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/webapp/images/bfg_logo.png Binary file gwt-client/src/main/webapp/images/bfg_logo.png has changed diff -r 7df65516ee8b -r 672cfb850229 gwt-client/src/main/webapp/images/logo-bfg.gif Binary file gwt-client/src/main/webapp/images/logo-bfg.gif has changed