=== 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 12:51:38 +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() { @@ -50,10 +52,13 @@ "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") + "WHERE PlaylistTracks.playlist_id = %3") .arg(escaper.escapeString(playlistTableName), columns.join(","), QString::number(playlistId)); + if (!m_showAll) { + queryString.append(" AND library.mixxx_deleted = 0"); + } query.prepare(queryString); if (!query.exec()) { LOG_FAILED_QUERY(query); @@ -246,49 +251,43 @@ //qDebug() << queryString; queryString = QString("UPDATE PlaylistTracks SET position=position-1 " - "WHERE position > %1 AND " - "playlist_id=%2").arg( - QString::number(oldPosition), - QString::number(m_iPlaylistId)); + "WHERE position > %1 AND " + "playlist_id=%2").arg(QString::number(oldPosition), + QString::number(m_iPlaylistId)); query.exec(queryString); queryString = QString("UPDATE PlaylistTracks SET position=position+1 " - "WHERE position >= %1 AND " //position < %2 AND " - "playlist_id=%3").arg( - QString::number(newPosition), - QString::number(m_iPlaylistId)); + "WHERE position >= %1 AND " //position < %2 AND " + "playlist_id=%3").arg(QString::number(newPosition), + QString::number(m_iPlaylistId)); query.exec(queryString); queryString = QString("UPDATE PlaylistTracks SET position=%1 " - "WHERE position=-1 AND " - "playlist_id=%2").arg( - QString::number(newPosition), - QString::number(m_iPlaylistId)); + "WHERE position=-1 AND " + "playlist_id=%2").arg(QString::number(newPosition), + QString::number(m_iPlaylistId)); query.exec(queryString); } else if (newPosition > oldPosition) { queryString = QString("UPDATE PlaylistTracks SET position=-1 " "WHERE position = %1 AND " - "playlist_id=%2").arg( - QString::number(oldPosition), - QString::number(m_iPlaylistId)); + "playlist_id=%2").arg(QString::number(oldPosition), + QString::number(m_iPlaylistId)); //qDebug() << queryString; query.exec(queryString); queryString = QString("UPDATE PlaylistTracks SET position=position-1 " "WHERE position > %1 AND position <= %2 AND " - "playlist_id=%3").arg( - QString::number(oldPosition), - QString::number(newPosition), - QString::number(m_iPlaylistId)); + "playlist_id=%3").arg(QString::number(oldPosition), + QString::number(newPosition), + QString::number(m_iPlaylistId)); query.exec(queryString); queryString = QString("UPDATE PlaylistTracks SET position=%1 " "WHERE position=-1 AND " - "playlist_id=%2").arg( - QString::number(newPosition), - QString::number(m_iPlaylistId)); + "playlist_id=%2").arg(QString::number(newPosition), + QString::number(m_iPlaylistId)); query.exec(queryString); } @@ -364,7 +363,7 @@ return true; } if (column == fieldIndex(PLAYLISTTRACKSTABLE_DATETIMEADDED)) { - return true; + return true; } return false; } === 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 11:19:41 +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 12:56:01 +0000 @@ -19,7 +19,8 @@ : BasePlaylistFeature(parent, pConfig, pTrackCollection, "SETLOGHOME") { m_pPlaylistTableModel = new PlaylistTableModel(this, pTrackCollection, - "mixxx.db.model.setlog"); + "mixxx.db.model.setlog", + true);//show all tracks m_pJoinWithPreviousAction = new QAction(tr("Join with previous"), this); connect(m_pJoinWithPreviousAction, SIGNAL(triggered()), this, SLOT(slotJoinWithPrevious()));