This is an automated email from the git hooks/post-receive script. New commit to branch feature/ajout_option_ne_pas_lire_unite in repository tutti. See http://git.codelutin.com/tutti.git commit b74029132b289b1d9189aafba1e21b2f452745c0 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Feb 3 16:59:18 2016 +0100 Ajout de l'option dans la configuration pour dicter ou non les unités (See #7948) --- .../src/main/java/fr/ifremer/tutti/TuttiConfiguration.java | 4 ++++ .../src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java | 7 +++++++ .../src/main/resources/i18n/tutti-persistence_fr_FR.properties | 1 + .../tutti/ui/swing/content/config/TuttiConfigUIHandler.java | 4 ++++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 1 + 5 files changed, 17 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 9b8a955..ae2042c 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -740,6 +740,10 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.ICHTYOMETER_VOICE_ENABLED.getKey()); } + public Boolean isIchtyometerSaysUnit() { + return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.ICHTYOMETER_SAYS_UNIT.getKey()); + } + public Boolean isIchtyometerDataReceptionBeepEnabled() { return applicationConfig.getOptionAsBoolean(TuttiConfigurationOption.ICHTYOMETER_DATA_RECEPTION_BEEP_ENABLED.getKey()); } diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 59a3fb5..4fd3f05 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -628,6 +628,13 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { Boolean.class, false ), + ICHTYOMETER_SAYS_UNIT( + "tutti.ichtyometer.says.unit", + n("tutti.config.option.ichtyometer.says.unit.description"), + "true", + Boolean.class, + false + ), ICHTYOMETER_DATA_RECEPTION_BEEP_ENABLED( "tutti.ichtyometer.beep.data.enabled", n("tutti.config.option.ichtyometer.beep.data.enabled.description"), diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index 327bb6a..296f215 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -24,6 +24,7 @@ tutti.config.option.ichtyometer.beep.error.frequency.description=Tonalité du bi tutti.config.option.ichtyometer.fullBluetoothScan.description=Pour toujours effectuer une recherche complète des périphériques bluetooth lors de la recherche d'un ichtyomètre tutti.config.option.ichtyometer.maximumNumberOfAttemptToConnect.description=Nombre maximum de de tentatives de connection à l'ichtyomètre tutti.config.option.ichtyometer.voice.enabled.description=Pour activer ou non la lecture vocale des mesures reçues +tutti.config.option.ichtyometer.says.unit.description=Pour dicter l'unité à la réception d'une mesure tutti.config.option.inceptionYear.description=Année de démarrage du projet tutti.config.option.launch.mode.description=Mode de démarrage de l'application tutti.config.option.organizationName.description=Nom de l'organisation dans la licence diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index d34da89..f83d646 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -277,6 +277,10 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.ICHTYOMETER_VOICE_ENABLED) .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerVoiceEnabled.shortLabel")) + .addOption(TuttiConfigurationOption.ICHTYOMETER_SAYS_UNIT) + .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerSaysUnit.shortLabel")) + + .addOption(TuttiConfigurationOption.ICHTYOMETER_DATA_RECEPTION_BEEP_ENABLED) .setOptionShortLabel(t("tutti.config.option.ui.ichtyometerDataBeepEnabled.shortLabel")) diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index 8ce0e99..0f6a33d 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -164,6 +164,7 @@ tutti.config.option.ui.ichtyometerDataBeepFrequency.shortLabel=Tonalité de réc tutti.config.option.ui.ichtyometerErrorBeepEnabled.shortLabel=Bip à la réception d'erreur tutti.config.option.ui.ichtyometerErrorBeepFrequency.shortLabel=Tonalité de réception d'erreur tutti.config.option.ui.ichtyometerMaximumNumberOfAttemptToConnect.shortLabel=Nombre maximum de tentatives de connection à l'ichtyomètre +tutti.config.option.ui.ichtyometerSaysUnit.shortLabel=Dicter l'unité à la réception d'une mesure (utilisée unique si la lecture vocale est active) tutti.config.option.ui.ichtyometerVoiceEnabled.shortLabel=Lecture vocale des mesures reçues tutti.config.option.ui.individualObservationRowsToCreate.shortLabel=Nombre max de données individuelles tutti.config.option.ui.showBatchLog.shortLabel=Voir la structure des lots dans les logs -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.