← Back to branch summary

~vthompson/music-app/fixes-1308042-album-text-alignment

« back to all changes in this revision

Viewing changes to MusicStart.qml

  • Committer: Victor Thompson
  • Date: 2014-03-27 23:44:29 UTC
  • mto: This revision was merged to the branch mainline in revision 399.
  • Revision ID: victor.thompson@gmail.com-20140327234429-ywildkkkueavrez5
remove column, add margins

Show diffs side-by-side

added added

removed removed

Lines of Context:
MusicStart.qml
63
63
        width:  mainpage.width
64
64
        height: mainpage.height
65
65
 
66
 
        contentHeight:  mainView.hasRecent ? recentlyPlayed.height + recentlist.height + genres.height + genrelist.height + albums.height + albumlist.height + units.gu(7)
67
 
                                           :  genres.height + genrelist.height + albums.height + albumlist.height + units.gu(5)
 
66
        contentHeight:  mainView.hasRecent ? recentlyPlayed.height + recentlist.height + genres.height + genrelist.height + albums.height + albumlist.height + units.gu(3)
 
67
                                           :  genres.height + genrelist.height + albums.height + albumlist.height + units.gu(2)
68
68
        contentWidth: width
69
69
 
70
70
        focus: true
71
71
 
72
 
        Column {
73
 
            height: mainpage.height
74
 
            width: mainpage.width
75
 
            spacing: units.gu(1)
76
 
 
77
72
            ListItem.Standard {
78
73
                id: recentlyPlayed
79
74
                text: i18n.tr("Recent")
82
77
 
83
78
            ListView {
84
79
                id: recentlist
 
80
                anchors.top: recentlyPlayed.bottom
 
81
                anchors.topMargin: units.gu(1)
85
82
                width: parent.width
86
83
                spacing: units.gu(2)
87
84
                height: units.gu(22)
198
195
 
199
196
            ListItem.ThinDivider {
200
197
                id: genreDivider
 
198
                 anchors.top: mainView.hasRecent ? recentlist.bottom : parent.top
201
199
            }
202
200
            ListItem.Standard {
203
201
                id: genres
 
202
                anchors.top: genreDivider.bottom
204
203
                text: i18n.tr("Genres")
205
204
            }
206
205
            // TODO: add music genres. frequency of play? most tracks?
207
206
            ListView {
208
207
                id: genrelist
209
208
                width: parent.width
 
209
                anchors.top: genres.bottom
 
210
                anchors.topMargin: units.gu(1)
210
211
                spacing: units.gu(2)
211
212
                height: units.gu(22)
212
213
                model: genreModel.model
303
304
 
304
305
            ListItem.ThinDivider {
305
306
                id: albumsDivider
 
307
                anchors.top: genrelist.bottom
306
308
            }
307
309
            ListItem.Standard {
308
310
                id: albums
309
311
                text: i18n.tr("Albums")
 
312
                anchors.top: albumsDivider.bottom
310
313
            }
311
314
 
312
315
            ListView {
313
316
                id: albumlist
314
317
                width: parent.width
 
318
                anchors.top: albums.bottom
 
319
                anchors.topMargin: units.gu(1)
315
320
                spacing: units.gu(2)
316
321
                height: units.gu(22)
317
322
                model: albumModel.model
406
411
            }
407
412
        }
408
413
    }
409
 
}