From mallon@users.chorem.org Fri Jul 20 14:24:05 2012
From: mallon@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3546 -
	trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering
Date: Fri, 20 Jul 2012 14:24:05 +0200
Message-ID: <20120720122405.130EE5A82A@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============5653433725805196011=="

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

Author: mallon
Date: 2012-07-20 14:24:05 +0200 (Fri, 20 Jul 2012)
New Revision: 3546

Url: http://chorem.org/repositories/revision/lima/3546

Log:
fixes #707 Suppression des anciens labels faisant office de titres, ajout de =
panels avec titres, et diminution de la place prise par chacune des fonctionn=
alit?\195?\169s.

Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.=
jaxx

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/Letteri=
ngView.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/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView=
.jaxx	2012-07-20 12:07:10 UTC (rev 3545)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView=
.jaxx	2012-07-20 12:24:05 UTC (rev 3546)
@@ -9,21 +9,22 @@
   %%
   This program is free software: you can redistribute it and/or modify
   it under the terms of the GNU General Public License as
-  published by the Free Software Foundation, either version 3 of the=20
+  published by the Free Software Foundation, either version 3 of the
   License, or (at your option) any later version.
- =20
+
   This program is distributed in the hope that it will be useful,
   but WITHOUT ANY WARRANTY; without even the implied warranty of
   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
   GNU General Public License for more details.
- =20
-  You should have received a copy of the GNU General Public=20
+
+  You should have received a copy of the GNU General Public
   License along with this program.  If not, see
   <http://www.gnu.org/licenses/gpl-3.0.html>.
   #L%
   -->
-<Table>
=20
+<Table constraints=3D'BorderLayout.NORTH'>
+
   <import>
     org.chorem.lima.ui.common.AccountComboBoxModel
     org.chorem.lima.ui.common.FinancialPeriodComboBoxModel
@@ -33,7 +34,7 @@
     org.chorem.lima.beans.LetteringFilter
     org.chorem.lima.beans.LetteringFilterImpl
   </import>
- =20
+
   <LetteringViewHandler id=3D"handler" constructorParams=3D"this"/>
   <LetteringTableModel id=3D"tableModel"/>
=20
@@ -43,63 +44,57 @@
   <LettringSelectionModel id=3D'lettringSelectionModel' constructorParams=3D=
' tableModel'
                           onValueChanged=3D"handler.balanceAndActions()"/>
=20
-  <script><![CDATA[
+  <script>
+    <![CDATA[
     void $afterCompleteSetup() {
         handler.init();
     }
-  ]]></script>
+    ]]>
+  </script>
=20
   <row>
-     <cell anchor=3D"center" weightx=3D"1" columns=3D"2">
-       <JLabel text=3D"lima.ui.lettering.account" labelFor=3D'{panelAccountC=
omboBox}'/>
+     <cell>
+        <JPanel layout=3D'{new BorderLayout()}' id=3D"panelAccountComboBox" =
border=3D'{new TitledBorder(_("lima.ui.lettering.account"))}'>
+           <org.chorem.lima.ui.common.AccountComboBoxModel id=3D"accountComb=
oBoxModel"/>
+               <JComboBox id=3D"accountComboBox" model=3D"{accountComboBoxMo=
del}"
+                          renderer=3D"{new org.chorem.lima.ui.common.Account=
ListRenderer()}"
+                          onActionPerformed=3D"filterModel.setAccount((Accou=
nt)accountComboBoxModel.getSelectedItem())"
+                          constraints=3D'BorderLayout.WEST'/>
+               <JButton id=3D"backCount" text=3D"lima.ui.account.buttonback"
+                        onActionPerformed=3D"handler.back(accountComboBox)"
+                        constraints=3D'BorderLayout.CENTER'/>
+               <JButton id=3D"nextCount" text=3D"lima.ui.account.buttonnext"
+                        onActionPerformed=3D"handler.next(accountComboBox)"
+                        constraints=3D'BorderLayout.EAST'/>
+        </JPanel>
      </cell>
