Tony CHEMIT pushed to branch develop at ultreiaio / ird-observe Commits: a1bf1fe0 by tchemit at 2019-06-08T12:27:33Z L'asssitant connexion propose des raccourcis sur des touches qui n'existent pas - Closes #1302 - - - - - 1 changed file: - client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java Changes: ===================================== client-core/src/main/java/fr/ird/observe/client/ui/storage/tabs/ConfigUIHandler.java ===================================== @@ -148,7 +148,8 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public void addRemoteConfiguration(ObserveMainUI mainUI, RemoteDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UseRemoteConfigurationUIAction action = new UseRemoteConfigurationUIAction(mainUI, ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + KeyStroke keyStroke = getKeyStroke(position); + UseRemoteConfigurationUIAction action = new UseRemoteConfigurationUIAction(mainUI, ui, UseRemoteConfigurationUIAction.ACTION_NAME + position, configuration, keyStroke); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getRemoteMenu().add(item); @@ -157,12 +158,29 @@ public class ConfigUIHandler extends StorageTabUIHandler<ConfigUI> implements UI public void addServerConfiguration(ObserveMainUI mainUI, ServerDataSourceConfiguration configuration, int position) { JMenuItem item = new JMenuItem(configuration.getName()); item.putClientProperty("configuration", configuration); - UseServerConfigurationUIAction action = new UseServerConfigurationUIAction(mainUI, ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, KeyStroke.getKeyStroke("F" + position)); + KeyStroke keyStroke = getKeyStroke(position); + UseServerConfigurationUIAction action = new UseServerConfigurationUIAction(mainUI, ui, UseServerConfigurationUIAction.ACTION_NAME + position, configuration, keyStroke); action.initForMainUi(item, ui.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT), observeActionMap); ui.getServerMenu().add(item); } + private KeyStroke getKeyStroke(int position) { + if (position<(12)+1) { + return KeyStroke.getKeyStroke("F" + position); + } + if (position<(12*2)+1) { + return KeyStroke.getKeyStroke("shift pressed F" + (position-12)); + } + if (position<(12*3)+1) { + return KeyStroke.getKeyStroke("ctrl pressed F" + (position-24)); + } + if (position<(12*4)+1) { + return KeyStroke.getKeyStroke("shift ctrl pressed F" + (position-36)); + } + return null; + } + private void refreshConfig(ConfigUI ui, String configId) { JComponent c = (JComponent) ui.getObjectById(configId); if (c != null) { View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a1bf1fe01f45d255581b9f0d0e46... -- View it on GitLab: https://gitlab.com/ultreiaio/ird-observe/commit/a1bf1fe01f45d255581b9f0d0e46... You're receiving this email because of your account on gitlab.com.