Author: tchemit Date: 2011-04-11 12:11:46 +0200 (Mon, 11 Apr 2011) New Revision: 2253 Url: http://nuiton.org/repositories/revision/jaxx/2253 Log: Evolution #1450: Can set a numberPattern on number editor Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties Modified: trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx =================================================================== --- trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/NumberEditorDemo.jaxx 2011-04-11 10:11:46 UTC (rev 2253) @@ -39,9 +39,15 @@ return new String[]{ getDefaultSource(), "NumberEditorDemoModel.java" }; } +public void changeNumberPattern() { + editor.setNumberPattern(numberPattern.getText()); +} + void $afterCompleteSetup() { editor.init(); + changeNumberPattern(); } + ]]> </script> @@ -71,11 +77,17 @@ <JCheckBox id='autoPopup' text='jaxxdemo.numbereditor.autoPopup' selected='false'/> - <JTextField id='numberPattern'/> - <JButton id='applyNumberPattern' - text='jaxxdemo.numbereditor.applyNumberPattern' - onActionPerformed='editor.setNumberPattern(numberPattern.getText())'/> + <JPanel + border='{new TitledBorder(_("jaxxdemo.numbereditor.numberPattern.configuration"))}' + layout='{new GridLayout(1,0)}'> + <JTextField id='numberPattern' text='{"\\d{0,3}"}'/> + <JButton id='applyNumberPattern' + text='jaxxdemo.numbereditor.applyNumberPattern' + onActionPerformed='changeNumberPattern();'/> + </JPanel> + + </JPanel> </cell> </row> @@ -97,6 +109,8 @@ <JPanel border='{new TitledBorder(_("jaxxdemo.numbereditor.model"))}' layout='{new GridLayout(0,1)}'> <JLabel + text='{_("jaxxdemo.numbereditor.model.numberPattern", editor.getNumberPattern())}'/> + <JLabel text='{_("jaxxdemo.numbereditor.model.int", demoModel.getIntegerProperty())}'/> <JLabel text='{_("jaxxdemo.numbereditor.model.float", demoModel.getFloatProperty())}'/> 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 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties 2011-04-11 10:11:46 UTC (rev 2253) @@ -211,12 +211,14 @@ jaxxdemo.navigation.actors.title=Actors jaxxdemo.navigation.movie.title=Movie jaxxdemo.navigation.movies.title=Movies -jaxxdemo.numbereditor.applyNumberPattern=Apply the pattern +jaxxdemo.numbereditor.applyNumberPattern=Apply pattern jaxxdemo.numbereditor.autoPopup=Show automatic popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=Result jaxxdemo.numbereditor.model.float=Float result \: %1$s jaxxdemo.numbereditor.model.int=Integer result \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Editor pattern \: %s +jaxxdemo.numbereditor.numberPattern.configuration=Number Pattern jaxxdemo.numbereditor.showPopupButton=Show Popup button jaxxdemo.numbereditor.showReset=Show reset button jaxxdemo.numbereditor.useFloat=Use float 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 2011-04-11 10:11:33 UTC (rev 2252) +++ trunk/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties 2011-04-11 10:11:46 UTC (rev 2253) @@ -211,12 +211,14 @@ jaxxdemo.navigation.actors.title=Acteurs jaxxdemo.navigation.movie.title=Film jaxxdemo.navigation.movies.title=Films -jaxxdemo.numbereditor.applyNumberPattern=Appliquer le format de l'\u00E9diteur +jaxxdemo.numbereditor.applyNumberPattern=Appliquer le pattern jaxxdemo.numbereditor.autoPopup=Affichage automatique popup jaxxdemo.numbereditor.configuration=Configuration jaxxdemo.numbereditor.model=R\u00E9sultat jaxxdemo.numbereditor.model.float=Valeur d\u00E9cimale \: %1$s jaxxdemo.numbereditor.model.int=Valeur enti\u00E8re \: %1$s +jaxxdemo.numbereditor.model.numberPattern=Format de l'\u00E9diteur \: %s +jaxxdemo.numbereditor.numberPattern.configuration=Pattern du nombre jaxxdemo.numbereditor.showPopupButton=Afficher le boutton de popup jaxxdemo.numbereditor.showReset=Afficher le boutton de reset jaxxdemo.numbereditor.useFloat=Utiliser les d\u00E9cimales