branch develop updated (49ac4c7 -> 5d89a13)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository jaxx. See http://git.nuiton.org/jaxx.git from 49ac4c7 refs #3884 (add enable state + test it in demo) new 5d89a13 refs #3501 add dateEditable and timeEditable property The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 5d89a130697d47421c1bad820d90e72b05f61c09 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 18:47:10 2014 +0100 refs #3501 add dateEditable and timeEditable property Summary of changes: .../jaxx/widgets/datetime/DateTimeEditorDemo.css | 12 ++++++++ .../jaxx/widgets/datetime/DateTimeEditorDemo.jaxx | 10 +++++++ .../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 ++ .../jaxx/widgets/datetime/DateTimeEditor.css | 8 +++--- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 4 ++- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 33 ++++++++++++++++++++++ 8 files changed, 68 insertions(+), 5 deletions(-) -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
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 5d89a130697d47421c1bad820d90e72b05f61c09 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 18:47:10 2014 +0100 refs #3501 add dateEditable and timeEditable property --- .../jaxx/widgets/datetime/DateTimeEditorDemo.css | 12 ++++++++ .../jaxx/widgets/datetime/DateTimeEditorDemo.jaxx | 10 +++++++ .../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 ++ .../jaxx/widgets/datetime/DateTimeEditor.css | 8 +++--- .../jaxx/widgets/datetime/DateTimeEditor.jaxx | 4 ++- .../jaxx/widgets/datetime/DateTimeEditorModel.java | 33 ++++++++++++++++++++++ 8 files changed, 68 insertions(+), 5 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css index e4b9333..283df54 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.css @@ -46,6 +46,16 @@ selected: true; } +#dateEditableButton { + text: "jaxxdemo.datetimeeditor.dateEditable"; + selected: true; +} + +#timeEditableButton { + text: "jaxxdemo.datetimeeditor.timeEditable"; + selected: true; +} + #editor { bean:{model}; propertyDate:date; @@ -56,6 +66,8 @@ label:{labelConfig.getText()}; dateFormat:{formatConfig.getText()}; enabled:{enableButton.isSelected()}; + dateEditable:{dateEditableButton.isSelected()}; + timeEditable:{timeEditableButton.isSelected()}; } #result { diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx index 28826e5..4bb8a86 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/datetime/DateTimeEditorDemo.jaxx @@ -47,6 +47,16 @@ </row> <row> <cell anchor='west' columns="2"> + <JCheckBox id='dateEditableButton'/> + </cell> + </row> + <row> + <cell anchor='west' columns="2"> + <JCheckBox id='timeEditableButton'/> + </cell> + </row> + <row> + <cell anchor='west' columns="2"> <JCheckBox id='enableButton'/> </cell> </row> 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 6a7a716..8aea671 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 @@ -264,12 +264,14 @@ 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.dateEditable=Editable Date jaxxdemo.datetimeeditor.editor=Editor jaxxdemo.datetimeeditor.enable=Enable / Disable jaxxdemo.datetimeeditor.result=Result jaxxdemo.datetimeeditor.result.date=Date\: jaxxdemo.datetimeeditor.result.dayDate=Day\: jaxxdemo.datetimeeditor.result.timeDate=Time\: +jaxxdemo.datetimeeditor.timeEditable=Editable Time jaxxdemo.feature=Features jaxxdemo.feature.databinding=Data Binding jaxxdemo.feature.list.validation=Multiple Bean Validation 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 6f2c6b2..d0108b1 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 @@ -266,6 +266,7 @@ jaxxdemo.datetimeeditor.configuration.format= jaxxdemo.datetimeeditor.configuration.format.value= jaxxdemo.datetimeeditor.configuration.label= jaxxdemo.datetimeeditor.configuration.label.value= +jaxxdemo.datetimeeditor.dateEditable=Editable Date jaxxdemo.datetimeeditor.editor= jaxxdemo.datetimeeditor.enable= jaxxdemo.datetimeeditor.label= @@ -280,6 +281,7 @@ jaxxdemo.datetimeeditor.result.time= jaxxdemo.datetimeeditor.result.timeDate= jaxxdemo.datetimeeditor.result.timeInMinutes= jaxxdemo.datetimeeditor.result.timmeInMinutes= +jaxxdemo.datetimeeditor.timeEditable=Editable Time jaxxdemo.feature=Fonctionnalités jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.list.validation= 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 12f4e42..7310e5c 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 @@ -264,12 +264,14 @@ 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.dateEditable=Date éditable jaxxdemo.datetimeeditor.editor=Éditeur jaxxdemo.datetimeeditor.enable=Activer / Désactiver jaxxdemo.datetimeeditor.result=Résultat jaxxdemo.datetimeeditor.result.date=Date \: jaxxdemo.datetimeeditor.result.dayDate=Jour \: jaxxdemo.datetimeeditor.result.timeDate=Heure \: +jaxxdemo.datetimeeditor.timeEditable=Heure éditable jaxxdemo.feature=Fonctionnalités jaxxdemo.feature.databinding=Data binding jaxxdemo.feature.list.validation=Validation de liste diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css index a1886ae..a33451d 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css @@ -26,7 +26,7 @@ #dayDateEditor { formats:{"dd/MM/yyyy"}; - enabled:{isEnabled()}; + enabled:{isEnabled() && model.isDateEditable()}; date: {model.getDayDate()}; } @@ -37,7 +37,7 @@ #hourEditor { model:{hourModel}; - enabled:{isEnabled()}; + enabled:{isEnabled() && model.isTimeEditable()}; } #labelH { @@ -52,7 +52,7 @@ #minuteEditor { model:{minuteModel}; - enabled:{isEnabled()}; + enabled:{isEnabled() && model.isTimeEditable()}; } #sliderHidorToolBar { @@ -75,6 +75,6 @@ majorTickSpacing:60; minorTickSpacing:30; value:{model.getTimeInMinutes()}; - enabled:{isEnabled()}; + enabled:{isEnabled() && model.isTimeEditable()}; model:{new DefaultBoundedRangeModel(0, 1, 0, 60 * 24)}; } diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx index 5948b7c..7584599 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx @@ -49,10 +49,12 @@ <script><
nuiton.org scm