[Lima-commits] 03/03: refs #1187 : inancial statement popups

This is an automated email from the git hooks/post-receive script. New commit to branch feature/1187 in repository lima. See http://git.chorem.org/lima.git commit e68fb180bb900891bbf935476e7a305d49a28aaf Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 30 17:13:41 2015 +0200 refs #1187 : inancial statement popups --- .../org/chorem/lima/FinancialStatementWayEnum.java | 42 +++-------- .../resources/i18n/lima-callao_en_GB.properties | 6 +- .../resources/i18n/lima-callao_fr_FR.properties | 6 +- .../lima/enums/FinancialStatementsChartEnum.java | 22 +++++- .../java/org/chorem/lima/ui/ClosableTabHeader.css | 2 +- .../FinancialStatementChartViewHandler.java | 8 +- .../FinancialStatementHeaderForm.css | 25 ++++--- .../FinancialStatementHeaderForm.jaxx | 65 ++++++++-------- .../FinancialStatementImportForm.css | 41 ++++------ .../FinancialStatementImportForm.jaxx | 83 ++++++++------------- .../FinancialStatementMovementForm.css | 16 +++- .../FinancialStatementMovementForm.jaxx | 63 ++++++++-------- .../java/org/chorem/lima/util/ReportDialogView.css | 5 +- .../org/chorem/lima/util/ReportDialogView.jaxx | 2 +- .../resources/i18n/lima-swing_en_GB.properties | 10 ++- .../resources/i18n/lima-swing_fr_FR.properties | 26 ++++--- .../{action-closeTab.png => action-close.png} | Bin 17 files changed, 206 insertions(+), 216 deletions(-) diff --git a/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java b/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java index 58dfaa5..bc7a15b 100644 --- a/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java +++ b/lima-callao/src/main/java/org/chorem/lima/FinancialStatementWayEnum.java @@ -22,44 +22,24 @@ package org.chorem.lima; +import org.chorem.lima.beans.Labeled; + import static org.nuiton.i18n.I18n.t; -public enum FinancialStatementWayEnum { +public enum FinancialStatementWayEnum implements Labeled { - BOTH(t("lima.enum.comboboxamount.both")), - DEBIT(t("lima.enum.comboboxamount.debit")), - CREDIT(t("lima.enum.comboboxamount.credit")); - - private final String description; + BOTH(t("lima.financialStatement.way.both")), + DEBIT(t("lima.financialStatement.way.debit")), + CREDIT(t("lima.financialStatement.way.credit")); - FinancialStatementWayEnum(String description) { - this.description = description; - } - - public String getDescription() { - return description; - } + private final String label; - public static String[] descriptions(){ - int nbElts = FinancialStatementWayEnum.values().length; - String[] descriptions = new String[nbElts]; - FinancialStatementWayEnum[] enums = FinancialStatementWayEnum.values(); - for (int i = 0; i < nbElts; i++) { - descriptions[i] = enums[i].getDescription(); - } - return descriptions; + FinancialStatementWayEnum(String label) { + this.label = label; } - public static FinancialStatementWayEnum valueOfDescription(String description){ - FinancialStatementWayEnum value = null; - - for (FinancialStatementWayEnum enums : FinancialStatementWayEnum.values()) { - if (description.equals(enums.description)){ - value = enums; - break; - } - } - return value; + public String getLabel() { + return label; } } diff --git a/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties b/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties index 5f15eb0..b6fd963 100644 --- a/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties +++ b/lima-callao/src/main/resources/i18n/lima-callao_en_GB.properties @@ -4,9 +4,9 @@ lima.enum.BigDecimal.operand.lowerorequal=<\= lima.enum.BigDecimal.operand.notequal=≠ lima.enum.BigDecimal.operand.upper=> lima.enum.BigDecimal.operand.upperorequal=>\= -lima.enum.comboboxamount.both=All -lima.enum.comboboxamount.credit=Credit -lima.enum.comboboxamount.debit=Debit +lima.financialStatement.way.both=All +lima.financialStatement.way.credit=Credit +lima.financialStatement.way.debit=Debit lima.enum.date.operand.after=after the lima.enum.date.operand.different=not same as lima.enum.date.operand.previous=before the diff --git a/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties b/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties index 8e7fa7a..b405140 100644 --- a/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties +++ b/lima-callao/src/main/resources/i18n/lima-callao_fr_FR.properties @@ -4,9 +4,9 @@ lima.enum.BigDecimal.operand.lowerorequal=<\= lima.enum.BigDecimal.operand.notequal=≠ lima.enum.BigDecimal.operand.upper=> lima.enum.BigDecimal.operand.upperorequal=>\= -lima.enum.comboboxamount.both=Tous -lima.enum.comboboxamount.credit=Crédit -lima.enum.comboboxamount.debit=Débit +lima.financialStatement.way.both=Tous +lima.financialStatement.way.credit=Crédit +lima.financialStatement.way.debit=Débit lima.enum.date.operand.after=après le lima.enum.date.operand.different=différent du lima.enum.date.operand.previous=avant le diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/FinancialStatementsChartEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/FinancialStatementsChartEnum.java index b1df6bc..10a851e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/enums/FinancialStatementsChartEnum.java +++ b/lima-swing/src/main/java/org/chorem/lima/enums/FinancialStatementsChartEnum.java @@ -22,21 +22,35 @@ package org.chorem.lima.enums; +import org.chorem.lima.beans.Labeled; + import java.net.URL; -public enum FinancialStatementsChartEnum { +import static org.nuiton.i18n.I18n.t; + +public enum FinancialStatementsChartEnum implements Labeled{ - IMPORT(""), SHORTENED("bcr_shortened.csv"), BASE("bcr_base.csv"), DEVELOPED("bcr_developed.csv"); + SHORTENED("bcr_shortened.csv", t("lima.financialStatement.shortened")), + BASE("bcr_base.csv", t("lima.financialStatement.base")), + DEVELOPED("bcr_developed.csv", t("lima.financialStatement.developed")), + IMPORT("", t("lima.financialStatement.import")); private final String filePath; - FinancialStatementsChartEnum(String filePath) { - this.filePath = filePath; + protected String label; + FinancialStatementsChartEnum(String filePath, String label) { + this.filePath = filePath; + this.label = label; } public URL getDefaultFileUrl() { URL url = ImportExportEnum.getFileURL("/import/" + filePath); return url; } + + @Override + public String getLabel() { + return label; + } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css index 241fa8d..635722a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.css @@ -33,7 +33,7 @@ focusable : false; border : {BorderFactory.createEtchedBorder()}; borderPainted : false; - actionIcon : closeTab; + actionIcon : close; visible : {isCanClose()}; enabled : {isCanClose()}; height : 16; diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java index 3e5bc1b..1b5e3a1 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementChartViewHandler.java @@ -380,17 +380,17 @@ public class FinancialStatementChartViewHandler implements ServiceListener { form.setLocationRelativeTo(view); form.setVisible(true); - Object value = form.getRadioButtons().getSelectedValue(); + Object value = form.getChartFinancialStatementCombo().getSelectedItem(); // if action confirmed if (value != null) { - if (form.getDeleteFinancialStatementChart().isSelected()) { + if (form.getDeleteChartFinancialStatement().isSelected()) { financialStatementService.removeAllFinancialStatement(); } - FinancialStatementsChartEnum defaultFinancialStatementsEnum = + FinancialStatementsChartEnum financialStatementsEnum = (FinancialStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_FINANCIALSTATEMENTS_IMPORT, - null, null, true); + null, financialStatementsEnum.getDefaultFileUrl(), true); } } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css index 035a724..7096339 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.css @@ -23,32 +23,39 @@ title : "lima.financialStatement.header.form"; } -#descriptionLabel { +#labelLabel { text : "lima.financialStatement.label"; } -#descriptionTextField { - text : "{getFinancialStatement().getLabel()}"; +#wayLabel { + text : "lima.financialStatement.way"; } -#subAmountCheckBox { - text : "lima.financialStatement.subAmount"; - selected : "{getFinancialStatement().getSubAmount()}"; +#wayCombo { + model : {new DefaultComboBoxModel(FinancialStatementWayEnum.values())}; + renderer : {new LabelListCellRenderer()}; } #headerAmountCheckBox { text : "lima.financialStatement.headerAmount"; - selected : "{getFinancialStatement().getHeaderAmount()}"; + selected : {getFinancialStatement().isHeaderAmount()}; } -#wayEnumEditor { - selectedItem : "{getFinancialStatement().getWay()}"; +#subAmountCheckBox { + text : "lima.financialStatement.subAmount"; + border : {BorderFactory.createEmptyBorder(0, 6, 0, 0)}; + enabled : {getHeaderAmountCheckBox().isSelected()}; + selected : {getFinancialStatement().isSubAmount() && getHeaderAmountCheckBox().isSelected()}; + } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } + diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx index 668b576..0793529 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementHeaderForm.jaxx @@ -25,10 +25,13 @@ onWindowClosing="performCancel();"> <import> - javax.swing.text.Document - org.chorem.lima.FinancialStatementWayEnum - org.chorem.lima.entity.FinancialStatement - org.chorem.lima.entity.FinancialStatementImpl + javax.swing.text.Document + javax.swing.DefaultComboBoxModel + + org.chorem.lima.FinancialStatementWayEnum + org.chorem.lima.entity.FinancialStatement + org.chorem.lima.entity.FinancialStatementImpl + org.chorem.lima.ui.common.LabelListCellRenderer </import> <FinancialStatement id="financialStatement" javaBean='null'/> <Boolean id="addState" javaBean='true'/> @@ -39,7 +42,7 @@ protected void getFinancialStatementWayValue(){ FinancialStatementWayEnum fSWE = - (FinancialStatementWayEnum) wayEnumEditor.getSelectedItem(); + (FinancialStatementWayEnum) wayCombo.getSelectedItem(); if (fSWE == null){ fSWE = FinancialStatementWayEnum.BOTH; @@ -55,46 +58,46 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> - <cell fill="horizontal"> - <JLabel id="descriptionLabel"/> + <cell anchor="east"> + <JLabel id="labelLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField"/> - <Document javaBean="getDescriptionTextField().getDocument()" - onInsertUpdate="getFinancialStatement().setLabel(getDescriptionTextField().getText())" - onRemoveUpdate="getFinancialStatement().setLabel(getDescriptionTextField().getText())"/> + <JTextField id="labelTextField" + text="{getFinancialStatement().getLabel()}" + onKeyReleased="getFinancialStatement().setLabel(labelTextField.getText())"/> </cell> </row> <row> - <cell> - <JCheckBox id="subAmountCheckBox" - onActionPerformed="getFinancialStatement().setSubAmount(subAmountCheckBox.isSelected())"/> + <cell anchor="east"> + <JLabel id="wayLabel"/> + </cell> + <cell fill="horizontal"> + <JComboBox id="wayCombo" + onActionPerformed="getFinancialStatementWayValue()"/> </cell> </row> <row> - <cell> + <cell columns="2" anchor="west"> <JCheckBox id="headerAmountCheckBox" onActionPerformed="getFinancialStatement().setHeaderAmount(headerAmountCheckBox.isSelected())"/> </cell> </row> <row> - <cell> - <EnumEditor id='wayEnumEditor' - constructorParams='org.chorem.lima.FinancialStatementWayEnum.class' - onActionPerformed="getFinancialStatementWayValue()"/> - </cell> - </row> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> + <cell columns="2" anchor="west"> + <JCheckBox id="subAmountCheckBox" + onActionPerformed="getFinancialStatement().setSubAmount(subAmountCheckBox.isSelected())"/> </cell> </row> - </Table> + </Table> + + + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css index 0a62fae..9eec65d 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.css @@ -20,48 +20,35 @@ * #L% */ #financialStatementImportForm { - title : "lima.financialStatement.import.form"; + title : "lima.financialStatement.import"; } -#nothing { - text : "lima.financialStatement.nothing"; +#description { + text : "lima.financialStatement.import.description"; + border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)}; } -#shortened { - text : "lima.financialStatement.shortened"; - value : "{FinancialStatementsChartEnum.SHORTENED}"; - buttonGroup : "{getRadioButtons()}"; - selected : "true"; +#chartFinancialStatementLabel { + text : "lima.financialStatement"; } -#statementBase { - text : "lima.financialStatement.base"; - value : "{FinancialStatementsChartEnum.BASE}"; - buttonGroup : "{getRadioButtons()}"; +#chartFinancialStatementCombo { + model : {new DefaultComboBoxModel(FinancialStatementsChartEnum.values())}; + renderer : {new LabelListCellRenderer()}; } -#developed { - text : "lima.financialStatement.developed"; - value : "{FinancialStatementsChartEnum.DEVELOPED}"; - buttonGroup : "{getRadioButtons()}"; -} - -#statementImport { - text : "lima.importExport.import"; - value : "{FinancialStatementsChartEnum.IMPORT}"; - buttonGroup : "{getRadioButtons()}"; -} - -#deleteFinancialStatementChart { - text : "lima.financialStatement.delete"; +#deleteChartFinancialStatement { + text : "lima.financialStatement.import.delete"; selected : false; } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; -} \ No newline at end of file + actionIcon : ok; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx index ce1aeb5..9667238 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx @@ -23,11 +23,13 @@ <JDialog id="financialStatementImportForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> - jaxx.runtime.swing.JAXXButtonGroup org.chorem.lima.enums.FinancialStatementsChartEnum + javax.swing.DefaultComboBoxModel + org.chorem.lima.ui.common.LabelListCellRenderer </import> <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> @@ -38,58 +40,39 @@ getRootPane().setDefaultButton(ok); protected void performCancel() { - getRadioButtons().setSelectedValue(null); + getChartFinancialStatementCombo().setSelectedItem(null); dispose(); } ]]> </script> - <Table> - <row> - <cell> - <JLabel id="nothing"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="shortened" /> - </cell> - </row> - <row> - <cell> - <JRadioButton id="statementBase"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="developed"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="statementImport"/> - </cell> - </row> - <row> - <cell> - <JCheckBox id="deleteFinancialStatementChart"/> - </cell> - </row> - <row> - <cell> - <Table> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> - </cell> - </row> - </Table> - </cell> - </row> - </Table> + <JLabel constraints="BorderLayout.NORTH" + id="description"/> + + <JPanel constraints="BorderLayout.CENTER" + layout="{new BorderLayout()}"> + + <Table constraints="BorderLayout.CENTER"> + <row> + <cell anchor="east"> + <JLabel id="chartFinancialStatementLabel"/> + </cell> + <cell anchor="west"> + <JComboBox id="chartFinancialStatementCombo"/> + </cell> + </row> + </Table> + + <JCheckBox constraints="BorderLayout.SOUTH" + id="deleteChartFinancialStatement"/> + + </JPanel> + + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css index d010b0f..c3188c7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.css @@ -23,14 +23,18 @@ title : "lima.financialStatement.movement.form"; } -#descriptionLabel { +#labelLabel { text : "lima.financialStatement.label"; } -#descriptionTextField { +#labelTextField { text : "{getFinancialStatement().getLabel()}"; } +#accountsSelectionTitle { + text : "lima.financialStatement.accountsSelection.tilte"; +} + #accountsLabel { text : "lima.financialStatement.accounts"; } @@ -63,10 +67,16 @@ text : "{getFinancialStatement().getProvisionDeprecationAccounts()}"; } +#accountsSelection { + text : "lima.financialStatement.accountsSelection"; +} + #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; -} \ No newline at end of file + actionIcon : ok; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx index 53e13f3..5e411e5 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementMovementForm.jaxx @@ -46,69 +46,66 @@ <Table> <row> - <cell fill="horizontal"> - <JLabel id="descriptionLabel"/> + <cell anchor="east"> + <JLabel id="labelLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="descriptionTextField"/> - <Document javaBean="getDescriptionTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())' - onRemoveUpdate='getFinancialStatement().setLabel(getDescriptionTextField().getText())'/> + <JTextField id="labelTextField" + onKeyReleased="getFinancialStatement().setLabel(labelTextField.getText())"/> </cell> </row> <row> - <cell fill="horizontal"> + <cell columns="2" anchor="west"> + <JLabel id="accountsSelectionTitle"></JLabel> + </cell> + </row> + <row> + <cell anchor="east"> <JLabel id="accountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="accountsTextField"/> - <Document javaBean="getAccountsTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setAccounts(getAccountsTextField().getText())' - onRemoveUpdate='getFinancialStatement().setAccounts(getAccountsTextField().getText())'/> + <JTextField id="accountsTextField" + onKeyReleased="getFinancialStatement().setAccounts(getAccountsTextField().getText())"/> </cell> </row> <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="debitAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="debitAccountsTextField"/> - <Document javaBean="getDebitAccountsTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setDebitAccounts(getDebitAccountsTextField().getText())' - onRemoveUpdate='getFinancialStatement().setDebitAccounts(getDebitAccountsTextField().getText())'/> + <JTextField id="debitAccountsTextField" + onKeyReleased="getFinancialStatement().setDebitAccounts(getDebitAccountsTextField().getText())"/> </cell> </row> <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="creditAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="creditAccountsTextField"/> - <Document javaBean="getCreditAccountsTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setCreditAccounts(getCreditAccountsTextField().getText())' - onRemoveUpdate='getFinancialStatement().setCreditAccounts(getCreditAccountsTextField().getText())'/> + <JTextField id="creditAccountsTextField" + onKeyReleased="getFinancialStatement().setCreditAccounts(getCreditAccountsTextField().getText())"/> </cell> </row> <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="provisionDeprecationAccountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="provisionDeprecationAccountsTextField"/> - <Document javaBean="getProvisionDeprecationAccountsTextField().getDocument()" - onInsertUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())' - onRemoveUpdate='getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())'/> + <JTextField id="provisionDeprecationAccountsTextField" + onKeyReleased="getFinancialStatement().setProvisionDeprecationAccounts(getProvisionDeprecationAccountsTextField().getText())"/> </cell> </row> <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> + <cell columns="2"> + <JLabel id="accountsSelection"></JLabel> </cell> </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css index 8a0e4e0..6f99734 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css +++ b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.css @@ -27,6 +27,7 @@ editable : false; } -#okButton { - text : "lima.ok"; +#close { + text : "lima.close"; + actionIcon : close; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx index c87a633..9ce16b6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/util/ReportDialogView.jaxx @@ -37,7 +37,7 @@ <JPanel constraints="BorderLayout.PAGE_END" layout="{new FlowLayout(FlowLayout.RIGHT)}"> - <JButton id="okButton" + <JButton id="close" onActionPerformed="dispose()"/> </JPanel> diff --git a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties index 3bdaec0..36f012a 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties @@ -24,6 +24,7 @@ lima.chart.accounts.developed=Developped accountchart lima.chart.accounts.import.csv=CSV customized accounting plan lima.chart.accounts.import.ebp=EBP customized accounting plan lima.chart.accounts.shortened=Shorthened accountchart +lima.close= lima.closed=Closed lima.code=Code lima.config.category.directories=Directories @@ -251,25 +252,28 @@ lima.financialPeriod.status=Status lima.financialPeriods=Financial periods lima.financialStatement=Financial statement chart lima.financialStatement.accounts=Account list on debit and on credit +lima.financialStatement.accountsSelection= +lima.financialStatement.accountsSelection.tilte= lima.financialStatement.base=Base financial statement chart lima.financialStatement.check=Check accounts passing to movement lima.financialStatement.creditAccounts=Account credit list lima.financialStatement.debitAccounts=Account debit list -lima.financialStatement.delete=Delete actual financial statement chart before import new lima.financialStatement.developed=Developped financial statement chart lima.financialStatement.error.alreadyExistFinancialStatement=Failed\! Financial statement %s already exist lima.financialStatement.header.add=Add category lima.financialStatement.header.form=Category lima.financialStatement.headerAmount=Calculate amount on header -lima.financialStatement.import.form=Import +lima.financialStatement.import=Import +lima.financialStatement.import.delete=Delete actual financial statement chart before import new +lima.financialStatement.import.description=NO financialstatement chart lima.financialStatement.label=Label lima.financialStatement.movement.add=Add movement lima.financialStatement.movement.form=Group -lima.financialStatement.nothing=NO financialstatement chart lima.financialStatement.provisionDeprecationAccounts= lima.financialStatement.remove.confirm=Do you really want to remove this financial statement ? lima.financialStatement.shortened=Shortened financialstatement chart lima.financialStatement.subAmount=Calculate a subamount +lima.financialStatement.way=Way lima.financialStatements=Financial statements lima.financialStatements.check=check account lima.financialStatements.check.nothing=Not found\: %s - %s diff --git a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties index 0052262..098cd95 100644 --- a/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties +++ b/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties @@ -25,6 +25,7 @@ lima.chart.accounts.developed=Développé lima.chart.accounts.import.csv=Personnalisé au format CSV lima.chart.accounts.import.ebp=Personnalisé au format EBP lima.chart.accounts.shortened=Abrégé +lima.close=Fermer lima.config.category.directories=Répertoires lima.config.category.directories.description=Répertoires utilisés par Lima lima.config.category.other=Autre @@ -261,26 +262,29 @@ lima.financialPeriod.period=Période lima.financialPeriod.status=Statut lima.financialPeriods=Périodes comptables lima.financialStatement=Plan BCR -lima.financialStatement.accounts=Liste de comptes au crédit et au débit -lima.financialStatement.base=Plan BCR de base +lima.financialStatement.accounts=Au crédit et au débit +lima.financialStatement.accountsSelection=<html><ul><li><strong>AAA, BBB, CCC</strong> \: La sommes des montants pour les comptes AAA, BBB et CCC ;</li><li><strong>AAA, BBB - CCC ; DDD</strong> \: Les montants des comptes AAA et BBB moins les montants des comptes CCC et DDD ;</li><li><strong>AAA .. BBB</strong> \: Le montant de touts les comptes entre AAA et BBB (inclus).</li></ul></html> +lima.financialStatement.accountsSelection.tilte=<html><h3>Sélection des comptes</h3></html> +lima.financialStatement.base=Standard lima.financialStatement.check=Vérification des comptes (Ctrl+F) -lima.financialStatement.creditAccounts=Liste de comptes au crédit -lima.financialStatement.debitAccounts=Liste de comptes au débit -lima.financialStatement.delete=Supprimer le plan BCR actuel avant d'importer -lima.financialStatement.developed=Plan BCR développé +lima.financialStatement.creditAccounts=Au crédit +lima.financialStatement.debitAccounts=Au débit +lima.financialStatement.developed=Développé lima.financialStatement.error.alreadyExistFinancialStatement=u00C9chec \: Le mouvement %s exist déjà \! lima.financialStatement.header.add=Ajouter une catégorie (Ctrl+Maj+N) lima.financialStatement.header.form=Catégorie -lima.financialStatement.headerAmount=Calculer le total en en-tete -lima.financialStatement.import.form=Importer +lima.financialStatement.headerAmount=Afficher le total en en-tete +lima.financialStatement.import=Importé +lima.financialStatement.import.delete=Supprimer le plan BCR actuel avant d'importer +lima.financialStatement.import.description=Sélectionnez un plan BCR à importer lima.financialStatement.label=Libellé lima.financialStatement.movement.add=Ajouter un regrouprement (Ctrl+N) lima.financialStatement.movement.form=Regroupement -lima.financialStatement.nothing=<html><center>Aucun plan BCR chargé<br/>Veuillez sélectionner un plan par défaut, <br/>importer un plan personnalisé<br/> ou annuler pour créer votre propre plan.</center></html> -lima.financialStatement.provisionDeprecationAccounts=Liste de comptes d'amortissement et provisions +lima.financialStatement.provisionDeprecationAccounts=Amortissement et provisions lima.financialStatement.remove.confirm=Voulez-vous supprimer ce bilan ? -lima.financialStatement.shortened=Plan BCR abrégé +lima.financialStatement.shortened=Abrégé lima.financialStatement.subAmount=Calculer un sous-total +lima.financialStatement.way=Valorisation lima.financialStatements=Plan BCR lima.financialStatements.check=Vérification des comptes aux postes lima.financialStatements.check.nothing=Introuvable\: %s - %s diff --git a/lima-swing/src/main/resources/icons/action-closeTab.png b/lima-swing/src/main/resources/icons/action-close.png similarity index 100% rename from lima-swing/src/main/resources/icons/action-closeTab.png rename to lima-swing/src/main/resources/icons/action-close.png -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.