1
=== removed file 'FirstRun.qml'
2
--- FirstRun.qml	2013-05-31 13:58:43 +0000
3
+++ FirstRun.qml	1970-01-01 00:00:00 +0000
4
@@ -1,54 +0,0 @@
5
1
/*
6
2
 * Copyleft Daniel Holm.
7
3
 *
8
4
 * Authors:
9
5
 *  Daniel Holm <d.holmen@gmail.com>
10
6
 *
11
7
 * This program is free software; you can redistribute it and/or modify
12
8
 * it under the terms of the GNU General Public License as published by
13
9
 * the Free Software Foundation; version 3.
14
10
 *
15
11
 * This program is distributed in the hope that it will be useful,
16
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
17
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
18
14
 * GNU General Public License for more details.
19
15
 *
20
16
 * You should have received a copy of the GNU General Public License
21
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
22
18
 */
23
19
24
20
import QtQuick 2.0
25
21
import Ubuntu.Components 0.1
26
22
import Ubuntu.Components.ListItems 0.1 as ListItem
27
23
import Ubuntu.Components.Popups 0.1
28
24
import QtQuick.LocalStorage 2.0
29
25
import "settings.js" as Settings
30
26
31
27
Dialog {
32
28
    id: root
33
29
    title: i18n.tr("First Run")
34
30
    text: i18n.tr("This appears to be your first run. Please set your music directory.")
35
31
36
32
    Row {
37
33
        spacing: units.gu(2)
38
34
        TextField {
39
35
            id: musicDirField
40
36
            placeholderText: "/home/username/Music"
41
37
            hasClearButton: false
42
38
            text: musicDir
43
39
        }
44
40
    }
45
41
46
42
    Button {
47
43
        text: i18n.tr("Save")
48
44
        color: "green"
49
45
        onClicked: {
50
46
            PopupUtils.close(root)
51
47
            // set new music dir
52
48
            Settings.initialize()
53
49
            Settings.setSetting("currentfolder", musicDirField.text)
54
50
            console.debug("Debug: Set new music dir to: "+musicDirField.text)
55
51
        }
56
52
    }
57
53
58
54
}
59
55
0
60
=== modified file 'MusicSettings.qml'
61
--- MusicSettings.qml	2013-05-31 14:58:23 +0000
62
+++ MusicSettings.qml	2013-06-05 04:48:28 +0000
63
@@ -3,6 +3,7 @@
64
3
 *
3
 *
65
4
 * Authors:
4
 * Authors:
66
5
 *  Daniel Holm <d.holmen@gmail.com>
5
 *  Daniel Holm <d.holmen@gmail.com>
67
6
 *  Victor Thompson <victor.thompson@gmail.com>
68
6
 *
7
 *
69
7
 * This program is free software; you can redistribute it and/or modify
8
 * This program is free software; you can redistribute it and/or modify
70
8
 * it under the terms of the GNU General Public License as published by
9
 * it under the terms of the GNU General Public License as published by
71
@@ -31,9 +32,13 @@
72
31
        spacing: units.gu(2)
32
        spacing: units.gu(2)
73
32
        TextField {
33
        TextField {
74
33
            id: musicDirField
34
            id: musicDirField
76
34
            placeholderText: "/home/username/Music"
35
            placeholderText: folderModel.homePath() + "/Music"
77
35
            hasClearButton: false
36
            hasClearButton: false
79
36
            text: musicDir
37
            text: Settings.getSetting("currentfolder")
80
38
81
39
            onTextChanged: {
82
40
                Settings.setSetting("currentfolder", text)
83
41
            }
84
37
        }
42
        }
85
38
    }
43
    }
86
39
44
87
@@ -45,8 +50,8 @@
88
45
            width: units.gu(20)
50
            width: units.gu(20)
89
46
        }
51
        }
90
47
        Switch {
52
        Switch {
93
48
            id: scrobbleSwitch
53
            id: shuffleSwitch
94
49
            checked: shuffleState
54
            checked: Settings.getSetting("shuffle") === "1"
95
50
        }
55
        }
96
51
    }
56
    }
97
52
57
98
@@ -97,7 +102,7 @@
99
97
    Row {
102
    Row {
100
98
        ListItem.Subtitled {
103
        ListItem.Subtitled {
101
99
            text:  "Music "+appVersion
104
            text:  "Music "+appVersion
103
100
            subText: i18n.tr("By Daniel Holm, Sweden")
105
            subText: i18n.tr("By Daniel Holm (Sweden) and\nVictor Thompson (USA)")
104
101
        }
106
        }
105
102
    }
107
    }
106
103
108
107
@@ -142,9 +147,10 @@
108
142
            // set new music dir
147
            // set new music dir
109
143
            Settings.initialize()
148
            Settings.initialize()
110
144
            Settings.setSetting("currentfolder", musicDirField.text) // save music dir
149
            Settings.setSetting("currentfolder", musicDirField.text) // save music dir
112
145
            Settings.setSetting("shuffle", scrobbleSwitch.checked) // save shuffle state
150
            Settings.setSetting("shuffle", shuffleSwitch.checked) // save shuffle state
113
151
            random = shuffleSwitch.checked
114
146
            console.debug("Debug: Set new music dir to: "+musicDirField.text)
152
            console.debug("Debug: Set new music dir to: "+musicDirField.text)
116
147
            console.debug("Debug: Shuffle: "+scrobbleSwitch.checked)
153
            console.debug("Debug: Shuffle: "+ shuffleSwitch.checked)
117
148
        }
154
        }
118
149
    }
155
    }
119
150
156
120
151
157
121
=== modified file 'MusicTracks.qml'
122
--- MusicTracks.qml	2013-05-31 14:58:23 +0000
123
+++ MusicTracks.qml	2013-06-05 04:48:28 +0000
124
@@ -3,6 +3,7 @@
125
3
 *
3
 *
126
4
 * Authors:
4
 * Authors:
127
5
 *  Daniel Holm <d.holmen@gmail.com>
5
 *  Daniel Holm <d.holmen@gmail.com>
128
6
 *  Victor Thompson <victor.thompson@gmail.com>
129
6
 *
7
 *
130
7
 * This program is free software; you can redistribute it and/or modify
8
 * This program is free software; you can redistribute it and/or modify
131
8
 * it under the terms of the GNU General Public License as published by
9
 * it under the terms of the GNU General Public License as published by
