=== modified file 'mixxx/src/library/playlisttablemodel.cpp' --- mixxx/src/library/playlisttablemodel.cpp 2012-05-23 19:12:25 +0000 +++ mixxx/src/library/playlisttablemodel.cpp 2012-06-04 07:52:14 +0000 @@ -9,7 +9,8 @@ PlaylistTableModel::PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection, - QString settingsNamespace) + QString settingsNamespace, + bool showAll) : BaseSqlTableModel(parent, pTrackCollection, pTrackCollection->getDatabase(), settingsNamespace), @@ -19,6 +20,7 @@ m_iPlaylistId(-1) { connect(this, SIGNAL(doSearch(const QString&)), this, SLOT(slotSearch(const QString&))); + m_showAll = showAll; } PlaylistTableModel::~PlaylistTableModel() { @@ -46,14 +48,26 @@ // (mixxx_deleted=0) from the view. There was a bug in <= 1.9.0 where // removed files were not removed from playlists, so some users will have // libraries where this is the case. - QString queryString = QString( - "CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS " - "SELECT %2 FROM PlaylistTracks " - "INNER JOIN library ON library.id = PlaylistTracks.track_id " - "WHERE PlaylistTracks.playlist_id = %3 AND library.mixxx_deleted = 0") - .arg(escaper.escapeString(playlistTableName), - columns.join(","), - QString::number(playlistId)); + QString queryString; + if(m_showAll){ + queryString = QString( + "CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS " + "SELECT %2 FROM PlaylistTracks " + "INNER JOIN library ON library.id = PlaylistTracks.track_id " + "WHERE PlaylistTracks.playlist_id = %3") + .arg(escaper.escapeString(playlistTableName), + columns.join(","), + QString::number(playlistId)); + } else { + queryString = QString( + "CREATE TEMPORARY VIEW IF NOT EXISTS %1 AS " + "SELECT %2 FROM PlaylistTracks " + "INNER JOIN library ON library.id = PlaylistTracks.track_id " + "WHERE PlaylistTracks.playlist_id = %3 AND library.mixxx_deleted = 0") + .arg(escaper.escapeString(playlistTableName), + columns.join(","), + QString::number(playlistId)); + } query.prepare(queryString); if (!query.exec()) { LOG_FAILED_QUERY(query); === modified file 'mixxx/src/library/playlisttablemodel.h' --- mixxx/src/library/playlisttablemodel.h 2012-05-23 19:12:25 +0000 +++ mixxx/src/library/playlisttablemodel.h 2012-06-04 07:43:44 +0000 @@ -16,7 +16,7 @@ Q_OBJECT public: PlaylistTableModel(QObject* parent, TrackCollection* pTrackCollection, - QString settingsNamespace); + QString settingsNamespace,bool showAll=false); virtual ~PlaylistTableModel(); void setPlaylist(int playlistId); int getPlaylist() const { @@ -50,6 +50,7 @@ PlaylistDAO& m_playlistDao; TrackDAO& m_trackDao; int m_iPlaylistId; + bool m_showAll; }; #endif === modified file 'mixxx/src/library/setlogfeature.cpp' --- mixxx/src/library/setlogfeature.cpp 2012-05-26 20:19:59 +0000 +++ mixxx/src/library/setlogfeature.cpp 2012-06-04 07:48:17 +0000 @@ -19,7 +19,7 @@ : BasePlaylistFeature(parent, pConfig, pTrackCollection, "SETLOGHOME") { m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection, - "mixxx.db.model.setlog"); + "mixxx.db.model.setlog",true); m_pJoinWithPreviousAction = new QAction(tr("Join with previous"), this); connect(m_pJoinWithPreviousAction, SIGNAL(triggered()), this, SLOT(slotJoinWithPrevious()));