Author: sbavencoff Date: 2014-07-23 10:52:27 +0200 (Wed, 23 Jul 2014) New Revision: 3856 Url: http://forge.chorem.org/projects/lima/repository/revisions/3856 Log: refs #974 : change filter view Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/ConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.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 Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -31,7 +31,6 @@ import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; -import javax.swing.*; import java.awt.event.ItemEvent; /** @@ -74,7 +73,7 @@ } @Override - public JComponent getView() { + public AccountConditionView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/AccountCondition/AccountConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,10 +22,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> +<JInternalFrame title="lima.ui.financialtransaction.account" + preferredSize="{new Dimension(400, 100)}" + onInternalFrameClosed="handler.delete()" + layout="{new FlowLayout()}"> -<Table> <import> java.awt.Dimension + java.awt.FlowLayout javax.swing.ListSelectionModel javax.swing.text.Document javax.swing.DefaultComboBoxModel @@ -38,21 +42,11 @@ <org.chorem.lima.ui.combobox.AccountComboBoxModel id="accountModel" /> - <row> - <cell> - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.ui.financialtransaction.account"/> - </cell> - <cell weightx="1" anchor="west"> - <JComboBox id="account" - model="{accountModel}" - renderer="{new AccountListRenderer()}" - selectedItem="{handler.getAccount()}" - onItemStateChanged="handler.accountSelected(event)"/> - </cell> - </row> -</Table> \ No newline at end of file + <JComboBox id="account" + preferredSize="{new Dimension(390, 30)}" + model="{accountModel}" + renderer="{new AccountListRenderer()}" + selectedItem="{handler.getAccount()}" + onItemStateChanged="handler.accountSelected(event)"/> + +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/BigDecimalConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,10 +22,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()" + layout="{new FlowLayout()}"> <import> java.awt.Dimension + java.awt.FlowLayout javax.swing.ListSelectionModel javax.swing.text.Document javax.swing.DefaultComboBoxModel @@ -38,35 +42,22 @@ <BigDecimalConditionHandler id="handler" javaBean="new BigDecimalConditionHandler(this)"/> - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel id="label" text=""/> - </cell> - <cell> - <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(AbstractBigDecimalCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" - onItemStateChanged="handler.operandSelected(event)"/> - </cell> - <cell weightx="1" anchor="west"> - <NumberEditor id="bigDecimaleditor" - constructorParams="this" - bean="{handler}" - model="{handler.getValue()}" - property="value" - modelType="{BigDecimal.class}" - numberPattern="([1-9]\d*|0)(\.\d*)?" - useFloat="true" - useSign="false" - autoPopup="false" - showPopupButton="false" - showReset="false"/> - </cell> - </row> -</Table> \ No newline at end of file + + <JComboBox id="operandComboBox" + model="{new DefaultComboBoxModel(AbstractBigDecimalCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" + selectedItem="{handler.getOperand()}" + onItemStateChanged="handler.operandSelected(event)"/> + <NumberEditor id="bigDecimaleditor" + constructorParams="this" + bean="{handler}" + model="{handler.getValue()}" + property="value" + modelType="{BigDecimal.class}" + numberPattern="([1-9]\d*|0)(\.\d*)?" + useFloat="true" + useSign="false" + autoPopup="false" + showPopupButton="false" + showReset="false"/> +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/CreditConditionView.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,7 +34,7 @@ public CreditConditionView() { super(); setHandler(new CreditConditionHandler(this)); - getLabel().setText(t("lima.ui.financialtransaction.credit")); + setTitle(t("lima.ui.financialtransaction.credit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/BigDecimalCondition/DebitConditionView.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,7 +34,7 @@ public DebitConditionView() { super(); setHandler(new DebitConditionHandler(this)); - getLabel().setText(t("lima.ui.financialtransaction.debit")); + setTitle(t("lima.ui.financialtransaction.debit")); getBigDecimaleditor().setBean(handler); getBigDecimaleditor().init(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/ConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/ConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/ConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -36,7 +36,7 @@ public Condition getCondition(); - public JComponent getView(); + public JInternalFrame getView(); public void setFilterHandler(FinancialTransactionConditionHandler filterHandler); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,7 +34,6 @@ import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; -import javax.swing.JComponent; import javax.swing.JList; import javax.swing.event.ListSelectionEvent; import java.util.List; @@ -63,7 +62,7 @@ } @Override - public JComponent getView() { + public EntryBookConditionView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/EntryBookCondition/EntryBookConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,8 +22,9 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="lima.enum.list.entryBook" + preferredSize="{new Dimension(400, 100)}" + onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension javax.swing.ListSelectionModel @@ -32,25 +33,12 @@ </import> <EntryBookConditionHandler id="handler" javaBean="new EntryBookConditionHandler(this)"/> - - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.enum.list.entryBook"/> - </cell> - <cell weightx="1" anchor="west"> - <JScrollPane preferredSize="{new Dimension(300, 60)}" minimumSize="{new Dimension(300, 60)}"> - <JList id="entryBookList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getEntryBookList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(EntryBook.class)}" - onValueChanged="handler.setEntryBook(event)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + <JScrollPane > + <JList id="entryBookList" + selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + visibleRowCount="-1" + listData="{handler.getEntryBookList()}" + cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(EntryBook.class)}" + onValueChanged="handler.setEntryBook(event)"/> + </JScrollPane> +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/DescriptionConditionView.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,6 +34,6 @@ public DescriptionConditionView() { super(); setHandler(new DescriptionConditionHandler(this)); - getLabel().setText(t("lima.ui.financialtransaction.description")); + setTitle(t("lima.ui.financialtransaction.description")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/LetteringConditionView.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,6 +34,6 @@ public LetteringConditionView() { super(); setHandler(new LetteringConditionHandler(this)); - getLabel().setText(t("lima.ui.financialtransaction.letter")); + setTitle(t("lima.ui.financialtransaction.letter")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/StringConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,10 +22,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="lima.filter.date.window" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()" + layout="{new FlowLayout(FlowLayout.CENTER, 0, 0)}"> <import> java.awt.Dimension + java.awt.FlowLayout javax.swing.ListSelectionModel javax.swing.text.Document javax.swing.DefaultComboBoxModel @@ -35,33 +39,16 @@ <StringConditionHandler id="handler" javaBean="new StringConditionHandler(this)"/> - - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel id="label" text=""/> - </cell> - <cell> - <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(AbstractStringCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" - onItemStateChanged="handler.operandSelected(event)"/> - </cell> - <cell> - <JTextField id="textField" - text="{handler.getText()}" - onKeyReleased="handler.setText(event)" /> - </cell> - <cell weightx="1" anchor="west"> - <JCheckBox id="sensitiveCaseCheckBox" - text="lima.filer.condition.sensitive.case" - selected="{handler.isSensitiveCase()}" - onActionPerformed="handler.setSensitiveCase(event)" /> - </cell> - </row> -</Table> \ No newline at end of file + <JComboBox id="operandComboBox" + model="{new DefaultComboBoxModel(AbstractStringCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" + selectedItem="{handler.getOperand()}" + onItemStateChanged="handler.operandSelected(event)"/> + <JTextField id="textField" + text="{handler.getText()}" + onKeyReleased="handler.setText(event)" /> + <JCheckBox id="sensitiveCaseCheckBox" + text="lima.filer.condition.sensitive.case" + selected="{handler.isSensitiveCase()}" + onActionPerformed="handler.setSensitiveCase(event)" /> +</JInternalFrame> Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/StringCondition/VoucherConditionView.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,7 +34,7 @@ public VoucherConditionView() { super(); setHandler(new VoucherConditionHandler(this)); - getLabel().setText(t("lima.ui.financialtransaction.voucher")); + setTitle(t("lima.ui.financialtransaction.voucher")); } } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateCondition/DateConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,10 +22,14 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="lima.ui.financialtransaction.date" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()" + layout="{new FlowLayout()}"> <import> java.awt.Dimension + java.awt.FlowLayout javax.swing.ListSelectionModel javax.swing.text.Document javax.swing.DefaultComboBoxModel @@ -35,27 +39,13 @@ <DateConditionHandler id="handler" javaBean="new DateConditionHandler(this)"/> - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.ui.financialtransaction.date"/> - </cell> - <cell> - <JComboBox id="operandComboBox" - model="{new DefaultComboBoxModel(DateCondition.Operand.values())}" - renderer="{new LabelListCellRenderer()}" - selectedItem="{handler.getOperand()}" - onItemStateChanged="handler.operandSelected(event)"/> - </cell> - <cell weightx="1" anchor="west"> - <JAXXDatePicker id='datePicker' - date='{handler.getDate()}' - formats='{handler.getFormats()}' - onActionPerformed='handler.setDate(datePicker.getDate())'/> - </cell> - </row> -</Table> \ No newline at end of file + <JComboBox id="operandComboBox" + model="{new DefaultComboBoxModel(DateCondition.Operand.values())}" + renderer="{new LabelListCellRenderer()}" + selectedItem="{handler.getOperand()}" + onItemStateChanged="handler.operandSelected(event)"/> + <JAXXDatePicker id='datePicker' + date='{handler.getDate()}' + formats='{handler.getFormats()}' + onActionPerformed='handler.setDate(datePicker.getDate())'/> +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -32,7 +32,6 @@ import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; import org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler; -import javax.swing.*; import java.text.DateFormat; import java.text.SimpleDateFormat; import java.util.Date; @@ -63,7 +62,7 @@ } @Override - public JComponent getView() { + public DateIntervalConditionView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/dateIntervalCondition/DateIntervalConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -23,7 +23,10 @@ #L% --> -<Table> +<JInternalFrame title="lima.ui.financialtransaction.dateInterval" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension javax.swing.ListSelectionModel @@ -33,30 +36,28 @@ </import> <DateIntervalConditionHandler id="handler" javaBean="new DateIntervalConditionHandler(this)"/> - - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.ui.financialtransaction.date.in"/> - </cell> - <cell> - <JAXXDatePicker id='beginDatePicker' - date='{handler.getBeginDate()}' - formats='{handler.getFormats()}' - onActionPerformed='handler.setBeginDate(beginDatePicker.getDate())'/> - </cell> - <cell> - <JLabel text="lima.ui.financialtransaction.date.to"/> - </cell> - <cell weightx="1" anchor="west"> - <JAXXDatePicker id='endDatePicker' - date='{handler.getEndDate()}' - formats='{handler.getFormats()}' - onActionPerformed='handler.setEndDate(endDatePicker.getDate())'/> - </cell> - </row> -</Table> \ No newline at end of file + <Table> + <row> + <cell> + <JLabel text="lima.ui.financialtransaction.dateInterval.in"/> + </cell> + <cell> + <JAXXDatePicker id='beginDatePicker' + date='{handler.getBeginDate()}' + formats='{handler.getFormats()}' + onActionPerformed='handler.setBeginDate(beginDatePicker.getDate())'/> + </cell> + </row> + <row> + <cell> + <JLabel text="lima.ui.financialtransaction.dateInterval.to"/> + </cell> + <cell> + <JAXXDatePicker id='endDatePicker' + date='{handler.getEndDate()}' + formats='{handler.getFormats()}' + onActionPerformed='handler.setEndDate(endDatePicker.getDate())'/> + </cell> + </row> + </Table> +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -35,7 +35,6 @@ import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; import org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler; -import javax.swing.JComponent; import javax.swing.JList; import javax.swing.event.ListSelectionEvent; import java.util.List; @@ -66,7 +65,7 @@ } @Override - public JComponent getView() { + public FinancialPeriodConditionView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialPeriodCondition/FinancialPeriodConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,8 +22,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="lima.enum.comboboxperiod.financialperiod" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension javax.swing.ListSelectionModel @@ -33,24 +35,12 @@ <FinancialPeriodConditionHandler id="handler" javaBean="new FinancialPeriodConditionHandler(this)"/> - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.enum.comboboxperiod.financialperiod"/> - </cell> - <cell weightx="1" anchor="west"> - <JScrollPane preferredSize="{new Dimension(250, 80)}" minimumSize="{new Dimension(250, 80)}"> - <JList id="financialPeriodList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getFinancialPeriodList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class)}" - onValueChanged="handler.setFinancialPeriod(event)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + <JScrollPane> + <JList id="financialPeriodList" + selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + visibleRowCount="-1" + listData="{handler.getFinancialPeriodList()}" + cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FinancialPeriod.class)}" + onValueChanged="handler.setFinancialPeriod(event)"/> + </JScrollPane> +</JInternalFrame> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -32,6 +32,7 @@ import org.chorem.lima.ui.financialtransactionsearch.FinancialTransactionSearchViewHandler; import javax.swing.*; +import java.beans.PropertyVetoException; import java.util.List; /** @@ -73,8 +74,13 @@ // add view if (add) { JPanel conditionPanel = view.getConditionPanel(); - JComponent conditionView = conditionHandler.getView(); + JInternalFrame conditionView = conditionHandler.getView(); conditionPanel.add(conditionView); + try { + conditionView.setSelected(true); + } catch (PropertyVetoException e) { + + } conditionPanel.validate(); conditionPanel.repaint(); } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/financialTransactionCondition/FinancialTransactionConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -23,37 +23,27 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> java.awt.Dimension javax.swing.ListSelectionModel javax.swing.text.Document - javax.swing.BoxLayout + java.awt.FlowLayout </import> <FinancialTransactionConditionHandler id="handler" javaBean="new FinancialTransactionConditionHandler(this)"/> - <row> - <cell weightx="1" anchor="east"> - <JRadioButton text="lima.filter.condition.one" - id="AllRadioButton" - onActionPerformed="handler.setAllConditions(false)" - buttonGroup="radioButtons" - selected="{!handler.isAllConditions()}"/> - </cell> - <cell weightx="0" > - <JRadioButton text="lima.filter.condition.all" - id="OneRadioButton" - onActionPerformed="handler.setAllConditions(true)" - buttonGroup="radioButtons" - selected="{handler.isAllConditions()}"/> - </cell> - </row> - <row> - <cell fill="both" weightx="1" columns="2" anchor="west"> - <JPanel id="conditionPanel" - layout="{new BoxLayout(conditionPanel, BoxLayout.PAGE_AXIS)}"> - </JPanel> - </cell> - </row> -</Table> \ No newline at end of file + <JPanel constraints="BorderLayout.NORTH"> + <JRadioButton text="lima.filter.condition.one" + id="AllRadioButton" + onActionPerformed="handler.setAllConditions(false)" + buttonGroup="radioButtons" + selected="{!handler.isAllConditions()}"/> + <JRadioButton text="lima.filter.condition.all" + id="OneRadioButton" + onActionPerformed="handler.setAllConditions(true)" + buttonGroup="radioButtons" + selected="{handler.isAllConditions()}"/> + </JPanel> + <JPanel id="conditionPanel" constraints="BorderLayout.CENTER" layout="{new FlowLayout(FlowLayout.LEADING, 0, 0)}"/> +</JPanel> \ No newline at end of file Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionHandler.java 2014-07-23 08:52:27 UTC (rev 3856) @@ -34,7 +34,6 @@ import org.chorem.lima.ui.Filter.ConditionHandler; import org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionHandler; -import javax.swing.JComponent; import javax.swing.JList; import javax.swing.event.ListSelectionEvent; import java.util.List; @@ -64,7 +63,7 @@ } @Override - public JComponent getView() { + public FiscalPeriodConditionView getView() { return view; } Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/Filter/fiscalPeriodCondition/FiscalPeriodConditionView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -22,8 +22,10 @@ <http://www.gnu.org/licenses/gpl-3.0.html>. #L% --> - -<Table> +<JInternalFrame title="lima.enum.comboboxperiod.fiscalperiod" + preferredSize="{new Dimension(200, 100)}" + minimumSize="{new Dimension(200, 100)}" + onInternalFrameClosed="handler.delete()"> <import> java.awt.Dimension javax.swing.ListSelectionModel @@ -33,24 +35,13 @@ <FiscalPeriodConditionHandler id="handler" javaBean="new FiscalPeriodConditionHandler(this)"/> - <row> - <cell > - <JButton toolTipText="lima.filter.condition.delete" - actionIcon='remove-condition' - onActionPerformed="handler.delete()" /> - </cell> - <cell> - <JLabel text="lima.enum.comboboxperiod.fiscalperiod"/> - </cell> - <cell weightx="1" anchor="west"> - <JScrollPane preferredSize="{new Dimension(250, 80)}" minimumSize="{new Dimension(250, 80)}"> - <JList id="fiscalPeriodList" - selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" - visibleRowCount="-1" - listData="{handler.getFiscalPeriodList()}" - cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class)}" - onValueChanged="handler.setFiscalPeriod(event)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + + <JScrollPane > + <JList id="fiscalPeriodList" + selectionMode="{ListSelectionModel.MULTIPLE_INTERVAL_SELECTION}" + visibleRowCount="-1" + listData="{handler.getFiscalPeriodList()}" + cellRenderer="{LimaRendererUtil.newDecoratorListCellRenderer(FiscalPeriod.class)}" + onValueChanged="handler.setFiscalPeriod(event)"/> + </JScrollPane> +</JInternalFrame> \ No newline at end of file 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 2014-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/financialtransactionsearch/FinancialTransactionSearchView.jaxx 2014-07-23 08:52:27 UTC (rev 3856) @@ -23,11 +23,12 @@ #L% --> -<Table> +<JPanel layout="{new BorderLayout()}"> <import> java.awt.Dimension javax.swing.ListSelectionModel javax.swing.text.Document + javax.swing.ScrollPaneConstants org.chorem.lima.ui.Filter.financialTransactionCondition.FinancialTransactionConditionView org.chorem.lima.enums.ComboBoxPeriodEnum org.chorem.lima.enums.ComboBoxAccountsEnum @@ -45,79 +46,71 @@ javaBean="new FinancialTransactionSearchViewHandler(this)"/> <Boolean id="selectedRow" javaBean="false"/> <Dimension id="fieldSize" javaBean="new java.awt.Dimension()"/> - <row> - <cell fill="both"> - <JToolBar floatable="false"> - <JButton toolTipText="lima.filter.date.one" - actionIcon='filter-transaction-date' - onActionPerformed="getHandler().addDateCondition()"/> - <JButton toolTipText="lima.filter.date.interval" - actionIcon='filter-transaction-interval' - onActionPerformed="getHandler().addDateIntervalCondition()"/> - <JButton toolTipText="lima.filter.date.financial.period" - actionIcon='filter-transaction-financial-period' - onActionPerformed="getHandler().addFinancialPeriodCondition()"/> - <JButton toolTipText="lima.filter.date.fiscal.period" - actionIcon='filter-transaction-fiscal-period' - onActionPerformed="getHandler().addFiscalPeriodCondition()"/> + <JToolBar floatable="false" constraints="BorderLayout.NORTH"> + <JButton toolTipText="lima.filter.date.one" + actionIcon='filter-transaction-date' + onActionPerformed="getHandler().addDateCondition()"/> + <JButton toolTipText="lima.filter.date.interval" + actionIcon='filter-transaction-interval' + onActionPerformed="getHandler().addDateIntervalCondition()"/> + <JButton toolTipText="lima.filter.date.financial.period" + actionIcon='filter-transaction-financial-period' + onActionPerformed="getHandler().addFinancialPeriodCondition()"/> + <JButton toolTipText="lima.filter.date.fiscal.period" + actionIcon='filter-transaction-fiscal-period' + onActionPerformed="getHandler().addFiscalPeriodCondition()"/> - <JToolBar.Separator/> + <JToolBar.Separator/> - <JButton toolTipText="lima.filter.entrybook" - actionIcon='filter-transaction-entrybook' - onActionPerformed="getHandler().addEntryBookCondition()"/> + <JButton toolTipText="lima.filter.entrybook" + actionIcon='filter-transaction-entrybook' + onActionPerformed="getHandler().addEntryBookCondition()"/> - <JToolBar.Separator/> + <JToolBar.Separator/> - <JButton toolTipText="lima.filter.voucher" - actionIcon='filter-transaction-voucher' - onActionPerformed="getHandler().addVoucherCondition()"/> - <JButton toolTipText="lima.filter.account" - actionIcon='filter-transaction-account' - onActionPerformed="getHandler().addAccountCondition()"/> - <JButton toolTipText="lima.filter.description" - actionIcon='filter-transaction-description' - onActionPerformed="getHandler().addDescriptionCondition()"/> - <JButton toolTipText="lima.filter.letter" - actionIcon='filter-transaction-letter' - onActionPerformed="getHandler().addLetteringCondition()"/> + <JButton toolTipText="lima.filter.voucher" + actionIcon='filter-transaction-voucher' + onActionPerformed="getHandler().addVoucherCondition()"/> + <JButton toolTipText="lima.filter.account" + actionIcon='filter-transaction-account' + onActionPerformed="getHandler().addAccountCondition()"/> + <JButton toolTipText="lima.filter.description" + actionIcon='filter-transaction-description' + onActionPerformed="getHandler().addDescriptionCondition()"/> + <JButton toolTipText="lima.filter.letter" + actionIcon='filter-transaction-letter' + onActionPerformed="getHandler().addLetteringCondition()"/> - <JToolBar.Separator/> + <JToolBar.Separator/> - <JButton toolTipText="lima.filter.debit" - actionIcon='filter-transaction-debit' - onActionPerformed="getHandler().addDebitCondition()"/> - <JButton toolTipText="lima.filter.credit" - actionIcon='filter-transaction-credit' - onActionPerformed="getHandler().addCreditCondition()"/> - <JToolBar.Separator/> - <JButton toolTipText="{ t("lima.ui.common.refresh") + " (F5)"}" actionIcon='refresh' - onActionPerformed="getHandler().refresh()"/> - </JToolBar> - </cell> - </row> + <JButton toolTipText="lima.filter.debit" + actionIcon='filter-transaction-debit' + onActionPerformed="getHandler().addDebitCondition()"/> + <JButton toolTipText="lima.filter.credit" + actionIcon='filter-transaction-credit' + onActionPerformed="getHandler().addCreditCondition()"/> + <JToolBar.Separator/> + <JButton toolTipText="{ t("lima.ui.common.refresh") + " (F5)"}" actionIcon='refresh' + onActionPerformed="getHandler().refresh()"/> + </JToolBar> - <row> - <cell fill='both' weightx="1"> + <JSplitPane constraints="BorderLayout.CENTER" + orientation='{JSplitPane.VERTICAL_SPLIT}'> + <JScrollPane> <FinancialTransactionConditionView id="financialTransactionConditionView" /> - </cell> - </row> - - <row> - <cell fill="both" weightx="1" weighty="1"> - <JScrollPane> - <FinancialTransactionSearchTableModel - id="financialTransactionSearchTableModel"/> - <FinancialTransactionDefaultTable - id="financialTransactionSearchTable" - constructorParams='handler' - rowHeight="22" - model="{getFinancialTransactionSearchTableModel()}" - selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> - <ListSelectionModel - javaBean="getFinancialTransactionSearchTable().getSelectionModel()" - onValueChanged="setSelectedRow(financialTransactionSearchTable.getSelectedRow() != -1)"/> - </JScrollPane> - </cell> - </row> -</Table> \ No newline at end of file + </JScrollPane> + <JScrollPane> + <FinancialTransactionSearchTableModel + id="financialTransactionSearchTableModel"/> + <FinancialTransactionDefaultTable + id="financialTransactionSearchTable" + constructorParams='handler' + rowHeight="22" + model="{getFinancialTransactionSearchTableModel()}" + selectionMode="{ListSelectionModel.SINGLE_SELECTION}"/> + <ListSelectionModel + javaBean="getFinancialTransactionSearchTable().getSelectionModel()" + onValueChanged="setSelectedRow(financialTransactionSearchTable.getSelectedRow() != -1)"/> + </JScrollPane> + </JSplitPane> +</JPanel> \ 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-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_en_GB.properties 2014-07-23 08:52:27 UTC (rev 3856) @@ -236,6 +236,7 @@ lima.filter.date.fiscal.period= lima.filter.date.interval= lima.filter.date.one= +lima.filter.date.window= lima.filter.debit= lima.filter.description= lima.filter.entrybook= @@ -427,6 +428,9 @@ lima.ui.financialtransaction.date= lima.ui.financialtransaction.date.in= lima.ui.financialtransaction.date.to= +lima.ui.financialtransaction.dateInterval= +lima.ui.financialtransaction.dateInterval.in= +lima.ui.financialtransaction.dateInterval.to= lima.ui.financialtransaction.debit= lima.ui.financialtransaction.description= lima.ui.financialtransaction.entrybook= 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-07-22 13:36:55 UTC (rev 3855) +++ trunk/lima-swing/src/main/resources/i18n/lima-swing_fr_FR.properties 2014-07-23 08:52:27 UTC (rev 3856) @@ -220,6 +220,7 @@ lima.filter.date.fiscal.period=Ajouter un filtre sur l'exercice lima.filter.date.interval=Ajouter un filtre sur un interval de dates lima.filter.date.one=Ajouter un filtre sur une date +lima.filter.date.window= lima.filter.debit=Ajouter un filtre sur les débits lima.filter.description=Ajouter un filtre sur les descriptions lima.filter.entrybook=Ajouter un filtre sur les journaux @@ -404,8 +405,9 @@ lima.ui.financialtransaction.buttonnext=→ lima.ui.financialtransaction.credit=Crédit lima.ui.financialtransaction.date=Date -lima.ui.financialtransaction.date.in=Date du -lima.ui.financialtransaction.date.to=au +lima.ui.financialtransaction.dateInterval=Interval de dates +lima.ui.financialtransaction.dateInterval.in=Du +lima.ui.financialtransaction.dateInterval.to=au lima.ui.financialtransaction.debit=Débit lima.ui.financialtransaction.description=Description lima.ui.financialtransaction.entrybook=Journal