Lima-commits
Threads by month
- ----- 2026 -----
- June
- May
- April
- March
- February
- January
- ----- 2025 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2024 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2023 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2022 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2021 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2020 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2019 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2018 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2017 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2016 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2015 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2014 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2013 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2012 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2011 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2010 -----
- December
- November
- October
- September
- August
- July
- June
- May
- April
- March
- February
- January
- ----- 2009 -----
- December
- November
- October
- September
- August
- 1853 discussions
14 Mar '14
Author: dcosse
Date: 2014-03-14 15:25:38 +0100 (Fri, 14 Mar 2014)
New Revision: 3758
Url: http://forge.chorem.org/projects/lima/repository/revisions/3758
Log:
refs #669 retrait du bouton de gen?\195?\169ration du rapport de TVA (le code est toujours pr?\195?\169sent)
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-03-14 14:24:10 UTC (rev 3757)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainView.jaxx 2014-03-14 14:25:38 UTC (rev 3758)
@@ -177,9 +177,10 @@
<JMenuItem text="lima.reports.financialstatement"
onActionPerformed='getHandler().showFinancialStatementReportsView(this)'
actionIcon='reports-financialstatement'/>
- <JMenuItem text="lima.reports.vat"
- onActionPerformed='getHandler().showVatReportView(this)'
- actionIcon='reports-vatstatement'/>
+ <!-- useless #669-->
+ <!--<JMenuItem text="lima.reports.vat"-->
+ <!--onActionPerformed='getHandler().showVatReportView(this)'-->
+ <!--actionIcon='reports-vatstatement'/>-->
</JMenu>
1
0
r3757 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by dcosse@users.chorem.org 14 Mar '14
by dcosse@users.chorem.org 14 Mar '14
14 Mar '14
Author: dcosse
Date: 2014-03-14 15:24:10 +0100 (Fri, 14 Mar 2014)
New Revision: 3757
Url: http://forge.chorem.org/projects/lima/repository/revisions/3757
Log:
fixes# #966 suppression de code mort
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-07 10:05:06 UTC (rev 3756)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-14 14:24:10 UTC (rev 3757)
@@ -185,14 +185,6 @@
provisionDeprecationAmount = new BigDecimal(0);
}
- String fontColor = "";
- if (financialStatementAmount.getSubAmount() && level == 1) {
- fontColor = "#CCCCCC";
- } else if (financialStatementAmount.getSubAmount()) {
- fontColor = "#C0C0C0";
- } else {
- fontColor = "#999999";
- }
if (label == null) {
if (printedType == 0) {
String [] emptyColumn = {"","","",""};
@@ -375,8 +367,6 @@
} else {
currentAmountCredit = currentAmountCredit.add(entry.getAmount());
}
- } else {
- ReportsDatas reportsDatas = (ReportsDatas) objectList;
}
}
1
0
Jenkins build became unstable: lima-nightly » Lima :: business #9
by admin+ci-chorem.org@codelutin.com 07 Mar '14
by admin+ci-chorem.org@codelutin.com 07 Mar '14
07 Mar '14
r3756 - in trunk/lima-swing/src/main/java/org/chorem/lima/ui: common financialtransactionunbalanced
by sbavencoff@users.chorem.org 07 Mar '14
by sbavencoff@users.chorem.org 07 Mar '14
07 Mar '14
Author: sbavencoff
Date: 2014-03-07 11:05:06 +0100 (Fri, 07 Mar 2014)
New Revision: 3756
Url: http://forge.chorem.org/projects/lima/repository/revisions/3756
Log:
fixes #970 : Exception lorsqu'on tente de changer de p?\195?\169riode comptable sur l'?\195?\169cran des 'entr?\195?\169es incorrectes'
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-03-06 16:45:18 UTC (rev 3755)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTableModel.java 2014-03-07 10:05:06 UTC (rev 3756)
@@ -1,6 +1,7 @@
package org.chorem.lima.ui.common;
import com.google.common.collect.Lists;
+import org.apache.commons.collections.CollectionUtils;
import javax.swing.table.AbstractTableModel;
import java.util.Collection;
@@ -64,10 +65,12 @@
}
public void addAll(Collection<E> values) {
- int row = this.values.size();
- this.values.addAll(values);
- fireTableRowsInserted(row, row + values.size() - 1);
- sort();
+ if (CollectionUtils.isNotEmpty(values)) {
+ int row = this.values.size();
+ this.values.addAll(values);
+ fireTableRowsInserted(row, row + values.size() - 1);
+ sort();
+ }
}
public void clear() {
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2014-03-06 16:45:18 UTC (rev 3755)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionunbalanced/FinancialTransactionUnbalancedTableModel.java 2014-03-07 10:05:06 UTC (rev 3756)
@@ -75,7 +75,7 @@
* @return
*/
protected void refresh() {
- values.clear();
+ clear();
if (selectedFiscalPeriod != null) {
List<FinancialTransaction> financialTransactions =
1
0
r3755 - trunk/lima-business/src/main/java/org/chorem/lima/business/ejb
by sbavencoff@users.chorem.org 06 Mar '14
by sbavencoff@users.chorem.org 06 Mar '14
06 Mar '14
Author: sbavencoff
Date: 2014-03-06 17:45:18 +0100 (Thu, 06 Mar 2014)
New Revision: 3755
Url: http://forge.chorem.org/projects/lima/repository/revisions/3755
Log:
fixes #316 : Les cellules ne sont pas align?\195?\169es avec les ent?\195?\170tes dans la g?\195?\169n?\195?\169ration PDF
Modified:
trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
Modified: trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java
===================================================================
--- trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-06 10:26:55 UTC (rev 3754)
+++ trunk/lima-business/src/main/java/org/chorem/lima/business/ejb/DocumentServiceImpl.java 2014-03-06 16:45:18 UTC (rev 3755)
@@ -45,7 +45,6 @@
import org.chorem.lima.business.api.VatStatementService;
import org.chorem.lima.business.utils.DocumentsEnum;
import org.chorem.lima.business.utils.EntryComparator;
-import org.chorem.lima.business.utils.FormatsEnum;
import org.chorem.lima.entity.Account;
import org.chorem.lima.entity.AccountDAO;
import org.chorem.lima.entity.ClosedPeriodicEntryBook;
@@ -63,8 +62,7 @@
import javax.ejb.Remote;
import javax.ejb.Stateless;
import javax.ejb.TransactionAttribute;
-import javax.swing.JOptionPane;
-import java.awt.*;
+import javax.swing.*;
import java.io.File;
import java.io.FileInputStream;
import java.io.FileNotFoundException;
@@ -364,6 +362,11 @@
}
}
+ // close inner
+ ledgerReport += "</tbody></table>" +
+ "</td>" +
+ "</tr>";
+
for (Object objectList : list) {
if (objectList instanceof Entry) {
Entry entry = (Entry) objectList;
1
0
r3754 - in trunk/lima-swing/src/main: java/org/chorem/lima java/org/chorem/lima/ui java/org/chorem/lima/ui/celleditor resources/i18n
by sbavencoff@users.chorem.org 06 Mar '14
by sbavencoff@users.chorem.org 06 Mar '14
06 Mar '14
Author: sbavencoff
Date: 2014-03-06 11:26:55 +0100 (Thu, 06 Mar 2014)
New Revision: 3754
Url: http://forge.chorem.org/projects/lima/repository/revisions/3754
Log:
fixes #370 : Options non termin?\195?\169es
Added:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-03-06 08:51:59 UTC (rev 3753)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-03-06 10:26:55 UTC (rev 3754)
@@ -25,6 +25,7 @@
package org.chorem.lima;
+import com.google.common.collect.ImmutableSet;
import jaxx.runtime.JAXXUtil;
import org.apache.commons.lang3.StringUtils;
import org.apache.commons.logging.Log;
@@ -34,9 +35,9 @@
import org.chorem.lima.entity.LimaCallaoDAOHelper;
import org.chorem.lima.service.LimaServiceFactory;
import org.nuiton.config.ApplicationConfig;
+import org.nuiton.config.ArgumentsParserException;
import org.nuiton.config.ConfigOptionDef;
import org.nuiton.topia.TopiaContextFactory;
-import org.nuiton.config.ArgumentsParserException;
import org.nuiton.util.Version;
import org.nuiton.util.VersionUtil;
import org.nuiton.util.converter.ConverterUtil;
@@ -46,6 +47,7 @@
import java.io.File;
import java.io.IOException;
import java.util.Locale;
+import java.util.Set;
import static org.nuiton.i18n.I18n._;
import static org.nuiton.i18n.I18n.n_;
@@ -64,6 +66,9 @@
/** to use log facility, just put in your code: log.info(\"...\"); */
static private Log log = LogFactory.getLog(LimaConfig.class);
+ static public final Set<Character> NUMBER_SEPARATOR = ImmutableSet.of(' ', ',', '.', ';');
+ static public final Set<Integer> NUMBER_DECIMALS = ImmutableSet.of(0, 1, 2, 3, 4, 5, 6);
+
protected static LimaConfig instance;
private static final String configFile = "lima-config.properties";
@@ -446,7 +451,7 @@
_("lima.config.decimalseparator.label"),
n_("lima.config.decimalseparator.description"),
",",
- String.class, false, false),
+ Character.class, false, false),
SCALE("lima.data.bigDecimal.scale",
_("lima.config.scale.label"),
@@ -458,7 +463,7 @@
_("limma.config.thousandseparator.label"),
n_("limma.config.thousandseparator.description"),
" ",
- String.class, false, false),
+ Character.class, false, false),
CURRENCY("lima.config.currency",
_("lima.config.currency.label"),
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-06 08:51:59 UTC (rev 3753)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-06 10:26:55 UTC (rev 3754)
@@ -39,6 +39,8 @@
import org.chorem.lima.ui.account.AccountView;
import org.chorem.lima.ui.accountsreports.AccountsReportsView;
import org.chorem.lima.ui.balance.BalanceReportsView;
+import org.chorem.lima.ui.celleditor.NumberSeparatorCellRenderer;
+import org.chorem.lima.ui.celleditor.NumberSeparatorTableCellRenderer;
import org.chorem.lima.ui.entrybook.EntryBookView;
import org.chorem.lima.ui.entrybooksreports.EntryBooksReportsView;
import org.chorem.lima.ui.financialperiod.FinancialPeriodView;
@@ -257,12 +259,27 @@
helper.setOptionShortLabel(LimaConfig.Option.FULL_SCREEN.getLabel());
helper.addOption(LimaConfig.Option.LOCALE);
helper.setOptionShortLabel(LimaConfig.Option.LOCALE.getLabel());
+
+ JComboBox<Character> comboBoxSeparator = new JComboBox<Character>(LimaConfig.NUMBER_SEPARATOR.toArray(new Character[0]));
+ DefaultCellEditor separatorEditor = new DefaultCellEditor(comboBoxSeparator);
+ comboBoxSeparator.setRenderer(new NumberSeparatorCellRenderer());
+ NumberSeparatorTableCellRenderer separatorRenderer = new NumberSeparatorTableCellRenderer();
helper.addOption(LimaConfig.Option.DECIMAL_SEPARATOR);
helper.setOptionShortLabel(LimaConfig.Option.DECIMAL_SEPARATOR.getLabel());
+ helper.setOptionRenderer(separatorRenderer);
+ helper.setOptionEditor(separatorEditor);
+
+ JComboBox<Integer> comboBoxDecimal = new JComboBox<Integer>(LimaConfig.NUMBER_DECIMALS.toArray(new Integer[0]));
+ DefaultCellEditor decimalEditor = new DefaultCellEditor(comboBoxDecimal);
helper.addOption(LimaConfig.Option.SCALE);
helper.setOptionShortLabel(LimaConfig.Option.SCALE.getLabel());
+ helper.setOptionEditor(decimalEditor);
+
helper.addOption(LimaConfig.Option.THOUSAND_SEPARATOR);
helper.setOptionShortLabel(LimaConfig.Option.THOUSAND_SEPARATOR.getLabel());
+ helper.setOptionRenderer(separatorRenderer);
+ helper.setOptionEditor(separatorEditor);
+
helper.addOption(LimaConfig.Option.CURRENCY);
helper.setOptionShortLabel(LimaConfig.Option.CURRENCY.getLabel());
/*Pas de 'callBack' sur le changement de comportement lors de l'édition d'une cellule,
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorCellRenderer.java 2014-03-06 10:26:55 UTC (rev 3754)
@@ -0,0 +1,48 @@
+package org.chorem.lima.ui.celleditor;
+
+import com.google.common.collect.ImmutableMap;
+
+import javax.swing.*;
+import java.awt.*;
+import java.util.Map;
+
+import static org.nuiton.i18n.I18n._;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class NumberSeparatorCellRenderer extends DefaultListCellRenderer {
+
+ protected static final Map<Character, String> LABEL_BY_SEPARATOR = ImmutableMap.of(
+ ' ', "lima.config.numberSeparator.space",
+ ',', "lima.config.numberSeparator.comma",
+ '.', "lima.config.numberSeparator.dot",
+ ';', "lima.config.numberSeparator.semicolon");
+
+ public static String getSeparatorLabel(Object value) {
+ String separatorLabel = "";
+ if (value != null) {
+ Character separator = (Character) value;
+ separatorLabel = LABEL_BY_SEPARATOR.get(separator);
+ if (separatorLabel == null) {
+ separatorLabel = "";
+ } else {
+ separatorLabel = _(separatorLabel);
+ }
+ separatorLabel += " \"" + separator + "\"";
+ }
+ return separatorLabel;
+ }
+
+ @Override
+ public Component getListCellRendererComponent(JList list,
+ Object value,
+ int index,
+ boolean isSelected,
+ boolean cellHasFocus) {
+
+ JLabel label = (JLabel) super.getListCellRendererComponent(list, value, index, isSelected, cellHasFocus);
+ label.setText(getSeparatorLabel(value));
+ return this;
+ }
+}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/NumberSeparatorTableCellRenderer.java 2014-03-06 10:26:55 UTC (rev 3754)
@@ -0,0 +1,14 @@
+package org.chorem.lima.ui.celleditor;
+
+import javax.swing.table.DefaultTableCellRenderer;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class NumberSeparatorTableCellRenderer extends DefaultTableCellRenderer {
+
+ protected void setValue(Object value) {
+ super.setValue(NumberSeparatorCellRenderer.getSeparatorLabel(value));
+ }
+
+}
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-06 08:51:59 UTC (rev 3753)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-06 10:26:55 UTC (rev 3754)
@@ -162,6 +162,10 @@
lima.config.i18n.dir.label=
lima.config.locale.description=Localization used by LIMA
lima.config.locale.label=
+lima.config.numberSeparator.comma=
+lima.config.numberSeparator.dot=
+lima.config.numberSeparator.semicolon=
+lima.config.numberSeparator.space=
lima.config.resources.dir.description=
lima.config.resources.dir.label=
lima.config.scale.description=
@@ -520,3 +524,6 @@
lima.warning.nimbus.landf=Could not find Numbus Look&Feel
limma.config.thousandseparator.description=
limma.config.thousandseparator.label=
+org.chorem.lima.LimaConfig.NumberSeparator.COMMA=
+org.chorem.lima.LimaConfig.NumberSeparator.DOT=
+org.chorem.lima.LimaConfig.NumberSeparator.SPACE=
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-06 08:51:59 UTC (rev 3753)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-06 10:26:55 UTC (rev 3754)
@@ -147,6 +147,10 @@
lima.config.i18n.dir.label=
lima.config.locale.description=Paramétres local utilisés par l'application
lima.config.locale.label=Zone
+lima.config.numberSeparator.comma=Virgule
+lima.config.numberSeparator.dot=Point
+lima.config.numberSeparator.semicolon=Point-virgule
+lima.config.numberSeparator.space=Espace
lima.config.resources.dir.description=
lima.config.resources.dir.label=
lima.config.scale.description=Nombre de caratères décimales pour les montants
@@ -493,3 +497,6 @@
lima.warning.nimbus.landf=Le look and feel nymbus n'a pas été trouvé
limma.config.thousandseparator.description=Caractère de séparation entre les blocs de milliers
limma.config.thousandseparator.label=Séparateur de milliers
+org.chorem.lima.LimaConfig.NumberSeparator.COMMA=
+org.chorem.lima.LimaConfig.NumberSeparator.DOT=
+org.chorem.lima.LimaConfig.NumberSeparator.SPACE=
1
0
Author: sbavencoff
Date: 2014-03-06 09:51:59 +0100 (Thu, 06 Mar 2014)
New Revision: 3753
Url: http://forge.chorem.org/projects/lima/repository/revisions/3753
Log:
fix build
Modified:
trunk/lima-swing/pom.xml
trunk/pom.xml
Modified: trunk/lima-swing/pom.xml
===================================================================
--- trunk/lima-swing/pom.xml 2014-03-05 15:07:37 UTC (rev 3752)
+++ trunk/lima-swing/pom.xml 2014-03-06 08:51:59 UTC (rev 3753)
@@ -91,6 +91,11 @@
</dependency>
<dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>pdf-renderer</artifactId>
+ </dependency>
+
+ <dependency>
<groupId>org.nuiton</groupId>
<artifactId>nuiton-utils</artifactId>
</dependency>
Modified: trunk/pom.xml
===================================================================
--- trunk/pom.xml 2014-03-05 15:07:37 UTC (rev 3752)
+++ trunk/pom.xml 2014-03-06 08:51:59 UTC (rev 3753)
@@ -310,6 +310,12 @@
<version>3.0.4</version>
</dependency>
+ <dependency>
+ <groupId>org.swinglabs</groupId>
+ <artifactId>pdf-renderer</artifactId>
+ <version>1.0.5</version>
+ </dependency>
+
<!-- librairie topia -->
<dependency>
<groupId>org.nuiton.topia</groupId>
1
0
r3752 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui resources/i18n
by sbavencoff@users.chorem.org 05 Mar '14
by sbavencoff@users.chorem.org 05 Mar '14
05 Mar '14
Author: sbavencoff
Date: 2014-03-05 16:07:37 +0100 (Wed, 05 Mar 2014)
New Revision: 3752
Url: http://forge.chorem.org/projects/lima/repository/revisions/3752
Log:
refs #971 : add color in setting frame
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-05 11:59:43 UTC (rev 3751)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/MainViewHandler.java 2014-03-05 15:07:37 UTC (rev 3752)
@@ -199,6 +199,59 @@
helper.addOption(LimaConfig.Option.CONFIG_FILE);
helper.setOptionShortLabel(LimaConfig.Option.CONFIG_FILE.getLabel());
+ helper.addCategory(_("lima.config.category.table"), _("lima.config.category.table.description"));
+ helper.addOption(LimaConfig.Option.TABLE_CELL_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND);
+ helper.setOptionShortLabel(LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND.getLabel());
+ helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS);
+ helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel());
+
+
helper.addCategory(_("lima.config.category.other"), _("lima.config.category.other.description"));
helper.addOption(LimaConfig.Option.FULL_SCREEN);
helper.setOptionShortLabel(LimaConfig.Option.FULL_SCREEN.getLabel());
@@ -216,10 +269,6 @@
* car les deux éditeurs concernés rappellent la config dans un listener ('focusGained')*/
helper.addOption(LimaConfig.Option.SELECT_ALL_EDITING_CELL);
helper.setOptionShortLabel(LimaConfig.Option.SELECT_ALL_EDITING_CELL.getLabel());
- helper.addOption(LimaConfig.Option.COLOR_SELECTION_FOCUS);
- helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel());
- helper.setOptionCallBack(LimaConfig.Option.COLOR_SELECTION_FOCUS.key);
- helper.setOptionShortLabel(LimaConfig.Option.COLOR_SELECTION_FOCUS.getLabel());
helper.buildUI(context, _("lima.config.category.directories"));
helper.displayUI(ui, false);
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-05 11:59:43 UTC (rev 3751)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-05 15:07:37 UTC (rev 3752)
@@ -89,8 +89,11 @@
lima.common.update=Modify
lima.config.category.directories=Directories
lima.config.category.directories.description=Directories used by LIMA
+lima.config.category.directories.table=
lima.config.category.other=Other
lima.config.category.other.description=Other configuration properties
+lima.config.category.table=
+lima.config.category.table.description=
lima.config.cell.background.description=
lima.config.cell.background.label=
lima.config.cell.error.background.description=
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-05 11:59:43 UTC (rev 3751)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-05 15:07:37 UTC (rev 3752)
@@ -80,54 +80,56 @@
lima.config.category.directories.description=Répertoires utilisés par Lima
lima.config.category.other=Autre
lima.config.category.other.description=Autre propriétés de configuration
-lima.config.cell.background.description=
-lima.config.cell.background.label=
-lima.config.cell.error.background.description=
-lima.config.cell.error.background.label=
-lima.config.cell.error.foreground.description=
-lima.config.cell.error.foreground.label=
-lima.config.cell.foreground.description=
-lima.config.cell.foreground.label=
-lima.config.cell.mandatory.background.description=
-lima.config.cell.mandatory.background.label=
-lima.config.cell.mandatory.foreground.description=
-lima.config.cell.mandatory.foreground.label=
-lima.config.cell.pair.background.description=
-lima.config.cell.pair.background.label=
-lima.config.cell.pair.error.background.description=
-lima.config.cell.pair.error.background.label=
-lima.config.cell.pair.error.foreground.description=
-lima.config.cell.pair.error.foreground.label=
-lima.config.cell.pair.foreground.description=
-lima.config.cell.pair.foreground.label=
-lima.config.cell.pair.mandatory.background.description=
-lima.config.cell.pair.mandatory.background.label=
-lima.config.cell.pair.mandatory.foreground.description=
-lima.config.cell.pair.mandatory.foreground.label=
-lima.config.cell.pair.selected.background.description=
-lima.config.cell.pair.selected.background.label=
-lima.config.cell.pair.selected.error.background.description=
-lima.config.cell.pair.selected.error.background.label=
-lima.config.cell.pair.selected.error.foreground.description=
-lima.config.cell.pair.selected.error.foreground.label=
-lima.config.cell.pair.selected.foreground.description=
-lima.config.cell.pair.selected.foreground.label=
-lima.config.cell.pair.selected.mandatory.background.description=
-lima.config.cell.pair.selected.mandatory.background.label=
-lima.config.cell.pair.selected.mandatory.foreground.description=
-lima.config.cell.pair.selected.mandatory.foreground.label=
-lima.config.cell.selected.background.description=
-lima.config.cell.selected.background.label=
-lima.config.cell.selected.error.background.description=
-lima.config.cell.selected.error.background.label=
-lima.config.cell.selected.error.foreground.description=
-lima.config.cell.selected.error.foreground.label=
-lima.config.cell.selected.foreground.description=
-lima.config.cell.selected.foreground.label=
-lima.config.cell.selected.mandatory.background.description=
-lima.config.cell.selected.mandatory.background.label=
-lima.config.cell.selected.mandatory.foreground.description=
-lima.config.cell.selected.mandatory.foreground.label=
+lima.config.category.table=Tableaux
+lima.config.category.table.description=Propriété des tableaux
+lima.config.cell.background.description=Couleur de fond d'une cellule
+lima.config.cell.background.label=Couleur de fond
+lima.config.cell.error.background.description=Couleur de fond d'une cellule en erreur
+lima.config.cell.error.background.label=Couleur de fond en erreur
+lima.config.cell.error.foreground.description=Couleur du texte d'une cellule en erreur
+lima.config.cell.error.foreground.label=Couleur du texte en erreur
+lima.config.cell.foreground.description=Couleur du texte d'une cellule
+lima.config.cell.foreground.label=Couleur du texte
+lima.config.cell.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire
+lima.config.cell.mandatory.background.label=Couleur de fond obligatoire
+lima.config.cell.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire
+lima.config.cell.mandatory.foreground.label=Couleur du texte obligatoire
+lima.config.cell.pair.background.description=Couleur de fond d'une ligne paire
+lima.config.cell.pair.background.label=Couleur de fond paire
+lima.config.cell.pair.error.background.description=Couleur de fond d'une ligne paire
+lima.config.cell.pair.error.background.label=Couleur de fond paire
+lima.config.cell.pair.error.foreground.description=Couleur du texte d'une ligne paire en erreur
+lima.config.cell.pair.error.foreground.label=Couleur du texte paire en erreur
+lima.config.cell.pair.foreground.description=Couleur du texte d'une ligne paire
+lima.config.cell.pair.foreground.label=Couleur du texte paire
+lima.config.cell.pair.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire dans une ligne paire
+lima.config.cell.pair.mandatory.background.label=Couleur de fond paire en erreur
+lima.config.cell.pair.mandatory.foreground.description=Couleur du texte d'une cellule en erreur et vide dont la valeur est obligatoire dans une ligne paire
+lima.config.cell.pair.mandatory.foreground.label=Couleur de fond paire en erreur
+lima.config.cell.pair.selected.background.description=Couleur de fond d'une ligne paire sélectionnée
+lima.config.cell.pair.selected.background.label=Couleur de fond paire sélectionnée
+lima.config.cell.pair.selected.error.background.description=Couleur de fond d'une cellule en erreur dans une ligne paire sélectionnée
+lima.config.cell.pair.selected.error.background.label=Couleur de fond paire sélectionnée en erreur
+lima.config.cell.pair.selected.error.foreground.description=Couleur du texte d'une cellule en erreur dans une ligne paire sélectionnée
+lima.config.cell.pair.selected.error.foreground.label=Couleur du texte paire sélectionnée en erreur
+lima.config.cell.pair.selected.foreground.description=Couleur du texte d'une ligne paire sélectionnée
+lima.config.cell.pair.selected.foreground.label=Couleur du texte paire sélectionnée
+lima.config.cell.pair.selected.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire pour une ligne paire selectionnée
+lima.config.cell.pair.selected.mandatory.background.label=Couleur de fond paire sélectionnée obligatoire
+lima.config.cell.pair.selected.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire pour une ligne paire sélectionnée
+lima.config.cell.pair.selected.mandatory.foreground.label=Couleur du texte paire sélectionnée obligatoire
+lima.config.cell.selected.background.description=Couleur de fond d'une ligne sélectionnée
+lima.config.cell.selected.background.label=Couleur de fond sélectionnée
+lima.config.cell.selected.error.background.description=Couleur de fond d'une cellule en erreur dans une ligne sélectionnée
+lima.config.cell.selected.error.background.label=Couleur de fond sélectionnée en erreur
+lima.config.cell.selected.error.foreground.description=Couleur du texte d'une cellule en erreur dans une ligne sélectionnée
+lima.config.cell.selected.error.foreground.label=Couleur du texte sélectionnée en erreur
+lima.config.cell.selected.foreground.description=Couleur du texte d'une ligne sélectionnée
+lima.config.cell.selected.foreground.label=Couleur du texte sélectionnée
+lima.config.cell.selected.mandatory.background.description=Couleur de fond d'une cellule vide dont la valeur est obligatoire pour une ligne sélectionnée
+lima.config.cell.selected.mandatory.background.label=Couleur de fond sélectionnée obligatoire
+lima.config.cell.selected.mandatory.foreground.description=Couleur du texte d'une cellule vide dont la valeur est obligatoire pour une ligne sélectionnée
+lima.config.cell.selected.mandatory.foreground.label=Couleur du texte sélectionnée obligatoire
lima.config.colorselectionfocus=
lima.config.colorselectionfocus.description=Couleur des bordures de la séléction
lima.config.colorselectionfocus.label=Couleur de l'encadrement de sélection d'une cellule
1
0
r3751 - in trunk/lima-swing/src/main: java/org/chorem/lima java/org/chorem/lima/ui/celleditor java/org/chorem/lima/ui/common java/org/chorem/lima/ui/financialperiod java/org/chorem/lima/ui/financialtransaction java/org/chorem/lima/ui/fiscalperiod resources/i18n
by sbavencoff@users.chorem.org 05 Mar '14
by sbavencoff@users.chorem.org 05 Mar '14
05 Mar '14
Author: sbavencoff
Date: 2014-03-05 12:59:43 +0100 (Wed, 05 Mar 2014)
New Revision: 3751
Url: http://forge.chorem.org/projects/lima/repository/revisions/3751
Log:
refs #971 : color of table cell
Added:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/TableCellErrorDetector.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodErrorDetector.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionErrorDetector.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodErrorDetector.java
Removed:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodRenderer.java
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionDefaultTable.java
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java
trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/LimaConfig.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -511,8 +511,152 @@
_("lima.config.selectAllEditingCell.label"),
n_("lima.config.selectAllEditingCell.description"),
"true",
- Boolean.class, false, false);
+ Boolean.class, false, false),
+ TABLE_CELL_BACKGROUND("lima.ui.table.cell.background",
+ _("lima.config.cell.background.label"),
+ n_("lima.config.cell.background.description"),
+ "#FFFFFF",
+ Color.class, false, false),
+
+ TABLE_CELL_FOREGROUND("lima.ui.table.cell.foreground",
+ _("lima.config.cell.foreground.label"),
+ n_("lima.config.cell.foreground.description"),
+ "#000000",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_BACKGROUND("lima.ui.table.cell.pair.background",
+ _("lima.config.cell.pair.background.label"),
+ n_("lima.config.cell.pair.background.description"),
+ "#EEEEEE",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_FOREGROUND("lima.ui.table.cell.pair.foreground",
+ _("lima.config.cell.pair.foreground.label"),
+ n_("lima.config.cell.pair.foreground.description"),
+ "#000000",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_BACKGROUND("lima.ui.table.cell.selected.background",
+ _("lima.config.cell.selected.background.label"),
+ n_("lima.config.cell.selected.background.description"),
+ "#0066CC",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_FOREGROUND("lima.ui.table.cell.selected.foreground",
+ _("lima.config.cell.selected.foreground.label"),
+ n_("lima.config.cell.selected.foreground.description"),
+ "#FFFFFF",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_BACKGROUND("lima.ui.table.cell.pair.selected.background",
+ _("lima.config.cell.pair.selected.background.label"),
+ n_("lima.config.cell.pair.selected.background.description"),
+ "#006699",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_FOREGROUND("lima.ui.table.cell.pair.selected.foreground",
+ _("lima.config.cell.pair.selected.foreground.label"),
+ n_("lima.config.cell.pair.selected.foreground.description"),
+ "#FFFFFF",
+ Color.class, false, false),
+
+ TABLE_CELL_ERROR_BACKGROUND("lima.ui.table.cell.error.background",
+ _("lima.config.cell.error.background.label"),
+ n_("lima.config.cell.error.background.description"),
+ "#FFFFFF",
+ Color.class, false, false),
+
+ TABLE_CELL_ERROR_FOREGROUND("lima.ui.table.cell.error.foreground",
+ _("lima.config.cell.error.foreground.label"),
+ n_("lima.config.cell.error.foreground.description"),
+ "#FF0936",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_ERROR_BACKGROUND("lima.ui.table.cell.pair.error.background",
+ _("lima.config.cell.pair.error.background.label"),
+ n_("lima.config.cell.pair.error.background.description"),
+ "#EEEEEE",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_ERROR_FOREGROUND("lima.ui.table.cell.pair.error.foreground",
+ _("lima.config.cell.pair.error.foreground.label"),
+ n_("lima.config.cell.pair.error.foreground.description"),
+ "#FC0625",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.selected.error.background",
+ _("lima.config.cell.selected.error.background.label"),
+ n_("lima.config.cell.selected.error.background.description"),
+ "#0066CC",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.selected.error.foreground",
+ _("lima.config.cell.selected.error.foreground.label"),
+ n_("lima.config.cell.selected.error.foreground.description"),
+ "#C998C1",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND("lima.ui.table.cell.pair.selected.error.background",
+ _("lima.config.cell.pair.selected.error.background.label"),
+ n_("lima.config.cell.pair.selected.error.background.description"),
+ "#006699",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND("lima.ui.table.cell.pair.selected.error.foreground",
+ _("lima.config.cell.pair.selected.error.foreground.label"),
+ n_("lima.config.cell.pair.selected.error.foreground.description"),
+ "#C96678",
+ Color.class, false, false),
+
+ TABLE_CELL_MANDATORY_BACKGROUND("lima.ui.table.cell.mandatory.background",
+ _("lima.config.cell.mandatory.background.label"),
+ n_("lima.config.cell.mandatory.background.description"),
+ "#FFCCCC",
+ Color.class, false, false),
+
+ TABLE_CELL_MANDATORY_FOREGROUND("lima.ui.table.cell.mandatory.foreground",
+ _("lima.config.cell.mandatory.foreground.label"),
+ n_("lima.config.cell.mandatory.foreground.description"),
+ "#000000",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.mandatory.background",
+ _("lima.config.cell.pair.mandatory.background.label"),
+ n_("lima.config.cell.pair.mandatory.background.description"),
+ "#FF99CC",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.mandatory.foreground",
+ _("lima.config.cell.pair.mandatory.foreground.label"),
+ n_("lima.config.cell.pair.mandatory.foreground.description"),
+ "#000000",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.selected.mandatory.background",
+ _("lima.config.cell.selected.mandatory.background.label"),
+ n_("lima.config.cell.selected.mandatory.background.description"),
+ "#FF0000",
+ Color.class, false, false),
+
+ TABLE_CELL_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.selected.mandatory.foreground",
+ _("lima.config.cell.selected.mandatory.foreground.label"),
+ n_("lima.config.cell.selected.mandatory.foreground.description"),
+ "#FFFFFF",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND("lima.ui.table.cell.pair.selected.mandatory.background",
+ _("lima.config.cell.pair.selected.mandatory.background.label"),
+ n_("lima.config.cell.pair.selected.mandatory.background.description"),
+ "#990000",
+ Color.class, false, false),
+
+ TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND("lima.ui.table.cell.pair.selected.mandatory.foreground",
+ _("lima.config.cell.pair.selected.mandatory.foreground.label"),
+ n_("lima.config.cell.pair.selected.mandatory.foreground.description"),
+ "#000000",
+ Color.class, false, false);
+
public enum ComportmentEditingCellEnum {ALL, NOTHING}
public final String key;
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/DefaultLimaTableCellRenderer.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -1,13 +1,10 @@
package org.chorem.lima.ui.celleditor;
-import org.chorem.lima.ui.common.FinancialTransactionTableModel;
+import org.chorem.lima.LimaConfig;
import org.chorem.lima.ui.common.TableModelWithGroup;
-import org.chorem.lima.ui.financialtransaction.FinancialTransactionTable;
-import sun.swing.DefaultLookup;
import javax.swing.*;
import javax.swing.border.Border;
-import javax.swing.border.EmptyBorder;
import javax.swing.table.TableCellRenderer;
import java.awt.*;
@@ -18,74 +15,101 @@
private String text = null;
+ protected boolean mandatory;
+
+ protected TableCellErrorDetector errorDetector;
+
+ public DefaultLimaTableCellRenderer() {
+ mandatory = false;
+ errorDetector = new TableCellErrorDetector();
+ }
+
@Override
public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
//Create a new JLabel to avoid colouring only when row is selected
JLabel myCell = new JLabel();
myCell.setOpaque(true);
- myCell.setBorder(new EmptyBorder(1, 1, 1, 1));
+
myCell.setName("Table.entryCellRenderer");
- Color background = Color.WHITE;
- Color foreground = Color.BLACK;
+ int line = row;
- if (isSelected) {
- foreground = table.getSelectionForeground();
- background = table.getSelectionBackground();
- } else {
- Color alternateColor = new Color(204, 207, 223);
+ if (table.getModel() instanceof TableModelWithGroup) {
+ TableModelWithGroup model = (TableModelWithGroup) table.getModel();
- if (table.getModel() instanceof TableModelWithGroup) {
- TableModelWithGroup model = (TableModelWithGroup) table.getModel();
- if (model.indexGroupAt(row) % 2 != 0) {
- background = alternateColor;
- }
- } else if (row % 2 != 0) {
- background = alternateColor;
- }
+ line = model.indexInGroup(row);
}
- if (table.isCellEditable(row, column)
- && (value == null
- || (value instanceof String) && ((String) value).isEmpty()
- )
- ) {
- background = new Color(255, 198, 209);
- }
+ LimaConfig limaConfig = LimaConfig.getInstance();
- if (table instanceof FinancialTransactionTable) {
- FinancialTransactionTableModel model = (FinancialTransactionTableModel) ((FinancialTransactionTable)table).getModel();
- if (model.getBalanceTransactionInRow(row).signum() != 0) {
- foreground = new Color(240, 30, 30);
- }
+ // border
+ Border border = BorderFactory.createEmptyBorder(1, 1, 1, 1);
+ if (hasFocus) {
+ Color color = limaConfig.getOptionAsColor(LimaConfig.Option.COLOR_SELECTION_FOCUS.key);
+ border = BorderFactory.createLineBorder(color, 2);
+ } else if (line == 0 && table.getModel() instanceof TableModelWithGroup) {
+ border = BorderFactory.createMatteBorder(1, 0, 0, 0, Color.BLACK);
}
- if (hasFocus) {
- Border border = null;
+ myCell.setBorder(border);
+
+ // color
+
+ LimaConfig.Option backgroundOption;
+ LimaConfig.Option foreGroundOption;
+
+ if (line % 2 == 1) {
if (isSelected) {
- //FIXME tchemit-2013-08_02 Do not use sun. classes
- border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusSelectedCellHighlightBorder");
+ if (errorDetector.isError(table, value, row, column)) {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_ERROR_FOREGROUND;
+ } else if (isMandatory(table, value, row, column)){
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_MANDATORY_FOREGROUND;
+ } else {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_SELECTED_FOREGROUND;
+ }
+ } else {
+ if (errorDetector.isError(table, value, row, column)) {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_ERROR_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_ERROR_FOREGROUND;
+ } else if (isMandatory(table, value, row, column)){
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_MANDATORY_FOREGROUND;
+ } else {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_PAIR_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_PAIR_FOREGROUND;
+ }
}
- if (border == null) {
- //FIXME tchemit-2013-08_02 Do not use sun. classes
- border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.focusCellHighlightBorder");
- }
- myCell.setBorder(border);
- if (table.getModel().isCellEditable(row, column)) {
- background = Color.WHITE;
- foreground = Color.BLACK;
- }
} else {
- //FIXME tchemit-2013-08_02 Do not use sun. classes
- Border border = DefaultLookup.getBorder(myCell, myCell.getUI(), "Table.cellNoFocusBorder");
- if (border == null) {
- border = new EmptyBorder(1, 1, 1, 1);
+ if (isSelected) {
+ if (errorDetector.isError(table, value, row, column)) {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_ERROR_FOREGROUND;
+ } else if (isMandatory(table, value, row, column)){
+ backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_MANDATORY_FOREGROUND;
+ } else {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_SELECTED_FOREGROUND;
+ }
+ } else {
+ if (errorDetector.isError(table, value, row, column)) {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_ERROR_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_ERROR_FOREGROUND;
+ } else if (isMandatory(table, value, row, column)){
+ backgroundOption = LimaConfig.Option.TABLE_CELL_MANDATORY_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_MANDATORY_FOREGROUND;
+ } else {
+ backgroundOption = LimaConfig.Option.TABLE_CELL_BACKGROUND;
+ foreGroundOption = LimaConfig.Option.TABLE_CELL_FOREGROUND;
+ }
}
- myCell.setBorder(border);
}
- myCell.setBackground(background);
- myCell.setForeground(foreground);
+ myCell.setBackground(limaConfig.getOptionAsColor(backgroundOption.key));
+ myCell.setForeground(limaConfig.getOptionAsColor(foreGroundOption.key));
setValue(value);
myCell.setText(text);
@@ -97,4 +121,28 @@
this.text = (value == null) ? "" : value.toString();
}
+ public boolean isMandatory() {
+ return mandatory;
+ }
+
+ public void setMandatory(boolean mandatory) {
+ this.mandatory = mandatory;
+ }
+
+ protected boolean isMandatory(JTable table, Object value, int row, int column) {
+ return mandatory && table.isCellEditable(row, column)
+ && (value == null
+ || (value instanceof String) && ((String) value).isEmpty());
+ }
+
+ public TableCellErrorDetector getError() {
+ return errorDetector;
+ }
+
+ public void setErrorDetector(TableCellErrorDetector errorDetector) {
+ this.errorDetector = errorDetector;
+ }
+
+
+
}
Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/EntryTableCellRenderer.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -1,52 +0,0 @@
-package org.chorem.lima.ui.celleditor;
-
-/*
- * #%L
- * Lima :: Swing
- * $Id$
- * $HeadURL$
- * %%
- * Copyright (C) 2008 - 2013 CodeLutin
- * %%
- * This program is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as
- * published by the Free Software Foundation, either version 3 of the
- * License, or (at your option) any later version.
- *
- * This program is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public
- * License along with this program. If not, see
- * <http://www.gnu.org/licenses/gpl-3.0.html>.
- * #L%
- */
-
-import org.chorem.lima.ui.common.FinancialTransactionTableModel;
-import org.chorem.lima.ui.common.LineRenderer;
-import org.chorem.lima.ui.financialtransaction.FinancialTransactionTable;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
- */
-public class EntryTableCellRenderer extends LineRenderer {
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
- Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- if (table instanceof FinancialTransactionTable) {
- FinancialTransactionTableModel model = (FinancialTransactionTableModel) table.getModel();
- if (!isSelected && model.getBalanceTransactionInRow(row).signum() != 0) {
- component.setForeground(new Color(240, 30, 30));
- }
- }
-
- return component;
- }
-}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/TableCellErrorDetector.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/TableCellErrorDetector.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/celleditor/TableCellErrorDetector.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -0,0 +1,15 @@
+package org.chorem.lima.ui.celleditor;
+
+import javax.swing.*;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class TableCellErrorDetector {
+
+ public boolean isError(JTable table, Object value, int row, int column) {
+ return false;
+ }
+
+
+}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/AbstractLimaTable.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -18,7 +18,6 @@
import javax.swing.*;
import javax.swing.table.TableCellEditor;
-import javax.swing.table.TableCellRenderer;
import java.awt.*;
import java.awt.event.ActionEvent;
import java.awt.event.KeyEvent;
@@ -36,13 +35,9 @@
protected H handler;
- protected LineRenderer lineRenderer;
-
public AbstractLimaTable(H handler) {
this.handler = handler;
- lineRenderer = new LineRenderer();
-
setShowHorizontalLines(true);
setShowVerticalLines(true);
setGridColor(new Color(232, 232, 246));
@@ -64,6 +59,8 @@
setDefaultEditor(Account.class, new AccountTableCellEditor());
setDefaultEditor(EntryBook.class, new EntryBookTableCellEditor());
setDefaultEditor(String.class, new StringTableCellEditor());
+
+ setShowHorizontalLines(false);
}
protected void initNavigation() {
@@ -87,17 +84,6 @@
return handler;
}
- @Override
- public TableCellRenderer getCellRenderer(int row, int column) {
- TableCellRenderer renderer = super.getCellRenderer(row, column);
-
- if (lineRenderer != null) {
- lineRenderer.setCellRenderer(renderer);
- renderer = lineRenderer;
- }
- return renderer;
- }
-
public void exit() {
if (isEditing()) {
TableCellEditor editor = getCellEditor();
Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/LineRenderer.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -1,44 +0,0 @@
-package org.chorem.lima.ui.common;
-
-import org.chorem.lima.ui.celleditor.DefaultLimaTableCellRenderer;
-
-import javax.swing.*;
-import javax.swing.table.TableCellRenderer;
-import java.awt.*;
-
-/**
- * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
- */
-public class LineRenderer extends DefaultLimaTableCellRenderer {
-
- protected TableCellRenderer cellRenderer;
-
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-
- Component component;
-
- if (cellRenderer != null) {
-
- component = cellRenderer.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- } else {
-
- component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- }
-
-
- return component;
-
- }
-
- public TableCellRenderer getCellRenderer() {
- return cellRenderer;
- }
-
- public void setCellRenderer(TableCellRenderer cellRenderer) {
- this.cellRenderer = cellRenderer;
- }
-}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/common/TableModelWithGroup.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -43,5 +43,14 @@
}
+ public int indexInGroup(int row) {
+ int index = 0;
+ while (row-index > 0 && sameGroup(get(row), get(row-index-1))) {
+ index++;
+ }
+ return index;
+
+ }
+
public abstract boolean sameGroup(E e1, E e2);
}
Copied: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodErrorDetector.java (from rev 3750, trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java)
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodErrorDetector.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodErrorDetector.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -0,0 +1,32 @@
+package org.chorem.lima.ui.financialperiod;
+
+import org.chorem.lima.entity.ClosedPeriodicEntryBook;
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
+
+import javax.swing.*;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class FinancialPeriodErrorDetector extends TableCellErrorDetector {
+
+ @Override
+ public boolean isError(JTable table, Object value, int row, int column) {
+
+ boolean error = false;
+
+ if (table.getModel() instanceof FinancialPeriodTableModel) {
+
+ FinancialPeriodTableModel model = (FinancialPeriodTableModel) table.getModel();
+
+ ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(row);
+
+ error = closedPeriodicEntryBook.getLocked();
+
+ }
+
+ return error;
+
+ }
+
+}
Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodRenderer.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -1,29 +0,0 @@
-package org.chorem.lima.ui.financialperiod;
-
-import org.chorem.lima.entity.ClosedPeriodicEntryBook;
-import org.chorem.lima.ui.common.LineRenderer;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
- */
-public class FinancialPeriodRenderer extends LineRenderer {
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-
- Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- if (table.getModel() instanceof FinancialPeriodTableModel) {
- FinancialPeriodTableModel model = (FinancialPeriodTableModel) table.getModel();
- ClosedPeriodicEntryBook closedPeriodicEntryBook = model.get(row);
- if (!isSelected && closedPeriodicEntryBook.getLocked()) {
- component.setForeground(new Color(222, 0, 0));
- }
- }
- return component;
- }
-
-}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialperiod/FinancialPeriodTable.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -25,8 +25,15 @@
package org.chorem.lima.ui.financialperiod;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.DefaultLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.EntryBookTableCellRender;
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
import org.chorem.lima.ui.common.AbstractLimaTable;
+import java.util.Date;
+
/**
* Financial period table adding color hidhlighter and key management.
*
@@ -49,8 +56,21 @@
public FinancialPeriodTable(FinancialPeriodViewHandler handler) {
super(handler);
- lineRenderer = new FinancialPeriodRenderer();
+ // renderer
+ TableCellErrorDetector errorDetector = new FinancialPeriodErrorDetector();
+ DefaultLimaTableCellRenderer renderer = new DefaultLimaTableCellRenderer();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(Object.class, renderer);
+
+ renderer = new DateLimaTableCellRenderer();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(Date.class, renderer);
+
+ renderer = new EntryBookTableCellRender();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(EntryBook.class, renderer);
+
}
}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionDefaultTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionDefaultTable.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionDefaultTable.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -26,13 +26,22 @@
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
-import org.chorem.lima.ui.celleditor.EntryTableCellRenderer;
+import org.chorem.lima.entity.Account;
+import org.chorem.lima.entity.EntryBook;
+import org.chorem.lima.ui.celleditor.AccountTableCellRenderer;
+import org.chorem.lima.ui.celleditor.BigDecimalTableCellRenderer;
+import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.DefaultLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.EntryBookTableCellRender;
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
import org.chorem.lima.ui.common.AbstractLimaTable;
import org.chorem.lima.ui.common.CellRouteHorizontalAction;
import org.chorem.lima.ui.common.CellRouteVerticalAction;
import javax.swing.*;
import java.awt.event.KeyEvent;
+import java.math.BigDecimal;
+import java.util.Date;
/**
* @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
@@ -47,7 +56,29 @@
public FinancialTransactionDefaultTable(H handler) {
super(handler);
setSortable(false);
- lineRenderer = new EntryTableCellRenderer();
+
+ // renderer
+ TableCellErrorDetector errorDetector = new FinancialTransactionErrorDetector();
+
+ DefaultLimaTableCellRenderer renderer = new DefaultLimaTableCellRenderer();
+ renderer.setMandatory(true);
+ setDefaultRenderer(Object.class, renderer);
+
+ renderer = new DateLimaTableCellRenderer();
+ renderer.setMandatory(true);
+ setDefaultRenderer(Date.class, renderer);
+
+ renderer = new BigDecimalTableCellRenderer();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(BigDecimal.class, renderer);
+
+ renderer = new AccountTableCellRenderer();
+ renderer.setMandatory(true);
+ setDefaultRenderer(Account.class, renderer);
+
+ renderer = new EntryBookTableCellRender();
+ renderer.setMandatory(true);
+ setDefaultRenderer(EntryBook.class, renderer);
}
@Override
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionErrorDetector.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionErrorDetector.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransaction/FinancialTransactionErrorDetector.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -0,0 +1,30 @@
+package org.chorem.lima.ui.financialtransaction;
+
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
+import org.chorem.lima.ui.common.FinancialTransactionTableModel;
+
+import javax.swing.*;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class FinancialTransactionErrorDetector extends TableCellErrorDetector {
+
+ @Override
+ public boolean isError(JTable table, Object value, int row, int column) {
+
+ boolean error = false;
+
+ if (table.getModel() instanceof FinancialTransactionTableModel) {
+
+ FinancialTransactionTableModel model = (FinancialTransactionTableModel) table.getModel();
+
+ error = model.getBalanceTransactionInRow(row).signum() != 0;
+
+ }
+
+ return error;
+
+
+ }
+}
Copied: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodErrorDetector.java (from rev 3750, trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodRenderer.java)
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodErrorDetector.java (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodErrorDetector.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -0,0 +1,31 @@
+package org.chorem.lima.ui.fiscalperiod;
+
+import org.chorem.lima.entity.FiscalPeriod;
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
+
+import javax.swing.*;
+
+/**
+ * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
+ */
+public class FiscalPeriodErrorDetector extends TableCellErrorDetector {
+
+ @Override
+ public boolean isError(JTable table, Object value, int row, int column) {
+
+ boolean error = false;
+
+ if (table.getModel() instanceof FiscalPeriodTableModel) {
+
+ FiscalPeriodTableModel model = (FiscalPeriodTableModel) table.getModel();
+
+ FiscalPeriod fiscalPeriod = model.get(row);
+
+ error = fiscalPeriod.getLocked();
+
+ }
+
+ return error;
+
+ }
+}
Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodRenderer.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodRenderer.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodRenderer.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -1,28 +0,0 @@
-package org.chorem.lima.ui.fiscalperiod;
-
-import org.chorem.lima.entity.FiscalPeriod;
-import org.chorem.lima.ui.common.LineRenderer;
-
-import javax.swing.*;
-import java.awt.*;
-
-/**
- * @author Sylvain Bavencoff <bavencoff(a)codelutin.com>
- */
-public class FiscalPeriodRenderer extends LineRenderer {
-
- @Override
- public Component getTableCellRendererComponent(JTable table, Object value, boolean isSelected, boolean hasFocus, int row, int column) {
-
- Component component = super.getTableCellRendererComponent(table, value, isSelected, hasFocus, row, column);
-
- if (table.getModel() instanceof FiscalPeriodTableModel) {
- FiscalPeriodTableModel model = (FiscalPeriodTableModel) table.getModel();
- FiscalPeriod fiscalPeriod = model.get(row);
- if (!isSelected && fiscalPeriod.getLocked()) {
- component.setForeground(new Color(222, 0, 0));
- }
- }
- return component;
- }
-}
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodTable.java 2014-03-05 11:59:43 UTC (rev 3751)
@@ -25,8 +25,13 @@
package org.chorem.lima.ui.fiscalperiod;
+import org.chorem.lima.ui.celleditor.DateLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.DefaultLimaTableCellRenderer;
+import org.chorem.lima.ui.celleditor.TableCellErrorDetector;
import org.chorem.lima.ui.common.AbstractLimaTable;
+import java.util.Date;
+
/**
* Fiscal period table add support for JXTable.
*
@@ -48,7 +53,17 @@
public FiscalPeriodTable(FiscalPeriodViewHandler handler) {
super(handler);
- lineRenderer = new FiscalPeriodRenderer();
+
+ // renderer
+ TableCellErrorDetector errorDetector = new FiscalPeriodErrorDetector();
+
+ DefaultLimaTableCellRenderer renderer = new DefaultLimaTableCellRenderer();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(Object.class, renderer);
+
+ renderer = new DateLimaTableCellRenderer();
+ renderer.setErrorDetector(errorDetector);
+ setDefaultRenderer(Date.class, renderer);
}
}
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-03-05 11:59:43 UTC (rev 3751)
@@ -91,6 +91,54 @@
lima.config.category.directories.description=Directories used by LIMA
lima.config.category.other=Other
lima.config.category.other.description=Other configuration properties
+lima.config.cell.background.description=
+lima.config.cell.background.label=
+lima.config.cell.error.background.description=
+lima.config.cell.error.background.label=
+lima.config.cell.error.foreground.description=
+lima.config.cell.error.foreground.label=
+lima.config.cell.foreground.description=
+lima.config.cell.foreground.label=
+lima.config.cell.mandatory.background.description=
+lima.config.cell.mandatory.background.label=
+lima.config.cell.mandatory.foreground.description=
+lima.config.cell.mandatory.foreground.label=
+lima.config.cell.pair.background.description=
+lima.config.cell.pair.background.label=
+lima.config.cell.pair.error.background.description=
+lima.config.cell.pair.error.background.label=
+lima.config.cell.pair.error.foreground.description=
+lima.config.cell.pair.error.foreground.label=
+lima.config.cell.pair.foreground.description=
+lima.config.cell.pair.foreground.label=
+lima.config.cell.pair.mandatory.background.description=
+lima.config.cell.pair.mandatory.background.label=
+lima.config.cell.pair.mandatory.foreground.description=
+lima.config.cell.pair.mandatory.foreground.label=
+lima.config.cell.pair.selected.background.description=
+lima.config.cell.pair.selected.background.label=
+lima.config.cell.pair.selected.error.background.description=
+lima.config.cell.pair.selected.error.background.label=
+lima.config.cell.pair.selected.error.foreground.description=
+lima.config.cell.pair.selected.error.foreground.label=
+lima.config.cell.pair.selected.foreground.description=
+lima.config.cell.pair.selected.foreground.label=
+lima.config.cell.pair.selected.mandatory.background.description=
+lima.config.cell.pair.selected.mandatory.background.label=
+lima.config.cell.pair.selected.mandatory.foreground.description=
+lima.config.cell.pair.selected.mandatory.foreground.label=
+lima.config.cell.selected.background.description=
+lima.config.cell.selected.background.label=
+lima.config.cell.selected.error.background.description=
+lima.config.cell.selected.error.background.label=
+lima.config.cell.selected.error.foreground.description=
+lima.config.cell.selected.error.foreground.label=
+lima.config.cell.selected.foreground.description=
+lima.config.cell.selected.foreground.label=
+lima.config.cell.selected.mandatory.background.description=
+lima.config.cell.selected.mandatory.background.label=
+lima.config.cell.selected.mandatory.foreground.description=
+lima.config.cell.selected.mandatory.foreground.label=
lima.config.colorselectionfocus=Cadring color of the selection of a cell
lima.config.colorselectionfocus.description=
lima.config.colorselectionfocus.label=
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-02-28 15:18:09 UTC (rev 3750)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-03-05 11:59:43 UTC (rev 3751)
@@ -80,6 +80,54 @@
lima.config.category.directories.description=Répertoires utilisés par Lima
lima.config.category.other=Autre
lima.config.category.other.description=Autre propriétés de configuration
+lima.config.cell.background.description=
+lima.config.cell.background.label=
+lima.config.cell.error.background.description=
+lima.config.cell.error.background.label=
+lima.config.cell.error.foreground.description=
+lima.config.cell.error.foreground.label=
+lima.config.cell.foreground.description=
+lima.config.cell.foreground.label=
+lima.config.cell.mandatory.background.description=
+lima.config.cell.mandatory.background.label=
+lima.config.cell.mandatory.foreground.description=
+lima.config.cell.mandatory.foreground.label=
+lima.config.cell.pair.background.description=
+lima.config.cell.pair.background.label=
+lima.config.cell.pair.error.background.description=
+lima.config.cell.pair.error.background.label=
+lima.config.cell.pair.error.foreground.description=
+lima.config.cell.pair.error.foreground.label=
+lima.config.cell.pair.foreground.description=
+lima.config.cell.pair.foreground.label=
+lima.config.cell.pair.mandatory.background.description=
+lima.config.cell.pair.mandatory.background.label=
+lima.config.cell.pair.mandatory.foreground.description=
+lima.config.cell.pair.mandatory.foreground.label=
+lima.config.cell.pair.selected.background.description=
+lima.config.cell.pair.selected.background.label=
+lima.config.cell.pair.selected.error.background.description=
+lima.config.cell.pair.selected.error.background.label=
+lima.config.cell.pair.selected.error.foreground.description=
+lima.config.cell.pair.selected.error.foreground.label=
+lima.config.cell.pair.selected.foreground.description=
+lima.config.cell.pair.selected.foreground.label=
+lima.config.cell.pair.selected.mandatory.background.description=
+lima.config.cell.pair.selected.mandatory.background.label=
+lima.config.cell.pair.selected.mandatory.foreground.description=
+lima.config.cell.pair.selected.mandatory.foreground.label=
+lima.config.cell.selected.background.description=
+lima.config.cell.selected.background.label=
+lima.config.cell.selected.error.background.description=
+lima.config.cell.selected.error.background.label=
+lima.config.cell.selected.error.foreground.description=
+lima.config.cell.selected.error.foreground.label=
+lima.config.cell.selected.foreground.description=
+lima.config.cell.selected.foreground.label=
+lima.config.cell.selected.mandatory.background.description=
+lima.config.cell.selected.mandatory.background.label=
+lima.config.cell.selected.mandatory.foreground.description=
+lima.config.cell.selected.mandatory.foreground.label=
lima.config.colorselectionfocus=
lima.config.colorselectionfocus.description=Couleur des bordures de la séléction
lima.config.colorselectionfocus.label=Couleur de l'encadrement de sélection d'une cellule
1
0
r3750 - in trunk/lima-swing/src/main: java/org/chorem/lima/ui/fiscalperiod resources/i18n
by sbavencoff@users.chorem.org 28 Feb '14
by sbavencoff@users.chorem.org 28 Feb '14
28 Feb '14
Author: sbavencoff
Date: 2014-02-28 16:18:09 +0100 (Fri, 28 Feb 2014)
New Revision: 3750
Url: http://chorem.org/projects/lima/repository/revisions/3750
Log:
fixes #768 : Report ?\195?\160 nouveau impossible ?\195?\160 ?\195?\169tablir
Added:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx
Modified:
trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java
trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-02-28 10:04:45 UTC (rev 3749)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/FiscalPeriodViewHandler.java 2014-02-28 15:18:09 UTC (rev 3750)
@@ -25,6 +25,7 @@
package org.chorem.lima.ui.fiscalperiod;
+import org.apache.commons.lang.StringUtils;
import org.apache.commons.lang3.time.DateUtils;
import org.apache.commons.logging.Log;
import org.apache.commons.logging.LogFactory;
@@ -299,13 +300,13 @@
*/
public void blockFiscalPeriod() {
FiscalPeriodTable table = view.getFiscalPeriodTable();
- FiscalPeriodTableModel tableModel = view.getFiscalPeriodTableModel();
+ final FiscalPeriodTableModel tableModel = view.getFiscalPeriodTableModel();
- int selectedRow = table.getSelectedRow();
+ final int selectedRow = table.getSelectedRow();
if (selectedRow >= 0) {
- FiscalPeriod selectedFiscalPeriod = tableModel.get(selectedRow);
+ final FiscalPeriod selectedFiscalPeriod = tableModel.get(selectedRow);
if (!selectedFiscalPeriod.isLocked()) {
@@ -316,31 +317,38 @@
JOptionPane.WARNING_MESSAGE);
if (answerBlock == JOptionPane.YES_OPTION) {
- boolean retainedEarnings = false;
- EntryBook entryBook = null;
- // find next fiscal year
- FiscalPeriod lastFiscalPeriod = fiscalPeriodService.getLastFiscalPeriod();
- if (selectedFiscalPeriod.equals(lastFiscalPeriod)) {
+ //report if they are at least one transaction to be report
+ if (fiscalPeriodService.isRetainedEarnings(selectedFiscalPeriod)) {
- //check if the user wants to create a new fiscal year
- int answerCreate = JOptionPane.showConfirmDialog(view,
- _("lima.ui.fiscalperiod.block.newyear"),
- _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION,
- JOptionPane.QUESTION_MESSAGE);
+ // find next fiscal year
+ FiscalPeriod lastFiscalPeriod = fiscalPeriodService.getLastFiscalPeriod();
+ if (selectedFiscalPeriod.equals(lastFiscalPeriod)) {
- // create a new fiscal year
- if (answerCreate == JOptionPane.YES_OPTION) {
- addFiscalPeriod();
+ //check if the user wants to create a new fiscal year
+ int answerCreate = JOptionPane.showConfirmDialog(view,
+ _("lima.ui.fiscalperiod.block.newyear"),
+ _("lima.ui.fiscalperiod.block.title"), JOptionPane.YES_NO_OPTION,
+ JOptionPane.QUESTION_MESSAGE);
+
+ // create a new fiscal year
+ if (answerCreate == JOptionPane.YES_OPTION) {
+ addFiscalPeriod();
+ }
}
- }
- // if next fiscal year exist
- if (selectedFiscalPeriod.equals(lastFiscalPeriod)) {
- //report if they are at least one transaction to be report
- if (fiscalPeriodService.isRetainedEarnings(selectedFiscalPeriod)) {
+ lastFiscalPeriod = fiscalPeriodService.getLastFiscalPeriod();
+ // check if next fiscal year don't exist
+ if (selectedFiscalPeriod.equals(lastFiscalPeriod)) {
+ JOptionPane.showMessageDialog(view,
+ _("lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist"),
+ _("lima.ui.fiscalperiod.block.title"),
+ JOptionPane.ERROR_MESSAGE);
+
+ } else {
+
//check if the user wants to report datas
int answerRetainedEarnings = JOptionPane.showConfirmDialog(view,
_("lima.ui.fiscalperiod.block.addretainedearnings"),
@@ -348,8 +356,6 @@
JOptionPane.QUESTION_MESSAGE);
if (answerRetainedEarnings == JOptionPane.YES_OPTION) {
- retainedEarnings = true;
-
//Sets EntryBook
EntryBook newEntryBook = new EntryBookImpl();
RetainedEarningsEntryBookForm entryBookForm =
@@ -359,16 +365,58 @@
// jaxx constructor don't call super() ?
entryBookForm.setLocationRelativeTo(view);
entryBookForm.setVisible(true);
- entryBook = entryBookForm.getEntryBook();
+ final EntryBook entryBook = entryBookForm.getEntryBook();
+
+ if (entryBook != null && StringUtils.isNotBlank(entryBook.getCode())) {
+
+ final RetainedEarningsWait retainedEarningsWait = new RetainedEarningsWait(view);
+ retainedEarningsWait.setLocationRelativeTo(view);
+
+ new SwingWorker<FiscalPeriod, Void>() {
+ @Override
+ protected FiscalPeriod doInBackground() throws Exception {
+ FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.retainedEarningsAndBlockFiscalPeriod(selectedFiscalPeriod, entryBook, true);
+ tableModel.setValue(selectedRow, fiscalPeriodBlocked);
+
+ view.setBlockEnabled(false);
+ view.setDeleteEnabled(false);
+
+ return fiscalPeriodBlocked;
+ }
+
+ @Override
+ protected void done() {
+ retainedEarningsWait.setVisible(false);
+ }
+ }.execute();
+ retainedEarningsWait.setVisible(true);
+
+ } else {
+
+ JOptionPane.showMessageDialog(view,
+ _("lima.ui.fiscalperiod.block.cantBalanceNotBook"),
+ _("lima.ui.fiscalperiod.block.title"),
+ JOptionPane.ERROR_MESSAGE);
+ }
+
+ } else {
+
+ JOptionPane.showMessageDialog(view,
+ _("lima.ui.fiscalperiod.block.cantBlockNotBalance"),
+ _("lima.ui.fiscalperiod.block.title"),
+ JOptionPane.ERROR_MESSAGE);
}
}
- }
- FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.retainedEarningsAndBlockFiscalPeriod(selectedFiscalPeriod, entryBook, retainedEarnings);
- tableModel.setValue(selectedRow, fiscalPeriodBlocked);
+ } else {
- view.setBlockEnabled(false);
- view.setDeleteEnabled(false);
+ FiscalPeriod fiscalPeriodBlocked = fiscalPeriodService.blockFiscalPeriod(selectedFiscalPeriod);
+ tableModel.setValue(selectedRow, fiscalPeriodBlocked);
+
+ view.setBlockEnabled(false);
+ view.setDeleteEnabled(false);
+
+ }
}
}
}
Added: trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx
===================================================================
--- trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx (rev 0)
+++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/fiscalperiod/RetainedEarningsWait.jaxx 2014-02-28 15:18:09 UTC (rev 3750)
@@ -0,0 +1,12 @@
+<JDialog modal="true" id="waitDialog" title="lima.ui.importexport.waittitle">
+ <Table>
+ <row>
+ <cell>
+ <org.jdesktop.swingx.JXBusyLabel id='busylabel' busy='true'/>
+ </cell>
+ <cell>
+ <JLabel text='lima.ui.retainedEarnings.wait'/>
+ </cell>
+ </row>
+ </Table>
+</JDialog>
\ No newline at end of file
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-02-28 10:04:45 UTC (rev 3749)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-02-28 15:18:09 UTC (rev 3750)
@@ -353,6 +353,9 @@
lima.ui.fiscalperiod.addfiscalperiodtitle=
lima.ui.fiscalperiod.begin=
lima.ui.fiscalperiod.block.addretainedearnings=
+lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=
+lima.ui.fiscalperiod.block.cantBalanceNotBook=
+lima.ui.fiscalperiod.block.cantBlockNotBalance=
lima.ui.fiscalperiod.block.confirmation=
lima.ui.fiscalperiod.block.newyear=
lima.ui.fiscalperiod.block.retainedearningstitle=
@@ -452,6 +455,7 @@
lima.ui.opening.next=Next
lima.ui.opening.title=
lima.ui.opening.welcome=<html><center>Welcome to Lima<br/>this assistant help you to start your business accounting in the blink of an eye<br/>OR import instantanly your already existing save in CSV format<br/><br/><br/><br/></center></html>
+lima.ui.retainedEarnings.wait=
lima.ui.table.cell.colorSelectionFocus=
lima.ui.table.cell.comportmentEditingCell=
lima.ui.table.cell.selectAllEditingCell=
Modified: trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties
===================================================================
--- trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-02-28 10:04:45 UTC (rev 3749)
+++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-02-28 15:18:09 UTC (rev 3750)
@@ -335,6 +335,9 @@
lima.ui.fiscalperiod.addfiscalperiodtitle=Nouvel exercice
lima.ui.fiscalperiod.begin=Début
lima.ui.fiscalperiod.block.addretainedearnings=Reporter à nouveau?
+lima.ui.fiscalperiod.block.cantBalanceIfNextPeriodNotExist=Impossible de créer le report à nouveaux. L'exercice fiscal suivant n'existe pas
+lima.ui.fiscalperiod.block.cantBalanceNotBook=Impossible de créer le report à nouveaux. aucun journal n'est selectioné.
+lima.ui.fiscalperiod.block.cantBlockNotBalance=Impossible de clôturer un exercice non equilibré
lima.ui.fiscalperiod.block.confirmation=Ètes vous sûre de vouloir clôturer cette période ? Cette action est irréversible \!
lima.ui.fiscalperiod.block.newyear=Voulez vous créer un nouvel exercice?
lima.ui.fiscalperiod.block.retainedearningstitle=Report à nouveau
@@ -429,6 +432,7 @@
lima.ui.opening.next=Suivant
lima.ui.opening.title=Initialisation
lima.ui.opening.welcome=<html><center>Bienvenue dans Lima<br/>Laissez vous guider par cet assistant pour démarrer votre comptabilité en quelques instants
<br/>Ou bien importer directement une ancienne sauvegarde de LIMA au format CSV<br/><br/><br/><br/></center></html>
+lima.ui.retainedEarnings.wait=Report à nouveaux...
lima.vatreport.listerror=Erreur lors de la récupération des données de la liste
lima.vatstatement.accounts=Liste des comptes
lima.vatstatement.boxname=PDF BoxName
1
0