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 b35193ff858343e559eca237b0028556a9cd687b Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Oct 1 14:46:53 2014 +0200 refs #3501: Introduce a new jaxx-widgets-datetime module (can show hide time editor slider) --- jaxx-widgets-datetime/pom.xml | 13 +++++++++++++ .../org/nuiton/jaxx/widgets/datetime/DateTimeEditor.css | 12 ++++++++++++ .../org/nuiton/jaxx/widgets/datetime/DateTimeEditor.jaxx | 7 ++++++- .../nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java | 1 + .../resources/i18n/jaxx-widgets-datetime_en_GB.properties | 2 ++ .../resources/i18n/jaxx-widgets-datetime_es_ES.properties | 2 ++ .../resources/i18n/jaxx-widgets-datetime_fr_FR.properties | 2 ++ 7 files changed, 38 insertions(+), 1 deletion(-) diff --git a/jaxx-widgets-datetime/pom.xml b/jaxx-widgets-datetime/pom.xml index b0194a2..560ebbd 100644 --- a/jaxx-widgets-datetime/pom.xml +++ b/jaxx-widgets-datetime/pom.xml @@ -65,6 +65,12 @@ </dependency> <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${project.version}</version> + </dependency> + + <dependency> <groupId>org.swinglabs.swingx</groupId> <artifactId>swingx-common</artifactId> </dependency> @@ -132,6 +138,13 @@ </goals> </execution> </executions> + <dependencies> + <dependency> + <groupId>${project.groupId}</groupId> + <artifactId>jaxx-widgets</artifactId> + <version>${project.version}</version> + </dependency> + </dependencies> </plugin> <plugin> 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 82e8ab1..e8d57b2 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 @@ -55,6 +55,18 @@ enabled:{isEnabled()}; } +#sliderHidorToolBar { + borderPainted:false; + floatable:false; + opaque:false; +} + +#sliderHidor { + target:{slider}; + showTip:{t("datetimeeditor.show.slider")}; + hideTip:{t("datetimeeditor.hide.slider")}; +} + #slider { font-size: 11; paintTicks:true; 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 b95d5f1..13395be 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 @@ -27,7 +27,8 @@ java.util.Date java.io.Serializable java.awt.BorderLayout - javax.swing.SpinnerNumberModel + + jaxx.runtime.swing.HidorButton javax.swing.DefaultBoundedRangeModel org.jdesktop.swingx.JXDatePicker @@ -53,6 +54,7 @@ public void setDate(Date date) { model.setDate(date); } public void setDateFormat(String dateFormat) { dayDateEditor.setFormats(dateFormat); } public void setLabel(String label) { dateTimeLabel.setText(label); } +public void setShowTimeEditorSlider(boolean showTimeEditorSlider) { sliderHidor.setTargetVisible(showTimeEditorSlider); } ]]> </script> @@ -71,6 +73,9 @@ public void setLabel(String label) { dateTimeLabel.setText(label); } <JLabel id='labelH'/> <JSpinner id='minuteEditor' onStateChanged='handler.setMinutes((Date)((JSpinner)event.getSource()).getValue())'/> </JPanel> + <JToolBar id="sliderHidorToolBar"> + <HidorButton id='sliderHidor'/> + </JToolBar> </JPanel> </JPanel> diff --git a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java index 4780196..63e4538 100644 --- a/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java +++ b/jaxx-widgets-datetime/src/main/java/org/nuiton/jaxx/widgets/datetime/DateTimeEditorHandler.java @@ -23,6 +23,7 @@ package org.nuiton.jaxx.widgets.datetime; */ import com.google.common.base.Preconditions; +import jaxx.runtime.JAXXUtil; import jaxx.runtime.spi.UIHandler; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; diff --git a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_en_GB.properties b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_en_GB.properties index 43875f0..bd1a16f 100644 --- a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_en_GB.properties +++ b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_en_GB.properties @@ -1 +1,3 @@ +datetimeeditor.hide.slider=hide time editor slider +datetimeeditor.show.slider=show time editor slider timeeditor.H= diff --git a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_es_ES.properties b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_es_ES.properties index 43875f0..8a9ee97 100644 --- a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_es_ES.properties +++ b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_es_ES.properties @@ -1 +1,3 @@ +datetimeeditor.hide.slider= +datetimeeditor.show.slider= timeeditor.H= diff --git a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_fr_FR.properties b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_fr_FR.properties index 43875f0..b973d7c 100644 --- a/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_fr_FR.properties +++ b/jaxx-widgets-datetime/src/main/resources/i18n/jaxx-widgets-datetime_fr_FR.properties @@ -1 +1,3 @@ +datetimeeditor.hide.slider=Cacher la réglette d'édition des heures +datetimeeditor.show.slider=Voir la réglette d'édition des heures timeeditor.H= -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.