Author: chatellier Date: 2011-02-02 09:42:02 +0000 (Wed, 02 Feb 2011) New Revision: 640 Log: Add coser logo and favicon Added: trunk/coser-ui/src/main/resources/icons/logo.png trunk/coser-ui/src/main/resources/icons/logo300.png trunk/coser-web/src/main/webapp/images/logo.png Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp trunk/coser-web/src/main/webapp/favicon.png Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrame.jaxx 2011-02-02 09:42:02 UTC (rev 640) @@ -23,7 +23,8 @@ #L% --> <JFrame title="coser.ui.mainview.titleempty" layout="{new BorderLayout()}" - name="mainFrame" onWindowClosing="getHandler().quit()"> + name="mainFrame" onWindowClosing="getHandler().quit()" + iconImage='{SwingUtil.createImageIcon("logo.png").getImage()}'> <CoserFrameHandler id="handler" constructorParams="this" /> <fr.ifremer.coser.bean.Project id="project" javaBean="null" /> Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/CoserFrameHandler.java 2011-02-02 09:42:02 UTC (rev 640) @@ -26,11 +26,13 @@ import static org.nuiton.i18n.I18n._; import java.awt.BorderLayout; +import java.awt.Color; import java.awt.Component; import java.awt.Desktop; import java.beans.PropertyChangeEvent; import java.io.File; import java.io.IOException; +import java.io.InputStream; import java.net.URI; import java.util.Locale; @@ -43,8 +45,11 @@ import jaxx.runtime.swing.editor.config.ConfigUI; import jaxx.runtime.swing.editor.config.ConfigUIHelper; +import org.apache.commons.io.IOUtils; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; +import org.nuiton.util.Resource; +import org.nuiton.widget.AboutFrame; import org.nuiton.widget.SwingSession; import fr.ifremer.coser.CoserBusinessConfig; @@ -240,12 +245,42 @@ */ public void showAboutView() { CoserConfig config = view.getContextValue(CoserConfig.class); + + /* Logo doesn't not display with that version AboutPanel aboutPanel = new AboutPanel(view); + aboutPanel.setIconPath("/icons/logo300.png"); aboutPanel.setTitle(_("coser.ui.about.title")); aboutPanel.setAboutText(_("coser.ui.about.about", config.getApplicationVersion())); aboutPanel.setLicenseFile("META-INF/coser-ui-LICENSE.txt"); aboutPanel.setThirdpartyFile("META-INF/coser-ui-THIRD-PARTY.txt"); - aboutPanel.showInDialog(view, true); + aboutPanel.init(); + aboutPanel.showInDialog(view, true);*/ + + AboutFrame aboutFrame = new AboutFrame(); + aboutFrame.setTitle(_("coser.ui.about.title")); + aboutFrame.setAboutHtmlText(_("coser.ui.about.about", config.getApplicationVersion())); + aboutFrame.setIconPath("/icons/logo300.png"); + aboutFrame.setIconImage(Resource.getIcon("/icons/logo300.png").getImage()); + InputStream licenseStream = getClass().getResourceAsStream("/META-INF/coser-ui-LICENSE.txt"); + try { + if (licenseStream != null) { + aboutFrame.setLicenseText(IOUtils.toString(licenseStream)); + } + else { + aboutFrame.setLicenseText("No license file found"); + } + } catch (IOException ex) { + if (log.isWarnEnabled()) { + log.warn("Can't read licence file", ex); + } + } + finally { + IOUtils.closeQuietly(licenseStream); + } + aboutFrame.setBackgroundColor(Color.WHITE); + aboutFrame.setSize(600, 600); + aboutFrame.setLocationRelativeTo(view); + aboutFrame.setVisible(true); } /** Added: trunk/coser-ui/src/main/resources/icons/logo.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Added: trunk/coser-ui/src/main/resources/icons/logo300.png =================================================================== (Binary files differ) Property changes on: trunk/coser-ui/src/main/resources/icons/logo300.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/layout.jsp 2011-02-02 09:42:02 UTC (rev 640) @@ -32,6 +32,7 @@ <script type="text/javascript" language="javascript" src="<s:url value='/js/jquery-1.4.4.min.js' />"></script> <script type="text/javascript" language="javascript" src="<s:url value='/js/coser.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> </head> <body> Modified: trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp =================================================================== --- trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 09:38:20 UTC (rev 639) +++ trunk/coser-web/src/main/webapp/WEB-INF/decorators/sublayout.jsp 2011-02-02 09:42:02 UTC (rev 640) @@ -32,6 +32,7 @@ <script type="text/javascript" language="javascript" src="<s:url value='/js/jquery-1.4.4.min.js' />"></script> <script type="text/javascript" language="javascript" src="<s:url value='/js/coser.js' />"></script> <link rel="stylesheet" type="text/css" href="<s:url value='/styles/coser.css' />" /> + <link rel="icon" type="image/png" href="<s:url value='/favicon.png' />" /> <decorator:head/> </head> <body> Modified: trunk/coser-web/src/main/webapp/favicon.png =================================================================== (Binary files differ) Added: trunk/coser-web/src/main/webapp/images/logo.png =================================================================== (Binary files differ) Property changes on: trunk/coser-web/src/main/webapp/images/logo.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream