Author: chatellier Date: 2010-11-24 15:04:36 +0000 (Wed, 24 Nov 2010) New Revision: 266 Log: Deplacement des boutons de validations des listes Modified: trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 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-11-24 14:51:28 UTC (rev 265) +++ trunk/coser-ui/src/main/java/fr/ifremer/coser/ui/selection/SelectionDetailsView.jaxx 2010-11-24 15:04:36 UTC (rev 266) @@ -63,7 +63,7 @@ <cell anchor="west"> <JLabel text="coser.ui.selection.details.name" /> </cell> - <cell weightx="1" fill="horizontal"> + <cell weightx="1" fill="horizontal" columns="3"> <JTextField id="detailsSelectionNameField" text="{getSelection().getName()}" enabled="{isCreationState()}"/> <javax.swing.text.Document javaBean="detailsSelectionNameField.getDocument()" @@ -75,7 +75,7 @@ <cell anchor="west"> <JLabel text="coser.ui.selection.details.description" /> </cell> - <cell weightx="1" fill="horizontal"> + <cell weightx="1" fill="horizontal" columns="3"> <JScrollPane> <JTextArea id="detailsDescription" text="{getSelection().getDescription()}" rows="3" /> </JScrollPane> @@ -97,21 +97,23 @@ <ListSelectionModel id="datesListSelectionModel" javaBean="datesList.getSelectionModel()" /> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validDatesButton" text="coser.ui.selection.details.validDates" onActionPerformed="getHandler().updateSelectionDateData(this);" /> </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" columns="2"> <JLabel text="coser.ui.selection.details.strata" /> </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 weighty="2" fill="both" columns="2"> @@ -122,21 +124,15 @@ onValueChanged="validStrataButton.setEnabled(true)"/> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validStrataButton" text="coser.ui.selection.details.validStrata" onActionPerformed="getHandler().strataListChanged(this)" /> </cell> </row> <row> - <cell fill="horizontal"> + <cell fill="horizontal" columns="4"> <JLabel text="coser.ui.selection.details.type" /> </cell> - <cell anchor="east"> - <JButton icon="table.png" toolTipText="coser.ui.selection.details.showSpreciesTip" - onActionPerformed='getDetailDecisionPanelLayout().show(getDetailDecisionPanel(), "SPECIESDATA");getHandler().showSamplingEffort(this);' /> - </cell> </row> <row> <cell fill="both" weightx="1" weighty="1" columns="2"> @@ -147,15 +143,13 @@ onValueChanged="validFilterButton.setEnabled(true)"/> </JScrollPane> </cell> - </row> - <row> - <cell anchor="east" columns="2"> + <cell anchor="south" columns="2"> <JButton id="validFilterButton" text="coser.ui.selection.details.validFilter" onActionPerformed="getHandler().updateSelectionSpecies(this)" /> </cell> </row> <row> - <cell weighty="2" fill="both" columns="2"> + <cell weighty="2" fill="both" columns="4"> <Table> <row> <cell fill="horizontal" columns="2"> @@ -217,7 +211,7 @@ <cell anchor="northwest"> <JLabel text="coser.ui.selection.details.comment" /> </cell> - <cell weighty="1" fill="both" columns="4"> + <cell weighty="1" fill="both" columns="3"> <JScrollPane> <JTextArea id="detailsComment" rows="3" /> <javax.swing.text.Document javaBean="detailsComment.getDocument()"