iiiypuk/cantata
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

If we are grouping multiple-artists albums under 'Various Artists', then we also need to place 'Various Artists' albums there as well. This oddity can occur when i18n('Various Artists') != 'Various Artists'

Browse Source
This commit is contained in:
craig.p.drummond
2012-09-03 19:03:37 +00:00
parent f526ff94b7
commit 9bd85ce443
3 changed files with 15 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
ChangeLog
View File

@@ -73,6 +73,9 @@
"1 Track" / "2 Tracks" Qt will have "Tracks: 1" / "Tracks: 2" The existing
translations will need to be updated to handle the Qt specific cases.
41. Dont clear genre list when clearing music library model.
42. If we are grouping multiple-artists albums under 'Various Artists', then
we also need to place 'Various Artists' albums there as well. This oddity
can occur when i18n('Various Artists') != 'Various Artists'
0.8.2
-----

4
models/musiclibraryitemartist.cpp
View File

@@ -217,6 +217,10 @@ void MusicLibraryItemArtist::remove(MusicLibraryItemAlbum *album)
QList<MusicLibraryItem *> MusicLibraryItemArtist::mutipleArtistAlbums()
{
if (isVarious()) {
return m_childItems;
}
QList<MusicLibraryItem *> ma;
QList<MusicLibraryItem *>::iterator it=m_childItems.begin();
QList<MusicLibraryItem *>::iterator end=m_childItems.end();

12
models/musiclibraryitemroot.cpp
View File

@@ -107,16 +107,20 @@ void MusicLibraryItemRoot::groupMultipleArtists()
QList<MusicLibraryItem *>::iterator it=m_childItems.begin();
MusicLibraryItemArtist *various=0;
bool created=false;
QString va=i18n("Various Artists");
bool checkDiffVaString=va!=QLatin1String("Various Artists");
// When grouping multiple artists - if 'Various Artists' is spelt different in curernt language, then we also need to place
// items by 'Various Artists' into i18n('Various Artists')
for (; it!=m_childItems.end(); ) {
if (various!=(*it) && !static_cast<MusicLibraryItemArtist *>(*it)->isVarious()) {
if (various!=(*it) && (!static_cast<MusicLibraryItemArtist *>(*it)->isVarious() ||
(checkDiffVaString && static_cast<MusicLibraryItemArtist *>(*it)->isVarious() && va!=(*it)->data())) ) {
QList<MusicLibraryItem *> mutipleAlbums=static_cast<MusicLibraryItemArtist *>(*it)->mutipleArtistAlbums();
if (mutipleAlbums.count()) {
if (!various) {
QString artist=i18n("Various Artists");
QHash<QString, int>::ConstIterator it=m_indexes.find(artist);
QHash<QString, int>::ConstIterator it=m_indexes.find(va);
if (m_indexes.end()==it) {
various=new MusicLibraryItemArtist(artist, this);
various=new MusicLibraryItemArtist(va, this);
created=true;
} else {
various=static_cast<MusicLibraryItemArtist *>(m_childItems.at(*it));