This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository observe. See https://gitlab.nuiton.org/codelutin/observe.git commit 5ac26aed47643e9d5177494e353c97131a9fa580 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Oct 25 20:14:09 2016 +0200 Ajout de l'option ui.coordinate.format (CoordinateFormat) --- application-swing-configuration/pom.xml | 4 ++++ .../src/main/config/ObserveSwingApplication.ini | 6 ++++++ .../resources/i18n/application-swing-configuration_en_GB.properties | 1 + .../resources/i18n/application-swing-configuration_es_ES.properties | 1 + .../resources/i18n/application-swing-configuration_fr_FR.properties | 1 + .../ird/observe/application/swing/ui/actions/ShowConfigAction.java | 3 ++- 6 files changed, 15 insertions(+), 1 deletion(-) diff --git a/application-swing-configuration/pom.xml b/application-swing-configuration/pom.xml index 2140dac..bc087d1 100644 --- a/application-swing-configuration/pom.xml +++ b/application-swing-configuration/pom.xml @@ -74,6 +74,10 @@ <groupId>org.nuiton</groupId> <artifactId>nuiton-config</artifactId> </dependency> + <dependency> + <groupId>org.nuiton.jaxx</groupId> + <artifactId>jaxx-widgets-gis</artifactId> + </dependency> </dependencies> diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini index b1d0db5..34e1816 100644 --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -471,6 +471,12 @@ key = backup.delay type = Integer defaultValue = 30 +[option coordinateFormat] +description = observe.config.coordinate.format +key = ui.coordinate.format +type = org.nuiton.jaxx.widgets.gis.CoordinateFormat +defaultValue = "dmd" + [action help] description = observe.action.commandline.help action = "fr.ird.observe.application.swing.ObserveCLAction#help" diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties index a027ae7..11ed12d 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_en_GB.properties @@ -12,6 +12,7 @@ observe.config.backup.atClose=Perform a backup of local source when closing appl observe.config.backup.delay=Delay in minutes between local data source backup observe.config.backup.use=To activate auto backup of local source observe.config.configFileName.description=Configuration filename +observe.config.coordinate.format=Position format (DMD, DD, DMS) observe.config.db.locale=Language of data source observe.config.defaultBackupDirectory.description=Default directory where are stored backup of data sources observe.config.defaultCreationMode=Default creation mode of new local data source diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties index e44536f..98e5260 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_es_ES.properties @@ -12,6 +12,7 @@ observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la f observe.config.backup.delay=Delay in minutes between local data source backup \#TODO observe.config.backup.use=To activate auto backup of local source \#TODO observe.config.configFileName.description=Nombre del archivo de configuración +observe.config.coordinate.format=Position format (DMD, DD, DMS) \#TODO observe.config.db.locale=Idioma del referencial observe.config.defaultBackupDirectory.description=Carpeta por defecto para copia de seguridad de bases locales observe.config.defaultCreationMode=Modo de creación de la base local por defecto diff --git a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties index 13d83c7..9ab7026 100644 --- a/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties +++ b/application-swing-configuration/src/main/resources/i18n/application-swing-configuration_fr_FR.properties @@ -12,6 +12,7 @@ observe.config.backup.atClose=Effectuer une sauvegarde de la base locale à la f observe.config.backup.delay=Temps en minutes entre chaque sauvegarde de la base locale observe.config.backup.use=Pour activer la sauvegarde automatique observe.config.configFileName.description=Le nom du fichier de configuration +observe.config.coordinate.format=Format des positions (DMD, DD, DMS) observe.config.db.locale=La langue du référentiel observe.config.defaultBackupDirectory.description=Répertoire par défaut où sauvegarder les bases locales observe.config.defaultCreationMode=Le mode de création de base locale par défaut diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java index b9f0530..dba3337 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/ShowConfigAction.java @@ -177,13 +177,14 @@ public class ShowConfigAction extends AbstractAction { helper.addOption(ObserveSwingApplicationConfigOption.SHOW_NUMBER_EDITOR_BUTTON); helper.addOption(ObserveSwingApplicationConfigOption.AUTO_POPUP_NUMBER_EDITOR); helper.addOption(ObserveSwingApplicationConfigOption.SHOW_DATE_TIME_EDITOR_SLIDER); + helper.addOption(ObserveSwingApplicationConfigOption.COORDINATE_FORMAT); helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_DB_MODE); helper.addOption(ObserveSwingApplicationConfigOption.DEFAULT_CREATION_MODE); helper.addOption(ObserveSwingApplicationConfigOption.STORE_REMOTE_STORAGE); helper.addOption(ObserveSwingApplicationConfigOption.MAP_BACKGROUND_COLOR); - ObserveSwingApplicationConfigOption.MAP_LAYERS.forEach(helper::addOption); + ObserveSwingApplicationConfig.MAP_LAYERS.forEach(helper::addOption); helper.addOption(ObserveSwingApplicationConfigOption.MAP_STYLE_FILE); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.