132
@@ -22,119 +23,649 @@
133
22
import Ubuntu.Components.ListItems 0.1
23
import Ubuntu.Components.ListItems 0.1
134
23
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
135
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
137
25
import Qt.labs.folderlistmodel 1.0
26
import org.nemomobile.folderlistmodel 1.0
138
26
import QtMultimedia 5.0
27
import QtMultimedia 5.0
139
27
import QtQuick.LocalStorage 2.0
28
import QtQuick.LocalStorage 2.0
140
28
import "settings.js" as Settings
29
import "settings.js" as Settings
142
29
import "meta-database.js" as MetaDB
30
import "meta-database.js" as Library
143
31
import "playing-list.js" as PlayingList
144
32
145
30
33
146
31
34
147
32
PageStack {
35
PageStack {
149
33
    id: singleTracksPageStack
36
    id: pageStack
150
34
    anchors.fill: parent
37
    anchors.fill: parent
151
35
38
152
39
    property bool needsUpdate: false
153
40
    property int filelistCurrentIndex: 0
154
41
    property int filelistCount: 0
155
42
156
43
    onFilelistCurrentIndexChanged: {
157
44
        filelist.currentIndex = filelistCurrentIndex
158
45
    }
159
46
160
47
    onNeedsUpdateChanged: {
161
48
        if (needsUpdate === true) {
162
49
            needsUpdate = false
163
50
            fileDurationProgressBackground.visible = true
164
51
            fileDurationProgressBackground_nowplaying.visible = true
165
52
            fileDurationProgress.width = units.gu(Math.floor((player.position*100)/player.duration) * .2) // 20 max
166
53
            fileDurationProgress_nowplaying.width = units.gu(Math.floor((player.position*100)/player.duration) * .4) // 40 max
167
54
            fileDurationBottom.text = Math.floor((player.position/1000) / 60).toString() + ":" + (
168
55
                        Math.floor((player.position/1000) % 60)<10 ? "0"+Math.floor((player.position/1000) % 60).toString() :
169
56
                                                          Math.floor((player.position/1000) % 60).toString())
170
57
            fileDurationBottom.text += " / "
171
58
            fileDurationBottom.text += Math.floor((player.duration/1000) / 60).toString() + ":" + (
172
59
                        Math.floor((player.duration/1000) % 60)<10 ? "0"+Math.floor((player.duration/1000) % 60).toString() :
173
60
                                                          Math.floor((player.duration/1000) % 60).toString())
174
61
            fileDurationBottom_nowplaying.text = fileDurationBottom.text
175
62
        }
176
63
    }
177
64
178
36
    Component.onCompleted: {
65
    Component.onCompleted: {
180
37
        // initialize settings db
66
        pageStack.push(mainpage)
181
38
        Settings.initialize()
67
        Settings.initialize()
185
39
        console.debug("INITIALIZED Settings")
68
        console.debug("INITIALIZED")
183
40
184
41
        // If there were no database
186
42
        if (Settings.getSetting("initialized") !== "true") {
69
        if (Settings.getSetting("initialized") !== "true") {
187
43
            // initialize settings
70
            // initialize settings
188
44
            console.debug("reset settings")
71
            console.debug("reset settings")
237
45
            Settings.setSetting("initialized", "true") // set that settings exists
72
            Settings.setSetting("initialized", "true")
238
46
            Settings.setSetting("shuffle", "false") // set to not shuffle as default
73
            Settings.setSetting("currentfolder", folderModel.homePath() + "/Music")
239
47
            Settings.setSetting("scrobble", "false") // no scrobble yet
74
        }
240
48
            Settings.setSetting("currentfolder", "/") // Music dir
75
        random = Settings.getSetting("shuffle") == "1"
241
49
            // show dialog so that user can set the music dir manually, untill later
76
        filelist.currentIndex = -1
242
50
            PopupUtils.open(Qt.resolvedUrl("FirstRun.qml"), pageLayout,
77
    }
243
51
                        {
78
244
52
                            title: i18n.tr("First Run")
79
    Page {
245
53
                        } )
80
        id: mainpage
246
54
        }
81
247
55
82
        title: i18n.tr("Music")
248
56
        // Run as usual
83
249
57
        else {
84
        Component {
250
58
            musicDir = Settings.getSetting("currentfolder")
85
            id: highlight
251
59
            shuffleState = Settings.getSetting("shuffle")
86
            Rectangle {
252
60
            console.debug("Debug: Music dir set to: "+musicDir)
87
                width: 5; height: 40
253
61
            console.debug("Debug: Shuffle state is: "+shuffleState)
88
                color: "#DD4814";
254
62
            //console.debug("Debug: Scrobble state is: "+scrobbleState)
89
                Behavior on y {
255
63
        }
90
                    SpringAnimation {
256
64
91
                        spring: 3
257
65
        // then go on to meta data db
92
                        damping: 0.2
258
66
        MetaDB.initialize() // also create the metaDB
93
                    }
259
67
        console.debug("INITIALIZED Meta data")
94
                }
260
68
        /*
95
            }
261
69
        if (Settings.getSetting("initialized") !== "true") {
96
        }
262
70
            // start adding tracks to db
97
263
71
            title = getTrackInfo(file, title)
98
        ListView {
264
72
            album = getTrackInfo(file, album)
99
            id: filelist
265
73
            year = getTrackInfo(file, year)
100
            width: parent.width
266
74
            tracknr = getTrackInfo(file, tracknr)
101
            height: parent.height - units.gu(8)
267
75
            length = getTrackInfo(file, length)
102
            anchors.top: tracksContext.bottom
268
76
            console.debug("file", "title", "artist", "album", "year", "tracknr", "length")
103
            highlight: highlight
269
77
            //MetaDB.setSetting("file", "title", "artist", "album", "year", "tracknr", "length")
104
            highlightFollowsCurrentItem: true
270
78
        }*/
105
            model: folderModel
271
79
    }
106
            delegate: fileDelegate
272
80
107
            onCountChanged: {
273
81
108
                filelistCount = filelist.count
274
82
    width: units.gu(50)
109
            }
275
83
    height: units.gu(75)
110
            onCurrentIndexChanged: {
276
84
111
                filelistCurrentIndex = filelist.currentIndex
277
85
    Page {
112
                console.log("filelist.currentIndex = " + filelist.currentIndex)
278
86
        id: singleTracksPage
113
            }
279
87
114
280
88
        // toolbar
115
            Component {
281
89
        tools: defaultToolbar
116
                id: fileDelegate
282
90
117
                ListItem.Standard {
283
91
        Column {
118
                    id: file
284
92
            anchors.centerIn: parent
119
                    progression: model.isDir
285
120
                    icon: !model.isDir ? (trackCover === "" ? (fileName.match("\\.mp3") ? Qt.resolvedUrl("images/audio-x-mpeg.png") : Qt.resolvedUrl("images/audio-x-vorbis+ogg.png")) : "image://cover-art/"+filePath) : Qt.resolvedUrl("images/folder.png")
286
121
                    iconFrame: false
287
122
                    Label {
288
123
                        id: fileTitle
289
124
                        width: 400
290
125
                        wrapMode: Text.Wrap
291
126
                        maximumLineCount: 1
292
127
                        font.pixelSize: 16
293
128
                        anchors.left: parent.left
294
129
                        anchors.leftMargin: 75
295
130
                        anchors.top: parent.top
296
131
                        anchors.topMargin: 5
297
132
                        text: trackTitle == "" ? fileName : trackTitle
298
133
                    }
299
134
                    Label {
300
135
                        id: fileArtistAlbum
301
136
                        width: 400
302
137
                        wrapMode: Text.Wrap
303
138
                        maximumLineCount: 2
304
139
                        font.pixelSize: 12
305
140
                        anchors.left: parent.left
306
141
                        anchors.leftMargin: 75
307
142
                        anchors.top: fileTitle.bottom
308
143
                        text: trackArtist == "" ? "" : trackArtist + " - " + trackAlbum
309
144
                    }
310
145
                    Label {
311
146
                        id: fileDuration
312
147
                        width: 400
313
148
                        wrapMode: Text.Wrap
314
149
                        maximumLineCount: 2
315
150
                        font.pixelSize: 12
316
151
                        anchors.left: parent.left
317
152
                        anchors.leftMargin: 75
318
153
                        anchors.top: fileArtistAlbum.bottom
319
154
                        visible: false
320
155
                        text: ""
321
156
                    }
322
157
323
158
                    onFocusChanged: {
324
159
                        if (focus == false) {
325
160
                            selected = false
326
161
                        } else if (file.progression == false){
327
162
                            selected = false
328
163
                            fileArtistAlbumBottom.text = fileArtistAlbum.text
329
164
                            fileTitleBottom.text = fileTitle.text
330
165
                            fileArtistAlbumBottom_nowplaying.text = trackArtist == "" ? "" : trackArtist + "\n" + trackAlbum
331
166
                            fileTitleBottom_nowplaying.text = fileTitle.text
332
167
                            iconbottom.source = file.icon
333
168
                            iconbottom_nowplaying.source = !model.isDir && trackCover !== "" ? "image://cover-art-full/" + filePath : "images/Blank_album.jpg"
334
169
                        }
335
170
                    }
336
171
                    MouseArea {
337
172
                        anchors.fill: parent
338
173
                        onDoubleClicked: {
339
174
                        }
340
175
                        onPressAndHold: {
341
176
                            if (!model.isDir) {
342
177
                                trackQueue.append({"title": trackTitle, "artist": trackArtist, "file": filePath})
343
178
                            }
344
179
                        }
345
180
                        onClicked: {
346
181
                            if (focus == false) {
347
182
                                focus = true
348
183
                            }
349
184
                            if (model.isDir) {
350
185
                                PlayingList.clear()
351
186
                                filelist.currentIndex = -1
352
187
                                itemnum = 0
353
188
                                playing = filelist.currentIndex
354
189
                                console.log("Stored:" + Settings.getSetting("currentfolder"))
355
190
                                folderModel.path = filePath
356
191
                            } else {
357
192
                                console.log("fileName: " + fileName)
358
193
                                if (filelist.currentIndex == index) {
359
194
                                    if (player.playbackState === MediaPlayer.PlayingState)  {
360
195
                                        playindicator.source = "images/play.png"
361
196
                                        player.pause()
362
197
                                    } else if (player.playbackState === MediaPlayer.PausedState) {
363
198
                                        playindicator.source = "images/pause.png"
364
199
                                        player.play()
365
200
                                    }
366
201
                                } else {
367
202
                                    player.stop()
368
203
                                    player.source = Qt.resolvedUrl(filePath)
369
204
                                    filelist.currentIndex = index
370
205
                                    playing = PlayingList.indexOf(filePath)
371
206
                                    console.log("Playing click: "+player.source)
372
207
                                    console.log("Index: " + filelist.currentIndex)
373
208
                                    player.play()
374
209
                                    playindicator.source = "images/pause.png"
375
210
                                }
376
211
                                console.log("Source: " + player.source.toString())
377
212
                                console.log("Length: " + trackLength.toString())
378
213
                            }
379
214
                            playindicator_nowplaying.source = playindicator.source
380
215
                        }
381
216
                    }
382
217
                    Component.onCompleted: {
383
218
                        if (!PlayingList.contains(filePath) && !model.isDir) {
384
219
                            console.log("Adding file:" + filePath)
385
220
                            PlayingList.addItem(filePath, itemnum)
386
221
                            console.log(itemnum)
387
222
                        }
388
223
                        itemnum++
389
224
                    }
390
225
                }
391
226
            }
392
227
        }
393
228
394
229
        // context: albums? tracks?
395
230
        Rectangle {
396
231
            id: appContext
397
232
            anchors.top: mainpage.top
398
233
            height: units.gu(5)
399
234
            width: parent.width
400
235
            color: "#333333"
401
236
            MouseArea {
402
237
                id: tracksContextArea
403
238
                anchors.verticalCenter: parent.verticalCenter
404
239
                anchors.left: parent.left
405
240
                width: units.gu(10)
406
241
                height: units.gu(5)
407
242
                onClicked: {
408
243
                    tracksContext.font.underline = true
409
244
                    artistsContext.font.underline = false
410
245
                    albumsContext.font.underline = false
411
246
                    listsContext.font.underline = false
412
247
                }
413
248
                Label {
414
249
                    id: tracksContext
415
250
                    width: units.gu(15)
416
251
                    wrapMode: Text.Wrap
417
252
                    color: "#FFFFFF"
418
253
                    maximumLineCount: 1
419
254
                    font.pixelSize: 20
420
255
                    anchors.verticalCenter: parent.verticalCenter
421
256
                    anchors.left: parent.left
422
257
                    anchors.leftMargin: units.gu(1)
423
258
                    text: "Music"
424
259
                    font.underline: true
425
260
                }
426
261
            }
427
262
            MouseArea {
428
263
                id: artistsContextArea
429
264
                anchors.verticalCenter: parent.verticalCenter
430
265
                anchors.left: tracksContextArea.right
431
266
                width: units.gu(10)
432
267
                height: units.gu(5)
433
268
                onClicked: {
434
269
                    tracksContext.font.underline = false
435
270
                    artistsContext.font.underline = true
436
271
                    albumsContext.font.underline = false
437
272
                    listsContext.font.underline = false
438
273
                }
439
274
                Label {
440
275
                    id: artistsContext
441
276
                    width: units.gu(10)
442
277
                    wrapMode: Text.Wrap
443
278
                    color: "#FFFFFF"
444
279
                    maximumLineCount: 1
445
280
                    font.pixelSize: 20
446
281
                    anchors.verticalCenter: parent.verticalCenter
447
282
                    anchors.left: parent.left
448
283
                    text: "Artists"
449
284
                }
450
285
            }
451
286
            MouseArea {
452
287
                id: albumsContextArea
453
288
                anchors.verticalCenter: parent.verticalCenter
454
289
                anchors.left: artistsContextArea.right
455
290
                width: units.gu(10)
456
291
                height: units.gu(5)
457
292
                onClicked: {
458
293
                    tracksContext.font.underline = false
459
294
                    artistsContext.font.underline = false
460
295
                    albumsContext.font.underline = true
461
296
                    listsContext.font.underline = false
462
297
                }
463
298
                Label {
464
299
                    id: albumsContext
465
300
                    width: units.gu(15)
466
301
                    wrapMode: Text.Wrap
467
302
                    color: "#FFFFFF"
468
303
                    maximumLineCount: 1
469
304
                    font.pixelSize: 20
470
305
                    anchors.verticalCenter: parent.verticalCenter
471
306
                    anchors.left: parent.left
472
307
                    text: "Albums"
473
308
                }
474
309
            }
475
310
            MouseArea {
476
311
                id: listsContextArea
477
312
                anchors.verticalCenter: parent.verticalCenter
478
313
                anchors.left: albumsContextArea.right
479
314
                width: units.gu(10)
480
315
                height: units.gu(5)
481
316
                onClicked: {
482
317
483
318
                    PopupUtils.open(Qt.resolvedUrl("QueueDialog.qml"), settingsArea,
484
319
                                {
485
320
                                    title: i18n.tr("Queue")
486
321
                                } )
487
322
                }
488
323
                Label {
489
324
                    id: listsContext
490
325
                    width: units.gu(15)
491
326
                    wrapMode: Text.Wrap
492
327
                    color: "#FFFFFF"
493
328
                    maximumLineCount: 1
494
329
                    font.pixelSize: 20
495
330
                    anchors.verticalCenter: parent.verticalCenter
496
331
                    anchors.left: parent.left
497
332
                    text: "Queue"
498
333
                }
499
334
            }
500
335
            MouseArea {
501
336
                id: settingsArea
502
337
                anchors.verticalCenter: parent.verticalCenter
503
338
                anchors.left: listsContextArea.right
504
339
                anchors.right: parent.right
505
340
                height: units.gu(5)
506
341
                onClicked: {
507
342
                    PopupUtils.open(Qt.resolvedUrl("MusicSettings.qml"), settingsArea,
508
343
                                {
509
344
                                    title: i18n.tr("Settings")
510
345
                                } )
511
346
                }
512
347
                Image {
513
348
                    id: settingsImage
514
349
                    source: "images/settings.png"
515
350
                    anchors.left: parent.left
516
351
                    anchors.verticalCenter: parent.verticalCenter
517
352
                    anchors.leftMargin: units.gu(1)
518
353
                }
519
354
            }
520
355
521
356
        }
522
357
523
358
        Rectangle {
524
359
            id: playerControls
525
360
            anchors.top: filelist.bottom
526
361
            height: units.gu(8)
527
362
            width: parent.width
528
363
            color: "#333333"
529
364
            UbuntuShape {
530
365
                id: forwardshape
531
366
                height: units.gu(5)
532
367
                width: units.gu(5)
533
368
                anchors.verticalCenter: parent.verticalCenter
534
369
                anchors.right: parent.right
535
370
                anchors.rightMargin: units.gu(2)
536
371
                radius: "none"
537
372
                image: Image {
538
373
                    id: forwardindicator
539
374
                    source: "images/forward.png"
540
375
                    anchors.right: parent.right
541
376
                    anchors.centerIn: parent
542
377
                    opacity: .7
543
378
                }
544
379
                MouseArea {
545
380
                    anchors.fill: parent
546
381
                    onClicked: {
547
382
                        playindicator.source = "images/pause.png"
548
383
                        playindicator_nowplaying.source = playindicator.source
549
384
                        nextSong()
550
385
                    }
551
386
                }
552
387
            }
553
388
            UbuntuShape {
554
389
                id: playshape
555
390
                height: units.gu(5)
556
391
                width: units.gu(5)
557
392
                anchors.verticalCenter: parent.verticalCenter
558
393
                anchors.right: forwardshape.left
559
394
                anchors.rightMargin: units.gu(1)
560
395
                radius: "none"
561
396
                image: Image {
562
397
                    id: playindicator
563
398
                    source: "images/play.png"
564
399
                    anchors.right: parent.right
565
400
                    anchors.centerIn: parent
566
401
                    opacity: .7
567
402
                }
568
403
                MouseArea {
569
404
                    anchors.fill: parent
570
405
                    onClicked: {
571
406
                        if (player.playbackState === MediaPlayer.PlayingState)  {
572
407
                            playindicator.source = "images/play.png"
573
408
                            player.pause()
574
409
                        } else {
575
410
                            playindicator.source = "images/pause.png"
576
411
                            player.play()
577
412
                        }
578
413
                        playindicator_nowplaying.source = playindicator.source
579
414
                    }
580
415
                }
581
416
            }
582
417
            Image {
583
418
                id: iconbottom
584
419
                source: ""
585
420
                anchors.left: parent.left
586
421
                anchors.top: parent.top
587
422
                anchors.topMargin: units.gu(1)
588
423
                anchors.leftMargin: units.gu(1)
589
424
590
425
                MouseArea {
591
426
                    anchors.fill: parent
592
427
                    onClicked: {
593
428
                        pageStack.push(nowPlaying)
594
429
                    }
595
430
                }
596
431
            }
597
432
            Label {
598
433
                id: fileTitleBottom
599
434
                width: units.gu(30)
600
435
                wrapMode: Text.Wrap
601
436
                color: "#FFFFFF"
602
437
                maximumLineCount: 1
603
438
                font.pixelSize: 16
604
439
                anchors.left: iconbottom.right
605
440
                anchors.top: parent.top
606
441
                anchors.topMargin: units.gu(1)
607
442
                anchors.leftMargin: units.gu(1)
608
443
                text: ""
609
444
            }
610
445
            Label {
611
446
                id: fileArtistAlbumBottom
612
447
                width: units.gu(30)
613
448
                wrapMode: Text.Wrap
614
449
                color: "#FFFFFF"
615
450
                maximumLineCount: 1
616
451
                font.pixelSize: 12
617
452
                anchors.left: iconbottom.right
618
453
                anchors.top: fileTitleBottom.bottom
619
454
                anchors.leftMargin: units.gu(1)
620
455
                text: ""
621
456
            }
622
457
            Rectangle {
623
458
                id: fileDurationProgressContainer
624
459
                anchors.top: fileArtistAlbumBottom.bottom
625
460
                anchors.left: iconbottom.right
626
461
                anchors.topMargin: 2
627
462
                anchors.leftMargin: units.gu(1)
628
463
                width: units.gu(20)
629
464
                color: "#333333"
630
465
631
466
                Rectangle {
632
467
                    id: fileDurationProgressBackground
633
468
                    anchors.top: parent.top
634
469
                    anchors.topMargin: 2
635
470
                    height: 1
636
471
                    width: units.gu(20)
637
472
                    color: "#FFFFFF"
638
473
                    visible: false
639
474
                }
640
475
                Rectangle {
641
476
                    id: fileDurationProgress
642
477
                    anchors.top: parent.top
643
478
                    height: 5
644
479
                    width: 0
645
480
                    color: "#DD4814"
646
481
                }
647
482
            }
648
483
            Label {
649
484
                id: fileDurationBottom
650
485
                anchors.top: fileArtistAlbumBottom.bottom
651
486
                anchors.left: fileDurationProgressContainer.right
652
487
                anchors.leftMargin: units.gu(1)
653
488
                width: units.gu(30)
654
489
                wrapMode: Text.Wrap
655
490
                color: "#FFFFFF"
656
491
                maximumLineCount: 1
657
492
                font.pixelSize: 12
658
493
                text: ""
659
494
            }
660
495
        }
661
496
    }
662
497
663
498
    Page {
664
499
        id: nowPlaying
665
500
        visible: false
666
501
667
502
        Rectangle {
668
93
            anchors.fill: parent
503
            anchors.fill: parent
694
94
            ListView {
504
            height: units.gu(10)
695
95
                id: musicFolder
505
            color: "#333333"
696
96
                width: parent.width
506
            Column {
697
97
                height: parent.height
507
                anchors.fill: parent
698
98
                model: folderModel
508
                anchors.bottomMargin: units.gu(10)
699
99
                //delegate: databaseDelegate
509
700
100
                delegate: ListItem.Subtitled {
510
                UbuntuShape {
701
101
                    text: fileName
511
                    id: forwardshape_nowplaying
702
102
                    subText: "Artist: " // this should be selected from metaDB
512
                    height: 50
703
103
                    Loader {
513
                    width: 50
704
104
                            id: trackLoad
514
                    anchors.bottom: parent.bottom
705
105
                            //onLoaded:
515
                    anchors.left: playshape_nowplaying.right
706
106
                            Component.onCompleted: {
516
                    anchors.leftMargin: units.gu(2)
707
107
                                    console.debug("This one was found: "+index+"; "+fileName)
517
                    radius: "none"
708
108
                                    trackQueue.append({"title": playMusic.metaData.title, "artist": playMusic.metaData.albumArtist, "file": filePath}) // just for dev
518
                    image: Image {
709
109
                                    /* Insert them to database
519
                        id: forwardindicator_nowplaying
710
110
                                    // start adding tracks to db
520
                        source: "images/forward.png"
711
111
                                    title = getTrackInfo(file, title)
521
                        anchors.right: parent.right
712
112
                                    album = getTrackInfo(file, album)
522
                        anchors.bottom: parent.bottom
713
113
                                    year = getTrackInfo(file, year)
523
                        opacity: .7
714
114
                                    tracknr = getTrackInfo(file, tracknr)
524
                    }
715
115
                                    length = getTrackInfo(file, length)
525
                    MouseArea {
716
116
                                    console.debug("file", "title", "artist", "album", "year", "tracknr", "length")
526
                        anchors.fill: parent
717
117
                                    //MetaDB.setSetting("file", "title", "artist", "album", "year", "tracknr", "length")
527
                        onClicked: {
718
118
                                    */
528
                            playindicator.source = "images/pause.png"
719
529
                            playindicator_nowplaying.source = playindicator.source
720
530
                            nextSong()
721
531
                        }
722
532
                    }
723
533
                }
724
534
                UbuntuShape {
725
535
                    id: playshape_nowplaying
726
536
                    height: 50
727
537
                    width: 50
728
538
                    anchors.bottom: parent.bottom
729
539
                    anchors.horizontalCenter: parent.horizontalCenter
730
540
                    radius: "none"
731
541
                    image: Image {
732
542
                        id: playindicator_nowplaying
733
543
                        source: "images/play.png"
734
544
                        anchors.right: parent.right
735
545
                        anchors.bottom: parent.bottom
736
546
                        opacity: .7
737
547
                    }
738
548
                    MouseArea {
739
549
                        anchors.fill: parent
740
550
                        onClicked: {
741
551
                            if (player.playbackState === MediaPlayer.PlayingState)  {
742
552
                                playindicator.source = "images/play.png"
743
553
                                player.pause()
744
554
                            } else {
745
555
                                playindicator.source = "images/pause.png"
746
556
                                player.play()
747
119
                            }
557
                            }
762
120
                    }
558
                            playindicator_nowplaying.source = playindicator.source
763
121
559
                        }
764
122
                    onClicked: {
560
                    }
765
123
                        playMusic.source = filePath
561
                }
766
124
                        playMusic.play()
562
                UbuntuShape {
767
125
                        console.debug('Debug: User pressed '+filePath)
563
                    id: backshape_nowplaying
768
126
                        trackInfo.text = playMusic.metaData.albumArtist+" - "+playMusic.metaData.title // show track meta data
564
                    height: 50
769
127
                        // cool animation
565
                    width: 50
770
128
                    }
566
                    anchors.bottom: parent.bottom
771
129
                    onPressAndHold: {
567
                    anchors.right: playshape_nowplaying.left
772
130
                        console.debug('Debug: '+filePath+' added to queue.')
568
                    anchors.rightMargin: units.gu(2)
773
131
                        trackQueue.append({"title": playMusic.metaData.title, "artist": playMusic.metaData.albumArtist, "file": filePath})
569
                    radius: "none"
774
132
                        // cool animation
570
                    image: Image {
775
133
                    }
571
                        id: backindicator_nowplaying
776
572
                        source: "images/back.png"
777
573
                        anchors.right: parent.right
778
574
                        anchors.bottom: parent.bottom
779
575
                        opacity: .7
780
576
                    }
781
577
                    MouseArea {
782
578
                        anchors.fill: parent
783
579
                        onClicked: {
784
580
                            playindicator.source = "images/pause.png"
785
581
                            playindicator_nowplaying.source = playindicator.source
786
582
                            getSong(-1)
787
583
                        }
788
584
                    }
789
585
                }
790
586
791
587
                Image {
792
588
                    id: iconbottom_nowplaying
793
589
                    source: ""
794
590
                    width: 300
795
591
                    height: 300
796
592
                    anchors.horizontalCenter: parent.horizontalCenter
797
593
                    anchors.top: parent.top
798
594
                    anchors.topMargin: units.gu(1)
799
595
                    anchors.leftMargin: units.gu(1)
800
596
801
597
                    MouseArea {
802
598
                        anchors.fill: parent
803
599
                        onClicked: {
804
600
                            pageStack.pop(nowPlaying)
805
601
                        }
806
602
                    }
807
603
                }
808
604
                Label {
809
605
                    id: fileTitleBottom_nowplaying
810
606
                    width: units.gu(30)
811
607
                    wrapMode: Text.Wrap
812
608
                    color: "#FFFFFF"
813
609
                    maximumLineCount: 1
814
610
                    font.pixelSize: 24
815
611
                    anchors.top: iconbottom_nowplaying.bottom
816
612
                    anchors.topMargin: units.gu(2)
817
613
                    anchors.left: parent.left
818
614
                    anchors.leftMargin: units.gu(2)
819
615
                    text: ""
820
616
                }
821
617
                Label {
822
618
                    id: fileArtistAlbumBottom_nowplaying
823
619
                    width: units.gu(30)
824
620
                    wrapMode: Text.Wrap
825
621
                    color: "#FFFFFF"
826
622
                    maximumLineCount: 2
827
623
                    font.pixelSize: 16
828
624
                    anchors.left: parent.left
829
625
                    anchors.top: fileTitleBottom_nowplaying.bottom
830
626
                    anchors.leftMargin: units.gu(2)
831
627
                    text: ""
832
628
                }
833
629
                Rectangle {
834
630
                    id: fileDurationProgressContainer_nowplaying
835
631
                    anchors.top: fileArtistAlbumBottom_nowplaying.bottom
836
632
                    anchors.left: parent.left
837
633
                    anchors.topMargin: units.gu(2)
838
634
                    anchors.leftMargin: units.gu(2)
839
635
                    width: units.gu(40)
840
636
                    color: "#333333"
841
637
842
638
                    Rectangle {
843
639
                        id: fileDurationProgressBackground_nowplaying
844
640
                        anchors.top: parent.top
845
641
                        anchors.topMargin: 4
846
642
                        height: 1
847
643
                        width: units.gu(40)
848
644
                        color: "#FFFFFF"
849
645
                        visible: false
850
646
                    }
851
647
                    Rectangle {
852
648
                        id: fileDurationProgress_nowplaying
853
649
                        anchors.top: parent.top
854
650
                        height: 8
855
651
                        width: 0
856
652
                        color: "#DD4814"
857
653
                    }
858
654
                }
859
655
                Label {
860
656
                    id: fileDurationBottom_nowplaying
861
657
                    anchors.top: fileDurationProgressContainer_nowplaying.bottom
862
658
                    anchors.left: parent.left
863
659
                    anchors.topMargin: units.gu(2)
864
660
                    anchors.leftMargin: units.gu(2)
865
661
                    width: units.gu(30)
866
662
                    wrapMode: Text.Wrap
867
663
                    color: "#FFFFFF"
868
664
                    maximumLineCount: 1
869
665
                    font.pixelSize: 16
870
666
                    text: ""
871
134
                }
667
                }
872
135
            }
668
            }
873
136
        }
669
        }
874
137
875
138
    }
670
    }
876
139
877
140
}
671
}
878
141
672
879
=== modified file 'QueueDialog.qml'
880
--- QueueDialog.qml	2013-05-31 14:58:23 +0000
881
+++ QueueDialog.qml	2013-06-05 04:48:28 +0000
882
@@ -3,6 +3,7 @@
883
3
 *
