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 7df0e68a9c2811637e53742caa4b3f91285a7908 Author: Tony CHEMIT <chemit@codelutin.com> Date: Fri Dec 23 11:24:15 2016 +0100 ajout raccourcis claviers sur gestionnaire de connexions --- .../application/swing/ui/storage/presets/RemotePresetsUI.jcss | 4 ++-- .../swing/ui/storage/presets/RemotePresetsUIHandler.java | 9 ++++++++- 2 files changed, 10 insertions(+), 3 deletions(-) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jcss index a7a9f58..7b8fb5e 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUI.jcss @@ -70,7 +70,7 @@ #saveRemoteAction { text:"observe.action.save"; actionIcon:"save"; - mnemonic:S; + mnemonic:E; enabled:{model.isRemoteModified()}; } @@ -90,7 +90,7 @@ #saveServerAction { text:"observe.action.save"; actionIcon:"save"; - mnemonic:S; + mnemonic:E; enabled:{model.isServerModified()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java index 0c0b5c8..9822eb1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/storage/presets/RemotePresetsUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.storage.presets; import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.configuration.ObserveSwingApplicationConfig; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.ui.ObserveKeyStrokes; import fr.ird.observe.application.swing.ui.ObserveMainUI; import fr.ird.observe.application.swing.ui.ObserveUIMode; import fr.ird.observe.application.swing.ui.UIHelper; @@ -126,6 +127,8 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { } SwingUtilities.invokeLater(ui::repaint); }); + + ObserveKeyStrokes.addKeyStrokeFromMnemonic(ui); } public void testRemote() { @@ -329,7 +332,11 @@ public class RemotePresetsUIHandler implements UIHandler<RemotePresetsUI> { public void quit() { ObserveMainUI mainUI = ObserveSwingApplicationContext.get().getMainUI(); - mainUI.getModel().setMode(ObserveUIMode.NO_DB); + if (ObserveSwingApplicationContext.get().getDataSourcesManager().getMainDataSource() == null) { + mainUI.getModel().setMode(ObserveUIMode.NO_DB); + } else { + mainUI.getModel().setMode(ObserveUIMode.DB); + } mainUI.getDataSourcePresets().removeAll(); } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.