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 3a968fac72881bd570e0d5b9af9e3a776fbe1a02 Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 09:12:44 2016 +0100 Ajout raccourci clavier dans la description de sélection --- .../java/fr/ird/observe/application/swing/ui/MnemonicHelper.java | 9 +++++++++ .../application/swing/ui/storage/tabs/SelectDataUIHandler.java | 5 ++++- .../application/swing/ui/tree/selection/SelectionTree.java | 7 +++---- 3 files changed, 16 insertions(+), 5 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java index dcad18d..607cfc0 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java @@ -56,6 +56,7 @@ public class MnemonicHelper { public static final KeyStroke KEY_STROKE_STORAGE_DO_USE_SSL = KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_CHOOSE_FILE = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); + public static final KeyStroke KEY_STROKE_ENTER = KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0); private static String keyStrokeToStr(KeyStroke actionKey) { String result = ""; @@ -99,6 +100,14 @@ public class MnemonicHelper { action.putValue(SHORT_DESCRIPTION, t(shortDescription) + acceleratorStr); } + public static String addKeyStroke3(String text, KeyStroke keyStroke) { + boolean showMnemonic = isShowMnemonic(); + if (showMnemonic) { + text += keyStrokeToStr(keyStroke); + } + return text; + } + public static void addKeyStroke2(AbstractButton editor, KeyStroke keyStroke) { String tip = (String) editor.getClientProperty("toolTipText"); boolean showMnemonic = isShowMnemonic(); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java index c00143c..a6fe06a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/SelectDataUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.storage.tabs; * #L% */ +import fr.ird.observe.application.swing.ui.MnemonicHelper; import jaxx.runtime.spi.UIHandler; import static org.nuiton.i18n.I18n.t; @@ -37,7 +38,9 @@ public class SelectDataUIHandler extends StorageTabUIHandler<SelectDataUI> imple @Override public void afterInit(SelectDataUI ui) { if (ui.getStep() != null) { - ui.setDescriptionText(t(ui.getStep().getDescription())); + String description = t(ui.getStep().getDescription()); + description = MnemonicHelper.addKeyStroke3(description, MnemonicHelper.KEY_STROKE_ENTER); + ui.setDescriptionText(description); } ui.getSelectTree().installUI(); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java index 1a44b26..e19438d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/tree/selection/SelectionTree.java @@ -22,16 +22,15 @@ package fr.ird.observe.application.swing.ui.tree.selection; * #L% */ +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.tree.selection.nodes.SelectionTreeNodeSupport; import org.jdesktop.swingx.JXTree; import javax.swing.AbstractAction; import javax.swing.ActionMap; import javax.swing.InputMap; -import javax.swing.KeyStroke; import javax.swing.ListSelectionModel; import java.awt.event.ActionEvent; -import java.awt.event.KeyEvent; /** * Created on 14/11/16. @@ -55,7 +54,7 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "select/unselect"); + inputMap.put(MnemonicHelper.KEY_STROKE_ENTER, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { @Override public void actionPerformed(ActionEvent e) { @@ -75,7 +74,7 @@ public class SelectionTree extends JXTree { InputMap inputMap = getInputMap(WHEN_IN_FOCUSED_WINDOW); ActionMap actionMap = getActionMap(); - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ENTER, 0), "select/unselect"); + inputMap.put(MnemonicHelper.KEY_STROKE_ENTER, "select/unselect"); actionMap.put("select/unselect", new AbstractAction() { protected void forTree(SelectionTree tree) { -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.

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 3684d560a5b2aac290c94f57631a1bdfab791ade Author: Tony CHEMIT <chemit@codelutin.com> Date: Sun Dec 18 12:36:58 2016 +0100 Suppression des anciennes options de configuration liées à la sauvegarde des connexions (Refs #8555) --- .../src/main/config/ObserveSwingApplication.ini | 47 ---------------------- .../ObserveSwingApplicationConfig.java | 5 --- ...pplication-swing-configuration_en_GB.properties | 8 ---- ...pplication-swing-configuration_es_ES.properties | 8 ---- ...pplication-swing-configuration_fr_FR.properties | 8 ---- .../ObserveSwingApplicationDataSourcesManager.java | 16 ++++---- .../application/swing/ui/MnemonicHelper.java | 1 - .../ui/actions/menu/config/ShowConfigAction.java | 8 ---- .../SaveCurrentRemoteConfigurationUIAction.java | 15 ++++--- .../SaveCurrentServerConfigurationUIAction.java | 18 ++++----- .../storage/UseRemoteConfigurationUIAction.java | 5 +-- .../storage/UseServerConfigurationUIAction.java | 5 +-- .../swing/ui/storage/StorageUIHandler.java | 43 -------------------- .../swing/ui/storage/StorageUIModel.java | 14 ------- .../swing/ui/storage/tabs/ConfigUI.jaxx | 7 ---- .../swing/ui/storage/tabs/ConfigUI.jcss | 6 --- .../swing/ui/storage/tabs/ConfigUIHandler.java | 12 ------ .../i18n/application-swing_en_GB.properties | 26 +----------- .../i18n/application-swing_es_ES.properties | 26 +----------- .../i18n/application-swing_fr_FR.properties | 26 +----------- 20 files changed, 33 insertions(+), 271 deletions(-) diff --git a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini index 332a225..c9f9e77 100644 --- a/application-swing-configuration/src/main/config/ObserveSwingApplication.ini +++ b/application-swing-configuration/src/main/config/ObserveSwingApplication.ini @@ -162,59 +162,12 @@ description = observe.config.serverDataSourceConfigurations.description key = serverDataSourceConfigurations type = fr.ird.observe.application.swing.configuration.ServerDataSourceConfiguration[] -[option obstunaUrl] -description = observe.config.obstuna.url.description -key = obstuna.url -type = string -defaultValue = jdbc:postgresql:///obstuna - -[option obstunaLogin] -description = observe.config.obstuna.login.description -key = obstuna.username -type = string -defaultValue = utilisateur - -[option obstunaPassword] -description = observe.config.obstuna.password.description -key = obstuna.password -type = string -defaultValue = -transient = true - -[option obstunaUseSslCert] -description = observe.config.obstuna.useSsl.description -key = obstuna.useSsl -type = Boolean -defaultValue = false - [option obstunaCanMigrate] description = observe.config.pg.can.migrate.description key = pg.canMigrate type = Boolean defaultValue = false -[option serverUrl] -description = observe.config.server.url.description -key = server.url -type = url - -[option serverLogin] -description = observe.config.server.login.description -key = server.login -type = string -defaultValue = - -[option serverPassword] -description = observe.config.server.password.description -key = server.password -type = string -defaultValue = - -[option serverDatabaseName] -description = observe.config.server.dataBaseName.description -key = server.dataBaseName -type = string - [option defaultDbMode] description = observe.config.defaultDbMode key = defaultDbMode diff --git a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java index 753a194..c6ed6cd 100644 --- a/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java +++ b/application-swing-configuration/src/main/java/fr/ird/observe/application/swing/configuration/ObserveSwingApplicationConfig.java @@ -187,11 +187,6 @@ public class ObserveSwingApplicationConfig extends GeneratedObserveSwingApplicat applicationConfig.parse(args); - //Fixes https://forge.codelutin.com/issues/8556 - if ("null".equals(getServerDatabaseName())) { - setServerDatabaseName(""); - saveForUser(); - } } @Override 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 b6bfcef..288f4f4 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 @@ -53,16 +53,8 @@ observe.config.observation.mammiferes=Observation of mammals observe.config.observation.mensurations=Observation of mensurations observe.config.observation.oiseaux=Observation of birds observe.config.observation.rejetsThons=Observation of discarded target catch -observe.config.obstuna.login.description=Remote login -observe.config.obstuna.password.description=Remote password -observe.config.obstuna.url.description=URL of remote data source -observe.config.obstuna.useSsl.description=Flag sets to true when your are using remote with ssl observe.config.pg.can.migrate.description=Flat sets to true when you can migrate remote data sources observe.config.remoteDataSourceConfigurations.description=Remote data source configurations -observe.config.server.dataBaseName.description=Optional name of database name on server -observe.config.server.login.description=Server login -observe.config.server.password.description=Server password -observe.config.server.url.description=Server url observe.config.serverDataSourceConfigurations.description=Server data source configurations observe.config.showMigrationProgression=Show migration progression observe.config.showMigrationSql=Show migration sql queries 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 496295e..69fa8b9 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 @@ -53,16 +53,8 @@ observe.config.observation.mammiferes=Observación de mamiferos observe.config.observation.mensurations=Observación de mendiciones observe.config.observation.oiseaux=Observaciones de pájaros observe.config.observation.rejetsThons=Observación de descartes de atún -observe.config.obstuna.login.description=Nombre de usuario para conectarse a la base Obstuna -observe.config.obstuna.password.description=Contraseña para conectarse a la base Obstuna -observe.config.obstuna.url.description=Url de conexión a la base Obstuna -observe.config.obstuna.useSsl.description=Bandera para permitir la utilización del modo ssl para la conexión a Obstuna observe.config.pg.can.migrate.description=Autorizar la actualización de las bases remotas (debe ser el propietario de la base) observe.config.remoteDataSourceConfigurations.description=Configuration de bases distantes \#TODO -observe.config.server.dataBaseName.description=El nombre opcinal de la base de referencia sobre el servidor -observe.config.server.login.description=Identificador del usuario -observe.config.server.password.description=La contraseña del usuario -observe.config.server.url.description=La dirección (url) del servidor observe.config.serverDataSourceConfigurations.description=Configurations de serveurs distants \#TODO observe.config.showMigrationProgression=Mostar los logs de actualización de una base de datos observe.config.showMigrationSql=Mostrar en los logs las consultas realizadas durante la actualización de una base de datos 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 4e368f3..a600367 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 @@ -53,16 +53,8 @@ observe.config.observation.mammiferes=Observation des mammifères observe.config.observation.mensurations=Observation des mensurations observe.config.observation.oiseaux=Observation des oiseaux observe.config.observation.rejetsThons=Observation des rejets thon -observe.config.obstuna.login.description=Le nom d'utilisateur pour se connecter à la base Obstuna -observe.config.obstuna.password.description=Le mote de passe pour se connecter à la base Obstuna -observe.config.obstuna.url.description=L'url de connexion à la base Obstuna -observe.config.obstuna.useSsl.description=Drapeau pour permettre l'utilisation du mode ssl pour la connexion à Obstuna observe.config.pg.can.migrate.description=Autoriser la mise à jour des bases distantes (il faut être propriétaire de la base) observe.config.remoteDataSourceConfigurations.description=Configurations de bases distantes -observe.config.server.dataBaseName.description=Le nom optionel de la base cible sur le serveur -observe.config.server.login.description=Identifiant de l'utilisateur -observe.config.server.password.description=Le mot de passe de l'utilisateur -observe.config.server.url.description=L'url du serveur observe.config.serverDataSourceConfigurations.description=Configuration de serveurs distants observe.config.showMigrationProgression=Afficher dans les logs la progression de la mise à jour d'une base observe.config.showMigrationSql=Afficher dans les logs les requêtes jouées lors de la mise à jour d'une base diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java index 9643249..90bec57 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ObserveSwingApplicationDataSourcesManager.java @@ -184,10 +184,10 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { return configurationMainFactory.createObserveDataSourceConfigurationTopiaPG( label, - config.getObstunaUrl(), - config.getObstunaLogin(), - config.getObstunaPassword().toCharArray(), - config.isObstunaUseSslCert(), + null, + null, + new char[0], + false, config.isShowMigrationProgression(), config.isShowMigrationSql(), config.getModelVersion() @@ -200,10 +200,10 @@ public class ObserveSwingApplicationDataSourcesManager implements Closeable { return configurationMainFactory.createObserveDataSourceConfigurationRest( label, - config.getServerUrl(), - config.getServerLogin(), - config.getServerPassword().toCharArray(), - config.getServerDatabaseName(), + null, + null, + new char[0], + null, config.getModelVersion() ); } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java index 607cfc0..9675d77 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/MnemonicHelper.java @@ -52,7 +52,6 @@ public class MnemonicHelper { public static final KeyStroke KEY_STROKE_STORAGE_DO_CONFIGURE_REMOTE_SERVER = KeyStroke.getKeyStroke(KeyEvent.VK_R, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_BACKUP = KeyStroke.getKeyStroke(KeyEvent.VK_S, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_CHOOSE_DIRECTORY = KeyStroke.getKeyStroke(KeyEvent.VK_D, InputEvent.CTRL_MASK); - public static final KeyStroke KEY_STROKE_STORAGE_KEEP_CONFIGURATION = KeyStroke.getKeyStroke(KeyEvent.VK_K, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_USE_SSL = KeyStroke.getKeyStroke(KeyEvent.VK_U, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_STORAGE_DO_CHOOSE_FILE = KeyStroke.getKeyStroke(KeyEvent.VK_F, InputEvent.CTRL_MASK); public static final KeyStroke KEY_STROKE_ESCAPE = KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java index a5be9e4..b0a9a91 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/menu/config/ShowConfigAction.java @@ -154,14 +154,6 @@ public class ShowConfigAction extends AbstractUIAction { helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_SPEED_MAX_VALUE); helper.addOption(ObserveSwingApplicationConfigOption.VALIDATION_LENGTH_WEIGHT_ENABLE); - helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_URL); - helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_LOGIN); - helper.addOption(ObserveSwingApplicationConfigOption.OBSTUNA_USE_SSL_CERT); - - helper.addOption(ObserveSwingApplicationConfigOption.SERVER_URL); - helper.addOption(ObserveSwingApplicationConfigOption.SERVER_LOGIN); - helper.addOption(ObserveSwingApplicationConfigOption.SERVER_DATABASE_NAME); - } protected void addUiOptions(ObserveConfigUIBuilder helper) { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java index 9f1071e..12b9396 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentRemoteConfigurationUIAction.java @@ -49,30 +49,30 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { panel.setLayout(new GridLayout(0, 2)); JTextField question = new JTextField(); - panel.add(new JLabel("Nom de la connexion")); + panel.add(new JLabel(t("observe.storage.remote.configuration.name"))); panel.add(question); - panel.add(new JLabel("Url")); + panel.add(new JLabel(t("observe.storage.remote.url"))); JTextField url = new JTextField(model.getRemoteUrl()); url.setEditable(false); panel.add(url); - panel.add(new JLabel("Login")); + panel.add(new JLabel(t("observe.storage.remote.login"))); JTextField login = new JTextField(model.getRemoteLogin()); login.setEditable(false); panel.add(login); - panel.add(new JLabel("Mot de passe")); + panel.add(new JLabel(t("observe.storage.remote.password"))); JTextField password = new JTextField(new String(model.getRemotePassword())); password.setEditable(false); panel.add(password); - JCheckBox databaseName = new JCheckBox("Utilisation SSL", model.isUseSsl()); + JCheckBox databaseName = new JCheckBox(t("observe.storage.remote.useSll"), model.isUseSsl()); databaseName.setEnabled(false); panel.add(databaseName); - question.setPreferredSize(new Dimension(200, 30)); - int response = UIHelper.askUser(getMainUI(), "Enregistrement de la configuration", panel, JOptionPane.QUESTION_MESSAGE, new String[]{ + question.setPreferredSize(new Dimension(300, 30)); + int response = UIHelper.askUser(getMainUI(), t("observe.storage.remote.configuration.save.title"), panel, JOptionPane.QUESTION_MESSAGE, new String[]{ t("observe.action.save"), t("observe.action.cancel") }, 0); @@ -87,7 +87,6 @@ public class SaveCurrentRemoteConfigurationUIAction extends AbstractUIAction { if (log.isInfoEnabled()) { log.info("Will add remote configuration: " + configurationName); } - getMainUI().getStatus().setStatus("Ajout de la configuration " + configurationName); RemoteDataSourceConfiguration configuration = new RemoteDataSourceConfiguration(); configuration.setName(configurationName); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java index adf9b17..10a741d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/SaveCurrentServerConfigurationUIAction.java @@ -48,31 +48,31 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { panel.setLayout(new GridLayout(0, 2)); JTextField question = new JTextField(); - panel.add(new JLabel("Nom de la connexion")); + panel.add(new JLabel(t("observe.storage.remote.configuration.name"))); panel.add(question); - panel.add(new JLabel("Url")); + panel.add(new JLabel(t("observe.storage.remote.url"))); JTextField url = new JTextField(model.getRemoteUrl()); url.setEditable(false); panel.add(url); - panel.add(new JLabel("Login")); + panel.add(new JLabel(t("observe.storage.remote.login"))); JTextField login = new JTextField(model.getRemoteLogin()); login.setEditable(false); panel.add(login); - panel.add(new JLabel("Mot de passe")); + panel.add(new JLabel(t("observe.storage.remote.password"))); JTextField password = new JTextField(new String(model.getRemotePassword())); password.setEditable(false); panel.add(password); - panel.add(new JLabel("Nom de la base")); + panel.add(new JLabel(t("observe.storage.server.dataBase"))); JTextField databaseName = new JTextField(model.getServerDatabase()); databaseName.setEditable(false); panel.add(databaseName); - question.setPreferredSize(new Dimension(200, 30)); - int response = UIHelper.askUser(getMainUI(), "Enregistrement de la configuration", panel, JOptionPane.QUESTION_MESSAGE, new String[]{ + question.setPreferredSize(new Dimension(300, 30)); + int response = UIHelper.askUser(getMainUI(), t("observe.storage.remote.configuration.save.title"), panel, JOptionPane.QUESTION_MESSAGE, new String[]{ t("observe.action.save"), t("observe.action.cancel") }, 0); @@ -85,10 +85,8 @@ public class SaveCurrentServerConfigurationUIAction extends AbstractUIAction { return; } if (log.isInfoEnabled()) { - log.info("Will add remote configuration: " + configurationName); + log.info("Will add server configuration: " + configurationName); } - getMainUI().getStatus().setStatus("Ajout de la configuration " + configurationName); - ServerDataSourceConfiguration configuration = new ServerDataSourceConfiguration(); configuration.setName(configurationName); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java index d0e1c58..954e73e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseRemoteConfigurationUIAction.java @@ -48,12 +48,11 @@ public class UseRemoteConfigurationUIAction extends AbstractUIAction { model.setRemotePassword(configuration.getPassword().toCharArray()); model.setUseSsl(configuration.isUseSsl()); + configUI.getTestRemoteAction().requestFocusInWindow(); StorageUI parentContainer = configUI.getParentContainer(StorageUI.class); SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); - if (ConnexionStatus.FAILED == configUI.getModel().getConnexionStatus()) { - configUI.getRemoteUrl().requestFocusInWindow(); - } else { + if (ConnexionStatus.SUCCESS== configUI.getModel().getConnexionStatus()) { parentContainer.getNextAction().requestFocusInWindow(); } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java index ff37bad..ac29458 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/actions/storage/UseServerConfigurationUIAction.java @@ -49,12 +49,11 @@ public class UseServerConfigurationUIAction extends AbstractUIAction { model.setServerDatabase(configuration.getDatabaseName()); StorageUI parentContainer = configUI.getParentContainer(StorageUI.class); + configUI.getTestRemoteAction().requestFocusInWindow(); SwingUtilities.invokeLater(() -> { configUI.getTestRemoteAction().doClick(); - if (ConnexionStatus.FAILED == configUI.getModel().getConnexionStatus()) { - configUI.getRemoteUrl().requestFocusInWindow(); - } else { + if (ConnexionStatus.SUCCESS == configUI.getModel().getConnexionStatus()) { parentContainer.getNextAction().requestFocusInWindow(); } }); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java index f636b87..c5dd262 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIHandler.java @@ -535,10 +535,6 @@ public class StorageUIHandler implements UIHandler<StorageUI> { log.info(">>> main storage opened " + currentDataSource.getLabel()); } - if (model.isStoreRemoteConfig()) { - storeRemoteConfig(model); - } - } catch (Exception ex) { UIHelper.handlingError(ex); throw new RuntimeException(ex); @@ -548,45 +544,6 @@ public class StorageUIHandler implements UIHandler<StorageUI> { } /** - * Sauvegarder dans la configuration de l'application le paramétrage de la - * source de données distante donnée. - * - * @param model le model de la source de données - */ - public void storeRemoteConfig(StorageUIModel model) { - - ObserveSwingApplicationConfig config = ObserveSwingApplicationContext.get().getConfig(); - - // on sauvegarde dans le parametrage dans la configuration de l'application - - if (model.isEditRemoteConfig()) { - - ObserveDataSourceConfigurationTopiaPG configurationTopiaPG = model.toPGStorageConfig(""); - - config.setObstunaUrl(configurationTopiaPG.getJdbcUrl()); - config.setObstunaLogin(configurationTopiaPG.getUsername()); - config.setObstunaPassword(new String(configurationTopiaPG.getPassword())); - config.setObstunaUseSslCert(configurationTopiaPG.isUseSsl()); - config.setShowMigrationProgression(configurationTopiaPG.isShowMigrationProgression()); - config.setShowMigrationSql(configurationTopiaPG.isShowMigrationSql()); - - config.saveForUser(); - - } else if (model.isEditServerConfig()) { - - ObserveDataSourceConfigurationRest configurationRest = model.toRestStorageConfig(""); - - config.setServerUrl(configurationRest.getServerUrl()); - config.setServerLogin(configurationRest.getLogin()); - config.setServerPassword(new String(configurationRest.getPassword())); - config.setServerDatabaseName(configurationRest.getOptionalDatabaseName().orElse("")); - - config.saveForUser(); - - } - } - - /** * Effectue une sauvegarde de la base locale vers le fichier choisi. * * @param dumpProducerService le service de dump diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java index 2cc05dc..a4daee1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/StorageUIModel.java @@ -113,8 +113,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { public static final String REMOTE_PASSWORD_PROPERTY_NAME = "remotePassword"; - public static final String STORE_REMOTE_CONFIG_PROPERTY_NAME = "storeRemoteConfig"; - public static final String CONNEXION_STATUS_PROPERTY_NAME = "connexionStatus"; public static final String PREVIOUS_SERVICE_PROPERTY_NAME = "previousSource"; @@ -367,7 +365,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { log.debug("previous service ? " + source); } - setStoreRemoteConfig(config.isStoreRemoteStorage()); setBackupFile(config.newBackupDataFile()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); @@ -456,7 +453,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { boolean isLocalStorageExist = config.isLocalStorageExist(); setLocalStorageExist(isLocalStorageExist); - setStoreRemoteConfig(config.isStoreRemoteStorage()); setBackupFile(config.newBackupDataFile()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); @@ -524,7 +520,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { log.debug("can use server storage ? " + isCanUseServerService()); } - setStoreRemoteConfig(config.isStoreRemoteStorage()); setDumpFile(config.getBackupDirectory()); setShowMigrationProgression(config.isShowMigrationProgression()); setShowMigrationSql(config.isShowMigrationSql()); @@ -672,7 +667,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { firePropertyChange(CONNEXION_STATUS_PROPERTY_NAME, getConnexionStatus()); firePropertyChange(PREVIOUS_SERVICE_PROPERTY_NAME, getPreviousDataSourceConfiguration()); firePropertyChange(LOCAL_STORAGE_EXIST_PROPERTY_NAME, isLocalStorageExist()); - firePropertyChange(STORE_REMOTE_CONFIG_PROPERTY_NAME, isStoreRemoteConfig()); firePropertyChange(REMOTE_URL_ROPERTY_NAME, getRemoteUrl()); firePropertyChange(REMOTE_LOGIN_ROPERTY_NAME, getRemoteLogin()); firePropertyChange(REMOTE_PASSWORD_PROPERTY_NAME, getRemotePassword()); @@ -1209,13 +1203,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { validate(); } - public void setStoreRemoteConfig(boolean storeRemoteConfig) { - boolean oldValue = this.storeRemoteConfig; - this.storeRemoteConfig = storeRemoteConfig; - firePropertyChange(STORE_REMOTE_CONFIG_PROPERTY_NAME, oldValue, - storeRemoteConfig); - } - public void setDoBackup(boolean doBackup) { boolean oldValue = this.doBackup; this.doBackup = doBackup; @@ -1608,7 +1595,6 @@ public class StorageUIModel extends WizardModel<StorageStep> { dst.setLocalStorageExist(isLocalStorageExist()); dst.setBackupFile(getBackupFile()); dst.setDoBackup(isDoBackup()); - dst.setStoreRemoteConfig(isStoreRemoteConfig()); dst.setPreviousDataSourceConfiguration(getPreviousDataSourceConfiguration()); dst.setCanCreateLocalService(isCanCreateLocalService()); dst.setCanUseLocalService(isCanUseLocalService()); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx index 9c8c984..50ec86b 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jaxx @@ -191,13 +191,6 @@ </cell> </row> - <!-- sauver dans la configuration --> - <row> - <cell columns='2'> - <JCheckBox id="storeRemoteConfig" - onActionPerformed='getModel().setStoreRemoteConfig(((JCheckBox)event.getSource()).isSelected())'/> - </cell> - </row> <!-- tester la connexion --> <row> <cell columns='2'> diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss index 6a707c3..5c5e350 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUI.jcss @@ -146,12 +146,6 @@ JMenu { _failedIcon:{SwingUtil.getUIManagerActionIcon("connect_no")}; } -#storeRemoteConfig { - text:"observe.storage.store.remote.config"; - toolTipText:"observe.storage.store.remote.config.tip"; - selected:{model.isStoreRemoteConfig()}; -} - #serverMenu { text:"observe.storage.serverConfiguration.presets"; actionIcon:db-server; diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java index 77382c3..84cc380 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/tabs/ConfigUIHandler.java @@ -70,7 +70,6 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public static final String ACTION_DO_CHOOSE_FILE = "doChooseFile"; public static final String ACTION_DO_USE_SSL = "doUseSsl"; - public static final String ACTION_DO_KEEP_CONFIGURATION = "doKeepConfiguration"; @Override public void afterInit(ConfigUI ui) { @@ -121,17 +120,6 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_DO_USE_SSL, ACTION_DO_USE_SSL); MnemonicHelper.addKeyStroke(ui.getRemoteUseSsl(), MnemonicHelper.KEY_STROKE_STORAGE_DO_USE_SSL); - actionMap.put(ACTION_DO_KEEP_CONFIGURATION, new AbstractAction() { - @Override - public void actionPerformed(ActionEvent e) { - if (StorageStep.CONFIG == ui.getModel().getStep()) { - ui.getStoreRemoteConfig().doClick(); - } - } - }); - ui.getInputMap(WHEN_IN_FOCUSED_WINDOW).put(MnemonicHelper.KEY_STROKE_STORAGE_KEEP_CONFIGURATION, ACTION_DO_KEEP_CONFIGURATION); - MnemonicHelper.addKeyStroke(ui.getStoreRemoteConfig(), MnemonicHelper.KEY_STROKE_STORAGE_KEEP_CONFIGURATION); - ObserveActionMap observeActionMap = ObserveSwingApplicationContext.get().getMainUI().getObserveActionMap(); init(observeActionMap, ui.getSaveRemoteConfiguration()); init(observeActionMap, ui.getSaveServerConfiguration()); diff --git a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties index e65d73f..6c175be 100644 --- a/application-swing/src/main/resources/i18n/application-swing_en_GB.properties +++ b/application-swing/src/main/resources/i18n/application-swing_en_GB.properties @@ -17,7 +17,6 @@ observe.action.auto.copy.to.clipboard.tip=Copy automaticly in clipboard with rep observe.action.back.to.list=Back to list observe.action.back.to.list.tip=Go back to the list observe.action.cancel=Cancel -observe.action.cancel.create.tip=Cancel object creation observe.action.change.storage=Change storage observe.action.change.storage.tip=To change current storage observe.action.choose.db.dump=Choose the backup @@ -59,9 +58,6 @@ observe.action.copy.row.headers=Copy row header observe.action.copy.row.headers.tip=Add in result row headers observe.action.copy.to.clipBoard=Copy in clipboard observe.action.create=Create -observe.action.db.locale.es.tip=Change database language in spanish -observe.action.db.locale.fr.tip=Change database language in french -observe.action.db.locale.uk.tip=Change database language in english observe.action.delete=Delete observe.action.delete.activity.tip=Delete activity observe.action.delete.entry.tip=Delete entry in edition @@ -99,7 +95,6 @@ observe.action.modify=Modify observe.action.new.entry=Add observe.action.new.entry.tip=Create a new entry observe.action.open.screen=Opening screen <%1$s> -observe.action.quitHelp.tip=Quit help screen observe.action.reload.application=reload application observe.action.reload.storage=Reload storage observe.action.reload.storage.tip=Reload current storage @@ -432,7 +427,6 @@ observe.common.length=Length observe.common.length.computed.tip=Length was computed observe.common.length.inf=Length (cm inf.) observe.common.length.observed.tip=Length was observed -observe.common.lengthMeasureType=Lenght measure type observe.common.lengthWeightFormula=Length weight formula observe.common.libelles=Labels observe.common.longitude=Longitude @@ -447,7 +441,6 @@ observe.common.meanValues=Mean values observe.common.meanWeight=Mean weight observe.common.meanWeightComputed.computed.tip=Mean weight was computed (%s) observe.common.meanWeightComputed.observed.tip=Mean weight was observed -observe.common.measureType=Measure type observe.common.minLength=Min length observe.common.minLengthMax=Min length maximum observe.common.minWeight=Min weight @@ -564,8 +557,6 @@ observe.config.category.technical=Technical observe.config.category.technical.description=Technical informations observe.config.category.ui=GUI observe.config.category.ui.description=Graphical interface options -observe.content.action.activity=Create a new activity -observe.content.action.activity.tip=Create a new activity observe.content.action.closeAndCreate=Close and create observe.content.action.closeAndCreate.activity=Next activity observe.content.action.closeAndCreate.activity.tip=close current activity and create a new one @@ -601,14 +592,6 @@ observe.content.action.goto.open.activity=Go to opened activity observe.content.action.goto.open.activity.short=Open activity observe.content.action.goto.open.activity.tip=Go to opened activity observe.content.action.goto.open.maree=Got to opened trip -observe.content.action.goto.open.other.activityLongline=Go to opened activity in another trip -observe.content.action.goto.open.other.activityLongline.tip=Go to opened activity in another trip -observe.content.action.goto.open.other.activitySeine=Go to opened activity in another trip -observe.content.action.goto.open.other.activitySeine.tip=Go to opened activity in another trip -observe.content.action.goto.open.other.maree=Go to opened trip in other program -observe.content.action.goto.open.other.maree.tip=Got to opened trip in other program -observe.content.action.goto.open.other.route=Go to opened road in other trip -observe.content.action.goto.open.other.route.tip=Go to opened road in other trip observe.content.action.goto.open.program.short=Open program observe.content.action.goto.open.program.tip=Go to opened program observe.content.action.goto.open.route=Go to opened route @@ -1576,7 +1559,6 @@ observe.selection.no.trips.selected=No trip selected. observe.selection.selected.trips=%s selected trip(s). observe.storage.action.apply=Apply observe.storage.action.apply.tip=Apply configured storage -observe.storage.action.canMigrate=Update database (current version %1$s) observe.storage.action.cancel=Cancel change storage observe.storage.action.cancel.tip=Cancel change of storage observe.storage.activityLongline.coordinate=Coordinates @@ -1655,10 +1637,6 @@ observe.storage.label.local=Local database observe.storage.label.reference.import.db=data source to import referential observe.storage.label.remote=Remote database observe.storage.label.server=Remote server -observe.storage.label.synchro.incoming=Data source <%1$s> -observe.storage.label.synchro.leftSource=Left data source <%1$s> -observe.storage.label.synchro.referentiel=Central data source <%1$s> -observe.storage.label.synchro.rightSource=Right data source <%1$s> observe.storage.locale.db=(local) observe.storage.message.closed=Connexion [%1$s] was closed observe.storage.message.closing=Closing connexion [%1$s] @@ -1679,6 +1657,8 @@ observe.storage.no.remote.storage=No referential data source defined observe.storage.no.server.storage=No referential server defined observe.storage.noImportData.config=< No configuration > observe.storage.noImportReferentiel.config=< No configuration > +observe.storage.remote.configuration.name=Configuration name +observe.storage.remote.configuration.save.title=Save configuration observe.storage.remote.db=(remote) observe.storage.remote.login=Login observe.storage.remote.password=Password @@ -1706,8 +1686,6 @@ observe.storage.showMigrationSql=display sql request while updating observe.storage.step.creationMode=Create local database observe.storage.step.dbMode.detail=Data source type observe.storage.step.label=Step %1$d/%2$d\: %3$s -observe.storage.store.remote.config=Remerber me -observe.storage.store.remote.config.tip=Remerber me observe.storage.title.change=Change storage observe.storage.useRemoteStorage.config=Configure remote data source to use observe.storage.useRemoteStorage.description=Please configure connexion to remote data source\nYou must validate your connexion to continue. diff --git a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties index 460f430..d25293f 100644 --- a/application-swing/src/main/resources/i18n/application-swing_es_ES.properties +++ b/application-swing/src/main/resources/i18n/application-swing_es_ES.properties @@ -17,7 +17,6 @@ observe.action.auto.copy.to.clipboard.tip=Puesta a punto automáticamente el con observe.action.back.to.list=Volver a la lista observe.action.back.to.list.tip=Volver a la lista de datos observe.action.cancel=Cancelar -observe.action.cancel.create.tip=Cancelar la creación del objeto observe.action.change.storage=Cambiar la fuente de datos observe.action.change.storage.tip=Para cambiar la fuente de datos de la aplicación observe.action.choose.db.dump=Elegir la copia de seguridad @@ -59,9 +58,6 @@ observe.action.copy.row.headers=Copiar las cabeceras de linea observe.action.copy.row.headers.tip=Añadir al resultado las cabeceras de linea (ej. la primera columna) observe.action.copy.to.clipBoard=Copiar el contenido en el portapapeles observe.action.create=Crear -observe.action.db.locale.es.tip=Cambia el idioma del referencial al español -observe.action.db.locale.fr.tip=Cambiar el idioma del referencial al francés -observe.action.db.locale.uk.tip=Cambiar el idioma del referencial al inglés observe.action.delete=Eliminar observe.action.delete.activity.tip=Eliminar la actividad observe.action.delete.entry.tip=Cancelar la edición de la entrada actual @@ -99,7 +95,6 @@ observe.action.modify=Modificar observe.action.new.entry=Nuevo observe.action.new.entry.tip=Crear una nueva entrada observe.action.open.screen=Abrir pantalla <%1$s> -observe.action.quitHelp.tip=Salir de la pantalla de ayuda observe.action.reload.application=Reinicializar la aplicación observe.action.reload.storage=Recargar la fuente de datos observe.action.reload.storage.tip=Cerrar y reabrir la fuente de datos @@ -432,7 +427,6 @@ observe.common.length=Longitud eslora total observe.common.length.computed.tip=Longitud calculada observe.common.length.inf=Longitud (cm inf.) observe.common.length.observed.tip=Longitud observada -observe.common.lengthMeasureType=Tipo de medida observe.common.lengthWeightFormula=Relación de peso observe.common.libelles=Textos observe.common.longitude=Longitude @@ -447,7 +441,6 @@ observe.common.meanValues=Valores medios observe.common.meanWeight=Peso medio (en Kg) observe.common.meanWeightComputed.computed.tip=El peso medio se calculó observe.common.meanWeightComputed.observed.tip=El peso medio se observó -observe.common.measureType=Tipo de medida observe.common.minLength=Talla mínima (en cm) observe.common.minLengthMax=Talla min-max (en cm) observe.common.minWeight=Peso mínimo @@ -564,8 +557,6 @@ observe.config.category.technical=Technical \#TODO observe.config.category.technical.description=Technical informations \#TODO observe.config.category.ui=Otro \#TODO observe.config.category.ui.description=Otras opciones \#TODO -observe.content.action.activity=Crear una nueva actividad -observe.content.action.activity.tip=Crear una nueva actividad para la ruta actual observe.content.action.closeAndCreate=Cerrar y crear observe.content.action.closeAndCreate.activity=Actividad siguiente observe.content.action.closeAndCreate.activity.tip=Cierre de la actividad actual y creación de una nueva @@ -601,14 +592,6 @@ observe.content.action.goto.open.activity=Acceder a la actividad abierta observe.content.action.goto.open.activity.short=Actividad abierta observe.content.action.goto.open.activity.tip=Acceder a la actividad abierta observe.content.action.goto.open.maree=Acceder a la marea abierta -observe.content.action.goto.open.other.activityLongline=Acceder a la actividad en una otra marea -observe.content.action.goto.open.other.activityLongline.tip=Acceder a la actividad abierta en una otra marea -observe.content.action.goto.open.other.activitySeine=Acceder a la actividad en una otra marea -observe.content.action.goto.open.other.activitySeine.tip=Acceder a la actividad abierta en una otra marea -observe.content.action.goto.open.other.maree=Acceder a la marea abierta en otro programa -observe.content.action.goto.open.other.maree.tip=Acceder a la marea abierta (en otro programa) -observe.content.action.goto.open.other.route=Acceder a la ruta abierta en otra marea -observe.content.action.goto.open.other.route.tip=Acceder a la route abierta (en otre marea) observe.content.action.goto.open.program.short=Programa abierto observe.content.action.goto.open.program.tip=Acceder al programa abierto observe.content.action.goto.open.route=Acceder a la route abierta @@ -1576,7 +1559,6 @@ observe.selection.no.trips.selected=Aucune marée sélectionnée. \#TODO observe.selection.selected.trips=%s marée(s) sélectionnée(s). \#TODO observe.storage.action.apply=Utilizar observe.storage.action.apply.tip=Utilizar la fuente de datos configuarada -observe.storage.action.canMigrate=Actualización de la base (versión actual %1$s) observe.storage.action.cancel=Cancelar el cambio de la fuente de datos observe.storage.action.cancel.tip=Cancelar el cambio de la fuente de datos observe.storage.activityLongline.coordinate=Coordinadas @@ -1655,10 +1637,6 @@ observe.storage.label.local=Base local observe.storage.label.reference.import.db=Base de importación de referenciales observe.storage.label.remote=Base remota observe.storage.label.server=Servidor remoto -observe.storage.label.synchro.incoming=Base de origen <%1$s> -observe.storage.label.synchro.leftSource=Fuente de la izquierda <%1$s> -observe.storage.label.synchro.referentiel=Base central <%1$s> -observe.storage.label.synchro.rightSource=Fuente de la derecha <%1$s> observe.storage.locale.db=(local) observe.storage.message.closed=La conexión [%1$s] ha sido cerrada observe.storage.message.closing=Cierre de la conexión [%1$s] @@ -1679,6 +1657,8 @@ observe.storage.no.remote.storage=No hay base de referencia definida observe.storage.no.server.storage=No hay servidor de referencia definido observe.storage.noImportData.config=< No hay configuración > observe.storage.noImportReferentiel.config=Sin configuración +observe.storage.remote.configuration.name=nom de la configuration \#TODO +observe.storage.remote.configuration.save.title=Enregistrement de la configuration \#TODO observe.storage.remote.db=(remoto) observe.storage.remote.login=Login observe.storage.remote.password=Contraseña @@ -1706,8 +1686,6 @@ observe.storage.showMigrationSql=Mostrar las consultas sql de las actualizacione observe.storage.step.creationMode=Creación de la base local observe.storage.step.dbMode.detail=Tipo de fuente de datos observe.storage.step.label=Etapa %1$d/%2$d \: %3$s -observe.storage.store.remote.config=Mantener la configuración -observe.storage.store.remote.config.tip=Mantener los parámetros de configuración de la fuente de datos remota (excepto la contraseña por motivos de seguridad) observe.storage.title.change=Cambiar la fuente de datos observe.storage.useRemoteStorage.config=Configurar la base remota a usar observe.storage.useRemoteStorage.description=Configure la conexión a la base remota\nAntes de continuar, debe validar la conexión. diff --git a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties index e5b2f4a..c2a561a 100644 --- a/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties +++ b/application-swing/src/main/resources/i18n/application-swing_fr_FR.properties @@ -17,7 +17,6 @@ observe.action.auto.copy.to.clipboard.tip=Mettre à jour automatiquement le cont observe.action.back.to.list=Retour à la liste observe.action.back.to.list.tip=Retour à la liste des données observe.action.cancel=Annuler -observe.action.cancel.create.tip=Annuler la création de l'objet observe.action.change.storage=Changer la source de données observe.action.change.storage.tip=Pour changer la source de données de l'application observe.action.choose.db.dump=Choisir la sauvegarde @@ -59,9 +58,6 @@ observe.action.copy.row.headers=Copier les entêtes de ligne observe.action.copy.row.headers.tip=Ajoute dans le résultat les entêtes de ligne (i.e la première colonne) observe.action.copy.to.clipBoard=Copier le contenu dans le presse-papier observe.action.create=Créer -observe.action.db.locale.es.tip=Changer la langue du référentiel en espagnol -observe.action.db.locale.fr.tip=Changer la langue du référentiel en français -observe.action.db.locale.uk.tip=Changer la langue du référentiel en anglais observe.action.delete=Supprimer observe.action.delete.activity.tip=Supprimer l'activité observe.action.delete.entry.tip=Supprimer l'entrée en cours d'édition @@ -99,7 +95,6 @@ observe.action.modify=Modifier observe.action.new.entry=Nouveau observe.action.new.entry.tip=Créer une nouvelle entrée observe.action.open.screen=Ouverture de l'écran <%1$s> -observe.action.quitHelp.tip=Quitter l'écran d'aide observe.action.reload.application=Redémarrer l'application observe.action.reload.storage=Recharger la source de données observe.action.reload.storage.tip=Ferme et réouvre la source de données @@ -432,7 +427,6 @@ observe.common.length=Longueur hors tout observe.common.length.computed.tip=La longueur a été calculée observe.common.length.inf=Longueur (cm inf.) observe.common.length.observed.tip=La longueur a été observée -observe.common.lengthMeasureType=Type de mensuration observe.common.lengthWeightFormula=Relation Poids observe.common.libelles=Libellés observe.common.longitude=Longitude @@ -447,7 +441,6 @@ observe.common.meanValues=Valeurs moyennes observe.common.meanWeight=Poids moyen (en Kg) observe.common.meanWeightComputed.computed.tip=Le poids moyen a été calculé (%s) observe.common.meanWeightComputed.observed.tip=Le poids moyen a été observé -observe.common.measureType=Type de mensuration observe.common.minLength=Taile minimum (en cm) observe.common.minLengthMax=Taille min-max (en cm) observe.common.minWeight=Poids minimum (en Kg) @@ -564,8 +557,6 @@ observe.config.category.technical=Technique observe.config.category.technical.description=Informations techniques observe.config.category.ui=Interface graphiques observe.config.category.ui.description=Configuration des interfaces graphiques -observe.content.action.activity=Créer une nouvelle activité -observe.content.action.activity.tip=Créer une nouvelle activité pour la route courante observe.content.action.closeAndCreate=Clôturer et créer observe.content.action.closeAndCreate.activity=Activité suivante observe.content.action.closeAndCreate.activity.tip=Clôturer l'activite courante et en créer une nouvelle @@ -601,14 +592,6 @@ observe.content.action.goto.open.activity=Accéder à l'activité ouverte observe.content.action.goto.open.activity.short=Activité ouverte observe.content.action.goto.open.activity.tip=Accéder à l'activité ouverte observe.content.action.goto.open.maree=Accéder à la marée ouverte -observe.content.action.goto.open.other.activityLongline=Accéder à l'activité ouverte dans une autre marée -observe.content.action.goto.open.other.activityLongline.tip=Accéder à l'activité ouverte dans une autre marée -observe.content.action.goto.open.other.activitySeine=Accéder à l'activité ouverte dans une autre marée -observe.content.action.goto.open.other.activitySeine.tip=Accéder à l'activité ouverte dans une autre marée -observe.content.action.goto.open.other.maree=Accéder à la marée ouverte dans un autre programme -observe.content.action.goto.open.other.maree.tip=Accéder à la marée ouverte (dans un autre programme) -observe.content.action.goto.open.other.route=Accéder à la route ouverte dans une autre marée -observe.content.action.goto.open.other.route.tip=Accéder à la route ouverte (dans une autre marée) observe.content.action.goto.open.program.short=Programme ouvert observe.content.action.goto.open.program.tip=Accéder au programme ouvert observe.content.action.goto.open.route=Accéder à la route ouverte @@ -1576,7 +1559,6 @@ observe.selection.no.trips.selected=Aucune marée sélectionnée. observe.selection.selected.trips=%s marée(s) sélectionnée(s). observe.storage.action.apply=Utiliser observe.storage.action.apply.tip=Utiliser la source de données configurée -observe.storage.action.canMigrate=Mettre à jour la base (version courante %1$s) observe.storage.action.cancel=Annuler le changement de source de données observe.storage.action.cancel.tip=Annuler le changement de source de données observe.storage.activityLongline.coordinate=Coordonnées @@ -1655,10 +1637,6 @@ observe.storage.label.local=Base locale observe.storage.label.reference.import.db=Base d'import de référentiels observe.storage.label.remote=Base distante observe.storage.label.server=Serveur Distant -observe.storage.label.synchro.incoming=Base source <%1$s> -observe.storage.label.synchro.leftSource=Base de gauche <%1$s> -observe.storage.label.synchro.referentiel=Base centrale <%1$s> -observe.storage.label.synchro.rightSource=Base de droite <%1$s> observe.storage.locale.db=(locale) observe.storage.message.closed=La connexion [%1$s] est fermé observe.storage.message.closing=Fermeture de la connexion [%1$s] @@ -1679,6 +1657,8 @@ observe.storage.no.remote.storage=Aucune base de référence définie observe.storage.no.server.storage=Aucun serveur de référence défini observe.storage.noImportData.config=< Pas de configuration > observe.storage.noImportReferentiel.config=< Pas de configuration > +observe.storage.remote.configuration.name=nom de la configuration +observe.storage.remote.configuration.save.title=Enregistrement de la configuration observe.storage.remote.db=(distante) observe.storage.remote.login=Utilisateur observe.storage.remote.password=Mot de passe @@ -1706,8 +1686,6 @@ observe.storage.showMigrationSql=Afficher les requêtes sql lors des mises à jo observe.storage.step.creationMode=Création base locale observe.storage.step.dbMode.detail=Type de source de données observe.storage.step.label=Etape %1$d/%2$d \: %3$s -observe.storage.store.remote.config=Conserver le paramétrage -observe.storage.store.remote.config.tip=Conserver le paramétrage de la source de données distante dans votre configuration (sauf les mots de passe pour des raisons de sécurité) observe.storage.title.change=Changer la source de données observe.storage.useRemoteStorage.config=Configurer la base distante à utiliser observe.storage.useRemoteStorage.description=Veuillez configurer votre connexion à la base distante\nAvant de pouvoir poursuivre, vous devez valider la connexion. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.