You are viewing a plain text version of this content. The canonical link for it is here.
Posted to commits@pivot.apache.org by gb...@apache.org on 2010/06/15 19:08:48 UTC
svn commit: r954970 [1/2] - in /pivot/trunk:
demos/src/org/apache/pivot/demos/dnd/ tests/src/org/apache/pivot/tests/
tools/src/org/apache/pivot/tools/wtk/
tutorials/src/org/apache/pivot/tutorials/
tutorials/src/org/apache/pivot/tutorials/buttons/ tutor...
Author: gbrown
Date: Tue Jun 15 17:08:47 2010
New Revision: 954970
URL: http://svn.apache.org/viewvc?rev=954970&view=rev
Log:
Resolve issue with PIVOT-528; update additional WTKX files to use default properties.
Modified:
pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/menu_bar_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/panorama_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/preferred_aspect_ratio_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/resolve_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkd
pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.frame.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/splitpane_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/table_pane_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/table_selection_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test2.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/textInputValidator_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/text_input_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/text_test.wtkx
pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.wtkx
pivot/trunk/tools/src/org/apache/pivot/tools/wtk/event_logger_skin.wtkx
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/toggle_buttons.wtkx
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.wtkx
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/layout/table_panes_configure_column.wtkx
pivot/trunk/tutorials/src/org/apache/pivot/tutorials/lists.wtkx
pivot/trunk/wtk-terra/src/org/apache/pivot/wtk/skin/terra/terra_file_browser_sheet_skin.wtkx
pivot/trunk/wtk/src/org/apache/pivot/wtkx/WTKXSerializer.java
Modified: pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx (original)
+++ pivot/trunk/demos/src/org/apache/pivot/demos/dnd/file_drop_target_demo.wtkx Tue Jun 15 17:08:47 2010
@@ -27,35 +27,33 @@ limitations under the License.
<TablePane.Row height="1*">
<Border styles="{color:10}">
- <content>
- <ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
- verticalScrollBarPolicy="fill_to_capacity">
- <TableView wtkx:id="fileTableView" selectMode="multi"
- styles="{showHorizontalGridLines:false}">
- <columns>
- <TableView.Column name="name" width="3*" headerData="File">
- <cellRenderer>
- <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
- </cellRenderer>
- </TableView.Column>
- <TableView.Column name="size" width="1*" headerData="Size">
- <cellRenderer>
- <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
- </cellRenderer>
- </TableView.Column>
- <TableView.Column name="lastModified" width="2*" headerData="Modified">
- <cellRenderer>
- <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
- </cellRenderer>
- </TableView.Column>
- </columns>
- </TableView>
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity"
+ verticalScrollBarPolicy="fill_to_capacity">
+ <TableView wtkx:id="fileTableView" selectMode="multi"
+ styles="{showHorizontalGridLines:false}">
+ <columns>
+ <TableView.Column name="name" width="3*" headerData="File">
+ <cellRenderer>
+ <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
+ </cellRenderer>
+ </TableView.Column>
+ <TableView.Column name="size" width="1*" headerData="Size">
+ <cellRenderer>
+ <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
+ </cellRenderer>
+ </TableView.Column>
+ <TableView.Column name="lastModified" width="2*" headerData="Modified">
+ <cellRenderer>
+ <terra:TerraFileBrowserSkin.TableViewFileRenderer/>
+ </cellRenderer>
+ </TableView.Column>
+ </columns>
+ </TableView>
- <columnHeader>
- <TableViewHeader tableView="$fileTableView" styles="{headersPressable:false}"/>
- </columnHeader>
- </ScrollPane>
- </content>
+ <columnHeader>
+ <TableViewHeader tableView="$fileTableView" styles="{headersPressable:false}"/>
+ </columnHeader>
+ </ScrollPane>
</Border>
</TablePane.Row>
<TablePane.Row height="-1">
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/menu_bar_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/menu_bar_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/menu_bar_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/menu_bar_test.wtkx Tue Jun 15 17:08:47 2010
@@ -23,171 +23,143 @@ limitations under the License.
xmlns="org.apache.pivot.wtk">
<menuBar>
<MenuBar>
- <items>
- <MenuBar.Item buttonData="File">
- <menu>
- <Menu>
- <sections>
- <Menu.Section>
- <Menu.Item>
- <buttonData>
- <content:ButtonData text="New"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:ButtonData text="Open"/>
- </buttonData>
- </Menu.Item>
- </Menu.Section>
- <Menu.Section>
- <Menu.Item>
- <buttonData>
- <content:ButtonData text="Close"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:ButtonData text="Close All"/>
- </buttonData>
- </Menu.Item>
- </Menu.Section>
- <Menu.Section>
- <Menu.Item enabled="false">
- <buttonData>
- <content:ButtonData text="Save"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:ButtonData text="Save As"/>
- </buttonData>
-
- <menu>
- <Menu>
- <sections>
- <Menu.Section>
- <Menu.Item buttonData="JPEG"/>
- <Menu.Item buttonData="PNG"/>
- <Menu.Item buttonData="GIF"/>
- <Menu.Item buttonData="PDF"/>
- </Menu.Section>
- </sections>
- </Menu>
- </menu>
- </Menu.Item>
- </Menu.Section>
- </sections>
- </Menu>
- </menu>
- </MenuBar.Item>
-
- <MenuBar.Item buttonData="Edit">
- <menu>
- <Menu>
- <sections>
- <Menu.Section>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Undo"
- keyboardShortcut="CTRL-Z"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Redo"
- keyboardShortcut="SHIFT-CTRL-Z"/>
- </buttonData>
- </Menu.Item>
- </Menu.Section>
- <Menu.Section>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Cut"
- keyboardShortcut="CTRL-X"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Copy"
- keyboardShortcut="CTRL-C"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Paste"
- keyboardShortcut="CTRL-V"/>
- </buttonData>
- </Menu.Item>
- </Menu.Section>
- <Menu.Section>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Delete"
- keyboardShortcut="DELETE"/>
- </buttonData>
- </Menu.Item>
- <Menu.Item>
- <buttonData>
- <content:MenuItemData text="Select All"
- keyboardShortcut="CTRL-A"/>
- </buttonData>
- </Menu.Item>
- </Menu.Section>
- </sections>
- </Menu>
- </menu>
- </MenuBar.Item>
-
- <MenuBar.Item buttonData="View">
- <menu>
- <Menu>
- <sections>
- <Menu.Section>
- <wtkx:define>
- <ButtonGroup wtkx:id="view"/>
- </wtkx:define>
- <Menu.Item buttonData="Large" toggleButton="true" buttonGroup="$view" selected="true"/>
- <Menu.Item buttonData="Medium" toggleButton="true" buttonGroup="$view"/>
- <Menu.Item buttonData="Small" toggleButton="true" buttonGroup="$view"/>
- </Menu.Section>
- </sections>
- </Menu>
- </menu>
- </MenuBar.Item>
-
- <MenuBar.Item buttonData="Window">
- <menu>
- <Menu>
- <sections>
- <Menu.Section>
- <Menu.Item buttonData="Minimize"/>
- <Menu.Item buttonData="Maximize"/>
- </Menu.Section>
- </sections>
- </Menu>
- </menu>
- </MenuBar.Item>
+ <MenuBar.Item buttonData="File">
+ <Menu>
+ <Menu.Section>
+ <Menu.Item>
+ <buttonData>
+ <content:ButtonData text="New"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:ButtonData text="Open"/>
+ </buttonData>
+ </Menu.Item>
+ </Menu.Section>
+ <Menu.Section>
+ <Menu.Item>
+ <buttonData>
+ <content:ButtonData text="Close"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:ButtonData text="Close All"/>
+ </buttonData>
+ </Menu.Item>
+ </Menu.Section>
+ <Menu.Section>
+ <Menu.Item enabled="false">
+ <buttonData>
+ <content:ButtonData text="Save"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:ButtonData text="Save As"/>
+ </buttonData>
+
+ <Menu>
+ <Menu.Section>
+ <Menu.Item buttonData="JPEG"/>
+ <Menu.Item buttonData="PNG"/>
+ <Menu.Item buttonData="GIF"/>
+ <Menu.Item buttonData="PDF"/>
+ </Menu.Section>
+ </Menu>
+ </Menu.Item>
+ </Menu.Section>
+ </Menu>
+ </MenuBar.Item>
+
+ <MenuBar.Item buttonData="Edit">
+ <Menu>
+ <Menu.Section>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Undo"
+ keyboardShortcut="CTRL-Z"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Redo"
+ keyboardShortcut="SHIFT-CTRL-Z"/>
+ </buttonData>
+ </Menu.Item>
+ </Menu.Section>
+ <Menu.Section>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Cut"
+ keyboardShortcut="CTRL-X"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Copy"
+ keyboardShortcut="CTRL-C"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Paste"
+ keyboardShortcut="CTRL-V"/>
+ </buttonData>
+ </Menu.Item>
+ </Menu.Section>
+ <Menu.Section>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Delete"
+ keyboardShortcut="DELETE"/>
+ </buttonData>
+ </Menu.Item>
+ <Menu.Item>
+ <buttonData>
+ <content:MenuItemData text="Select All"
+ keyboardShortcut="CTRL-A"/>
+ </buttonData>
+ </Menu.Item>
+ </Menu.Section>
+ </Menu>
+ </MenuBar.Item>
+
+ <MenuBar.Item buttonData="View">
+ <Menu>
+ <Menu.Section>
+ <wtkx:define>
+ <ButtonGroup wtkx:id="view"/>
+ </wtkx:define>
+ <Menu.Item buttonData="Large" toggleButton="true" buttonGroup="$view" selected="true"/>
+ <Menu.Item buttonData="Medium" toggleButton="true" buttonGroup="$view"/>
+ <Menu.Item buttonData="Small" toggleButton="true" buttonGroup="$view"/>
+ </Menu.Section>
+ </Menu>
+ </MenuBar.Item>
+
+ <MenuBar.Item buttonData="Window">
+ <Menu>
+ <Menu.Section>
+ <Menu.Item buttonData="Minimize"/>
+ <Menu.Item buttonData="Maximize"/>
+ </Menu.Section>
+ </Menu>
+ </MenuBar.Item>
- <MenuBar.Item buttonData="Empty"/>
- </items>
+ <MenuBar.Item buttonData="Empty"/>
</MenuBar>
</menuBar>
- <content>
- <Border styles="{padding:8}">
- <content>
- <Form>
- <sections>
- <Form.Section>
- <TextInput wtkx:id="textInput1" Form.label="Field 1"/>
- <TextInput wtkx:id="textInput2" Form.label="Field 2"/>
- <TextInput wtkx:id="textInput3" Form.label="Field 3"/>
- </Form.Section>
- </sections>
- </Form>
- </content>
- </Border>
- </content>
+ <Border styles="{padding:8}">
+ <Form>
+ <Form.Section>
+ <TextInput wtkx:id="textInput1" Form.label="Field 1"/>
+ <TextInput wtkx:id="textInput2" Form.label="Field 2"/>
+ <TextInput wtkx:id="textInput3" Form.label="Field 3"/>
+ </Form.Section>
+ </Form>
+ </Border>
</Frame>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/panorama_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/panorama_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/panorama_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/panorama_test.wtkx Tue Jun 15 17:08:47 2010
@@ -19,17 +19,15 @@ limitations under the License.
<TabPane selectedIndex="0"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <tabs>
- <Label TabPane.tooltipText="Tooltip1" TabPane.label="Tab 1" preferredWidth="320" preferredHeight="240" text="Tab 1"/>
- <Label TabPane.label="Tab 2" preferredWidth="320" preferredHeight="240" text="Tab 2"/>
- <Label TabPane.label="Tab 3" preferredWidth="320" preferredHeight="240" text="Tab 3"/>
- <Label TabPane.label="Tab 4" preferredWidth="320" preferredHeight="240" text="Tab 4"/>
- <Label TabPane.label="Tab 5" preferredWidth="320" preferredHeight="240" text="Tab 5"/>
- <Label TabPane.label="Tab 6" preferredWidth="320" preferredHeight="240" text="Tab 6"/>
- <Label TabPane.label="Tab 7" preferredWidth="320" preferredHeight="240" text="Tab 7"/>
- <Label TabPane.label="Tab 8" preferredWidth="320" preferredHeight="240" text="Tab 8"/>
- <Label TabPane.label="Tab 9" preferredWidth="320" preferredHeight="240" text="Tab 9"/>
- <Label TabPane.label="Tab 10" preferredWidth="320" preferredHeight="240" text="Tab 10"/>
- </tabs>
+ <Label TabPane.tooltipText="Tooltip1" TabPane.label="Tab 1" preferredWidth="320" preferredHeight="240" text="Tab 1"/>
+ <Label TabPane.label="Tab 2" preferredWidth="320" preferredHeight="240" text="Tab 2"/>
+ <Label TabPane.label="Tab 3" preferredWidth="320" preferredHeight="240" text="Tab 3"/>
+ <Label TabPane.label="Tab 4" preferredWidth="320" preferredHeight="240" text="Tab 4"/>
+ <Label TabPane.label="Tab 5" preferredWidth="320" preferredHeight="240" text="Tab 5"/>
+ <Label TabPane.label="Tab 6" preferredWidth="320" preferredHeight="240" text="Tab 6"/>
+ <Label TabPane.label="Tab 7" preferredWidth="320" preferredHeight="240" text="Tab 7"/>
+ <Label TabPane.label="Tab 8" preferredWidth="320" preferredHeight="240" text="Tab 8"/>
+ <Label TabPane.label="Tab 9" preferredWidth="320" preferredHeight="240" text="Tab 9"/>
+ <Label TabPane.label="Tab 10" preferredWidth="320" preferredHeight="240" text="Tab 10"/>
</TabPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/preferred_aspect_ratio_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/preferred_aspect_ratio_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/preferred_aspect_ratio_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/preferred_aspect_ratio_test.wtkx Tue Jun 15 17:08:47 2010
@@ -19,13 +19,11 @@ limitations under the License.
<Window title="Preferred Aspect Ratio Test" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <BoxPane styles="{fill:true}">
- <BoxPane orientation="vertical" styles="{fill:true}">
- <PushButton buttonData="ABCDEFG" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
- <PushButton buttonData="ABC" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
- <PushButton buttonData="A" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
- </BoxPane>
+ <BoxPane styles="{fill:true}">
+ <BoxPane orientation="vertical" styles="{fill:true}">
+ <PushButton buttonData="ABCDEFG" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
+ <PushButton buttonData="ABC" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
+ <PushButton buttonData="A" styles="{minimumAspectRatio:1, maximumAspectRatio:1}"/>
</BoxPane>
- </content>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/resolve_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/resolve_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/resolve_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/resolve_test.wtkx Tue Jun 15 17:08:47 2010
@@ -23,16 +23,14 @@ limitations under the License.
var foo = "ABC";
</wtkx:script>
- <content>
- <BoxPane orientation="vertical">
- <BoxPane styles="{verticalAlignment:'center'}">
- <Label text="%labelText"/>
- <PushButton buttonData="%buttonData"/>
- </BoxPane>
- <BoxPane styles="{verticalAlignment:'center'}">
- <Label text="$foo"/>
- <PushButton buttonData="$bar"/>
- </BoxPane>
+ <BoxPane orientation="vertical">
+ <BoxPane styles="{verticalAlignment:'center'}">
+ <Label text="%labelText"/>
+ <PushButton buttonData="%buttonData"/>
</BoxPane>
- </content>
+ <BoxPane styles="{verticalAlignment:'center'}">
+ <Label text="$foo"/>
+ <PushButton buttonData="$bar"/>
+ </BoxPane>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkd
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkd?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkd (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkd Tue Jun 15 17:08:47 2010
@@ -19,71 +19,69 @@ limitations under the License.
<Drawing background="#ffff00"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk.media">
- <canvas>
- <Canvas xmlns="org.apache.pivot.wtk.media.drawing">
- <Rectangle width="640" height="480"/>
- <Rectangle x="10" y="20"
- width="320" height="240" fill="#ff0000"
- stroke="#0000ff" strokeThickness="6"/>
- <Ellipse x="50" y="50"
- width="90" height="72"
- stroke="#cc00cc" strokeThickness="10"/>
- <Ellipse x="200" y="50"
- width="90" height="72"
- stroke="#cc00cc" strokeThickness="10"/>
- <Line x1="140" y1="86" x2="200" y2="86"
- stroke="#cc00cc" strokeThickness="10"/>
- <Path x="132" y="83" stroke="#0088ff" strokeThickness="2">
- <Path.MoveTo x="20" y="70"/>
- <Path.LineTo x="30" y="20"/>
- <Path.QuadTo x1="40" y1="10" x2="50" y2="20"/>
- <Path.LineTo x="60" y="70"/>
- <Path.QuadTo x1="70" y1="80" x2="60" y2="80"/>
- <Path.LineTo x="20" y="80"/>
- <Path.QuadTo x1="10" y1="80" x2="20" y2="70"/>
- </Path>
- <Ellipse x="60" y="180"
- width="220" height="60" fill="#000000"
- stroke="#ffaaaa" strokeThickness="15"/>
+ <Canvas xmlns="org.apache.pivot.wtk.media.drawing">
+ <Rectangle width="640" height="480"/>
+ <Rectangle x="10" y="20"
+ width="320" height="240" fill="#ff0000"
+ stroke="#0000ff" strokeThickness="6"/>
+ <Ellipse x="50" y="50"
+ width="90" height="72"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <Ellipse x="200" y="50"
+ width="90" height="72"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <Line x1="140" y1="86" x2="200" y2="86"
+ stroke="#cc00cc" strokeThickness="10"/>
+ <Path x="132" y="83" stroke="#0088ff" strokeThickness="2">
+ <Path.MoveTo x="20" y="70"/>
+ <Path.LineTo x="30" y="20"/>
+ <Path.QuadTo x1="40" y1="10" x2="50" y2="20"/>
+ <Path.LineTo x="60" y="70"/>
+ <Path.QuadTo x1="70" y1="80" x2="60" y2="80"/>
+ <Path.LineTo x="20" y="80"/>
+ <Path.QuadTo x1="10" y1="80" x2="20" y2="70"/>
+ </Path>
+ <Ellipse x="60" y="180"
+ width="220" height="60" fill="#000000"
+ stroke="#ffaaaa" strokeThickness="15"/>
- <Group x="360" y="20">
- <transforms>
- <Shape.Rotate angle="30.0"/>
- <Shape.Translate x="50" y="-50"/>
- <Shape.Scale x="2" y="2"/>
- </transforms>
+ <Group x="360" y="20">
+ <transforms>
+ <Shape.Rotate angle="30.0"/>
+ <Shape.Translate x="50" y="-50"/>
+ <Shape.Scale x="2" y="2"/>
+ </transforms>
- <Rectangle x="0" y="0"
- width="160" height="120"
- fill="{paintType:'radial_gradient',
- centerX:50, centerY:50, radius:50,
- stops: [{color:'#ffffff', offset:0.0}, {color:'#000000', offset:1.0}]}"
- stroke="#00ff00" strokeThickness="4"
- cornerRadius="20"/>
- <Arc x="-10" y="10" width="50" height="50" start="90.0" extent="90.0"
- fill="#ffff00" stroke="#ff0000" strokeThickness="4" type="pie"/>
- <Arc x="0" y="10" width="50" height="50" start="0.0" extent="90.0"
- fill="#ffff00" stroke="#ff0000" strokeThickness="4" type="pie"
- visible="false"/>
- <Line x1="-10" y1="130" x2="30" y2="90" stroke="#cc00cc" strokeThickness="20"/>
- </Group>
+ <Rectangle x="0" y="0"
+ width="160" height="120"
+ fill="{paintType:'radial_gradient',
+ centerX:50, centerY:50, radius:50,
+ stops: [{color:'#ffffff', offset:0.0}, {color:'#000000', offset:1.0}]}"
+ stroke="#00ff00" strokeThickness="4"
+ cornerRadius="20"/>
+ <Arc x="-10" y="10" width="50" height="50" start="90.0" extent="90.0"
+ fill="#ffff00" stroke="#ff0000" strokeThickness="4" type="pie"/>
+ <Arc x="0" y="10" width="50" height="50" start="0.0" extent="90.0"
+ fill="#ffff00" stroke="#ff0000" strokeThickness="4" type="pie"
+ visible="false"/>
+ <Line x1="-10" y1="130" x2="30" y2="90" stroke="#cc00cc" strokeThickness="20"/>
+ </Group>
- <Group x="240" y="240">
- <QuadCurve x1="0" y1="0" x2="0" y2="50" controlX="50" controlY="25"
- strokeThickness="4" fill="#ff00ff"/>
- </Group>
+ <Group x="240" y="240">
+ <QuadCurve x1="0" y1="0" x2="0" y2="50" controlX="50" controlY="25"
+ strokeThickness="4" fill="#ff00ff"/>
+ </Group>
- <Group x="360" y="240">
- <CubicCurve x1="0" y1="0" x2="0" y2="50"
- controlX1="12" controlY1="12" controlX2="25" controlY2="37"
- strokeThickness="4" fill="#00ffff"/>
- </Group>
+ <Group x="360" y="240">
+ <CubicCurve x1="0" y1="0" x2="0" y2="50"
+ controlX1="12" controlY1="12" controlX2="25" controlY2="37"
+ strokeThickness="4" fill="#00ffff"/>
+ </Group>
- <Group x="120" y="240">
- <Text text="ABCDEF GHIJK LMN OPQRSTU VW X Y Z" font="Arial BOLD 48" width="80"
- fill="#cccccc" stroke="#ff0000" strokeThickness="2"
- alignment="left"/>
- </Group>
- </Canvas>
- </canvas>
+ <Group x="120" y="240">
+ <Text text="ABCDEF GHIJK LMN OPQRSTU VW X Y Z" font="Arial BOLD 48" width="80"
+ fill="#cccccc" stroke="#ff0000" strokeThickness="2"
+ alignment="left"/>
+ </Group>
+ </Canvas>
</Drawing>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/sample_drawing.wtkx Tue Jun 15 17:08:47 2010
@@ -18,11 +18,7 @@ limitations under the License.
<Window xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <ScrollPane>
- <view>
- <ImageView styles="{backgroundColor:'#999999'}" image="@sample_drawing.wtkd"/>
- </view>
- </ScrollPane>
- </content>
+ <ScrollPane>
+ <ImageView styles="{backgroundColor:'#999999'}" image="@sample_drawing.wtkd"/>
+ </ScrollPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.frame.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.frame.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.frame.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.frame.wtkx Tue Jun 15 17:08:47 2010
@@ -19,9 +19,7 @@ limitations under the License.
<Frame title="Script Application Test Frame" preferredWidth="320" preferredHeight="240"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <Label text="Sample Frame"
- styles="{horizontalAlignment:'center', verticalAlignment:'center'}"/>
- </content>
+ <Label text="Sample Frame"
+ styles="{horizontalAlignment:'center', verticalAlignment:'center'}"/>
</Frame>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/script_application_test.wtkx Tue Jun 15 17:08:47 2010
@@ -25,27 +25,25 @@ limitations under the License.
<Label wtkx:id="label1" text="Hello"/>
</wtkx:define>
- <content>
- <BoxPane orientation="vertical">
- <Label wtkx:id="fooLabel"/>
- <Label wtkx:id="barLabel"/>
- <PushButton buttonData="Click Me">
- <buttonPressListeners>
- <wtkx:script>
- <![CDATA[
- function buttonPressed(button) {
- testFrame.open(window);
- java.lang.System.out.println(label1.getText());
- java.lang.System.out.println(label2.getText());
- }
- ]]>
- </wtkx:script>
- <wtkx:define>
- <Label wtkx:id="label2" text="World"/>
- </wtkx:define>
- </buttonPressListeners>
- </PushButton>
- </BoxPane>
- </content>
+ <BoxPane orientation="vertical">
+ <Label wtkx:id="fooLabel"/>
+ <Label wtkx:id="barLabel"/>
+ <PushButton buttonData="Click Me">
+ <buttonPressListeners>
+ <wtkx:script>
+ <![CDATA[
+ function buttonPressed(button) {
+ testFrame.open(window);
+ java.lang.System.out.println(label1.getText());
+ java.lang.System.out.println(label2.getText());
+ }
+ ]]>
+ </wtkx:script>
+ <wtkx:define>
+ <Label wtkx:id="label2" text="World"/>
+ </wtkx:define>
+ </buttonPressListeners>
+ </PushButton>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/splitpane_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/splitpane_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/splitpane_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/splitpane_test.wtkx Tue Jun 15 17:08:47 2010
@@ -16,50 +16,47 @@ See the License for the specific languag
limitations under the License.
-->
-<BoxPane xmlns:wtkx="http://pivot.apache.org/wtkx"
- xmlns="org.apache.pivot.wtk" orientation="vertical" styles="{fill:true}">
+<BoxPane orientation="vertical" styles="{fill:true}"
+ xmlns:wtkx="http://pivot.apache.org/wtkx"
+ xmlns="org.apache.pivot.wtk" >
<Label text="Test 1"/>
- <SplitPane orientation="vertical" splitRatio="0.5" preferredWidth="480" preferredHeight="360">
- <top>
- <SplitPane orientation="horizontal" splitRatio="0.5" resizeMode="primary_region">
- <left>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
- styles="{backgroundColor:'#404040'}"/>
- </left>
- <right>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
- styles="{backgroundColor:'#404040'}"/>
- </right>
- </SplitPane>
- </top>
- <bottom>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
+ <SplitPane orientation="vertical" splitRatio="0.5" preferredWidth="480"
+ preferredHeight="360">
+ <top>
+ <SplitPane orientation="horizontal" splitRatio="0.5" resizeMode="primary_region">
+ <left>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
styles="{backgroundColor:'#404040'}"/>
- </bottom>
+ </left>
+ <right>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
+ styles="{backgroundColor:'#404040'}"/>
+ </right>
</SplitPane>
+ </top>
+ <bottom>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
+ styles="{backgroundColor:'#404040'}"/>
+ </bottom>
+ </SplitPane>
<Label text="Test 2"/>
- <SplitPane orientation="horizontal" splitRatio="0.5" preferredWidth="480" preferredHeight="360">
- <top>
- <SplitPane orientation="vertical" splitRatio="0.5" resizeMode="primary_region">
- <left>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
- styles="{backgroundColor:'#404040'}"/>
- </left>
- <right>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
- styles="{backgroundColor:'#404040'}"/>
- </right>
- </SplitPane>
- </top>
- <bottom>
- <ImageView asynchronous="true"
- image="@IMG_0735_2.jpg"
+ <SplitPane orientation="horizontal" splitRatio="0.5" preferredWidth="480"
+ preferredHeight="360">
+ <top>
+ <SplitPane orientation="vertical" splitRatio="0.5" resizeMode="primary_region">
+ <left>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
+ styles="{backgroundColor:'#404040'}"/>
+ </left>
+ <right>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
styles="{backgroundColor:'#404040'}"/>
- </bottom>
+ </right>
</SplitPane>
+ </top>
+ <bottom>
+ <ImageView asynchronous="true" image="@IMG_0735_2.jpg"
+ styles="{backgroundColor:'#404040'}"/>
+ </bottom>
+ </SplitPane>
</BoxPane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/suggestion_popup_test.wtkx Tue Jun 15 17:08:47 2010
@@ -20,11 +20,9 @@ limitations under the License.
x="120" y="60"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <BoxPane orientation="vertical">
- <TextInput wtkx:id="textInput"/>
- <TextInput/>
- <Label wtkx:id="selectedIndexLabel"/>
- </BoxPane>
- </content>
+ <BoxPane orientation="vertical">
+ <TextInput wtkx:id="textInput"/>
+ <TextInput/>
+ <Label wtkx:id="selectedIndexLabel"/>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/table_pane_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/table_pane_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/table_pane_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/table_pane_test.wtkx Tue Jun 15 17:08:47 2010
@@ -19,25 +19,22 @@ limitations under the License.
<Window title="TablePane Test" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <TablePane styles="{padding:6, verticalSpacing:8}">
- <columns>
- <TablePane.Column width="-1"/>
- </columns>
- <rows>
- <TablePane.Row height="-1">
- <PushButton buttonData="One"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <TablePane.Filler preferredHeight="60"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <PushButton buttonData="Three" visible="false"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <PushButton buttonData="Four"/>
- </TablePane.Row>
- </rows>
- </TablePane>
- </content>
+ <TablePane styles="{padding:6, verticalSpacing:8}">
+ <columns>
+ <TablePane.Column width="-1"/>
+ </columns>
+
+ <TablePane.Row height="-1">
+ <PushButton buttonData="One"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <TablePane.Filler preferredHeight="60"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <PushButton buttonData="Three" visible="false"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <PushButton buttonData="Four"/>
+ </TablePane.Row>
+ </TablePane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/table_selection_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/table_selection_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/table_selection_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/table_selection_test.wtkx Tue Jun 15 17:08:47 2010
@@ -18,40 +18,34 @@ limitations under the License.
<Window title="Table Selection Test" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
+ xmlns:collections="org.apache.pivot.collections"
xmlns="org.apache.pivot.wtk">
- <content>
- <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fill_to_capacity">
- <view>
- <TableView selectMode="multi">
- <columns>
- <TableView.Column name="a" width="1*"/>
- </columns>
- <tableData xmlns:collections="org.apache.pivot.collections">
- <collections:ArrayList>
- <collections:HashMap a="0"/>
- <collections:HashMap a="1"/>
- <collections:HashMap a="2"/>
- <collections:HashMap a="3"/>
- <collections:HashMap a="4"/>
- <collections:HashMap a="5"/>
- <collections:HashMap a="6"/>
- <collections:HashMap a="7"/>
- <collections:HashMap a="8"/>
- <collections:HashMap a="9"/>
- <collections:HashMap a="0"/>
- <collections:HashMap a="1"/>
- <collections:HashMap a="2"/>
- <collections:HashMap a="3"/>
- <collections:HashMap a="4"/>
- <collections:HashMap a="5"/>
- <collections:HashMap a="6"/>
- <collections:HashMap a="7"/>
- <collections:HashMap a="8"/>
- <collections:HashMap a="9"/>
- </collections:ArrayList>
- </tableData>
- </TableView>
- </view>
- </ScrollPane>
- </content>
+ <ScrollPane horizontalScrollBarPolicy="fill" verticalScrollBarPolicy="fill_to_capacity">
+ <TableView selectMode="multi">
+ <columns>
+ <TableView.Column name="a" width="1*"/>
+ </columns>
+
+ <collections:HashMap a="0"/>
+ <collections:HashMap a="1"/>
+ <collections:HashMap a="2"/>
+ <collections:HashMap a="3"/>
+ <collections:HashMap a="4"/>
+ <collections:HashMap a="5"/>
+ <collections:HashMap a="6"/>
+ <collections:HashMap a="7"/>
+ <collections:HashMap a="8"/>
+ <collections:HashMap a="9"/>
+ <collections:HashMap a="0"/>
+ <collections:HashMap a="1"/>
+ <collections:HashMap a="2"/>
+ <collections:HashMap a="3"/>
+ <collections:HashMap a="4"/>
+ <collections:HashMap a="5"/>
+ <collections:HashMap a="6"/>
+ <collections:HashMap a="7"/>
+ <collections:HashMap a="8"/>
+ <collections:HashMap a="9"/>
+ </TableView>
+ </ScrollPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test.wtkx Tue Jun 15 17:08:47 2010
@@ -35,44 +35,40 @@ limitations under the License.
var i = Image.load(new URL(location, "go-home.png"));
]]>
</wtkx:script>
- <content>
- <TableView>
- <columns>
- <TableView.Column name="value" width="-1">
- <cellRenderer>
- <content:TableViewMultiCellRenderer>
- <wtkx:define>
- <content:TableViewBooleanCellRenderer wtkx:id="booleanCellRenderer"/>
- <content:TableViewNumberCellRenderer wtkx:id="numberCellRenderer"/>
- <content:TableViewDateCellRenderer wtkx:id="dateCellRenderer"/>
- <content:TableViewImageCellRenderer wtkx:id="imageCellRenderer" preferredHeight="40"/>
- </wtkx:define>
- <rendererMappings>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
- cellRenderer="$booleanCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
- cellRenderer="$numberCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
- cellRenderer="$dateCellRenderer"/>
- <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
- cellRenderer="$imageCellRenderer"/>
- </rendererMappings>
- </content:TableViewMultiCellRenderer>
- </cellRenderer>
- </TableView.Column>
+ <TableView>
+ <columns>
+ <TableView.Column name="value" width="-1">
+ <cellRenderer>
+ <content:TableViewMultiCellRenderer>
+ <wtkx:define>
+ <content:TableViewBooleanCellRenderer wtkx:id="booleanCellRenderer"/>
+ <content:TableViewNumberCellRenderer wtkx:id="numberCellRenderer"/>
+ <content:TableViewDateCellRenderer wtkx:id="dateCellRenderer"/>
+ <content:TableViewImageCellRenderer wtkx:id="imageCellRenderer" preferredHeight="40"/>
+ </wtkx:define>
- <TableView.Column width="1*"/>
- </columns>
- <tableData>
- <collections:ArrayList>
- <collections:HashMap value="$s"/>
- <collections:HashMap value="$b"/>
- <collections:HashMap value="$n"/>
- <collections:HashMap value="$d"/>
- <collections:HashMap value="$i"/>
- </collections:ArrayList>
- </tableData>
- </TableView>
- </content>
+ <rendererMappings>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Boolean"
+ cellRenderer="$booleanCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="java.lang.Number"
+ cellRenderer="$numberCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.util.CalendarDate"
+ cellRenderer="$dateCellRenderer"/>
+ <content:TableViewMultiCellRenderer.RendererMapping valueClass="org.apache.pivot.wtk.media.Image"
+ cellRenderer="$imageCellRenderer"/>
+ </rendererMappings>
+ </content:TableViewMultiCellRenderer>
+ </cellRenderer>
+ </TableView.Column>
+
+ <TableView.Column width="1*"/>
+ </columns>
+
+ <collections:HashMap value="$s"/>
+ <collections:HashMap value="$b"/>
+ <collections:HashMap value="$n"/>
+ <collections:HashMap value="$d"/>
+ <collections:HashMap value="$i"/>
+ </TableView>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test2.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test2.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test2.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/table_view_test2.wtkx Tue Jun 15 17:08:47 2010
@@ -21,29 +21,22 @@ limitations under the License.
xmlns:collections="org.apache.pivot.collections"
xmlns:content="org.apache.pivot.wtk.content"
xmlns="org.apache.pivot.wtk">
- <content>
- <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
- <view>
- <TableView wtkx:id="tableView" styles="{variableRowHeight:true, backgroundColor:'#ffeeee'}">
- <columns>
- <TableView.Column name="value" width="100">
- <cellRenderer>
- <content:TableViewCellRenderer styles="{wrapText:true}"/>
- </cellRenderer>
- </TableView.Column>
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+ <TableView wtkx:id="tableView" styles="{variableRowHeight:true, backgroundColor:'#ffeeee'}">
+ <columns>
+ <TableView.Column name="value" width="100">
+ <cellRenderer>
+ <content:TableViewCellRenderer styles="{wrapText:true}"/>
+ </cellRenderer>
+ </TableView.Column>
- <TableView.Column width="1*"/>
- </columns>
- <tableData>
- <collections:ArrayList>
- <collections:HashMap value="Single Line"/>
- <collections:HashMap value="Double
Line Line Line Line!"/>
- <collections:HashMap value="Single Line"/>
- <collections:HashMap value="Double
Line"/>
- </collections:ArrayList>
- </tableData>
- </TableView>
- </view>
- </ScrollPane>
- </content>
+ <TableView.Column width="1*"/>
+ </columns>
+
+ <collections:HashMap value="Single Line"/>
+ <collections:HashMap value="Double
Line Line Line Line!"/>
+ <collections:HashMap value="Single Line"/>
+ <collections:HashMap value="Double
Line"/>
+ </TableView>
+ </ScrollPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/textInputValidator_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/textInputValidator_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/textInputValidator_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/textInputValidator_test.wtkx Tue Jun 15 17:08:47 2010
@@ -21,23 +21,22 @@ limitations under the License.
<TablePane.Column width="-1"/>
<TablePane.Column width="-1"/>
</columns>
- <rows>
- <TablePane.Row height="-1">
- <Label text="float range 0.3-2000"/>
- <TextInput wtkx:id="textinputFloatRange"/>
- <Label wtkx:id="invalidLabel"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <Label text="int range 0-100"/>
- <TextInput wtkx:id="textinputIntRange"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <Label text="date regex"/>
- <TextInput wtkx:id="textinputDateRegex"/>
- </TablePane.Row>
- <TablePane.Row height="-1">
- <Label text="custom boolean"/>
- <TextInput wtkx:id="textinputCustomBoolean"/>
- </TablePane.Row>
- </rows>
+
+ <TablePane.Row height="-1">
+ <Label text="float range 0.3-2000"/>
+ <TextInput wtkx:id="textinputFloatRange"/>
+ <Label wtkx:id="invalidLabel"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <Label text="int range 0-100"/>
+ <TextInput wtkx:id="textinputIntRange"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <Label text="date regex"/>
+ <TextInput wtkx:id="textinputDateRegex"/>
+ </TablePane.Row>
+ <TablePane.Row height="-1">
+ <Label text="custom boolean"/>
+ <TextInput wtkx:id="textinputCustomBoolean"/>
+ </TablePane.Row>
</TablePane>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/text_input_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/text_input_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/text_input_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/text_input_test.wtkx Tue Jun 15 17:08:47 2010
@@ -19,12 +19,10 @@ limitations under the License.
<Window title="Text Input Test" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <BoxPane orientation="vertical" styles="{padding:4}">
- <TextInput text="ABCD 1234 abcd 5678 EFGH 90" textSize="6"/>
- <TextInput text="abcd 5678"/>
- <TextInput prompt="Type something!"/>
- <TextInput/>
- </BoxPane>
- </content>
+ <BoxPane orientation="vertical" styles="{padding:4}">
+ <TextInput text="ABCD 1234 abcd 5678 EFGH 90" textSize="6"/>
+ <TextInput text="abcd 5678"/>
+ <TextInput prompt="Type something!"/>
+ <TextInput/>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/text_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/text_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/text_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/text_test.wtkx Tue Jun 15 17:08:47 2010
@@ -19,15 +19,13 @@ limitations under the License.
<Window title="Text Test" maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <BoxPane orientation="vertical" styles="{fill:true, spacing:8, padding:8}">
- <Separator heading="INFORMATION"/>
- <Border title="INFORMATION" styles="{padding:6}">
- <content>
- <Label text="This is the information."/>
- </content>
- </Border>
- <Label text="INFORMATION" styles="{font:{bold:true}, color:13}"/>
- </BoxPane>
- </content>
+ <BoxPane orientation="vertical" styles="{fill:true, spacing:8, padding:8}">
+ <Separator heading="INFORMATION"/>
+ <Border title="INFORMATION" styles="{padding:6}">
+ <content>
+ <Label text="This is the information."/>
+ </content>
+ </Border>
+ <Label text="INFORMATION" styles="{font:{bold:true}, color:13}"/>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.wtkx (original)
+++ pivot/trunk/tests/src/org/apache/pivot/tests/watermark_decorator_test.wtkx Tue Jun 15 17:08:47 2010
@@ -21,39 +21,36 @@ limitations under the License.
maximized="true"
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns="org.apache.pivot.wtk">
- <content>
- <TablePane styles="{verticalSpacing:1, showHorizontalGridLines:true}">
- <columns>
- <TablePane.Column width="1*" />
- </columns>
- <rows>
- <TablePane.Row height="-1">
- <BoxPane styles="{padding:10}">
- <PushButton buttonData="Toggle Watermark" toggleButton="true">
- <buttonStateListeners>
- <wtkx:script>
- <![CDATA[
- importPackage(org.apache.pivot.wtk.effects);
+ <TablePane styles="{verticalSpacing:1, showHorizontalGridLines:true}">
+ <columns>
+ <TablePane.Column width="1*" />
+ </columns>
- function stateChanged(button, previousState) {
- if (button.isSelected()) {
- cardPane.getDecorators().add(new WatermarkDecorator("Only below the line"));
- } else {
- cardPane.getDecorators().removeAll();
- }
- }
- ]]>
- </wtkx:script>
- </buttonStateListeners>
- </PushButton>
- </BoxPane>
- </TablePane.Row>
- <TablePane.Row height="1*">
- <CardPane wtkx:id="cardPane" selectedIndex="0">
- <BoxPane />
- </CardPane>
- </TablePane.Row>
- </rows>
- </TablePane>
- </content>
+ <TablePane.Row height="-1">
+ <BoxPane styles="{padding:10}">
+ <PushButton buttonData="Toggle Watermark" toggleButton="true">
+ <buttonStateListeners>
+ <wtkx:script>
+ <![CDATA[
+ importPackage(org.apache.pivot.wtk.effects);
+
+ function stateChanged(button, previousState) {
+ if (button.isSelected()) {
+ cardPane.getDecorators().add(new WatermarkDecorator("Only below the line"));
+ } else {
+ cardPane.getDecorators().removeAll();
+ }
+ }
+ ]]>
+ </wtkx:script>
+ </buttonStateListeners>
+ </PushButton>
+ </BoxPane>
+ </TablePane.Row>
+ <TablePane.Row height="1*">
+ <CardPane wtkx:id="cardPane" selectedIndex="0">
+ <BoxPane />
+ </CardPane>
+ </TablePane.Row>
+ </TablePane>
</Window>
Modified: pivot/trunk/tools/src/org/apache/pivot/tools/wtk/event_logger_skin.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tools/src/org/apache/pivot/tools/wtk/event_logger_skin.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tools/src/org/apache/pivot/tools/wtk/event_logger_skin.wtkx (original)
+++ pivot/trunk/tools/src/org/apache/pivot/tools/wtk/event_logger_skin.wtkx Tue Jun 15 17:08:47 2010
@@ -22,44 +22,37 @@ limitations under the License.
xmlns="org.apache.pivot.wtk">
<left>
<Border>
- <content>
- <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
- <view>
- <TreeView wtkx:id="declaredEventsTreeView"
- checkmarksEnabled="true"
- showMixedCheckmarkState="true"
- selectMode="none">
- <nodeRenderer>
- <content:TreeViewNodeRenderer showIcon="false"/>
- </nodeRenderer>
- </TreeView>
- </view>
- </ScrollPane>
- </content>
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+ <TreeView wtkx:id="declaredEventsTreeView"
+ checkmarksEnabled="true"
+ showMixedCheckmarkState="true"
+ selectMode="none">
+ <nodeRenderer>
+ <content:TreeViewNodeRenderer showIcon="false"/>
+ </nodeRenderer>
+ </TreeView>
+ </ScrollPane>
</Border>
</left>
<right>
<Border>
- <content>
- <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
- <view>
- <TableView wtkx:id="firedEventsTableView" selectMode="none">
- <columns>
- <TableView.Column name="interface" width="175"
- headerData="%interface"/>
- <TableView.Column name="method" width="200"
- headerData="%method"/>
- <TableView.Column name="arguments" width="1*"
- headerData="%arguments" minimumWidth="200"/>
- </columns>
- </TableView>
- </view>
- <columnHeader>
- <TableViewHeader tableView="$firedEventsTableView"
- sortMode="none" styles="{headersPressable:false}"/>
- </columnHeader>
- </ScrollPane>
- </content>
+ <ScrollPane horizontalScrollBarPolicy="fill_to_capacity">
+ <TableView wtkx:id="firedEventsTableView" selectMode="none">
+ <columns>
+ <TableView.Column name="interface" width="175"
+ headerData="%interface"/>
+ <TableView.Column name="method" width="200"
+ headerData="%method"/>
+ <TableView.Column name="arguments" width="1*"
+ headerData="%arguments" minimumWidth="200"/>
+ </columns>
+ </TableView>
+
+ <columnHeader>
+ <TableViewHeader tableView="$firedEventsTableView"
+ sortMode="none" styles="{headersPressable:false}"/>
+ </columnHeader>
+ </ScrollPane>
</Border>
</right>
</SplitPane>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons.wtkx Tue Jun 15 17:08:47 2010
@@ -87,78 +87,74 @@ limitations under the License.
</Border>
<Border styles="{padding:2}">
- <content>
- <BoxPane orientation="vertical" styles="{padding:{top:2, left:4, bottom:4, right:4}, spacing:10}">
- <BoxPane orientation="vertical">
- <Label text="Basic Radio Buttons" styles="{font:{bold:true}}"/>
- <BoxPane>
- <wtkx:define>
- <ButtonGroup wtkx:id="radioButtons"/>
- </wtkx:define>
- <RadioButton buttonData="One" buttonGroup="$radioButtons"/>
- <RadioButton buttonData="Two" buttonGroup="$radioButtons"/>
- <RadioButton buttonData="Three" buttonGroup="$radioButtons" selected="true" enabled="false"/>
- </BoxPane>
+ <BoxPane orientation="vertical" styles="{padding:{top:2, left:4, bottom:4, right:4}, spacing:10}">
+ <BoxPane orientation="vertical">
+ <Label text="Basic Radio Buttons" styles="{font:{bold:true}}"/>
+ <BoxPane>
+ <wtkx:define>
+ <ButtonGroup wtkx:id="radioButtons"/>
+ </wtkx:define>
+ <RadioButton buttonData="One" buttonGroup="$radioButtons"/>
+ <RadioButton buttonData="Two" buttonGroup="$radioButtons"/>
+ <RadioButton buttonData="Three" buttonGroup="$radioButtons" selected="true" enabled="false"/>
</BoxPane>
+ </BoxPane>
+ <BoxPane orientation="vertical">
+ <Label text="Image Radio Buttons" styles="{font:{bold:true}}"/>
<BoxPane orientation="vertical">
- <Label text="Image Radio Buttons" styles="{font:{bold:true}}"/>
- <BoxPane orientation="vertical">
- <wtkx:define>
- <ButtonGroup wtkx:id="imageRadioButtons"/>
- </wtkx:define>
- <RadioButton buttonGroup="$imageRadioButtons">
- <content:ButtonData icon="@bell.png" text="Bell"/>
- </RadioButton>
- <RadioButton buttonGroup="$imageRadioButtons">
- <content:ButtonData icon="@clock.png" text="Clock"/>
- </RadioButton>
- <RadioButton buttonGroup="$imageRadioButtons" selected="true" enabled="false">
- <content:ButtonData icon="@house.png" text="House"/>
- </RadioButton>
- </BoxPane>
+ <wtkx:define>
+ <ButtonGroup wtkx:id="imageRadioButtons"/>
+ </wtkx:define>
+ <RadioButton buttonGroup="$imageRadioButtons">
+ <content:ButtonData icon="@bell.png" text="Bell"/>
+ </RadioButton>
+ <RadioButton buttonGroup="$imageRadioButtons">
+ <content:ButtonData icon="@clock.png" text="Clock"/>
+ </RadioButton>
+ <RadioButton buttonGroup="$imageRadioButtons" selected="true" enabled="false">
+ <content:ButtonData icon="@house.png" text="House"/>
+ </RadioButton>
</BoxPane>
</BoxPane>
- </content>
+ </BoxPane>
</Border>
<Border styles="{padding:2}">
- <content>
- <BoxPane orientation="vertical" styles="{padding:{top:2, left:4, bottom:4, right:4}, spacing:10}">
- <BoxPane orientation="vertical">
- <Label text="Basic Checkboxes" styles="{font:{bold:true}}"/>
- <BoxPane>
- <Checkbox buttonData="One"/>
- <Checkbox buttonData="Two"/>
- <Checkbox buttonData="Three" selected="true" enabled="false"/>
- </BoxPane>
+ <BoxPane orientation="vertical" styles="{padding:{top:2, left:4, bottom:4, right:4}, spacing:10}">
+ <BoxPane orientation="vertical">
+ <Label text="Basic Checkboxes" styles="{font:{bold:true}}"/>
+ <BoxPane>
+ <Checkbox buttonData="One"/>
+ <Checkbox buttonData="Two"/>
+ <Checkbox buttonData="Three" selected="true" enabled="false"/>
</BoxPane>
+ </BoxPane>
+ <BoxPane orientation="vertical">
+ <Label text="Image Checkboxes" styles="{font:{bold:true}}"/>
<BoxPane orientation="vertical">
- <Label text="Image Checkboxes" styles="{font:{bold:true}}"/>
- <BoxPane orientation="vertical">
- <Checkbox>
- <content:ButtonData icon="@clock.png" text="Clock"/>
- </Checkbox>
- <Checkbox>
- <content:ButtonData icon="@bell.png" text="Bell"/>
- </Checkbox>
- <Checkbox selected="true" enabled="false">
- <content:ButtonData icon="@house.png" text="House"/>
- </Checkbox>
- </BoxPane>
+ <Checkbox>
+ <content:ButtonData icon="@clock.png" text="Clock"/>
+ </Checkbox>
+ <Checkbox>
+ <content:ButtonData icon="@bell.png" text="Bell"/>
+ </Checkbox>
+ <Checkbox selected="true" enabled="false">
+ <content:ButtonData icon="@house.png" text="House"/>
+ </Checkbox>
</BoxPane>
+ </BoxPane>
+ <BoxPane orientation="vertical">
+ <Label text="Tri-state Checkboxes" styles="{font:{bold:true}}"/>
<BoxPane orientation="vertical">
- <Label text="Tri-state Checkboxes" styles="{font:{bold:true}}"/>
- <BoxPane orientation="vertical">
- <Checkbox buttonData="Read" triState="true" state="selected"/>
- <Checkbox buttonData="Write" triState="true" state="unselected"/>
- <Checkbox buttonData="Execute" triState="true" state="mixed" enabled="false"/>
- </BoxPane>
+ <Checkbox buttonData="Read" triState="true" state="selected"/>
+ <Checkbox buttonData="Write" triState="true" state="unselected"/>
+ <Checkbox buttonData="Execute" triState="true" state="mixed" enabled="false"/>
</BoxPane>
</BoxPane>
- </content>
+ </BoxPane>
</Border>
<Border styles="{padding:2}">
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/toggle_buttons.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/toggle_buttons.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/toggle_buttons.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/buttons/toggle_buttons.wtkx Tue Jun 15 17:08:47 2010
@@ -20,25 +20,17 @@ limitations under the License.
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns:content="org.apache.pivot.wtk.content"
xmlns="org.apache.pivot.wtk">
- <content>
- <BoxPane styles="{padding:4, horizontalAlignment:'center',
- verticalAlignment:'center'}">
- <PushButton toggleButton="true">
- <buttonData>
- <content:ButtonData text="Anchor" icon="org/apache/pivot/tutorials/anchor.png"/>
- </buttonData>
- </PushButton>
- <PushButton toggleButton="true">
- <buttonData>
- <content:ButtonData text="Cup" icon="org/apache/pivot/tutorials/cup.png"/>
- </buttonData>
- </PushButton>
- <PushButton toggleButton="true">
- <buttonData>
- <content:ButtonData text="Star" icon="org/apache/pivot/tutorials/star.png"/>
- </buttonData>
- </PushButton>
- </BoxPane>
- </content>
+ <BoxPane styles="{padding:4, horizontalAlignment:'center',
+ verticalAlignment:'center'}">
+ <PushButton toggleButton="true">
+ <content:ButtonData text="Anchor" icon="org/apache/pivot/tutorials/anchor.png"/>
+ </PushButton>
+ <PushButton toggleButton="true">
+ <content:ButtonData text="Cup" icon="org/apache/pivot/tutorials/cup.png"/>
+ </PushButton>
+ <PushButton toggleButton="true">
+ <content:ButtonData text="Star" icon="org/apache/pivot/tutorials/star.png"/>
+ </PushButton>
+ </BoxPane>
</Window>
Modified: pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.wtkx
URL: http://svn.apache.org/viewvc/pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.wtkx?rev=954970&r1=954969&r2=954970&view=diff
==============================================================================
--- pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.wtkx (original)
+++ pivot/trunk/tutorials/src/org/apache/pivot/tutorials/effects/decorators.wtkx Tue Jun 15 17:08:47 2010
@@ -20,17 +20,6 @@ limitations under the License.
xmlns:wtkx="http://pivot.apache.org/wtkx"
xmlns:effects="org.apache.pivot.wtk.effects"
xmlns="org.apache.pivot.wtk">
- <wtkx:define>
- <effects:BlurDecorator wtkx:id="blurDecorator"/>
- <effects:FadeDecorator wtkx:id="fadeDecorator" opacity="0.33"/>
- <effects:GrayscaleDecorator wtkx:id="grayscaleDecorator"/>
- <effects:ReflectionDecorator wtkx:id="reflectionDecorator"/>
- <effects:SaturationDecorator wtkx:id="saturationDecorator" multiplier="2.5"/>
- <effects:ShadeDecorator wtkx:id="shadeDecorator" color="#ff0000" opacity="0.33"/>
- <effects:WatermarkDecorator wtkx:id="watermarkDecorator" text="Watermark"
- font="Arial BOLD 24" opacity="0.33"/>
- </wtkx:define>
-
<TablePane>
<columns>
<TablePane.Column width="1*"/>
@@ -72,31 +61,60 @@ limitations under the License.
<RadioButton buttonData="None" buttonGroup="$decoratorButtonGroup" selected="true"/>
<RadioButton buttonData="Blur" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$blurDecorator"/>
+ <userData>
+ <decorator>
+ <effects:BlurDecorator/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Fade" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$fadeDecorator"/>
+ <userData>
+ <decorator>
+ <effects:FadeDecorator opacity="0.33"/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Grayscale" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$grayscaleDecorator"/>
+ <userData>
+ <decorator>
+ <effects:GrayscaleDecorator/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Reflection" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$reflectionDecorator"/>
+ <userData>
+ <decorator>
+ <effects:ReflectionDecorator/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Saturation" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$saturationDecorator"/>
+ <userData>
+ <decorator>
+ <effects:SaturationDecorator multiplier="2.5"/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Shade" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$shadeDecorator"/>
+ <userData>
+ <decorator>
+ <effects:ShadeDecorator color="#ff0000" opacity="0.33"/>
+ </decorator>
+ </userData>
</RadioButton>
<RadioButton buttonData="Watermark" buttonGroup="$decoratorButtonGroup">
- <userData decorator="$watermarkDecorator"/>
+ <userData>
+ <decorator>
+ <effects:WatermarkDecorator text="Watermark" font="Arial BOLD 24"
+ opacity="0.33"/>
+ </decorator>
+ </userData>
</RadioButton>
</BoxPane>
</TablePane.Row>