This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git commit b95ed40657b5162ed43692975de300a01df0ba72 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Sep 10 09:51:40 2014 +0200 refs-40 #3501: Introduce a new jaxx-widgets-datetime module (date-time editor demo is ok) --- .../jaxx/editor/datetime/DateTimeEditorDemo.css | 9 +++++++++ .../jaxx/editor/datetime/DateTimeEditorDemo.jaxx | 23 +++++++++++++++++----- .../main/resources/i18n/jaxx-demo_en_GB.properties | 2 ++ .../main/resources/i18n/jaxx-demo_es_ES.properties | 2 ++ .../main/resources/i18n/jaxx-demo_fr_FR.properties | 2 ++ 5 files changed, 33 insertions(+), 5 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css index ff2f516..6050e57 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.css @@ -12,6 +12,14 @@ text:{t("jaxxdemo.datetimeeditor.configuration.label.value")}; } +#formatConfigLabel { + text:"jaxxdemo.datetimeeditor.configuration.format"; +} + +#formatConfig { + text:{t("jaxxdemo.datetimeeditor.configuration.format.value")}; +} + #editor { bean:{model}; propertyDate:date; @@ -20,6 +28,7 @@ border:{new TitledBorder(t("jaxxdemo.datetimeeditor.editor"))}; date:{model.getDate()}; label:{labelConfig.getText()}; + dateFormat:{formatConfig.getText()}; } #result { diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx index 4e5f610..cea6781 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/editor/datetime/DateTimeEditorDemo.jaxx @@ -28,11 +28,24 @@ <DateTimeEditorDemoModel id='model' initializer='getContextValue(DateTimeEditorDemoModel.class)'/> <JPanel layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - - <JPanel id="configPanel" layout='{new BorderLayout()}' constraints='BorderLayout.NORTH'> - <JLabel id='labelConfigLabel' constraints='BorderLayout.WEST'/> - <JTextField id='labelConfig' constraints='BorderLayout.CENTER'/> - </JPanel> + <Table id="configPanel" constraints='BorderLayout.NORTH'> + <row> + <cell anchor='west'> + <JLabel id='labelConfigLabel'/> + </cell> + <cell fill='both' weightx='1'> + <JTextField id='labelConfig'/> + </cell> + </row> + <row> + <cell> + <JLabel id='formatConfigLabel'/> + </cell> + <cell fill='both' weightx='1'> + <JTextField id='formatConfig'/> + </cell> + </row> + </Table> <DateTimeEditor id='editor' constructorParams='this' constraints='BorderLayout.CENTER'/> </JPanel> diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties index 0aabaec..7690f20 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_en_GB.properties @@ -253,6 +253,8 @@ jaxxdemo.datePickerEditor.dateResult=Result display jaxxdemo.datePickerEditor.patternLayout=Date pattern jaxxdemo.datePickerEditor.showPopupButton=Display popup button jaxxdemo.datetimeeditor.configuration=Configuration +jaxxdemo.datetimeeditor.configuration.format=Date format +jaxxdemo.datetimeeditor.configuration.format.value=yyyy/MM/dd jaxxdemo.datetimeeditor.configuration.label=Label of editor jaxxdemo.datetimeeditor.configuration.label.value=Date - Time jaxxdemo.datetimeeditor.editor=Editor diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties index 91b2560..e88831b 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_es_ES.properties @@ -253,6 +253,8 @@ jaxxdemo.datePickerEditor.dateResult=Affichage du résultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup jaxxdemo.datetimeeditor.configuration= +jaxxdemo.datetimeeditor.configuration.format= +jaxxdemo.datetimeeditor.configuration.format.value= jaxxdemo.datetimeeditor.configuration.label= jaxxdemo.datetimeeditor.configuration.label.value= jaxxdemo.datetimeeditor.editor= diff --git a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties index f3a2980..fd9ecc4 100644 --- a/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties +++ b/jaxx-demo/src/main/resources/i18n/jaxx-demo_fr_FR.properties @@ -253,6 +253,8 @@ jaxxdemo.datePickerEditor.dateResult=Affichage du résultat jaxxdemo.datePickerEditor.patternLayout=Pattern de date jaxxdemo.datePickerEditor.showPopupButton=Afficher le boutton pour ouvrir la popup jaxxdemo.datetimeeditor.configuration=Configuration +jaxxdemo.datetimeeditor.configuration.format=Format des dates +jaxxdemo.datetimeeditor.configuration.format.value=dd-MM-yyyy jaxxdemo.datetimeeditor.configuration.label=Libellé de l'éditeur jaxxdemo.datetimeeditor.configuration.label.value=Date - Heure jaxxdemo.datetimeeditor.editor=Éditeur -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.