Author: sbavencoff Date: 2014-01-02 16:01:00 +0100 (Thu, 02 Jan 2014) New Revision: 3730 Url: http://chorem.org/projects/lima/repository/revisions/3730 Log: refactor vat statement Added: trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-01-02 14:30:39 UTC (rev 3729) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartView.jaxx 2014-01-02 15:01:00 UTC (rev 3730) @@ -38,7 +38,37 @@ </script> <row> - <cell fill="both" weightx="1" weighty="1" rows='6'> + <cell fill="horizontal"> + <JToolBar floatable="false"> + + <JButton id="addVatStatementMovement" + toolTipText="{ _("lima.vatstatement.movement.add") + " (Ctrl+N)"}" + actionIcon='vatstatement-new' + onActionPerformed="handler.addVatStatementMovement()"/> + + <JButton id="updateButton" + toolTipText="{ _("lima.common.update") + " (Ctrl+M)"}" + actionIcon='vatstatement-edit' + onActionPerformed="handler.updateVatStatement()" + enabled="{isSelectedRow()}"/> + + <JButton id="removeButton" + toolTipText="{ _("lima.common.remove") + " (Del)"}" + actionIcon='vatstatement-remove' + onActionPerformed="handler.removeVatStatement()" + enabled="{isSelectedRow()}"/> + + <JButton id="importButton" + actionIcon='vatstatement-import' + toolTipText="lima.ui.importexport.import" + onActionPerformed="handler.importVatStatementChart()"/> + + </JToolBar> + </cell> + </row> + + <row> + <cell fill="both" weightx="1" weighty="1" > <JScrollPane> <VatChartTreeTableModel id="vatTreeTableModel"/> <VatChartTreeTable id="treeTable" @@ -51,31 +81,4 @@ </JScrollPane> </cell> </row> - <row> - <cell fill="horizontal"> - <JButton id="addVatStatementMovement" - text="lima.vatstatement.movement.add" - onActionPerformed="getHandler().addVatStatementMovement()"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton id="updateButton" text="lima.common.update" - onActionPerformed="getHandler().updateVatStatement()" - enabled="{isSelectedRow()}"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton id="removeButton" text="lima.common.remove" - onActionPerformed="getHandler().removeVatStatement()" - enabled="{isSelectedRow()}"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JButton id="importButton" text="lima.ui.importexport.import" - onActionPerformed="getHandler().importVatStatementChart()"/> - </cell> - </row> </Table> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-01-02 14:30:39 UTC (rev 3729) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java 2014-01-02 15:01:00 UTC (rev 3730) @@ -24,11 +24,6 @@ */ package org.chorem.lima.ui.vatchart; -import static org.nuiton.i18n.I18n._; - -import javax.swing.JOptionPane; -import javax.swing.tree.TreePath; - import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.business.LimaBusinessException; @@ -44,6 +39,13 @@ import org.chorem.lima.ui.importexport.ImportExport; import org.jdesktop.swingx.JXTreeTable; +import javax.swing.*; +import javax.swing.tree.TreePath; +import java.awt.event.ActionEvent; +import java.awt.event.KeyEvent; + +import static org.nuiton.i18n.I18n._; + public class VatChartViewHandler implements ServiceListener { /** log. */ @@ -60,8 +62,47 @@ LimaServiceFactory.getService( VatStatementService.class); LimaServiceFactory.addServiceListener(ImportService.class, this); + + init(); } + public void init() { + + InputMap inputMap = view.getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = view.getActionMap(); + + // add action on Ctrl + N + String binding = "new-vatStatement"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_N, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + addVatStatementMovement(); + } + }); + + // add action on Delete + binding = "remove-vatStatement"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_DELETE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + removeVatStatement(); + } + }); + + // add action on Ctrl + M + binding = "modify-vatStatement"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_M, KeyEvent.CTRL_DOWN_MASK), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + updateVatStatement(); + } + }); + + } + public void addVatStatementMovement() { VatChartTreeTableModel treeTableModel = @@ -77,7 +118,7 @@ } VatStatement newVatChartMovement = new VatStatementImpl(); - VatChartMovementForm vatChartMovementForm = + final VatChartMovementForm vatChartMovementForm = new VatChartMovementForm(view); VatStatement masterVatStatement = null; if (selectedRow != -1) { @@ -85,6 +126,18 @@ } newVatChartMovement.setMasterVatStatement(masterVatStatement); vatChartMovementForm.setVatStatement(newVatChartMovement); + + InputMap inputMap = vatChartMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = vatChartMovementForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + vatChartMovementForm.performCancel(); + } + }); + // jaxx constructor don't call super() ? vatChartMovementForm.setLocationRelativeTo(view); vatChartMovementForm.setVisible(true); @@ -138,13 +191,25 @@ } else { treePath = new TreePath(treeTableModel.getRoot()); } - VatChartMovementForm vatChartMovementForm = + final VatChartMovementForm vatChartMovementForm = new VatChartMovementForm(view); if (vatStatement.getMasterVatStatement() == null) { VatStatement masterVatStatement = new VatStatementImpl(); vatStatement.setMasterVatStatement(masterVatStatement); } vatChartMovementForm.setVatStatement(vatStatement); + + InputMap inputMap = vatChartMovementForm.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = vatChartMovementForm.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + vatChartMovementForm.performCancel(); + } + }); + // jaxx constructor don't call super() ? vatChartMovementForm.setLocationRelativeTo(view); vatChartMovementForm.setVisible(true); @@ -172,8 +237,20 @@ } public void importVatStatementChart() { - VatChartImportForm form = + final VatChartImportForm form = new VatChartImportForm(); + + InputMap inputMap = form.getRootPane().getInputMap(JComponent.WHEN_ANCESTOR_OF_FOCUSED_COMPONENT); + ActionMap actionMap = form.getRootPane().getActionMap(); + String binding = "dispose"; + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_ESCAPE, 0), binding); + actionMap.put(binding, new AbstractAction() { + @Override + public void actionPerformed(ActionEvent e) { + form.performCancel(); + } + }); + form.setLocationRelativeTo(view); form.setVisible(true); Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-edit.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-edit.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-import.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-import.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-new.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-new.png) =================================================================== (Binary files differ) Copied: trunk/lima-swing/src/main/resources/icons/action-vatstatement-remove.png (from rev 3729, trunk/lima-swing/src/main/resources/icons/action-entryBook-remove.png) =================================================================== (Binary files differ)