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 9ea0ad0a7c22c1d3d36fd31cf00012ab34b35863 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Jan 28 19:08:09 2015 +0100 refs #6569: [ERGONOMIE] amélioration de la visibilité et du déclanchement des .csv et .pdf sur les traits (tentative d'amélioration du style) --- .../tutti/ui/swing/content/operation/EditFishingOperationUI.css | 9 ++++++++- .../tutti/ui/swing/content/operation/catches/EditCatchesUI.css | 9 ++++++++- .../content/operation/catches/accidental/AccidentalBatchUI.css | 9 ++++++++- .../swing/content/operation/catches/benthos/BenthosBatchUI.css | 9 ++++++++- .../individualobservation/IndividualObservationBatchUI.css | 9 ++++++++- .../operation/catches/marinelitter/MarineLitterBatchUI.css | 9 ++++++++- .../swing/content/operation/catches/species/SpeciesBatchUI.css | 9 ++++++++- .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 4 ++-- 8 files changed, 58 insertions(+), 9 deletions(-) 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 a93bf75..ee40fca 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 @@ -79,11 +79,17 @@ JXDatePicker { #traitGeneralTabPaneToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -106,6 +112,7 @@ JXDatePicker { #fishingOperationAttachmentsButton { enabled: {model.getId() != null}; toolTipText: "tutti.editFishingOperation.action.attachments.tip"; + focusPainted: false; _help: {"tutti.editFishingOperation.action.attachments.help"}; } 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 b6afd48..f8369c0 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 @@ -42,11 +42,17 @@ ComputableDataEditor { #catchesCaracteristicsTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -55,6 +61,7 @@ ComputableDataEditor { #catchesCaracteristicsAttachmentsButton { enabled: {model.getObjectId() != null}; toolTipText: "tutti.editCatchBatch.action.attachments.tip"; + focusPainted: false; } #catchesCaracteristicsTabPane { 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 c73183a..592c68d 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 @@ -33,11 +33,17 @@ NumberEditor { #accidentalBatchTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -45,6 +51,7 @@ NumberEditor { #accidentalBatchAttachmentsButton { toolTipText: "tutti.editAccidentalBatch.action.attachments.tip"; + focusPainted: false; } #tablePopup { 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 4790dea..2ffead7 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 @@ -43,11 +43,17 @@ ComputableDataEditor { #benthosBatchTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -55,6 +61,7 @@ ComputableDataEditor { #benthosBatchAttachmentsButton { toolTipText: "tutti.editBenthosBatch.action.attachments.tip"; + focusPainted: false; } #benthosTotalWeightLabel { 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 30970c7..1373833 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 @@ -26,11 +26,17 @@ #individualObservationBatchTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -38,6 +44,7 @@ #individualObservationBatchAttachmentsButton { toolTipText: "tutti.editIndividualObservationBatch.action.attachments.tip"; + focusPainted: false; } #tablePopup { 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 27a1722..ee18641 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 @@ -33,11 +33,17 @@ ComputableDataEditor { #marineLitterBatchTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -45,6 +51,7 @@ ComputableDataEditor { #marineLitterBatchAttachmentsButton { toolTipText: "tutti.editMarineLitterBatch.action.attachments.tip"; + focusPainted: false; } #marineLitterTotalWeightLabel { 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 0f0f6d4..8c38d3c 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 @@ -43,11 +43,17 @@ ComputableDataEditor { #speciesBatchTabToolBar { floatable: false; - opaque: false; + opaque: true; borderPainted: false; } +#menu { + border:{null}; + background:{javax.swing.UIManager.getColor("MenuBar.background")}; +} + #menuAction { + opaque: true; text: "tutti.toolbar.menu.action"; toolTipText: "tutti.toolbar.menu.action.tip"; i18nMnemonic: "tutti.toolbar.menu.action.mnemonic"; @@ -55,6 +61,7 @@ ComputableDataEditor { #speciesBatchAttachmentsButton { toolTipText: "tutti.editSpeciesBatch.action.attachments.tip"; + focusPainted: false; } #speciesTotalWeightLabel { 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 5e5c4b7..e05a6b8 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 @@ -1462,7 +1462,7 @@ tutti.main.menu.file=Fichier tutti.main.menu.file.mnemonic=h tutti.main.menu.file.tip=Fichier tutti.main.menu.help=Aide -tutti.main.menu.help.mnemonic=A +tutti.main.menu.help.mnemonic=Z tutti.main.menu.help.tip=Aide tutti.main.title.application=Allegro Campagne - v %s [%s] tutti.main.title.applicationName=Allegro Campagne @@ -1747,7 +1747,7 @@ 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.toolbar.menu.action=Actions -tutti.toolbar.menu.action.mnemonic=c +tutti.toolbar.menu.action.mnemonic=A 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 -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.