3
 *
884
4
 * Authors:
4
 * Authors:
885
5
 *  Daniel Holm <d.holmen@gmail.com>
5
 *  Daniel Holm <d.holmen@gmail.com>
886
6
 *  Victor Thompson <victor.thompson@gmail.com>
887
6
 *
7
 *
888
7
 * This program is free software; you can redistribute it and/or modify
8
 * This program is free software; you can redistribute it and/or modify
889
8
 * it under the terms of the GNU General Public License as published by
9
 * it under the terms of the GNU General Public License as published by
890
@@ -32,8 +33,7 @@
891
32
        height: units.gu(50)
33
        height: units.gu(50)
892
33
        model: trackQueue
34
        model: trackQueue
893
34
        delegate: ListItem.Standard {
35
        delegate: ListItem.Standard {
896
35
            //text: artist+" - "+title
36
            text: artist+" - "+title
895
36
            text: file
897
37
            removable: true
37
            removable: true
898
38
            onClicked: {
38
            onClicked: {
899
39
                console.debug("Debug: Play "+file+" instead - now.")
39
                console.debug("Debug: Play "+file+" instead - now.")
900
@@ -50,7 +50,7 @@
901
50
    // Clean whole queue button
50
    // Clean whole queue button
902
51
    Button {
51
    Button {
903
52
        text: i18n.tr("Clear")
52
        text: i18n.tr("Clear")
905
53
        color: "orange"
53
        color: "#DD4814"
906
54
        onClicked: {
54
        onClicked: {
907
55
            console.debug("Debug: Track queue cleared.")
55
            console.debug("Debug: Track queue cleared.")
908
56
            trackQueue.clear()
56
            trackQueue.clear()
909
@@ -61,7 +61,7 @@
910
61
    // close dialog button
61
    // close dialog button
911
62
    Button {
62
    Button {
912
63
        text: i18n.tr("Close")
63
        text: i18n.tr("Close")
914
64
        color: "red"
64
        color: "#DD4814"
915
65
        onClicked: {
65
        onClicked: {
916
66
            PopupUtils.close(queueDialog)
66
            PopupUtils.close(queueDialog)
917
67
        }
67
        }
918
68
68
919
=== removed file 'Toolbar.qml'
920
--- Toolbar.qml	2013-05-08 21:53:49 +0000
921
+++ Toolbar.qml	1970-01-01 00:00:00 +0000
922
@@ -1,103 +0,0 @@
923
1
/*
924
2
 * Copyleft Daniel Holm.
925
3
 *
926
4
 * Authors:
927
5
 *  Daniel Holm <d.holmen@gmail.com>
928
6
 *
929
7
 * This program is free software; you can redistribute it and/or modify
930
8
 * it under the terms of the GNU General Public License as published by
931
9
 * the Free Software Foundation; version 3.
932
10
 *
933
11
 * This program is distributed in the hope that it will be useful,
934
12
 * but WITHOUT ANY WARRANTY; without even the implied warranty of
935
13
 * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
936
14
 * GNU General Public License for more details.
937
15
 *
938
16
 * You should have received a copy of the GNU General Public License
939
17
 * along with this program.  If not, see <http://www.gnu.org/licenses/>.
940
18
 */
941
19
942
20
import QtQuick 2.0
943
21
import Ubuntu.Components 0.1
944
22
import Ubuntu.Components.ListItems 0.1 as ListItem
945
23
import Ubuntu.Components.Popups 0.1
946
24
947
25
Component {
948
26
    // Share
949
27
    Action {
950
28
        id: shareTrack
951
29
        objectName: "share"
952
30
953
31
        iconSource: Qt.resolvedUrl("images/icon_share@20.png")
954
32
        text: i18n.tr("Share")
955
33
956
34
        onTriggered: {
957
35
            console.debug('Debug: Share pressed')
958
36
        }
959
37
    }
960
38
961
39
    // prevous track
962
40
    Action {
963
41
        id: prevTrack
964
42
        objectName: "prev"
965
43
966
44
        iconSource: Qt.resolvedUrl("images/prev.png")
967
45
        text: i18n.tr("Previous")
968
46
969
47
        onTriggered: {
970
48
            console.debug('Debug: Prev track pressed')
971
49
        }
972
50
    }
973
51
974
52
    // Play
975
53
    Action {
976
54
        id: playTrack
977
55
        objectName: "play"
978
56
979
57
        iconSource: Qt.resolvedUrl("images/icon_play@20.png")
980
58
        text: i18n.tr("Play")
981
59
982
60
        onTriggered: {
983
61
            //trackStatus: 'pause' // this changes on press
984
62
            onTrackStatusChange(playTrack.text)
985
63
        }
986
64
    }
987
65
988
66
    // Next track
989
67
    Action {
990
68
        id: nextTrack
991
69
        objectName: "next"
992
70
993
71
        iconSource: Qt.resolvedUrl("images/next.png")
994
72
        text: i18n.tr("Next")
995
73
996
74
        onTriggered: {
997
75
            console.debug('Debug: next track pressed')
998
76
        }
999
77
    }
1000
78
1001
79
    // Queue
1002
80
    Action {
1003
81
        id: trackQueue
1004
82
        objectName: "queuelist"
1005
83
        iconSource: Qt.resolvedUrl("images/icon_settings@20.png")
1006
84
        text: i18n.tr("Queue")
1007
85
        onTriggered: {
1008
86
            PopupUtils.open(queueDialog, trackQueue)
1009
87
        }
1010
88
    }
1011
89
1012
90
    // Settings
1013
91
    Action {
1014
92
        objectName: "settings"
1015
93
1016
94
        iconSource: Qt.resolvedUrl("images/icon_settings@20.png")
1017
95
        text: i18n.tr("Settings")
1018
96
1019
97
        onTriggered: {
1020
98
            console.debug('Debug: Settings pressed')
1021
99
            // show settings page
1022
100
            //page: MusicSettings { id: musicSettings }
1023
101
        }
1024
102
    }
1025
103
}
1026
104
0
1027
=== modified file 'debian/changelog'
1028
--- debian/changelog	2013-06-01 01:05:45 +0000
1029
+++ debian/changelog	2013-06-05 04:48:28 +0000
1030
@@ -1,5 +1,11 @@
1031
1
music-app (0.2) raring; urgency=low
1032
2
1033
3
  * Merge of Daniel's and Victor's code
1034
4
1035
5
 -- Victor Thompson <victor.thompson@gmail.com>  Tue, 04 June 2013 11:45:00 -0400
1036
6
1037
1
music-app (0.1) raring; urgency=low
7
music-app (0.1) raring; urgency=low
1038
2
8
1039
3
  * Initial Release.
9
  * Initial Release.
1040
4
10
1042
5
 -- "Michael <mhall119@ubuntu.com>  Thu, 23 May 2013 17:10:45 -0400
11
 -- Michael <mhall119@ubuntu.com>  Thu, 23 May 2013 17:10:45 -0400
1043
6
12
1044
=== modified file 'debian/install'
1045
--- debian/install	2013-06-03 17:43:53 +0000
1046
+++ debian/install	2013-06-05 04:48:28 +0000
1047
@@ -1,4 +1,3 @@
1048
1
Toolbar.qml /usr/share/music-app
1049
2
MusicSettings.qml /usr/share/music-app
1
MusicSettings.qml /usr/share/music-app
1050
3
music-app.qml /usr/share/music-app
2
music-app.qml /usr/share/music-app
1051
4
QueueDialog.qml /usr/share/music-app
3
QueueDialog.qml /usr/share/music-app
1052
@@ -16,5 +15,14 @@
1053
16
images/icon_settings@20.png /usr/share/music-app
15
images/icon_settings@20.png /usr/share/music-app
1054
17
images/music.png /usr/share/music-app
16
images/music.png /usr/share/music-app
1055
18
images/icon_play@20.png /usr/share/music-app
17
images/icon_play@20.png /usr/share/music-app
1056
18
images/settings@8.png /usr/share/music-app
1057
19
images/play.png /usr/share/music-app
1058
20
images/pause.png /usr/share/music-app
1059
21
images/forward.png /usr/share/music-app
1060
22
images/Blank_album.jpg /usr/share/music-app
1061
23
images/back.png /usr/share/music-app
1062
24
images/audio-x-mpeg.png /usr/share/music-app
1063
25
images/audio-x-vorbis+ogg.png /usr/share/music-app
1064
26
playing-list.js /usr/share/music-app
1065
19
meta-database.js /usr/share/music-app
27
meta-database.js /usr/share/music-app
1066
20
music-app.desktop /usr/share/applications
28
music-app.desktop /usr/share/applications
1067
21
29
1068
=== added file 'images/Blank_album.jpg'
1069
22
Binary files images/Blank_album.jpg	1970-01-01 00:00:00 +0000 and images/Blank_album.jpg	2013-06-05 04:48:28 +0000 differ
30
Binary files images/Blank_album.jpg	1970-01-01 00:00:00 +0000 and images/Blank_album.jpg	2013-06-05 04:48:28 +0000 differ
1070
=== added file 'images/audio-x-mpeg.png'
1071
23
Binary files images/audio-x-mpeg.png	1970-01-01 00:00:00 +0000 and images/audio-x-mpeg.png	2013-06-05 04:48:28 +0000 differ
31
Binary files images/audio-x-mpeg.png	1970-01-01 00:00:00 +0000 and images/audio-x-mpeg.png	2013-06-05 04:48:28 +0000 differ
1072
=== added file 'images/audio-x-vorbis+ogg.png'
1073
24
Binary files images/audio-x-vorbis+ogg.png	1970-01-01 00:00:00 +0000 and images/audio-x-vorbis+ogg.png	2013-06-05 04:48:28 +0000 differ
32
Binary files images/audio-x-vorbis+ogg.png	1970-01-01 00:00:00 +0000 and images/audio-x-vorbis+ogg.png	2013-06-05 04:48:28 +0000 differ
1074
=== added file 'images/back.png'
1075
25
Binary files images/back.png	1970-01-01 00:00:00 +0000 and images/back.png	2013-06-05 04:48:28 +0000 differ
33
Binary files images/back.png	1970-01-01 00:00:00 +0000 and images/back.png	2013-06-05 04:48:28 +0000 differ
1076
=== added file 'images/forward.png'
1077
26
Binary files images/forward.png	1970-01-01 00:00:00 +0000 and images/forward.png	2013-06-05 04:48:28 +0000 differ
34
Binary files images/forward.png	1970-01-01 00:00:00 +0000 and images/forward.png	2013-06-05 04:48:28 +0000 differ
1078
=== added file 'images/pause.png'
1079
27
Binary files images/pause.png	1970-01-01 00:00:00 +0000 and images/pause.png	2013-06-05 04:48:28 +0000 differ
35
Binary files images/pause.png	1970-01-01 00:00:00 +0000 and images/pause.png	2013-06-05 04:48:28 +0000 differ
1080
=== added file 'images/play.png'
1081
28
Binary files images/play.png	1970-01-01 00:00:00 +0000 and images/play.png	2013-06-05 04:48:28 +0000 differ
36
Binary files images/play.png	1970-01-01 00:00:00 +0000 and images/play.png	2013-06-05 04:48:28 +0000 differ
1082
=== added file 'images/settings@8.png'
1083
29
Binary files images/settings@8.png	1970-01-01 00:00:00 +0000 and images/settings@8.png	2013-06-05 04:48:28 +0000 differ
37
Binary files images/settings@8.png	1970-01-01 00:00:00 +0000 and images/settings@8.png	2013-06-05 04:48:28 +0000 differ
1084
=== modified file 'music-app.qml'
1085
--- music-app.qml	2013-06-03 17:43:53 +0000
1086
+++ music-app.qml	2013-06-05 04:48:28 +0000
1087
@@ -3,6 +3,7 @@
1088
3
 *
3
 *
1089
4
 * Authors:
4
 * Authors:
1090
5
 *  Daniel Holm <d.holmen@gmail.com>
5
 *  Daniel Holm <d.holmen@gmail.com>
1091
6
 *  Victor Thompson <victor.thompson@gmail.com>
1092
6
 *
7
 *
1093
7
 * This program is free software; you can redistribute it and/or modify
8
 * This program is free software; you can redistribute it and/or modify
1094
8
 * it under the terms of the GNU General Public License as published by
9
 * it under the terms of the GNU General Public License as published by
1095
@@ -22,11 +23,12 @@
1096
22
import Ubuntu.Components.ListItems 0.1
23
import Ubuntu.Components.ListItems 0.1
1097
23
import Ubuntu.Components.Popups 0.1
24
import Ubuntu.Components.Popups 0.1
1098
24
import Ubuntu.Components.ListItems 0.1 as ListItem
25
import Ubuntu.Components.ListItems 0.1 as ListItem
1100
25
import Qt.labs.folderlistmodel 1.0
26
import org.nemomobile.folderlistmodel 1.0
1101
26
import QtMultimedia 5.0
27
import QtMultimedia 5.0
1102
27
import QtQuick.LocalStorage 2.0
28
import QtQuick.LocalStorage 2.0
1103
28
import "settings.js" as Settings
29
import "settings.js" as Settings
1105
29
import "meta-database.js" as MetaDatabase
30
import "meta-database.js" as Library
1106
31
import "playing-list.js" as PlayingList
1107
30
32
1108
31
MainView {
33
MainView {
1109
32
    objectName: i18n.tr("mainView")
34
    objectName: i18n.tr("mainView")
1110
@@ -34,156 +36,76 @@
1111
34
36
1112
35
    width: units.gu(50)
37
    width: units.gu(50)
1113
36
    height: units.gu(75)
38
    height: units.gu(75)
1114
39
    Component.onCompleted: {
1115
40
        header.visible = false
1116
41
    }
1117
42
1118
37
43
1119
38
    // VARIABLES
44
    // VARIABLES
1120
39
    property string musicName: i18n.tr("Music")
45
    property string musicName: i18n.tr("Music")
1121
40
    property string musicDir: ""
46
    property string musicDir: ""
1122
41
    property string shuffleState: ""
1123
42
    property string trackStatus: "stopped"
1124
43
    property string appVersion: '0.5.2'
47
    property string appVersion: '0.5.2'
1125
48
    property int playing: 0
1126
49
    property int itemnum: 0
1127
50
    property bool random: false
1128
51
    property string artist
1129
52
    property string album
1130
53
    property string song
1131
54
    property string tracktitle
1132
44
55
1133
45
    // FUNCTIONS
56
    // FUNCTIONS
1275
46
57
    function previousSong() {
1276
47
    // digg deeper in the music folder
58
        getSong(-1)
1277
48
    function subDirCheck(directory) {
59
    }
1278
49
        // populate listmodel with meta data of tracks
60
    function nextSong() {
1279
50
    }
61
        getSong(1)
1280
51
62
    }
1281
52
    // What is the state of the playback?
63
1282
53
    function stateChange() {
64
    function getSong(direction) {
1283
54
        // state was stopped (0)
65
        if (random) {
1284
55
        if (playMusic.playbackState == "0") {
66
            var now = new Date();
1285
56
            console.debug("Debug: Music was stopped. Playing")
67
            var seed = now.getSeconds();
1286
57
            beenStopped() // run stop function
68
            do {
1287
58
            playMusic.play() // then play
69
                var num = (Math.floor((PlayingList.size()) * Math.random(seed)));
1288
59
        }
70
                console.log(num)
1289
60
71
                console.log(playing)
1290
61
        // if state was playing (1)
72
            } while (num == playing && PlayingList.size() > 0)
1291
62
        else if (playMusic.playbackState == "1") {
73
            player.source = Qt.resolvedUrl(PlayingList.getList()[num])
1292
63
            console.debug("Debug: Track was playing. Pause")
74
            musicTracksPage.filelistCurrentIndex = PlayingList.at(num)
1293
64
            playMusic.pause() // pause the music then
75
            playing = num
1294
65
        }
76
            console.log("MediaPlayer statusChanged, currentIndex: " + musicTracksPage.filelistCurrentIndex)
1295
66
77
        } else {
1296
67
        // if state is paused (2)
78
            if ((playing < PlayingList.size() - 1 && direction === 1 )
1297
68
        else if (playMusic.playbackState == "2") {
79
                    || (playing > 0 && direction === -1)) {
1298
69
            console.debug("Debug: Track was paused. Playing")
80
                console.log("playing: " + playing)
1299
70
            playMusic.play() // resume then
81
                console.log("filelistCount: " + musicTracksPage.filelistCount)
1300
71
        }
82
                console.log("PlayingList.size(): " + PlayingList.size())
1301
72
83
                playing += direction
1302
73
        updateUI()
84
                if (playing === 0) {
1303
74
    }
85
                    musicTracksPage.filelistCurrentIndex = playing + (itemnum - PlayingList.size())
1304
75
86
                } else {
1305
76
    // stop function
87
                    musicTracksPage.filelistCurrentIndex += direction
1306
77
    function beenStopped() {
88
                }
1307
78
        console.debug("Debug: has a track been played before or did I just start?")
89
                player.source = Qt.resolvedUrl(PlayingList.getList()[playing])
1308
79
90
            } else if(direction === 1) {
1309
80
        // track was just paused or stopped. Resume previous track
91
                console.log("playing: " + playing)
1310
81
        if (playMusic.source != "") {
92
                console.log("filelistCount: " + musicTracksPage.filelistCount)
1311
82
            console.debug("Debug: Resume previous song: "+playMusic.source)
93
                console.log("PlayingList.size(): " + PlayingList.size())
1312
83
94
                playing = 0
1313
84
            updateUI()
95
                musicTracksPage.filelistCurrentIndex = playing + (musicTracksPage.filelistCount - PlayingList.size())
1314
85
        }
96
                player.source = Qt.resolvedUrl(PlayingList.getList()[playing])
1315
86
97
            } else if(direction === -1) {
1316
87
        // app just started, play random or first track in list, depending on shuffle on or off
98
                console.log("playing: " + playing)
1317
88
        else {
99
                console.log("filelistCount: " + musicTracksPage.filelistCount)
1318
89
            // is shuffle on?
100
                console.log("PlayingList.size(): " + PlayingList.size())
1319
90
            // if shuffle on {
101
                playing = PlayingList.size() - 1
1320
91
            //}
102
                musicTracksPage.filelistCurrentIndex = playing + (musicTracksPage.filelistCount - PlayingList.size())
1321
92
            // Shuffle not activated
103
                player.source = Qt.resolvedUrl(PlayingList.getList()[playing])
1322
93
            //else {
104
            }
1323
94
            playMusic.source = trackQueue.get(0).file // this should play a dynamic track
105
            console.log("MediaPlayer statusChanged, currentIndex: " + musicTracksPage.filelistCurrentIndex)
1324
95
            console.debug("Debug: First song is "+trackQueue.get(0).file)
106
        }
1325
96
            console.debug("Debug: I was just started. Play random track: "+playMusic.source)
107
        console.log("Playing: "+player.source)
1326
97
108
        player.play()
1186
98
            updateUI()
1187
99
            //}
1188
100
        }
1189
101
    }
1190
102
1191
103
    // previous and next track function
1192
104
    function nextTrack() {
1193
105
        //check if any queued songs
1194
106
        // if there are, play them
1195
107
        if (trackQueue > 1) {
1196
108
            console.debug() // print next songs filename
1197
109
            playMusic.source = trackQueue.get(0).file
1198
110
            playMusic.play()
1199
111
            removedTrackQueue.append({"title": trackQueue.get(0).title, "artist": trackQueue.get(0).artist, "file": trackQueue.get(0).file}) // move the track to a list of preious tracks
1200
112
            trackQueue.remove(index) // remove the track from queue
1201
113
1202
114
            updateUI()
1203
115
        }
1204
116
1205
117
        // if not, play another
1206
118
        else {
1207
119
1208
120
            // if shuffle, play random
1209
121
            if (settings.shuffle == 1) {
1210
122
                updateUI()
1211
123
            }
1212
124
1213
125
            // if not shuffle, play next
1214
126
            else {
1215
127
                console.debug() // print next songs filename
1216
128
                playMusic.source = trackQueue.get(0).file
1217
129
                playMusic.play()
1218
130
                removedTrackQueue.append({"title": trackQueue.get(0).title, "artist": trackQueue.get(0).artist, "file": trackQueue.get(0).file}) // move the track to a list of preious tracks
1219
131
                trackQueue.remove(index) // remove the track from queue
1220
132
1221
133
                updateUI()
1222
134
            }
1223
135
        }
1224
136
    }
1225
137
1226
138
    function previousTrack() {
1227
139
        console.debug("Debug: Previous track was "+removedTrackQueue.get(removedTrackQueue.count).file)
1228
140
        // play the previous track
1229
141
        playMusic.source = removedTrackQueue.get(removedTrackQueue.count).file
1230
142
        playMusic.play()
1231
143
1232
144
        updateUI()
1233
145
    }
1234
146
1235
147
    // Get song title
1236
148
    function getTrackInfo(source, type) {
1237
149
        console.debug('Debug: Got it. Trying to get meta data from: '+source) // debug
1238
150
        musicInfo.source = source
1239
151
        musicInfo.pause()
1240
152
1241
153
        // if title
1242
154
        if (type == "title") {
1243
155
            return musicInfo.metaData.title
1244
156
        }
1245
157
1246
158
        // if artist
1247
159
        else if (type == "artist") {
1248
160
            return musicInfo.metaData.albumArtist
1249
161
        }
1250
162
1251
163
        // if album
1252
164
        else if (type == "album") {
1253
165
            return musicInfo.metaData.albumTitle
1254
166
        }
1255
167
1256
168
        // year
1257
169
        else if (type == "year") {
1258
170
            return musicInfo.metaData.year
1259
171
        }
1260
172
1261
173
        // cover
1262
174
        else if (type == "cover") {
1263
175
            // download cover art from last.fm
1264
176
            // save the file in a app dir in HOME
1265
177
            // return the value of the cover art file
1266
178
        }
1267
179
1268
180
        // tracknr
1269
181
        else if (type == "tracknr") {
1270
182
        }
1271
183
1272
184
        // lenght
1273
185
        else if (type == "length") {
1274
186
        }
1327
187
    }
109
    }
1328
188
110
1329
189
    // add track to database
111
    // add track to database
1330
@@ -198,67 +120,30 @@
1331
198
        //length =
120
        //length =
1332
199
121
1333
200
        // push to database
122
        // push to database
1361
201
        MetaDatabase.setMetadata(track, title, artist, album, cover, year, tracknr, length)
123
        Library.setMetadata(track, title, artist, album, cover, year, tracknr, length)
1362
202
    }
124
    }
1363
203
125
1364
204
    // progressbar
126
    MediaPlayer {
1365
205
    function setProgressbar() {
127
        id: player
1366
206
        console.debug("Debug: change progressvalue to "+playMusic.duration)
128
        muted: false
1340
207
        trackProgress.maximumValue = playMusic.duration
1341
208
    }
1342
209
1343
210
    // update the UI things with meta data from track
1344
211
    function updateUI() {
1345
212
        playinTab.title = playMusic.metaData.title // show track title in tab header
1346
213
        playTrack.iconSource = Qt.resolvedUrl("images/icon_pause@20.png") // change toolbar icon
1347
214
        playTrack.text = i18n.tr("Pause") // change toolbar text
1348
215
        trackInfo.text = playMusic.metaData.albumArtist+" - "+playMusic.metaData.title // show track meta data
1349
216
//        coverArt.source = "HOMEDIR/.music-app/coverart/"+MetaDatabase.getMetadata(playMusic.source,"cover") // get cover art filename
1350
217
1351
218
        setProgressbar() // set progressbar
1352
219
1353
220
        console.debug("Debug: UI updated.")
1354
221
    }
1355
222
1356
223
    // Music stuff
1357
224
    Audio {
1358
225
        id: playMusic
1359
226
        source: ""
1360
227
        /*
1367
228
        onStatusChanged: {
129
        onStatusChanged: {
1374
229
             if (status === Audio.EndOfMedia || 7 ) {
130
            if (status == MediaPlayer.EndOfMedia) {
1375
230
                 console.log("Debug: Track ended. Play next.") //debug
131
                nextSong()
1370
231
                 //nextTrack()
1371
232
             }
1372
233
             else {
1373
234
                  console.log("the Music Players status = " + playMusic.status)
1376
235
            }
132
            }
1395
236
        }*/
133
        }
1396
237
    }
134
1397
238
135
        onPositionChanged: {
1398
239
    // while playing
136
            musicTracksPage.needsUpdate = true
1399
240
    Connections {
137
        }
1382
241
        target: playMusic
1383
242
        onPlaying: {
1384
243
            trackProgress.value = playMusic.position
1385
244
            console.debug("Debug: change position to "+playMusic.position)
1386
245
        }     
1387
246
    }
1388
247
1389
248
    // get file meta data
1390
249
    Audio {
1391
250
        id: musicInfo
1392
251
        source: ""
1393
252
        volume: 0.0
1394
253
        //Keys.onSpacePressed: stateChange()
1400
254
    }
138
    }
1401
255
139
1402
256
    // set the folder from where the music is
140
    // set the folder from where the music is
1403
257
    FolderListModel {
141
    FolderListModel {
1404
258
        id: folderModel
142
        id: folderModel
1408
259
        folder: musicDir
143
        showDirectories: false
1409
260
        showDirs: false
144
        filterDirectories: false
1410
261
        nameFilters: ["*.ogg","*.mp3","*.oga","*.wav"]
145
        nameFilters: ["*.mp3", "*.ogg", "*.flac", "*.wav", "*.oga"]
1411
146
        path: Settings.getSetting("initialized") === "true" && Settings.getSetting("currentfolder") !== "" ? Settings.getSetting("currentfolder") : homePath() + "/Music"
1412
262
    }
147
    }
1413
263
148
1414
264
    /* this is how a queue looks like
149
    /* this is how a queue looks like
1415
@@ -283,244 +168,6 @@
1416
283
        id: singleTracks
168
        id: singleTracks
1417
284
    }
169
    }
1418
285
170
1659
286
    // reusable toolbar
171
    MusicTracks { id: musicTracksPage }
1660
287
    ToolbarActions {
172
1421
288
        id: defaultToolbar
1422
289
1423
290
        // Share
1424
291
        Action {
1425
292
            id: shareTrack
1426
293
            objectName: "share"
1427
294
1428
295
            iconSource: Qt.resolvedUrl("images/icon_share@20.png")
1429
296
            text: i18n.tr("Share")
1430
297
1431
298
            onTriggered: {
1432
299
                console.debug('Debug: Share pressed')
1433
300
                // just to debug other stuff for a while
1434
301
                console.debug("Debug: change progress to "+playMusic.position)
1435
302
                trackProgress.value = playMusic.position
1436
303
            }
1437
304
        }
1438
305
1439
306
        // prevous track
1440
307
        Action {
1441
308
            id: prevTrack
1442
309
            objectName: "prev"
1443
310
1444
311
            iconSource: Qt.resolvedUrl("images/icon_prev@20.png")
1445
312
            text: i18n.tr("Previous")
1446
313
1447
314
            onTriggered: {
1448
315
                console.debug('Debug: Prev track pressed')
1449
316
                //console.debug(removedTrackQueue.get(0).file) // print next songs filename
1450
317
                //playMusic.source = removedTrackQueue.get(0).file
1451
318
                //playMusic.play()
1452
319
                previousTrack()
1453
320
            }
1454
321
        }
1455
322
1456
323
        // Play
1457
324
        Action {
1458
325
            id: playTrack
1459
326
            objectName: "play"
1460
327
1461
328
            iconSource: Qt.resolvedUrl("images/icon_play@20.png")
1462
329
            text: i18n.tr("Play")
1463
330
1464
331
            onTriggered: {
1465
332
                console.debug("Debug: "+trackStatus+" pressed in toolbar.")
1466
333
                console.debug(playMusic.playbackState)
1467
334
                stateChange()
1468
335
            }
1469
336
        }
1470
337
1471
338
        // Next track
1472
339
        Action {
1473
340
            id: nextTrack
1474
341
            objectName: "next"
1475
342
1476
343
            iconSource: Qt.resolvedUrl("images/icon_next@20.png")
1477
344
            text: i18n.tr("Next")
1478
345
1479
346
            onTriggered: {
1480
347
                console.debug('Debug: next track pressed')
1481
348
                console.debug(trackQueue.get(0).file) // print next songs filename
1482
349
                playMusic.source = trackQueue.get(0).file
1483
350
                playMusic.play()
1484
351
1485
352
                // move track, which has been played from queue, to old queue so that prev button works
1486
353
                removedTrackQueue.append({"title": trackQueue.get(0).title, "artist": trackQueue.get(0).artist, "file": trackQueue.get(0).file})
1487
354
                trackQueue.remove(0)
1488
355
            }
1489
356
        }
1490
357
1491
358
        // Queue
1492
359
        Action {
1493
360
            id: trackQueueAction
1494
361
            objectName: "queuelist"
1495
362
            iconSource: Qt.resolvedUrl("images/icon_settings@20.png")
1496
363
            text: i18n.tr("Queue")
1497
364
            onTriggered: {
1498
365
                PopupUtils.open(Qt.resolvedUrl("QueueDialog.qml"), pageLayout,
1499
366
                            {
1500
367
                                title: i18n.tr("Queue")
1501
368
                            } )
1502
369
            }
1503
370
        }
1504
371
1505
372
        // Settings
1506
373
        Action {
1507
374
            id: settingsAction
1508
375
            objectName: "settings"
1509
376
1510
377
            iconSource: Qt.resolvedUrl("images/icon_settings@20.png")
1511
378
            text: i18n.tr("Settings")
1512
379
1513
380
            onTriggered: {
1514
381
                console.debug('Debug: Settings pressed')
1515
382
                // show settings page (not yet implemented)
1516
383
                //dialog
1517
384
                PopupUtils.open(Qt.resolvedUrl("MusicSettings.qml"), pageLayout,
1518
385
                            {
1519
386
                                title: i18n.tr("Settings")
1520
387
                            } )
1521
388
            }
1522
389
        }
1523
390
    }
1524
391
1525
392
    Tabs {
1526
393
        id: tabs
1527
394
        anchors.fill: parent
1528
395
1529
396
        // First tab begins here - should be the primary tab
1530
397
        Tab {
1531
398
            id: playinTab
1532
399
            objectName: "Tab1"
1533
400
1534
401
            title: musicName
1535
402
1536
403
            // Tab content begins here
1537
404
            page: Page {
1538
405
                id: playingPage
1539
406
1540
407
                // toolbar
1541
408
                tools: defaultToolbar
1542
409
1543
410
                Column {
1544
411
                        id: pageLayout
1545
412
1546
413
                        spacing: units.gu(1)
1547
414
1548
415
                        Column {
1549
416
                            spacing: units.gu(1)
1550
417
                            // Album cover here
1551
418
                            UbuntuShape {
1552
419
                                id: trackCoverArt
1553
420
                                width: units.gu(50)
1554
421
                                height: units.gu(50)
1555
422
                                gradientColor: "blue" // test
1556
423
                                image: Image {
1557
424
                                    id: coverArt
1558
425
                                    source: "images/music.png"
1559
426
                                }
1560
427
                            }
1561
428
                            /*onClicked: {
1562
429
                                playMusic.pause()
1563
430
                            }
1564
431
                            onDoubbleTap: {
1565
432
                                nextTrack()
1566
433
                            }
1567
434
                            onPressAndHold: {
1568
435
                                playMusic.stop()
1569
436
                            }*/
1570
437
                        }
1571
438
1572
439
                        // track progress
1573
440
                        Column {
1574
441
                            width: units.gu(50)
1575
442
                            ProgressBar {
1576
443
                                id: trackProgress
1577
444
                                minimumValue: 0
1578
445
                                maximumValue: 100
1579
446
                                value: 0
1580
447
                            }
1581
448
                        }
1582
449
1583
450
                        // Track info
1584
451
                        Column {
1585
452
                            spacing: units.gu(1)
1586
453
                            Label {
1587
454
                                id: trackInfo
1588
455
                                text: "Stopped. Press play."
1589
456
                                //subText: "Artist: + Year:"
1590
457
                            }
1591
458
                        }
1592
459
                    }
1593
460
1594
461
1595
462
            }
1596
463
        }
1597
464
1598
465
1599
466
        // Second tab begins here - artists here
1600
467
        Tab {
1601
468
            objectName: "Artists Tab"
1602
469
1603
470
            title: i18n.tr("Artists")
1604
471
            page: Page {
1605
472
                anchors.margins: units.gu(2)
1606
473
1607
474
            // foreach artist:
1608
475
            ListItem.Standard {
1609
476
                height: units.gu(4)
1610
477
                // when pressed on this row, change to albums of artist
1611
478
                Row {
1612
479
                    Label {
1613
480
                        text: i18n.tr("Artist 1")
1614
481
                    }
1615
482
                }
1616
483
            }
1617
484
1618
485
            // toolbar
1619
486
            tools: defaultToolbar
1620
487
1621
488
            Column {
1622
489
                anchors.centerIn: parent
1623
490
                anchors.fill: parent
1624
491
            }
1625
492
            }
1626
493
        }
1627
494
1628
495
        // Third tab begins here - albums here
1629
496
        Tab {
1630
497
            objectName: "Albums Tab"
1631
498
1632
499
            title: i18n.tr("Albums")
1633
500
            page: Page {
1634
501
                anchors.margins: units.gu(2)
1635
502
1636
503
                Column {
1637
504
                    anchors.centerIn: parent
1638
505
                    anchors.fill: parent
1639
506
                }
1640
507
1641
508
                // toolbar
1642
509
                tools: defaultToolbar
1643
510
1644
511
                Column {
1645
512
                    anchors.centerIn: parent
1646
513
                }
1647
514
            }
1648
515
        }
1649
516
1650
517
        // Fourth tab - tracks in ~/Music
1651
518
        Tab {
1652
519
            objectName: "Tracks Tab"
1653
520
1654
521
            title: i18n.tr("Tracks")
1655
522
            page: MusicTracks { id: musicTracksPage }
1656
523
        } // 4th tab
1657
524
1658
525
    } // tabs
1661
526
} // main view
173
} // main view
1662
527
174
1663
=== added file 'playing-list.js'
1664
--- playing-list.js	1970-01-01 00:00:00 +0000
1665
+++ playing-list.js	2013-06-05 04:48:28 +0000
1666
@@ -0,0 +1,34 @@
1667
1
//playing-list.js
1668
2
.pragma library
1669
3
var myArray = new Array()
1670
4
var myLocation = new Array()
1671
5
1672
6
function getList() {
1673
7
    return myArray
1674
8
}
1675
9
1676
10
function at(index) {
1677
11
    return myLocation[index]
1678
12
}
1679
13
1680
14
function addItem(item, index) {
1681
15
    myArray.push(item)
1682
16
    myLocation.push(index)
1683
17
}
1684
18
1685
19
function contains(item) {
1686
20
    return myArray.indexOf(item) !== -1
1687
21
}
1688
22
1689
23
function indexOf(item) {
1690
24
    return myArray.indexOf(item)
1691
25
}
1692
26
1693
27
function size() {
1694
28
    return myArray.length
1695
29
}
1696
30
1697
31
function clear() {
1698
32
    myArray = []
1699
33
    myLocation = []
1700
34
}
Status:	Merged
Approved by:	Victor Thompson on 2013-06-05
Approved revision:	33
Merged at revision:	24
Proposed branch:	lp:~music-app-dev/music-app/frankenstein-merge
Merge into:	lp:music-app/trusty
Diff against target:	1700 lines (+780/-705) 9 files modified FirstRun.qml (+0/-54) MusicSettings.qml (+13/-7) MusicTracks.qml (+627/-96) QueueDialog.qml (+4/-4) Toolbar.qml (+0/-103) debian/changelog (+7/-1) debian/install (+9/-1) music-app.qml (+86/-439) playing-list.js (+34/-0)
To merge this branch:	bzr merge lp:~music-app-dev/music-app/frankenstein-merge
Related bugs:	Link a bug report
Reviewer	Review Type	Date Requested	Status
Ubuntu Phone Apps Jenkins Bot	continuous-integration		Approve on 2013-06-05
Martin Mrazik (community)			Approve on 2013-06-05
Daniel Holm		2013-06-04	Approve on 2013-06-04
Review via email: mp+167199@code.launchpad.net