This is an automated email from the git hooks/post-receive script. New commit to branch feature/8140 in repository tutti. See https://gitlab.nuiton.org/codelutin/tutti.git commit db357c622d3a15e0c3d67986908a1200fbd73fa1 Author: Tony CHEMIT <chemit@codelutin.com> Date: Wed Mar 16 18:47:34 2016 +0100 Ajout de deux titres (See #8140) --- .../operation/catches/species/frequency/SpeciesFrequencyUI.jaxx | 4 ++-- .../operation/catches/species/frequency/SpeciesFrequencyUI.jcss | 8 ++++++++ .../src/main/resources/i18n/tutti-ui-swing_en_GB.properties | 2 ++ .../src/main/resources/i18n/tutti-ui-swing_fr_FR.properties | 2 ++ 4 files changed, 14 insertions(+), 2 deletions(-) diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx index f8e5990..09d5ae7 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jaxx @@ -242,7 +242,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { <cell columns="2" weightx="1"> <JPanel id='dataFieldPanel'> <JSplitPane constraints='"lengthCaracteristicPmfm"' id="firstSplitPane"> - <JPanel layout="{new BorderLayout()}"> + <JPanel id='frequenciesPanel' layout="{new BorderLayout()}"> <Table constraints='BorderLayout.NORTH' fill="both" id="lengthstepSettingsBlock"> @@ -278,7 +278,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) { </JScrollPane> </JSplitPane> </JPanel> - <JPanel layout="{new BorderLayout()}"> + <JPanel id='individualObservationsPanel' layout="{new BorderLayout()}"> <HBox id="copyToSizeTablePanel" verticalAlignment='{SwingConstants.CENTER}' constraints="BorderLayout.NORTH"> diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss index 3535084..8530b8b 100644 --- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss +++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/frequency/SpeciesFrequencyUI.jcss @@ -330,6 +330,14 @@ ComputableDataEditor { resizeWeight: 0.6; } +#frequenciesPanel { + border: {BorderFactory.createTitledBorder(t("tutti.editSpeciesFrequencies.frequenciesPanel"))}; +} + +#individualObservationsPanel { + border: {BorderFactory.createTitledBorder(t("tutti.editSpeciesFrequencies.individualObservationsPanel"))}; +} + #lengthstepSettingsBlock { border: {BorderFactory.createEmptyBorder(5, 10, 5, 10)}; } 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 6234059..6cca7c3 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 @@ -1595,7 +1595,9 @@ tutti.editSpeciesFrequencies.field.totalWeight= tutti.editSpeciesFrequencies.field.totalWeight.tip= tutti.editSpeciesFrequencies.field.useRtp= tutti.editSpeciesFrequencies.field.useRtp.tip= +tutti.editSpeciesFrequencies.frequenciesPanel= tutti.editSpeciesFrequencies.ichtyometerConnected= +tutti.editSpeciesFrequencies.individualObservationsPanel= tutti.editSpeciesFrequencies.label.no.configuration= tutti.editSpeciesFrequencies.logTable.header.date= tutti.editSpeciesFrequencies.logTable.header.label= 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 6ebd56d..62d343d 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 @@ -1488,6 +1488,8 @@ tutti.editSpeciesFrequencies.field.totalWeight=Poids total tutti.editSpeciesFrequencies.field.totalWeight.tip=Poids total des lignes valides tutti.editSpeciesFrequencies.field.useRtp=Utiliser les RTP tutti.editSpeciesFrequencies.field.useRtp.tip=Utiliser les RTP +tutti.editSpeciesFrequencies.frequenciesPanel=Mensurations +tutti.editSpeciesFrequencies.individualObservationsPanel=Observations individuelles tutti.editSpeciesFrequencies.label.no.configuration=< Pas de configuration > tutti.editSpeciesFrequencies.logTable.header.label=Logs tutti.editSpeciesFrequencies.logTable.removeRow.confirm.message=Êtes-vous sûr de vouloir supprimer la mesure %s ? -- To stop receiving notification emails like this one, please contact codelutin.com SCM administrator <admin+scm@codelutin.com>.