From sbavencoff@users.chorem.org Fri Sep 19 17:21:44 2014
From: sbavencoff@users.chorem.org
To: lima-commits@list.chorem.org
Subject: [Lima-commits] r3921 - in trunk/lima-swing/src/main:
	java/org/chorem/lima/ui/financialtransactionunbalanced	resources/i18n
Date: Fri, 19 Sep 2014 17:21:43 +0200
Message-ID: <20140919152143.D9544180208@goh.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============0896587324196029632=="

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

Author: sbavencoff
Date: 2014-09-19 17:21:43 +0200 (Fri, 19 Sep 2014)
New Revision: 3921

Url: http://forge.chorem.org/projects/lima/repository/revisions/3921

Log:
refs #875 #1043 : financial transaction unbalanced

Added:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunba=
lanced/FinancialTransactionUnbalancedView.css
Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunba=
lanced/FinancialTransactionUnbalancedView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunba=
lanced/FinancialTransactionUnbalancedViewHandler.java
   trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
   trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties

Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction=
unbalanced/FinancialTransactionUnbalancedView.css
=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/financialtransactionunb=
alanced/FinancialTransactionUnbalancedView.css	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunb=
alanced/FinancialTransactionUnbalancedView.css	2014-09-19 15:21:43 UTC (rev 3=
921)
@@ -0,0 +1,46 @@
+#toolbar {
+    floatable : false;
+}
+
+#removeTransaction {
+    actionIcon : "delete-financial-transaction";
+    toolTipText : "lima.entries.remove.transaction";
+    enabled : "{isSelectedRow()}";
+}
+
+#addEntry {
+    actionIcon : "add-entry";
+    toolTipText : "lima.entries.addEntry";
+    enabled : "{isSelectedRow()}";
+}
+
+#removeEntry {
+    actionIcon : "delete-entry";
+    toolTipText : "lima.entries.remove.entry";
+    enabled : "{isSelectedRow()}";
+}
+
+#balanceButton {
+    actionIcon : "balance";
+    toolTipText : "lima.entries.balance";
+    enabled : "{!isBalance()}";
+}
+
+#fiscalPeriodLabel {
+    actionIcon : "choose-fiscal-year";
+    labelFor : "{fiscalPeriodComboBox}";
+}
+
+#fiscalPeriodComboBox {
+    toolTipText : "lima.financialTransaction.fiscalYear";
+    renderer : "{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}";
+}
+
+#refresh {
+    toolTipText : "lima.refresh.shortcut";
+    actionIcon : "refresh";
+}
+
+#financialTransactionUnbalancedTable {
+    rowHeight : "22";
+}

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransact=
ionunbalanced/FinancialTransactionUnbalancedView.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/financialtransactionunb=
alanced/FinancialTransactionUnbalancedView.jaxx	2014-09-19 14:50:34 UTC (rev =
3920)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunb=
alanced/FinancialTransactionUnbalancedView.jaxx	2014-09-19 15:21:43 UTC (rev =
3921)
@@ -23,7 +23,8 @@
   #L%
   -->
=20
-<Table>
+<JPanel layout=3D"{new BorderLayout()}">
+
   <import>
     javax.swing.ListSelectionModel
     javax.swing.DefaultListSelectionModel
@@ -31,6 +32,7 @@
     org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel
     org.chorem.lima.ui.financialtransaction.FinancialTransactionDefaultTable
   </import>
+
   <FinancialTransactionUnbalancedViewHandler id=3D"handler"
                                              javaBean=3D"new FinancialTransa=
ctionUnbalancedViewHandler(this)"/>
=20
@@ -42,7 +44,7 @@
=20
   <Boolean id=3D"selectedRow" javaBean=3D"false"/>
   <Boolean id=3D"balance" javaBean=3D"true"/>
-  <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id=3D"modelFiscalPe=
riod"/>
+
   <script>
     <![CDATA[
     void $afterCompleteSetup() {
@@ -50,54 +52,49 @@
     }
     ]]>
   </script>
-  <row>
-    <cell fill=3D"horizontal">
-      <JToolBar floatable=3D"false">
-        <JButton toolTipText=3D"{ t(&quot;lima.entries.remove.transaction&qu=
ot;) + &quot; (Ctrl+Shift+Del)&quot;}"
-                 actionIcon=3D'delete-financial-transaction'
-                 enabled=3D"{isSelectedRow()}"
-                 onActionPerformed=3D"getHandler().deleteSelectedTransaction=
()" />
-        <JButton toolTipText =3D"{ t(&quot;lima.entries.addEntry&quot;) + &q=
uot; (Ctrl+N)&quot;}" actionIcon=3D'add-entry'
-                 enabled=3D"{isSelectedRow()}"
-                 onActionPerformed=3D"getHandler().addEntry()" />
-        <JButton toolTipText=3D"{ t(&quot;lima.entries.remove.entry&quot;) +=
 &quot; (Ctrl+Del)&quot;}" actionIcon=3D'delete-entry'
