Author: tchemit Date: 2009-11-06 02:00:03 +0100 (Fri, 06 Nov 2009) New Revision: 1635 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties Log: add hidor on ListSelector (must finish the ui refresh, still problems) Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/HidorButton.jaxx 2009-11-06 01:00:03 UTC (rev 1635) @@ -22,7 +22,7 @@ boolean newValue = (Boolean) evt.getNewValue(); if (target != null) { target.setVisible(newValue); - }; + } } }); Modified: branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/java/jaxx/runtime/swing/ListSelectorUI.jaxx 2009-11-06 01:00:03 UTC (rev 1635) @@ -1,5 +1,8 @@ <JPanel layout='{new BorderLayout()}' genericType='B'> + <!-- show hidor property --> + <Boolean id='showHidor' javaBean='false'/> + <Boolean id='modified' javaBean='false'/> <String id='addToListTip' javaBean='"+"'/> @@ -7,9 +10,30 @@ <String id='addToComboTip' javaBean='"-"'/> <ListCellRenderer id='renderer' javaBean='null'/> - + <script><![CDATA[ +hidor.addPropertyChangeListener("targetVisible", new PropertyChangeListener() { + + @Override + public void propertyChange(PropertyChangeEvent evt) { + if (log.isDebugEnabled()) { + log.debug("target visible changed <" + evt.getOldValue() + ":" + evt.getNewValue() + ">"); + } + if (!showHidor || !isEnabled()) { + return; + } + SwingUtilities.invokeLater(new Runnable() { + + @Override + public void run() { + log.info("invalidate " + getParent().getName()); + listPane.invalidate(); + } + }); + } +}); + /** * @return the datas from the combo box. */ @@ -112,17 +136,19 @@ ]]> </script> - <JScrollPane constraints='BorderLayout.CENTER' - columnHeaderView='{header}' - verticalScrollBarPolicy='vertical_scrollbar_always' - minimumSize='{SwingUtil.newMinDimension()}'> - <JList id='list' - enabled='{isEnabled()}' - model='{new DefaultListModel()}' - minimumSize='{SwingUtil.newMinDimension()}' - maximumSize='{new Dimension(100,200)}' - font-size='11' - cellRenderer='{getRenderer()}'/> + <JScrollPane id='listPane' constraints='BorderLayout.CENTER' + columnHeaderView='{header}'> + <!--minimumSize='{SwingUtil.newMinDimension()}'>--> + <!--verticalScrollBarPolicy='vertical_scrollbar_always'--> + <JPanel layout="{new BorderLayout()}" minimumSize='{getMinimumSize()}'> + <JList id='list' + constraints='BorderLayout.CENTER' + enabled='{isEnabled()}' + model='{new DefaultListModel()}' + font-size='11' + cellRenderer='{getRenderer()}'/> + </JPanel> + </JScrollPane> <Table id="header" insets='0' constraints='BorderLayout.SOUTH'> @@ -133,7 +159,7 @@ renderer='{getRenderer()}'/> </cell> <cell anchor='east'> - <JToolBar floatable='false'> + <JToolBar id='actions' floatable='false'> <JButton id="add" toolTipText='{getAddToListTip()}' actionIcon='add' @@ -145,6 +171,14 @@ actionIcon='remove' enabled='{updateRemoveEnabled(list.isEnabled() && list.getSelectedIndex() > -1)}' onActionPerformed='transfertToCombo((B) list.getSelectedValue());'/> + + <HidorButton id="hidor" + target='{list}' + visible='{isShowHidor()}' + enabled='{isEnabled()}' + collapseTip='{_("listSelector.hideList")}' + expandTip='{_("listSelector.showList")}' + targetVisible='{true}'/> </JToolBar> </cell> </row> Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-en_GB.properties 2009-11-06 01:00:03 UTC (rev 1635) @@ -52,6 +52,8 @@ i18neditor.popup.title=Change language i18neditor.selected=Selected language \: %1$s i18neditor.unselected=Select this langage \: %1$s +listSelector.hideList=Hide the list +listSelector.showList=Show the list memorywidget.memory=%d/%dMb numbereditor..=. numbereditor.0=0 Modified: branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties =================================================================== --- branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-05 22:25:07 UTC (rev 1634) +++ branches/jaxx-2.X/jaxx-widgets/src/main/resources/i18n/jaxx-widgets-fr_FR.properties 2009-11-06 01:00:03 UTC (rev 1635) @@ -54,6 +54,8 @@ i18neditor.popup.title=Changer de langue i18neditor.selected=Langue actuellement utilis\u00E9e \: %1$s i18neditor.unselected=Pour utiliser cette langue \: %1$s +listSelector.hideList=Cacher la liste +listSelector.showList=Afficher la liste memorywidget.memory=%d/%dMo numbereditor..=. numbereditor.0=0