From 11619c9484af0c52e2004eca69024f1d6359bb84 Mon Sep 17 00:00:00 2001 From: John Maguire Date: Wed, 4 Jan 2012 15:43:28 +0000 Subject: [PATCH] Bump the playlist view state version. --- src/playlist/playlistdelegates.cpp | 2 +- src/playlist/playlistview.cpp | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/src/playlist/playlistdelegates.cpp b/src/playlist/playlistdelegates.cpp index c691a134d..68ff27b46 100644 --- a/src/playlist/playlistdelegates.cpp +++ b/src/playlist/playlistdelegates.cpp @@ -441,7 +441,7 @@ SongSourceDelegate::SongSourceDelegate(QObject* parent, Player* player) } QString SongSourceDelegate::displayText(const QVariant& value, const QLocale&) const { - return ""; + return QString(); } QPixmap SongSourceDelegate::LookupPixmap(const QUrl& url, const QSize& size) const { diff --git a/src/playlist/playlistview.cpp b/src/playlist/playlistview.cpp index d2be680c3..cd0b5279d 100644 --- a/src/playlist/playlistview.cpp +++ b/src/playlist/playlistview.cpp @@ -35,7 +35,7 @@ #include -const int PlaylistView::kStateVersion = 3; +const int PlaylistView::kStateVersion = 4; const int PlaylistView::kGlowIntensitySteps = 24; const int PlaylistView::kAutoscrollGraceTimeout = 60; // seconds const int PlaylistView::kDropIndicatorWidth = 2; @@ -55,7 +55,7 @@ void PlaylistProxyStyle::drawControl( const QRect& rect = header_option->rect; const QString& text = header_option->text; const QFontMetrics& font_metrics = header_option->fontMetrics; - + // spaces added to make transition less abrupt if (rect.width() < font_metrics.width(text + " ")) { const Playlist::Column column = static_cast(header_option->section); @@ -267,6 +267,9 @@ void PlaylistView::LoadGeometry() { if (state_version < 3) { header_->HideSection(Playlist::Column_Comment); } + if (state_version < 4) { + header_->SetColumnWidth(Playlist::Column_Source, 0.05); + } // Make sure at least one column is visible bool all_hidden = true;