Ubuntu Music App

Merge lp:~vthompson/music-app/fix-1291712 into lp:music-app/trusty

  1. fix-1291712
  2. Merge into trusty
Proposed by Victor Thompson
Status: Merged
Approved by: Victor Thompson
Approved revision: 385
Merged at revision: 388
Proposed branch: lp:~vthompson/music-app/fix-1291712
Merge into: lp:music-app/trusty
Diff against target: 43 lines (+11/-1)
2 files modified
MusicSearch.qml (+6/-0)
music-app.qml (+5/-1)
To merge this branch: bzr merge lp:~vthompson/music-app/fix-1291712
Reviewer Review Type Date Requested Status
Andrew Hayzen Approve
Ubuntu Phone Apps Jenkins Bot continuous-integration Approve
Review via email: mp+211168@code.launchpad.net

Commit message

* Allow search sheet to be used
* Remove focus from TextField when the ListView is scrolled or item is expanded

Description of the change

This MR is to allow search sheet to be used on the current Qt5.2 images. Additionally, a modification was made to remove focus from TextField when the ListView is scrolled or item is expanded

To post a comment you must log in.
Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:384
http://91.189.93.70:8080/job/music-app-ci/644/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1762
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/644
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/646
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/365

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/644/rebuild

review: Approve (continuous-integration)
lp:~vthompson/music-app/fix-1291712 updated
385. By Victor Thompson

Redo fix changes

Revision history for this message
Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote :

PASSED: Continuous integration, rev:385
http://91.189.93.70:8080/job/music-app-ci/645/
Executed test runs:
    SUCCESS: http://91.189.93.70:8080/job/generic-mediumtests-trusty/1763
    SUCCESS: http://91.189.93.70:8080/job/music-app-raring-amd64-ci/645
    SUCCESS: http://91.189.93.70:8080/job/music-app-saucy-amd64-ci/647
    SUCCESS: http://91.189.93.70:8080/job/music-app-trusty-amd64-ci/366

Click here to trigger a rebuild:
http://91.189.93.70:8080/job/music-app-ci/645/rebuild

review: Approve (continuous-integration)
Revision history for this message
Andrew Hayzen (ahayzen) wrote :

Looks good :)

review: Approve

Preview Diff

[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
1=== modified file 'MusicSearch.qml'
2--- MusicSearch.qml 2014-03-08 21:34:13 +0000
3+++ MusicSearch.qml 2014-03-15 08:39:33 +0000
4@@ -147,6 +147,11 @@
5 width: parent.width
6 height: parent.width
7 model: searchModel.model
8+
9+ onMovementStarted: {
10+ searchTrackView.forceActiveFocus()
11+ }
12+
13 delegate: ListItem.Standard {
14 id: search
15 objectName: "playlist"
16@@ -259,6 +264,7 @@
17 anchors.top: parent.top
18 width: styleMusic.common.expandedItem * 3
19 onClicked: {
20+ expandItem.forceActiveFocus()
21 if(expandable.visible) {
22 customdebug("clicked collapse")
23 expandable.visible = false
24
25=== modified file 'music-app.qml'
26--- music-app.qml 2014-03-12 21:16:32 +0000
27+++ music-app.qml 2014-03-15 08:39:33 +0000
28@@ -136,10 +136,14 @@
29 id: searchAction
30 text: i18n.tr("Search")
31 keywords: i18n.tr("Search Track")
32- onTriggered: PopupUtils.open(Qt.resolvedUrl("MusicSearch.qml"), mainView,
33+ onTriggered: {
34+ if (!searchSheet.sheetVisible) {
35+ PopupUtils.open(searchSheet.sheet, mainView,
36 {
37 title: i18n.tr("Search")
38 } )
39+ }
40+ }
41 }
42 Action {
43 id: nextAction

Subscribers

People subscribed via source and target branches

to status/vote changes: