Author: kmorin Date: 2013-03-12 11:35:17 +0100 (Tue, 12 Mar 2013) New Revision: 585 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/585 Log: - enable select species only if one is selected - do not show the caroussel tremie vessel option if no db is loaded Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 09:49:05 UTC (rev 584) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/config/TuttiConfigUI.java 2013-03-12 10:35:17 UTC (rev 585) @@ -25,6 +25,7 @@ */ import fr.ifremer.tutti.service.config.TuttiServiceConfigOption; +import fr.ifremer.tutti.ui.swing.TuttiUIContext; import fr.ifremer.tutti.ui.swing.content.MainUI; import fr.ifremer.tutti.ui.swing.util.editor.VesselTableCell; import jaxx.runtime.SwingUtil; @@ -100,17 +101,21 @@ // APPLICATION - VesselTableCell vesselTableCellComponent = new VesselTableCell(mainUI.getHandler().getContext()); helper.addCategory(n_("tutti.config.category.applications"), n_("tutti.config.category.applications.description"), CALLBACK_APPLICATION) .addOption(TuttiServiceConfigOption.DATA_DIRECTORY) .addOption(TuttiServiceConfigOption.SITE_URL) .addOption(TuttiApplicationConfigOption.UI_CONFIG_FILE) - .addOption(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE) - .addOption(TuttiApplicationConfigOption.TREMIE_CAROUSSEL_VESSEL_ID) + .addOption(TuttiApplicationConfigOption.TOTAL_SORTED_WEIGHTS_DIFFERENCE_RATE); + + TuttiUIContext context = mainUI.getHandler().getContext(); + if (context.isDbLoaded()) { + VesselTableCell vesselTableCellComponent = new VesselTableCell(context); + helper.addOption(TuttiApplicationConfigOption.TREMIE_CAROUSSEL_VESSEL_ID) .setOptionEditor(vesselTableCellComponent.getNewTableCellEditor()) .setOptionRenderer(vesselTableCellComponent.getNewTableCellRenderer()); + } // UI Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-12 09:49:05 UTC (rev 584) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/SelectSpeciesUI.css 2013-03-12 10:35:17 UTC (rev 585) @@ -40,4 +40,5 @@ text: "tutti.action.validate"; actionIcon: accept; mnemonic:V; + enabled: {model.getSelectedSpecies() != null}; } \ No newline at end of file