[Lima-commits] r3921 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransactionunbalanced resources/i18n

19 Sep 2014

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/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css
Modified:
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx
   trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/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/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css
===================================================================

--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css	                        (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.css	2014-09-19 15:21:43 UTC (rev 3921)
@@ -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/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx	2014-09-19 14:50:34 UTC (rev 3920)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedView.jaxx	2014-09-19 15:21:43 UTC (rev 3921)
@@ -23,7 +23,8 @@
   #L%
   -->
 
-<Table>
+<JPanel layout="{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="handler"
                                              javaBean="new FinancialTransactionUnbalancedViewHandler(this)"/>
 
@@ -42,7 +44,7 @@
 
   <Boolean id="selectedRow" javaBean="false"/>
   <Boolean id="balance" javaBean="true"/>
-  <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="modelFiscalPeriod"/>
+
   <script>
     <![CDATA[
     void $afterCompleteSetup() {
@@ -50,54 +52,49 @@
     }
     ]]>
   </script>
-  <row>
-    <cell fill="horizontal">
-      <JToolBar floatable="false">
-        <JButton toolTipText="{ t("lima.entries.remove.transaction") + " (Ctrl+Shift+Del)"}"
-                 actionIcon='delete-financial-transaction'
-                 enabled="{isSelectedRow()}"
-                 onActionPerformed="getHandler().deleteSelectedTransaction()" />
-        <JButton toolTipText ="{ t("lima.entries.addEntry") + " (Ctrl+N)"}" actionIcon='add-entry'
-                 enabled="{isSelectedRow()}"
-                 onActionPerformed="getHandler().addEntry()" />
-        <JButton toolTipText="{ t("lima.entries.remove.entry") + " (Ctrl+Del)"}" actionIcon='delete-entry'
-                 enabled="{isSelectedRow()}"
-                 onActionPerformed="getHandler().deleteSelectedEntry()" />
-        <JToolBar.Separator/>
-        <JButton toolTipText="{ t("lima.entries.balance") + " (Ctrl+B)"}" actionIcon='balance'
-                 enabled="{!isBalance()}"
-                 onActionPerformed="handler.balanceTransaction()" />
-        <JToolBar.Separator/>
 
-        <JLabel id="fiscalPeriodLabel"
-                actionIcon='choose-fiscal-year'
-                labelFor='{fiscalPeriodComboBox}'/>
-        <JComboBox id="fiscalPeriodComboBox" model="{modelFiscalPeriod}"
-                   toolTipText="lima.financialTransaction.fiscalYear"
-                   renderer="{new org.chorem.lima.ui.common.FiscalPeriodListRenderer()}"
-                   onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem());
-                getHandler().refresh()"
-                   editable="false"/>
-        <JToolBar.Separator/>
-        <JButton toolTipText="{ t("lima.refresh") + " (F5)"}" actionIcon='refresh'
-                 onActionPerformed="getHandler().refresh()"/>
+  <JToolBar id="toolbar"
+            constraints="BorderLayout.PAGE_START">
 
-      </JToolBar>
-    </cell>
-  </row>
+    <JButton id="removeTransaction"
+             onActionPerformed="handler.deleteSelectedTransaction()" />
 
-  <row>
-    <cell fill="both" weightx="1" weighty="1" rows="1" >
-      <JScrollPane>
-        <FinancialTransactionUnbalancedTableModel
-          id="financialTransactionUnbalancedTableModel"/>
-        <FinancialTransactionUnbalancedTable
-          id="financialTransactionUnbalancedTable"
-          constructorParams='handler'
-          rowHeight="22"
-          selectionModel='{selectionModel}'
-          model="{getFinancialTransactionUnbalancedTableModel()}"/>
-      </JScrollPane>
-    </cell>
-  </row>
-</Table>
\ No newline at end of file
+    <JButton id="addEntry"
+             onActionPerformed="handler.addEntry()" />
+
+    <JButton id="removeEntry"
+             onActionPerformed="handler.deleteSelectedEntry()" />
+
+    <JToolBar.Separator/>
+
+    <JButton id="balanceButton"
+             onActionPerformed="handler.balanceTransaction()" />
+
+    <JToolBar.Separator/>
+
+    <JLabel id="fiscalPeriodLabel"/>
+
+    <org.chorem.lima.ui.combobox.FiscalPeriodComboBoxModel id="fiscalPeriodComboBoxModel"/>
+
+    <JComboBox id="fiscalPeriodComboBox"
+               model="{fiscalPeriodComboBoxModel}"
+               onActionPerformed="getFinancialTransactionUnbalancedTableModel().setFiscalPeriod( (FiscalPeriod) fiscalPeriodComboBox.getSelectedItem()); getHandler().refresh()"/>
+
+    <JToolBar.Separator/>
+
+    <JButton id="refresh"
+             onActionPerformed="getHandler().refresh()"/>
+
+  </JToolBar>
+
+  <JScrollPane>
+    <FinancialTransactionUnbalancedTableModel
+      id="financialTransactionUnbalancedTableModel"/>
+    <FinancialTransactionUnbalancedTable
+      id="financialTransactionUnbalancedTable"
+      constructorParams='handler'
+      selectionModel='{selectionModel}'
+      model="{getFinancialTransactionUnbalancedTableModel()}"/>
+  </JScrollPane>
+
+</JPanel>
\ No newline at end of file

Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java	2014-09-19 14:50:34 UTC (rev 3920)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedViewHandler.java	2014-09-19 15:21:43 UTC (rev 3921)
@@ -386,7 +386,7 @@
         tableModel.refresh();
         table.clearSelection();
 
-        FiscalPeriodComboBoxModel comboBoxModel = view.getModelFiscalPeriod();
+        FiscalPeriodComboBoxModel comboBoxModel = view.getFiscalPeriodComboBoxModel();
         comboBoxModel.refresh();
     }
 }

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- 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=Preferences
 lima.quit=Exit
 lima.refresh=Refresh
+lima.refresh.shortcut=
 lima.remove=Remove
 lima.remove.shortcut=
 lima.reports=Reports

Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- 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=Préférences
 lima.quit=Quitter
 lima.refresh=Actualiser
+lima.refresh.shortcut=Actualiser (F5)
 lima.remove=Supprimer
 lima.remove.shortcut="Supprimer (Suppr)
 lima.reports=Rapports

    

[Lima-commits] r3921 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/financialtransactionunbalanced resources/i18n

sbavencoff＠users.chorem.org