-     <cell anchor=3D"center" weightx=3D"1">
-       <JLabel text=3D"lima.ui.lettering.period" labelFor=3D'{panelFinancial=
PeriodComboBox}'/>
-     </cell>
-     <cell anchor=3D"center" weightx=3D"1">
-       <JLabel text=3D"lima.ui.lettering.entry" labelFor=3D'{entryPanel}'/>
-     </cell>
-  </row>  =20
-  <row>
-     <cell anchor=3D"center" weightx=3D"1" columns=3D"2">    =20
-        <JPanel id=3D"panelAccountComboBox">
-           <org.chorem.lima.ui.common.AccountComboBoxModel id=3D"accountComb=
oBoxModel"/> =20
-           <JComboBox id=3D"accountComboBox" model=3D"{accountComboBoxModel}"
-                      renderer=3D"{new org.chorem.lima.ui.common.AccountList=
Renderer()}"
-                      onActionPerformed=3D"filterModel.setAccount((Account)a=
ccountComboBoxModel.getSelectedItem())"/>
-           <JButton id=3D"backCount" text=3D"lima.ui.account.buttonback"
-                    onActionPerformed=3D"handler.back(accountComboBox)"/>
-           <JButton id=3D"nextCount" text=3D"lima.ui.account.buttonnext"
-                    onActionPerformed=3D"handler.next(accountComboBox)"/>
-        </JPanel>        =20
-     </cell>=20
-     <cell anchor=3D"center" weightx=3D"1">
-        <JPanel id=3D"panelFinancialPeriodComboBox">
-           <Table>
+     <cell>
+        <JPanel id=3D"panelFinancialPeriodComboBox" layout=3D'{new BorderLay=
out()}' border=3D'{new TitledBorder(_("lima.ui.lettering.period"))}'>
+           <Table constraints=3D'BorderLayout.NORTH'>
             <row>
                 <cell>
-                 <JLabel text=3D"lima.ui.lettering.beginFinancialPeriod"/>
-                </cell>=20
+                        <JLabel text=3D"lima.ui.lettering.beginFinancialPeri=
od"/>
+                </cell>
                 <cell>
-                    <JXDatePicker id=3D"pickerDebut"
-                                  onActionPerformed=3D"filterModel.setDateSt=
art(pickerDebut.getDate())"/>
+                        <JXDatePicker id=3D"pickerDebut"
+                                      onActionPerformed=3D"filterModel.setDa=
teStart(pickerDebut.getDate())"/>
                 </cell>
             </row>
             <row>
                 <cell>
-                    <JLabel text=3D"lima.ui.lettering.endFinancialPeriod"/>
+                        <JLabel text=3D"lima.ui.lettering.endFinancialPeriod=
"/>
                 </cell>
                 <cell>
-                    <JXDatePicker id=3D"pickerFin"
-                                  onActionPerformed=3D"filterModel.setDateEn=
d(pickerFin.getDate())"/>
+                        <JXDatePicker id=3D"pickerFin"
+                                      onActionPerformed=3D"filterModel.setDa=
teEnd(pickerFin.getDate())"/>
                 </cell>
             </row>
            </Table>
-        </JPanel>         =20
+        </JPanel>
      </cell>
      <cell anchor=3D"center" weightx=3D"1">
-       <JPanel id=3D"entryPanel">
-        <Table>
+       <JPanel id=3D"entryPanel"  layout=3D'{new BorderLayout()}' border=3D'=
{new TitledBorder(_("lima.ui.lettering.entry"))}'>
+        <Table constraints=3D'BorderLayout.NORTH'>
             <row>
                 <cell>
                     <JRadioButton id=3D"lettredEntryCheckBox" buttonGroup=3D=
"letteredCheckGroup"
@@ -107,16 +102,16 @@
                 </cell>
                 <cell>
                     <JLabel text=3D"lima.ui.lettering.checkLettredEntry"/>
-                </cell>           =20
+                </cell>
             </row>
             <row>
                 <cell>
                     <JRadioButton id=3D"noLettredEntryCheckBox" selected=3D"=
true" buttonGroup=3D"letteredCheckGroup"
                                   onActionPerformed=3D"filterModel.setDispla=
yUnlettred(true) ; filterModel.setDisplayLettered(false)"/>
-                </cell> =20
+                </cell>
                 <cell>
                     <JLabel text=3D"lima.ui.lettering.checkNoLettredEntry"/>
-                </cell>              =20
+                </cell>
             </row>
             <row>
                 <cell>
@@ -127,67 +122,62 @@
                     <JLabel text=3D"lima.ui.lettering.checkAll"/>
                 </cell>
             </row>
-        </Table>           =20
+        </Table>
        </JPanel>
      </cell>
   </row>
