Merge lp:~unity-team/unity8/preview-rating-position-listview into lp:unity8

Proposed by Andrea Cimitan
Status: Rejected
Rejected by: Michał Sawicz
Proposed branch: lp:~unity-team/unity8/preview-rating-position-listview
Merge into: lp:unity8
Diff against target: 47 lines (+8/-0)
3 files modified
qml/Dash/Previews/PreviewRatingInput.qml (+1/-0)
qml/Dash/Previews/PreviewWidget.qml (+3/-0)
qml/Dash/Previews/PreviewWidgetFactory.qml (+4/-0)
To merge this branch: bzr merge lp:~unity-team/unity8/preview-rating-position-listview
Reviewer Review Type Date Requested Status
Unity8 CI Bot continuous-integration Needs Fixing
Michał Sawicz Disapprove
Review via email: mp+288707@code.launchpad.net
To post a comment you must log in.
2228. By Andrea Cimitan

init to -1

Revision history for this message
Michał Sawicz (saviq) wrote :

There is makeSureVisible already, better to use that? And please include in the branch that changes the preview widget.

review: Disapprove
Revision history for this message
Unity8 CI Bot (unity8-ci-bot) wrote :

FAILED: Continuous integration, rev:2227
No commit message was specified in the merge proposal. Click on the following link and set the commit message (if you want a jenkins rebuild you need to trigger it yourself):
https://code.launchpad.net/~unity-team/unity8/preview-rating-position-listview/+merge/288707/+edit-commit-message

https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/668/
Executed test runs:
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-0-fetch/876
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=vivid+overlay/892
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-1-sourcepkg/release=xenial/892
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=vivid+overlay/890/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=amd64,release=xenial/890/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=vivid+overlay/890/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=armhf,release=xenial/890/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=vivid+overlay/890/artifact/output/*zip*/output.zip
    SUCCESS: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/890
        deb: https://unity8-jenkins.ubuntu.com/job/build-2-binpkg/arch=i386,release=xenial/890/artifact/output/*zip*/output.zip

Click here to trigger a rebuild:
https://unity8-jenkins.ubuntu.com/job/lp-unity8-ci/668/rebuild

review: Needs Fixing (continuous-integration)

Unmerged revisions

2228. By Andrea Cimitan

init to -1

2227. By Andrea Cimitan

move the preview listview when touching the preview rating widget

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'qml/Dash/Previews/PreviewRatingInput.qml'
2--- qml/Dash/Previews/PreviewRatingInput.qml 2015-09-14 07:47:24 +0000
3+++ qml/Dash/Previews/PreviewRatingInput.qml 2016-03-10 21:25:16 +0000
4@@ -93,6 +93,7 @@
5 }
6 size: 5
7 onValueChanged: {
8+ parentFlickable.positionViewAtIndex(widgetIndex, ListView.Contain);
9 if (widgetData["visible"] === "rating") root.submit();
10 }
11
12
13=== modified file 'qml/Dash/Previews/PreviewWidget.qml'
14--- qml/Dash/Previews/PreviewWidget.qml 2016-02-19 11:42:42 +0000
15+++ qml/Dash/Previews/PreviewWidget.qml 2016-03-10 21:25:16 +0000
16@@ -37,6 +37,9 @@
17 /// The parent (vertical) flickable this widget is in (if any)
18 property var parentFlickable: null
19
20+ /// The index of this widget
21+ property int widgetIndex: -1
22+
23 /*! \brief This signal should be emitted when a preview action was triggered.
24 *
25 * \param widgetId, actionId Respective identifiers from widgetData.
26
27=== modified file 'qml/Dash/Previews/PreviewWidgetFactory.qml'
28--- qml/Dash/Previews/PreviewWidgetFactory.qml 2016-02-19 11:42:42 +0000
29+++ qml/Dash/Previews/PreviewWidgetFactory.qml 2016-03-10 21:25:16 +0000
30@@ -31,6 +31,9 @@
31 //! Widget data, forwarded to the widget as is.
32 property var widgetData: null
33
34+ //! Index of the widget.
35+ property int widgetIndex: -1
36+
37 //! The ScopeStyle component.
38 property var scopeStyle: null
39
40@@ -82,6 +85,7 @@
41 item.expanded = Qt.binding(function() { return root.expanded } )
42 item.scopeStyle = Qt.binding(function() { return root.scopeStyle } )
43 item.parentFlickable = Qt.binding(function() { return root.parentFlickable } )
44+ item.widgetIndex = Qt.binding(function() { return root.widgetIndex } )
45 }
46
47 Connections {

Subscribers

People subscribed via source and target branches