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>.