From chatellier@users.labs.libre-entreprise.org Mon Jun 15 04:19:30 2026
From: chatellier@users.labs.libre-entreprise.org
To: coser-commits@list.forge.codelutin.com
Subject: [Coser-commits] r146 - in trunk/coser-ui/src/main:
	java/fr/ifremer/coser/ui/control resources/i18n
Date: Tue, 02 Nov 2010 17:24:38 +0100
Message-ID: <20101102162438.C635C2FACED@labs.libre-entreprise.org>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0127054322556026645=="

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

Author: chatellier
Date: 2010-11-02 16:24:38 +0000 (Tue, 02 Nov 2010)
New Revision: 146

Log:
Add graph button caption text.
Add L1, L2... code in selection liste titles

Modified:
   trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx
   trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties
   trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties

Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlVie=
w.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx=
	2010-11-02 16:23:57 UTC (rev 145)
+++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/control/ControlView.jaxx=
	2010-11-02 16:24:38 UTC (rev 146)
@@ -46,7 +46,8 @@
                     renderer=3D"{new fr.ifremer.coser.ui.control.ControlCate=
goryListRenderer()}"
                     onActionPerformed=3D"getHandler().categoryChanged(this, =
event)"/>
                 <JSeparator />
-                <JButton icon=3D"chart_bar.png" onActionPerformed=3D"getHand=
ler().displayGraph(this)"/>
+                <JButton icon=3D"chart_bar.png" text=3D"coser.ui.graph.compa=
reNumberCatchSize"
+                    onActionPerformed=3D"getHandler().displayGraph(this)"/>
             </JToolBar>
         </cell>
     </row>
@@ -62,7 +63,7 @@
         </cell>
     </row>
     <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"3" columns=3D"2">
+        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
             <JScrollPane id=3D"editionScrollPane">
                 <Table>
                     <row>
@@ -82,7 +83,7 @@
                                 enabled=3D"false" />
                         </cell>
                         <cell>
-                            <JButton id=3D"controlDataDeleteButton" text=3D"=
coser.ui.common.delete"
+                            <JButton id=3D"controlDataDeleteButton" text=3D"=
coser.ui.control.deleteLine"
                                 onActionPerformed=3D"getHandler().deleteData=
(this)"
                                 enabled=3D"false" />
                         </cell>
@@ -91,9 +92,7 @@
                =20
             </JScrollPane>
         </cell>
-    </row>
-    <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"2" columns=3D"2">
+        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
             <jaxx.runtime.validator.swing.SwingValidatorMessageTableModel id=
=3D'errorsTableModel'
                 onTableChanged=3D'saveButton.setEnabled(errorsTableModel.get=
RowCount()=3D=3D0)'/>
             <fr.ifremer.coser.data.Catch id=3D"beanCatch" javaBean=3D"null" =
/>
@@ -120,7 +119,7 @@
         </cell>
     </row>
     <row>
-        <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"2">
+        <cell fill=3D"both" weightx=3D"1" weighty=3D"1">
             <JScrollPane>
                 <GlobalValidationModel id=3D"globalValidationModel" />
                 <JTable id=3D'validationGlobalErrorsTable' model=3D"{globalV=
alidationModel}"
@@ -131,6 +130,11 @@
                     onValueChanged=3D"getHandler().showSelectedError(this, e=
vent)" />
             </JScrollPane>
         </cell>
+        <cell fill=3D"both" weighty=3D"1">
+            <JScrollPane>
+                <JXTextArea constructorParams=3D'_("coser.ui.common.comment"=
)' rows=3D"3" />
+            </JScrollPane>
+        </cell>
     </row>
     <row>
         <cell anchor=3D"center" weightx=3D"1" fill=3D"horizontal">
@@ -141,13 +145,6 @@
         </cell>
     </row>
     <row>
-        <cell fill=3D"both" weighty=3D"1" columns=3D"2">
-            <JScrollPane>
-                <JXTextArea constructorParams=3D'_("coser.ui.common.comment"=
)' rows=3D"3" />
-            </JScrollPane>
-        </cell>
-    </row>
-    <row>
         <cell anchor=3D"east" columns=3D"2">
             <JButton id=3D"saveButton" text=3D"coser.ui.control.save" enable=
d=3D"false"
                 onActionPerformed=3D"getHandler().saveControl(this)" />

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties	2010-11-=
02 16:23:57 UTC (rev 145)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui-en_GB.properties	2010-11-=
02 16:24:38 UTC (rev 146)
@@ -19,6 +19,7 @@
 coser.ui.control.confirmDeletionTitle=3DConfirm delete
 coser.ui.control.dataMenuLabel=3DData menu
 coser.ui.control.dataMenuReplace=3DReplace in %s
+coser.ui.control.deleteLine=3DDelete line
 coser.ui.control.global.level=3DType
 coser.ui.control.global.message=3DMessage
 coser.ui.control.graphtitle=3DGraph
@@ -29,6 +30,7 @@
 coser.ui.control.save=3DSave
 coser.ui.error.htmlmessage=3DAn error occurs \: %s
 coser.ui.error.title=3DGlobal application error
