branch feature/1187 updated (7e3dbfa -> 37937e4)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1187 in repository lima. See http://git.chorem.org/lima.git discards 7e3dbfa refs #1187 : identitiy popups discards 4e12c75 refs #1187 : Vat chart popups discards d212660 refs #1187 : inancial statement popups discards e27ec71 refs #1187 : fiscal period popups discards 91dab5f refs #1187 : entry book popups discards ea8d12e refs #1187 : account popups discards 14ee9ac change remove icon on tab adds f8d81c6 refs #1226 Hide close tab button if you cannot close the tab adds 2184fc7 fixes #1226 Hide close tab button if you cannot close the tab Merge branch 'feature/1226' into develop adds e06ef0c fixes #1193 La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale adds 2581c20 refs #1226 Hide close tab button if you cannot close the tab adds a9d9110 utilisation css adds e8a9357 fixes #1193: La zone des critères de recherche apparait réduite, les critères de recherche ne sont donc pas visibles, il faudrait définir une taille minimale Merge branch 'feature/1193' into develop new 9243835 change remove icon on tab new 47dacdc refs #1187 : account popups new 0e30c25 refs #1187 : entry book popups new 4ac2c21 refs #1187 : fiscal period popups new ece040e refs #1187 : inancial statement popups new 1f5f807 refs #1187 : Vat chart popups new 37937e4 refs #1187 : identitiy popups This update added new revisions after undoing existing revisions. That is to say, some revisions that were in the old version of the branch are not in the new version. This situation occurs when a user --force pushes a change and generates a repository containing something like this: * -- * -- B -- O -- O -- O (7e3dbfa) \ N -- N -- N refs/heads/feature/1187 (37937e4) You should already have received notification emails for all of the O revisions, and so the following emails describe only the N revisions from the common base, B. Any revisions marked "omits" are not gone; other references still refer to them. Any revisions marked "discards" are gone forever. The 7 revisions listed above as "new" are entirely new to this repository and will be described in separate emails. The revisions listed as "adds" were already present in the repository and have only been added to this reference. Detailed log of new commits: commit 37937e4aeca32b2c4f219d80fcda24a51b415560 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 14:28:51 2015 +0200 refs #1187 : identitiy popups commit 1f5f80772d2872cd1c226049e48743bf2072753d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 09:09:09 2015 +0200 refs #1187 : Vat chart popups commit ece040e90663517b2b377ffb28e4b377ec34efaa Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Mon Mar 30 17:13:41 2015 +0200 refs #1187 : inancial statement popups commit 4ac2c21bc21d6e011c82857f03211ec0acac4446 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 27 08:52:22 2015 +0100 refs #1187 : fiscal period popups commit 0e30c25096ee2cc6221bf16b69d6a6e6b8912aa6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:26:07 2015 +0100 refs #1187 : entry book popups commit 47dacdc28e704cc6ad3722a197adf1a14360e22f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:15:42 2015 +0100 refs #1187 : account popups commit 92438356a5d57e2497e185edc073dad10fcca377 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 15:02:18 2015 +0100 change remove icon on tab Summary of changes: .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../java/org/chorem/lima/ui/ClosableTabHeader.css | 1 + .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 3 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 275 +++++++++++++++++---- .../java/org/chorem/lima/ui/MainViewHandler.java | 1 + .../FinancialTransactionSearchView.css | 6 +- .../FinancialTransactionSearchView.jaxx | 7 +- .../FinancialTransactionSearchViewHandler.java | 13 +- 8 files changed, 245 insertions(+), 62 deletions(-) -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 92438356a5d57e2497e185edc073dad10fcca377 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 15:02:18 2015 +0100 change remove icon on tab --- .../main/java/org/chorem/lima/ui/ClosableTabHeader.css | 12 ++++++++---- .../src/main/resources/icons/action-closeTab.png | Bin 3140 -> 655 bytes 2 files changed, 8 insertions(+), 4 deletions(-) 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 712b8b9..6b10fa5 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 @@ -30,9 +30,13 @@ } #closeTab { - opaque : true; - border : {BorderFactory.createEmptyBorder()}; - focusPainted : false; + contentAreaFilled : false; + focusable : false; + border : {BorderFactory.createEtchedBorder()}; + borderPainted : false; actionIcon : closeTab; - visible: {isCanClose()}; + visible : {isCanClose()}; + enabled : {isCanClose()}; + height : 16; + width : 16; } diff --git a/lima-swing/src/main/resources/icons/action-closeTab.png b/lima-swing/src/main/resources/icons/action-closeTab.png index 235e4a9..1514d51 100644 Binary files a/lima-swing/src/main/resources/icons/action-closeTab.png and b/lima-swing/src/main/resources/icons/action-closeTab.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 47dacdc28e704cc6ad3722a197adf1a14360e22f Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:15:42 2015 +0100 refs #1187 : account popups --- .../org/chorem/lima/enums/AccountsChartEnum.java | 24 ++++++-- .../org/chorem/lima/ui/account/AccountForm.css | 2 + .../org/chorem/lima/ui/account/AccountForm.jaxx | 20 +++---- .../chorem/lima/ui/account/AccountImportForm.css | 39 ++++--------- .../chorem/lima/ui/account/AccountImportForm.jaxx | 61 +++++++-------------- .../chorem/lima/ui/account/AccountViewHandler.java | 2 +- .../chorem/lima/ui/account/UpdateAccountForm.css | 2 + .../chorem/lima/ui/account/UpdateAccountForm.jaxx | 17 +++--- .../resources/i18n/lima-swing_fr_FR.properties | 10 ++-- .../src/main/resources/icons/action-cancel.png | Bin 0 -> 587 bytes lima-swing/src/main/resources/icons/action-ok.png | Bin 0 -> 537 bytes 11 files changed, 78 insertions(+), 99 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/AccountsChartEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/AccountsChartEnum.java index 4ec0a32..cab2b65 100644 --- a/lima-swing/src/main/java/org/chorem/lima/enums/AccountsChartEnum.java +++ b/lima-swing/src/main/java/org/chorem/lima/enums/AccountsChartEnum.java @@ -22,16 +22,27 @@ package org.chorem.lima.enums; +import org.chorem.lima.beans.Labeled; + import java.net.URL; -public enum AccountsChartEnum { +import static org.nuiton.i18n.I18n.t; + +public enum AccountsChartEnum implements Labeled { + + BASE("pcg_base.csv", t("lima.chart.accounts.base")), + SHORTENED("pcg_shortened.csv", t("lima.chart.accounts.shortened")), + DEVELOPED("pcg_developed.csv", t("lima.chart.accounts.developed")), + IMPORT("", t("lima.chart.accounts.import.csv")), + IMPORT_EBP("", t("lima.chart.accounts.import.ebp")); - IMPORT(""), IMPORT_EBP(""), SHORTENED("pcg_shortened.csv"), BASE("pcg_base.csv"), DEVELOPED("pcg_developed.csv"); + protected String filePath; - private final String filePath; + protected String label; - AccountsChartEnum(String filePath) { + AccountsChartEnum(String filePath, String label) { this.filePath = filePath; + this.label = label; } public URL getDefaultFileURL() { @@ -39,4 +50,9 @@ public enum AccountsChartEnum { return url; } + public String getLabel() { + return label; + } + + } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css index dd784d5..99db39a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.css @@ -43,8 +43,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx index cc0b830..f6a2871 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountForm.jaxx @@ -23,6 +23,7 @@ <JDialog id="accountFormDailog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="dispose()"> <import> @@ -40,7 +41,7 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell fill="horizontal"> @@ -64,15 +65,12 @@ onRemoveUpdate='account.setLabel(descriptionTextField.getText())'/> </cell> </row> - <row> - <cell columns="2"> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton id="cancel" - onActionPerformed="dispose()"/> - <JButton id="ok" - onActionPerformed="handler.addAccount(this)"/> - </JPanel> - </cell> - </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="handler.addAccount(this)"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css index ddaf141..b49f4c6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.css @@ -20,48 +20,29 @@ * #L% */ #accountImportDialog { - title : "lima.account.import" + title : "lima.account.import"; } #description { - text : "lima.account.import.description" + text : "lima.account.import.description"; + border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)}; } -#shortened { - text : "lima.chart.accounts.shortened"; - value : "{AccountsChartEnum.SHORTENED}"; - buttonGroup : buttonGroup; - selected : true; +#chartAccountLabel { + text : "lima.chart.accounts"; } -#accountsBase { - text : "lima.chart.accounts.base"; - value : "{AccountsChartEnum.BASE}"; - buttonGroup : buttonGroup; -} - -#developed { - text : "lima.chart.accounts.developed"; - value : "{AccountsChartEnum.DEVELOPED}"; - buttonGroup : buttonGroup; -} - -#importcsv { - text : "lima.chart.accounts.import.csv"; - value : "{AccountsChartEnum.IMPORT}"; - buttonGroup : buttonGroup; -} - -#importebp { - text : "lima.chart.accounts.import.ebp"; - value : "{AccountsChartEnum.IMPORT_EBP}"; - buttonGroup : buttonGroup; +#chartAccountCombo { + model : {new DefaultComboBoxModel(AccountsChartEnum.values())}; + renderer : {new LabelListCellRenderer()}; } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx index 8df4aa2..df08eec 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountImportForm.jaxx @@ -22,10 +22,13 @@ <JDialog id="accountImportDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> org.chorem.lima.enums.AccountsChartEnum + javax.swing.DefaultComboBoxModel + org.chorem.lima.ui.common.LabelListCellRenderer </import> <javax.swing.ButtonGroup id="buttonGroup" /> @@ -35,58 +38,32 @@ <![CDATA[ getRootPane().setDefaultButton(ok); protected void performCancel() { - buttonGroup.setSelectedValue(null); + chartAccountCombo.setSelectedItem(null); dispose(); } ]]> </script> - <Table> + <JLabel constraints="BorderLayout.NORTH" + id="description"/> + + <Table constraints="BorderLayout.CENTER"> <row> <cell> - <JLabel id="description"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="shortened"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="accountsBase"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="developed"/> + <JLabel id="chartAccountLabel"/> </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="importcsv"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="importebp"/> - </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> + <JComboBox id="chartAccountCombo"/> </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/ui/account/AccountViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java index 2ccad1a..9dc3d91 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/AccountViewHandler.java @@ -461,7 +461,7 @@ public class AccountViewHandler implements ServiceListener { form.setLocationRelativeTo(view); form.setVisible(true); - Object value = form.getButtonGroup().getSelectedValue(); + Object value = form.getChartAccountCombo().getSelectedItem(); // if action confirmed if (value != null) { ImportExport importExport = new ImportExport(view); diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css index 0e0a832..fe0797f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.css @@ -44,8 +44,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx index a98282b..a782014 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/account/UpdateAccountForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="updateAccountFormDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="dispose()"> <import> @@ -40,7 +41,7 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell fill="horizontal"> @@ -63,13 +64,15 @@ </row> <row> <cell columns="2"> - <JPanel layout='{new GridLayout(1,0)}'> - <JButton id="cancel" - onActionPerformed="dispose()"/> - <JButton id="ok" - onActionPerformed="handler.updateAccount(this)"/> - </JPanel> + </cell> </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="handler.updateAccount(this)"/> + </JPanel> </JDialog> 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 73550e7..0052262 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 @@ -20,11 +20,11 @@ lima.action.commandline.help=Afficher l'aide en console lima.balance=Équilibrer lima.cancel=Annuler lima.chart.accounts=Plan comptable -lima.chart.accounts.base=Plan comptable de base -lima.chart.accounts.developed=Plan comptable développé -lima.chart.accounts.import.csv=Plan comptable personnalisé au format CSV -lima.chart.accounts.import.ebp=Plan comptable personnalisé au format EBP -lima.chart.accounts.shortened=Plan comptable abrégé +lima.chart.accounts.base=Standard +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.config.category.directories=Répertoires lima.config.category.directories.description=Répertoires utilisés par Lima lima.config.category.other=Autre diff --git a/lima-swing/src/main/resources/icons/action-cancel.png b/lima-swing/src/main/resources/icons/action-cancel.png new file mode 100644 index 0000000..c149c2b Binary files /dev/null and b/lima-swing/src/main/resources/icons/action-cancel.png differ diff --git a/lima-swing/src/main/resources/icons/action-ok.png b/lima-swing/src/main/resources/icons/action-ok.png new file mode 100644 index 0000000..a9925a0 Binary files /dev/null and b/lima-swing/src/main/resources/icons/action-ok.png differ -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 0e30c25096ee2cc6221bf16b69d6a6e6b8912aa6 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 20 17:26:07 2015 +0100 refs #1187 : entry book popups --- .../org/chorem/lima/ui/entrybook/EntryBookForm.css | 2 ++ .../chorem/lima/ui/entrybook/EntryBookForm.jaxx | 20 ++++++++--------- .../lima/ui/entrybook/EntryBookImportForm.css | 2 ++ .../lima/ui/entrybook/EntryBookImportForm.jaxx | 26 +++++++++------------- 4 files changed, 23 insertions(+), 27 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css index bb177c7..dcacd40 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.css @@ -44,8 +44,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx index 47e375e..f4777f6 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="entryBookFormDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -41,7 +42,7 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JLabel id="codeLabel"/> @@ -64,15 +65,12 @@ onRemoveUpdate='getEntryBook().setLabel(getLabelTextField().getText())'/> </cell> </row> - <row> - <cell> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell> - <JButton id="ok" - onActionPerformed="dispose()"/> - </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/ui/entrybook/EntryBookImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css index 9ae8889..3d8265b 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.css @@ -38,8 +38,10 @@ #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx index 3e59d97..939e70e 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/entrybook/EntryBookImportForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="entryBookImportForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -41,30 +42,23 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JRadioButton id="entryBooksDefault"/> </cell> - <cell> - <JRadioButton id="entryBooksImport"/> - </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> + <JRadioButton id="entryBooksImport"/> </cell> </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="dispose()"/> + </JPanel> </JDialog> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 4ac2c21bc21d6e011c82857f03211ec0acac4446 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Fri Mar 27 08:52:22 2015 +0100 refs #1187 : fiscal period popups --- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.css | 6 +- .../org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx | 28 +++---- .../ui/fiscalperiod/FiscalPeriodViewHandler.java | 70 +++++++++++------- .../fiscalperiod/RetainedEarningsEntryBookForm.css | 33 ++++----- .../RetainedEarningsEntryBookForm.jaxx | 85 +++++----------------- 5 files changed, 92 insertions(+), 130 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css index b99c328..3aa092f 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.css @@ -37,10 +37,12 @@ labelFor : "{endDatePicker}"; } -#cancelButton { +#cancel { text : "lima.cancel"; + actionIcon : cancel; } -#okButton { +#ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx index 4af795a..06e4fc0 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/AddPeriod.jaxx @@ -22,6 +22,7 @@ <JDialog id="periodFormDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <Boolean id="modifyPeriod" javaBean="false"/> @@ -30,7 +31,7 @@ <script> <![CDATA[ - getRootPane().setDefaultButton(okButton); + getRootPane().setDefaultButton(ok); protected void performOk() { setValidate(true); @@ -43,7 +44,7 @@ } ]]></script> - <Table fill="both"> + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JLabel id="beginDateLabel"/> @@ -60,21 +61,12 @@ <org.jdesktop.swingx.JXDatePicker id="endDatePicker" /> </cell> </row> - <row> - <cell> - <Table fill="none" anchor="center" weighty="1"> - <row> - <cell> - <JButton id="cancelButton" - onActionPerformed="performCancel()"/> - </cell> - <cell> - <JButton id="okButton" - onActionPerformed="performOk()"/> - </cell> - </row> - </Table> - </cell> - </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="performCancel()"/> + <JButton id="ok" + onActionPerformed="performOk()"/> + </JPanel> </JDialog> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java index 514f805..38d031a 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java @@ -45,7 +45,14 @@ import org.chorem.lima.business.LimaServiceFactory; import org.chorem.lima.util.ErrorHelper; import org.nuiton.util.DateUtil; -import javax.swing.*; +import javax.swing.AbstractAction; +import javax.swing.ActionMap; +import javax.swing.DefaultListSelectionModel; +import javax.swing.InputMap; +import javax.swing.JComponent; +import javax.swing.JOptionPane; +import javax.swing.KeyStroke; +import javax.swing.SwingWorker; import javax.swing.event.ListSelectionEvent; import java.awt.event.ActionEvent; import java.awt.event.KeyEvent; @@ -374,46 +381,55 @@ public class FiscalPeriodViewHandler implements ServiceListener { if (answerRetainedEarnings == JOptionPane.YES_OPTION) { //Sets EntryBook - EntryBook newEntryBook = new EntryBookImpl(); RetainedEarningsEntryBookForm entryBookForm = new RetainedEarningsEntryBookForm(view); - entryBookForm.setEntryBook(newEntryBook); // jaxx constructor don't call super() ? entryBookForm.setLocationRelativeTo(view); entryBookForm.setVisible(true); - final EntryBook entryBook = entryBookForm.getEntryBook(); - if (entryBook != null && StringUtils.isNotBlank(entryBook.getCode())) { + if (entryBookForm.getValidate()) { + final EntryBook entryBook; - final RetainedEarningsWait retainedEarningsWait = new RetainedEarningsWait(view); - retainedEarningsWait.setLocationRelativeTo(view); + if (entryBookForm.getNewEntryBookCheckBox().isSelected()) { + entryBook = new EntryBookImpl(); + entryBook.setCode(entryBookForm.getCodeField().getText()); + entryBook.setLabel(entryBookForm.getLabelField().getText()); + } else { + entryBook = (EntryBook) entryBookForm.getEntryBookComboBox().getSelectedItem(); + } - new SwingWorker<FiscalPeriod, Void>() { - @Override - protected FiscalPeriod doInBackground() throws Exception { - FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.retainedEarningsAndBlockFiscalPeriod(selectedFiscalPeriod, entryBook, true); - tableModel.setValue(selectedRow, fiscalPeriodBlocked); + if (entryBook != null && StringUtils.isNotBlank(entryBook.getCode())) { - view.setBlockEnabled(false); - view.setDeleteEnabled(false); + final RetainedEarningsWait retainedEarningsWait = new RetainedEarningsWait(view); + retainedEarningsWait.setLocationRelativeTo(view); - return fiscalPeriodBlocked; - } + new SwingWorker<FiscalPeriod, Void>() { + @Override + protected FiscalPeriod doInBackground() throws Exception { + FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.retainedEarningsAndBlockFiscalPeriod(selectedFiscalPeriod, entryBook, true); + tableModel.setValue(selectedRow, fiscalPeriodBlocked); - @Override - protected void done() { - retainedEarningsWait.setVisible(false); - } - }.execute(); - retainedEarningsWait.setVisible(true); + view.setBlockEnabled(false); + view.setDeleteEnabled(false); - } else { + return fiscalPeriodBlocked; + } - JOptionPane.showMessageDialog(view, - t("lima.fiscalPeriod.block.cantBalanceNotBook"), - t("lima.fiscalPeriod.block.title"), - JOptionPane.ERROR_MESSAGE); + @Override + protected void done() { + retainedEarningsWait.setVisible(false); + } + }.execute(); + retainedEarningsWait.setVisible(true); + + } else { + + JOptionPane.showMessageDialog(view, + t("lima.fiscalPeriod.block.cantBalanceNotBook"), + t("lima.fiscalPeriod.block.title"), + JOptionPane.ERROR_MESSAGE); + } } } else { diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css index 190ab4d..7412c17 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.css @@ -21,50 +21,47 @@ */ #retainedEarningsEntryBookFormDialog { title : "lima.fiscalPeriod.block.retainedEarnings"; + minimumSize : {new Dimension(250, 160)} } -#selectedEntryBook { - text : "lima.entryBook"; - selected : true; - buttonGroup : "EntryBookGroup"; - +#newEntryBookCheckBox { + text : "lima.fiscalPeriod.entryBooks.create"; + border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)} } #entryBookSelectorLabel { text : "lima.entryBook"; + visible : {!newEntryBookCheckBox.isSelected()}; } #entryBookComboBox { - editable : "false"; -} - -#newEntryBook { - text : "lima.fiscalPeriod.entryBooks.create"; - selected : false; - buttonGroup : "EntryBookGroup"; + visible : {!newEntryBookCheckBox.isSelected()}; } #codeLabel { text : "lima.entryBook.code"; + visible : {newEntryBookCheckBox.isSelected()}; } #codeField { - text : "{getEntryBook().getCode()}"; + visible : {newEntryBookCheckBox.isSelected()}; } #labelLabel { text : "lima.label"; + visible : {newEntryBookCheckBox.isSelected()}; } -#LabelField { - editable : "{isAddState()}"; - text : "{getEntryBook().getLabel()}"; +#labelField { + visible : {newEntryBookCheckBox.isSelected()}; } -#cancelButton { +#cancel { text : "lima.cancel"; + actionIcon : cancel; } -#okButton { +#ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx index 2c50771..2754946 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsEntryBookForm.jaxx @@ -22,65 +22,37 @@ <JDialog id="retainedEarningsEntryBookFormDialog" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" - onWindowClosing="performCancel();"> + layout="{new BorderLayout()}" + onWindowClosing="dispose();"> <import> + java.awt.Dimension javax.swing.text.Document org.chorem.lima.entity.EntryBook org.chorem.lima.ui.common.EntryBookListRenderer </import> - <EntryBook id="entryBook" javaBean="null"/> - <Boolean id="addState" javaBean='true'/> + <Boolean id="validate" javaBean='false'/> <script> <![CDATA[ - getRootPane().setDefaultButton(okButton); + getRootPane().setDefaultButton(ok); /** * Sets null to EntryBook and closes JDialog */ - protected void performCancel() { - setEntryBook(null); + protected void performOk() { + setValidate(true); dispose(); } - - /** - * Sets the right EntryBook to use and its values - */ - protected void performNew() { - if (selectedEntryBook.isSelected()) { - entryBookComboBox.setEnabled(true); - labelField.setEditable(false); - codeField.setEditable(false); - if (getEntryBookComboBox().getSelectedItem() != null) { - getEntryBook().setCode(((EntryBook)getEntryBookComboBox().getSelectedItem()).getCode().trim()); - getEntryBook().setLabel(((EntryBook)getEntryBookComboBox().getSelectedItem()).getLabel().trim()); - } else { - setEntryBook(null); - } - } else { - entryBookComboBox.setEnabled(false); - labelField.setEditable(true); - codeField.setEditable(true); - getEntryBook().setCode(getCodeField().getText()); - getEntryBook().setLabel(getLabelField().getText()); - } - } - - void $afterCompleteSetup() { - performNew(); - } + ]]> </script> - <Table> - <row> - <cell anchor="west"> - <JRadioButton id="selectedEntryBook" - onActionPerformed="performNew()"/> - </cell> - </row> + <JCheckBox id="newEntryBookCheckBox" + constraints="BorderLayout.NORTH"/> + + <Table constraints="BorderLayout.CENTER"> <row> <cell> <JLabel id="entryBookSelectorLabel" /> @@ -89,14 +61,7 @@ <org.chorem.lima.ui.combobox.EntryBookComboBoxModel id="modelEntryBookComboBox"/> <JComboBox id="entryBookComboBox" model="{getModelEntryBookComboBox()}" - renderer="{new EntryBookListRenderer()}" - onItemStateChanged="getEntryBook().setCode(((EntryBook)getEntryBookComboBox().getSelectedItem()).getCode()); getEntryBook().setLabel(((EntryBook)getEntryBookComboBox().getSelectedItem()).getLabel())"/> - </cell> - </row> - <row> - <cell anchor="west"> - <JRadioButton id="newEntryBook" - onActionPerformed="performNew()"/> + renderer="{new EntryBookListRenderer()}"/> </cell> </row> <row> @@ -105,9 +70,6 @@ </cell> <cell> <JTextField id="codeField"/> - <Document javaBean="getCodeField().getDocument()" - onInsertUpdate='getEntryBook().setCode(getCodeField().getText())' - onRemoveUpdate='getEntryBook().setCode(getCodeField().getText())'/> </cell> </row> <row> @@ -116,21 +78,14 @@ </cell> <cell> <JTextField id="labelField"/> - <Document javaBean="getLabelField().getDocument()" - onInsertUpdate='getEntryBook().setLabel(getLabelField().getText())' - onRemoveUpdate='getEntryBook().setLabel(getLabelField().getText())'/> - </cell> - </row> - <row> - <cell> - <JButton id="cancelButton" - onActionPerformed="performCancel()"/> </cell> - <cell> - <JButton id="okButton" - onActionPerformed="dispose()"/> - </cell> - </row> </Table> + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="dispose()"/> + <JButton id="ok" + onActionPerformed="performOk()"/> + </JPanel> </JDialog> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 ece040e90663517b2b377ffb28e4b377ec34efaa 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 6b10fa5..5a0d28e 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 @@ -34,7 +34,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 70f0a6c..e0f3e35 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>.
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 1f5f80772d2872cd1c226049e48743bf2072753d Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 09:09:09 2015 +0200 refs #1187 : Vat chart popups --- .../chorem/lima/enums/VatStatementsChartEnum.java | 26 +++++-- .../FinancialStatementImportForm.jaxx | 1 - .../chorem/lima/ui/vatchart/VatChartImportForm.css | 35 ++++----- .../lima/ui/vatchart/VatChartImportForm.jaxx | 84 +++++++++------------- .../lima/ui/vatchart/VatChartMovementForm.css | 29 ++++---- .../lima/ui/vatchart/VatChartMovementForm.jaxx | 59 ++++++++------- .../lima/ui/vatchart/VatChartViewHandler.java | 7 +- .../resources/i18n/lima-swing_en_GB.properties | 3 + .../resources/i18n/lima-swing_fr_FR.properties | 13 ++-- 9 files changed, 122 insertions(+), 135 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java index f66d246..3a6d206 100644 --- a/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java +++ b/lima-swing/src/main/java/org/chorem/lima/enums/VatStatementsChartEnum.java @@ -21,22 +21,36 @@ */ package org.chorem.lima.enums; +import org.chorem.lima.beans.Labeled; + import java.net.URL; -public enum VatStatementsChartEnum { +import static org.nuiton.i18n.I18n.t; - IMPORT(""), SHORTENED("vat_shortened.csv"), BASE("vat_base.csv"), - DEVELOPED("vat_developed.csv"), DEFAULT("vat_default.csv"); +public enum VatStatementsChartEnum implements Labeled { - private final String filePath; + DEFAULT("vat_default.csv", t("lima.vatStatement.default")), + SHORTENED("vat_shortened.csv", t("lima.vatStatement.shortened")), + BASE("vat_base.csv", t("lima.vatStatement.base")), + DEVELOPED("vat_developed.csv", t("lima.vatStatement.developed")), + IMPORT("", t("lima.vatStatement.import")); - VatStatementsChartEnum(String filePath) { - this.filePath = filePath; + protected final String filePath; + + protected String label; + VatStatementsChartEnum(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/financialstatementchart/FinancialStatementImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialstatementchart/FinancialStatementImportForm.jaxx index 9667238..288adef 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 @@ -32,7 +32,6 @@ org.chorem.lima.ui.common.LabelListCellRenderer </import> - <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> <script> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css index 568554c..362e236 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.css @@ -20,47 +20,36 @@ * #L% */ #vatStatementImportFormg { - title : "lima.vatStatement.import.form"; + title : "lima.vatStatement.import"; } -#nothingLabel { - text : "lima.vatStatement.nothing"; -} -#shortened { - text : "lima.vatStatement.shortened"; - value : "{VatStatementsChartEnum.SHORTENED}"; - buttonGroup : "{getRadioButtons()}"; - selected : true; -} -#vatBase { - text : "lima.vatStatement.base"; - value : "{VatStatementsChartEnum.BASE}"; - buttonGroup : "{getRadioButtons()}"; +#description { + text : "lima.vatStatement.import.description"; + border : {BorderFactory.createEmptyBorder(6, 6, 6, 6)}; } -#developed { - text : "lima.vatStatement.developed"; - value : "{VatStatementsChartEnum.DEVELOPED}"; - buttonGroup : "{getRadioButtons()}"; +#chartVatStatementLabel { + text : "lima.vatStatement"; } -#importCSV { - text : "lima.vatStatement.import"; - value : "{VatStatementsChartEnum.IMPORT}"; - buttonGroup : "{getRadioButtons()}"; +#chartVatStatementCombo { + model : {new DefaultComboBoxModel(VatStatementsChartEnum.values())}; + renderer : {new LabelListCellRenderer()}; } #deleteVatStatementChart { - text : "lima.vatStatement.delete"; + text : "lima.vatStatement.import.delete"; selected : false; } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx index 4cc2852..7c924a3 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartImportForm.jaxx @@ -22,14 +22,15 @@ <JDialog id="vatStatementImportForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> - jaxx.runtime.swing.JAXXButtonGroup org.chorem.lima.enums.VatStatementsChartEnum + javax.swing.DefaultComboBoxModel + org.chorem.lima.ui.common.LabelListCellRenderer </import> - <JAXXButtonGroup id="radioButtons" javaBean='new JAXXButtonGroup()'/> <Boolean id="addState" javaBean='true'/> <script> @@ -37,58 +38,39 @@ getRootPane().setDefaultButton(ok); protected void performCancel() { - getRadioButtons().setSelectedValue(null); + getChartVatStatementCombo().setSelectedItem(null); dispose(); } ]]> </script> - <Table> - <row> - <cell> - <JLabel id="nothingLabel"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="shortened"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="vatBase"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="developed"/> - </cell> - </row> - <row> - <cell> - <JRadioButton id="importCSV"/> - </cell> - </row> - <row> - <cell> - <JCheckBox id='deleteVatStatementChart'/> - </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="chartVatStatementLabel"/> + </cell> + <cell anchor="west"> + <JComboBox id="chartVatStatementCombo"/> + </cell> + </row> + </Table> + + <JCheckBox constraints="BorderLayout.SOUTH" + id="deleteVatStatementChart"/> + + </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/vatchart/VatChartMovementForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css index 3f47d08..1dfeea2 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.css @@ -23,20 +23,21 @@ title : "lima.vatStatement.movement"; } -#labelLabel { - text : "lima.vatStatement.label"; +#masterLabel { + text : "lima.vatStatement.master"; } -#labelTextField { - text : "{getVatStatement().getLabel()}"; +#masterTextField { + text : "{getVatStatement().getMasterVatStatement().getLabel()}"; + enabled : false; } -#boxNameLabel { - text : "lima.vatStatement.boxName"; +#labelLabel { + text : "lima.vatStatement.label"; } -#boxNameTextField { - text : "{getVatStatement().getBoxName()}"; +#labelTextField { + text : "{getVatStatement().getLabel()}"; } #accountsLabel { @@ -47,19 +48,21 @@ text : "{getVatStatement().getAccounts()}"; } -#masterLabel { - text : "lima.vatStatement.master"; +#boxNameLabel { + text : "lima.vatStatement.boxName"; } -#masterTextField { - text : "{getVatStatement().getMasterVatStatement().getLabel()}"; - editable : false; +#boxNameTextField { + text : "{getVatStatement().getBoxName()}"; } + #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } \ No newline at end of file diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx index 14dc657..cca1dea 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartMovementForm.jaxx @@ -22,6 +22,7 @@ <JDialog id="VatChartMovementForm" modal="true" defaultCloseOperation="{JDialog.DO_NOTHING_ON_CLOSE}" + layout="{new BorderLayout()}" onWindowClosing="performCancel();"> <import> @@ -46,58 +47,54 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER"> <row> - <cell fill="horizontal"> - <JLabel id="labelLabel"/> + <cell anchor="east"> + <JLabel id="masterLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="labelTextField"/> - <Document javaBean="getLabelTextField().getDocument()" - onInsertUpdate='getVatStatement().setLabel(getLabelTextField().getText())' - onRemoveUpdate='getVatStatement().setLabel(getLabelTextField().getText())'/> + <JTextField id="masterTextField"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="boxNameLabel"/> + <cell anchor="east"> + <JLabel id="labelLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="boxNameTextField"/> - <Document javaBean="getBoxNameTextField().getDocument()" - onInsertUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())' - onRemoveUpdate='getVatStatement().setBoxName(getBoxNameTextField().getText())'/> + <JTextField id="labelTextField" + onKeyReleased="getVatStatement().setLabel(labelTextField.getText())"/> </cell> </row> + <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="accountsLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="accountsTextField"/> - <Document javaBean="getAccountsTextField().getDocument()" - onInsertUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())' - onRemoveUpdate='getVatStatement().setAccounts(getAccountsTextField().getText())'/> + <JTextField id="accountsTextField" + onKeyReleased="getVatStatement().setAccounts(getAccountsTextField().getText())"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="masterLabel"/> + <cell anchor="east"> + <JLabel id="boxNameLabel"/> </cell> <cell fill="horizontal"> - <JTextField id="masterTextField"/> - </cell> - </row> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="performCancel()"/> - </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="dispose()"/> + <JTextField id="boxNameTextField" + onKeyReleased="getVatStatement().setBoxName(getAccountsTextField().getText())"/> </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/ui/vatchart/VatChartViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java index 6ac3baf..a876f34 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/vatchart/VatChartViewHandler.java @@ -197,7 +197,6 @@ public class VatChartViewHandler implements ServiceListener { treePath, vatStatement); } } - refresh(); } public void importVatStatementChart() { @@ -218,17 +217,17 @@ public class VatChartViewHandler implements ServiceListener { form.setLocationRelativeTo(view); form.setVisible(true); - Object value = form.getRadioButtons().getSelectedValue(); + Object value = form.getChartVatStatementCombo().getSelectedItem(); // if action confirmed if (value != null) { if (form.getDeleteVatStatementChart().isSelected()) { vatStatementService.removeAllVatStatement(); } - VatStatementsChartEnum defaultVatStatementsEnum = + VatStatementsChartEnum vatStatementsEnum = (VatStatementsChartEnum) value; ImportExport importExport = new ImportExport(view); importExport.importExport(ImportExportEnum.CSV_VAT_IMPORT, - null, null, true); + null, vatStatementsEnum.getDefaultFileUrl(), true); refresh(); } } 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 36f012a..5c5afd6 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 @@ -473,11 +473,14 @@ lima.vatStatement=VAT statement chart lima.vatStatement.accounts=List of accounts lima.vatStatement.base=Base VAT statement chart lima.vatStatement.boxName=PDF BoxName +lima.vatStatement.default= lima.vatStatement.delete=Delete actual VAT statement chart before import new lima.vatStatement.delete.parent=Remove parent lima.vatStatement.developed=Developped VAT statement chart lima.vatStatement.error.alreadyExistVatStatement= lima.vatStatement.import=Impport CSV +lima.vatStatement.import.delete= +lima.vatStatement.import.description= lima.vatStatement.label=Label lima.vatStatement.master=Master VAT statement lima.vatStatement.movement=Movement 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 098cd95..2d5abde 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 @@ -483,20 +483,21 @@ lima.update=Modifier lima.update.shortcut=Modifier (Ctrl+M) lima.vatStatement=Plan TVA lima.vatStatement.accounts=Liste des comptes -lima.vatStatement.base=Plan TVA de base +lima.vatStatement.base=Standard lima.vatStatement.boxName=PDF BoxName -lima.vatStatement.delete=Supprimer le plan TVA actuel avant d'importer +lima.vatStatement.default=Par défaut lima.vatStatement.delete.parent=Veuillez supprimer les sous-catégories de cette ligne -lima.vatStatement.developed=Plan TVA développé +lima.vatStatement.developed=Développé lima.vatStatement.error.alreadyExistVatStatement=u00C9chec \: Le plan %s exist déjà \! -lima.vatStatement.import=Import CSV +lima.vatStatement.import=Importé +lima.vatStatement.import.delete=Supprimer le plan TVA actuel avant d'importer +lima.vatStatement.import.description=Sélectionnez un plan de TVA lima.vatStatement.label=Libellé lima.vatStatement.master=Plan parent lima.vatStatement.movement=Regroupement lima.vatStatement.movement.add=Ajouter un regrouprement (Ctrl+N) -lima.vatStatement.nothing=<html><center>Aucun plan TVA 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.vatStatement.remove.confirm=Etes vous sur de vouloir supprimer cette ligne ? lima.vatStatement.remove.title=supprimer de ligne ? -lima.vatStatement.shortened=Plan TVA abrégé +lima.vatStatement.shortened=Abrégé lima.vatStatements=Plan TVA lima.wait=Traitement en cours -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
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 37937e4aeca32b2c4f219d80fcda24a51b415560 Author: Sylvain Bavencoff <bavencoff@codelutin.com> Date: Tue Mar 31 14:28:51 2015 +0200 refs #1187 : identitiy popups --- .../org/chorem/lima/ui/identity/IdentityForm.css | 18 ++- .../org/chorem/lima/ui/identity/IdentityForm.jaxx | 130 +++++++++++---------- 2 files changed, 83 insertions(+), 65 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css index 92a5786..8675205 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.css @@ -20,6 +20,7 @@ * #L% */ #dialog { + title : "lima.identity"; modal : true; defaultCloseOperation : {JDialog.DO_NOTHING_ON_CLOSE}; } @@ -30,6 +31,7 @@ #nameTextField { text : {handler.getIdentity().getName()}; + columns : 20; } #descriptionLabel { @@ -38,6 +40,7 @@ #descriptionTextField { text : {handler.getIdentity().getDescription()}; + columns : 30; } #addressLabel { @@ -46,14 +49,12 @@ #addressTextField { text : {handler.getIdentity().getAddress()}; -} - -#address2Label { - text : "lima.identity.address2"; + columns : 30; } #address2TextField { text : {handler.getIdentity().getAddress2()}; + columns : 30; } #zipCodeLabel { @@ -62,6 +63,7 @@ #zipCodeTextField { text : {handler.getIdentity().getZipCode()}; + columns : 5; } #cityLabel { @@ -70,6 +72,7 @@ #cityTextField { text : {handler.getIdentity().getCity()}; + columns : 20; } #businessNumberLabel { @@ -78,6 +81,7 @@ #businessNumberTextField { text : {handler.getIdentity().getBusinessNumber()}; + columns : 20; } #vatNumberLabel { @@ -86,6 +90,7 @@ #vatNumberTextField { text : {handler.getIdentity().getVatNumber()}; + columns : 20; } #classificationCodeLabel { @@ -94,6 +99,7 @@ #classificationCodeTextField { text : {handler.getIdentity().getClassificationCode()}; + columns : 5; } #phoneNumberLabel { @@ -102,6 +108,7 @@ #phoneNumberTextField { text : {handler.getIdentity().getPhoneNumber()}; + columns : 20; } #emailLabel { @@ -110,12 +117,15 @@ #emailTextField { text : {handler.getIdentity().getEmail()}; + columns : 20; } #cancel { text : "lima.cancel"; + actionIcon : cancel; } #ok { text : "lima.ok"; + actionIcon : ok; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx index e9fd1de..b050d35 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/identity/IdentityForm.jaxx @@ -21,11 +21,15 @@ --> <JDialog id="dialog" + layout="{new BorderLayout()}" onWindowClosing="dispose();"> <IdentityHandler id="handler" javaBean="new IdentityHandler(this)"/> <org.chorem.lima.entity.Identity id="identity" javaBean='handler.getIdentity()'/> + <import> + java.awt.Dimension + </import> <script> <![CDATA[ @@ -33,104 +37,108 @@ ]]> </script> - <Table> + <Table constraints="BorderLayout.CENTER" + border="{BorderFactory.createEmptyBorder(10, 10, 10, 10)}" > <row> - <cell fill="horizontal"> + <cell anchor="east"> <JLabel id="nameLabel" /> </cell> - <cell fill="horizontal"> + <cell anchor="west" + columns="3"> <JTextField id="nameTextField" /> </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="descriptionLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="descriptionTextField"/> + + <cell rows="5"> + <JPanel minimumSize="{new Dimension(20, 20)}"> + </JPanel> </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="addressLabel"/> + + <cell anchor="east"> + <JLabel id="phoneNumberLabel"/> </cell> - <cell fill="horizontal"> - <JTextField id="addressTextField" /> + <cell anchor="west"> + <JTextField id="phoneNumberTextField"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="address2Label"/> + <cell anchor="east"> + <JLabel id="descriptionLabel"/> </cell> - <cell fill="horizontal"> - <JTextField id="address2TextField"/> + <cell anchor="west" + columns="3"> + <JTextField id="descriptionTextField"/> </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="zipCodeLabel"/> + + <cell anchor="east"> + <JLabel id="emailLabel"/> </cell> - <cell fill="horizontal"> - <JTextField id="zipCodeTextField"/> + <cell anchor="west"> + <JTextField id="emailTextField" /> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel text="lima.identity.city"/> + <cell anchor="east"> + <JLabel id="addressLabel"/> </cell> - <cell fill="horizontal"> - <JTextField id="cityTextField" /> + <cell anchor="west" + columns="3"> + <JTextField id="addressTextField" /> </cell> - </row> - <row> - <cell fill="horizontal"> + + <cell anchor="east"> <JLabel id="businessNumberLabel"/> </cell> - <cell fill="horizontal"> + <cell anchor="west"> <JTextField id="businessNumberTextField"/> </cell> </row> + <row> - <cell fill="horizontal"> + <cell/> + <cell anchor="west" + columns="3"> + <JTextField id="address2TextField"/> + </cell> + + <cell anchor="east"> <JLabel id="vatNumberLabel"/> </cell> - <cell fill="horizontal"> + <cell anchor="west"> <JTextField id="vatNumberTextField"/> </cell> </row> + <row> - <cell fill="horizontal"> - <JLabel id="classificationCodeLabel"/> - </cell> - <cell fill="horizontal"> - <JTextField id="classificationCodeTextField"/> - </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="phoneNumberLabel"/> + <cell anchor="east"> + <JLabel id="zipCodeLabel"/> </cell> - <cell fill="horizontal"> - <JTextField id="phoneNumberTextField"/> + <cell anchor="west"> + <JTextField id="zipCodeTextField"/> </cell> - </row> - <row> - <cell fill="horizontal"> - <JLabel id="emailLabel"/> + <cell anchor="east"> + <JLabel text="lima.identity.city"/> </cell> <cell fill="horizontal"> - <JTextField id="emailTextField" /> + <JTextField id="cityTextField" /> </cell> - </row> - <row> - <cell fill="none"> - <JButton id="cancel" - onActionPerformed="dispose();"/> + + <cell anchor="east"> + <JLabel id="classificationCodeLabel"/> </cell> - <cell fill="none"> - <JButton id="ok" - onActionPerformed="handler.updateIdentity(); dispose();" /> + <cell anchor="west"> + <JTextField id="classificationCodeTextField"/> </cell> </row> </Table> + + <JPanel constraints="BorderLayout.SOUTH" + layout='{new GridLayout(1,0)}'> + <JButton id="cancel" + onActionPerformed="dispose();"/> + <JButton id="ok" + onActionPerformed="handler.updateIdentity(); dispose();"/> + </JPanel> + </JDialog> -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm