Author: chatellier Date: 2010-06-17 08:26:59 +0000 (Thu, 17 Jun 2010) New Revision: 3060 Log: Remove titleBorder to reduce stategies insets Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2010-06-16 14:19:31 UTC (rev 3059) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyMonthInfoUI.jaxx 2010-06-17 08:26:59 UTC (rev 3060) @@ -51,66 +51,66 @@ <JPanel id='body' layout='{new BorderLayout()}'> <Table constraints='BorderLayout.CENTER'> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJanuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.january")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.january"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyFebuary' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.february")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.february"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMarch' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.march")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.march"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyApril' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.april")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.april"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyMay' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.may")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.may"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJune' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.june")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.june"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyJuly' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.july")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.july"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyAugust' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.august")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.august"))}' /> </cell> </row> <row> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategySeptember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.september")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.september"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyOctober' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.october")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.october"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyNovember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.november")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.november"))}' /> </cell> - <cell fill='both' weightx='0.25' weighty='0.3' insets='0'> + <cell fill='both' weightx='1' weighty='1' insets='0'> <StrategyOneMonthInfoUI id='strategyDecember' constructorParams='this' - border='{BorderFactory.createTitledBorder(StringUtils.capitalize(_("isisfish.month.december")))}' /> + strategieMonthText='{StringUtils.capitalize(_("isisfish.month.december"))}' /> </cell> </row> </Table> <Table constraints='BorderLayout.SOUTH'> <row> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='save' decorator='boxed'/> </cell> - <cell fill='horizontal' weightx='0.5'> + <cell fill='horizontal' weightx='1'> <JButton id='cancel' decorator='boxed'/> </cell> </row> Modified: isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx =================================================================== --- isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-06-16 14:19:31 UTC (rev 3059) +++ isis-fish/trunk/src/main/java/fr/ifremer/isisfish/ui/input/StrategyOneMonthInfoUI.jaxx 2010-06-17 08:26:59 UTC (rev 3060) @@ -20,6 +20,8 @@ <fr.ifremer.isisfish.ui.input.InputContentUI> + <String id="strategieMonthText" javaBean='null'/> + <!-- bean property --> <fr.ifremer.isisfish.entities.StrategyImpl id='bean' javaBean='null'/> @@ -108,7 +110,7 @@ <Table id='body'> <row> <cell columns='2' fill='horizontal' weightx='1.0' anchor='west'> - <JLabel id='StrategieMonth' enabled='{isActif()}'/> + <JLabel enabled='{isActif()}' text="{getStrategieMonthText()}" font-weight="bold"/> </cell> </row> <row>