This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit f56fee1b2f0b1e6c4f68e4a2f3bde6399ed40c1f Author: dcosse <cosse@codelutin.com> Date: Fri Jul 24 18:29:55 2015 +0200 refs #1241 placement correcte des champs dans la fenêtre de saisie de l'identité --- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 93 +++++++++++----------- 1 file changed, 48 insertions(+), 45 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx index 9d53d7f..031b887 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx @@ -42,13 +42,13 @@ <JTabbedPane id="identityContentTabbedPane" constraints="BorderLayout.CENTER"> - <tab id="identityTab" title="Identité" layout='{new GridLayout(0,1)}'> - <Table id="identityTable"> + <tab id="identityTab" title="Identité"> + <Table id="identityTable" fill="both"> <row> - <cell anchor="east"> + <cell anchor="east" weightx="1"> <JLabel id="nameLabel" /> </cell> - <cell anchor="west"> + <cell anchor="west" columns="3"> <JTextField id="nameTextField" /> </cell> </row> @@ -57,27 +57,27 @@ <cell anchor="east"> <JLabel id="phoneNumberLabel"/> </cell> - <cell anchor="west" > + <cell anchor="west" columns="3"> <JTextField id="phoneNumberTextField"/> </cell> </row> <row> - <cell anchor="east" rows="5"> + <cell anchor="northeast"> <JLabel id="addressLabel"/> </cell> <cell anchor="west" - rows="5"> + columns="3"> <JTextArea id="addressTextField" /> </cell> </row> <row> - <cell anchor="east" rows="5"> + <cell anchor="northeast"> <JLabel id="descriptionLabel"/> </cell> <cell anchor="west" - rows="5"> + columns="3"> <JTextArea id="descriptionTextField"/> </cell> </row> @@ -101,7 +101,7 @@ <cell anchor="east"> <JLabel id="emailLabel"/> </cell> - <cell anchor="west"> + <cell anchor="west" columns="3"> <JTextField id="emailTextField" /> </cell> </row> @@ -110,7 +110,7 @@ <cell anchor="east"> <JLabel id="businessNumberLabel"/> </cell> - <cell anchor="west"> + <cell anchor="west" columns="3"> <JTextField id="businessNumberTextField"/> </cell> </row> @@ -119,7 +119,7 @@ <cell anchor="east"> <JLabel id="classificationCodeLabel"/> </cell> - <cell anchor="west"> + <cell anchor="west" columns="3"> <JTextField id="classificationCodeTextField"/> </cell> </row> @@ -128,7 +128,7 @@ <cell anchor="east"> <JLabel id="vatNumberLabel"/> </cell> - <cell anchor="west"> + <cell anchor="west" columns="3"> <JTextField id="vatNumberTextField"/> </cell> </row> @@ -136,15 +136,15 @@ </Table> </tab> - <tab id="treasuryTab" title="Trésor Public" layout='{new GridLayout(0,1)}'> - <JPanel layout='{new GridLayout(0,1)}'> - <Table id="treasuryTable" layout='{new GridLayout(3,1)}'> + <tab id="treasuryTab" title="Trésor Public"> + <JPanel layout="{new BorderLayout()}"> + <Table fill="both" constraints="BorderLayout.NORTH" insets="5"> <row> - <cell anchor="east" rows="5"> + <cell anchor="northeast"> <JLabel id="treasuryAddressLabel" /> </cell> <cell anchor="west" - rows="5"> + columns="3"> <JTextArea id="treasuryAddressTextField" /> </cell> </row> @@ -156,9 +156,6 @@ <cell anchor="west"> <JTextField id="treasuryZipCodeTextField" /> </cell> - </row> - - <row> <cell anchor="east"> <JLabel id="treasuryCityLabel"/> </cell> @@ -167,48 +164,54 @@ </cell> </row> </Table> - - <Table layout='{new GridLayout(1,1)}'> + <Table fill="both" constraints="BorderLayout.CENTER"> <row> - <cell anchor="east"> + <cell> <JLabel id="treasurySieLabel"/> </cell> - <cell anchor="west"> - <JTextField id="treasurySieTextField"/> - </cell> - <cell anchor="east"> + <cell> <JLabel id="dossierNumberLabel"/> </cell> - <cell anchor="west"> - <JTextField id="dossierNumberTextField" /> - </cell> - <cell anchor="east"> + <cell> <JLabel id="treasuryKeyLabel"/> </cell> - <cell anchor="west"> - <JTextField id="treasuryKeyTextField"/> - </cell> - <cell anchor="east"> + <cell> <JLabel id="treasuryCdiLabel"/> </cell> - <cell anchor="west"> - <JTextField id="treasuryCdiTextField" /> - </cell> - <cell anchor="east"> + <cell> <JLabel id="treasuryServiceCodeLabel"/> </cell> - <cell anchor="west"> - <JTextField id="treasuryServiceCodeTextField"/> - </cell> - <cell anchor="east"> + <cell> <JLabel id="treasurySystemTypeLabel"/> </cell> - <cell anchor="west"> + </row> + <row> + <cell> + <JTextField id="treasurySieTextField"/> + </cell> + + <cell> + <JTextField id="dossierNumberTextField" /> + </cell> + + <cell> + <JTextField id="treasuryKeyTextField"/> + </cell> + + <cell> + <JTextField id="treasuryCdiTextField" /> + </cell> + + <cell> + <JTextField id="treasuryServiceCodeTextField"/> + </cell> + + <cell> <JTextField id="treasurySystemTypeTextField" /> </cell> </row> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.