09/28: refs #1187 : identitiy popups

15 May 2015

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

New commit to branch feature/1176 in repository lima.

See http://git.chorem.org/lima.git

commit f44b3dab6c582d2287b687a6a16c7f593cf28cff
Author: Sylvain Bavencoff <bavencoff@codelutin.com>
Date:   Tue Mar 31 14:28:51 2015 +0200

    refs #1187 : identitiy popups
---
 .../org/chorem/lima/ui/identity/IdentityForm.css   |  18 ++-
 .../org/chorem/lima/ui/identity/IdentityForm.jaxx  | 130 +++++++++++----------
 2 files changed, 83 insertions(+), 65 deletions(-)

diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
index 92a5786..8675205 100644
--- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
+++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css
@@ -20,6 +20,7 @@
  * #L%
  */
 #dialog {
+    title : "lima.identity";
     modal : true;
     defaultCloseOperation : {JDialog.DO_NOTHING_ON_CLOSE};
 }
@@ -30,6 +31,7 @@
 
 #nameTextField {
     text : {handler.getIdentity().getName()};
+    columns : 20;
 }
 
 #descriptionLabel {
@@ -38,6 +40,7 @@
 
 #descriptionTextField {
     text : {handler.getIdentity().getDescription()};
+    columns : 30;
 }
 
 #addressLabel {
@@ -46,14 +49,12 @@
 
 #addressTextField {
     text : {handler.getIdentity().getAddress()};
-}
-
-#address2Label {
-    text : "lima.identity.address2";
+    columns : 30;
 }
 
 #address2TextField {
     text : {handler.getIdentity().getAddress2()};
+    columns : 30;
 }
 
 #zipCodeLabel {
@@ -62,6 +63,7 @@
 
 #zipCodeTextField {
     text : {handler.getIdentity().getZipCode()};
+    columns : 5;
 }
 
 #cityLabel {
@@ -70,6 +72,7 @@
 
 #cityTextField {
     text : {handler.getIdentity().getCity()};
+    columns : 20;
 }
 
 #businessNumberLabel {
@@ -78,6 +81,7 @@
 
 #businessNumberTextField {
     text : {handler.getIdentity().getBusinessNumber()};
+    columns : 20;
 }
 
 #vatNumberLabel {
@@ -86,6 +90,7 @@
 
 #vatNumberTextField {
     text : {handler.getIdentity().getVatNumber()};
+    columns : 20;
 }
 
 #classificationCodeLabel {
@@ -94,6 +99,7 @@
 
 #classificationCodeTextField {
     text : {handler.getIdentity().getClassificationCode()};
+    columns : 5;
 }
 
 #phoneNumberLabel {
@@ -102,6 +108,7 @@
 
 #phoneNumberTextField {
     text : {handler.getIdentity().getPhoneNumber()};
+    columns : 20;
 }
 
 #emailLabel {
@@ -110,12 +117,15 @@
 
 #emailTextField {
     text : {handler.getIdentity().getEmail()};
+    columns : 20;
 }
 
 #cancel {
     text : "lima.cancel";
+    actionIcon : cancel;
 }
 
 #ok {
     text : "lima.ok";
+    actionIcon : ok;
 }
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 e9fd1de..b050d35 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
@@ -21,11 +21,15 @@
   -->
 
 <JDialog id="dialog"
+         layout="{new BorderLayout()}"
          onWindowClosing="dispose();">
 
   <IdentityHandler id="handler" javaBean="new IdentityHandler(this)"/>
   <org.chorem.lima.entity.Identity id="identity"
                                    javaBean='handler.getIdentity()'/>
+  <import>
+    java.awt.Dimension
+  </import>
 
   <script>
     <![CDATA[
@@ -33,104 +37,108 @@
     ]]>
   </script>
 
-  <Table>
+  <Table constraints="BorderLayout.CENTER"
+         border="{BorderFactory.createEmptyBorder(10, 10, 10, 10)}" >
     <row>
-      <cell fill="horizontal">
+      <cell anchor="east">
         <JLabel id="nameLabel" />
       </cell>
-      <cell fill="horizontal">
+      <cell anchor="west"
+            columns="3">
         <JTextField id="nameTextField" />
       </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
