[Observe-commits] 01/10: refs #8429 Ajout raccourcis claviers sur les actions dans les opérations

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 e92f69ae231c0140313ac68a91fd59dbf06884d7 Author: Tony CHEMIT <chemit@codelutin.com> Date: Tue Dec 6 09:35:26 2016 +0100 refs #8429 Ajout raccourcis claviers sur les actions dans les opérations --- .../observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss | 1 + .../application/swing/ui/admin/consolidate/ConsolidateUIHandler.java | 2 ++ .../fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss | 2 ++ .../observe/application/swing/ui/admin/export/ExportUIHandler.java | 4 ++++ .../fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss | 2 ++ .../observe/application/swing/ui/admin/save/SaveLocalUIHandler.java | 3 +++ .../application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss | 2 ++ .../swing/ui/admin/synchronize/data/DataSynchroUIHandler.java | 4 ++++ .../swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss | 2 ++ .../ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java | 4 ++++ .../ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss | 1 + .../admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java | 3 +++ .../swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java | 1 + .../ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss | 2 ++ .../application/swing/ui/admin/validate/ValidateUIHandler.java | 4 ++++ 15 files changed, 37 insertions(+) diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss index 6d1ea22..7644d9a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUI.jcss @@ -31,5 +31,6 @@ #startButton { actionIcon:"wizard-start"; + mnemonic:D; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java index f3f958b..d611669 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/consolidate/ConsolidateUIHandler.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.consolidate; import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.services.dto.DataReference; import fr.ird.observe.services.service.actions.consolidate.ConsolidateActivitySeineDataResult; @@ -55,6 +56,7 @@ public class ConsolidateUIHandler extends AdminTabUIHandler<ConsolidateUI> imple public void afterInit(ConsolidateUI ui) { super.afterInit(ui); ui.getStartButton().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartButton()); } public ConsolidateModel getStepModel() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss index db6f799..cf34bf1 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUI.jcss @@ -26,10 +26,12 @@ #prepareAction { actionIcon:"wizard-start"; + mnemonic:R; } #startAction { actionIcon:"save"; + mnemonic:D; } #NEED_FIX_content { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java index 6529e9d..32748d7 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/export/ExportUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.DataReferenceDecorator; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -93,6 +94,9 @@ public class ExportUIHandler extends AdminTabUIHandler<ExportUI> implements UIHa ui.getPrepareAction().setText(t("observe.actions.synchro.prepare.operation", t(ui.getStep().getOperationLabel()))); ui.getStartAction().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getPrepareAction()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + ConfigUI configabUI = (ConfigUI) parentUI.getStepUI(AdminStep.CONFIG); configabUI.getCentralSourceInfoLabel().setText(t("observe.action.config.export.required.write.data")); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss index baadbcf..87e4ce6 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUI.jcss @@ -41,6 +41,7 @@ #continueAction { text:"observe.action.continue"; actionIcon:"wizard-start"; + mnemonic:O; } #needSaveText { @@ -80,4 +81,5 @@ #startAction { enabled:{stepModel.isCanSaveLocal()}; actionIcon:"wizard-start"; + mnemonic:D; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java index 88da083..6610814 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/save/SaveLocalUIHandler.java @@ -22,6 +22,7 @@ package fr.ird.observe.application.swing.ui.admin.save; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -60,6 +61,8 @@ public class SaveLocalUIHandler extends AdminTabUIHandler<SaveLocalUI> implement String message = t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel())); ui.getStartAction().setText(message); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getContinueAction()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); } public void updateText() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss index 91956b8..932c317 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUI.jcss @@ -31,6 +31,7 @@ #startAction { actionIcon:"wizard-start"; text:"observe.actions.synchro.data.launch.operation"; + mnemonic:D; } #contentSplitPane { @@ -41,6 +42,7 @@ #applyAction { actionIcon:accept; text:"observe.action.apply"; + mnemonic:Q; } #leftTree { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java index 28a7937..4ca8142 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/data/DataSynchroUIHandler.java @@ -25,6 +25,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.data; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUI; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -110,6 +111,9 @@ public class DataSynchroUIHandler extends AdminTabUIHandler<DataSynchroUI> imple }); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + } public DataSynchroModel getStepModel() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss index 6dfd6e4..efd3e89 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUI.jcss @@ -30,6 +30,7 @@ #startAction { actionIcon:"wizard-start"; + mnemonic:D; } #errorsPane { @@ -49,5 +50,6 @@ #applyAction { text:"observe.action.apply"; actionIcon:"accept"; + mnemonic:Q; enabled:{isCanApply()}; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java index 698327a..980920d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/legacy/SynchronizeUIHandler.java @@ -25,6 +25,7 @@ import com.google.common.collect.ImmutableSet; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; import fr.ird.observe.application.swing.decoration.decorators.ReferentialReferenceDecorator; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; import fr.ird.observe.services.dto.referential.ReferentialDto; @@ -80,6 +81,9 @@ public class SynchronizeUIHandler extends AdminTabUIHandler<SynchronizeUI> imple super.afterInit(ui); ui.getStartAction().setText(t("observe.actions.synchro.referential.legacy.launch.operation", t(ui.getStep().getOperationLabel()))); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); + DefaultListSelectionModel obsoleteReferenceSelectionModel = ui.getModel().getSynchronizeReferentielModel().getObsoleteReferencesSelectionModel(); obsoleteReferenceSelectionModel.addListSelectionListener(this::updateSelectedObsoleteEntity); obsoleteReferenceSelectionModel.setSelectionMode(ListSelectionModel.SINGLE_SELECTION); diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss index e5897ab..96e89aa 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUI.jcss @@ -31,6 +31,7 @@ #startAction { actionIcon:"wizard-start"; text:"observe.actions.synchro.referential.launch.operation"; + mnemonic:D; } #contentSplitPane { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java index 9917a8b..2dbcfcb 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/ReferentialSynchroUIHandler.java @@ -23,6 +23,7 @@ package fr.ird.observe.application.swing.ui.admin.synchronize.referential.ng; */ import fr.ird.observe.application.swing.db.ObserveSwingDataSource; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -72,6 +73,8 @@ public class ReferentialSynchroUIHandler extends AdminTabUIHandler<ReferentialSy ReferentialSynchroConfigUI extraConfig = new ReferentialSynchroConfigUI(tx); configUI.getExtraConfig().add(extraConfig); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartAction()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getApplyAction()); } public void doStartAction() { diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java index 4a86f85..363211d 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/synchronize/referential/ng/action/ApplyAction.java @@ -55,6 +55,7 @@ public class ApplyAction extends AbstractObserveAction { public ApplyAction(ReferentialSynchroUI ui) { super(t("observe.action.apply"), UIHelper.getUIManagerActionIcon("accept")); + putValue(MNEMONIC_KEY, (int) 'Q'); this.ui = ui; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss index 9989082..d2f084a 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUI.jcss @@ -48,6 +48,7 @@ #startButton { actionIcon:"wizard-start"; + mnemonic:D; } #messageTable { @@ -89,4 +90,5 @@ #saveReport { text:"observe.actions.validate.save"; actionIcon:"save"; + mnemonic:S; } diff --git a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java index 1188435..01a60bc 100644 --- a/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java +++ b/application-swing/src/main/java/fr/ird/observe/application/swing/ui/admin/validate/ValidateUIHandler.java @@ -28,6 +28,7 @@ import fr.ird.observe.application.swing.ObserveSwingApplicationContext; import fr.ird.observe.application.swing.db.ObserveSwingDataSource; import fr.ird.observe.application.swing.decoration.DecoratorService; import fr.ird.observe.application.swing.decoration.ObserveI18nDecoratorHelper; +import fr.ird.observe.application.swing.ui.MnemonicHelper; import fr.ird.observe.application.swing.ui.UIHelper; import fr.ird.observe.application.swing.ui.admin.AdminStep; import fr.ird.observe.application.swing.ui.admin.AdminTabUIHandler; @@ -124,6 +125,9 @@ public class ValidateUIHandler extends AdminTabUIHandler<ValidateUI> implements ui.getStartButton().setText(t("observe.actions.synchro.launch.operation", t(ui.getStep().getOperationLabel()))); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getStartButton()); + MnemonicHelper.addKeyStrokeFromMnemonic(ui.getSaveReport()); + // initialisation de l'ui de configuration if (log.isInfoEnabled()) { log.info("Init extra configuration for " + ui.getName()); -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.