branch feature/1226 updated (3d4c252 -> f8d81c6)
This is an automated email from the git hooks/post-receive script. New change to branch feature/1226 in repository lima. See http://git.chorem.org/lima.git discards 3d4c252 Hide close tab button if you cannot close the tab new f8d81c6 refs #1226 Hide close tab button if you cannot close the tab 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 (3d4c252) \ N -- N -- N refs/heads/feature/1226 (f8d81c6) 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 1 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 f8d81c67195dfff26f8fc2d5e7bbf051ff30683d Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 refs #1226 Hide close tab button if you cannot close the tab Summary of changes: -- 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/1226 in repository lima. See http://git.chorem.org/lima.git commit f8d81c67195dfff26f8fc2d5e7bbf051ff30683d Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 refs #1226 Hide close tab button if you cannot close the tab --- .../src/main/java/org/chorem/lima/LimaMain.java | 1 + .../java/org/chorem/lima/ui/ClosableTabHeader.css | 2 + .../java/org/chorem/lima/ui/ClosableTabHeader.jaxx | 6 +- .../src/main/java/org/chorem/lima/ui/MainView.css | 275 +++++++++++++++++---- .../java/org/chorem/lima/ui/MainViewHandler.java | 1 + 5 files changed, 227 insertions(+), 58 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java index d39ab37..4cec550 100644 --- a/lima-swing/src/main/java/org/chorem/lima/LimaMain.java +++ b/lima-swing/src/main/java/org/chorem/lima/LimaMain.java @@ -35,6 +35,7 @@ import org.chorem.lima.ui.opening.OpeningView; import javax.swing.*; import java.util.Arrays; import java.util.Date; +import java.util.Locale; import static org.nuiton.i18n.I18n.t; 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 25fb9e4..712b8b9 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 @@ -26,6 +26,7 @@ #label { opaque : false; font-size : 12; + text : {getTitle()}; } #closeTab { @@ -33,4 +34,5 @@ border : {BorderFactory.createEmptyBorder()}; focusPainted : false; actionIcon : closeTab; + visible: {isCanClose()}; } diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx index 061aa0a..3a94b7c 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/ClosableTabHeader.jaxx @@ -29,8 +29,6 @@ <Boolean id="canClose" javaBean='true'/> - <JLabel id='label' - text='{getTitle()}'/> - <JButton id='closeTab' - enabled='{isCanClose()}'/> + <JLabel id='label'/> + <JButton id='closeTab'/> </JPanel> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css index 06b2b89..d08d492 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainView.css @@ -21,79 +21,246 @@ */ #mainView { - title : "lima.title"; - width : 1024; - height : 768; - minimumSize : {new Dimension(320,240)}; - resizable : true; - extendedState : "{this.MAXIMIZED_BOTH}" ; - iconImage : "puzzle_icon.png"; + title : "lima.title"; + width : 1024; + height : 768; + minimumSize : {new Dimension(320,240)}; + resizable : true; + extendedState : "{this.MAXIMIZED_BOTH}" ; + iconImage : "puzzle_icon.png"; } -#file{ text : "lima.file"; mnemonic : "F"; } +#file{ + text : "lima.file"; + mnemonic : "F"; +} + +#csv { + text : "lima.importExport.csv"; +} + +#csvImport { + text : "lima.importExport.import"; + actionIcon : "import"; +} + +#csvImportAll { + text : "lima.importExport.all"; +} + +#csvImportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#csvImportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#csvImportFinancialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} + +#csvImportVatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} + +#csvImportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#csvExport { + text : "lima.importExport.export"; + actionIcon : "export"; +} + +#csvExportAll { + text : "lima.importExport.all"; +} + +#csvExportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#csvExportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#csvExportFinancialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} + +#csvExportVatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} + +#csvExportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#ebp { + text : "lima.importExport.ebp"; +} + +#ebpImport { + text : "lima.importExport.import"; + actionIcon : "import"; +} + +#ebpImportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#ebpImportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#ebpImportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#ebpExport { + text : "lima.importExport.export"; + actionIcon : "export"; +} + +#ebpExportAccounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} + +#ebpExportEntryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} + +#ebpExportEntries { + text : "lima.entries"; + actionIcon : "entries" +} + +#documents { + text : "lima.documents" +} + +#identity { + text : "lima.identity"; + actionIcon : "identity"; +} + +#preferences { + text : "lima.preferences"; + actionIcon : "config"; +} + +#quit { + text : "lima.quit"; + actionIcon : "quit"; + mnemonic : "Q"; +} -#csv { text : "lima.importExport.csv"; } +#structure { + text : "lima.structure"; + mnemonic : "S"; +} -#csvImport { text : "lima.importExport.import"; actionIcon : "import"; } -#csvImportAll { text : "lima.importExport.all"; } -#csvImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#csvImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#csvImportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#csvImportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } -#csvImportEntries { text : "lima.entries"; actionIcon : "entries" } +#accounts { + text : "lima.chart.accounts"; + actionIcon : "accounts"; +} -#csvExport { text : "lima.importExport.export"; actionIcon : "export"; } -#csvExportAll { text : "lima.importExport.all"; } -#csvExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#csvExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#csvExportFinancialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#csvExportVatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } -#csvExportEntries { text : "lima.entries"; actionIcon : "entries" } +#entryBooks { + text : "lima.entryBooks"; + actionIcon : "entryBooks"; +} +#fiscalYears { + text : "lima.fiscalYears"; + actionIcon : "fiscalPeriods"; +} -#ebp { text : "lima.importExport.ebp"; } +#financialPeriods { + text : "lima.financialPeriods"; + actionIcon : "financialPeriods"; +} -#ebpImport { text : "lima.importExport.import"; actionIcon : "import"; } -#ebpImportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#ebpImportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#ebpImportEntries { text : "lima.entries"; actionIcon : "entries" } +#financialStatements { + text : "lima.financialStatements"; + actionIcon : "financialStatements"; +} -#ebpExport { text : "lima.importExport.export"; actionIcon : "export"; } -#ebpExportAccounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#ebpExportEntryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#ebpExportEntries { text : "lima.entries"; actionIcon : "entries" } +#vatStatements { + text : "lima.vatStatements"; + actionIcon : "vatStatements"; +} -#documents { text : "lima.documents" } -#identity { text : "lima.identity"; actionIcon : "identity"; } -#preferences { text : "lima.preferences"; actionIcon : "config"; } -#quit { text : "lima.quit"; actionIcon : "quit"; mnemonic : "Q"; } +#enter { + text : "lima.entries"; + mnemonic : "E"; +} +#entries { + text : "lima.entries.enter"; + actionIcon : "entries"; +} -#structure { text : "lima.structure"; mnemonic : "S"; } +#unbalanced { + text : "lima.entries.unbalanced"; + actionIcon : "entries-unbalanced"; +} -#accounts { text : "lima.chart.accounts"; actionIcon : "accounts"; } -#entryBooks { text : "lima.entryBooks"; actionIcon : "entryBooks"; } -#fiscalYears { text : "lima.fiscalYears"; actionIcon : "fiscalPeriods"; } -#financialPeriods { text : "lima.financialPeriods"; actionIcon : "financialPeriods"; } -#financialStatements { text : "lima.financialStatements"; actionIcon : "financialStatements"; } -#vatStatements { text : "lima.vatStatements"; actionIcon : "vatStatements"; } +#search { + text : "lima.entries.search"; + actionIcon : "entries-search"; +} +#lettering { + text : "lima.entries.lettering"; + actionIcon : "lettering"; +} -#enter { text : "lima.entries"; mnemonic : "E"; } +#help { + text : "lima.help"; + mnemonic : "H"; +} -#entries { text : "lima.entries.enter"; actionIcon : "entries"; } -#unbalanced { text : "lima.entries.unbalanced"; actionIcon : "entries-unbalanced"; } -#search { text : "lima.entries.search"; actionIcon : "entries-search"; } -#lettering { text : "lima.entries.lettering"; actionIcon : "lettering"; } +#site { + text : "lima.help.site"; + actionIcon : "site"; +} +#about { + text : "lima.help.about"; + actionIcon : "about"; +} -#help { text : "lima.help"; mnemonic : "H"; } +#i18n { + text : "lima.help.i18n"; + actionIcon : "translate"; + mnemonic : "L"; +} + +#fr { + text : "lima.help.i18n.fr"; + actionIcon : "i18n-fr"; +} -#site { text : "lima.help.site"; actionIcon : "site"; } -#about { text : "lima.help.about"; actionIcon : "about"; } -#i18n { text : "lima.help.i18n"; actionIcon : "translate"; mnemonic : "L"; } -#fr { text : "lima.help.i18n.fr"; actionIcon : "i18n-fr"; } -#uk { text : "lima.help.i18n.uk"; actionIcon : "i18n-uk"; } +#uk { + text : "lima.help.i18n.uk"; + actionIcon : "i18n-uk"; +} diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java index a1dd428..6612a25 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java @@ -70,6 +70,7 @@ import java.net.URI; import java.net.URL; import java.util.Locale; +import static org.nuiton.i18n.I18n.setDefaultLocale; import static org.nuiton.i18n.I18n.t; /** -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm