Merge lp:~ahayzen/music-app/remix-remove-legacy-toolbar into lp:music-app/remix
- remix-remove-legacy-toolbar
- Merge into remix
Proposed by
Andrew Hayzen
| Status: | Merged |
|---|---|
| Approved by: | Victor Thompson |
| Approved revision: | 664 |
| Merged at revision: | 655 |
| Proposed branch: | lp:~ahayzen/music-app/remix-remove-legacy-toolbar |
| Merge into: | lp:music-app/remix |
| Diff against target: |
1418 lines (+192/-740) 6 files modified
MusicNowPlaying.qml (+28/-16) MusicToolbar.qml (+3/-594) common/MusicPage.qml (+1/-1) music-app.qml (+1/-2) tests/autopilot/music_app/__init__.py (+99/-81) tests/autopilot/music_app/tests/test_music.py (+60/-46) |
| To merge this branch: | bzr merge lp:~ahayzen/music-app/remix-remove-legacy-toolbar |
| Related bugs: | |
| Related blueprints: |
Music Remix for RTM
(Essential)
|
| Reviewer | Review Type | Date Requested | Status |
|---|---|---|---|
| Victor Thompson | Approve | ||
| Ubuntu Phone Apps Jenkins Bot | continuous-integration | Approve | |
|
Review via email:
|
|||
Commit message
* Remove legacy toolbar code
* Make full (non listview) now playing default
* Fix header disappearing in full now playing
Description of the change
* Remove legacy toolbar code
* Make full (non listview) now playing default
* Fix header disappearing in full now playing
To post a comment you must log in.
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
review:
Needs Fixing
(continuous-integration)
- 653. By Andrew Hayzen
-
* Various fixes for autopilot
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:653
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 654. By Andrew Hayzen
-
* Fix for autopilot
- 655. By Andrew Hayzen
-
* Fix for missed case
- 656. By Andrew Hayzen
-
* Remove ensuring visible as this method is called sometimes when the now playing is not the currentPage
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:654
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:656
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 657. By Andrew Hayzen
-
* Further fixes for autopilot
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:657
http://
Executed test runs:
FAILURE: http://
FAILURE: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 658. By Andrew Hayzen
-
* Fix for pyflakes
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:658
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 659. By Andrew Hayzen
-
* Wait for now playing page to be visible when switching
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:659
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 660. By Andrew Hayzen
-
* Reget now playing page after switching
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:660
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Victor Thompson (vthompson) wrote : | # |
So far the code looks good and the test updates seem sane.
However, there are two things that don't seem to work properly:
1. In the Now Playing list view the swipe to add to playlist doesn't appear to work. Essentially, the app doesn't present the playlist chooser and instead ejects the user to the root tab they were previously on.
2. There seems to be issues removing items from the Now Playing list view. When I swipe to delete the now playing item, or sometimes other items IIRC, they aren't actually removed from the list. Other odd things are happening, such as removing a non-playing item causing the currently enlarged art to change.
I'm not sure what is going on with the second issue, but it would benefit from simplifying the Now Playing list per the redesign we are supposed to get.
review:
Needs Fixing
- 661. By Andrew Hayzen
-
* Fix for pagestack jumping
* Added extra code comment
Revision history for this message
| Andrew Hayzen (ahayzen) wrote : | # |
1) Fixed Tim suggested modifying the head.backAction for just the now playing page to do the extra pops, this works in a much less hacky way :)
2) I'm not able to reproduce this on device, seems fine to me?
Added code comment as suggested in the inline diff comments.
- 662. By Andrew Hayzen
-
* Merge of trunk
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:662
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 663. By Andrew Hayzen
-
* Add objectName for back button
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
FAILED: Continuous integration, rev:663
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Needs Fixing
(continuous-integration)
- 664. By Andrew Hayzen
-
* Use custom back button
Revision history for this message
| Ubuntu Phone Apps Jenkins Bot (ubuntu-phone-apps-jenkins-bot) wrote : | # |
PASSED: Continuous integration, rev:664
http://
Executed test runs:
SUCCESS: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://
review:
Approve
(continuous-integration)
Revision history for this message
| Victor Thompson (vthompson) wrote : | # |
I can get the app to have a mismatch between the now playing large art and the song shown in the toolbar pretty easily by swiping to delete a now playing large cover art: http://
I'm not sure exactly what the fix is for this.
review:
Needs Fixing
Revision history for this message
| Victor Thompson (vthompson) wrote : | # |
The bug mentioned above was not introduced by this code change, so we will not block on it. This LGTM!
review:
Approve
Preview Diff
[H/L] Next/Prev Comment, [J/K] Next/Prev File, [N/P] Next/Prev Hunk
| 1 | === modified file 'MusicNowPlaying.qml' | |||
| 2 | --- MusicNowPlaying.qml 2014-10-06 00:26:56 +0000 | |||
| 3 | +++ MusicNowPlaying.qml 2014-10-07 15:28:54 +0000 | |||
| 4 | @@ -28,19 +28,31 @@ | |||
| 5 | 28 | 28 | ||
| 6 | 29 | MusicPage { | 29 | MusicPage { |
| 7 | 30 | id: nowPlaying | 30 | id: nowPlaying |
| 8 | 31 | flickable: isListView ? queuelist : null // Ensures that the header is shown in fullview | ||
| 9 | 31 | objectName: "nowPlayingPage" | 32 | objectName: "nowPlayingPage" |
| 10 | 32 | title: i18n.tr("Now Playing") | 33 | title: i18n.tr("Now Playing") |
| 11 | 33 | visible: false | 34 | visible: false |
| 12 | 34 | onVisibleChanged: { | 35 | onVisibleChanged: { |
| 13 | 35 | if (!visible) { | 36 | if (!visible) { |
| 14 | 36 | // Reset the isListView property | 37 | // Reset the isListView property |
| 17 | 37 | // TODO: In the future this will default to false | 38 | isListView = false |
| 16 | 38 | isListView = true | ||
| 18 | 39 | } | 39 | } |
| 19 | 40 | } | 40 | } |
| 20 | 41 | 41 | ||
| 21 | 42 | property int ensureVisibleIndex: 0 // ensure first index is visible at startup | 42 | property int ensureVisibleIndex: 0 // ensure first index is visible at startup |
| 23 | 43 | property bool isListView: true | 43 | property bool isListView: false |
| 24 | 44 | |||
| 25 | 45 | head.backAction: Action { | ||
| 26 | 46 | iconName: "back"; | ||
| 27 | 47 | objectName: "backButton" | ||
| 28 | 48 | onTriggered: { | ||
| 29 | 49 | mainPageStack.pop(); | ||
| 30 | 50 | |||
| 31 | 51 | while (mainPageStack.depth > 1) { // jump back to the tab layer if via SongsPage | ||
| 32 | 52 | mainPageStack.pop(); | ||
| 33 | 53 | } | ||
| 34 | 54 | } | ||
| 35 | 55 | } | ||
| 36 | 44 | 56 | ||
| 37 | 45 | head { | 57 | head { |
| 38 | 46 | actions: [ | 58 | actions: [ |
| 39 | @@ -88,10 +100,9 @@ | |||
| 40 | 88 | 100 | ||
| 41 | 89 | Rectangle { | 101 | Rectangle { |
| 42 | 90 | id: fullview | 102 | id: fullview |
| 43 | 91 | visible: !isListView | ||
| 44 | 92 | anchors.fill: parent | 103 | anchors.fill: parent |
| 45 | 93 | color: "transparent" | 104 | color: "transparent" |
| 47 | 94 | clip: true | 105 | visible: !isListView |
| 48 | 95 | 106 | ||
| 49 | 96 | BlurredBackground { | 107 | BlurredBackground { |
| 50 | 97 | id: blurredBackground | 108 | id: blurredBackground |
| 51 | @@ -195,6 +206,7 @@ | |||
| 52 | 195 | id: progressSliderMusic | 206 | id: progressSliderMusic |
| 53 | 196 | anchors.left: parent.left | 207 | anchors.left: parent.left |
| 54 | 197 | anchors.right: parent.right | 208 | anchors.right: parent.right |
| 55 | 209 | objectName: "progressSliderShape" | ||
| 56 | 198 | function formatValue(v) { return durationToString(v) } | 210 | function formatValue(v) { return durationToString(v) } |
| 57 | 199 | 211 | ||
| 58 | 200 | property bool seeking: false | 212 | property bool seeking: false |
| 59 | @@ -255,7 +267,6 @@ | |||
| 60 | 255 | /* Repeat button */ | 267 | /* Repeat button */ |
| 61 | 256 | MouseArea { | 268 | MouseArea { |
| 62 | 257 | id: nowPlayingRepeatButton | 269 | id: nowPlayingRepeatButton |
| 63 | 258 | objectName: "repeatShape" | ||
| 64 | 259 | anchors.right: nowPlayingPreviousButton.left | 270 | anchors.right: nowPlayingPreviousButton.left |
| 65 | 260 | anchors.rightMargin: units.gu(1) | 271 | anchors.rightMargin: units.gu(1) |
| 66 | 261 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter | 272 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter |
| 67 | @@ -272,6 +283,7 @@ | |||
| 68 | 272 | anchors.horizontalCenter: parent.horizontalCenter | 283 | anchors.horizontalCenter: parent.horizontalCenter |
| 69 | 273 | color: "white" | 284 | color: "white" |
| 70 | 274 | name: "media-playlist-repeat" | 285 | name: "media-playlist-repeat" |
| 71 | 286 | objectName: "repeatShape" | ||
| 72 | 275 | opacity: player.repeat && !emptyPage.noMusic ? 1 : .4 | 287 | opacity: player.repeat && !emptyPage.noMusic ? 1 : .4 |
| 73 | 276 | } | 288 | } |
| 74 | 277 | } | 289 | } |
| 75 | @@ -283,7 +295,6 @@ | |||
| 76 | 283 | anchors.rightMargin: units.gu(1) | 295 | anchors.rightMargin: units.gu(1) |
| 77 | 284 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter | 296 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter |
| 78 | 285 | height: units.gu(6) | 297 | height: units.gu(6) |
| 79 | 286 | objectName: "previousShape" | ||
| 80 | 287 | opacity: trackQueue.model.count === 0 ? .4 : 1 | 298 | opacity: trackQueue.model.count === 0 ? .4 : 1 |
| 81 | 288 | width: height | 299 | width: height |
| 82 | 289 | onClicked: player.previousSong() | 300 | onClicked: player.previousSong() |
| 83 | @@ -296,6 +307,7 @@ | |||
| 84 | 296 | anchors.horizontalCenter: parent.horizontalCenter | 307 | anchors.horizontalCenter: parent.horizontalCenter |
| 85 | 297 | color: "white" | 308 | color: "white" |
| 86 | 298 | name: "media-skip-backward" | 309 | name: "media-skip-backward" |
| 87 | 310 | objectName: "previousShape" | ||
| 88 | 299 | opacity: 1 | 311 | opacity: 1 |
| 89 | 300 | } | 312 | } |
| 90 | 301 | } | 313 | } |
| 91 | @@ -307,7 +319,6 @@ | |||
| 92 | 307 | anchors.top: musicToolbarFullProgressContainer.bottom | 319 | anchors.top: musicToolbarFullProgressContainer.bottom |
| 93 | 308 | anchors.topMargin: units.gu(2) | 320 | anchors.topMargin: units.gu(2) |
| 94 | 309 | height: units.gu(12) | 321 | height: units.gu(12) |
| 95 | 310 | objectName: "playShape" | ||
| 96 | 311 | width: height | 322 | width: height |
| 97 | 312 | onClicked: player.toggle() | 323 | onClicked: player.toggle() |
| 98 | 313 | 324 | ||
| 99 | @@ -320,6 +331,7 @@ | |||
| 100 | 320 | opacity: emptyPage.noMusic ? .4 : 1 | 331 | opacity: emptyPage.noMusic ? .4 : 1 |
| 101 | 321 | color: "white" | 332 | color: "white" |
| 102 | 322 | name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start" | 333 | name: player.playbackState === MediaPlayer.PlayingState ? "media-playback-pause" : "media-playback-start" |
| 103 | 334 | objectName: "playShape" | ||
| 104 | 323 | } | 335 | } |
| 105 | 324 | } | 336 | } |
| 106 | 325 | 337 | ||
| 107 | @@ -330,7 +342,6 @@ | |||
| 108 | 330 | anchors.leftMargin: units.gu(1) | 342 | anchors.leftMargin: units.gu(1) |
| 109 | 331 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter | 343 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter |
| 110 | 332 | height: units.gu(6) | 344 | height: units.gu(6) |
| 111 | 333 | objectName: "forwardShape" | ||
| 112 | 334 | opacity: trackQueue.model.count === 0 ? .4 : 1 | 345 | opacity: trackQueue.model.count === 0 ? .4 : 1 |
| 113 | 335 | width: height | 346 | width: height |
| 114 | 336 | onClicked: player.nextSong() | 347 | onClicked: player.nextSong() |
| 115 | @@ -343,6 +354,7 @@ | |||
| 116 | 343 | anchors.horizontalCenter: parent.horizontalCenter | 354 | anchors.horizontalCenter: parent.horizontalCenter |
| 117 | 344 | color: "white" | 355 | color: "white" |
| 118 | 345 | name: "media-skip-forward" | 356 | name: "media-skip-forward" |
| 119 | 357 | objectName: "forwardShape" | ||
| 120 | 346 | opacity: 1 | 358 | opacity: 1 |
| 121 | 347 | } | 359 | } |
| 122 | 348 | } | 360 | } |
| 123 | @@ -350,7 +362,6 @@ | |||
| 124 | 350 | /* Shuffle button */ | 362 | /* Shuffle button */ |
| 125 | 351 | MouseArea { | 363 | MouseArea { |
| 126 | 352 | id: nowPlayingShuffleButton | 364 | id: nowPlayingShuffleButton |
| 127 | 353 | objectName: "shuffleShape" | ||
| 128 | 354 | anchors.left: nowPlayingNextButton.right | 365 | anchors.left: nowPlayingNextButton.right |
| 129 | 355 | anchors.leftMargin: units.gu(1) | 366 | anchors.leftMargin: units.gu(1) |
| 130 | 356 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter | 367 | anchors.verticalCenter: nowPlayingPlayButton.verticalCenter |
| 131 | @@ -367,6 +378,7 @@ | |||
| 132 | 367 | anchors.horizontalCenter: parent.horizontalCenter | 378 | anchors.horizontalCenter: parent.horizontalCenter |
| 133 | 368 | color: "white" | 379 | color: "white" |
| 134 | 369 | name: "media-playlist-shuffle" | 380 | name: "media-playlist-shuffle" |
| 135 | 381 | objectName: "shuffleShape" | ||
| 136 | 370 | opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4 | 382 | opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4 |
| 137 | 371 | } | 383 | } |
| 138 | 372 | } | 384 | } |
| 139 | @@ -375,14 +387,16 @@ | |||
| 140 | 375 | 387 | ||
| 141 | 376 | ListView { | 388 | ListView { |
| 142 | 377 | id: queuelist | 389 | id: queuelist |
| 143 | 378 | visible: isListView | ||
| 144 | 379 | objectName: "nowPlayingQueueList" | ||
| 145 | 380 | anchors { | 390 | anchors { |
| 146 | 381 | fill: parent | 391 | fill: parent |
| 147 | 382 | } | 392 | } |
| 148 | 383 | delegate: queueDelegate | 393 | delegate: queueDelegate |
| 149 | 394 | footer: Item { | ||
| 150 | 395 | height: mainView.height - (styleMusic.common.expandHeight + queuelist.currentHeight) + units.gu(8) | ||
| 151 | 396 | } | ||
| 152 | 397 | highlightFollowsCurrentItem: false | ||
| 153 | 384 | model: trackQueue.model | 398 | model: trackQueue.model |
| 155 | 385 | highlightFollowsCurrentItem: false | 399 | objectName: "nowPlayingQueueList" |
| 156 | 386 | state: "normal" | 400 | state: "normal" |
| 157 | 387 | states: [ | 401 | states: [ |
| 158 | 388 | State { | 402 | State { |
| 159 | @@ -400,9 +414,7 @@ | |||
| 160 | 400 | } | 414 | } |
| 161 | 401 | } | 415 | } |
| 162 | 402 | ] | 416 | ] |
| 166 | 403 | footer: Item { | 417 | visible: isListView |
| 164 | 404 | height: mainView.height - (styleMusic.common.expandHeight + queuelist.currentHeight) + units.gu(8) | ||
| 165 | 405 | } | ||
| 167 | 406 | 418 | ||
| 168 | 407 | property int normalHeight: units.gu(12) | 419 | property int normalHeight: units.gu(12) |
| 169 | 408 | property int currentHeight: units.gu(40) | 420 | property int currentHeight: units.gu(40) |
| 170 | 409 | 421 | ||
| 171 | === modified file 'MusicToolbar.qml' | |||
| 172 | --- MusicToolbar.qml 2014-10-04 03:49:08 +0000 | |||
| 173 | +++ MusicToolbar.qml 2014-10-07 15:28:54 +0000 | |||
| 174 | @@ -35,40 +35,11 @@ | |||
| 175 | 35 | property var currentPage: null | 35 | property var currentPage: null |
| 176 | 36 | property var currentSheet: [] | 36 | property var currentSheet: [] |
| 177 | 37 | property var currentTab: null | 37 | property var currentTab: null |
| 178 | 38 | property var previousPage: null | ||
| 179 | 39 | 38 | ||
| 180 | 40 | // Properties and signals for the toolbar | 39 | // Properties and signals for the toolbar |
| 181 | 41 | property var cachedStates: [] | ||
| 182 | 42 | property bool shown: false | ||
| 183 | 43 | property int transitionDuration: 100 | ||
| 184 | 44 | |||
| 185 | 45 | property alias currentHeight: musicToolbarPanel.height | 40 | property alias currentHeight: musicToolbarPanel.height |
| 186 | 46 | property alias expandedHeight: musicToolbarPanel.expandedHeight | ||
| 187 | 47 | property alias fullHeight: musicToolbarPanel.fullHeight | ||
| 188 | 48 | property alias mouseAreaOffset: musicToolbarPanel.hintSize | ||
| 189 | 49 | |||
| 190 | 50 | property alias animating: musicToolbarPanel.animating | ||
| 191 | 51 | property alias opened: musicToolbarPanel.opened | 41 | property alias opened: musicToolbarPanel.opened |
| 192 | 52 | 42 | ||
| 193 | 53 | // Alias for autopilot | ||
| 194 | 54 | property alias currentMode: musicToolbarPanel.currentMode | ||
| 195 | 55 | |||
| 196 | 56 | Connections { | ||
| 197 | 57 | id: pageStackConn | ||
| 198 | 58 | target: mainPageStack | ||
| 199 | 59 | |||
| 200 | 60 | onCurrentPageChanged: { | ||
| 201 | 61 | previousPage = currentPage; | ||
| 202 | 62 | |||
| 203 | 63 | // If going back from nowPlaying jump back to tabs | ||
| 204 | 64 | if (previousPage === nowPlaying && mainPageStack.currentPage !== nowPlaying) { | ||
| 205 | 65 | while (mainPageStack.depth > 1) { | ||
| 206 | 66 | mainPageStack.pop(mainPageStack.currentPage) | ||
| 207 | 67 | } | ||
| 208 | 68 | } | ||
| 209 | 69 | } | ||
| 210 | 70 | } | ||
| 211 | 71 | |||
| 212 | 72 | /* Helper functions */ | 43 | /* Helper functions */ |
| 213 | 73 | 44 | ||
| 214 | 74 | // Back button has been pressed, jump up pageStack or back to parent page | 45 | // Back button has been pressed, jump up pageStack or back to parent page |
| 215 | @@ -97,8 +68,6 @@ | |||
| 216 | 97 | function setPage(childPage) | 68 | function setPage(childPage) |
| 217 | 98 | { | 69 | { |
| 218 | 99 | currentPage = childPage; | 70 | currentPage = childPage; |
| 219 | 100 | // note: If pageStack tracking is needed readd here | ||
| 220 | 101 | //currentPageStack = pageStack === undefined ? null : pageStack; | ||
| 221 | 102 | } | 71 | } |
| 222 | 103 | 72 | ||
| 223 | 104 | // Set the current sheet (overrides page) | 73 | // Set the current sheet (overrides page) |
| 224 | @@ -113,537 +82,10 @@ | |||
| 225 | 113 | right: parent.right | 82 | right: parent.right |
| 226 | 114 | bottom: parent.bottom | 83 | bottom: parent.bottom |
| 227 | 115 | } | 84 | } |
| 230 | 116 | // TODO: this will be removed when the toolbar is redone | 85 | height: units.gu(7.25) |
| 229 | 117 | height: currentMode === "hidden" ? 0 : (currentMode === "full" ? fullHeight : expandedHeight) | ||
| 231 | 118 | locked: true | 86 | locked: true |
| 232 | 119 | opened: true | 87 | opened: true |
| 233 | 120 | 88 | ||
| 234 | 121 | // TODO: this will be removed when the toolbar is redone | ||
| 235 | 122 | // The current mode of the controls | ||
| 236 | 123 | property string currentMode: !nowPlaying.isListView && currentPage === nowPlaying | ||
| 237 | 124 | ? "hidden" : (wideAspect || currentPage === nowPlaying | ||
| 238 | 125 | ? "full" : "expanded") | ||
| 239 | 126 | |||
| 240 | 127 | // Properties for the different heights | ||
| 241 | 128 | property int expandedHeight: units.gu(7.25) | ||
| 242 | 129 | property int fullHeight: units.gu(11) | ||
| 243 | 130 | |||
| 244 | 131 | onCurrentModeChanged: { | ||
| 245 | 132 | musicToolbarFullProgressMouseArea.enabled = currentMode === "full" | ||
| 246 | 133 | } | ||
| 247 | 134 | |||
| 248 | 135 | /* Full toolbar */ | ||
| 249 | 136 | Rectangle { | ||
| 250 | 137 | id: musicToolbarFullContainer | ||
| 251 | 138 | anchors { | ||
| 252 | 139 | fill: parent | ||
| 253 | 140 | } | ||
| 254 | 141 | color: styleMusic.toolbar.fullBackgroundColor | ||
| 255 | 142 | visible: musicToolbarPanel.currentMode === "full" | ||
| 256 | 143 | |||
| 257 | 144 | /* Buttons component */ | ||
| 258 | 145 | Rectangle { | ||
| 259 | 146 | id: musicToolbarFullButtonsContainer | ||
| 260 | 147 | anchors.left: parent.left | ||
| 261 | 148 | anchors.top: musicToolbarFullProgressContainer.bottom | ||
| 262 | 149 | color: "transparent" | ||
| 263 | 150 | height: parent.height - musicToolbarFullProgressContainer.height | ||
| 264 | 151 | width: parent.width | ||
| 265 | 152 | |||
| 266 | 153 | /* Column for labels in wideAspect */ | ||
| 267 | 154 | Column { | ||
| 268 | 155 | id: nowPlayingWideAspectLabels | ||
| 269 | 156 | anchors { | ||
| 270 | 157 | left: parent.left | ||
| 271 | 158 | leftMargin: units.gu(1) | ||
| 272 | 159 | right: nowPlayingRepeatButton.left | ||
| 273 | 160 | rightMargin: units.gu(1) | ||
| 274 | 161 | verticalCenter: parent.verticalCenter | ||
| 275 | 162 | } | ||
| 276 | 163 | visible: wideAspect | ||
| 277 | 164 | |||
| 278 | 165 | /* Clicking in the area shows the queue */ | ||
| 279 | 166 | function trigger() { | ||
| 280 | 167 | if (trackQueue.model.count !== 0 && currentPage !== nowPlaying) { | ||
| 281 | 168 | tabs.pushNowPlaying(); | ||
| 282 | 169 | } | ||
| 283 | 170 | else if (currentPage === nowPlaying) { | ||
| 284 | 171 | musicToolbar.goBack(); | ||
| 285 | 172 | } | ||
| 286 | 173 | } | ||
| 287 | 174 | |||
| 288 | 175 | /* Title of track */ | ||
| 289 | 176 | Label { | ||
| 290 | 177 | id: nowPlayingWideAspectTitle | ||
| 291 | 178 | anchors { | ||
| 292 | 179 | left: parent.left | ||
| 293 | 180 | leftMargin: units.gu(1) | ||
| 294 | 181 | right: parent.right | ||
| 295 | 182 | rightMargin: units.gu(1) | ||
| 296 | 183 | } | ||
| 297 | 184 | color: styleMusic.playerControls.labelColor | ||
| 298 | 185 | elide: Text.ElideRight | ||
| 299 | 186 | fontSize: "medium" | ||
| 300 | 187 | objectName: "playercontroltitle" | ||
| 301 | 188 | text: trackQueue.model.count === 0 ? "" : player.currentMetaTitle === "" ? player.currentMetaFile : player.currentMetaTitle | ||
| 302 | 189 | } | ||
| 303 | 190 | |||
| 304 | 191 | /* Artist of track */ | ||
| 305 | 192 | Label { | ||
| 306 | 193 | id: nowPlayingWideAspectArtist | ||
| 307 | 194 | anchors { | ||
| 308 | 195 | left: parent.left | ||
| 309 | 196 | leftMargin: units.gu(1) | ||
| 310 | 197 | right: parent.right | ||
| 311 | 198 | rightMargin: units.gu(1) | ||
| 312 | 199 | } | ||
| 313 | 200 | color: styleMusic.playerControls.labelColor | ||
| 314 | 201 | elide: Text.ElideRight | ||
| 315 | 202 | fontSize: "small" | ||
| 316 | 203 | text: trackQueue.model.count === 0 ? "" : player.currentMetaArtist | ||
| 317 | 204 | } | ||
| 318 | 205 | |||
| 319 | 206 | /* Album of track */ | ||
| 320 | 207 | Label { | ||
| 321 | 208 | id: nowPlayingWideAspectAlbum | ||
| 322 | 209 | anchors { | ||
| 323 | 210 | left: parent.left | ||
| 324 | 211 | leftMargin: units.gu(1) | ||
| 325 | 212 | right: parent.right | ||
| 326 | 213 | rightMargin: units.gu(1) | ||
| 327 | 214 | } | ||
| 328 | 215 | color: styleMusic.playerControls.labelColor | ||
| 329 | 216 | elide: Text.ElideRight | ||
| 330 | 217 | fontSize: "small" | ||
| 331 | 218 | text: trackQueue.model.count === 0 ? "" : player.currentMetaAlbum | ||
| 332 | 219 | } | ||
| 333 | 220 | } | ||
| 334 | 221 | |||
| 335 | 222 | /* Repeat button */ | ||
| 336 | 223 | Item { | ||
| 337 | 224 | id: nowPlayingRepeatButton | ||
| 338 | 225 | objectName: "repeatShape" | ||
| 339 | 226 | anchors.right: nowPlayingPreviousButton.left | ||
| 340 | 227 | anchors.rightMargin: units.gu(1) | ||
| 341 | 228 | anchors.verticalCenter: parent.verticalCenter | ||
| 342 | 229 | height: units.gu(6) | ||
| 343 | 230 | opacity: player.repeat && !emptyPage.noMusic ? 1 : .4 | ||
| 344 | 231 | width: height | ||
| 345 | 232 | |||
| 346 | 233 | function trigger() { | ||
| 347 | 234 | if (emptyPage.noMusic) { | ||
| 348 | 235 | return; | ||
| 349 | 236 | } | ||
| 350 | 237 | |||
| 351 | 238 | // Invert repeat settings | ||
| 352 | 239 | player.repeat = !player.repeat | ||
| 353 | 240 | } | ||
| 354 | 241 | |||
| 355 | 242 | Image { | ||
| 356 | 243 | id: repeatIcon | ||
| 357 | 244 | height: units.gu(3) | ||
| 358 | 245 | width: height | ||
| 359 | 246 | anchors.verticalCenter: parent.verticalCenter | ||
| 360 | 247 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 361 | 248 | source: Qt.resolvedUrl("images/media-playlist-repeat.svg") | ||
| 362 | 249 | verticalAlignment: Text.AlignVCenter | ||
| 363 | 250 | opacity: player.repeat && !emptyPage.noMusic ? 1 : .4 | ||
| 364 | 251 | } | ||
| 365 | 252 | } | ||
| 366 | 253 | |||
| 367 | 254 | /* Previous button */ | ||
| 368 | 255 | Item { | ||
| 369 | 256 | id: nowPlayingPreviousButton | ||
| 370 | 257 | anchors.right: nowPlayingPlayButton.left | ||
| 371 | 258 | anchors.rightMargin: units.gu(1) | ||
| 372 | 259 | anchors.verticalCenter: parent.verticalCenter | ||
| 373 | 260 | height: units.gu(6) | ||
| 374 | 261 | objectName: "previousShape" | ||
| 375 | 262 | opacity: trackQueue.model.count === 0 ? .4 : 1 | ||
| 376 | 263 | width: height | ||
| 377 | 264 | |||
| 378 | 265 | function trigger() { | ||
| 379 | 266 | if (trackQueue.model.count === 0) { | ||
| 380 | 267 | return; | ||
| 381 | 268 | } | ||
| 382 | 269 | |||
| 383 | 270 | player.previousSong() | ||
| 384 | 271 | } | ||
| 385 | 272 | |||
| 386 | 273 | Image { | ||
| 387 | 274 | id: nowPlayingPreviousIndicator | ||
| 388 | 275 | height: units.gu(3) | ||
| 389 | 276 | width: height | ||
| 390 | 277 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 391 | 278 | anchors.verticalCenter: parent.verticalCenter | ||
| 392 | 279 | source: Qt.resolvedUrl("images/media-skip-backward.svg") | ||
| 393 | 280 | opacity: 1 | ||
| 394 | 281 | } | ||
| 395 | 282 | } | ||
| 396 | 283 | |||
| 397 | 284 | /* Play/Pause button */ | ||
| 398 | 285 | Rectangle { | ||
| 399 | 286 | id: nowPlayingPlayButton | ||
| 400 | 287 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 401 | 288 | anchors.verticalCenter: parent.verticalCenter | ||
| 402 | 289 | antialiasing: true | ||
| 403 | 290 | color: styleMusic.toolbar.fullOuterPlayCircleColor | ||
| 404 | 291 | height: units.gu(12) | ||
| 405 | 292 | radius: height / 2 | ||
| 406 | 293 | width: height | ||
| 407 | 294 | |||
| 408 | 295 | // draws the outter shadow/highlight | ||
| 409 | 296 | Rectangle { | ||
| 410 | 297 | id: sourceOutterFull | ||
| 411 | 298 | anchors { fill: parent; margins: -units.gu(0.1) } | ||
| 412 | 299 | radius: (width / 2) | ||
| 413 | 300 | antialiasing: true | ||
| 414 | 301 | gradient: Gradient { | ||
| 415 | 302 | GradientStop { position: 0.0; color: "black" } | ||
| 416 | 303 | GradientStop { position: 0.5; color: "transparent" } | ||
| 417 | 304 | GradientStop { position: 1.0; color: UbuntuColors.warmGrey } | ||
| 418 | 305 | } | ||
| 419 | 306 | |||
| 420 | 307 | Rectangle { | ||
| 421 | 308 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 422 | 309 | anchors.verticalCenter: parent.verticalCenter | ||
| 423 | 310 | antialiasing: true | ||
| 424 | 311 | color: styleMusic.toolbar.fullOuterPlayCircleColor | ||
| 425 | 312 | height: nowPlayingPlayButton.height - units.gu(.1) | ||
| 426 | 313 | radius: height / 2 | ||
| 427 | 314 | width: height | ||
| 428 | 315 | |||
| 429 | 316 | Rectangle { | ||
| 430 | 317 | id: nowPlayingPlayButtonInner | ||
| 431 | 318 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 432 | 319 | anchors.verticalCenter: parent.verticalCenter | ||
| 433 | 320 | antialiasing: true | ||
| 434 | 321 | color: styleMusic.toolbar.fullInnerPlayCircleColor | ||
| 435 | 322 | height: units.gu(7) | ||
| 436 | 323 | radius: height / 2 | ||
| 437 | 324 | width: height | ||
| 438 | 325 | |||
| 439 | 326 | // draws the inner shadow/highlight | ||
| 440 | 327 | Rectangle { | ||
| 441 | 328 | id: sourceInnerFull | ||
| 442 | 329 | anchors { fill: parent; margins: -units.gu(0.1) } | ||
| 443 | 330 | radius: (width / 2) | ||
| 444 | 331 | antialiasing: true | ||
| 445 | 332 | gradient: Gradient { | ||
| 446 | 333 | GradientStop { position: 0.0; color: UbuntuColors.warmGrey } | ||
| 447 | 334 | GradientStop { position: 0.5; color: "transparent" } | ||
| 448 | 335 | GradientStop { position: 1.0; color: "black" } | ||
| 449 | 336 | } | ||
| 450 | 337 | |||
| 451 | 338 | Rectangle { | ||
| 452 | 339 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 453 | 340 | anchors.verticalCenter: parent.verticalCenter | ||
| 454 | 341 | antialiasing: true | ||
| 455 | 342 | color: styleMusic.toolbar.fullInnerPlayCircleColor | ||
| 456 | 343 | height: nowPlayingPlayButtonInner.height - units.gu(.1) | ||
| 457 | 344 | objectName: "playShape" | ||
| 458 | 345 | radius: height / 2 | ||
| 459 | 346 | width: height | ||
| 460 | 347 | |||
| 461 | 348 | function trigger() { | ||
| 462 | 349 | if (emptyPage.noMusic) { | ||
| 463 | 350 | return; | ||
| 464 | 351 | } | ||
| 465 | 352 | |||
| 466 | 353 | if (trackQueue.model.count === 0) { | ||
| 467 | 354 | playRandomSong(); | ||
| 468 | 355 | } | ||
| 469 | 356 | else { | ||
| 470 | 357 | player.toggle(); | ||
| 471 | 358 | } | ||
| 472 | 359 | } | ||
| 473 | 360 | |||
| 474 | 361 | Image { | ||
| 475 | 362 | id: nowPlayingPlayIndicator | ||
| 476 | 363 | height: units.gu(6) | ||
| 477 | 364 | width: height | ||
| 478 | 365 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 479 | 366 | anchors.verticalCenter: parent.verticalCenter | ||
| 480 | 367 | opacity: emptyPage.noMusic ? .4 : 1 | ||
| 481 | 368 | source: player.playbackState === MediaPlayer.PlayingState ? | ||
| 482 | 369 | Qt.resolvedUrl("images/media-playback-pause.svg") : Qt.resolvedUrl("images/media-playback-start.svg") | ||
| 483 | 370 | } | ||
| 484 | 371 | } | ||
| 485 | 372 | } | ||
| 486 | 373 | } | ||
| 487 | 374 | } | ||
| 488 | 375 | } | ||
| 489 | 376 | } | ||
| 490 | 377 | |||
| 491 | 378 | /* Next button */ | ||
| 492 | 379 | Item { | ||
| 493 | 380 | id: nowPlayingNextButton | ||
| 494 | 381 | anchors.left: nowPlayingPlayButton.right | ||
| 495 | 382 | anchors.leftMargin: units.gu(1) | ||
| 496 | 383 | anchors.verticalCenter: parent.verticalCenter | ||
| 497 | 384 | height: units.gu(6) | ||
| 498 | 385 | objectName: "forwardShape" | ||
| 499 | 386 | opacity: trackQueue.model.count === 0 ? .4 : 1 | ||
| 500 | 387 | width: height | ||
| 501 | 388 | |||
| 502 | 389 | function trigger() { | ||
| 503 | 390 | if (trackQueue.model.count === 0 || emptyPage.noMusic) { | ||
| 504 | 391 | return; | ||
| 505 | 392 | } | ||
| 506 | 393 | |||
| 507 | 394 | player.nextSong() | ||
| 508 | 395 | } | ||
| 509 | 396 | |||
| 510 | 397 | Image { | ||
| 511 | 398 | id: nowPlayingNextIndicator | ||
| 512 | 399 | height: units.gu(3) | ||
| 513 | 400 | width: height | ||
| 514 | 401 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 515 | 402 | anchors.verticalCenter: parent.verticalCenter | ||
| 516 | 403 | source: Qt.resolvedUrl("images/media-skip-forward.svg") | ||
| 517 | 404 | opacity: 1 | ||
| 518 | 405 | } | ||
| 519 | 406 | } | ||
| 520 | 407 | |||
| 521 | 408 | /* Shuffle button */ | ||
| 522 | 409 | Item { | ||
| 523 | 410 | id: nowPlayingShuffleButton | ||
| 524 | 411 | objectName: "shuffleShape" | ||
| 525 | 412 | anchors.left: nowPlayingNextButton.right | ||
| 526 | 413 | anchors.leftMargin: units.gu(1) | ||
| 527 | 414 | anchors.verticalCenter: parent.verticalCenter | ||
| 528 | 415 | height: units.gu(6) | ||
| 529 | 416 | opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4 | ||
| 530 | 417 | width: height | ||
| 531 | 418 | |||
| 532 | 419 | function trigger() { | ||
| 533 | 420 | if (emptyPage.noMusic) { | ||
| 534 | 421 | return; | ||
| 535 | 422 | } | ||
| 536 | 423 | |||
| 537 | 424 | // Invert shuffle settings | ||
| 538 | 425 | player.shuffle = !player.shuffle | ||
| 539 | 426 | } | ||
| 540 | 427 | |||
| 541 | 428 | Image { | ||
| 542 | 429 | id: shuffleIcon | ||
| 543 | 430 | height: units.gu(3) | ||
| 544 | 431 | width: height | ||
| 545 | 432 | anchors.verticalCenter: parent.verticalCenter | ||
| 546 | 433 | anchors.horizontalCenter: parent.horizontalCenter | ||
| 547 | 434 | source: Qt.resolvedUrl("images/media-playlist-shuffle.svg") | ||
| 548 | 435 | opacity: player.shuffle && !emptyPage.noMusic ? 1 : .4 | ||
| 549 | 436 | } | ||
| 550 | 437 | } | ||
| 551 | 438 | |||
| 552 | 439 | /* Search button in wideAspect */ | ||
| 553 | 440 | Item { | ||
| 554 | 441 | id: nowPlayingSearchButton | ||
| 555 | 442 | objectName: "searchShape" | ||
| 556 | 443 | anchors { | ||
| 557 | 444 | right: parent.right | ||
| 558 | 445 | rightMargin: units.gu(1) | ||
| 559 | 446 | verticalCenter: parent.verticalCenter | ||
| 560 | 447 | } | ||
| 561 | 448 | height: units.gu(6) | ||
| 562 | 449 | opacity: !emptyPage.noMusic ? 1 : .4 | ||
| 563 | 450 | width: height | ||
| 564 | 451 | visible: wideAspect | ||
| 565 | 452 | |||
| 566 | 453 | function trigger() { | ||
| 567 | 454 | if (emptyPage.noMusic) { | ||
| 568 | 455 | return; | ||
| 569 | 456 | } | ||
| 570 | 457 | |||
| 571 | 458 | if (!searchSheet.sheetVisible) { | ||
| 572 | 459 | PopupUtils.open(searchSheet.sheet, | ||
| 573 | 460 | mainView, { title: i18n.tr("Search")} ) | ||
| 574 | 461 | } | ||
| 575 | 462 | } | ||
| 576 | 463 | |||
| 577 | 464 | Image { | ||
| 578 | 465 | id: searchIcon | ||
| 579 | 466 | anchors { | ||
| 580 | 467 | horizontalCenter: parent.horizontalCenter | ||
| 581 | 468 | verticalCenter: parent.verticalCenter | ||
| 582 | 469 | } | ||
| 583 | 470 | height: units.gu(3) | ||
| 584 | 471 | opacity: !emptyPage.noMusic ? 1 : .4 | ||
| 585 | 472 | source: Qt.resolvedUrl("images/search.svg") | ||
| 586 | 473 | width: height | ||
| 587 | 474 | } | ||
| 588 | 475 | } | ||
| 589 | 476 | } | ||
| 590 | 477 | |||
| 591 | 478 | /* Progress bar component */ | ||
| 592 | 479 | Rectangle { | ||
| 593 | 480 | id: musicToolbarFullProgressContainer | ||
| 594 | 481 | anchors.left: parent.left | ||
| 595 | 482 | anchors.top: parent.top | ||
| 596 | 483 | color: styleMusic.toolbar.fullBackgroundColor | ||
| 597 | 484 | height: units.gu(3) | ||
| 598 | 485 | width: parent.width | ||
| 599 | 486 | |||
| 600 | 487 | /* Position label */ | ||
| 601 | 488 | Label { | ||
| 602 | 489 | id: musicToolbarFullPositionLabel | ||
| 603 | 490 | anchors.left: parent.left | ||
| 604 | 491 | anchors.leftMargin: units.gu(2) | ||
| 605 | 492 | anchors.top: parent.top | ||
| 606 | 493 | color: styleMusic.nowPlaying.labelColor | ||
| 607 | 494 | fontSize: "x-small" | ||
| 608 | 495 | height: parent.height | ||
| 609 | 496 | horizontalAlignment: Text.AlignHCenter | ||
| 610 | 497 | text: durationToString(player.position) | ||
| 611 | 498 | verticalAlignment: Text.AlignVCenter | ||
| 612 | 499 | width: units.gu(3) | ||
| 613 | 500 | } | ||
| 614 | 501 | |||
| 615 | 502 | /* Progress bar */ | ||
| 616 | 503 | Rectangle { | ||
| 617 | 504 | id: musicToolbarFullProgressBarContainer | ||
| 618 | 505 | objectName: "progressBarShape" | ||
| 619 | 506 | anchors.left: musicToolbarFullPositionLabel.right | ||
| 620 | 507 | anchors.leftMargin: units.gu(2) | ||
| 621 | 508 | anchors.right: musicToolbarFullDurationLabel.left | ||
| 622 | 509 | anchors.rightMargin: units.gu(2) | ||
| 623 | 510 | anchors.verticalCenter: parent.verticalCenter | ||
| 624 | 511 | color: "transparent" | ||
| 625 | 512 | height: units.gu(1); | ||
| 626 | 513 | state: trackQueue.model.count === 0 ? "disabled" : "enabled" | ||
| 627 | 514 | |||
| 628 | 515 | states: [ | ||
| 629 | 516 | State { | ||
| 630 | 517 | name: "disabled" | ||
| 631 | 518 | PropertyChanges { | ||
| 632 | 519 | target: musicToolbarFullProgressMouseArea | ||
| 633 | 520 | enabled: false | ||
| 634 | 521 | } | ||
| 635 | 522 | PropertyChanges { | ||
| 636 | 523 | target: musicToolbarFullProgressTrough | ||
| 637 | 524 | visible: false | ||
| 638 | 525 | } | ||
| 639 | 526 | PropertyChanges { | ||
| 640 | 527 | target: musicToolbarFullProgressHandle | ||
| 641 | 528 | visible: false | ||
| 642 | 529 | } | ||
| 643 | 530 | }, | ||
| 644 | 531 | State { | ||
| 645 | 532 | name: "enabled" | ||
| 646 | 533 | PropertyChanges { | ||
| 647 | 534 | target: musicToolbarFullProgressMouseArea | ||
| 648 | 535 | enabled: true | ||
| 649 | 536 | } | ||
| 650 | 537 | PropertyChanges { | ||
| 651 | 538 | target: musicToolbarFullProgressTrough | ||
| 652 | 539 | visible: true | ||
| 653 | 540 | } | ||
| 654 | 541 | PropertyChanges { | ||
| 655 | 542 | target: musicToolbarFullProgressHandle | ||
| 656 | 543 | visible: true | ||
| 657 | 544 | } | ||
| 658 | 545 | } | ||
| 659 | 546 | ] | ||
| 660 | 547 | |||
| 661 | 548 | property bool seeking: false | ||
| 662 | 549 | |||
| 663 | 550 | onSeekingChanged: { | ||
| 664 | 551 | if (seeking === false) { | ||
| 665 | 552 | musicToolbarFullPositionLabel.text = durationToString(player.position) | ||
| 666 | 553 | } | ||
| 667 | 554 | } | ||
| 668 | 555 | |||
| 669 | 556 | Connections { | ||
| 670 | 557 | target: player | ||
| 671 | 558 | onDurationChanged: { | ||
| 672 | 559 | console.debug("Duration changed: " + player.duration) | ||
| 673 | 560 | musicToolbarFullDurationLabel.text = durationToString(player.duration) | ||
| 674 | 561 | } | ||
| 675 | 562 | onPositionChanged: { | ||
| 676 | 563 | if (musicToolbarFullProgressBarContainer.seeking === false) | ||
| 677 | 564 | { | ||
| 678 | 565 | musicToolbarFullPositionLabel.text = durationToString(player.position) | ||
| 679 | 566 | musicToolbarFullDurationLabel.text = durationToString(player.duration) | ||
| 680 | 567 | musicToolbarFullProgressHandle.x = (player.position / player.duration) * musicToolbarFullProgressBarContainer.width | ||
| 681 | 568 | - musicToolbarFullProgressHandle.width / 2; | ||
| 682 | 569 | } | ||
| 683 | 570 | } | ||
| 684 | 571 | onStopped: { | ||
| 685 | 572 | musicToolbarFullProgressHandle.x = -musicToolbarFullProgressHandle.width / 2; | ||
| 686 | 573 | |||
| 687 | 574 | musicToolbarFullPositionLabel.text = durationToString(0); | ||
| 688 | 575 | musicToolbarFullDurationLabel.text = durationToString(0); | ||
| 689 | 576 | } | ||
| 690 | 577 | } | ||
| 691 | 578 | |||
| 692 | 579 | // Black background behind the progress bar | ||
| 693 | 580 | Rectangle { | ||
| 694 | 581 | id: musicToolbarFullProgressBackground | ||
| 695 | 582 | anchors.verticalCenter: parent.verticalCenter; | ||
| 696 | 583 | color: styleMusic.toolbar.fullProgressBackgroundColor; | ||
| 697 | 584 | height: parent.height; | ||
| 698 | 585 | radius: units.gu(0.5) | ||
| 699 | 586 | width: parent.width; | ||
| 700 | 587 | } | ||
| 701 | 588 | |||
| 702 | 589 | // The orange fill of the progress bar | ||
| 703 | 590 | Rectangle { | ||
| 704 | 591 | id: musicToolbarFullProgressTrough | ||
| 705 | 592 | anchors.verticalCenter: parent.verticalCenter; | ||
| 706 | 593 | antialiasing: true | ||
| 707 | 594 | color: styleMusic.toolbar.fullProgressTroughColor; | ||
| 708 | 595 | height: parent.height; | ||
| 709 | 596 | radius: units.gu(0.5) | ||
| 710 | 597 | width: musicToolbarFullProgressHandle.x + (height / 2); // +radius | ||
| 711 | 598 | } | ||
| 712 | 599 | |||
| 713 | 600 | // The current position (handle) of the progress bar | ||
| 714 | 601 | Rectangle { | ||
| 715 | 602 | id: musicToolbarFullProgressHandle | ||
| 716 | 603 | anchors.verticalCenter: musicToolbarFullProgressBackground.verticalCenter | ||
| 717 | 604 | antialiasing: true | ||
| 718 | 605 | color: styleMusic.nowPlaying.progressHandleColor | ||
| 719 | 606 | height: units.gu(1.5) | ||
| 720 | 607 | radius: height / 2 | ||
| 721 | 608 | width: height | ||
| 722 | 609 | |||
| 723 | 610 | // On X change update the position string | ||
| 724 | 611 | onXChanged: { | ||
| 725 | 612 | if (musicToolbarFullProgressBarContainer.seeking) { | ||
| 726 | 613 | var fraction = (x + (width / 2)) / parent.width; | ||
| 727 | 614 | musicToolbarFullPositionLabel.text = durationToString(fraction * player.duration) | ||
| 728 | 615 | } | ||
| 729 | 616 | } | ||
| 730 | 617 | } | ||
| 731 | 618 | } | ||
| 732 | 619 | |||
| 733 | 620 | /* Duration label */ | ||
| 734 | 621 | Label { | ||
| 735 | 622 | id: musicToolbarFullDurationLabel | ||
| 736 | 623 | anchors.right: parent.right | ||
| 737 | 624 | anchors.rightMargin: units.gu(2) | ||
| 738 | 625 | anchors.top: parent.top | ||
| 739 | 626 | color: styleMusic.nowPlaying.labelColor | ||
| 740 | 627 | fontSize: "x-small" | ||
| 741 | 628 | height: parent.height | ||
| 742 | 629 | horizontalAlignment: Text.AlignHCenter | ||
| 743 | 630 | text: durationToString(player.duration) | ||
| 744 | 631 | verticalAlignment: Text.AlignVCenter | ||
| 745 | 632 | width: units.gu(3) | ||
| 746 | 633 | } | ||
| 747 | 634 | |||
| 748 | 635 | /* Border at the bottom */ | ||
| 749 | 636 | Rectangle { | ||
| 750 | 637 | anchors.bottom: parent.bottom | ||
| 751 | 638 | anchors.left: parent.left | ||
| 752 | 639 | anchors.right: parent.right | ||
| 753 | 640 | color: styleMusic.common.white | ||
| 754 | 641 | height: units.gu(0.1) | ||
| 755 | 642 | opacity: 0.1 | ||
| 756 | 643 | } | ||
| 757 | 644 | } | ||
| 758 | 645 | } | ||
| 759 | 646 | |||
| 760 | 647 | /* Expanded toolbar */ | 89 | /* Expanded toolbar */ |
| 761 | 648 | Rectangle { | 90 | Rectangle { |
| 762 | 649 | id: musicToolbarExpandedContainer | 91 | id: musicToolbarExpandedContainer |
| 763 | @@ -651,7 +93,6 @@ | |||
| 764 | 651 | fill: parent | 93 | fill: parent |
| 765 | 652 | } | 94 | } |
| 766 | 653 | color: "transparent" | 95 | color: "transparent" |
| 767 | 654 | visible: musicToolbarPanel.currentMode === "expanded" | ||
| 768 | 655 | 96 | ||
| 769 | 656 | Rectangle { | 97 | Rectangle { |
| 770 | 657 | id: musicToolbarPlayerControls | 98 | id: musicToolbarPlayerControls |
| 771 | @@ -835,7 +276,7 @@ | |||
| 772 | 835 | height: units.gu(2.5) | 276 | height: units.gu(2.5) |
| 773 | 836 | name: player.playbackState === MediaPlayer.PlayingState ? | 277 | name: player.playbackState === MediaPlayer.PlayingState ? |
| 774 | 837 | "media-playback-pause" : "media-playback-start" | 278 | "media-playback-pause" : "media-playback-start" |
| 776 | 838 | objectName: "smallPlayShape" | 279 | objectName: "playShape" |
| 777 | 839 | width: height | 280 | width: height |
| 778 | 840 | } | 281 | } |
| 779 | 841 | 282 | ||
| 780 | @@ -872,6 +313,7 @@ | |||
| 781 | 872 | top: parent.top | 313 | top: parent.top |
| 782 | 873 | } | 314 | } |
| 783 | 874 | color: "transparent" | 315 | color: "transparent" |
| 784 | 316 | objectName: "jumpNowPlaying" | ||
| 785 | 875 | function trigger() { | 317 | function trigger() { |
| 786 | 876 | tabs.pushNowPlaying(); | 318 | tabs.pushNowPlaying(); |
| 787 | 877 | } | 319 | } |
| 788 | @@ -912,39 +354,6 @@ | |||
| 789 | 912 | } | 354 | } |
| 790 | 913 | } | 355 | } |
| 791 | 914 | } | 356 | } |
| 792 | 915 | |||
| 793 | 916 | /* Mouse events for the progress bar | ||
| 794 | 917 | is after musicToolbarMouseArea so that it captures mouse events for dragging */ | ||
| 795 | 918 | MouseArea { | ||
| 796 | 919 | id: musicToolbarFullProgressMouseArea | ||
| 797 | 920 | height: units.gu(2) | ||
| 798 | 921 | width: musicToolbarFullProgressBarContainer.width | ||
| 799 | 922 | x: musicToolbarFullProgressBarContainer.x | ||
| 800 | 923 | y: musicToolbarFullProgressBarContainer.y | ||
| 801 | 924 | |||
| 802 | 925 | drag.axis: Drag.XAxis | ||
| 803 | 926 | drag.minimumX: -(musicToolbarFullProgressHandle.width / 2) | ||
| 804 | 927 | drag.maximumX: musicToolbarFullProgressBarContainer.width - (musicToolbarFullProgressHandle.width / 2) | ||
| 805 | 928 | drag.target: musicToolbarFullProgressHandle | ||
| 806 | 929 | |||
| 807 | 930 | onPressed: { | ||
| 808 | 931 | musicToolbarFullProgressBarContainer.seeking = true; | ||
| 809 | 932 | |||
| 810 | 933 | // Jump the handle to the current mouse position | ||
| 811 | 934 | musicToolbarFullProgressHandle.x = mouse.x - (musicToolbarFullProgressHandle.width / 2); | ||
| 812 | 935 | } | ||
| 813 | 936 | |||
| 814 | 937 | onReleased: { | ||
| 815 | 938 | var fraction = mouse.x / musicToolbarFullProgressBarContainer.width; | ||
| 816 | 939 | |||
| 817 | 940 | // Limit the bounds of the fraction | ||
| 818 | 941 | fraction = fraction < 0 ? 0 : fraction | ||
| 819 | 942 | fraction = fraction > 1 ? 1 : fraction | ||
| 820 | 943 | |||
| 821 | 944 | player.seek((fraction) * player.duration); | ||
| 822 | 945 | musicToolbarFullProgressBarContainer.seeking = false; | ||
| 823 | 946 | } | ||
| 824 | 947 | } | ||
| 825 | 948 | } | 357 | } |
| 826 | 949 | } | 358 | } |
| 827 | 950 | 359 | ||
| 828 | 951 | 360 | ||
| 829 | === modified file 'common/MusicPage.qml' | |||
| 830 | --- common/MusicPage.qml 2014-09-30 15:18:25 +0000 | |||
| 831 | +++ common/MusicPage.qml 2014-10-07 15:28:54 +0000 | |||
| 832 | @@ -24,7 +24,7 @@ | |||
| 833 | 24 | Page { | 24 | Page { |
| 834 | 25 | id: thisPage | 25 | id: thisPage |
| 835 | 26 | anchors { | 26 | anchors { |
| 837 | 27 | bottomMargin: musicToolbar.currentHeight | 27 | bottomMargin: musicToolbar.visible ? musicToolbar.currentHeight : 0 |
| 838 | 28 | fill: parent | 28 | fill: parent |
| 839 | 29 | } | 29 | } |
| 840 | 30 | 30 | ||
| 841 | 31 | 31 | ||
| 842 | === modified file 'music-app.qml' | |||
| 843 | --- music-app.qml 2014-10-04 01:45:45 +0000 | |||
| 844 | +++ music-app.qml 2014-10-07 15:28:54 +0000 | |||
| 845 | @@ -581,7 +581,7 @@ | |||
| 846 | 581 | property string lastfmpassword | 581 | property string lastfmpassword |
| 847 | 582 | property string timestamp // used to scrobble | 582 | property string timestamp // used to scrobble |
| 848 | 583 | property var chosenElement: null | 583 | property var chosenElement: null |
| 850 | 584 | property bool toolbarShown: musicToolbar.shown | 584 | property bool toolbarShown: musicToolbar.visible |
| 851 | 585 | property bool selectedAlbum: false | 585 | property bool selectedAlbum: false |
| 852 | 586 | 586 | ||
| 853 | 587 | signal listItemSwiping(int i) | 587 | signal listItemSwiping(int i) |
| 854 | @@ -973,7 +973,6 @@ | |||
| 855 | 973 | Tabs { | 973 | Tabs { |
| 856 | 974 | id: tabs | 974 | id: tabs |
| 857 | 975 | anchors { | 975 | anchors { |
| 858 | 976 | bottomMargin: wideAspect ? musicToolbar.fullHeight : undefined | ||
| 859 | 977 | fill: parent | 976 | fill: parent |
| 860 | 978 | } | 977 | } |
| 861 | 979 | 978 | ||
| 862 | 980 | 979 | ||
| 863 | === modified file 'tests/autopilot/music_app/__init__.py' | |||
| 864 | --- tests/autopilot/music_app/__init__.py 2014-09-25 17:58:55 +0000 | |||
| 865 | +++ tests/autopilot/music_app/__init__.py 2014-10-07 15:28:54 +0000 | |||
| 866 | @@ -21,11 +21,22 @@ | |||
| 867 | 21 | return func_wrapper | 21 | return func_wrapper |
| 868 | 22 | 22 | ||
| 869 | 23 | 23 | ||
| 875 | 24 | def ensure_toolbar_visible(func): | 24 | def ensure_now_playing_full(func): |
| 876 | 25 | """Wrapper which ensures the toolbar is shown before clicking""" | 25 | """Wrapper which ensures the now playing is full before clicking""" |
| 877 | 26 | def func_wrapper(self, *args, **kwargs): | 26 | def func_wrapper(self, *args, **kwargs): |
| 878 | 27 | if not self.opened: | 27 | if self.isListView: |
| 879 | 28 | self.show() | 28 | self.click_toggle_view() |
| 880 | 29 | |||
| 881 | 30 | return func(self, *args, **kwargs) | ||
| 882 | 31 | |||
| 883 | 32 | return func_wrapper | ||
| 884 | 33 | |||
| 885 | 34 | |||
| 886 | 35 | def ensure_now_playing_list(func): | ||
| 887 | 36 | """Wrapper which ensures the now playing is list before clicking""" | ||
| 888 | 37 | def func_wrapper(self, *args, **kwargs): | ||
| 889 | 38 | if not self.isListView: | ||
| 890 | 39 | self.click_toggle_view() | ||
| 891 | 29 | 40 | ||
| 892 | 30 | return func(self, *args, **kwargs) | 41 | return func(self, *args, **kwargs) |
| 893 | 31 | 42 | ||
| 894 | @@ -221,96 +232,54 @@ | |||
| 895 | 221 | def __init__(self, *args): | 232 | def __init__(self, *args): |
| 896 | 222 | super(MusicPage, self).__init__(*args) | 233 | super(MusicPage, self).__init__(*args) |
| 897 | 223 | 234 | ||
| 898 | 224 | def get_count(self): | ||
| 899 | 225 | return self.select_single("QQuickListView", | ||
| 900 | 226 | objectName="nowPlayingQueueList").count | ||
| 901 | 227 | |||
| 902 | 228 | def get_track(self, i): | ||
| 903 | 229 | return (self.wait_select_single(ListItemWithActions, | ||
| 904 | 230 | objectName="nowPlayingListItem" + str(i))) | ||
| 905 | 231 | |||
| 906 | 232 | |||
| 907 | 233 | class AlbumsPage(MusicPage): | ||
| 908 | 234 | """ Autopilot helper for the albums page """ | ||
| 909 | 235 | def __init__(self, *args): | ||
| 910 | 236 | super(MusicPage, self).__init__(*args) | ||
| 911 | 237 | |||
| 912 | 238 | self.visible.wait_for(True) | ||
| 913 | 239 | |||
| 914 | 240 | @click_object | ||
| 915 | 241 | def click_artist(self, i): | ||
| 916 | 242 | return self.wait_select_single("Standard", | ||
| 917 | 243 | objectName="albumsArtistListItem" | ||
| 918 | 244 | + str(i)) | ||
| 919 | 245 | |||
| 920 | 246 | def get_artist(self): | ||
| 921 | 247 | return self.wait_select_single("Label", objectName="artistLabel").text | ||
| 922 | 248 | |||
| 923 | 249 | |||
| 924 | 250 | class SongsPage(MusicPage): | ||
| 925 | 251 | """ Autopilot helper for the songs page """ | ||
| 926 | 252 | def __init__(self, *args): | ||
| 927 | 253 | super(MusicPage, self).__init__(*args) | ||
| 928 | 254 | |||
| 929 | 255 | self.visible.wait_for(True) | ||
| 930 | 256 | |||
| 931 | 257 | @click_object | ||
| 932 | 258 | def click_track(self, i): | ||
| 933 | 259 | return self.get_track(i) | ||
| 934 | 260 | |||
| 935 | 261 | def get_header_artist_label(self): | ||
| 936 | 262 | return self.wait_select_single("Label", | ||
| 937 | 263 | objectName="songsPageHeaderAlbumArtist") | ||
| 938 | 264 | |||
| 939 | 265 | def get_track(self, i): | ||
| 940 | 266 | return (self.wait_select_single(ListItemWithActions, | ||
| 941 | 267 | objectName="songsPageListItem" + str(i))) | ||
| 942 | 268 | |||
| 943 | 269 | |||
| 944 | 270 | class MusicToolbar(UbuntuUIToolkitCustomProxyObjectBase): | ||
| 945 | 271 | """Autopilot helper for the toolbar | ||
| 946 | 272 | |||
| 947 | 273 | expanded - refers to things when the toolbar is in its smaller state | ||
| 948 | 274 | full - refers to things when the toolbar is in its larger state | ||
| 949 | 275 | """ | ||
| 950 | 276 | def __init__(self, *args): | ||
| 951 | 277 | super(MusicToolbar, self).__init__(*args) | ||
| 952 | 278 | |||
| 953 | 279 | root = self.get_root_instance() | 235 | root = self.get_root_instance() |
| 954 | 280 | self.player = root.select_single(Player, objectName="player") | 236 | self.player = root.select_single(Player, objectName="player") |
| 955 | 281 | 237 | ||
| 957 | 282 | @ensure_toolbar_visible | 238 | @ensure_now_playing_full |
| 958 | 283 | @click_object | 239 | @click_object |
| 959 | 284 | def click_forward_button(self): | 240 | def click_forward_button(self): |
| 960 | 285 | return self.wait_select_single("*", objectName="forwardShape") | 241 | return self.wait_select_single("*", objectName="forwardShape") |
| 961 | 286 | 242 | ||
| 963 | 287 | @ensure_toolbar_visible | 243 | @ensure_now_playing_full |
| 964 | 288 | @click_object | 244 | @click_object |
| 965 | 289 | def click_play_button(self): | 245 | def click_play_button(self): |
| 970 | 290 | if self.currentMode == "full": | 246 | return self.wait_select_single("*", objectName="playShape") |
| 967 | 291 | return self.wait_select_single("*", objectName="playShape") | ||
| 968 | 292 | else: | ||
| 969 | 293 | return self.wait_select_single("*", objectName="smallPlayShape") | ||
| 971 | 294 | 247 | ||
| 973 | 295 | @ensure_toolbar_visible | 248 | @ensure_now_playing_full |
| 974 | 296 | @click_object | 249 | @click_object |
| 975 | 297 | def click_previous_button(self): | 250 | def click_previous_button(self): |
| 976 | 298 | return self.wait_select_single("*", objectName="previousShape") | 251 | return self.wait_select_single("*", objectName="previousShape") |
| 977 | 299 | 252 | ||
| 979 | 300 | @ensure_toolbar_visible | 253 | @ensure_now_playing_full |
| 980 | 301 | @click_object | 254 | @click_object |
| 981 | 302 | def click_repeat_button(self): | 255 | def click_repeat_button(self): |
| 982 | 303 | return self.wait_select_single("*", objectName="repeatShape") | 256 | return self.wait_select_single("*", objectName="repeatShape") |
| 983 | 304 | 257 | ||
| 985 | 305 | @ensure_toolbar_visible | 258 | @ensure_now_playing_full |
| 986 | 306 | @click_object | 259 | @click_object |
| 987 | 307 | def click_shuffle_button(self): | 260 | def click_shuffle_button(self): |
| 988 | 308 | return self.wait_select_single("*", objectName="shuffleShape") | 261 | return self.wait_select_single("*", objectName="shuffleShape") |
| 989 | 309 | 262 | ||
| 991 | 310 | @ensure_toolbar_visible | 263 | def click_toggle_view(self): |
| 992 | 264 | self.main_view.get_header().click_action_button("toggleView") | ||
| 993 | 265 | |||
| 994 | 266 | def get_count(self): | ||
| 995 | 267 | return self.select_single("QQuickListView", | ||
| 996 | 268 | objectName="nowPlayingQueueList").count | ||
| 997 | 269 | |||
| 998 | 270 | def go_back(self): | ||
| 999 | 271 | """Use custom back button to go back""" | ||
| 1000 | 272 | self.main_view.get_header().click_custom_back_button() | ||
| 1001 | 273 | |||
| 1002 | 274 | @ensure_now_playing_list | ||
| 1003 | 275 | def get_track(self, i): | ||
| 1004 | 276 | return (self.wait_select_single(ListItemWithActions, | ||
| 1005 | 277 | objectName="nowPlayingListItem" + str(i))) | ||
| 1006 | 278 | |||
| 1007 | 279 | @ensure_now_playing_full | ||
| 1008 | 311 | def seek_to(self, percentage): | 280 | def seek_to(self, percentage): |
| 1009 | 312 | progress_bar = self.wait_select_single( | 281 | progress_bar = self.wait_select_single( |
| 1011 | 313 | "*", objectName="progressBarShape") | 282 | "*", objectName="progressSliderShape") |
| 1012 | 314 | 283 | ||
| 1013 | 315 | x1, y1, width, height = progress_bar.globalRect | 284 | x1, y1, width, height = progress_bar.globalRect |
| 1014 | 316 | y1 += height // 2 | 285 | y1 += height // 2 |
| 1015 | @@ -319,28 +288,77 @@ | |||
| 1016 | 319 | 288 | ||
| 1017 | 320 | self.pointing_device.drag(x1, y1, x2, y1) | 289 | self.pointing_device.drag(x1, y1, x2, y1) |
| 1018 | 321 | 290 | ||
| 1019 | 322 | @ensure_toolbar_visible | ||
| 1020 | 323 | def set_repeat(self, state): | 291 | def set_repeat(self, state): |
| 1021 | 324 | if self.player.repeat != state: | 292 | if self.player.repeat != state: |
| 1022 | 325 | self.click_repeat_button() | 293 | self.click_repeat_button() |
| 1023 | 326 | 294 | ||
| 1024 | 327 | self.player.repeat.wait_for(state) | 295 | self.player.repeat.wait_for(state) |
| 1025 | 328 | 296 | ||
| 1026 | 329 | @ensure_toolbar_visible | ||
| 1027 | 330 | def set_shuffle(self, state): | 297 | def set_shuffle(self, state): |
| 1028 | 331 | if self.player.shuffle != state: | 298 | if self.player.shuffle != state: |
| 1029 | 332 | self.click_shuffle_button() | 299 | self.click_shuffle_button() |
| 1030 | 333 | 300 | ||
| 1031 | 334 | self.player.shuffle.wait_for(state) | 301 | self.player.shuffle.wait_for(state) |
| 1032 | 335 | 302 | ||
| 1041 | 336 | def show(self): | 303 | |
| 1042 | 337 | self.pointing_device.move_to_object(self) | 304 | class AlbumsPage(MusicPage): |
| 1043 | 338 | 305 | """ Autopilot helper for the albums page """ | |
| 1044 | 339 | x1, y1 = self.pointing_device.position() | 306 | def __init__(self, *args): |
| 1045 | 340 | 307 | super(MusicPage, self).__init__(*args) | |
| 1046 | 341 | y1 -= (self.height / 2) + 1 # get position at top of toolbar | 308 | |
| 1047 | 342 | 309 | self.visible.wait_for(True) | |
| 1048 | 343 | self.pointing_device.drag(x1, y1, x1, y1 - self.fullHeight) | 310 | |
| 1049 | 311 | @click_object | ||
| 1050 | 312 | def click_artist(self, i): | ||
| 1051 | 313 | return self.wait_select_single("Standard", | ||
| 1052 | 314 | objectName="albumsArtistListItem" | ||
| 1053 | 315 | + str(i)) | ||
| 1054 | 316 | |||
| 1055 | 317 | def get_artist(self): | ||
| 1056 | 318 | return self.wait_select_single("Label", objectName="artistLabel").text | ||
| 1057 | 319 | |||
| 1058 | 320 | |||
| 1059 | 321 | class SongsPage(MusicPage): | ||
| 1060 | 322 | """ Autopilot helper for the songs page """ | ||
| 1061 | 323 | def __init__(self, *args): | ||
| 1062 | 324 | super(MusicPage, self).__init__(*args) | ||
| 1063 | 325 | |||
| 1064 | 326 | self.visible.wait_for(True) | ||
| 1065 | 327 | |||
| 1066 | 328 | @click_object | ||
| 1067 | 329 | def click_track(self, i): | ||
| 1068 | 330 | return self.get_track(i) | ||
| 1069 | 331 | |||
| 1070 | 332 | def get_header_artist_label(self): | ||
| 1071 | 333 | return self.wait_select_single("Label", | ||
| 1072 | 334 | objectName="songsPageHeaderAlbumArtist") | ||
| 1073 | 335 | |||
| 1074 | 336 | def get_track(self, i): | ||
| 1075 | 337 | return (self.wait_select_single(ListItemWithActions, | ||
| 1076 | 338 | objectName="songsPageListItem" + str(i))) | ||
| 1077 | 339 | |||
| 1078 | 340 | |||
| 1079 | 341 | class MusicToolbar(UbuntuUIToolkitCustomProxyObjectBase): | ||
| 1080 | 342 | """Autopilot helper for the toolbar""" | ||
| 1081 | 343 | def __init__(self, *args): | ||
| 1082 | 344 | super(MusicToolbar, self).__init__(*args) | ||
| 1083 | 345 | |||
| 1084 | 346 | @click_object | ||
| 1085 | 347 | def click_play_button(self): | ||
| 1086 | 348 | return self.wait_select_single("*", objectName="playShape") | ||
| 1087 | 349 | |||
| 1088 | 350 | @click_object | ||
| 1089 | 351 | def click_jump_to_now_playing(self): | ||
| 1090 | 352 | return self.wait_select_single("*", objectName="jumpNowPlaying") | ||
| 1091 | 353 | |||
| 1092 | 354 | def switch_to_now_playing(self): | ||
| 1093 | 355 | self.click_jump_to_now_playing() | ||
| 1094 | 356 | |||
| 1095 | 357 | root = self.get_root_instance() | ||
| 1096 | 358 | now_playing_page = root.wait_select_single(MusicNowPlaying, | ||
| 1097 | 359 | objectName="nowPlayingPage") | ||
| 1098 | 360 | |||
| 1099 | 361 | now_playing_page.visible.wait_for(True) | ||
| 1100 | 344 | 362 | ||
| 1101 | 345 | 363 | ||
| 1102 | 346 | class ListItemWithActions(UbuntuUIToolkitCustomProxyObjectBase): | 364 | class ListItemWithActions(UbuntuUIToolkitCustomProxyObjectBase): |
| 1103 | 347 | 365 | ||
| 1104 | === modified file 'tests/autopilot/music_app/tests/test_music.py' | |||
| 1105 | --- tests/autopilot/music_app/tests/test_music.py 2014-09-23 20:45:41 +0000 | |||
| 1106 | +++ tests/autopilot/music_app/tests/test_music.py 2014-10-07 15:28:54 +0000 | |||
| 1107 | @@ -91,6 +91,11 @@ | |||
| 1108 | 91 | Eventually(NotEquals(end_tracks_count))) | 91 | Eventually(NotEquals(end_tracks_count))) |
| 1109 | 92 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 92 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1110 | 93 | 93 | ||
| 1111 | 94 | toolbar.switch_to_now_playing() # Switch to the now playing page | ||
| 1112 | 95 | |||
| 1113 | 96 | # Re get now playing page as it has changed | ||
| 1114 | 97 | now_playing_page = self.app.get_now_playing_page() | ||
| 1115 | 98 | |||
| 1116 | 94 | # verify song's metadata matches the item added to the Now Playing view | 99 | # verify song's metadata matches the item added to the Now Playing view |
| 1117 | 95 | current_track = now_playing_page.get_track(self.player.currentIndex) | 100 | current_track = now_playing_page.get_track(self.player.currentIndex) |
| 1118 | 96 | 101 | ||
| 1119 | @@ -99,14 +104,14 @@ | |||
| 1120 | 99 | self.assertThat(current_track.get_label_text("titleLabel"), | 104 | self.assertThat(current_track.get_label_text("titleLabel"), |
| 1121 | 100 | Equals(self.tracks[0]["title"])) | 105 | Equals(self.tracks[0]["title"])) |
| 1122 | 101 | 106 | ||
| 1125 | 102 | # click on close button to close the page | 107 | # click on close button to close the page and now playing page |
| 1126 | 103 | self.app.main_view.go_back() | 108 | now_playing_page.go_back() |
| 1127 | 104 | 109 | ||
| 1129 | 105 | # click the play button to start playing | 110 | # click the play button (toolbar) to start playing |
| 1130 | 106 | toolbar.click_play_button() | 111 | toolbar.click_play_button() |
| 1131 | 107 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 112 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1132 | 108 | 113 | ||
| 1134 | 109 | # click the play button to stop playing | 114 | # click the play button (toolbar) to stop playing |
| 1135 | 110 | toolbar.click_play_button() | 115 | toolbar.click_play_button() |
| 1136 | 111 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 116 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1137 | 112 | 117 | ||
| 1138 | @@ -115,15 +120,15 @@ | |||
| 1139 | 115 | 120 | ||
| 1140 | 116 | self.app.populate_queue() # populate queue | 121 | self.app.populate_queue() # populate queue |
| 1141 | 117 | 122 | ||
| 1143 | 118 | toolbar = self.app.get_toolbar() | 123 | now_playing_page = self.app.get_now_playing_page() |
| 1144 | 119 | 124 | ||
| 1145 | 120 | # check that the player is playing and then select pause | 125 | # check that the player is playing and then select pause |
| 1146 | 121 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 126 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1148 | 122 | toolbar.click_play_button() | 127 | now_playing_page.click_play_button() |
| 1149 | 123 | 128 | ||
| 1150 | 124 | # check that the player is paused and then select play | 129 | # check that the player is paused and then select play |
| 1151 | 125 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 130 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1153 | 126 | toolbar.click_play_button() | 131 | now_playing_page.click_play_button() |
| 1154 | 127 | 132 | ||
| 1155 | 128 | # check that the player is playing | 133 | # check that the player is playing |
| 1156 | 129 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 134 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1157 | @@ -133,7 +138,7 @@ | |||
| 1158 | 133 | 138 | ||
| 1159 | 134 | self.app.populate_queue() # populate queue | 139 | self.app.populate_queue() # populate queue |
| 1160 | 135 | 140 | ||
| 1162 | 136 | toolbar = self.app.get_toolbar() | 141 | now_playing_page = self.app.get_now_playing_page() |
| 1163 | 137 | 142 | ||
| 1164 | 138 | # save original song data for later | 143 | # save original song data for later |
| 1165 | 139 | org_title = self.player.currentMetaTitle | 144 | org_title = self.player.currentMetaTitle |
| 1166 | @@ -144,17 +149,17 @@ | |||
| 1167 | 144 | logger.debug("Original Song %s, %s" % (org_title, org_artist)) | 149 | logger.debug("Original Song %s, %s" % (org_title, org_artist)) |
| 1168 | 145 | 150 | ||
| 1169 | 146 | # select pause and check the player has stopped | 151 | # select pause and check the player has stopped |
| 1171 | 147 | toolbar.click_play_button() | 152 | now_playing_page.click_play_button() |
| 1172 | 148 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 153 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1173 | 149 | 154 | ||
| 1175 | 150 | toolbar.set_shuffle(False) # ensure shuffe is off | 155 | now_playing_page.set_shuffle(False) # ensure shuffe is off |
| 1176 | 151 | 156 | ||
| 1177 | 152 | # goal is to go back and forth and ensure 2 different songs | 157 | # goal is to go back and forth and ensure 2 different songs |
| 1179 | 153 | toolbar.click_forward_button() | 158 | now_playing_page.click_forward_button() |
| 1180 | 154 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 159 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1181 | 155 | 160 | ||
| 1182 | 156 | # select pause and check the player has stopped | 161 | # select pause and check the player has stopped |
| 1184 | 157 | toolbar.click_play_button() | 162 | now_playing_page.click_play_button() |
| 1185 | 158 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 163 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1186 | 159 | 164 | ||
| 1187 | 160 | # ensure different song | 165 | # ensure different song |
| 1188 | @@ -166,14 +171,14 @@ | |||
| 1189 | 166 | logger.debug("Next Song %s, %s" % (self.player.currentMetaTitle, | 171 | logger.debug("Next Song %s, %s" % (self.player.currentMetaTitle, |
| 1190 | 167 | self.player.currentMetaArtist)) | 172 | self.player.currentMetaArtist)) |
| 1191 | 168 | 173 | ||
| 1193 | 169 | toolbar.seek_to(0) # seek to 0 (start) | 174 | now_playing_page.seek_to(0) # seek to 0 (start) |
| 1194 | 170 | 175 | ||
| 1195 | 171 | # select previous and ensure the track is playing | 176 | # select previous and ensure the track is playing |
| 1197 | 172 | toolbar.click_previous_button() | 177 | now_playing_page.click_previous_button() |
| 1198 | 173 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 178 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1199 | 174 | 179 | ||
| 1200 | 175 | # select pause and check the player has stopped | 180 | # select pause and check the player has stopped |
| 1202 | 176 | toolbar.click_play_button() | 181 | now_playing_page.click_play_button() |
| 1203 | 177 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 182 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1204 | 178 | 183 | ||
| 1205 | 179 | # ensure we're back to original song | 184 | # ensure we're back to original song |
| 1206 | @@ -207,13 +212,13 @@ | |||
| 1207 | 207 | self.assertThat(self.player.source.endswith("mp3"), | 212 | self.assertThat(self.player.source.endswith("mp3"), |
| 1208 | 208 | Equals(True)) | 213 | Equals(True)) |
| 1209 | 209 | 214 | ||
| 1211 | 210 | # Start playing the track | 215 | # Start playing the track (click from toolbar) |
| 1212 | 211 | toolbar.click_play_button() | 216 | toolbar.click_play_button() |
| 1213 | 212 | 217 | ||
| 1214 | 213 | # Check that the track is playing | 218 | # Check that the track is playing |
| 1215 | 214 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) | 219 | self.assertThat(self.player.isPlaying, Eventually(Equals(True))) |
| 1216 | 215 | 220 | ||
| 1218 | 216 | # Stop playing the track | 221 | # Stop playing the track (click from toolbar) |
| 1219 | 217 | toolbar.click_play_button() | 222 | toolbar.click_play_button() |
| 1220 | 218 | 223 | ||
| 1221 | 219 | # Check current meta data is correct | 224 | # Check current meta data is correct |
| 1222 | @@ -229,15 +234,15 @@ | |||
| 1223 | 229 | 234 | ||
| 1224 | 230 | # at this point the track is playing and shuffle is enabled | 235 | # at this point the track is playing and shuffle is enabled |
| 1225 | 231 | 236 | ||
| 1227 | 232 | toolbar = self.app.get_toolbar() | 237 | now_playing_page = self.app.get_now_playing_page() |
| 1228 | 233 | 238 | ||
| 1229 | 234 | # pause the track if it is playing | 239 | # pause the track if it is playing |
| 1230 | 235 | if self.player.isPlaying: | 240 | if self.player.isPlaying: |
| 1232 | 236 | toolbar.click_play_button() | 241 | now_playing_page.click_play_button() |
| 1233 | 237 | 242 | ||
| 1234 | 238 | self.player.isPlaying.wait_for(False) | 243 | self.player.isPlaying.wait_for(False) |
| 1235 | 239 | 244 | ||
| 1237 | 240 | toolbar.set_shuffle(True) # enable shuffle | 245 | now_playing_page.set_shuffle(True) # enable shuffle |
| 1238 | 241 | 246 | ||
| 1239 | 242 | # save original song metadata | 247 | # save original song metadata |
| 1240 | 243 | org_title = self.player.currentMetaTitle | 248 | org_title = self.player.currentMetaTitle |
| 1241 | @@ -256,11 +261,11 @@ | |||
| 1242 | 256 | self.assertThat(count, LessThan(100)) | 261 | self.assertThat(count, LessThan(100)) |
| 1243 | 257 | 262 | ||
| 1244 | 258 | # select next track | 263 | # select next track |
| 1246 | 259 | toolbar.click_forward_button() | 264 | now_playing_page.click_forward_button() |
| 1247 | 260 | 265 | ||
| 1248 | 261 | # pause the track if it is playing | 266 | # pause the track if it is playing |
| 1249 | 262 | if self.player.isPlaying: | 267 | if self.player.isPlaying: |
| 1251 | 263 | toolbar.click_play_button() | 268 | now_playing_page.click_play_button() |
| 1252 | 264 | 269 | ||
| 1253 | 265 | # check it is paused | 270 | # check it is paused |
| 1254 | 266 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 271 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1255 | @@ -270,11 +275,11 @@ | |||
| 1256 | 270 | 275 | ||
| 1257 | 271 | # select previous track while will break if this previous track | 276 | # select previous track while will break if this previous track |
| 1258 | 272 | # is different and therefore a shuffle has occurred | 277 | # is different and therefore a shuffle has occurred |
| 1260 | 273 | toolbar.click_previous_button() | 278 | now_playing_page.click_previous_button() |
| 1261 | 274 | 279 | ||
| 1262 | 275 | # pause the track if it is playing | 280 | # pause the track if it is playing |
| 1263 | 276 | if self.player.isPlaying: | 281 | if self.player.isPlaying: |
| 1265 | 277 | toolbar.click_play_button() | 282 | now_playing_page.click_play_button() |
| 1266 | 278 | 283 | ||
| 1267 | 279 | # check it is paused | 284 | # check it is paused |
| 1268 | 280 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 285 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1269 | @@ -314,6 +319,7 @@ | |||
| 1270 | 314 | """tests navigating to the Albums tab and adding a song to queue""" | 319 | """tests navigating to the Albums tab and adding a song to queue""" |
| 1271 | 315 | 320 | ||
| 1272 | 316 | now_playing_page = self.app.get_now_playing_page() | 321 | now_playing_page = self.app.get_now_playing_page() |
| 1273 | 322 | toolbar = self.app.get_toolbar() | ||
| 1274 | 317 | 323 | ||
| 1275 | 318 | # get number of tracks in queue before queuing a track | 324 | # get number of tracks in queue before queuing a track |
| 1276 | 319 | initial_tracks_count = now_playing_page.get_count() | 325 | initial_tracks_count = now_playing_page.get_count() |
| 1277 | @@ -341,6 +347,11 @@ | |||
| 1278 | 341 | # Assert that the song added to the list is not playing | 347 | # Assert that the song added to the list is not playing |
| 1279 | 342 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 348 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1280 | 343 | 349 | ||
| 1281 | 350 | toolbar.switch_to_now_playing() # Switch to the now playing page | ||
| 1282 | 351 | |||
| 1283 | 352 | # Re get now playing page as it has changed | ||
| 1284 | 353 | now_playing_page = self.app.get_now_playing_page() | ||
| 1285 | 354 | |||
| 1286 | 344 | # verify song's metadata matches the item added to the Now Playing view | 355 | # verify song's metadata matches the item added to the Now Playing view |
| 1287 | 345 | current_track = now_playing_page.get_track(self.player.currentIndex) | 356 | current_track = now_playing_page.get_track(self.player.currentIndex) |
| 1288 | 346 | 357 | ||
| 1289 | @@ -349,8 +360,8 @@ | |||
| 1290 | 349 | self.assertThat(current_track.get_label_text("titleLabel"), | 360 | self.assertThat(current_track.get_label_text("titleLabel"), |
| 1291 | 350 | Equals(tracks[0]["title"])) | 361 | Equals(tracks[0]["title"])) |
| 1292 | 351 | 362 | ||
| 1295 | 352 | # click on close button to close songs page | 363 | # click on close button to close nowplaying and songs page |
| 1296 | 353 | self.app.main_view.go_back() | 364 | now_playing_page.go_back() |
| 1297 | 354 | 365 | ||
| 1298 | 355 | # check that the albums page is now visible | 366 | # check that the albums page is now visible |
| 1299 | 356 | self.assertThat(albums_page.visible, Eventually(Equals(True))) | 367 | self.assertThat(albums_page.visible, Eventually(Equals(True))) |
| 1300 | @@ -391,6 +402,7 @@ | |||
| 1301 | 391 | to the queue via the expandable list view item. """ | 402 | to the queue via the expandable list view item. """ |
| 1302 | 392 | 403 | ||
| 1303 | 393 | now_playing_page = self.app.get_now_playing_page() | 404 | now_playing_page = self.app.get_now_playing_page() |
| 1304 | 405 | toolbar = self.app.get_toolbar() | ||
| 1305 | 394 | 406 | ||
| 1306 | 395 | # get number of tracks in queue before queuing a track | 407 | # get number of tracks in queue before queuing a track |
| 1307 | 396 | initial_tracks_count = now_playing_page.get_count() | 408 | initial_tracks_count = now_playing_page.get_count() |
| 1308 | @@ -413,6 +425,11 @@ | |||
| 1309 | 413 | Eventually(NotEquals(now_playing_page.get_count()))) | 425 | Eventually(NotEquals(now_playing_page.get_count()))) |
| 1310 | 414 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 426 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1311 | 415 | 427 | ||
| 1312 | 428 | toolbar.switch_to_now_playing() # Switch to the now playing page | ||
| 1313 | 429 | |||
| 1314 | 430 | # Re get now playing page as it has changed | ||
| 1315 | 431 | now_playing_page = self.app.get_now_playing_page() | ||
| 1316 | 432 | |||
| 1317 | 416 | # verify song's metadata matches the item added to the Now Playing view | 433 | # verify song's metadata matches the item added to the Now Playing view |
| 1318 | 417 | current_track = now_playing_page.get_track(self.player.currentIndex) | 434 | current_track = now_playing_page.get_track(self.player.currentIndex) |
| 1319 | 418 | 435 | ||
| 1320 | @@ -552,14 +569,13 @@ | |||
| 1321 | 552 | self.app.populate_queue() # populate queue | 569 | self.app.populate_queue() # populate queue |
| 1322 | 553 | 570 | ||
| 1323 | 554 | now_playing_page = self.app.get_now_playing_page() | 571 | now_playing_page = self.app.get_now_playing_page() |
| 1324 | 555 | toolbar = self.app.get_toolbar() | ||
| 1325 | 556 | 572 | ||
| 1328 | 557 | toolbar.set_shuffle(False) | 573 | now_playing_page.set_shuffle(False) |
| 1329 | 558 | toolbar.set_repeat(False) | 574 | now_playing_page.set_repeat(False) |
| 1330 | 559 | 575 | ||
| 1331 | 560 | # Skip through all songs in queue, stopping on last one. | 576 | # Skip through all songs in queue, stopping on last one. |
| 1332 | 561 | for count in range(0, now_playing_page.get_count() - 1): | 577 | for count in range(0, now_playing_page.get_count() - 1): |
| 1334 | 562 | toolbar.click_forward_button() | 578 | now_playing_page.click_forward_button() |
| 1335 | 563 | 579 | ||
| 1336 | 564 | # When the last song ends, playback should stop | 580 | # When the last song ends, playback should stop |
| 1337 | 565 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) | 581 | self.assertThat(self.player.isPlaying, Eventually(Equals(False))) |
| 1338 | @@ -570,14 +586,13 @@ | |||
| 1339 | 570 | self.app.populate_queue() # populate queue | 586 | self.app.populate_queue() # populate queue |
| 1340 | 571 | 587 | ||
| 1341 | 572 | now_playing_page = self.app.get_now_playing_page() | 588 | now_playing_page = self.app.get_now_playing_page() |
| 1342 | 573 | toolbar = self.app.get_toolbar() | ||
| 1343 | 574 | 589 | ||
| 1346 | 575 | toolbar.set_shuffle(False) | 590 | now_playing_page.set_shuffle(False) |
| 1347 | 576 | toolbar.set_repeat(True) | 591 | now_playing_page.set_repeat(True) |
| 1348 | 577 | 592 | ||
| 1349 | 578 | # Skip through all songs in queue, stopping on last one. | 593 | # Skip through all songs in queue, stopping on last one. |
| 1350 | 579 | for count in range(0, now_playing_page.get_count() - 1): | 594 | for count in range(0, now_playing_page.get_count() - 1): |
| 1352 | 580 | toolbar.click_forward_button() | 595 | now_playing_page.click_forward_button() |
| 1353 | 581 | 596 | ||
| 1354 | 582 | # Make sure we loop back to first song after last song ends | 597 | # Make sure we loop back to first song after last song ends |
| 1355 | 583 | self.assertThat(self.player.currentMetaTitle, | 598 | self.assertThat(self.player.currentMetaTitle, |
| 1356 | @@ -590,14 +605,13 @@ | |||
| 1357 | 590 | self.app.populate_queue() # populate queue | 605 | self.app.populate_queue() # populate queue |
| 1358 | 591 | 606 | ||
| 1359 | 592 | now_playing_page = self.app.get_now_playing_page() | 607 | now_playing_page = self.app.get_now_playing_page() |
| 1360 | 593 | toolbar = self.app.get_toolbar() | ||
| 1361 | 594 | 608 | ||
| 1364 | 595 | toolbar.set_shuffle(False) | 609 | now_playing_page.set_shuffle(False) |
| 1365 | 596 | toolbar.set_repeat(True) | 610 | now_playing_page.set_repeat(True) |
| 1366 | 597 | 611 | ||
| 1367 | 598 | # Skip through all songs in queue, INCLUDING last one. | 612 | # Skip through all songs in queue, INCLUDING last one. |
| 1368 | 599 | for count in range(0, now_playing_page.get_count() - 1): | 613 | for count in range(0, now_playing_page.get_count() - 1): |
| 1370 | 600 | toolbar.click_forward_button() | 614 | now_playing_page.click_forward_button() |
| 1371 | 601 | 615 | ||
| 1372 | 602 | # Make sure we loop back to first song after last song ends | 616 | # Make sure we loop back to first song after last song ends |
| 1373 | 603 | self.assertThat(self.player.currentMetaTitle, | 617 | self.assertThat(self.player.currentMetaTitle, |
| 1374 | @@ -609,19 +623,19 @@ | |||
| 1375 | 609 | 623 | ||
| 1376 | 610 | self.app.populate_queue() # populate queue | 624 | self.app.populate_queue() # populate queue |
| 1377 | 611 | 625 | ||
| 1379 | 612 | toolbar = self.app.get_toolbar() | 626 | now_playing_page = self.app.get_now_playing_page() |
| 1380 | 613 | 627 | ||
| 1383 | 614 | toolbar.set_shuffle(False) | 628 | now_playing_page.set_shuffle(False) |
| 1384 | 615 | toolbar.set_repeat(True) | 629 | now_playing_page.set_repeat(True) |
| 1385 | 616 | 630 | ||
| 1386 | 617 | initial_song = self.player.currentMetaTitle | 631 | initial_song = self.player.currentMetaTitle |
| 1388 | 618 | toolbar.click_previous_button() | 632 | now_playing_page.click_previous_button() |
| 1389 | 619 | 633 | ||
| 1390 | 620 | # If we're far enough into a song, pressing prev just takes us to the | 634 | # If we're far enough into a song, pressing prev just takes us to the |
| 1391 | 621 | # beginning of that track. In that case, hit prev again to actually | 635 | # beginning of that track. In that case, hit prev again to actually |
| 1392 | 622 | # skip over the track. | 636 | # skip over the track. |
| 1393 | 623 | if self.player.currentMetaTitle == initial_song: | 637 | if self.player.currentMetaTitle == initial_song: |
| 1395 | 624 | toolbar.click_previous_button() | 638 | now_playing_page.click_previous_button() |
| 1396 | 625 | 639 | ||
| 1397 | 626 | self.assertThat(self.player.currentMetaTitle, | 640 | self.assertThat(self.player.currentMetaTitle, |
| 1398 | 627 | Eventually(Equals(self.tracks[-1]["title"]))) | 641 | Eventually(Equals(self.tracks[-1]["title"]))) |
| 1399 | @@ -632,17 +646,17 @@ | |||
| 1400 | 632 | 646 | ||
| 1401 | 633 | self.app.populate_queue() # populate queue | 647 | self.app.populate_queue() # populate queue |
| 1402 | 634 | 648 | ||
| 1404 | 635 | toolbar = self.app.get_toolbar() | 649 | now_playing_page = self.app.get_now_playing_page() |
| 1405 | 636 | 650 | ||
| 1406 | 637 | self.player.isPlaying.wait_for(True) # ensure the track is playing | 651 | self.player.isPlaying.wait_for(True) # ensure the track is playing |
| 1407 | 638 | self.player.position.wait_for(GreaterThan(5000)) # wait until > 5s | 652 | self.player.position.wait_for(GreaterThan(5000)) # wait until > 5s |
| 1408 | 639 | 653 | ||
| 1410 | 640 | toolbar.click_play_button() # pause the track | 654 | now_playing_page.click_play_button() # pause the track |
| 1411 | 641 | self.player.isPlaying.wait_for(False) # ensure the track has paused | 655 | self.player.isPlaying.wait_for(False) # ensure the track has paused |
| 1412 | 642 | 656 | ||
| 1413 | 643 | source = self.player.source # store current source | 657 | source = self.player.source # store current source |
| 1414 | 644 | 658 | ||
| 1416 | 645 | toolbar.click_previous_button() # click previous | 659 | now_playing_page.click_previous_button() # click previous |
| 1417 | 646 | 660 | ||
| 1418 | 647 | self.player.position.wait_for(LessThan(5000)) # wait until < 5s | 661 | self.player.position.wait_for(LessThan(5000)) # wait until < 5s |
| 1419 | 648 | 662 | ||
FAILED: Continuous integration, rev:652
http://
Executed test runs:
UNSTABLE: http://
deb: http://
SUCCESS: http://
Click here to trigger a rebuild:
http://