+coser.ui.graph.compareNumberCatchSize=3D
 coser.ui.mainframe.menu.configuration=3DConfiguration
 coser.ui.mainframe.menu.file=3DFile
 coser.ui.mainframe.menu.locale.fr=3DFran\u00E7ais
@@ -73,7 +75,7 @@
 coser.ui.result.otherDataFile=3DOther files \:
 coser.ui.result.resultName=3DResult name \:
 coser.ui.result.rsufiVersion=3DRSufi version
-coser.ui.selection.allSpecies=3DAll species
+coser.ui.selection.allSpecies=3DL1 : All species
 coser.ui.selection.createError=3DCreation error
 coser.ui.selection.details.beginDate=3DBegin date \:
 coser.ui.selection.details.endDate=3DEnd date \:
@@ -94,10 +96,10 @@
 coser.ui.selection.fusion.title=3DMerge
 coser.ui.selection.fusionError=3DMerge error
 coser.ui.selection.invalidFusionName=3DSelection fusion name not found in re=
ferential \!
-coser.ui.selection.maturitySpecies=3DSpecies with maturity
-coser.ui.selection.occurenceDensitySpecies=3DFiltered species
+coser.ui.selection.maturitySpecies=3DL4 : Species with maturity
+coser.ui.selection.occurenceDensitySpecies=3DL2 : Filtered species
 coser.ui.selection.saveError=3DSave error
-coser.ui.selection.sizeAllYearSpecies=3DSpecies with size all year
+coser.ui.selection.sizeAllYearSpecies=3DL3 : Species with size all year
 coser.ui.selection.speciesMenuFusion=3DMerge
 coser.ui.selection.speciesMenuLabel=3DSpecies menu
 coser.ui.selection.tab.details=3DSelection details

Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties	2010-11-=
02 16:23:57 UTC (rev 145)
+++ trunk/coser-ui/src/main/resources/i18n/coser-ui-fr_FR.properties	2010-11-=
02 16:24:38 UTC (rev 146)
@@ -19,6 +19,7 @@
 coser.ui.control.confirmDeletionTitle=3DConfirmation de suppression
 coser.ui.control.dataMenuLabel=3DMenu des donn\u00E9es
 coser.ui.control.dataMenuReplace=3DRemplacer dans %s
+coser.ui.control.deleteLine=3DSupprimer la ligne
 coser.ui.control.global.level=3DType
 coser.ui.control.global.message=3DMessage
 coser.ui.control.graphtitle=3DGraphique
@@ -29,6 +30,7 @@
 coser.ui.control.save=3DSauvegarder
 coser.ui.error.htmlmessage=3DUne erreur s'est produite \: %s
 coser.ui.error.title=3DErreur globale
+coser.ui.graph.compareNumberCatchSize=3DComparaison Captures/Tailles
 coser.ui.mainframe.menu.configuration=3DConfiguration
 coser.ui.mainframe.menu.file=3DFichier
 coser.ui.mainframe.menu.locale.fr=3DFran\u00E7ais
@@ -73,7 +75,7 @@
 coser.ui.result.otherDataFile=3DAutre fichiers \:
 coser.ui.result.resultName=3DNom du r\u00E9sultat \:
 coser.ui.result.rsufiVersion=3DVersion de RSufi \:
-coser.ui.selection.allSpecies=3DToutes les esp\u00E8ces
+coser.ui.selection.allSpecies=3DL1 \: Toutes les esp\u00E8ces
 coser.ui.selection.createError=3DErreur de cr\u00E9action
 coser.ui.selection.details.beginDate=3DDate de d\u00E9but \:
 coser.ui.selection.details.endDate=3DDate de fin \:
@@ -94,10 +96,10 @@
 coser.ui.selection.fusion.title=3DFusion
 coser.ui.selection.fusionError=3DErreur de fusion
 coser.ui.selection.invalidFusionName=3DLe nom de fusion choisit n'est pas pr=
\u00E9sent de le r\u00E9f\u00E9rentiel \!
-coser.ui.selection.maturitySpecies=3DEsp\u00E8ces avec maturit\u00E9
-coser.ui.selection.occurenceDensitySpecies=3DEsp\u00E8ces filtr\u00E9es
+coser.ui.selection.maturitySpecies=3DL4 \: Esp\u00E8ces avec maturit\u00E9
+coser.ui.selection.occurenceDensitySpecies=3DL2 \: Esp\u00E8ces filtr\u00E9es
 coser.ui.selection.saveError=3DErreur de sauvegarde
-coser.ui.selection.sizeAllYearSpecies=3DEsp\u00E8ces avec taille pour toutes=
 les ann\u00E9es
+coser.ui.selection.sizeAllYearSpecies=3DL3 \: Esp\u00E8ces avec taille pour =
toutes les ann\u00E9es
 coser.ui.selection.speciesMenuFusion=3DFusion
 coser.ui.selection.speciesMenuLabel=3DMenu esp\u00E8ces
 coser.ui.selection.tab.details=3DD\u00E9tails de la s\u00E9lection


--===============0127054322556026645==--