diff options
8 files changed, 39 insertions, 39 deletions
diff --git a/doc/src/snippets/declarative/GroupBox.qml b/doc/src/snippets/declarative/GroupBox.qml index 13e7eb6..6c5431e 100644 --- a/doc/src/snippets/declarative/GroupBox.qml +++ b/doc/src/snippets/declarative/GroupBox.qml @@ -1,12 +1,12 @@ import Qt 4.6 ContentWrapper { - id: Container; width: parent.width; height: contents.height + id: container; width: parent.width; height: contents.height children: [ Rectangle { width: parent.width; height: contents.height color: "white"; pen.width: 2; pen.color: "#adaeb0"; radius: 10 - VerticalLayout { + Column { id: layout; width: parent.width; margin: 5; spacing: 2 Content { } } diff --git a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml index 6868385..3cf9ba7 100644 --- a/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml +++ b/doc/src/snippets/declarative/gridview/dummydata/ContactModel.qml @@ -1,7 +1,7 @@ import Qt 4.6 ListModel { - id: ContactModel + id: contactModel ListElement { name: "Bill Smith" number: "555 3264" diff --git a/doc/src/snippets/declarative/gridview/gridview.qml b/doc/src/snippets/declarative/gridview/gridview.qml index d0f0623..1a2021c 100644 --- a/doc/src/snippets/declarative/gridview/gridview.qml +++ b/doc/src/snippets/declarative/gridview/gridview.qml @@ -11,11 +11,11 @@ Rectangle { // instantiated for each visible item in the list. //! [0] Component { - id: Delegate + id: delegate Item { - id: Wrapper + id: wrapper width: 80; height: 78 - VerticalLayout { + Column { Image { source: portrait; anchors.horizontalCenter: parent.horizontalCenter } Text { text: name; anchors.horizontalCenter: parent.horizontalCenter } } @@ -26,7 +26,7 @@ Rectangle { // by each ListView and placed behind the current item. //! [1] Component { - id: Highlight + id: highlight Rectangle { color: "lightsteelblue" radius: 5 @@ -37,9 +37,9 @@ Rectangle { //! [2] GridView { width: parent.width; height: parent.height - model: ContactModel; delegate: Delegate + model: ContactModel; delegate: delegate cellWidth: 80; cellHeight: 80 - highlight: Highlight + highlight: highlight focus: true } //! [2] diff --git a/doc/src/snippets/declarative/listview/highlight.qml b/doc/src/snippets/declarative/listview/highlight.qml index 97eac45..2234ee7 100644 --- a/doc/src/snippets/declarative/listview/highlight.qml +++ b/doc/src/snippets/declarative/listview/highlight.qml @@ -11,9 +11,9 @@ Rectangle { // instantiated for each visible item in the list. //! [0] Component { - id: Delegate + id: delegate Item { - id: Wrapper + id: wrapper width: 180; height: 40 Column { x: 5; y: 5 @@ -28,22 +28,22 @@ Rectangle { // highlight moves to the current item. //! [1] Component { - id: Highlight + id: highlight Rectangle { width: 180; height: 40 color: "lightsteelblue"; radius: 5 y: SpringFollow { - source: List.currentItem.y + source: list.currentItem.y spring: 3 damping: 0.2 } } } ListView { - id: List + id: list width: parent.height; height: parent.height - model: ContactModel; delegate: Delegate - highlight: Highlight + model: ContactModel; delegate: delegate + highlight: highlight highlightFollowsCurrentItem: false focus: true } diff --git a/doc/src/snippets/declarative/listview/listview.qml b/doc/src/snippets/declarative/listview/listview.qml index c907077..be0f3ad 100644 --- a/doc/src/snippets/declarative/listview/listview.qml +++ b/doc/src/snippets/declarative/listview/listview.qml @@ -12,11 +12,11 @@ Rectangle { // instantiated for each visible item in the list. //! [0] Component { - id: Delegate + id: delegate Item { - id: Wrapper + id: wrapper width: 180; height: 40 - VerticalLayout { + Column { x: 5; y: 5 Text { text: '<b>Name:</b> ' + name } Text { text: '<b>Number:</b> ' + number } @@ -28,7 +28,7 @@ Rectangle { // by each ListView and placed behind the current item. //! [1] Component { - id: Highlight + id: highlight Rectangle { color: "lightsteelblue" radius: 5 @@ -40,8 +40,8 @@ Rectangle { ListView { width: parent.width; height: parent.height model: ContactModel - delegate: Delegate - highlight: Highlight + delegate: delegate + highlight: highlight focus: true } //! [2] diff --git a/doc/src/snippets/declarative/pathview/pathattributes.qml b/doc/src/snippets/declarative/pathview/pathattributes.qml index 92d6966..19a192c 100644 --- a/doc/src/snippets/declarative/pathview/pathattributes.qml +++ b/doc/src/snippets/declarative/pathview/pathattributes.qml @@ -5,22 +5,22 @@ Rectangle { //! [0] //! [1] Component { - id: Delegate + id: delegate Item { - id: Wrapper + id: wrapper width: 80; height: 80 scale: PathView.scale opacity: PathView.opacity - VerticalLayout { - Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon } - Text { id: Name; text: name; font.pointSize: 16} + Column { + Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon } + Text { id: name; text: name; font.pointSize: 16} } } } //! [1] //! [2] PathView { - anchors.fill: parent; model: MenuModel; delegate: Delegate + anchors.fill: parent; model: MenuModel; delegate: delegate path: Path { startX: 120; startY: 100 PathAttribute { name: "scale"; value: 1.0 } diff --git a/doc/src/snippets/declarative/pathview/pathview.qml b/doc/src/snippets/declarative/pathview/pathview.qml index 004a1d2..5605139 100644 --- a/doc/src/snippets/declarative/pathview/pathview.qml +++ b/doc/src/snippets/declarative/pathview/pathview.qml @@ -5,20 +5,20 @@ Rectangle { //! [0] //! [1] Component { - id: Delegate + id: delegate Item { - id: Wrapper + id: wrapper width: 80; height: 80 - VerticalLayout { - Image { anchors.horizontalCenter: Name.horizontalCenter; width: 64; height: 64; source: icon } - Text { id: Name; text: name; font.pointSize: 16} + Column { + Image { anchors.horizontalCenter: name.horizontalCenter; width: 64; height: 64; source: icon } + Text { id: name; text: name; font.pointSize: 16} } } } //! [1] //! [2] PathView { - anchors.fill: parent; model: MenuModel; delegate: Delegate + anchors.fill: parent; model: MenuModel; delegate: delegate path: Path { startX: 120; startY: 100 PathQuad { x: 120; y: 25; controlX: 260; controlY: 75 } diff --git a/examples/declarative/states/transitions.qml b/examples/declarative/states/transitions.qml index be1419d..cc6894d 100644 --- a/examples/declarative/states/transitions.qml +++ b/examples/declarative/states/transitions.qml @@ -1,25 +1,25 @@ import Qt 4.6 Rectangle { - id: Page + id: page width: 300; height: 300; color: "white" // A target region. Clicking in here sets the state to '' - the default state Rectangle { x: 0; y: 0; width: 50; height: 50 color: "transparent"; border.color: "black" - MouseRegion { anchors.fill: parent; onClicked: { Page.state='' } } + MouseRegion { anchors.fill: parent; onClicked: { page.state='' } } } // Another target region. Clicking in here sets the state to 'Position1' Rectangle { x: 150; y: 50; width: 50; height: 50 color: "transparent"; border.color: "black" - MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position1' } } + MouseRegion { anchors.fill: parent; onClicked: { page.state='Position1' } } } // Another target region. Clicking in here sets the state to 'Position2' Rectangle { x: 0; y: 200; width: 50; height: 50 color: "transparent"; border.color: "black" - MouseRegion { anchors.fill: parent; onClicked: { Page.state='Position2' } } + MouseRegion { anchors.fill: parent; onClicked: { page.state='Position2' } } } // Rect which will be moved when my state changes Rectangle { id: myrect; width: 50; height: 50; color: "red" } @@ -34,7 +34,7 @@ Rectangle { y: 50 } }, - // In state 'Position2', change y to 100. We do not specify 'x' here - + // In state 'Position2', change y to 100. We do not specify 'x' here - // it will therefore be restored to its default value of 0, if it // had been changed. State { |