diff options
Diffstat (limited to 'examples')
23 files changed, 26 insertions, 26 deletions
diff --git a/examples/declarative/border-image/example.qml b/examples/declarative/border-image/example.qml index 8f974e1..87d3f37 100644 --- a/examples/declarative/border-image/example.qml +++ b/examples/declarative/border-image/example.qml @@ -5,7 +5,7 @@ Rectangle { color: "white" width: 520; height: 280 - HorizontalPositioner { + Row { anchors.centerIn: parent spacing: 50 //! [0] diff --git a/examples/declarative/easing/easing.qml b/examples/declarative/easing/easing.qml index f15b3fb..60c2040 100644 --- a/examples/declarative/easing/easing.qml +++ b/examples/declarative/easing/easing.qml @@ -51,7 +51,7 @@ Rectangle { ListElement { type: "easeOutInBounce" } } - VerticalPositioner { + Column { id: Layout anchors.left: Window.left anchors.right: Window.right diff --git a/examples/declarative/fonts/fonts.qml b/examples/declarative/fonts/fonts.qml index 2aa4851..f7ed494 100644 --- a/examples/declarative/fonts/fonts.qml +++ b/examples/declarative/fonts/fonts.qml @@ -16,7 +16,7 @@ Rectangle { FontLoader { id: WebFont; source: "http://www.princexml.com/fonts/steffmann/Starburst.ttf" } FontLoader { id: WebFont2; source: "http://wrong.address.org" } - VerticalPositioner { + Column { anchors.fill: parent anchors.leftMargin: 10; anchors.rightMargin: 10 Text { diff --git a/examples/declarative/layouts/positioners.qml b/examples/declarative/layouts/positioners.qml index add46a4..fe28105 100644 --- a/examples/declarative/layouts/positioners.qml +++ b/examples/declarative/layouts/positioners.qml @@ -1,6 +1,6 @@ import Qt 4.6 Rectangle { width: 420; height: 420; id:page; color:"white" - VerticalPositioner { id: layout1; y:0; //width: 100; height:250; + Column { id: layout1; y:0; //width: 100; height:250; move: Transition{ NumberAnimation {properties: "y"; easing: "easeOutBounce" }} add: Transition{ NumberAnimation { properties: "y"; from: 500; duration:500; easing: "easeOutQuad"}} remove: Transition { NumberAnimation { properties:"y"; to: 500; duration:500; easing: "easeInQuad"}} @@ -14,7 +14,7 @@ Rectangle { width: 420; height: 420; id:page; color:"white" } Rectangle { color: "orange"; width: 100; height: 50; border.color: "black"; radius: 15 } } - HorizontalPositioner { id: layout2; y:300; + Row { id: layout2; y:300; move: Transition{ NumberAnimation {properties: "x"; easing: "easeOutBounce" }} add: Transition{ NumberAnimation { properties: "x"; from: 500; duration:500; easing: "easeOutQuad"} NumberAnimation { properties: "opacity"; from: 0; duration: 500;}} @@ -32,7 +32,7 @@ Rectangle { width: 420; height: 420; id:page; color:"white" Button { text: "Add"; icon: "add.png"; x: 145; y:140; onClicked: {blueH2.opacity=1; blueH1.opacity=1; blueV1.opacity=1; blueV2.opacity=1; blueG1.opacity=1; blueG2.opacity=1; blueG3.opacity=1;} } - GridPositioner { x:260; y:0; columns:3 + Grid { x:260; y:0; columns:3 remove: Transition { NumberAnimation{ properties: "opacity"; from: 1; to: 0; duration: 500} NumberAnimation{properties: "x,y"; easing: "easeOutBounce"} } move: Transition { NumberAnimation{ properties: "x,y"; easing: "easeOutBounce" }} diff --git a/examples/declarative/listview/highlight.qml b/examples/declarative/listview/highlight.qml index 3506ad7..2bf3a9f 100644 --- a/examples/declarative/listview/highlight.qml +++ b/examples/declarative/listview/highlight.qml @@ -14,7 +14,7 @@ Rectangle { Item { id: Wrapper width: 200; height: 50 - VerticalPositioner { + Column { Text { text: 'Name: ' + name } Text { text: 'Type: ' + type } Text { text: 'Age: ' + age } diff --git a/examples/declarative/listview/itemlist.qml b/examples/declarative/listview/itemlist.qml index bf1184f..c25ee59 100644 --- a/examples/declarative/listview/itemlist.qml +++ b/examples/declarative/listview/itemlist.qml @@ -40,7 +40,7 @@ Rectangle { height: 30 width: 240 - HorizontalPositioner { + Row { anchors.centerIn: parent spacing: 20 Repeater { diff --git a/examples/declarative/listview/listview.qml b/examples/declarative/listview/listview.qml index 1e2de65..0f197b4 100644 --- a/examples/declarative/listview/listview.qml +++ b/examples/declarative/listview/listview.qml @@ -14,7 +14,7 @@ Rectangle { Item { id: Wrapper width: 200; height: 50 - VerticalPositioner { + Column { Text { text: 'Name: ' + name } Text { text: 'Type: ' + type } Text { text: 'Age: ' + age } diff --git a/examples/declarative/listview/recipes.qml b/examples/declarative/listview/recipes.qml index b4ad4d5..eac8bb5 100644 --- a/examples/declarative/listview/recipes.qml +++ b/examples/declarative/listview/recipes.qml @@ -37,7 +37,7 @@ Rectangle { // Layout the page. Picture, title and ingredients at the top, method at the // bottom. Note that elements that should not be visible in the list // mode have their opacity set to wrapper.detailsOpacity. - HorizontalPositioner { + Row { id: topLayout x: 10; y: 10; height: recipePic.height; width: parent.width spacing: 10 @@ -45,7 +45,7 @@ Rectangle { id: recipePic source: picture; width: 48; height: 48 } - VerticalPositioner { + Column { height: recipePic.height; width: background.width-recipePic.width-20 spacing: 5 Text { id: name; text: title; font.bold: true; font.pointSize: 16 } diff --git a/examples/declarative/listview/sections.qml b/examples/declarative/listview/sections.qml index 1b51a43..ddb4931 100644 --- a/examples/declarative/listview/sections.qml +++ b/examples/declarative/listview/sections.qml @@ -36,7 +36,7 @@ Rectangle { x: 5 height: Layout.height + 4 anchors.top: Separator.bottom - VerticalPositioner { + Column { id: Layout y: 2 Text { text: 'Name: ' + name } diff --git a/examples/declarative/modules/installed-version.qml b/examples/declarative/modules/installed-version.qml index 0d3fa09..d90375dd 100644 --- a/examples/declarative/modules/installed-version.qml +++ b/examples/declarative/modules/installed-version.qml @@ -2,7 +2,7 @@ import Qt 4.6 import com.nokia.Foo 1.6 import com.nokia.Foo 1.7 as NewFoo -VerticalPositioner { +Column { Bar { } Baz { } NewFoo.Bar { } diff --git a/examples/declarative/modules/local-qualified.qml b/examples/declarative/modules/local-qualified.qml index f321738..d3532af 100644 --- a/examples/declarative/modules/local-qualified.qml +++ b/examples/declarative/modules/local-qualified.qml @@ -3,7 +3,7 @@ import Qt 4.6 import "local" as X import "local/SubLib" as Y -VerticalPositioner { +Column { X.Foo { } Y.Bar { } } diff --git a/examples/declarative/smooth/rect-painting.qml b/examples/declarative/smooth/rect-painting.qml index 0f3eb6e..4b6e223 100644 --- a/examples/declarative/smooth/rect-painting.qml +++ b/examples/declarative/smooth/rect-painting.qml @@ -12,7 +12,7 @@ Rectangle { color: "#eeeeee" } - GridPositioner { + Grid { anchors.centerIn: parent columns: 8; rows:4; spacing: 30 diff --git a/examples/declarative/snow/snow.qml b/examples/declarative/snow/snow.qml index 985f913..b6781c3 100644 --- a/examples/declarative/snow/snow.qml +++ b/examples/declarative/snow/snow.qml @@ -22,7 +22,7 @@ Rectangle { Item { anchors.centerIn: parent - HorizontalPositioner { + Row { id: MyLayout property real targetX: -(selectedX + imageWidth / 2) diff --git a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml index ecc5635..050f05f 100644 --- a/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml +++ b/examples/declarative/tutorials/contacts/1_Drawing_and_Animation/1_Drawing_and_animation.qml @@ -5,7 +5,7 @@ Rectangle { width: layout.width height: layout.height color: "white" - VerticalPositioner { + Column { id: layout width: childrenRect.width GroupBox { diff --git a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml index 885a3a1..a913dda 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/2_Reuse.qml @@ -5,7 +5,7 @@ Rectangle { width: layout.width height: layout.height color: "white" - GridPositioner { + Grid { id: layout columns: 2 rows: 4 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml index 8c54cd6..3516cee 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/3/Contact.qml @@ -14,7 +14,7 @@ Item { onEmailChanged: { emailField.value = email } onPhoneChanged: { phoneField.value = phone } - VerticalPositioner { + Column { id: layout anchors.fill: parent spacing: 5 diff --git a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml index 37fd8d3..83988ab 100644 --- a/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml +++ b/examples/declarative/tutorials/contacts/2_Reuse/4/Contact.qml @@ -17,7 +17,7 @@ Item { onEmailChanged: { emailField.value = email } onPhoneChanged: { phoneField.value = phone } - VerticalPositioner { + Column { id: layout anchors.fill: parent spacing: 5 diff --git a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml index 4cc16a4..a7764ed 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/3_Collections.qml @@ -11,7 +11,7 @@ Rectangle { } // relies on the current focus behavior whereby setting focus=true on a // component removes focus from any previous element - GridPositioner { + Grid { id: layout width: childrenRect.width height: childrenRect.height diff --git a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml index 6f40e24..d00bf05 100644 --- a/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml +++ b/examples/declarative/tutorials/contacts/3_Collections/lib/Contact.qml @@ -13,7 +13,7 @@ Item { onEmailChanged: { emailField.value = email } onPhoneChanged: { phoneField.value = phone } - VerticalPositioner { + Column { id: layout anchors.fill: parent spacing: 5 diff --git a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml index 32e9369..458e302 100644 --- a/examples/declarative/tutorials/helloworld/t2/tutorial2.qml +++ b/examples/declarative/tutorials/helloworld/t2/tutorial2.qml @@ -13,7 +13,7 @@ Rectangle { y: 30 anchors.horizontalCenter: Page.horizontalCenter } - GridPositioner { + Grid { id: ColorPicker x: 0 anchors.bottom: Page.bottom diff --git a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml index daf32d5..81e1f6a 100644 --- a/examples/declarative/tutorials/helloworld/t3/tutorial3.qml +++ b/examples/declarative/tutorials/helloworld/t3/tutorial3.qml @@ -40,7 +40,7 @@ Rectangle { ] } MouseRegion { id: MouseRegion; anchors.fill: HelloText } - GridPositioner { + Grid { id: ColorPicker x: 0 anchors.bottom: Page.bottom diff --git a/examples/declarative/velocity/velocity.qml b/examples/declarative/velocity/velocity.qml index 088532e..c2425da 100644 --- a/examples/declarative/velocity/velocity.qml +++ b/examples/declarative/velocity/velocity.qml @@ -98,7 +98,7 @@ Rectangle { id: Flick anchors.fill: parent viewportWidth: Lay.width - HorizontalPositioner { + Row { id: Lay Repeater { dataSource: List diff --git a/examples/declarative/webview/autosize.qml b/examples/declarative/webview/autosize.qml index 0099f37..13004a8 100644 --- a/examples/declarative/webview/autosize.qml +++ b/examples/declarative/webview/autosize.qml @@ -7,7 +7,7 @@ Rectangle { color: "white" width: 200 height: Layout.height - VerticalPositioner { + Column { id: Layout spacing: 2 WebView { |