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 49ac4c7046bcd7a374aa2b2b586e5cb673a52bcf Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Nov 30 17:22:57 2014 +0100 refs #3884 (add enable state + test it in demo) --- .../jaxx/widgets/gis/CoordinatesEditorDemo.css | 6 ++++++ .../jaxx/widgets/gis/CoordinatesEditorDemo.jaxx | 3 ++- .../main/resources/i18n/jaxx-demo_en_GB.properties | 1 + .../main/resources/i18n/jaxx-demo_es_ES.properties | 1 + .../main/resources/i18n/jaxx-demo_fr_FR.properties | 1 + .../gis/absolute/AbsoluteDdCoordinateEditor.jaxx | 4 ++-- .../gis/absolute/AbsoluteDmdCoordinateEditor.jaxx | 4 ++-- .../gis/absolute/AbsoluteDmsCoordinateEditor.jaxx | 4 ++-- .../jaxx/widgets/gis/absolute/CoordinateEditor.css | 12 ++++++------ .../jaxx/widgets/gis/absolute/CoordinatesEditor.css | 4 ++++ .../jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx | 20 ++++++++++---------- .../jaxx/widgets/gis/signed/CoordinateEditor.css | 10 +++++----- .../widgets/gis/signed/SignedDdCoordinateEditor.jaxx | 6 +++--- .../gis/signed/SignedDmdCoordinateEditor.jaxx | 4 ++-- .../gis/signed/SignedDmsCoordinateEditor.jaxx | 4 ++-- 15 files changed, 49 insertions(+), 35 deletions(-) diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css index 0cb5f05..8eba577 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.css @@ -29,6 +29,11 @@ selected: true; } +#enableButton { + text: "jaxxdemo.coordinate.enable"; + selected: true; +} + #editor { showResetButton: {showReset.isSelected()}; propertyLatitude:latitude; @@ -38,6 +43,7 @@ latitude:{model.getLatitude()}; longitude:{model.getLongitude()}; quadrant:{model.getQuadrant()}; + enabled:{enableButton.isSelected()}; } #result { diff --git a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx index f5488aa..5acda97 100644 --- a/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx +++ b/jaxx-demo/src/main/java/jaxx/demo/component/jaxx/widgets/gis/CoordinatesEditorDemo.jaxx @@ -30,8 +30,9 @@ <Table insets='0' fill='both' weightx='1' constraints='BorderLayout.NORTH'> <row> <cell> - <JPanel id='config' layout='{new GridLayout(1,0)}'> + <JPanel id='config' layout='{new GridLayout(0,1)}'> <JCheckBox id='showReset'/> + <JCheckBox id='enableButton'/> </JPanel> </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 081308b..6a7a716 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 @@ -241,6 +241,7 @@ jaxxdemo.config.ui.locale=Language used in application jaxxdemo.config.ui.logLevel=Log level jaxxdemo.config.ui.logPatternLayout=Log pattern jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.enable=Enable / Disable jaxxdemo.coordinate.latitude=Latitude jaxxdemo.coordinate.latitudeDd=Latitude (format DD) jaxxdemo.coordinate.latitudeDmd=Latitude (format DMD) 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 91539b0..6f2c6b2 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 @@ -243,6 +243,7 @@ jaxxdemo.config.ui.locale=La langue utilisée par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.enable= jaxxdemo.coordinate.latitude= jaxxdemo.coordinate.latitudeDd= jaxxdemo.coordinate.latitudeDmd= 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 8152812..12f4e42 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 @@ -241,6 +241,7 @@ jaxxdemo.config.ui.locale=La langue utilisée par l'application jaxxdemo.config.ui.logLevel=Level de log jaxxdemo.config.ui.logPatternLayout=Pattern des log jaxxdemo.context.helpPage.notFound= +jaxxdemo.coordinate.enable=Activer / Désactiver jaxxdemo.coordinate.latitude=Latitude jaxxdemo.coordinate.latitudeDd=Latitude (au format DD) jaxxdemo.coordinate.latitudeDmd=Latitude (au format DMD) diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx index c37b3ed..1c10171 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDdCoordinateEditor.jaxx @@ -48,8 +48,8 @@ public void setValue(DdCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER'/> + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled"/> </JPanel> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx index 1a0396a..fa08e7e 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmdCoordinateEditor.jaxx @@ -49,8 +49,8 @@ public void setValue(DmdCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER'/> + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled"/> </JPanel> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx index b502b1c..7029e56 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/AbsoluteDmsCoordinateEditor.jaxx @@ -49,8 +49,8 @@ public void setValue(DmsCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER'/> + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled"/> </JPanel> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css index b7d85eb..9db8326 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinateEditor.css @@ -19,6 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + +.enabled { + enabled:{isEnabled()}; +} + #toolbarLeft { floatable:false; borderPainted:false; @@ -30,9 +35,4 @@ toolTipText: {getShowResetTip()}; focusable:false; focusPainted:false; - enabled:{isEnabled()}; -} - -#editor { - enabled:{isEnabled()}; -} +} \ No newline at end of file diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css index 45465cc..9356616 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.css @@ -24,6 +24,10 @@ // Common // ---------- +.enabled { + enabled:{isEnabled()}; +} + AbsoluteDdCoordinateEditor { bean: {model}; showReset: {model.isShowResetButton()}; diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx index eae9c6b..9426f02 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/absolute/CoordinatesEditor.jaxx @@ -58,10 +58,10 @@ public void setShowResetButton(boolean showResetButton) { model.setShowResetButt <row> <cell anchor="west"> <JPanel id='quadrantEditor' layout="{new GridLayout(2,2,0,0)}"> - <JToggleButton id='quadrant4'/> - <JToggleButton id='quadrant1'/> - <JToggleButton id='quadrant3'/> - <JToggleButton id='quadrant2'/> + <JToggleButton id='quadrant4' styleClass="enabled"/> + <JToggleButton id='quadrant1' styleClass="enabled"/> + <JToggleButton id='quadrant3' styleClass="enabled"/> + <JToggleButton id='quadrant2' styleClass="enabled"/> </JPanel> </cell> <cell fill="both" weightx='1'> @@ -72,9 +72,9 @@ public void setShowResetButton(boolean showResetButton) { model.setShowResetButt </cell> <cell fill="both" weightx='1'> <JPanel id='latitudeEditor'> - <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + <AbsoluteDdCoordinateEditor id='latitudeDd' constraints='CoordinateFormat.dd.name()' styleClass="enabled"/> + <AbsoluteDmsCoordinateEditor id='latitudeDms' constraints='CoordinateFormat.dms.name()' styleClass="enabled"/> + <AbsoluteDmdCoordinateEditor id='latitudeDmd' constraints='CoordinateFormat.dmd.name()' styleClass="enabled"/> </JPanel> </cell> </row> @@ -84,9 +84,9 @@ public void setShowResetButton(boolean showResetButton) { model.setShowResetButt </cell> <cell fill="both" weightx='1'> <JPanel id='longitudeEditor'> - <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()'/> - <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()'/> - <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()'/> + <AbsoluteDdCoordinateEditor id='longitudeDd' constraints='CoordinateFormat.dd.name()' styleClass="enabled"/> + <AbsoluteDmsCoordinateEditor id='longitudeDms' constraints='CoordinateFormat.dms.name()' styleClass="enabled"/> + <AbsoluteDmdCoordinateEditor id='longitudeDmd' constraints='CoordinateFormat.dmd.name()' styleClass="enabled"/> </JPanel> </cell> </row> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css index b7d85eb..45a9228 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/CoordinateEditor.css @@ -19,6 +19,11 @@ * <http://www.gnu.org/licenses/lgpl-3.0.html>. * #L% */ + +.enabled { + enabled:{isEnabled()}; +} + #toolbarLeft { floatable:false; borderPainted:false; @@ -30,9 +35,4 @@ toolTipText: {getShowResetTip()}; focusable:false; focusPainted:false; - enabled:{isEnabled()}; -} - -#editor { - enabled:{isEnabled()}; } diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx index 528f951..74662b7 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDdCoordinateEditor.jaxx @@ -29,7 +29,7 @@ </import> <style source="CoordinateEditor.css"/> - + <!-- show reset property --> <Boolean id='showReset' javaBean='false'/> @@ -49,9 +49,9 @@ public void setValue(DdCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled" onKeyReleased='handler.onKeyReleased(event)'/> </JPanel> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx index 85bef3f..8fd058a 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmdCoordinateEditor.jaxx @@ -50,9 +50,9 @@ public void setValue(DmdCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled" onKeyReleased='handler.onKeyReleased(event)'/> </JPanel> diff --git a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx index 012aa0d..4f2a13c 100644 --- a/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx +++ b/jaxx-widgets-gis/src/main/java/org/nuiton/jaxx/widgets/gis/signed/SignedDmsCoordinateEditor.jaxx @@ -50,9 +50,9 @@ public void setValue(DmsCoordinate value) { handler.setValue(value, true); } ]]> </script> - <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST'> + <JToolBar id='toolbarLeft' constraints='BorderLayout.WEST' styleClass="enabled"> <JButton id='resetButton' onActionPerformed='handler.resetEditor()'/> </JToolBar> - <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' + <JFormattedTextField id='editor' constraints='BorderLayout.CENTER' styleClass="enabled" onKeyReleased='handler.onKeyReleased(event)'/> </JPanel> -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.