Author: chatellier Date: 2010-12-03 14:45:45 +0000 (Fri, 03 Dec 2010) New Revision: 356 Log: Deplacement des ann?\195?\169es dans un accord?\195?\169on seules Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.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/selection/SelectionDetailsView.jaxx =================================================================== --- trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-12-03 14:45:45 UTC (rev 356) @@ -92,9 +92,28 @@ </cell> </row> <row> - <cell anchor="west"> + <cell anchor="northwest"> + <JLabel text="coser.ui.selection.details.comment" /> + </cell> + <cell anchor="north" fill="horizontal" weighty="1" columns="3"> + <JScrollPane> + <JTextArea id="detailsComment" rows="3" /> + <javax.swing.text.Document javaBean="detailsComment.getDocument()" + onInsertUpdate='getSelection().setComment(detailsComment.getText())' + onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> + </JScrollPane> + </cell> + </row> + </Table> + </AccordionPaneSubPanel> + <AccordionPaneSubPanel title="coser.ui.selection.detail.yearAccordion"> + <Table> + <row> + <cell anchor="west" columns="2"> <JLabel text="coser.ui.selection.details.dates" /> </cell> + </row> + <row> <cell weighty="1" weightx="1" fill="both"> <JScrollPane> <YearListModel id="datesListModel" /> @@ -104,7 +123,7 @@ <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> </JScrollPane> </cell> - <cell anchor="south" columns="2"> + <cell anchor="south"> <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" onActionPerformed="getHandler().updateSelectionDateData(this);setYearsValidated(true)" enabled="{!isYearsValidated()}"/> @@ -118,17 +137,9 @@ <cell fill="horizontal"> <JLabel id="strataLabel" text='{_("coser.ui.selection.details.strata", 0, 0)}' /> </cell> - <cell anchor="east"> - <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> - </cell> - <cell> - <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> - </cell> </row> <row> - <cell weightx="1" weighty="2" fill="both"> + <cell weightx="1" weighty="2" fill="both" rows="2"> <JScrollPane> <StrataListModel id="strataListModel" onContentsChanged='strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> @@ -137,6 +148,16 @@ onValueChanged='setStrataValidated(false); strataLabel.setText(_("coser.ui.selection.details.strata", strataList.getSelectedIndices().length, strataList.getModel().getSize()))'/> </JScrollPane> </cell> + <cell anchor="northeast"> + <JButton icon="map.png" toolTipText="coser.ui.selection.details.showMapTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "ZONEMAP");' /> + </cell> + <cell anchor="northeast"> + <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" + onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> + </cell> + </row> + <row> <cell anchor="south" columns="2"> <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" onActionPerformed="getHandler().strataListChanged(this);setStrataValidated(true)" @@ -236,19 +257,6 @@ </Table> </cell> </row> - <row> - <cell anchor="northwest"> - <JLabel text="coser.ui.selection.details.comment" /> - </cell> - <cell fill="both" columns="3"> - <JScrollPane> - <JTextArea id="detailsComment" rows="3" /> - <javax.swing.text.Document javaBean="detailsComment.getDocument()" - onInsertUpdate='getSelection().setComment(detailsComment.getText())' - onRemoveUpdate='getSelection().setComment(detailsComment.getText())' /> - </JScrollPane> - </cell> - </row> </Table> </AccordionPaneSubPanel> </AccordionPane> Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_en_GB.properties 2010-12-03 14:45:45 UTC (rev 356) @@ -144,9 +144,10 @@ coser.ui.selection.allSpecies=L1 \: All species coser.ui.selection.comment=Comment \: coser.ui.selection.createError=Creation error -coser.ui.selection.detail.mainAccordion=Details and years +coser.ui.selection.detail.mainAccordion=Details coser.ui.selection.detail.speciesAccordion=Species coser.ui.selection.detail.strataAccordion=Strata +coser.ui.selection.detail.yearAccordion=Years coser.ui.selection.details.addToSelectedListTip=Add selected species to selected species list. coser.ui.selection.details.comment=Comments \: coser.ui.selection.details.dates=Years \: Modified: trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties =================================================================== --- trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-03 13:33:54 UTC (rev 355) +++ trunk/coser-ui/src/main/resources/i18n/coser-ui_fr_FR.properties 2010-12-03 14:45:45 UTC (rev 356) @@ -144,9 +144,10 @@ coser.ui.selection.allSpecies=L1 \: Toutes les esp\u00E8ces coser.ui.selection.comment=Commentaire \: coser.ui.selection.createError=Erreur de cr\u00E9action -coser.ui.selection.detail.mainAccordion=D\u00E9tails et ann\u00E9es +coser.ui.selection.detail.mainAccordion=D\u00E9tails coser.ui.selection.detail.speciesAccordion=Esp\u00E8ces coser.ui.selection.detail.strataAccordion=Strates +coser.ui.selection.detail.yearAccordion=Ann\u00E9es coser.ui.selection.details.addToSelectedListTip=Ajoute les esp\u00E8ces s\u00E9lectionn\u00E9es \u00E0 la liste des especes s\u00E9lectionn\u00E9es. coser.ui.selection.details.comment=Commentaire \: coser.ui.selection.details.dates=Ann\u00E9es \: