branch feature/7928 created (now 756f3ec)
This is an automated email from the git hooks/post-receive script. New change to branch feature/7928 in repository tutti. See http://git.codelutin.com/tutti.git at 756f3ec mise en avant des textes (couleur fond + texte) dans la creation de lot benthos (fixes #7928) This branch includes the following new commits: new ca2b99e mise en avant des textes (couleur fond + texte) dans la creation de lot espèces (refs #7928) new 756f3ec mise en avant des textes (couleur fond + texte) dans la creation de lot benthos (fixes #7928) The 2 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 756f3ec807ae06e761e119660b9abaf24362b3ba Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 20 17:05:51 2016 +0100 mise en avant des textes (couleur fond + texte) dans la creation de lot benthos (fixes #7928) commit ca2b99e9baa766aaf020638d3d95b39c283a5c5d Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 20 16:25:25 2016 +0100 mise en avant des textes (couleur fond + texte) dans la creation de lot espèces (refs #7928) -- 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 feature/7928 in repository tutti. See http://git.codelutin.com/tutti.git commit ca2b99e9baa766aaf020638d3d95b39c283a5c5d Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 20 16:25:25 2016 +0100 mise en avant des textes (couleur fond + texte) dans la creation de lot espèces (refs #7928) --- .../main/java/fr/ifremer/tutti/TuttiConfiguration.java | 8 ++++++++ .../java/fr/ifremer/tutti/TuttiConfigurationOption.java | 16 ++++++++++++++++ .../resources/i18n/tutti-persistence_en_GB.properties | 2 ++ .../resources/i18n/tutti-persistence_fr_FR.properties | 2 ++ .../ui/swing/content/config/TuttiConfigUIHandler.java | 6 ++++++ .../catches/species/create/CreateSpeciesBatchUI.jcss | 9 +++++++++ .../main/resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 8 files changed, 47 insertions(+) diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java index 0f8f274..20371ce 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfiguration.java @@ -668,6 +668,14 @@ public class TuttiConfiguration extends ApplicationConfiguration { return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_MARINE_LITTER.getKey()); } + public Color getColorHighlightInfoBackground() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_HIGHLIGHT_INFO_BACKGROUND.getKey()); + } + + public Color getColorHighlightInfoForeground() { + return applicationConfig.getOptionAsColor(TuttiConfigurationOption.COLOR_HIGHLIGHT_INFO_FOREGROUND.getKey()); + } + @Override public KeyStroke getShortcutClosePopup() { return applicationConfig.getOptionAsKeyStroke(TuttiConfigurationOption.SHORTCUT_CLOSE_POPUP.getKey()); diff --git a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java index 03555f2..7a04696 100644 --- a/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java +++ b/tutti-persistence/src/main/java/fr/ifremer/tutti/TuttiConfigurationOption.java @@ -550,6 +550,22 @@ public enum TuttiConfigurationOption implements ConfigOptionDef { false ), + COLOR_HIGHLIGHT_INFO_BACKGROUND( + "tutti.ui.color.hightlightInfo.background", + n("tutti.config.option.ui.color.hightlightInfo.background.description"), + Color.YELLOW.toString(), + Color.class, + false + ), + + COLOR_HIGHLIGHT_INFO_FOREGROUND( + "tutti.ui.color.hightlightInfo.foreground", + n("tutti.config.option.ui.color.hightlightInfo.foreground.description"), + Color.BLACK.toString(), + Color.class, + false + ), + SHORTCUT_CLOSE_POPUP( "tutti.ui.shortcut.closePopup", n("tutti.config.option.ui.shortcut.closePopup.description"), diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties index 5a20bce..14557b6 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_en_GB.properties @@ -63,6 +63,8 @@ tutti.config.option.ui.color.blockingLayer.description= tutti.config.option.ui.color.catch.description= tutti.config.option.ui.color.cellWithValue.description= tutti.config.option.ui.color.computedWeights.description= +tutti.config.option.ui.color.hightlightInfo.background.description= +tutti.config.option.ui.color.hightlightInfo.foreground.description= tutti.config.option.ui.color.marineLitter.description= tutti.config.option.ui.color.rowInvalid.description= tutti.config.option.ui.color.rowReadOnly.description= diff --git a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties index d817e42..4f79873 100644 --- a/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties +++ b/tutti-persistence/src/main/resources/i18n/tutti-persistence_fr_FR.properties @@ -59,6 +59,8 @@ tutti.config.option.ui.color.blockingLayer.description=Couleur utilisée pour bl tutti.config.option.ui.color.catch.description=Couleur pour représenter les captures dans l'écran de résumé des captures tutti.config.option.ui.color.cellWithValue.description=Couleur d'une cellule avec des données tutti.config.option.ui.color.computedWeights.description=Couleur des données calculées +tutti.config.option.ui.color.hightlightInfo.background.description=Couleur du fond des libellés mis en avant +tutti.config.option.ui.color.hightlightInfo.foreground.description=Couleur du texte des libellés mis en avant tutti.config.option.ui.color.marineLitter.description=Couleur pour représenter les macro-déchets dans l'écran de résumé des captures tutti.config.option.ui.color.rowInvalid.description=Ligne invalide tutti.config.option.ui.color.rowReadOnly.description=Cellule non éditable diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java index 95bae99..e539e0c 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/config/TuttiConfigUIHandler.java @@ -224,6 +224,12 @@ public class TuttiConfigUIHandler extends AbstractTuttiUIHandler<TuttiUIContext, .addOption(TuttiConfigurationOption.COLOR_MARINE_LITTER) .setOptionShortLabel(t("tutti.config.option.ui.color.marineLitter.shortLabel")) + .addOption(TuttiConfigurationOption.COLOR_HIGHLIGHT_INFO_BACKGROUND) + .setOptionShortLabel(t("tutti.config.option.ui.color.hightlightInfo.background.shortLabel")) + + .addOption(TuttiConfigurationOption.COLOR_HIGHLIGHT_INFO_FOREGROUND) + .setOptionShortLabel(t("tutti.config.option.ui.color.hightlightInfo.foreground.shortLabel")) + .addOption(TuttiConfigurationOption.DATE_FORMAT) .setOptionShortLabel(t("tutti.config.option.ui.dateFormat.shortLabel")) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss index 71b69cb..7fac441 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/create/CreateSpeciesBatchUI.jcss @@ -54,6 +54,10 @@ NumberEditor { visible: { model.getSpeciesProtocolFrequencyMode() != null }; text: { model.getSpeciesProtocolFrequencyMode().toString() }; font-weight: bold; + background: { handler.getConfig().getColorHighlightInfoBackground() }; + foreground: { handler.getConfig().getColorHighlightInfoForeground() }; + opaque: true; + border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; } #categoryPanel { @@ -108,6 +112,9 @@ NumberEditor { toolTipText: "tutti.createSpeciesBatch.field.batchCount.tip"; labelFor: {batchCountField}; font-weight: { CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; + background: {CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoBackground() : null}; + foreground: {CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoForeground() : null}; + opaque: {CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode()}; _help: {"tutti.createSpeciesBatch.field.batchCount.help"}; } @@ -195,6 +202,8 @@ NumberEditor { i18nMnemonic: "tutti.createSpeciesBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; font-weight: { CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; + background: {CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoBackground() : null}; + foreground: {CreateSpeciesBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() && model.isValid() ? handler.getConfig().getColorHighlightInfoForeground() : null}; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.species.create.actions.CreateSpeciesBatchAndFrequenciesAction.class}; _help: {"tutti.createSpeciesBatch.action.saveAndFrequencies.help"}; } 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 a4669b9..0d842cd 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 @@ -157,6 +157,8 @@ tutti.config.option.ui.color.blockingLayer.shortLabel= tutti.config.option.ui.color.catch.shortLabel= tutti.config.option.ui.color.cellWithValue.shortLabel= tutti.config.option.ui.color.computedWeights.shortLabel= +tutti.config.option.ui.color.hightlightInfo.background.shortLabel= +tutti.config.option.ui.color.hightlightInfo.foreground.shortLabel= tutti.config.option.ui.color.marineLitter.shortLabel= tutti.config.option.ui.color.rowInvalid.shortLabel= tutti.config.option.ui.color.rowReadOnly.shortLabel= 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 61efbe2..ae8d0a0 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 @@ -139,6 +139,8 @@ tutti.config.option.ui.color.blockingLayer.shortLabel=Couleur d'attente tutti.config.option.ui.color.catch.shortLabel=Couleur des libellés de capture (Écran Capture > Résumé) tutti.config.option.ui.color.cellWithValue.shortLabel=Couleur cellule avec donnée tutti.config.option.ui.color.computedWeights.shortLabel=Couleur de valeur calculée +tutti.config.option.ui.color.hightlightInfo.background.shortLabel=Couleur du fond des libellés mis en avant +tutti.config.option.ui.color.hightlightInfo.foreground.shortLabel=Couleur du texte des libellés mis en avant tutti.config.option.ui.color.marineLitter.shortLabel=Couleur des libellés de macro-déchets (Écran Capture > Résumé) tutti.config.option.ui.color.rowInvalid.shortLabel=Couleur d'une ligne invalide tutti.config.option.ui.color.rowReadOnly.shortLabel=Couleur d'une cellule en lecture seule -- 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 feature/7928 in repository tutti. See http://git.codelutin.com/tutti.git commit 756f3ec807ae06e761e119660b9abaf24362b3ba Author: Kevin Morin <morin@codelutin.com> Date: Wed Jan 20 17:05:51 2016 +0100 mise en avant des textes (couleur fond + texte) dans la creation de lot benthos (fixes #7928) --- .../operation/catches/benthos/create/CreateBenthosBatchUI.jcss | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss index d13bdda..00e7293 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/benthos/create/CreateBenthosBatchUI.jcss @@ -54,6 +54,10 @@ NumberEditor { visible: { model.getSpeciesProtocolFrequencyMode() != null }; text: { model.getSpeciesProtocolFrequencyMode().toString() }; font-weight: bold; + background: { handler.getConfig().getColorHighlightInfoBackground() }; + foreground: { handler.getConfig().getColorHighlightInfoForeground() }; + opaque: true; + border: {new javax.swing.border.EmptyBorder(5, 10, 5, 10)}; } #categoryPanel { @@ -108,6 +112,9 @@ NumberEditor { toolTipText: "tutti.createBenthosBatch.field.batchCount.tip"; labelFor: {batchCountField}; font-weight: { CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; + background: {CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoBackground() : null}; + foreground: {CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoForeground() : null}; + opaque: {CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.COUNT == model.getSpeciesProtocolFrequencyMode()}; _help: {"tutti.createBenthosBatch.field.batchCount.help"}; } @@ -195,6 +202,8 @@ NumberEditor { i18nMnemonic: "tutti.createBenthosBatch.action.saveAndFrequencies.mnemonic"; enabled: {model.isValid()}; font-weight: { CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? "bold" : "normal" }; + background: {CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() ? handler.getConfig().getColorHighlightInfoBackground() : null}; + foreground: {CreateBenthosBatchUIModel.SpeciesProtocolFrequencyMode.MEASURE == model.getSpeciesProtocolFrequencyMode() && model.isValid() ? handler.getConfig().getColorHighlightInfoForeground() : null}; _simpleAction: {fr.ifremer.tutti.ui.swing.content.operation.catches.benthos.create.actions.CreateBenthosBatchAndFrequenciesAction.class}; _help: {"tutti.createBenthosBatch.action.saveAndFrequencies.help"}; } -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.
participants (1)
-
codelutin.com scm