-                 enabled=3D"{isSelectedRow()}"
-                 onActionPerformed=3D"getHandler().deleteSelectedEntry()" />
-        <JToolBar.Separator/>
-        <JButton toolTipText=3D"{ t(&quot;lima.entries.balance&quot;) + &quo=
t; (Ctrl+B)&quot;}" actionIcon=3D'balance'
-                 enabled=3D"{!isBalance()}"
-                 onActionPerformed=3D"handler.balanceTransaction()" />
-        <JToolBar.Separator/>
=20
-        <JLabel id=3D"fiscalPeriodLabel"
-                actionIcon=3D'choose-fiscal-year'
-                labelFor=3D'{fiscalPeriodComboBox}'/>
-        <JComboBox id=3D"fiscalPeriodComboBox" model=3D"{modelFiscalPeriod}"
-                   toolTipText=3D"lima.financialTransaction.fiscalYear"
-                   renderer=3D"{new org.chorem.lima.ui.common.FiscalPeriodLi=
stRenderer()}"
-                   onActionPerformed=3D"getFinancialTransactionUnbalancedTab=
leModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedIte=
m());
-                getHandler().refresh()"
-                   editable=3D"false"/>
-        <JToolBar.Separator/>
-        <JButton toolTipText=3D"{ t(&quot;lima.refresh&quot;) + &quot; (F5)&=
quot;}" actionIcon=3D'refresh'
-                 onActionPerformed=3D"getHandler().refresh()"/>
+  <JToolBar id=3D"toolbar"
+            constraints=3D"BorderLayout.PAGE_START">
=20
-      </JToolBar>
-    </cell>
-  </row>
+    <JButton id=3D"removeTransaction"
+             onActionPerformed=3D"handler.deleteSelectedTransaction()" />
=20
-  <row>
-    <cell fill=3D"both" weightx=3D"1" weighty=3D"1" rows=3D"1" >
-      <JScrollPane>
-        <FinancialTransactionUnbalancedTableModel
-          id=3D"financialTransactionUnbalancedTableModel"/>
-        <FinancialTransactionUnbalancedTable
-          id=3D"financialTransactionUnbalancedTable"
-          constructorParams=3D'handler'
-          rowHeight=3D"22"
-          selectionModel=3D'{selectionModel}'
-          model=3D"{getFinancialTransactionUnbalancedTableModel()}"/>
-      </JScrollPane>
-    </cell>
-  </row>
-</Table>
\ No newline at end of file
+    <JButton id=3D"addEntry"
+             onActionPerformed=3D"handler.addEntry()" />
+
+    <JButton id=3D"removeEntry"
+             onActionPerformed=3D"handler.deleteSelectedEntry()" />
+
+    <JToolBar.Separator/>
+
+    <JButton id=3D"balanceButton"
+             onActionPerformed=3D"handler.balanceTransaction()" />
+
+    <JToolBar.Separator/>
+
+    <JLabel id=3D"fiscalPeriodLabel"/>
+
+    <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id=3D"fiscalPerio=
dComboBoxModel"/>
+
+    <JComboBox id=3D"fiscalPeriodComboBox"
+               model=3D"{fiscalPeriodComboBoxModel}"
+               onActionPerformed=3D"getFinancialTransactionUnbalancedTableMo=
del().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem())=
; getHandler().refresh()"/>
+
+    <JToolBar.Separator/>
+
+    <JButton id=3D"refresh"
+             onActionPerformed=3D"getHandler().refresh()"/>
+
+  </JToolBar>
+
+  <JScrollPane>
+    <FinancialTransactionUnbalancedTableModel
+      id=3D"financialTransactionUnbalancedTableModel"/>
+    <FinancialTransactionUnbalancedTable
+      id=3D"financialTransactionUnbalancedTable"
+      constructorParams=3D'handler'
+      selectionModel=3D'{selectionModel}'
+      model=3D"{getFinancialTransactionUnbalancedTableModel()}"/>
+  </JScrollPane>
+
+</JPanel>
\ No newline at end of file

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransact=
ionunbalanced/FinancialTransactionUnbalancedViewHandler.java
=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/financialtransactionunb=
alanced/FinancialTransactionUnbalancedViewHandler.java	2014-09-19 14:50:34 UT=
C (rev 3920)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunb=
alanced/FinancialTransactionUnbalancedViewHandler.java	2014-09-19 15:21:43 UT=
C (rev 3921)
@@ -386,7 +386,7 @@
         tableModel.refresh();
         table.clearSelection();
=20
-        FiscalPeriodComboBoxModel comboBoxModel =3D view.getModelFiscalPerio=
d();
+        FiscalPeriodComboBoxModel comboBoxModel =3D view.getFiscalPeriodComb=
oBoxModel();
         comboBoxModel.refresh();
     }
 }

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
=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/resources/i18n/lima-swing_en_GB.properties	2014=
-09-19 14:50:34 UTC (rev 3920)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties	2014=
-09-19 15:21:43 UTC (rev 3921)
@@ -614,6 +614,7 @@
 lima.preferences=3DPreferences
 lima.quit=3DExit
 lima.refresh=3DRefresh
+lima.refresh.shortcut=3D
 lima.remove=3DRemove
 lima.remove.shortcut=3D
 lima.reports=3DReports

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
=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/resources/i18n/lima-swing_fr_FR.properties	2014=
-09-19 14:50:34 UTC (rev 3920)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties	2014=
-09-19 15:21:43 UTC (rev 3921)
@@ -525,6 +525,7 @@
 lima.preferences=3DPr=C3=A9f=C3=A9rences
 lima.quit=3DQuitter
 lima.refresh=3DActualiser
+lima.refresh.shortcut=3DActualiser (F5)
 lima.remove=3DSupprimer
 lima.remove.shortcut=3D"Supprimer (Suppr)
 lima.reports=3DRapports


--===============0896587324196029632==--