branch develop updated (7b18ab3 -> 1bc0d5c)
This is an automated email from the git hooks/post-receive script. New change to branch develop in repository lima. See http://git.chorem.org/lima.git from 7b18ab3 [jgitflow-maven-plugin]Updating develop poms back to pre merge state new 3d4c252 Hide close tab button if you cannot close the tab new 1bc0d5c 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 The 2 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 1bc0d5c212e33c81e96382233ca10535d8a8e87e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 17:17:53 2015 +0100 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 commit 3d4c252504714214486079d1283d13ce030148e7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 Hide close tab button if you cannot close the tab Summary of changes: .../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 + .../FinancialTransactionSearchView.jaxx | 5 +- .../FinancialTransactionSearchViewHandler.java | 13 +- 7 files changed, 242 insertions(+), 61 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 develop in repository lima. See http://git.chorem.org/lima.git commit 3d4c252504714214486079d1283d13ce030148e7 Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 16:26:53 2015 +0100 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>.
This is an automated email from the git hooks/post-receive script. New commit to branch develop in repository lima. See http://git.chorem.org/lima.git commit 1bc0d5c212e33c81e96382233ca10535d8a8e87e Author: Kevin Morin <morin@codelutin.com> Date: Fri Mar 27 17:17:53 2015 +0100 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 --- .../FinancialTransactionSearchView.jaxx | 5 +++-- .../FinancialTransactionSearchViewHandler.java | 13 ++++++++++++- 2 files changed, 15 insertions(+), 3 deletions(-) diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx index d2a4965..269e4a7 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx @@ -92,8 +92,9 @@ </JToolBar> <JSplitPane constraints="BorderLayout.CENTER" - orientation='{JSplitPane.VERTICAL_SPLIT}'> - <JScrollPane> + orientation='{JSplitPane.VERTICAL_SPLIT}' + id="financialTransactionSplitpane"> + <JScrollPane id="financialTransactionConditionScrollPane"> <FinancialTransactionConditionView id="financialTransactionConditionView" /> </JScrollPane> <JScrollPane> diff --git a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java index 37119d1..d0936fb 100644 --- a/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java +++ b/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java @@ -88,7 +88,7 @@ public class FinancialTransactionSearchViewHandler { // add action on F5 binding = "refresh"; - inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0) , binding); + inputMap.put(KeyStroke.getKeyStroke(KeyEvent.VK_F5, 0), binding); actionMap.put(binding, new AbstractAction() { private static final long serialVersionUID = 5877340693755869036L; @@ -103,6 +103,17 @@ public class FinancialTransactionSearchViewHandler { FinancialTransactionConditionView filterView = view.getFinancialTransactionConditionView(); FinancialTransactionConditionHandler handler = filterView.getHandler(); handler.addCondition(conditionHandler); + + // cf #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 + JSplitPane financialTransactionSplitpane = view.getFinancialTransactionSplitpane(); + int dividerLocation = financialTransactionSplitpane.getDividerLocation(); + + int height = view.getFinancialTransactionConditionScrollPane().getPreferredSize().height + 5; + if (dividerLocation < height) { + financialTransactionSplitpane.setDividerLocation(height); + } + view.validate(); view.repaint(); } -- To stop receiving notification emails like this one, please contact chorem.org SCM administrator <admin+scm@chorem.org>.
participants (1)
-
chorem.org scm