Viewing all changes in revision 2644.

Committer: RJ Ryan
Date: 2011-02-20 20:47:37 UTC
mfrom: (2621.2.13 crate-and-playlist-lock)
Revision ID: rryan@mit.edu-20110220204737-s2pi4a98a0sc7zr3

Merging from lp:~mhaulo/mixxx/crate-and-playlist-lock. This branch brings the ability to lock playlists and crates. Thanks to Mika Haulo for these nice improvements.

files added:
mixxx/res/images/library/ic_library_locked.png

files modified:
mixxx/res/images/templates/ic_template_library_and_preferences.svg

mixxx/res/mixxx.qrc

mixxx/res/schema.xml

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

mixxx/src/library/cratetablemodel.cpp

mixxx/src/library/dao/cratedao.cpp

mixxx/src/library/dao/cratedao.h

mixxx/src/library/dao/playlistdao.cpp

mixxx/src/library/dao/playlistdao.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlistfeature.h

mixxx/src/library/playlisttablemodel.cpp

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/trackcollection.cpp

mixxx/src/library/trackmodel.h

mixxx/src/library/treeitem.cpp

mixxx/src/library/treeitem.h

mixxx/src/library/treeitemmodel.cpp

mixxx/src/mixxx.cpp

mixxx/src/widget/wtracktableview.cpp

expand all

Show diffs side-by-side

added added

removed removed

mixxx/res/images/library/ic_library_locked.png

mixxx/res/images/templates/ic_template_library_and_preferences.svg

mixxx/res/mixxx.qrc

mixxx/res/schema.xml

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

mixxx/src/library/cratetablemodel.cpp

mixxx/src/library/dao/cratedao.cpp

mixxx/src/library/dao/cratedao.h

mixxx/src/library/dao/playlistdao.cpp

mixxx/src/library/dao/playlistdao.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlistfeature.h

mixxx/src/library/playlisttablemodel.cpp

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/trackcollection.cpp

mixxx/src/library/trackmodel.h

mixxx/src/library/treeitem.cpp

mixxx/src/library/treeitem.h

mixxx/src/library/treeitemmodel.cpp

mixxx/src/mixxx.cpp

Older »

~vininim/mixxx/hackish

Viewing all changes in revision 2644.