branch feature/3919-3920_numbereditor-buttons created (now 2036f69)
This is an automated email from the git hooks/post-receive script. New change to branch feature/3919-3920_numbereditor-buttons in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git at 2036f69 fix button ids (fixes #3919) This branch includes the following new commits: new 7192076 enable the 0 button if the value is not 0 (fixes #3920) new 2036f69 fix button ids (fixes #3919) The 2 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 2036f6990be18c9ddbd7919404ce4884f63f8479 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 10:09:25 2016 +0100 fix button ids (fixes #3919) commit 7192076c697ed0508a9d7bf03f0de09acd294215 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 10:09:21 2016 +0100 enable the 0 button if the value is not 0 (fixes #3920) -- 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 feature/3919-3920_numbereditor-buttons in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 7192076c697ed0508a9d7bf03f0de09acd294215 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 10:09:21 2016 +0100 enable the 0 button if the value is not 0 (fixes #3920) --- .../src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java index 6250f31..548ef36 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditorModel.java @@ -173,7 +173,7 @@ public class NumberEditorModel extends AbstractSerializableBean implements Model } public boolean isCanUseZero() { - return StringUtils.isNotBlank(textValue) && "0".equals(textValue); + return StringUtils.isNotBlank(textValue) && StringUtils.isNotBlank(textValue.replaceAll("0", "")); } public boolean isCanClearAll() { -- 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 feature/3919-3920_numbereditor-buttons in repository jaxx. See https://gitlab.nuiton.org/nuiton/jaxx.git commit 2036f6990be18c9ddbd7919404ce4884f63f8479 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 18 10:09:25 2016 +0100 fix button ids (fixes #3919) --- .../src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx | 4 ++-- .../src/main/resources/i18n/jaxx-widgets-number_en_GB.properties | 2 ++ .../src/main/resources/i18n/jaxx-widgets-number_es_ES.properties | 2 ++ .../src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties | 2 ++ 4 files changed, 8 insertions(+), 2 deletions(-) diff --git a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx index 068bb77..19cb6cb 100644 --- a/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx +++ b/jaxx-widgets-number/src/main/java/org/nuiton/jaxx/widgets/number/NumberEditor.jaxx @@ -101,7 +101,7 @@ public void setToolTipText(String toolTipText) { <JButton id='number4Button' styleClass='digit' onActionPerformed="handler.addChar('4')"/> <JButton id='number5Button' styleClass='digit' onActionPerformed="handler.addChar('5')"/> <JButton id='number6Button' styleClass='digit' onActionPerformed="handler.addChar('6')"/> - <JButton id='clearOnebutton' styleClass='clear' onActionPerformed="handler.removeChar()"/> + <JButton id='clearOneButton' styleClass='clear' onActionPerformed="handler.removeChar()"/> <JButton id='number1Button' styleClass='digit' onActionPerformed="handler.addChar('1')"/> <JButton id='number2Button' styleClass='digit' onActionPerformed="handler.addChar('2')"/> @@ -109,7 +109,7 @@ public void setToolTipText(String toolTipText) { <JButton enabled="false"/> - <JButton id='number0' styleClass='digit' onActionPerformed="handler.addChar('0')"/> + <JButton id='number0Button' styleClass='digit' onActionPerformed="handler.addChar('0')"/> <JButton id='toggleSignButton' styleClass='operator' onActionPerformed='handler.toggleSign()'/> <JButton id='dotButton' styleClass='operator' onActionPerformed="handler.addChar('.')"/> <JButton id='validateButton' onActionPerformed="handler.validate()"/> diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties index 67f8ca8..9e21690 100644 --- a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_en_GB.properties @@ -1,4 +1,5 @@ numbereditor..=. +numbereditor.0=0 numbereditor.1=1 numbereditor.2=2 numbereditor.3=3 @@ -11,4 +12,5 @@ numbereditor.9=9 numbereditor.action.reset.tip=Reset numbereditor.action.show.tip=Show numeric panel numbereditor.clearAll=C +numbereditor.clearOne=CE numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties index f8fe076..bf1b649 100644 --- a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_es_ES.properties @@ -1,4 +1,5 @@ numbereditor..=. +numbereditor.0=0 numbereditor.1=1 numbereditor.2=2 numbereditor.3=3 @@ -11,4 +12,5 @@ numbereditor.9=9 numbereditor.action.reset.tip=Reinicializar numbereditor.action.show.tip=Mostar el teclado numérico numbereditor.clearAll=C +numbereditor.clearOne=CE numbereditor.toggleSign=+/- diff --git a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties index 9a34ded..57ae4cb 100644 --- a/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties +++ b/jaxx-widgets-number/src/main/resources/i18n/jaxx-widgets-number_fr_FR.properties @@ -1,4 +1,5 @@ numbereditor..=. +numbereditor.0=0 numbereditor.1=1 numbereditor.2=2 numbereditor.3=3 @@ -11,4 +12,5 @@ numbereditor.9=9 numbereditor.action.reset.tip=Réinitialiser numbereditor.action.show.tip=Afficher le pavé numérique numbereditor.clearAll=C +numbereditor.clearOne=CE numbereditor.toggleSign=+/- -- To stop receiving notification emails like this one, please contact nuiton.org SCM administrator <admin+scm@nuiton.org>.
participants (1)
-
nuiton.org scm