Author: tchemit Date: 2008-12-30 15:31:02 +0000 (Tue, 30 Dec 2008) New Revision: 1109 Added: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyle.css lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyleDemo.jaxx Removed: lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.css lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.jaxx Modified: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/Components.jaxx lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-en_GB.properties lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-fr_FR.properties lutinjaxx/branches/storm_1/jaxx-example/pom.xml Log: move LabelStyle example to Components example Modified: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/Components.jaxx =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/Components.jaxx 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/Components.jaxx 2008-12-30 15:31:02 UTC (rev 1109) @@ -12,7 +12,7 @@ ]]></script> <JSplitPane> - <!--JSplitPane dividerLocation='200'--> + <!--JSplitPane dividerLocation='200'--> <JScrollPane> <JTree id='list' showsRootHandles='true' onValueChanged='changePanel()' cellRenderer='{new javax.swing.tree.DefaultTreeCellRenderer() { @@ -59,12 +59,15 @@ <item value='{progressBarDemo}'/> - <item value='Validation'> - <item value='{validationDemo1}'/> - <item value='{validationDemo2}'/> + <item value='{labelStyleDemo}'/> + + <item value='New features'> + <item value='Validation'> + <item value='{validationDemo1}'/> + <item value='{validationDemo2}'/> + </item> + <item value='{dataBindingDemo}'/> </item> - - <item value='{dataBindingDemo}'/> </JTree> </JScrollPane> @@ -91,6 +94,7 @@ <ValidationListDemo id='validationDemo1' constraints='validationDemo1.getLabel()'/> <ValidationTableDemo id='validationDemo2' constraints='validationDemo2.getLabel()'/> <BeanDataBindingDemo id='dataBindingDemo' constraints='dataBindingDemo.getLabel()'/> + <LabelStyleDemo id='labelStyleDemo' constraints='labelStyleDemo.getLabel()'/> </JPanel> </JSplitPane> </Application> \ No newline at end of file Copied: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyle.css (from rev 1107, lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.css) =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyle.css (rev 0) +++ lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyle.css 2008-12-30 15:31:02 UTC (rev 1109) @@ -0,0 +1,34 @@ +JSlider { + paintTicks: true; +} + +JSlider.color { + minorTickSpacing: 10; + majorTickSpacing: 50; + border: { BorderFactory.createEmptyBorder(1, 1, 1, 1) }; +} + +JSlider.color:focused { + border: { BorderFactory.createLineBorder(Color.BLACK, 1) }; +} + +JSlider#red:focused { + background: #E7ADAD; +} + +JSlider#green:focused { + background: #B2E7AD; +} + +JSlider#blue:focused { + background: #ADB2E7; +} + +JSlider#dummySize { + minorTickSpacing: 2; + majorTickSpacing: 6; +} + +JRadioButton { + enabled: { backgroundCheckbox.isSelected() }; +} \ No newline at end of file Copied: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyleDemo.jaxx (from rev 1107, lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.jaxx) =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyleDemo.jaxx (rev 0) +++ lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/java/examples/Components/LabelStyleDemo.jaxx 2008-12-30 15:31:02 UTC (rev 1109) @@ -0,0 +1,64 @@ +<DemoPanel> + <style source="LabelStyle.css"/> + + <Table id='demoPanel' anchor='north' fill='both'> + <row> + <cell weightx='1' weighty='1' insets='6, 3, 0, 0'> + <Table anchor='west' fill='both'> + <row> + <cell><JLabel text='Text:'/></cell> + <cell weightx='1'><JTextField id='text' text='Data Binding'/></cell> + </row> + + <row> + <cell><JLabel text='Red:'/></cell> + <cell><JSlider id='red' value='128' maximum='255' styleClass='color'/></cell> + </row> + + <row> + <cell><JLabel text='Green:'/></cell> + <cell><JSlider id='green' value='0' maximum='255' styleClass='color'/></cell> + </row> + + <row> + <cell><JLabel text='Blue:'/></cell> + <cell><JSlider id='blue' value='255' maximum='255' styleClass='color'/></cell> + </row> + + <row> + <cell><JLabel text='Size:'/></cell> + <cell><JSlider id='dummySize' value='36' minimum='6' maximum='60'/></cell> + </row> + + <row> + <cell columns='2' fill='both' weighty='1'> + <JPanel border='{BorderFactory.createTitledBorder("Preview")}' + height='90' + layout='{new BorderLayout()}'> + <VBox background='{(Color)( backgroundCheckbox.isSelected() ? backgroundColor.getSelectedValue() : null)}' + margin='0' + horizontalAlignment='center' + verticalAlignment='middle'> + <JLabel text='{text.getText()}' font-size='{dummySize.getValue()}' foreground='{new Color(red.getValue(), green.getValue(), blue.getValue())}'/> + </VBox> + </JPanel> + </cell> + </row> + </Table> + </cell> + + <cell> + <VBox spacing='0' border='{BorderFactory.createTitledBorder("Background")}'> + <JCheckBox id='backgroundCheckbox' text='Show Background'/> + <JRadioButton text='Red' buttonGroup='backgroundColor' value='{Color.RED}' selected='true'/> + <JRadioButton text='Orange' buttonGroup='backgroundColor' value='{Color.ORANGE}'/> + <JRadioButton text='Yellow' buttonGroup='backgroundColor' value='{Color.YELLOW}'/> + <JRadioButton text='Green' buttonGroup='backgroundColor' value='{Color.GREEN}'/> + <JRadioButton text='Cyan' buttonGroup='backgroundColor' value='{Color.CYAN}'/> + <JRadioButton text='Blue' buttonGroup='backgroundColor' value='{Color.BLUE}'/> + <JRadioButton text='Purple' buttonGroup='backgroundColor' value='{new Color(160, 30, 255)}'/> + </VBox> + </cell> + </row> + </Table> +</DemoPanel> \ No newline at end of file Modified: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-en_GB.properties =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-en_GB.properties 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-en_GB.properties 2008-12-30 15:31:02 UTC (rev 1109) @@ -8,6 +8,8 @@ 3= Age\:= Animal= +Blue= +Blue\:= Bold= Button\ label\:= Cancel= @@ -15,6 +17,7 @@ Component\ Demo= Config\ file\ \:= Config\ file\:= +Cyan= Demo= Directory\ file\:= Editable= @@ -25,6 +28,8 @@ First\ Name\:= FirstName\:= Font\ size= +Green= +Green\:= Greet= Italic= JMenu\ demo= @@ -34,11 +39,17 @@ Mineral= Normal\ text\:= OK= +Orange= Password\:= +Purple= Ratio\:= +Red= +Red\:= +Show\ Background= Show\ password\ dialog= Sign\ on= Simple\ Button= +Size\:= Source= Spacing\:= Start= @@ -54,6 +65,7 @@ View= Welcome\ to\ the\ JAXX\ framework\!= Working\ directory\:= +Yellow= Your\ name\:= adjust\ the\ spacing= between\ these\ lines= Modified: lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-fr_FR.properties =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-fr_FR.properties 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/Components/src/main/resources/i18n/Components-fr_FR.properties 2008-12-30 15:31:02 UTC (rev 1109) @@ -8,6 +8,8 @@ 3= Age\:= Animal= +Blue= +Blue\:= Bold= Button\ label\:= Cancel= @@ -15,6 +17,7 @@ Component\ Demo= Config\ file\ \:= Config\ file\:= +Cyan= Demo= Directory\ file\:= Editable= @@ -25,6 +28,8 @@ First\ Name\:= FirstName\:= Font\ size= +Green= +Green\:= Greet= Italic= JMenu\ demo= @@ -34,11 +39,17 @@ Mineral= Normal\ text\:= OK= +Orange= Password\:= +Purple= Ratio\:= +Red= +Red\:= +Show\ Background= Show\ password\ dialog= Sign\ on= Simple\ Button= +Size\:= Source= Spacing\:= Start= @@ -54,6 +65,7 @@ View= Welcome\ to\ the\ JAXX\ framework\!= Working\ directory\:= +Yellow= Your\ name\:= adjust\ the\ spacing= between\ these\ lines= Deleted: lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.css =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.css 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.css 2008-12-30 15:31:02 UTC (rev 1109) @@ -1,34 +0,0 @@ -JSlider { - paintTicks: true; -} - -JSlider.color { - minorTickSpacing: 10; - majorTickSpacing: 50; - border: { BorderFactory.createEmptyBorder(1, 1, 1, 1) }; -} - -JSlider.color:focused { - border: { BorderFactory.createLineBorder(Color.BLACK, 1) }; -} - -JSlider#red:focused { - background: #E7ADAD; -} - -JSlider#green:focused { - background: #B2E7AD; -} - -JSlider#blue:focused { - background: #ADB2E7; -} - -JSlider#dummySize { - minorTickSpacing: 2; - majorTickSpacing: 6; -} - -JRadioButton { - enabled: { backgroundCheckbox.isSelected() }; -} \ No newline at end of file Deleted: lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.jaxx =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.jaxx 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/LabelStyle/src/main/java/examples/LabelStyle/LabelStyle.jaxx 2008-12-30 15:31:02 UTC (rev 1109) @@ -1,64 +0,0 @@ -<Application title="LabelStyle.jaxx"> - <style source="LabelStyle.css"/> - - <Table anchor='north' fill='both'> - <row> - <cell weightx='1' weighty='1' insets='6, 3, 0, 0'> - <Table anchor='west' fill='both'> - <row> - <cell><JLabel text='Text:'/></cell> - <cell weightx='1'><JTextField id='text' text='Data Binding'/></cell> - </row> - - <row> - <cell><JLabel text='Red:'/></cell> - <cell><JSlider id='red' value='128' maximum='255' styleClass='color'/></cell> - </row> - - <row> - <cell><JLabel text='Green:'/></cell> - <cell><JSlider id='green' value='0' maximum='255' styleClass='color'/></cell> - </row> - - <row> - <cell><JLabel text='Blue:'/></cell> - <cell><JSlider id='blue' value='255' maximum='255' styleClass='color'/></cell> - </row> - - <row> - <cell><JLabel text='Size:'/></cell> - <cell><JSlider id='dummySize' value='36' minimum='6' maximum='60'/></cell> - </row> - - <row> - <cell columns='2' fill='both' weighty='1'> - <JPanel border='{BorderFactory.createTitledBorder("Preview")}' - height='90' - layout='{new BorderLayout()}'> - <VBox background='{(Color)( backgroundCheckbox.isSelected() ? backgroundColor.getSelectedValue() : null)}' - margin='0' - horizontalAlignment='center' - verticalAlignment='middle'> - <JLabel text='{text.getText()}' font-size='{dummySize.getValue()}' foreground='{new Color(red.getValue(), green.getValue(), blue.getValue())}'/> - </VBox> - </JPanel> - </cell> - </row> - </Table> - </cell> - - <cell> - <VBox spacing='0' border='{BorderFactory.createTitledBorder("Background")}'> - <JCheckBox id='backgroundCheckbox' text='Show Background'/> - <JRadioButton text='Red' buttonGroup='backgroundColor' value='{Color.RED}' selected='true'/> - <JRadioButton text='Orange' buttonGroup='backgroundColor' value='{Color.ORANGE}'/> - <JRadioButton text='Yellow' buttonGroup='backgroundColor' value='{Color.YELLOW}'/> - <JRadioButton text='Green' buttonGroup='backgroundColor' value='{Color.GREEN}'/> - <JRadioButton text='Cyan' buttonGroup='backgroundColor' value='{Color.CYAN}'/> - <JRadioButton text='Blue' buttonGroup='backgroundColor' value='{Color.BLUE}'/> - <JRadioButton text='Purple' buttonGroup='backgroundColor' value='{new Color(160, 30, 255)}'/> - </VBox> - </cell> - </row> - </Table> -</Application> \ No newline at end of file Modified: lutinjaxx/branches/storm_1/jaxx-example/pom.xml =================================================================== --- lutinjaxx/branches/storm_1/jaxx-example/pom.xml 2008-12-30 15:12:39 UTC (rev 1108) +++ lutinjaxx/branches/storm_1/jaxx-example/pom.xml 2008-12-30 15:31:02 UTC (rev 1109) @@ -28,8 +28,6 @@ <module>Calculator</module> <module>Components</module> <module>Counter</module> - <module>LabelStyle</module> - <module>BeanDataBinding</module> </modules> <!-- ************************************************************* -->