I have made the following changes intended for : CE:MW:Shared / qt-components
Please review and accept or decline. BOSS has already run some checks on this request. See the "Messages from BOSS" section below. https://build.pub.meego.com//request/show/8392 Thank You, Robin Burchell [This message was auto-generated] --- Request # 8392: Messages from BOSS: State: review at 2013-03-08T16:14:21 by bossbot Reviews: accepted by bossbot : Prechecks succeeded. new for CE-maintainers : Please replace this text with a review and approve/reject the review (not the SR). BOSS will take care of the rest Changes: submit: home:w00t:branches:CE:MW:Shared / qt-components -> CE:MW:Shared / qt-components changes files: -------------- --- qt-components.changes +++ qt-components.changes @@ -0,0 +1,6 @@ +* Fri Mar 08 2013 Robin Burchell <[email protected]> - 1.4.9 +- Default sheet children to 'content' for easier use (from Robin) +- Fix some anchoring bugs in the gallery (from Robin) +- Improve performance of ListDelegate (from Robin) +- Use new BusyIndicator (from Robin) + old: ---- qt-components-1.4.8.tar.bz2 new: ---- qt-components-1.4.9.tar.bz2 spec files: ----------- --- qt-components.spec +++ qt-components.spec @@ -9,7 +9,7 @@ # << macros Summary: Qt Quick UX Components -Version: 1.4.8 +Version: 1.4.9 Release: 1 Group: System/Libraries License: BSD other changes: -------------- ++++++ qt-components-1.4.8.tar.bz2 -> qt-components-1.4.9.tar.bz2 --- examples/meego/QmlComponentGallery/qml/SectionScrollerPage.qml +++ examples/meego/QmlComponentGallery/qml/SectionScrollerPage.qml @@ -44,108 +44,105 @@ Page { id: sectionScrollerPage - anchors.margins: UiConstants.DefaultMargin tools: commonTools - Item { - anchors.fill: parent + ListModel { + id: testModel - ListModel { - id: testModel + ListElement { title: "A Cat 1"; alphabet: "A" } + ListElement { title: "A Cat 2"; alphabet: "A" } + ListElement { title: "A Cat 3"; alphabet: "A" } + ListElement { title: "A Cat 1"; alphabet: "A" } + ListElement { title: "A Cat 2"; alphabet: "A" } + ListElement { title: "A Cat 3"; alphabet: "A" } + ListElement { title: "Boo 1"; alphabet: "B" } + ListElement { title: "Boo 2"; alphabet: "B" } + ListElement { title: "Boo 3"; alphabet: "B" } + ListElement { title: "Cat 1"; alphabet: "C" } + ListElement { title: "Cat 2"; alphabet: "C" } + ListElement { title: "Cat 3"; alphabet: "C" } + ListElement { title: "Cat 4"; alphabet: "C" } + ListElement { title: "Cat 5"; alphabet: "C" } + ListElement { title: "Cat 6"; alphabet: "C" } + ListElement { title: "Dog 1"; alphabet: "D" } + ListElement { title: "Dog 2"; alphabet: "D" } + ListElement { title: "Dog 3"; alphabet: "D" } + ListElement { title: "Dog 4"; alphabet: "D" } + ListElement { title: "Dog 5"; alphabet: "D" } + ListElement { title: "Dog 6"; alphabet: "D" } + ListElement { title: "Dog 7"; alphabet: "D" } + ListElement { title: "Dog 8"; alphabet: "D" } + ListElement { title: "Dog 9"; alphabet: "D" } + ListElement { title: "Elephant 1"; alphabet: "E" } + ListElement { title: "Elephant 2"; alphabet: "E" } + ListElement { title: "Elephant 3"; alphabet: "E" } + ListElement { title: "Elephant 4"; alphabet: "E" } + ListElement { title: "Elephant 5"; alphabet: "E" } + ListElement { title: "Elephant 6"; alphabet: "E" } + ListElement { title: "FElephant 1"; alphabet: "F" } + ListElement { title: "FElephant 2"; alphabet: "F" } + ListElement { title: "FElephant 3"; alphabet: "F" } + ListElement { title: "FElephant 4"; alphabet: "F" } + ListElement { title: "FElephant 5"; alphabet: "F" } + ListElement { title: "FElephant 6"; alphabet: "F" } + ListElement { title: "Guinea pig"; alphabet: "G" } + ListElement { title: "Goose"; alphabet: "G" } + ListElement { title: "Giraffe"; alphabet: "G" } + ListElement { title: "Guinea pig"; alphabet: "G" } + ListElement { title: "Goose"; alphabet: "G" } + ListElement { title: "Giraffe"; alphabet: "G" } + ListElement { title: "Guinea pig"; alphabet: "G" } + ListElement { title: "Goose"; alphabet: "G" } + ListElement { title: "Giraffe"; alphabet: "G" } + ListElement { title: "Horse"; alphabet: "H" } + ListElement { title: "Horse"; alphabet: "H" } + ListElement { title: "Horse"; alphabet: "H" } + ListElement { title: "Parrot"; alphabet: "P" } + ListElement { title: "Parrot"; alphabet: "P" } + ListElement { title: "Parrot"; alphabet: "P" } + ListElement { title: "Parrot"; alphabet: "P" } + } - ListElement { title: "A Cat 1"; alphabet: "A" } - ListElement { title: "A Cat 2"; alphabet: "A" } - ListElement { title: "A Cat 3"; alphabet: "A" } - ListElement { title: "A Cat 1"; alphabet: "A" } - ListElement { title: "A Cat 2"; alphabet: "A" } - ListElement { title: "A Cat 3"; alphabet: "A" } - ListElement { title: "Boo 1"; alphabet: "B" } - ListElement { title: "Boo 2"; alphabet: "B" } - ListElement { title: "Boo 3"; alphabet: "B" } - ListElement { title: "Cat 1"; alphabet: "C" } - ListElement { title: "Cat 2"; alphabet: "C" } - ListElement { title: "Cat 3"; alphabet: "C" } - ListElement { title: "Cat 4"; alphabet: "C" } - ListElement { title: "Cat 5"; alphabet: "C" } - ListElement { title: "Cat 6"; alphabet: "C" } - ListElement { title: "Dog 1"; alphabet: "D" } - ListElement { title: "Dog 2"; alphabet: "D" } - ListElement { title: "Dog 3"; alphabet: "D" } - ListElement { title: "Dog 4"; alphabet: "D" } - ListElement { title: "Dog 5"; alphabet: "D" } - ListElement { title: "Dog 6"; alphabet: "D" } - ListElement { title: "Dog 7"; alphabet: "D" } - ListElement { title: "Dog 8"; alphabet: "D" } - ListElement { title: "Dog 9"; alphabet: "D" } - ListElement { title: "Elephant 1"; alphabet: "E" } - ListElement { title: "Elephant 2"; alphabet: "E" } - ListElement { title: "Elephant 3"; alphabet: "E" } - ListElement { title: "Elephant 4"; alphabet: "E" } - ListElement { title: "Elephant 5"; alphabet: "E" } - ListElement { title: "Elephant 6"; alphabet: "E" } - ListElement { title: "FElephant 1"; alphabet: "F" } - ListElement { title: "FElephant 2"; alphabet: "F" } - ListElement { title: "FElephant 3"; alphabet: "F" } - ListElement { title: "FElephant 4"; alphabet: "F" } - ListElement { title: "FElephant 5"; alphabet: "F" } - ListElement { title: "FElephant 6"; alphabet: "F" } - ListElement { title: "Guinea pig"; alphabet: "G" } - ListElement { title: "Goose"; alphabet: "G" } - ListElement { title: "Giraffe"; alphabet: "G" } - ListElement { title: "Guinea pig"; alphabet: "G" } - ListElement { title: "Goose"; alphabet: "G" } - ListElement { title: "Giraffe"; alphabet: "G" } - ListElement { title: "Guinea pig"; alphabet: "G" } - ListElement { title: "Goose"; alphabet: "G" } - ListElement { title: "Giraffe"; alphabet: "G" } - ListElement { title: "Horse"; alphabet: "H" } - ListElement { title: "Horse"; alphabet: "H" } - ListElement { title: "Horse"; alphabet: "H" } - ListElement { title: "Parrot"; alphabet: "P" } - ListElement { title: "Parrot"; alphabet: "P" } - ListElement { title: "Parrot"; alphabet: "P" } - ListElement { title: "Parrot"; alphabet: "P" } + ListView { + id: list + anchors.fill: parent + delegate: ListDelegate { + x: UiConstants.DefaultMargin + width: ListView.view.width - UiConstants.DefaultMargin * 2 } - ListView { - id: list - - anchors.fill: parent - delegate: ListDelegate {} - - model: testModel - section.property: "alphabet" - section.criteria: ViewSection.FullString - section.delegate: Item { - // "GroupHeader" component? - width: parent.width - height: 40 - Text { - id: headerLabel - anchors.right: parent.right - anchors.bottom: parent.bottom - anchors.rightMargin: 8 - anchors.bottomMargin: 2 - text: section - font.bold: true - font.pointSize: 18 - color: theme.inverted ? "#4D4D4D" : "#3C3C3C"; - } - Image { - anchors.right: headerLabel.left - anchors.left: parent.left - anchors.verticalCenter: headerLabel.verticalCenter - anchors.rightMargin: 24 - source: "image://theme/meegotouch-groupheader" + (theme.inverted ? "-inverted" : "") + "-background" - } + model: testModel + section.property: "alphabet" + section.criteria: ViewSection.FullString + section.delegate: Item { + // "GroupHeader" component? + width: parent.width + height: 40 + Text { + id: headerLabel + anchors.right: parent.right + anchors.rightMargin: UiConstants.DefaultMargin + anchors.bottom: parent.bottom + anchors.bottomMargin: 2 + text: section + font.bold: true + font.pointSize: 18 + color: theme.inverted ? "#4D4D4D" : "#3C3C3C"; + } + Image { + anchors.right: headerLabel.left + anchors.left: parent.left + anchors.verticalCenter: headerLabel.verticalCenter + anchors.rightMargin: 24 + source: "image://theme/meegotouch-groupheader" + (theme.inverted ? "-inverted" : "") + "-background" } } + } - SectionScroller { - listView: list - } - ScrollDecorator { - flickableItem: list - } + SectionScroller { + listView: list + } + ScrollDecorator { + flickableItem: list } } --- src/meego/BusyIndicator.qml +++ src/meego/BusyIndicator.qml @@ -69,14 +69,17 @@ Image { id: spinner property int index: 1 - // This is re-evaluated for each frame. Could be optimized by calculating the sources separately is js - source: root.platformStyle.spinnerFrames + "_" + root.implicitWidth + "_" + index + source: "image://theme/nemomobile-busyindicator" + (theme.inverted ? "-inverted" : "") smooth: true + height: root.height + width: root.width - NumberAnimation on index { - from: 1; to: root.platformStyle.numberOfFrames + NumberAnimation on rotation { + from: 0; to: 360 duration: root.platformStyle.period running: root.running && root.visible && Qt.application.active && !internal.offScreen + target: spinner + property: "rotation" loops: Animation.Infinite } } --- src/meego/Sheet.qml +++ src/meego/Sheet.qml @@ -48,7 +48,7 @@ height: parent ? parent.height : 0 property alias title: header.children - property alias content: contentField.children + default property alias content: contentField.data property alias buttons: header.children property Item visualParent property int status: DialogStatus.Closed --- src/meego/extras/ListDelegate.qml +++ src/meego/extras/ListDelegate.qml @@ -42,12 +42,9 @@ import com.nokia.meego 1.0 import "constants.js" as UI -Item { +MouseArea { id: listItem - signal clicked - property alias pressed: mouseArea.pressed - property int titleSize: UI.LIST_TILE_SIZE property int titleWeight: Font.Bold property string titleFont: UiConstants.DefaultFontFamily @@ -76,7 +73,7 @@ // Fill page porders anchors.leftMargin: -UI.MARGIN_XLARGE anchors.rightMargin: -UI.MARGIN_XLARGE - visible: mouseArea.pressed + visible: listItem.pressed source: theme.inverted ? "image://theme/meegotouch-panel-inverted-background-pressed" : "image://theme/meegotouch-panel-background-pressed" } @@ -89,7 +86,7 @@ visible: listItem.iconSource ? true : false width: UI.LIST_ICON_SIZE height: UI.LIST_ICON_SIZE - source: listItem.iconSource ? listItem.iconSource : "" + source: listItem.iconSource } Column { @@ -101,28 +98,21 @@ font.family: listItem.titleFont font.weight: listItem.titleWeight font.pixelSize: listItem.titleSize - color: mouseArea.pressed ? listItem.titleColorPressed : listItem.titleColor + color: listItem.pressed ? listItem.titleColorPressed : listItem.titleColor } Label { id: subText - text: listItem.subtitleText ? listItem.subtitleText : "" + text: listItem.subtitleText font.family: listItem.subtitleFont font.weight: listItem.subtitleWeight font.pixelSize: listItem.subtitleSize - color: mouseArea.pressed ? listItem.subtitleColorPressed : listItem.subtitleColor + color: listItem.pressed ? listItem.subtitleColorPressed : listItem.subtitleColor visible: text != "" } } } - MouseArea { - id: mouseArea; - anchors.fill: parent - onClicked: { - listItem.clicked(); - } - } Image { function handleIconId() { ++++++ qt-components.yaml --- qt-components.yaml +++ qt-components.yaml @@ -1,6 +1,6 @@ Name: qt-components Summary: Qt Quick UX Components -Version: 1.4.8 +Version: 1.4.9 Release: 1 Group: System/Libraries License: BSD
