Author: chatellier Date: 2010-11-08 16:33:00 +0000 (Mon, 08 Nov 2010) New Revision: 191 Log: Add select all / unselect all in specy context menu Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionHandler.java 2010-11-08 16:33:00 UTC (rev 191) @@ -180,14 +180,16 @@ * @param event mouse event */ public void showSpeciesContextMenu(final SelectionDetailsView view, MouseEvent event) { - + // clic droit if (event.getButton() == MouseEvent.BUTTON3) { - + + JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + // affiche le menu contextuel si au moins 2 especes selectionnées int[] selectedRows = view.getSpecyList().getSelectedIndices(); if (selectedRows.length > 1) { - JPopupMenu popupMenu = new JPopupMenu(_("coser.ui.selection.speciesMenuLabel")); + // merge menu JMenuItem fusionMenu = new JMenuItem(_("coser.ui.selection.speciesMenuFusion")); fusionMenu.addActionListener(new ActionListener() { @Override @@ -204,8 +206,30 @@ } }); popupMenu.add(fusionMenu); - popupMenu.show(view.getSpecyList(), event.getX(), event.getY()); } + + // select all menu + JMenuItem selectAllMenu = new JMenuItem(_("coser.ui.common.selectAll")); + selectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + int size = view.getSpecyList().getModel().getSize(); + view.getSpecyList().getSelectionModel().addSelectionInterval(0, size - 1); + } + }); + popupMenu.add(selectAllMenu); + + // unselect all menu + JMenuItem unselectAllMenu = new JMenuItem(_("coser.ui.common.unselectAll")); + unselectAllMenu.addActionListener(new ActionListener() { + @Override + public void actionPerformed(ActionEvent e) { + view.getSpecyList().getSelectionModel().clearSelection(); + } + }); + popupMenu.add(unselectAllMenu); + + popupMenu.show(view.getSpecyList(), event.getX(), event.getY()); } } Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionListsView.jaxx 2010-11-08 16:33:00 UTC (rev 191) @@ -109,35 +109,35 @@ </row> <row> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionAllSpeciesList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionAllSpeciesList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionOccurenceDensityList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionOccurenceDensityList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionSizeAllYearList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionSizeAllYearList.getSelectionModel()).clearSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.selectAll' + <JButton text='coser.ui.common.selectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionMaturityList.getSelectionModel()).fillSelection()"/> </cell> <cell fill="horizontal" weightx="1"> - <JButton text='coser.ui.common.unselectAll' + <JButton text='coser.ui.common.unselectAll.short' onActionPerformed="((SpecyListSelectionModel)selectionMaturityList.getSelectionModel()).clearSelection()"/> </cell> </row> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties 2010-11-08 16:33:00 UTC (rev 191) @@ -10,8 +10,10 @@ coser.ui.common.cancel=Cancel coser.ui.common.comment=Comment coser.ui.common.selectAll=All +coser.ui.common.selectAll.short= coser.ui.common.selectFile=Select\u2026 coser.ui.common.unselectAll=None +coser.ui.common.unselectAll.short= coser.ui.common.valid=Valid coser.ui.config.title=Configuration coser.ui.control.check.containsError= Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:22:13 UTC (rev 190) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties 2010-11-08 16:33:00 UTC (rev 191) @@ -9,9 +9,11 @@ coser.config.support.email.description=Adresse de suport pour l'envoi des erreurs coser.ui.common.cancel=Annuler coser.ui.common.comment=Commentaire -coser.ui.common.selectAll=Tous +coser.ui.common.selectAll=S\u00E9lectionner tout +coser.ui.common.selectAll.short=Tout coser.ui.common.selectFile=S\u00E9lectionner\u2026 -coser.ui.common.unselectAll=Aucun +coser.ui.common.unselectAll=D\u00E9-s\u00E9lectionner tout +coser.ui.common.unselectAll.short=Aucun coser.ui.common.valid=Valider coser.ui.config.title=Configuration coser.ui.control.check.containsError=Les donn\u00E9es contiennent encore des erreurs non corrig\u00E9es\npouvant fausser la cr\u00E9ation de la s\u00E9lection.\nVoulez vous poursuivre la cr\u00E9ation de la s\u00E9lection ?