Commit cb42ead6 authored by Michael Pyne's avatar Michael Pyne

Allow 'default playlists' to have duplicate entries.

This is still disabled in search playlists, folder-based playlists, and
the collection list (where the concept doesn't make sense), but at
least you can add items over and over to the normal playlists.

FIXED-IN:16.08
parent 3ad38ca6
......@@ -350,6 +350,9 @@ CollectionList::CollectionList(PlaylistCollection *collection) :
m_columnTags[PlaylistItem::ArtistColumn] = new TagCountDict;
m_columnTags[PlaylistItem::AlbumColumn] = new TagCountDict;
m_columnTags[PlaylistItem::GenreColumn] = new TagCountDict;
// Even set to true it wouldn't work with this class due to other checks
setAllowDuplicates(false);
}
CollectionList::~CollectionList()
......
......@@ -55,6 +55,7 @@ DynamicPlaylist::DynamicPlaylist(const PlaylistList &playlists,
if(setupPlaylist)
collection->setupPlaylist(this, iconName);
setName(name);
setAllowDuplicates(false);
setSorting(columns() + 1);
......
......@@ -29,6 +29,7 @@ FolderPlaylist::FolderPlaylist(PlaylistCollection *collection, const QString &fo
Playlist(collection, name, "folder"),
m_folder(folder)
{
setAllowDuplicates(false);
QTimer::singleShot(0, this, SLOT(slotReload()));
}
......
......@@ -51,8 +51,8 @@ static const char sho[] = I18N_NOOP("MPRIS2 Interface implementation.");
int main(int argc, char *argv[])
{
KAboutData aboutData("juk", 0, ki18n("JuK"),
"3.12", ki18n(description), KAboutData::License_GPL,
ki18n("© 2002–2014, Scott Wheeler, Michael Pyne, and others"),
"3.13", ki18n(description), KAboutData::License_GPL,
ki18n("© 2002–2016, Scott Wheeler, Michael Pyne, and others"),
KLocalizedString(),
"http://www.kde.org/applications/multimedia/juk/");
......
......@@ -331,7 +331,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QString &name,
m_collection(collection),
m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_allowDuplicates(true),
m_applySharedSettings(true),
m_columnWidthModeChanged(false),
m_disableColumnWidthUpdates(true),
......@@ -354,7 +354,7 @@ Playlist::Playlist(PlaylistCollection *collection, const PlaylistItemList &items
m_collection(collection),
m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_allowDuplicates(true),
m_applySharedSettings(true),
m_columnWidthModeChanged(false),
m_disableColumnWidthUpdates(true),
......@@ -378,7 +378,7 @@ Playlist::Playlist(PlaylistCollection *collection, const QFileInfo &playlistFile
m_collection(collection),
m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_allowDuplicates(true),
m_applySharedSettings(true),
m_columnWidthModeChanged(false),
m_disableColumnWidthUpdates(true),
......@@ -401,7 +401,7 @@ Playlist::Playlist(PlaylistCollection *collection, bool delaySetup, int extraCol
m_collection(collection),
m_fetcher(new WebImageFetcher(this)),
m_selectedCount(0),
m_allowDuplicates(false),
m_allowDuplicates(true),
m_applySharedSettings(true),
m_columnWidthModeChanged(false),
m_disableColumnWidthUpdates(true),
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment