branch develop updated (1922f47 -> 7d56197)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository tutti. See http://git.codelutin.com/tutti.git from 1922f47 refactor des mises à jour new 7d56197 fixes #6569 The 1 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 7d561979aedb1d9295efd5954eddcdba4622ffb6 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 28 15:29:10 2015 +0100 fixes #6569 Summary of changes: .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 2 -- .../content/operation/EditFishingOperationUI.css | 7 ++++--- .../content/operation/EditFishingOperationUI.jaxx | 12 +++++------- .../operation/EditFishingOperationUIHandler.java | 2 -- .../content/operation/catches/EditCatchesUI.css | 10 ++++------ .../content/operation/catches/EditCatchesUI.jaxx | 18 ++++++++---------- .../operation/catches/EditCatchesUIHandler.java | 2 -- .../catches/accidental/AccidentalBatchUI.css | 8 ++++---- .../catches/accidental/AccidentalBatchUI.jaxx | 14 ++++++-------- .../accidental/AccidentalBatchUIHandler.java | 1 - .../operation/catches/benthos/BenthosBatchUI.css | 8 ++++---- .../operation/catches/benthos/BenthosBatchUI.jaxx | 14 ++++++-------- .../catches/benthos/BenthosBatchUIHandler.java | 2 -- .../IndividualObservationBatchUI.css | 8 ++++---- .../IndividualObservationBatchUI.jaxx | 14 ++++++-------- .../IndividualObservationBatchUIHandler.java | 2 -- .../catches/marinelitter/MarineLitterBatchUI.css | 8 ++++---- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 14 ++++++-------- .../marinelitter/MarineLitterBatchUIHandler.java | 2 -- .../operation/catches/species/SpeciesBatchUI.css | 10 ++++------ .../operation/catches/species/SpeciesBatchUI.jaxx | 20 +++++++++----------- .../catches/species/SpeciesBatchUIHandler.java | 2 -- .../ui/swing/util/AbstractTuttiUIHandler.java | 22 ---------------------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 +++++++---- 25 files changed, 84 insertions(+), 132 deletions(-) -- 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 tutti. See http://git.codelutin.com/tutti.git commit 7d561979aedb1d9295efd5954eddcdba4622ffb6 Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 28 15:29:10 2015 +0100 fixes #6569 --- .../fr/ifremer/tutti/ui/swing/content/MainUI.css | 2 -- .../content/operation/EditFishingOperationUI.css | 7 ++++--- .../content/operation/EditFishingOperationUI.jaxx | 12 +++++------- .../operation/EditFishingOperationUIHandler.java | 2 -- .../content/operation/catches/EditCatchesUI.css | 10 ++++------ .../content/operation/catches/EditCatchesUI.jaxx | 18 ++++++++---------- .../operation/catches/EditCatchesUIHandler.java | 2 -- .../catches/accidental/AccidentalBatchUI.css | 8 ++++---- .../catches/accidental/AccidentalBatchUI.jaxx | 14 ++++++-------- .../accidental/AccidentalBatchUIHandler.java | 1 - .../operation/catches/benthos/BenthosBatchUI.css | 8 ++++---- .../operation/catches/benthos/BenthosBatchUI.jaxx | 14 ++++++-------- .../catches/benthos/BenthosBatchUIHandler.java | 2 -- .../IndividualObservationBatchUI.css | 8 ++++---- .../IndividualObservationBatchUI.jaxx | 14 ++++++-------- .../IndividualObservationBatchUIHandler.java | 2 -- .../catches/marinelitter/MarineLitterBatchUI.css | 8 ++++---- .../catches/marinelitter/MarineLitterBatchUI.jaxx | 14 ++++++-------- .../marinelitter/MarineLitterBatchUIHandler.java | 2 -- .../operation/catches/species/SpeciesBatchUI.css | 10 ++++------ .../operation/catches/species/SpeciesBatchUI.jaxx | 20 +++++++++----------- .../catches/species/SpeciesBatchUIHandler.java | 2 -- .../ui/swing/util/AbstractTuttiUIHandler.java | 22 ---------------------- .../resources/i18n/tutti-ui-swing_en_GB.properties | 3 +++ .../resources/i18n/tutti-ui-swing_fr_FR.properties | 11 +++++++---- 25 files changed, 84 insertions(+), 132 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css index f8aa797..b833804 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/MainUI.css @@ -30,13 +30,11 @@ title: "tutti.main.title.applicationName"; defaultCloseOperation: {JFrame.DO_NOTHING_ON_CLOSE}; iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; - iconImage:{SwingUtil.createImageIcon("allegro_32.png").getImage()}; } #menuFile { text: "tutti.main.menu.file"; toolTipText: "tutti.main.menu.file.tip"; - toolTipText: "tutti.main.menu.file.tip"; i18nMnemonic: "tutti.main.menu.file.mnemonic"; } diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css index e3a13f8..a93bf75 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css @@ -83,9 +83,10 @@ JXDatePicker { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importFromColumnFile)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #fishingOperationTabScrollPane { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx index 2d0ec2b..558f08e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.jaxx @@ -33,7 +33,6 @@ fr.ifremer.tutti.ui.swing.TuttiHelpBroker fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.type.CoordinateEditorType @@ -154,13 +153,12 @@ public EditFishingOperationUI(FishingOperationsUI parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tuttihelp.editeditFishingOperation.help"'/> - <JButton id='importFromColumnFile'/> - <JToolBar id='traitGeneralTabPaneToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importFromColumnFile'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='fishingOperationAttachmentsButton' constructorParams='getHandler().getContext(), getModel()'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java index df35462..244460b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUIHandler.java @@ -343,8 +343,6 @@ public class EditFishingOperationUIHandler extends AbstractTuttiTabContainerUIHa initUI(ui); - initActionComboBox(ui.getActionComboBox()); - List<Person> people = getDataContext().getPersons(); initBeanList(ui.getRecorderPersonList(), people, diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css index 0680c8d..b6afd48 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.css @@ -46,12 +46,10 @@ ComputableDataEditor { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(exportFishingOperationReportButton, - exportFishingOperationReportForSumatraButton, - importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #catchesCaracteristicsAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx index 8c4ea9d..7a32a2a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUI.jaxx @@ -44,7 +44,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.caracteristics.CaracteristicMapEditorUI fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor @@ -102,16 +101,15 @@ public EditCatchesUI(FishingOperationsUI parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editCatchBatch.help"'/> - <JButton id='exportFishingOperationReportButton'/> - <JButton id='exportFishingOperationReportForSumatraButton'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='catchesCaracteristicsTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='exportFishingOperationReportButton'/> + <JMenuItem id='exportFishingOperationReportForSumatraButton'/> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='catchesCaracteristicsAttachmentsButton' constructorParams='getHandler().getContext(), getModel()'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java index e1ea1d4..a2b9da1 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/EditCatchesUIHandler.java @@ -199,8 +199,6 @@ public class EditCatchesUIHandler extends AbstractTuttiTabContainerUIHandler<Edi initUI(ui); - initActionComboBox(ui.getActionComboBox()); - EditCatchesUIModel model = getModel(); changeValidatorContext(model.getValidationContext(), getValidator()); diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css index 6423e37..c73183a 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.css @@ -37,10 +37,10 @@ NumberEditor { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #accidentalBatchAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx index 31fa909..035f25e 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUI.jaxx @@ -28,7 +28,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment org.jdesktop.swingx.JXTable @@ -57,14 +56,13 @@ public AccidentalBatchUI(TuttiUI<?,?> parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editAccidentalBatch.help"'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='accidentalBatchTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='accidentalBatchAttachmentsButton' constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java index 72d8381..1badc5f 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/AccidentalBatchUIHandler.java @@ -242,7 +242,6 @@ public class AccidentalBatchUIHandler initUI(ui); - initActionComboBox(ui.getActionComboBox()); JXTable table = getTable(); // create table column model diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css index 3e70e4d..4790dea 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.css @@ -47,10 +47,10 @@ ComputableDataEditor { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #benthosBatchAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx index df030fe..0df3509 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUI.jaxx @@ -30,7 +30,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor @@ -62,14 +61,13 @@ public BenthosBatchUI(TuttiUI<?,?> parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editBenthosBatch.help"'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='benthosBatchTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='benthosBatchAttachmentsButton' constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java index 8dde3e8..8099423 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/BenthosBatchUIHandler.java @@ -672,8 +672,6 @@ public class BenthosBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Bent initUI(ui); - initActionComboBox(ui.getActionComboBox()); - List<Integer> samplingOrder = sampleCategoryModel.getSamplingOrder(); if (log.isDebugEnabled()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css index edfdd58..30970c7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.css @@ -30,10 +30,10 @@ borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #individualObservationBatchAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx index baeb4cd..668d4c5 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUI.jaxx @@ -31,7 +31,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment org.nuiton.jaxx.widgets.number.NumberEditor @@ -63,14 +62,13 @@ public IndividualObservationBatchUI(TuttiUI<?,?> parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editIndividualObservationBatch.help"'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='individualObservationBatchTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='individualObservationBatchAttachmentsButton' constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java index 40c7a86..0236bdb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/IndividualObservationBatchUIHandler.java @@ -272,8 +272,6 @@ public class IndividualObservationBatchUIHandler initUI(ui); - initActionComboBox(ui.getActionComboBox()); - JXTable table = getTable(); // can show / hide some columns in model diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css index 850fb10..27a1722 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.css @@ -37,10 +37,10 @@ ComputableDataEditor { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #marineLitterBatchAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx index abf01af..64775cb 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUI.jaxx @@ -29,7 +29,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.EditCatchesUIModel fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor @@ -62,14 +61,13 @@ public MarineLitterBatchUI(TuttiUI<?,?> parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editMarineLitterBatch.help"'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='marineLitterBatchTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='marineLitterBatchAttachmentsButton' constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java index a6626c9..b19c1ce 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/MarineLitterBatchUIHandler.java @@ -230,8 +230,6 @@ public class MarineLitterBatchUIHandler extends AbstractTuttiBatchTableUIHandler initUI(ui); - initActionComboBox(ui.getActionComboBox()); - JXTable table = getTable(); // create table column model diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css index f26ce26..0f0f6d4 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.css @@ -47,12 +47,10 @@ ComputableDataEditor { borderPainted: false; } -#actionComboBox { - model: {SwingUtil.newComboModel(importPupitriButton, - importPsionButton, - importMultiPostButton, - exportMultiPostButton)}; - renderer: {new ActionListCellRenderer()}; +#menuAction { + text: "tutti.toolbar.menu.action"; + toolTipText: "tutti.toolbar.menu.action.tip"; + i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; } #speciesBatchAttachmentsButton { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx index 73e27c9..facab39 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUI.jaxx @@ -28,7 +28,6 @@ fr.ifremer.tutti.ui.swing.content.operation.catches.SpeciesSortMode fr.ifremer.tutti.ui.swing.util.TuttiUI fr.ifremer.tutti.ui.swing.util.TuttiUIUtil - org.nuiton.jaxx.application.swing.util.ActionListCellRenderer fr.ifremer.tutti.ui.swing.util.attachment.ButtonAttachment fr.ifremer.tutti.ui.swing.util.computable.ComputableDataEditor @@ -60,17 +59,16 @@ public SpeciesBatchUI(TuttiUI<?,?> parentUI) { <TuttiHelpBroker id='broker' constructorParams='"tutti.editSpeciesBatch.help"'/> - <JButton id='importPupitriButton'/> - <JButton id='importPsionButton'/> - <JButton id='importBigfinButton'/> - <JButton id='importMultiPostButton'/> - <JButton id='exportMultiPostButton'/> - <JToolBar id='speciesBatchTabToolBar'> - <JComboBox id='actionComboBox' - onMouseEntered='actionComboBox.showPopup()' - onMouseClicked='handler.startAction(event)' - onActionPerformed='handler.startAction(event)'/> + <JMenuBar id='menu'> + <JMenu id='menuAction'> + <JMenuItem id='importPupitriButton'/> + <JMenuItem id='importPsionButton'/> + <JMenuItem id='importBigfinButton'/> + <JMenuItem id='importMultiPostButton'/> + <JMenuItem id='exportMultiPostButton'/> + </JMenu> + </JMenuBar> <ButtonAttachment id='speciesBatchAttachmentsButton' constructorParams='handler.getContext(), getContextValue(EditCatchesUIModel.class)'/> </JToolBar> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java index 1577092..648d8da 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SpeciesBatchUIHandler.java @@ -675,8 +675,6 @@ public class SpeciesBatchUIHandler extends AbstractTuttiBatchTableUIHandler<Spec initUI(ui); - initActionComboBox(ui.getActionComboBox()); - List<Integer> samplingOrder = sampleCategoryModel.getSamplingOrder(); if (log.isDebugEnabled()) { diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java index 5bcbce4..df964b8 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/AbstractTuttiUIHandler.java @@ -68,8 +68,6 @@ import javax.swing.table.TableCellEditor; import javax.swing.table.TableCellRenderer; import javax.swing.table.TableColumnModel; import java.awt.*; -import java.awt.event.ActionEvent; -import java.awt.event.MouseEvent; import java.beans.PropertyChangeEvent; import java.beans.PropertyChangeListener; import java.text.DecimalFormat; @@ -184,22 +182,6 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend return decorator; } - public void startAction(MouseEvent event) { - startAction(event); - } - - public void startAction(ActionEvent event) { - JComboBox existingCombo = (JComboBox) event.getSource(); - JButton selectedAction = (JButton) existingCombo.getSelectedItem(); - // hide popup before performing the action, otherwise, if the action - // opens a popup, the user must click a first time to hide the combobox - // popup to then interact with the popup opened by the action - // (see http://forge.codelutin.com/issues/2032) - existingCombo.setSelectedIndex(0); - existingCombo.hidePopup(); - getContext().getActionEngine().runAction(selectedAction); - } - @Override protected void addHighlighters(final JXTable table) { @@ -545,8 +527,4 @@ public abstract class AbstractTuttiUIHandler<M, UI extends TuttiUI<M, ?>> extend return col; } - protected void initActionComboBox(JComboBox combo) { - combo.putClientProperty("JComboBox.isTableCellEditor", Boolean.TRUE); - combo.addMouseListener(TuttiUIUtil.GRAB_FOCUS_ON_ENTER_LISTENER); - } } diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties index fe16052..bcd9360 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properties @@ -1841,6 +1841,9 @@ tutti.title.openReplaceTemporaryUI.noSource= tutti.title.openReplaceTemporaryUI.noTarget= tutti.title.openReplaceTemporaryVesselUI.noSource= tutti.title.openReplaceTemporaryVesselUI.noTarget= +tutti.toolbar.menu.action= +tutti.toolbar.menu.action.mnemonic= +tutti.toolbar.menu.action.tip= tutti.ui.change.species.decorator= tutti.update.db= tutti.update.error.with.auth= diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties index d65e066..8e8875f 100644 --- a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties +++ b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties @@ -1438,9 +1438,9 @@ tutti.main.action.updateSpecificApplication.tip=Mettre à jour le module <strong tutti.main.action.validateCatches=Valider les captures tutti.main.action.validateCatches.mnemonic=V tutti.main.action.validateCatches.tip=Valider les captures -tutti.main.menu.actions=Actions -tutti.main.menu.actions.mnemonic=c -tutti.main.menu.actions.tip=Actions +tutti.main.menu.actions=Aller à +tutti.main.menu.actions.mnemonic=l +tutti.main.menu.actions.tip=Accès aux différents écrans tutti.main.menu.administration=Administration tutti.main.menu.administration.mnemonic=d tutti.main.menu.administration.tip=Administrer l'application @@ -1731,8 +1731,11 @@ tutti.splitSpeciesBatch.table.header.category=Catégorie tutti.splitSpeciesBatch.table.header.selected=Sélection tutti.splitSpeciesBatch.table.header.weight=Poids tutti.splitSpeciesBatch.title=Catégorisation du lot +tutti.title.openReplaceTecmporaryUI.noTarget=Pas de référentiel officiel de type %s dans la base tutti.title.openReplaceTemporaryUI.noSource=Pas de référentiel temporaire de type %s dans la base -tutti.title.openReplaceTemporaryUI.noTarget=Pas de référentiel officiel de type %s dans la base +tutti.toolbar.menu.action=Actions +tutti.toolbar.menu.action.mnemonic=c +tutti.toolbar.menu.action.tip=Actions possibles pour cet onglet tutti.ui.change.species.decorator=Changer la décoration tutti.update.db=Base de données tutti.update.error.with.auth=Impossible de télécharger la mise à jour du module <strong>%s</strong>.<br/>Le login / mot de passe que vous avez saisis n'étaient peut-être pas corrects.<br/>Si le problème persiste, veuillez consulter l'administrateur. -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm