← Back to branch summary

~mixxxdevelopers/mixxx/trunk

~mixxxdevelopers/mixxx/trunk

« back to all changes in this revision

Viewing changes to mixxx/res/mixxx.qrc

Committer: Raffitea
Date: 2011-01-07 00:44:11 UTC
mfrom: (2616.1.25 traktor_library)
Revision ID: raffitea-20110107004411-lz9m8mnny3sf86rq

Merging from lp:~mixxxdevelopers/mixxx/traktor_library
* support for n-level childmodels in sidebar
* M3U and PLS playlist import

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

mixxx/src/library/parser.cpp

mixxx/src/library/parser.h

mixxx/src/library/parserm3u.cpp

mixxx/src/library/parserm3u.h

mixxx/src/library/parserpls.cpp

mixxx/src/library/parserpls.h

mixxx/src/library/traktorfeature.cpp

mixxx/src/library/traktorfeature.h

mixxx/src/library/traktorplaylistmodel.cpp

mixxx/src/library/traktorplaylistmodel.h

mixxx/src/library/traktortablemodel.cpp

mixxx/src/library/traktortablemodel.h

mixxx/src/library/treeitem.cpp

mixxx/src/library/treeitem.h

mixxx/src/library/treeitemmodel.cpp

mixxx/src/library/treeitemmodel.h

files removed:
mixxx/src/parser.cpp

mixxx/src/parser.h

mixxx/src/parserm3u.cpp

mixxx/src/parserm3u.h

mixxx/src/parserpls.cpp

mixxx/src/parserpls.h

files modified:
mixxx/build/depends.py

mixxx/res/mixxx.qrc

mixxx/res/schema.xml

mixxx/src/library/autodjfeature.cpp

mixxx/src/library/autodjfeature.h

mixxx/src/library/browsefeature.cpp

mixxx/src/library/browsefeature.h

mixxx/src/library/cratefeature.cpp

mixxx/src/library/cratefeature.h

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/itunesfeature.cpp

mixxx/src/library/itunesfeature.h

mixxx/src/library/library.cpp

mixxx/src/library/libraryfeature.h

mixxx/src/library/mixxxlibraryfeature.cpp

mixxx/src/library/mixxxlibraryfeature.h

mixxx/src/library/playlistfeature.cpp

mixxx/src/library/playlistfeature.h

mixxx/src/library/preparefeature.cpp

mixxx/src/library/preparefeature.h

mixxx/src/library/promotracksfeature.cpp

mixxx/src/library/promotracksfeature.h

mixxx/src/library/rhythmboxfeature.cpp

mixxx/src/library/rhythmboxfeature.h

mixxx/src/library/sidebarmodel.cpp

mixxx/src/library/trackcollection.cpp

Show diffs side-by-side

added added

removed removed

mixxx/res/mixxx.qrc

28

28

<file>images/library/ic_library_prepare.png</file>

29

29

<file>images/library/ic_library_promotracks.png</file>

30

30

<file>images/library/ic_library_rhythmbox.png</file>

31

<file>images/library/ic_library_traktor.png</file>

31

32

</qresource>

32

33

</RCC>

Older »