-        <JLabel  id="descriptionLabel"/>
-      </cell>
-      <cell fill="horizontal">
-        <JTextField id="descriptionTextField"/>
+
+      <cell rows="5">
+        <JPanel minimumSize="{new Dimension(20, 20)}">
+        </JPanel>
       </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
-        <JLabel id="addressLabel"/>
+
+      <cell anchor="east">
+        <JLabel id="phoneNumberLabel"/>
       </cell>
-      <cell fill="horizontal">
-        <JTextField id="addressTextField" />
+      <cell anchor="west">
+        <JTextField id="phoneNumberTextField"/>
       </cell>
     </row>
+
     <row>
-      <cell fill="horizontal">
-        <JLabel id="address2Label"/>
+      <cell anchor="east">
+        <JLabel  id="descriptionLabel"/>
       </cell>
-      <cell fill="horizontal">
-        <JTextField id="address2TextField"/>
+      <cell anchor="west"
+            columns="3">
+        <JTextField id="descriptionTextField"/>
       </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
-        <JLabel id="zipCodeLabel"/>
+
+      <cell anchor="east">
+        <JLabel id="emailLabel"/>
       </cell>
-      <cell fill="horizontal">
-        <JTextField id="zipCodeTextField"/>
+      <cell anchor="west">
+        <JTextField id="emailTextField" />
       </cell>
     </row>
+
     <row>
-      <cell fill="horizontal">
-        <JLabel text="lima.identity.city"/>
+      <cell anchor="east">
+        <JLabel id="addressLabel"/>
       </cell>
-      <cell fill="horizontal">
-        <JTextField id="cityTextField" />
+      <cell anchor="west"
+            columns="3">
+        <JTextField id="addressTextField" />
       </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
+
+      <cell anchor="east">
         <JLabel id="businessNumberLabel"/>
       </cell>
-      <cell fill="horizontal">
+      <cell anchor="west">
         <JTextField id="businessNumberTextField"/>
       </cell>
     </row>
+
     <row>
-      <cell fill="horizontal">
+      <cell/>
+      <cell anchor="west"
+            columns="3">
+        <JTextField id="address2TextField"/>
+      </cell>
+
+      <cell anchor="east">
         <JLabel id="vatNumberLabel"/>
       </cell>
-      <cell fill="horizontal">
+      <cell anchor="west">
         <JTextField id="vatNumberTextField"/>
       </cell>
     </row>
+
     <row>
-      <cell fill="horizontal">
-        <JLabel id="classificationCodeLabel"/>
-      </cell>
-      <cell fill="horizontal">
-        <JTextField id="classificationCodeTextField"/>
-      </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
-        <JLabel id="phoneNumberLabel"/>
+      <cell anchor="east">
+        <JLabel id="zipCodeLabel"/>
       </cell>
-      <cell fill="horizontal">
-        <JTextField id="phoneNumberTextField"/>
+      <cell anchor="west">
+          <JTextField id="zipCodeTextField"/>
       </cell>
-    </row>
-    <row>
-      <cell fill="horizontal">
-        <JLabel id="emailLabel"/>
+      <cell anchor="east">
+          <JLabel text="lima.identity.city"/>
       </cell>
       <cell fill="horizontal">
-        <JTextField id="emailTextField" />
+          <JTextField id="cityTextField" />
       </cell>
-    </row>
-    <row>
-      <cell fill="none">
-        <JButton id="cancel"
-                 onActionPerformed="dispose();"/>
+
+      <cell anchor="east">
+        <JLabel id="classificationCodeLabel"/>
       </cell>
-      <cell fill="none">
-        <JButton id="ok"
-                 onActionPerformed="handler.updateIdentity(); dispose();" />
+      <cell anchor="west">
+        <JTextField id="classificationCodeTextField"/>
       </cell>
     </row>
   </Table>
+
+  <JPanel constraints="BorderLayout.SOUTH"
+          layout='{new GridLayout(1,0)}'>
+    <JButton id="cancel"
+             onActionPerformed="dispose();"/>
+    <JButton id="ok"
+             onActionPerformed="handler.updateIdentity(); dispose();"/>
+  </JPanel>
+
 </JDialog>

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

    

chorem.org scm

tags

participants (1)