Author: tchemit Date: 2013-09-27 15:45:06 +0200 (Fri, 27 Sep 2013) New Revision: 1244 Url: http://forge.codelutin.com/projects/tutti/repository/revisions/1244 Log: improve css fix i18n add reset for add length step combo box Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties Modified: trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java =================================================================== --- trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-service/src/main/java/fr/ifremer/tutti/service/DecoratorService.java 2013-09-27 13:45:06 UTC (rev 1244) @@ -158,6 +158,7 @@ n_("tutti.property.cruise"); n_("tutti.property.fishingOperation"); n_("tutti.property.fishingOperationLocation"); + n_("tutti.property.tuttiLocation"); n_("tutti.property.zone"); n_("tutti.property.vessel"); n_("tutti.property.country"); Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_en_GB.properties 2013-09-27 13:45:06 UTC (rev 1244) @@ -41,6 +41,7 @@ tutti.property.stationNumber= tutti.property.strata= tutti.property.surveyCode= +tutti.property.tuttiLocation= tutti.property.user= tutti.property.vessel= tutti.property.zone= Modified: trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties =================================================================== --- trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-service/src/main/resources/i18n/tutti-service_fr_FR.properties 2013-09-27 13:45:06 UTC (rev 1244) @@ -41,6 +41,7 @@ tutti.property.stationNumber=Numéro de station tutti.property.strata=Strate d'association tutti.property.surveyCode=Code campagne +tutti.property.tuttiLocation=Lieu tutti.property.user=Utilisateur tutti.property.vessel=Navire tutti.property.zone=Zone Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/category/EditSampleCategoryModelUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -22,7 +22,6 @@ * #L% */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/cruise/GearCaracteristicsEditorUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -20,7 +20,6 @@ * #L% */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/home/SelectCruiseUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -24,7 +24,6 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/EditFishingOperationUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -28,13 +28,11 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } BeanDoubleList { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/FishingOperationsUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -24,7 +24,6 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/accidental/create/CreateAccidentalBatchUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -21,7 +21,6 @@ */ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -24,7 +24,6 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/frequency/BenthosFrequencyUIHandler.java 2013-09-27 13:45:06 UTC (rev 1244) @@ -413,6 +413,7 @@ BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<Caracteristic>(); editor.setBeanType(Caracteristic.class); + editor.setShowReset(true); initBeanFilterableComboBox(editor, toSelect, null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/individualobservation/create/CreateIndividualObservationBatchUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -21,7 +21,6 @@ */ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/marinelitter/create/CreateMarineLitterBatchUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -23,7 +23,6 @@ */ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -24,7 +24,6 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUIHandler.java 2013-09-27 13:45:06 UTC (rev 1244) @@ -411,6 +411,7 @@ BeanFilterableComboBox<Caracteristic> editor = new BeanFilterableComboBox<Caracteristic>(); editor.setBeanType(Caracteristic.class); + editor.setShowReset(true); initBeanFilterableComboBox(editor, toSelect, null); Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/GearUseFeatureTabUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -23,7 +23,6 @@ */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/fishing/VesselUseFeatureTabUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -23,7 +23,6 @@ */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/program/EditProgramUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -24,7 +24,6 @@ BeanFilterableComboBox { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/protocol/EditProtocolUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -23,14 +23,12 @@ */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } BeanDoubleList { showReset: true; showSelectPopupEnabled: true; - i18nPrefix: "tutti.property."; bean: {model}; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/caracteristics/CaracteristicMapEditorUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -20,7 +20,6 @@ * #L% */ BeanFilterableComboBox { - i18nPrefix: "tutti.property."; showReset: true; } Modified: trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css =================================================================== --- trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/util/species/SelectSpeciesUI.css 2013-09-27 13:45:06 UTC (rev 1244) @@ -23,7 +23,6 @@ */ #speciesCombo { showReset: true; - i18nPrefix: "tutti.property."; bean: {model}; property: selectedSpecies; selectedItem: {model.getSelectedSpecies()}; Modified: trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties =================================================================== --- trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-27 13:22:40 UTC (rev 1243) +++ trunk/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properties 2013-09-27 13:45:06 UTC (rev 1244) @@ -976,9 +976,9 @@ tutti.editSpeciesBatch.table.header.toConfirm=A Confirmer tutti.editSpeciesBatch.table.header.weight=Poids sous-échantillonné tutti.editSpeciesBatch.title.changeSampleCategoryValue=Changer la valeur de la catégorie %s -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic= -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic= -tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip= +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic=... +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.mnemonic=. +tutti.editSpeciesFrequencies.action.addLengthStepCaracteristic.tip=Sélectionner une autre caractéristique tutti.editSpeciesFrequencies.action.cancel=Annuler tutti.editSpeciesFrequencies.action.cancel.mnemonic=A tutti.editSpeciesFrequencies.action.cancel.tip=Annuler l'édition des mensurations