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

Re-add showing of dates.

Browse Source 
BUG: 446
This commit is contained in:
craig.p.drummond
2014-03-23 20:09:12 +00:00
committed by craig.p.drummond
parent 4f63711498
commit 8c94a79967
6 changed files with 30 additions and 32 deletions
Download Patch File Download Diff File Expand all files Collapse all files

34
ChangeLog
View File

@@ -44,31 +44,29 @@
26. When context view is collapsed, draw background over selector buttons.
27. Be consistent with displaying years of albums - year is shown in brackets
after album name.
28. Only show album year in non-icon view.
29. Only show album year in browsers.
30. Reduce memory usage, by storing album covers in a cache - and using this
28. Reduce memory usage, by storing album covers in a cache - and using this
for display. Size of cache can be controlled by config item, see README for
details.
31. Only save albumartist tag in XML cache file if library supports this tag.
32. Use MPD status to determine when to show, and hide, "Updating..." message.
33. Ignore mouse-events on message-overlay if cancel button is hidden.
34. Update copy of QJson to 0.8.1
35. Speed up building list of songs - by only checking if file has already
29. Only save albumartist tag in XML cache file if library supports this tag.
30. Use MPD status to determine when to show, and hide, "Updating..." message.
31. Ignore mouse-events on message-overlay if cancel button is hidden.
32. Update copy of QJson to 0.8.1
33. Speed up building list of songs - by only checking if file has already
been added, not song.
36. After scanning replay gain, show original tag values in tooltips if
34. After scanning replay gain, show original tag values in tooltips if
different to those calculated.
37. Don't use italic text for grouped view headers.
38. Save scaled covers as PNG files.
39. Use Q_GLOBAL_STATIC for Qt4.8, and Qt>=5.1 Qt-only builds.
40. Show music folder location in device properties dialog when called from
35. Don't use italic text for grouped view headers.
36. Save scaled covers as PNG files.
37. Use Q_GLOBAL_STATIC for Qt4.8, and Qt>=5.1 Qt-only builds.
38. Show music folder location in device properties dialog when called from
copy/delete dialog - just dont allow setting to be changed.
41. Remove artist image support for online-services.
42. Update context-view when artist, or album, image is updated.
43. When current song is from an online-service (Jamendo, Magnatune, etc) then
39. Remove artist image support for online-services.
40. Update context-view when artist, or album, image is updated.
41. When current song is from an online-service (Jamendo, Magnatune, etc) then
only show cover and tite in context view. No attempt is made to get artist,
album, or song information - as these are likely to fail anyway.
44. Jamendo radio streams.
45. Install listenlive.xml to Cantata folder, as opposed to embedding in app.
42. Jamendo radio streams.
43. Install listenlive.xml to Cantata folder, as opposed to embedding in app.
1.3.3
-----

4
gui/trayitem.cpp
View File

@@ -199,9 +199,9 @@ void TrayItem::songChanged(const Song &song, bool isPlaying)
? !song.title.isEmpty() && !song.name.isEmpty()
: !song.title.isEmpty() && !song.artist.isEmpty() && !song.album.isEmpty();
if (useable) {
QString text=song.describe(false, false);
QString text=song.describe(false);
if (song.time>0) {
text+=QLatin1String(" (")+Utils::formatTime(song.time)+QLatin1Char(')');
text+=QLatin1String(" - ")+Utils::formatTime(song.time);
}
if (trayItem) {

4
mpd/song.cpp
View File

@@ -512,9 +512,9 @@ QString Song::basicArtist() const
return artist;
}
QString Song::describe(bool withMarkup, bool withYear) const
QString Song::describe(bool withMarkup) const
{
QString albumText=album.isEmpty() ? name : (withYear ? displayAlbum(album, Song::albumYear(*this)) : album);
QString albumText=album.isEmpty() ? name : displayAlbum(album, Song::albumYear(*this));
return withMarkup
? title.isEmpty()

2
mpd/song.h
View File

@@ -126,7 +126,7 @@ struct Song
QString basicArtist() const;
QString filePath() const { return decodePath(file); }
QString displayAlbum() const { return displayAlbum(album, year); }
QString describe(bool withMarkup=false, bool withYear=true) const;
QString describe(bool withMarkup=false) const;
// QString basicDescription() const;
//

14
widgets/groupedview.cpp
View File

@@ -258,15 +258,15 @@ public:
track=song.trackAndTitleStr(song.isVariousArtists());
} else {
if (song.isFromOnlineService()) {
title=song.album; // Song::displayAlbum(song.album, Song::albumYear(song));
title=Song::displayAlbum(song.album, Song::albumYear(song));
} else {
title=song.artistOrComposer()+QLatin1String(" - ")+song.album; // Song::displayAlbum(song.album, Song::albumYear(song));
title=song.artistOrComposer()+QLatin1String(" - ")+Song::displayAlbum(song.album, Song::albumYear(song));
}
if (Song::useComposer()) {
while (title.contains(") (")) {
title=title.replace(") (", ", ");
}
}
// if (Song::useComposer()) {
// while (title.contains(") (")) {
// title=title.replace(") (", ", ");
// }
// }
track=song.trackAndTitleStr(song.isVariousArtists());
}
} else {

4
widgets/songlabel.cpp
View File

@@ -52,8 +52,8 @@ void SongLabel::update(const Song &song)
if (song.isEmpty()) {
plainText=text=QString();
} else {
plainText=song.describe(false, false);
text=song.describe(true, false);
plainText=song.describe(false);
text=song.describe(true);
}
open.clear();