From scm@users.codelutin.com Wed Mar 16 18:47:45 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] branch feature/8140 created (now db357c6)
Date: Wed, 16 Mar 2016 18:47:45 +0100
Message-ID: <20160316174745.21516.93437@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============1115511364783896250=="

--===============1115511364783896250==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: 7bit

This is an automated email from the git hooks/post-receive script.

New change to branch feature/8140 in repository tutti.

See https://gitlab.nuiton.org/codelutin/tutti.git

        at  db357c6   Ajout de deux titres (See #8140)

This branch includes the following new commits:

       new  db357c6   Ajout de deux titres (See #8140)

The 1 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 db357c622d3a15e0c3d67986908a1200fbd73fa1
Author: Tony CHEMIT <chemit@codelutin.com>
Date:   Wed Mar 16 18:47:34 2016 +0100

    Ajout de deux titres (See #8140)

-- 
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============1115511364783896250==--


From scm@users.codelutin.com Wed Mar 16 18:47:45 2016
From: "codelutin.com scm" <scm@users.codelutin.com>
To: tutti-commits@list.forge.codelutin.com
Subject: [Tutti-commits] 01/01: Ajout de deux titres (See #8140)
Date: Wed, 16 Mar 2016 18:47:46 +0100
Message-ID: <20160316174745.AB3EB5C254C@goh.codelutin.com>
In-Reply-To: <20160316174745.21516.93437@bihar.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============4939940533153751337=="

--===============4939940533153751337==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

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/o=
peration/catches/species/frequency/SpeciesFrequencyUI.jaxx b/tutti-ui-swing/s=
rc/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/freq=
uency/SpeciesFrequencyUI.jaxx
index f8e5990..09d5ae7 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jaxx
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jaxx
@@ -242,7 +242,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
       <cell columns=3D"2" weightx=3D"1">
         <JPanel id=3D'dataFieldPanel'>
           <JSplitPane constraints=3D'"lengthCaracteristicPmfm"' id=3D"firstS=
plitPane">
-            <JPanel layout=3D"{new BorderLayout()}">
+            <JPanel id=3D'frequenciesPanel' layout=3D"{new BorderLayout()}">
               <Table constraints=3D'BorderLayout.NORTH'
                      fill=3D"both"
                      id=3D"lengthstepSettingsBlock">
@@ -278,7 +278,7 @@ public SpeciesFrequencyUI(TuttiUI parentUI) {
                 </JScrollPane>
               </JSplitPane>
             </JPanel>
-            <JPanel layout=3D"{new BorderLayout()}">
+            <JPanel id=3D'individualObservationsPanel' layout=3D"{new Border=
Layout()}">
               <HBox id=3D"copyToSizeTablePanel"
                     verticalAlignment=3D'{SwingConstants.CENTER}'
                     constraints=3D"BorderLayout.NORTH">
diff --git a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/o=
peration/catches/species/frequency/SpeciesFrequencyUI.jcss b/tutti-ui-swing/s=
rc/main/java/fr/ifremer/tutti/ui/swing/content/operation/catches/species/freq=
uency/SpeciesFrequencyUI.jcss
index 3535084..8530b8b 100644
--- a/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jcss
+++ b/tutti-ui-swing/src/main/java/fr/ifremer/tutti/ui/swing/content/operatio=
n/catches/species/frequency/SpeciesFrequencyUI.jcss
@@ -330,6 +330,14 @@ ComputableDataEditor {
   resizeWeight: 0.6;
 }
=20
+#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.prop=
erties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_en_GB.properti=
es
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=3D
 tutti.editSpeciesFrequencies.field.totalWeight.tip=3D
 tutti.editSpeciesFrequencies.field.useRtp=3D
 tutti.editSpeciesFrequencies.field.useRtp.tip=3D
+tutti.editSpeciesFrequencies.frequenciesPanel=3D
 tutti.editSpeciesFrequencies.ichtyometerConnected=3D
+tutti.editSpeciesFrequencies.individualObservationsPanel=3D
 tutti.editSpeciesFrequencies.label.no.configuration=3D
 tutti.editSpeciesFrequencies.logTable.header.date=3D
 tutti.editSpeciesFrequencies.logTable.header.label=3D
diff --git a/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.prop=
erties b/tutti-ui-swing/src/main/resources/i18n/tutti-ui-swing_fr_FR.properti=
es
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=3DPoids =
total
 tutti.editSpeciesFrequencies.field.totalWeight.tip=3DPoids total des lignes =
valides
 tutti.editSpeciesFrequencies.field.useRtp=3DUtiliser les RTP
 tutti.editSpeciesFrequencies.field.useRtp.tip=3DUtiliser les RTP
+tutti.editSpeciesFrequencies.frequenciesPanel=3DMensurations
+tutti.editSpeciesFrequencies.individualObservationsPanel=3DObservations indi=
viduelles
 tutti.editSpeciesFrequencies.label.no.configuration=3D< Pas de configuration=
 >
 tutti.editSpeciesFrequencies.logTable.header.label=3DLogs
 tutti.editSpeciesFrequencies.logTable.removeRow.confirm.message=3D=C3=8Ates-=
vous s=C3=BBr de vouloir supprimer la mesure %s ?

--=20
To stop receiving notification emails like this one, please contact
codelutin.com SCM administrator <admin+scm@codelutin.com>.

--===============4939940533153751337==--