From jpepin@users.chorem.org Mon Aug 23 22:01:25 2010 From: jpepin@users.chorem.org To: lima-commits@list.chorem.org Subject: [Lima-commits] r3017 - in trunk: lima-business/src/main/java/org/chorem/lima/business/ejb lima-business/src/main/resources/images lima-swing/src/main/java/org/chorem/lima lima-swing/src/main/resources/images Date: Mon, 23 Aug 2010 22:01:25 +0200 Message-ID: <20100823200125.1B06E15A10@nuiton.codelutin.com> MIME-Version: 1.0 Content-Type: multipart/mixed; boundary="===============0706590226755868960==" --===============0706590226755868960== Content-Type: text/plain; charset="utf-8" Content-Transfer-Encoding: quoted-printable 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/HttpServerS= erviceImpl.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/Http= ServerServiceImpl.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServer= ServiceImpl.java 2010-08-23 16:49:11 UTC (rev 3016) +++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/HttpServer= ServiceImpl.java 2010-08-23 20:01:24 UTC (rev 3017) @@ -203,14 +203,15 @@ + "" + "\n" + "\n" - + "\n" - + "\n" - + "\n" + + "

LIMA Documents Report

\n" + + "\n" + + "\n" + + "\n" + "\n" - + "\n" - + "\n" + + "\n" + + "\n" + + "\n" + "" + "\n" - + "\n" + + "\n" + "

=	LIMA Documents Report
	\n" + _("lima-business.document.date.begin") @@ -237,12 +238,12 @@ } =20 pageContent.append("\n" - + "

\n" + "\n" + ""); Deleted: trunk/lima-business/src/main/resources/images/logo-codelutin.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Added: trunk/lima-business/src/main/resources/images/puzzle_icon_mini.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Property changes on: trunk/lima-business/src/main/resources/images/puzzle_ico= n_mini.png ___________________________________________________________________ Added: svn:mime-type + application/octet-stream Deleted: trunk/lima-business/src/main/resources/images/splash.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 1= 6:49:11 UTC (rev 3016) +++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaMain.java 2010-08-23 2= 0:01:24 UTC (rev 3017) @@ -54,6 +54,9 @@ /** Lima configuration. */ public static LimaConfig config; =20 + /** splash */ + private static LimaSplash splash; + =20 /** * Lima main method. *=20 @@ -67,6 +70,7 @@ } =20 try { + =09 // init root context final LimaContext context =3D init(args); =20 @@ -98,6 +102,10 @@ */ public static synchronized LimaContext init(String... args) throws Excep= tion { =20 + // update splash + splash =3D new LimaSplash(); + splash.initSplash(); + =09 // 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, S= ystem.nanoTime()))); } =20 + =20 Runtime.getRuntime().addShutdownHook(new ShutdownHook()); =20 // init root context @@ -150,12 +159,10 @@ =20 =20 protected static void launch(LimaContext context) throws Exception { + =20 + splash.drawVersion(config.getVersion()); + splash.updateProgression(0.1, _("lima.splash.1")); =20 - // update splash - LimaSplash splash =3D new LimaSplash(); - splash.initSplash(config.getVersion()); - splash.updateProgression(0.1, _("lima.splash.1")); - =20 // do init ui MainViewHandler uiHandler =3D context.getContextValue(MainViewHandle= r.class); final MainView ui =3D uiHandler.initUI(context, context.getConfig().= isFullScreen()); @@ -166,7 +173,7 @@ =20 // 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")); =20 //start http server LimaServiceFactory.getInstance().getService(HttpServerServiceMonitor= able.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 =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D --- 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 @@ *=20 * @param version version to display on splash screen */ - public void initSplash(String version) { + public void initSplash() { if (splashGraphics !=3D 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 =3D new Font("Lucida Sans", Font.BOLD, 14); + splashGraphics.setFont(font); + splashGraphics.drawString("Lutin Invoice Monitoring and Accounti= ng", 65, 249); + =20 + splash.update(); } else { if (log.isWarnEnabled()) { @@ -81,6 +89,17 @@ } } =20 + public void drawVersion(String version){ + if (splashGraphics !=3D null) { + splashGraphics.setColor(Color.DARK_GRAY); + Font font =3D new Font("Lucida Sans", Font.PLAIN, 12); + splashGraphics.setFont(font); + splashGraphics.setColor(Color.BLACK); + splashGraphics.drawString("Version : " + version, 394, 42); + splash.update(); + } + } + =20 /** * Update progression. *=20 Modified: trunk/lima-swing/src/main/resources/images/puzzle_splash.png =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D= =3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D (Binary files differ) --===============0706590226755868960==--