Author: jpepin Date: 2010-08-21 15:01:48 +0200 (Sat, 21 Aug 2010) New Revision: 3012 Url: http://chorem.org/repositories/revision/lima/3012 Log: Modification UI recherche d'?\195?\169criture. Retouche UI balance et grand-journal. Removed: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceFilterTextField.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerFilterTextField.java Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AmountSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchComboBox.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchPanel.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceFilterTextField.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceFilterTextField.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceFilterTextField.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -1,56 +0,0 @@ -/* - * *##% Lima Swing - * Copyright (C) 2008 - 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* - */ - -package org.chorem.lima.ui.balance; - -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import javax.swing.JTextField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class BalanceFilterTextField extends JTextField implements KeyListener { - - private static final long serialVersionUID = 1L; - - private static final Log log = - LogFactory.getLog(BalanceFilterTextField.class); - - protected BalanceViewHandler handler; - - public BalanceFilterTextField(BalanceViewHandler handler) { - this.handler = handler; - addKeyListener(this); - } - - @Override - public void keyPressed(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - handler.setAccountFilter(getText()); - } - - @Override - public void keyTyped(KeyEvent e) { - - } - -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/balance/BalanceView.jaxx 2010-08-21 13:01:48 UTC (rev 3012) @@ -50,27 +50,30 @@ </script> <row weightx="1" weighty="0" anchor="center"> <cell anchor="east"> - <JLabel id="beginCalendarPanelLabel" text="lima.accountsreports.begincalendar"/> + <JLabel id="beginCalendarPanelLabel" text="lima.period.begindate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())"/> </cell> <cell anchor="east"> - <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> + <JLabel id="endCalendarPanelLabel" text="lima.period.enddate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> <cell anchor="east"> - <JLabel text="lima.accountsreports.accountfilter"/> + <JLabel text="lima.common.filter"/> </cell> <cell anchor="west"> - <JTextField javaBean="new org.chorem.lima.ui.balance.BalanceFilterTextField(getHandler())"/> + <JTextField id='balanceFilter' minimumSize='{balanceFilter.getPreferredSize()}'/> + <javax.swing.text.Document javaBean="balanceFilter.getDocument()" + onInsertUpdate='handler.setAccountFilter(balanceFilter.getText())' + onRemoveUpdate='handler.setAccountFilter(balanceFilter.getText())' /> </cell> <cell anchor="center"> - <JCheckBox id='movmentedFilter' text='lima.accountsreports.movmentedfilter' selected='false' + <JCheckBox id='movmentedFilter' text='lima.common.movmentedfilter' selected='false' onActionPerformed="getHandler().refresh()"/> </cell> <cell> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchComboBox.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -59,7 +59,6 @@ Object object = this.getSelectedItem(); if (object instanceof Account){ handler.setAccount((Account) this.getSelectedItem()); - handler.refresh(); } } @@ -77,7 +76,6 @@ //to prevent useless call to service if (!account.equals(handler.getAccount())){ handler.setAccount(account); - handler.refresh(); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AccountSearchPanel.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -54,6 +54,7 @@ case ACCOUNT_LIST: final JTextField accountsList = new JTextField(16); + accountsList.setMinimumSize(accountsList.getPreferredSize()); KeyListener accountsListKeyListener = new KeyListener() { @Override @@ -66,7 +67,6 @@ //to prevent useless call to service if (!accounts.equals(handler.getAccountsList())){ handler.setAccountsList(accounts); - handler.refresh(); } } @@ -77,7 +77,6 @@ accountsList.addKeyListener(accountsListKeyListener); handler.setAccountsList(accountsList.getText()); handler.setAccount(null); - handler.refresh(); this.removeAll(); this.add(accountsList); break; Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AmountSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AmountSearchPanel.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/AmountSearchPanel.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -38,6 +38,7 @@ public void refresh(ComboBoxOperatorsEnum enums){ final JTextField amountTextField = new JTextField(16); + amountTextField.setMinimumSize(amountTextField.getPreferredSize()); KeyListener amountKeyListener = new KeyListener() { @Override @@ -50,7 +51,6 @@ //to prevent useless call to service if (!amount.equals(handler.getAmount())){ handler.setAmount(amount); - handler.refresh(); } } @@ -61,12 +61,14 @@ amountTextField.addKeyListener(amountKeyListener); handler.setAmount2(""); handler.setOperator(enums.getSymbol()); + handler.refresh(); this.removeAll(); this.add(amountTextField); switch (enums) { case INTERVAL: final JTextField amount2TextField = new JTextField(16); + amount2TextField.setMinimumSize(amount2TextField.getPreferredSize()); KeyListener amount2KeyListener = new KeyListener() { @Override @@ -80,7 +82,6 @@ //to prevent useless call to service if (!amount2.equals(handler.getAmount2())){ handler.setAmount2(amount2); - handler.refresh(); } } @@ -93,9 +94,7 @@ this.add(amount2TextField); break; } - amountTextField.setText(handler.getAmount()); - handler.refresh(); - + amountTextField.setText(handler.getAmount()); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchComboBox.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchComboBox.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchComboBox.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -59,7 +59,6 @@ Object object = this.getSelectedItem(); if (object instanceof EntryBook){ handler.setEntryBook((EntryBook) this.getSelectedItem()); - handler.refresh(); } } @@ -74,7 +73,6 @@ Object object = this.getSelectedItem(); if (object instanceof EntryBook){ handler.setEntryBook((EntryBook) this.getSelectedItem()); - handler.refresh(); } // delegate popup list menu if ( e.getKeyChar() == KeyEvent.VK_ENTER ) Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchPanel.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchPanel.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/EntryBookSearchPanel.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -37,14 +37,12 @@ case SELECT_ONE: EntryBookSearchComboBox entryBookSearchComboBox = new EntryBookSearchComboBox(handler); handler.setEntryBook(null); - handler.refresh(); this.removeAll(); this.add(entryBookSearchComboBox); break; case ALL: handler.setEntryBook(null); - handler.refresh(); this.removeAll(); break; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2010-08-21 13:01:48 UTC (rev 3012) @@ -18,6 +18,7 @@ <Table> <FinancialTransactionSearchViewHandler id="handler" javaBean="new FinancialTransactionSearchViewHandler(this)" /> <Boolean id="selectedRow" javaBean="false" /> + <java.awt.Dimension id="fieldSize" javaBean="new java.awt.Dimension()" /> <script> <![CDATA[ import org.chorem.lima.enums.ComboBoxPeriodEnum; @@ -32,7 +33,6 @@ PeriodSearchPanel periodSearchPanel = new PeriodSearchPanel(handler); void $afterCompleteSetup() { - handler.init(); handler.setAmountWayEnum(FinancialStatementWayEnum.valueOfDescription( (String) getAmountComboBox().getSelectedItem())); handler.setOperator(ComboBoxOperatorsEnum.valueOfDescription( @@ -43,7 +43,7 @@ </script> <row> - <cell><Table><row> + <cell fill='both'><Table><row> <cell anchor="west"><JComboBox id="periodComboBox" javaBean="new JComboBox(ComboBoxPeriodEnum.descriptions())" onActionPerformed="periodSearchPanel.refresh(ComboBoxPeriodEnum.valueOfDescription((String) periodComboBox.getSelectedItem())); validate(); repaint()"/></cell> @@ -51,17 +51,29 @@ </row></Table></cell> </row> <row> - <cell><Table><row> + <cell fill='both'><Table><row> <cell><JLabel text="lima.table.voucher"/></cell> - <cell><JTextField id='voucher'/></cell> + <cell><JTextField id='voucher' minimumSize="{voucher.getPreferredSize()}"/> + <javax.swing.text.Document javaBean="voucher.getDocument()" + onInsertUpdate='handler.setVoucher(voucher.getText())' + onRemoveUpdate='handler.setVoucher(voucher.getText())' /> + </cell> <cell><JLabel text="lima.table.description"/></cell> - <cell><JTextField id='description'/></cell> + <cell><JTextField id='description' minimumSize='{description.getPreferredSize()}'/> + <javax.swing.text.Document javaBean="description.getDocument()" + onInsertUpdate='handler.setDescription(description.getText())' + onRemoveUpdate='handler.setDescription(description.getText())' /> + </cell> <cell><JLabel text="lima.table.letter"/></cell> - <cell><JTextField id='letter'/></cell> + <cell><JTextField id='letter' minimumSize='{letter.getPreferredSize()}'/> + <javax.swing.text.Document javaBean="letter.getDocument()" + onInsertUpdate='handler.setLetter(letter.getText())' + onRemoveUpdate='handler.setLetter(letter.getText())' /> + </cell> </row></Table></cell> </row> <row> - <cell><Table><row> + <cell fill='both'><Table><row> <cell><JComboBox id="accountComboBox" javaBean="new JComboBox(ComboBoxAccountsEnum.descriptions())" onActionPerformed="accountSearchPanel.refresh(ComboBoxAccountsEnum.valueOfDescription((String) accountComboBox.getSelectedItem())); validate(); repaint()"/></cell> @@ -73,7 +85,7 @@ </row></Table></cell> </row> <row> - <cell><Table><row> + <cell fill='both'><Table><row> <cell><JLabel text="lima.amount"/></cell> <cell><JComboBox id="amountComboBox" javaBean="new JComboBox(FinancialStatementWayEnum.descriptions())" onActionPerformed="handler.setAmountWayEnum(FinancialStatementWayEnum.valueOfDescription((String)amountComboBox.getSelectedItem())); @@ -85,6 +97,9 @@ </row></Table></cell> </row> <row> + <cell><JButton id="validSearch" text='lima.common.search' onActionPerformed="handler.refresh()"/></cell> + </row> + <row> <cell fill="both" weightx="1" weighty="1"> <JScrollPane> <org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchTableModel Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchViewHandler.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -1,4 +1,4 @@ -/* *##% Lima Swing + /* *##% Lima Swing * Copyright (C) 2008 - 2010 CodeLutin * * This program is free software; you can redistribute it and/or @@ -18,12 +18,8 @@ package org.chorem.lima.ui.financialtransactionsearch; -import static org.nuiton.i18n.I18n._; -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; import java.util.Date; import java.util.List; -import javax.swing.JTextField; import org.apache.commons.logging.Log; import org.apache.commons.logging.LogFactory; import org.chorem.lima.FinancialStatementWayEnum; @@ -86,85 +82,16 @@ FinancialTransactionServiceMonitorable.class); } - public void init(){ - - final JTextField descriptionTextField = view.getDescription(); - KeyListener descriptionKeyListener = new KeyListener() { - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - setDescription(descriptionTextField.getText()); - refresh(); - } - - @Override - public void keyPressed(KeyEvent e) { - } - }; - descriptionTextField.addKeyListener(descriptionKeyListener); - - final JTextField letterTextField = view.getLetter(); - KeyListener letterKeyListener = new KeyListener() { - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - //to prevent useless call to service - String letterNew = letterTextField.getText(); - if (!letterNew.equals(letter)){ - setLetter(letterNew); - refresh(); - } - } - - @Override - public void keyPressed(KeyEvent e) { - } - }; - letterTextField.addKeyListener(letterKeyListener); - - final JTextField voucherTextField = view.getVoucher(); - KeyListener voucherKeyListener = new KeyListener() { - - @Override - public void keyTyped(KeyEvent e) { - } - - @Override - public void keyReleased(KeyEvent e) { - //to prevent useless call to service - String voucherNew = voucherTextField.getText(); - if (!voucherNew.equals(voucher)){ - setVoucher(voucherNew); - refresh(); - } - } - - @Override - public void keyPressed(KeyEvent e) { - } - }; - voucherTextField.addKeyListener(voucherKeyListener); - } - public void setBeginDate(Date beginDate){ this.beginDate = beginDate; - log.debug(beginDate); } public void setEndDate(Date endDate){ this.endDate = endDate; - log.debug(endDate); } public void setVoucher(String voucher){ + String result = null; if (!voucher.equals("")){ result = voucher; @@ -255,13 +182,13 @@ log.debug(voucher+" " +description+" "+letter+" "+accountsList+" " +account+" "+entryBook+" "+amount); - //prevent to much result tableModel.refresh(getDataList()); } } protected List<Entry> getDataList() { List<Entry> results = null; + //prevent to much result if (voucher != null || description != null || letter != null || accountsList != null || account != null || entryBook != null || (amount != null && operator != null) || (amount != null && amount2 != null)){ Deleted: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerFilterTextField.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerFilterTextField.java 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerFilterTextField.java 2010-08-21 13:01:48 UTC (rev 3012) @@ -1,58 +0,0 @@ -/* - * *##% Lima Swing - * Copyright (C) 2008 - 2010 CodeLutin - * - * This program is free software: you can redistribute it and/or modify - * it under the terms of the GNU Lesser 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 Lesser Public License for more details. - * - * You should have received a copy of the GNU General Lesser Public - * License along with this program. If not, see - * <http://www.gnu.org/licenses/lgpl-3.0.html>. ##%* - */ - -package org.chorem.lima.ui.ledger; - -import java.awt.event.KeyEvent; -import java.awt.event.KeyListener; -import javax.swing.JTextField; -import org.apache.commons.logging.Log; -import org.apache.commons.logging.LogFactory; - -public class LedgerFilterTextField extends JTextField implements KeyListener { - - private static final long serialVersionUID = 1L; - - private static final Log log = - LogFactory.getLog(LedgerFilterTextField.class); - - protected LedgerViewHandler handler; - - public LedgerFilterTextField(LedgerViewHandler handler) { - this.handler = handler; - addKeyListener(this); - } - - @Override - public void keyPressed(KeyEvent e) { - - } - - @Override - public void keyReleased(KeyEvent e) { - handler.setAccountFilter(getText()); - - } - - @Override - public void keyTyped(KeyEvent e) { - - } - -} Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/ledger/LedgerView.jaxx 2010-08-21 13:01:48 UTC (rev 3012) @@ -49,27 +49,30 @@ </script> <row weightx="1" weighty="0" anchor="center"> <cell anchor="east"> - <JLabel id="beginCalendarPanelLabel" text="lima.accountsreports.begincalendar"/> + <JLabel id="beginCalendarPanelLabel" text="lima.period.begindate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="beginDatePicker" onActionPerformed="getHandler().setBeginDate(beginDatePicker.getDate())" /> </cell> <cell anchor="east"> - <JLabel id="endCalendarPanelLabel" text="lima.accountsreports.endcalendar"/> + <JLabel id="endCalendarPanelLabel" text="lima.period.enddate"/> </cell> <cell anchor="west"> <org.jdesktop.swingx.JXDatePicker id="endDatePicker" onActionPerformed="getHandler().setEndDate(endDatePicker.getDate())"/> </cell> <cell anchor="east"> - <JLabel text="lima.accountsreports.accountfilter"/> + <JLabel text="lima.common.filter"/> </cell> <cell anchor="west"> - <JTextField javaBean="new org.chorem.lima.ui.ledger.LedgerFilterTextField(getHandler())"/> + <JTextField id='balanceFilter' minimumSize='{balanceFilter.getPreferredSize()}'/> + <javax.swing.text.Document javaBean="balanceFilter.getDocument()" + onInsertUpdate='handler.setAccountFilter(balanceFilter.getText())' + onRemoveUpdate='handler.setAccountFilter(balanceFilter.getText())' /> </cell> <cell anchor="center"> - <JCheckBox id='movmentedFilter' text='lima.accountsreports.movmentedfilter' selected='false' + <JCheckBox id='movmentedFilter' text='lima.common.movmentedfilter' selected='false' onActionPerformed="getHandler().refresh()"/> </cell> <cell> 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 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-en_GB.properties 2010-08-21 13:01:48 UTC (rev 3012) @@ -47,15 +47,18 @@ lima.common.cancel= lima.common.close= lima.common.copy= +lima.common.filter= lima.common.fin= lima.common.import= lima.common.importexport=Import/Export +lima.common.movmentedfilter= lima.common.next= lima.common.ok= lima.common.paste= lima.common.print= lima.common.quit= lima.common.remove= +lima.common.search= lima.common.update= lima.config.category.directories= lima.config.category.directories.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 2010-08-21 11:51:36 UTC (rev 3011) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing-fr_FR.properties 2010-08-21 13:01:48 UTC (rev 3012) @@ -10,10 +10,6 @@ lima.account=Compte lima.account.label= lima.account.number= -lima.accountsreports.accountfilter=Filtrer -lima.accountsreports.begincalendar=Date d\u00E9but -lima.accountsreports.endcalendar=Date fin -lima.accountsreports.movmentedfilter=Afficher que les comptes mouvement\u00E9s lima.action.commandline.help=Afficher l'aide en console lima.action.fullscreen=Plein Ecran lima.action.fullscreen.tip=Passer en mode plein \u00E9cran @@ -44,14 +40,17 @@ lima.common.cancel=Annuler lima.common.close=Fermer lima.common.copy=Copier +lima.common.filter=Filtrer lima.common.fin=Termin\u00E9 lima.common.importexport=Importer/Exporter +lima.common.movmentedfilter=Comptes mouvement\u00E9s lima.common.next=Suivant lima.common.ok=OK lima.common.paste=Coller lima.common.print= lima.common.quit=Quitter lima.common.remove=Supprimer +lima.common.search=Rechercher lima.common.update=Modifier lima.config.category.directories=R\u00E9pertoires lima.config.category.directories.description=R\u00E9pertoires utilis\u00E9s par Lima