Author: jpepin Date: 2010-08-23 22:01:24 +0200 (Mon, 23 Aug 2010) New Revision: 3017 Url: http://chorem.org/repositories/revision/lima/3017 Log: Ajout icone LIMA sur la page web. Slpash screen puzzle v2. Added: trunk/lima-business/src/main/resources/images/puzzle_icon_mini.png Removed: trunk/lima-business/src/main/resources/images/logo-codelutin.png trunk/lima-business/src/main/resources/images/splash.png Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java trunk/lima-swing/src/main/resources/images/puzzle_splash.png Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java =================================================================== --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2010-08-23 16:49:11 UTC (rev 3016) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServerServiceImpl.java 2010-08-23 20:01:24 UTC (rev 3017) @@ -203,14 +203,15 @@ + "<style type=\"text/css\">" + "body { font: 14px sans-serif; }" + "h1 { font: 20px sans-serif; text-align: center; }" - + "table.paddingleft td {padding-left:100px;}" + + "table.padding td {padding-right:20px;}" + ".tdright {text-align: right;}" + "</style>" + "</head>\n" + "<body>\n" - + "<table class=\"paddingleft\">\n" - + "<tr><td colspan=2><h1>LIMA Documents Report</h1></td></tr>\n" - + "<tr><td><img src=\"?img=identity.png\"/></td>\n" + + "<table class=\"padding\">\n" + + "<tr><td><img src=\"?img=puzzle_icon_mini.png\"/></td>\n" + + "<td><h1>LIMA Documents Report</h1></td></tr>\n" + + "<tr><td class=\"tdright\"><img src=\"?img=identity.png\"/></td>\n" + "<td rowspan=3><form method=GET action=" + serverAdress + ">\n" + _("lima-business.document.date.begin") @@ -237,12 +238,12 @@ } pageContent.append("</select>\n" - + "<tr><td><img src=\"?img=entries.png\"/></td></tr>\n" - + "<tr><td><img src=\"?img=accounts.png\"/></td></tr>\n" - + "<tr><td><img src=\"?img=entrybooks.png\"/></td>\n" + + "<tr><td class=\"tdright\"><img src=\"?img=entries.png\"/></td></tr>\n" + + "<tr><td class=\"tdright\"><img src=\"?img=accounts.png\"/></td></tr>\n" + + "<tr><td class=\"tdright\"><img src=\"?img=entrybooks.png\"/></td>\n" + "<td class=\"tdright\"><input type=\"submit\"></td></tr>" + "</form>\n" - + "<tr><td><img src=\"?img=fiscalperiods.png\"/></td></tr>\n" + + "<tr><td class=\"tdright\"><img src=\"?img=fiscalperiods.png\"/></td></tr>\n" + "</table>\n" + "</body>\n" + "</html>"); Deleted: trunk/lima-business/src/main/resources/images/logo-codelutin.png =================================================================== (Binary files differ) Added: trunk/lima-business/src/main/resources/images/puzzle_icon_mini.png =================================================================== (Binary files differ) Property changes on: trunk/lima-business/src/main/resources/images/puzzle_icon_mini.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-business/src/main/resources/images/splash.png =================================================================== (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 16:49:11 UTC (rev 3016) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 20:01:24 UTC (rev 3017) @@ -54,6 +54,9 @@ /** Lima configuration. */ public static LimaConfig config; + /** splash */ + private static LimaSplash splash; + /** * Lima main method. * @@ -67,6 +70,7 @@ } try { + // init root context final LimaContext context = init(args); @@ -98,6 +102,10 @@ */ public static synchronized LimaContext init(String... args) throws Exception { + // update splash + splash = new LimaSplash(); + splash.initSplash(); + // to enable javassist on webstart, must remove any securityManager, // see if this can be dangerous (should not be since jnlp is signed ?) // moreover it speeds up the loading :) @@ -114,6 +122,7 @@ log.debug("i18n loading time : " + (StringUtil.convertTime(t0, System.nanoTime()))); } + Runtime.getRuntime().addShutdownHook(new ShutdownHook()); // init root context @@ -150,12 +159,10 @@ protected static void launch(LimaContext context) throws Exception { + + splash.drawVersion(config.getVersion()); + splash.updateProgression(0.1, _("lima.splash.1")); - // update splash - LimaSplash splash = new LimaSplash(); - splash.initSplash(config.getVersion()); - splash.updateProgression(0.1, _("lima.splash.1")); - // do init ui MainViewHandler uiHandler = context.getContextValue(MainViewHandler.class); final MainView ui = uiHandler.initUI(context, context.getConfig().isFullScreen()); @@ -166,7 +173,7 @@ // load accounts and test if there is an account plan defined // if not, call #loadDefaultAccount() - splash.updateProgression(0.5, _("lima.splash.2")); + splash.updateProgression(0.7, _("lima.splash.2")); //start http server LimaServiceFactory.getInstance().getService(HttpServerServiceMonitorable.class).start(); @@ -185,7 +192,7 @@ openingView.setLocationRelativeTo(null); openingView.setVisible(true); } - splash.updateProgression(0.5, _("lima.splash.3")); + splash.updateProgression(1, _("lima.splash.3")); // show ui SwingUtilities.invokeLater(new Runnable() { @Override Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-08-23 16:49:11 UTC (rev 3016) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaSplash.java 2010-08-23 20:01:24 UTC (rev 3017) @@ -67,10 +67,18 @@ * * @param version version to display on splash screen */ - public void initSplash(String version) { + public void initSplash() { if (splashGraphics != null) { - splashGraphics.setColor(Color.BLACK); - splashGraphics.drawString("Version : " + version, 394, 42); + splashGraphics.setColor(Color.GRAY); + splashGraphics.drawRect(65, 253, 300, 10); + splashGraphics.fillRect(65, 253, 0, 10); + + splashGraphics.setColor(Color.DARK_GRAY); + Font font = new Font("Lucida Sans", Font.BOLD, 14); + splashGraphics.setFont(font); + splashGraphics.drawString("Lutin Invoice Monitoring and Accounting", 65, 249); + + splash.update(); } else { if (log.isWarnEnabled()) { @@ -81,6 +89,17 @@ } } + public void drawVersion(String version){ + if (splashGraphics != null) { + splashGraphics.setColor(Color.DARK_GRAY); + Font font = new Font("Lucida Sans", Font.PLAIN, 12); + splashGraphics.setFont(font); + splashGraphics.setColor(Color.BLACK); + splashGraphics.drawString("Version : " + version, 394, 42); + splash.update(); + } + } + /** * Update progression. * Modified: trunk/lima-swing/src/main/resources/images/puzzle_splash.png =================================================================== (Binary files differ)