Author: tchemit Date: 2014-01-12 14:19:54 +0100 (Sun, 12 Jan 2014) New Revision: 2769 Url: http://nuiton.org/projects/jaxx/repository/revisions/2769 Log: refs #72: Improve Jaxx demo Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-01-10 18:06:58 UTC (rev 2768) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoApplicationContext.java 2014-01-12 13:19:54 UTC (rev 2769) @@ -138,6 +138,7 @@ if (log.isInfoEnabled()) { log.info("help-uri: " + resolvedUri); } + getMainUI().getP().setStatus(_("jaxxdemo.openHelp", helpId)); // SwingUtil.openLink(resolvedUri); // } catch (URISyntaxException e) { // throw new RuntimeException(_("jaxxdemo.context.helpPage.notFound", resolvedUri)); Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2014-01-10 18:06:58 UTC (rev 2768) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/DemoUI.jaxx 2014-01-12 13:19:54 UTC (rev 2769) @@ -87,9 +87,13 @@ onActionPerformed="handler.showAbout(this)"/> </JMenu> - <!-- pour afficher l'aide contextuelle --> - <JButton id='showHelp'/> + <JToolBar layout='{new BorderLayout()}'> + <!-- pour afficher l'aide contextuelle --> + <JButton id='showHelp' constraints='BorderLayout.EAST'/> + </JToolBar> + + </JMenuBar> <JPanel id='mainPane' layout='{new BorderLayout()}'> Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2014-01-10 18:06:58 UTC (rev 2768) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2014-01-12 13:19:54 UTC (rev 2769) @@ -307,6 +307,7 @@ jaxxdemo.numbereditor.showReset=Show reset button jaxxdemo.numbereditor.useFloat=Use float jaxxdemo.numbereditor.useSign=Use Sign +jaxxdemo.openHelp=Open contextual help (%s), Will come in 3.0 version jaxxdemo.timeeditor.editor=Time Editor jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Result Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2014-01-10 18:06:58 UTC (rev 2768) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties 2014-01-12 13:19:54 UTC (rev 2769) @@ -310,6 +310,7 @@ jaxxdemo.numbereditor.showReset=Afficher le boutton de reset jaxxdemo.numbereditor.useFloat=Utiliser les décimales jaxxdemo.numbereditor.useSign=Utiliser le signe +jaxxdemo.openHelp=Open contextual help (%s), Will come in 3.0 version jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Résultat Modified: trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties =================================================================== --- trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2014-01-10 18:06:58 UTC (rev 2768) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2014-01-12 13:19:54 UTC (rev 2769) @@ -302,6 +302,7 @@ jaxxdemo.numbereditor.showReset=Afficher le boutton de reset jaxxdemo.numbereditor.useFloat=Utiliser les décimales jaxxdemo.numbereditor.useSign=Utiliser le signe +jaxxdemo.openHelp=Ouvertude l'aide contextuelle (%s), A venir en version 3.0 jaxxdemo.timeeditor.editor=Editeur de temps jaxxdemo.timeeditor.label=Label jaxxdemo.timeeditor.model=Résultat