lp:~mhaulo/mixxx/multilevel_crates_playlists

Branch merges

Propose for merging

No branches dependent on this one.

On hold for merging into lp:~mixxxdevelopers/mixxx/trunk

Daniel Schürmann: Needs Fixing on 2013-05-13

Diff: 1727 lines (+748/-280)

19 files modified

mixxx/res/schema.xml (+29/-0)
mixxx/src/library/cratefeature.cpp (+146/-66)
mixxx/src/library/cratefeature.h (+10/-3)
mixxx/src/library/dao/cratedao.cpp (+118/-29)
mixxx/src/library/dao/cratedao.h (+12/-1)
mixxx/src/library/dao/playlistdao.cpp (+123/-38)
mixxx/src/library/dao/playlistdao.h (+15/-2)
mixxx/src/library/playlistfeature.cpp (+146/-77)
mixxx/src/library/playlistfeature.h (+9/-4)
mixxx/src/library/sidebarmodel.cpp (+6/-0)
mixxx/src/library/trackcollection.cpp (+1/-1)
mixxx/src/library/treeitem.cpp (+16/-1)
mixxx/src/library/treeitem.h (+8/-0)
mixxx/src/library/treeitemmodel.cpp (+16/-0)
mixxx/src/library/treeitemmodel.h (+3/-0)
mixxx/src/mixxx.cpp (+0/-20)
mixxx/src/mixxx.h (+0/-2)
mixxx/src/widget/wtracktableview.cpp (+88/-36)
mixxx/src/widget/wtracktableview.h (+2/-0)

api

Related source package recipes

No recipes using this branch. (?)

Related snap packages

Related bugs

Bug #671632: add multi level crate support

Wishlist

In Progress

Link a bug report

Related blueprints

2741. By Mika Haulo on 2011-05-25

Some internal merge stuff

2740. By Mika Haulo on 2011-05-25

Merging from trunk

2739. By Mika Haulo on 2011-05-25

Merging from trunk

2738. By Mika Haulo on 2011-05-03

Added ability to expand and collapse crate/playlist trees

2737. By Mika Haulo on 2011-04-26

Quick fix to prevent a crash.

Mixxx was crashing if the last subcrate/playlist was deleted. I'm not sure
about the root cause (there's a null pointer, but why?), but this seems
to prevent the crash.

2736. By Mika Haulo on 2011-04-26

Merging from trunk

2735. By Mika Haulo on 2011-04-25

Bug fix: AutoDJ queue should not be in playlist tree

2734. By Mika Haulo on 2011-04-25

More restrictions to crate/playlist deletion.

If any parent or child crate/playlist is locked, deletion
is not possible.

2733. By Mika Haulo on 2011-04-25

Added menu action to indicate if there are no crates/playlists

2732. By Mika Haulo on 2011-04-25

Don't enable deletion of crate/playlist if any of its parents are locked