-  <row>   =20
-    <cell anchor=3D"center" weightx=3D"0.25">
-        <JLabel/>
-    </cell>
-    <cell anchor=3D"center" weightx=3D"0.25">
-     <JLabel text=3D"lima.ui.lettering.selectDebit" labelFor=3D'{debitTexttF=
ield}'/>
-    </cell>
-    <cell anchor=3D"center" weightx=3D"0.25">=20
-     <JLabel text=3D"lima.ui.lettering.selectCredit" labelFor=3D'{creditText=
Field}'/>
-    </cell>
-    <cell anchor=3D"center" weightx=3D"0.25">=20
-     <JLabel text=3D"lima.ui.lettering.selectSolde" labelFor=3D'{soldeTextFi=
eld}'/>
-    </cell>
-  </row> =20
-  <row>=20
-     <cell anchor=3D'center' weightx=3D"0.25">
-        <JLabel text=3D"lima.ui.lettering.selectEntry"/>
-     </cell>   =20
-     <cell fill=3D"horizontal" weightx=3D"0.25">
-        <JTextField id=3D"debitTexttField" editable=3D"false" text=3D"{editM=
odel.getDebit().toString()}"
-                    focusable=3D"false"/>
-     </cell>  =20
-     <cell fill=3D"horizontal" weightx=3D"0.25">
-        <JTextField id=3D"creditTextField" editable=3D"false" text=3D"{editM=
odel.getCredit().toString()}"
-                    focusable=3D"false"/>
-     </cell>      =20
-     <cell fill=3D"horizontal" weightx=3D"0.25">
-        <JTextField id=3D"soldeTextField" editable=3D"false" text=3D"{editMo=
del.getSolde().toString()}"
-        focusable=3D"false"/>
-     </cell> =20
-  </row> =20
   <row>
-     <cell anchor=3D"center" columns=3D'4'>
-       <JLabel text=3D"lima.ui.lettering.actions" labelFor=3D'{actionsPanel}=
'/>
-     </cell>
+      <cell fill=3D"horizontal" columns=3D"4">
+          <JPanel id=3D"selectedEntry" layout=3D'{new BorderLayout()}' borde=
r=3D'{new TitledBorder(_("lima.ui.lettering.selectEntry"))}'>
+              <Table constraints=3D'BorderLayout.NORTH'>
+                  <row>
+                    <cell anchor=3D"center" weightx=3D"0.6">
+                     <JLabel text=3D"lima.ui.lettering.selectDebit" labelFor=
=3D'{debitTexttField}'/>
+                    </cell>
+                    <cell fill=3D"horizontal" weightx=3D"0.6">
+                      <JTextField id=3D"debitTexttField" editable=3D"false" =
text=3D"{editModel.getDebit().toString()}"
+                                  focusable=3D"false"/>
+                    </cell>
+                    <cell anchor=3D"center" weightx=3D"0.6">
+                     <JLabel text=3D"lima.ui.lettering.selectCredit" labelFo=
r=3D'{creditTextField}'/>
+                    </cell>
+                    <cell fill=3D"horizontal" weightx=3D"0.6">
+                      <JTextField id=3D"creditTextField" editable=3D"false" =
text=3D"{editModel.getCredit().toString()}"
+                                  focusable=3D"false"/>
+                    </cell>
+                    <cell anchor=3D"center" weightx=3D"0.6">
+                     <JLabel text=3D"lima.ui.lettering.selectSolde" labelFor=
=3D'{soldeTextField}'/>
+                    </cell>
+                    <cell fill=3D"horizontal" weightx=3D"0.6">
+                        <JTextField id=3D"soldeTextField" editable=3D"false"=
 text=3D"{editModel.getSolde().toString()}"
+                        focusable=3D"false"/>
+                    </cell>
+                  </row>
+              </Table>
+          </JPanel>
+      </cell>
   </row>
   <row>
       <cell anchor=3D"center" columns=3D'4'>
         <JPanel id=3D"actionsPanel">
-           <JButton id=3D"lettered" text=3D"lima.ui.lettering.buttonLettered=
"=20
+           <JButton id=3D"lettered" text=3D"lima.ui.lettering.buttonLettered"
            enabled=3D"{editModel.isLettred()}"
            onActionPerformed=3D"handler.addLetter()"/>
-           <JButton id=3D"noLettered" text=3D"lima.ui.lettering.buttonNoLett=
ered"=20
+           <JButton id=3D"noLettered" text=3D"lima.ui.lettering.buttonNoLett=
ered"
            enabled=3D"{editModel.isUnLettred()}"
            onActionPerformed=3D"handler.removeLetter()"/>
         </JPanel>
       </cell>
   </row>
   <row>
-     <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"4">
-        <JScrollPane>
-          <LetteringTable
-            id=3D"table" sortable=3D"false" rowHeight=3D"22"
-            constructorParams=3D"getTableModel()"
-            selectionModel=3D"{lettringSelectionModel}"
-           />
-        </JScrollPane>
-     </cell>
+	   <cell fill=3D"both" weightx=3D"1" weighty=3D"1" columns=3D"4">
+	    <JScrollPane>
+	      <LetteringTable
+	        id=3D"table" sortable=3D"false" rowHeight=3D"22"
+	        constructorParams=3D"getTableModel()"
+	        selectionModel=3D"{lettringSelectionModel}"
+	       />
+	    </JScrollPane>
+	   </cell>
   </row>
 </Table>
\ No newline at end of file


--===============5653433725805196011==--