Author: mallon Date: 2012-07-20 14:24:05 +0200 (Fri, 20 Jul 2012) New Revision: 3546 Url: http://chorem.org/repositories/revision/lima/3546 Log: fixes #707 Suppression des anciens labels faisant office de titres, ajout de panels avec titres, et diminution de la place prise par chacune des fonctionnalit?\195?\169s. Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx Modified: trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx =================================================================== --- trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-20 12:07:10 UTC (rev 3545) +++ trunk/lima-swing/src/main/java/org/chorem/lima/ui/lettering/LetteringView.jaxx 2012-07-20 12:24:05 UTC (rev 3546) @@ -9,21 +9,22 @@ %% 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 + 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 + + 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% --> -<Table> +<Table constraints='BorderLayout.NORTH'> + <import> org.chorem.lima.ui.common.AccountComboBoxModel org.chorem.lima.ui.common.FinancialPeriodComboBoxModel @@ -33,7 +34,7 @@ org.chorem.lima.beans.LetteringFilter org.chorem.lima.beans.LetteringFilterImpl </import> - + <LetteringViewHandler id="handler" constructorParams="this"/> <LetteringTableModel id="tableModel"/> @@ -43,63 +44,57 @@ <LettringSelectionModel id='lettringSelectionModel' constructorParams=' tableModel' onValueChanged="handler.balanceAndActions()"/> - <script><![CDATA[ + <script> + <![CDATA[ void $afterCompleteSetup() { handler.init(); } - ]]></script> + ]]> + </script> <row> - <cell anchor="center" weightx="1" columns="2"> - <JLabel text="lima.ui.lettering.account" labelFor='{panelAccountComboBox}'/> + <cell> + <JPanel layout='{new BorderLayout()}' id="panelAccountComboBox" border='{new TitledBorder(_("lima.ui.lettering.account"))}'> + <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> + <JComboBox id="accountComboBox" model="{accountComboBoxModel}" + renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" + onActionPerformed="filterModel.setAccount((Account)accountComboBoxModel.getSelectedItem())" + constraints='BorderLayout.WEST'/> + <JButton id="backCount" text="lima.ui.account.buttonback" + onActionPerformed="handler.back(accountComboBox)" + constraints='BorderLayout.CENTER'/> + <JButton id="nextCount" text="lima.ui.account.buttonnext" + onActionPerformed="handler.next(accountComboBox)" + constraints='BorderLayout.EAST'/> + </JPanel> </cell> - <cell anchor="center" weightx="1"> - <JLabel text="lima.ui.lettering.period" labelFor='{panelFinancialPeriodComboBox}'/> - </cell> - <cell anchor="center" weightx="1"> - <JLabel text="lima.ui.lettering.entry" labelFor='{entryPanel}'/> - </cell> - </row> - <row> - <cell anchor="center" weightx="1" columns="2"> - <JPanel id="panelAccountComboBox"> - <org.chorem.lima.ui.common.AccountComboBoxModel id="accountComboBoxModel"/> - <JComboBox id="accountComboBox" model="{accountComboBoxModel}" - renderer="{new org.chorem.lima.ui.common.AccountListRenderer()}" - onActionPerformed="filterModel.setAccount((Account)accountComboBoxModel.getSelectedItem())"/> - <JButton id="backCount" text="lima.ui.account.buttonback" - onActionPerformed="handler.back(accountComboBox)"/> - <JButton id="nextCount" text="lima.ui.account.buttonnext" - onActionPerformed="handler.next(accountComboBox)"/> - </JPanel> - </cell> - <cell anchor="center" weightx="1"> - <JPanel id="panelFinancialPeriodComboBox"> - <Table> + <cell> + <JPanel id="panelFinancialPeriodComboBox" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.period"))}'> + <Table constraints='BorderLayout.NORTH'> <row> <cell> - <JLabel text="lima.ui.lettering.beginFinancialPeriod"/> - </cell> + <JLabel text="lima.ui.lettering.beginFinancialPeriod"/> + </cell> <cell> - <JXDatePicker id="pickerDebut" - onActionPerformed="filterModel.setDateStart(pickerDebut.getDate())"/> + <JXDatePicker id="pickerDebut" + onActionPerformed="filterModel.setDateStart(pickerDebut.getDate())"/> </cell> </row> <row> <cell> - <JLabel text="lima.ui.lettering.endFinancialPeriod"/> + <JLabel text="lima.ui.lettering.endFinancialPeriod"/> </cell> <cell> - <JXDatePicker id="pickerFin" - onActionPerformed="filterModel.setDateEnd(pickerFin.getDate())"/> + <JXDatePicker id="pickerFin" + onActionPerformed="filterModel.setDateEnd(pickerFin.getDate())"/> </cell> </row> </Table> - </JPanel> + </JPanel> </cell> <cell anchor="center" weightx="1"> - <JPanel id="entryPanel"> - <Table> + <JPanel id="entryPanel" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.entry"))}'> + <Table constraints='BorderLayout.NORTH'> <row> <cell> <JRadioButton id="lettredEntryCheckBox" buttonGroup="letteredCheckGroup" @@ -107,16 +102,16 @@ </cell> <cell> <JLabel text="lima.ui.lettering.checkLettredEntry"/> - </cell> + </cell> </row> <row> <cell> <JRadioButton id="noLettredEntryCheckBox" selected="true" buttonGroup="letteredCheckGroup" onActionPerformed="filterModel.setDisplayUnlettred(true) ; filterModel.setDisplayLettered(false)"/> - </cell> + </cell> <cell> <JLabel text="lima.ui.lettering.checkNoLettredEntry"/> - </cell> + </cell> </row> <row> <cell> @@ -127,67 +122,62 @@ <JLabel text="lima.ui.lettering.checkAll"/> </cell> </row> - </Table> + </Table> </JPanel> </cell> </row> - <row> - <cell anchor="center" weightx="0.25"> - <JLabel/> - </cell> - <cell anchor="center" weightx="0.25"> - <JLabel text="lima.ui.lettering.selectDebit" labelFor='{debitTexttField}'/> - </cell> - <cell anchor="center" weightx="0.25"> - <JLabel text="lima.ui.lettering.selectCredit" labelFor='{creditTextField}'/> - </cell> - <cell anchor="center" weightx="0.25"> - <JLabel text="lima.ui.lettering.selectSolde" labelFor='{soldeTextField}'/> - </cell> - </row> - <row> - <cell anchor='center' weightx="0.25"> - <JLabel text="lima.ui.lettering.selectEntry"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JTextField id="debitTexttField" editable="false" text="{editModel.getDebit().toString()}" - focusable="false"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JTextField id="creditTextField" editable="false" text="{editModel.getCredit().toString()}" - focusable="false"/> - </cell> - <cell fill="horizontal" weightx="0.25"> - <JTextField id="soldeTextField" editable="false" text="{editModel.getSolde().toString()}" - focusable="false"/> - </cell> - </row> <row> - <cell anchor="center" columns='4'> - <JLabel text="lima.ui.lettering.actions" labelFor='{actionsPanel}'/> - </cell> + <cell fill="horizontal" columns="4"> + <JPanel id="selectedEntry" layout='{new BorderLayout()}' border='{new TitledBorder(_("lima.ui.lettering.selectEntry"))}'> + <Table constraints='BorderLayout.NORTH'> + <row> + <cell anchor="center" weightx="0.6"> + <JLabel text="lima.ui.lettering.selectDebit" labelFor='{debitTexttField}'/> + </cell> + <cell fill="horizontal" weightx="0.6"> + <JTextField id="debitTexttField" editable="false" text="{editModel.getDebit().toString()}" + focusable="false"/> + </cell> + <cell anchor="center" weightx="0.6"> + <JLabel text="lima.ui.lettering.selectCredit" labelFor='{creditTextField}'/> + </cell> + <cell fill="horizontal" weightx="0.6"> + <JTextField id="creditTextField" editable="false" text="{editModel.getCredit().toString()}" + focusable="false"/> + </cell> + <cell anchor="center" weightx="0.6"> + <JLabel text="lima.ui.lettering.selectSolde" labelFor='{soldeTextField}'/> + </cell> + <cell fill="horizontal" weightx="0.6"> + <JTextField id="soldeTextField" editable="false" text="{editModel.getSolde().toString()}" + focusable="false"/> + </cell> + </row> + </Table> + </JPanel> + </cell> </row> <row> <cell anchor="center" columns='4'> <JPanel id="actionsPanel"> - <JButton id="lettered" text="lima.ui.lettering.buttonLettered" + <JButton id="lettered" text="lima.ui.lettering.buttonLettered" enabled="{editModel.isLettred()}" onActionPerformed="handler.addLetter()"/> - <JButton id="noLettered" text="lima.ui.lettering.buttonNoLettered" + <JButton id="noLettered" text="lima.ui.lettering.buttonNoLettered" enabled="{editModel.isUnLettred()}" onActionPerformed="handler.removeLetter()"/> </JPanel> </cell> </row> <row> - <cell fill="both" weightx="1" weighty="1" columns="4"> - <JScrollPane> - <LetteringTable - id="table" sortable="false" rowHeight="22" - constructorParams="getTableModel()" - selectionModel="{lettringSelectionModel}" - /> - </JScrollPane> - </cell> + <cell fill="both" weightx="1" weighty="1" columns="4"> + <JScrollPane> + <LetteringTable + id="table" sortable="false" rowHeight="22" + constructorParams="getTableModel()" + selectionModel="{lettringSelectionModel}" + /> + </JScrollPane> + </cell> </row> </Table> \ No newline at end of file