Highlight Crates a Track is in

build/depends.py

@@ -743,6 +743,7 @@ def sources(self, build):
                    "library/baseplaylistfeature.cpp",
                    "library/playlistfeature.cpp",
                    "library/setlogfeature.cpp",
+                   "library/cratehighlightdelegate.cpp",
 
                    "library/browse/browsetablemodel.cpp",
                    "library/browse/browsethread.cpp",

src/library/baseplaylistfeature.cpp

@@ -5,6 +5,7 @@
 #include <QFileInfo>
 #include <QDesktopServices>
 
+#include "library/library.h"
 #include "library/parser.h"
 #include "library/parserm3u.h"
 #include "library/parserpls.h"
@@ -82,6 +83,12 @@ BasePlaylistFeature::BasePlaylistFeature(QObject* parent,
 
     connect(&m_playlistDao, SIGNAL(lockChanged(int)),
             this, SLOT(slotPlaylistTableChanged(int)));
+
+    Library* pLibrary = static_cast<Library*>(parent);
+    connect(pLibrary, SIGNAL(trackSelected(TrackPointer)),
+                this, SLOT(slotTrackSelected(TrackPointer)));
+    connect(pLibrary, SIGNAL(switchToView(const QString&)),
+                this, SLOT(slotResetSelectedTrack()));
 }
 
 BasePlaylistFeature::~BasePlaylistFeature() {
@@ -585,3 +592,22 @@ QModelIndex BasePlaylistFeature::indexFromPlaylistId(int playlistId) {
     }
     return QModelIndex();
 }
+
+bool BasePlaylistFeature::isTrackInChildModel(const int trackId,
+        const QVariant dataPath) {
+    return m_playlistDao.isTrackInPlaylist(trackId, dataPath.toInt());
+}
+
+TrackPointer BasePlaylistFeature::getSelectedTrack() {
+    return m_pSelectedTrack;
+}
+
+void BasePlaylistFeature::slotTrackSelected(TrackPointer pTrack) {
+    m_pSelectedTrack = pTrack;
+    m_childModel.triggerRepaint();
+}
+
+
+void BasePlaylistFeature::slotResetSelectedTrack() {
+    slotTrackSelected(TrackPointer());
+}

src/library/baseplaylistfeature.h

@@ -13,6 +13,7 @@
 #include "library/libraryfeature.h"
 #include "library/dao/playlistdao.h"
 #include "library/dao/trackdao.h"
+#include "trackinfoobject.h"
 
 class WLibrary;
 class MixxxKeyboard;
@@ -34,6 +35,9 @@ class BasePlaylistFeature : public LibraryFeature {
     void bindWidget(WLibrary* libraryWidget,
                     MixxxKeyboard* keyboard);
 
+    TrackPointer getSelectedTrack();
+    virtual bool isTrackInChildModel(const int trackId, const QVariant dataPath);
+
   signals:
     void showPage(const QUrl& page);
     void analyzeTracks(QList<int>);
@@ -89,11 +93,16 @@ class BasePlaylistFeature : public LibraryFeature {
     QList<QPair<int, QString> > m_playlistList;
     QModelIndex m_lastRightClickedIndex;
     TreeItemModel m_childModel;
+    TrackPointer m_pSelectedTrack;
 
   private:
     virtual QString getRootViewHtml() const = 0;
 
     QString m_rootViewName;
+
+  private slots:
+    void slotTrackSelected(TrackPointer pTrack);
+    void slotResetSelectedTrack();
 };
 
 #endif /* BASEPLAYLISTFEATURE_H */

src/library/cratefeature.cpp

@@ -24,14 +24,13 @@
 #include "util/dnd.h"
 #include "util/time.h"
 
-CrateFeature::CrateFeature(QObject* parent,
+CrateFeature::CrateFeature(Library* pLibrary,
                            TrackCollection* pTrackCollection,
                            ConfigObject<ConfigValue>* pConfig)
         : m_pTrackCollection(pTrackCollection),
           m_crateDao(pTrackCollection->getCrateDAO()),
           m_crateTableModel(this, pTrackCollection),
           m_pConfig(pConfig) {
-    Q_UNUSED(parent);
     m_pCreateCrateAction = new QAction(tr("Create New Crate"),this);
     connect(m_pCreateCrateAction, SIGNAL(triggered()),
             this, SLOT(slotCreateCrate()));
@@ -92,6 +91,11 @@ CrateFeature::CrateFeature(QObject* parent,
     TreeItem *rootItem = new TreeItem();
     m_childModel.setRootItem(rootItem);
     constructChildModel(-1);
+
+    connect(pLibrary, SIGNAL(trackSelected(TrackPointer)),
+                this, SLOT(slotTrackSelected(TrackPointer)));
+    connect(pLibrary, SIGNAL(switchToView(const QString&)),
+                this, SLOT(slotResetSelectedTrack()));
 }
 
 CrateFeature::~CrateFeature() {
@@ -116,6 +120,11 @@ QIcon CrateFeature::getIcon() {
     return QIcon(":/images/library/ic_library_crates.png");
 }
 
+bool CrateFeature::isTrackInChildModel(const int trackId,
+        const QVariant dataPath) {
+    return m_crateDao.isTrackInCrate(trackId, dataPath.toInt());
+}
+
 int CrateFeature::crateIdFromIndex(QModelIndex index) {
     TreeItem* item = static_cast<TreeItem*>(index.internalPointer());
     if (item == NULL) {
@@ -705,3 +714,17 @@ QString CrateFeature::getRootViewHtml() const {
     html.append("</td></tr></table>");
     return html;
 }
+
+TrackPointer CrateFeature::getSelectedTrack() {
+    return m_pSelectedTrack;
+}
+
+void CrateFeature::slotTrackSelected(TrackPointer pTrack) {
+    m_pSelectedTrack = pTrack;
+    m_childModel.triggerRepaint();
+}
+
+void CrateFeature::slotResetSelectedTrack() {
+    slotTrackSelected(TrackPointer());
+}
+

src/library/cratefeature.h

@@ -12,16 +12,18 @@
 
 #include "library/libraryfeature.h"
 #include "library/cratetablemodel.h"
+#include "library/library.h"
 
 #include "treeitemmodel.h"
 #include "configobject.h"
+#include "trackinfoobject.h"
 
 class TrackCollection;
 
 class CrateFeature : public LibraryFeature {
     Q_OBJECT
   public:
-    CrateFeature(QObject* parent,
+    CrateFeature(Library* pLibrary,
                  TrackCollection* pTrackCollection,
                  ConfigObject<ConfigValue>* pConfig);
     virtual ~CrateFeature();
@@ -38,6 +40,9 @@ class CrateFeature : public LibraryFeature {
 
     TreeItemModel* getChildModel();
 
+    TrackPointer getSelectedTrack();
+    virtual bool isTrackInChildModel(const int trackId, const QVariant dataPath);
+
   signals:
     void analyzeTracks(QList<int>);
 
@@ -85,6 +90,11 @@ class CrateFeature : public LibraryFeature {
     QModelIndex m_lastRightClickedIndex;
     TreeItemModel m_childModel;
     ConfigObject<ConfigValue>* m_pConfig;
+    TrackPointer m_pSelectedTrack;
+
+   private slots:
+       void slotTrackSelected(TrackPointer pTrack);
+       void slotResetSelectedTrack();
 };
 
 #endif /* CRATEFEATURE_H */

src/library/cratehighlightdelegate.cpp

@@ -0,0 +1,45 @@
+#include "library/cratehighlightdelegate.h"
+#include "library/treeitem.h"
+#include "trackinfoobject.h"
+#include "libraryfeature.h"
+#include "cratefeature.h"
+
+CrateHighlightDelegate::CrateHighlightDelegate(QObject* parent)
+    : QStyledItemDelegate(parent) {
+}
+
+// This will be called to by Qt before painting the TreeView-Item. Set up styles here
+void CrateHighlightDelegate::initStyleOption(QStyleOptionViewItem* option,
+                                             const QModelIndex& index) const {
+    if (!index.isValid()) {
+        return;
+    }
+
+    QStyledItemDelegate::initStyleOption(option, index);
+    QStyleOptionViewItemV4 *optionV4 = qstyleoption_cast<QStyleOptionViewItemV4*>(option);
+
+    // If the item has no parent then it is a top-level sidebar item and its
+    // internalPointer is of type SidebarModel*, not TreeItem*.
+    if (!index.parent().isValid()) {
+        return;
+    }
+
+    TreeItem* item = static_cast<TreeItem*>(index.internalPointer());
+    if (item == NULL) {
+        return;
+    }
+
+    LibraryFeature* pFeature = item->getFeature();
+    if (pFeature == NULL) {
+        return;
+    }
+
+    TrackPointer pTrack = pFeature->getSelectedTrack();
+    if (pTrack.isNull()) {
+        return;
+    }
+
+    if (pFeature->isTrackInChildModel(pTrack->getId(), item->dataPath())){
+        optionV4->font.setBold(true);
+    }
+}

src/library/cratehighlightdelegate.h

@@ -0,0 +1,9 @@
+#include <QStyledItemDelegate>
+
+class CrateHighlightDelegate : public QStyledItemDelegate {
+
+public:
+    CrateHighlightDelegate(QObject* parent = 0);
+
+    void initStyleOption(QStyleOptionViewItem* option, const QModelIndex& index) const;
+};

src/library/dao/cratedao.cpp

@@ -18,6 +18,32 @@ CrateDAO::~CrateDAO() {
 
 void CrateDAO::initialize() {
     qDebug() << "CrateDAO::initialize()";
+
+    //get the count to allocate HashMap
+    int tracksInCratesCount = 0;
+    QSqlQuery query(m_database);
+    query.prepare("SELECT COUNT(*) from " CRATE_TRACKS_TABLE);
+
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+    }
+
+    tracksInCratesCount = query.value(0).toInt();
+
+    m_cratesTrackIsIn.reserve(tracksInCratesCount);
+
+    //now fetch all Tracks from all crates and insert them into the hashmap
+    query.prepare("SELECT track_id, crate_id from " CRATE_TRACKS_TABLE);
+    if (!query.exec()) {
+        LOG_FAILED_QUERY(query);
+    }
+
+    const int trackIdColumn = query.record().indexOf("track_id");
+    const int crateIdColumn = query.record().indexOf("crate_id");
+    while (query.next()) {
+        m_cratesTrackIsIn.insert(query.value(crateIdColumn).toInt(),
+                                 query.value(trackIdColumn).toInt());
+    }
 }
 
 unsigned int CrateDAO::crateCount() {
@@ -236,6 +262,9 @@ bool CrateDAO::deleteCrate(const int crateId) {
     transaction.commit();
 
     emit(deleted(crateId));
+
+    //Update in-memory map
+    m_cratesTrackIsIn.remove(crateId);
     return true;
 }
 
@@ -334,6 +363,7 @@ bool CrateDAO::addTrackToCrate(const int trackId, const int crateId) {
 
     emit(trackAdded(crateId, trackId));
     emit(changed(crateId));
+    m_cratesTrackIsIn.insert(crateId, trackId);
     return true;
 }
 
@@ -359,6 +389,7 @@ int CrateDAO::addTracksToCrate(const int crateId, QList<int>* trackIdList) {
     // Emitting the trackAdded signals for each trackID outside the transaction
     foreach(int trackId, *trackIdList) {
         emit(trackAdded(crateId, trackId));
+        m_cratesTrackIsIn.insert(crateId, trackId);
     }
 
     emit(changed(crateId));
@@ -381,6 +412,7 @@ bool CrateDAO::removeTrackFromCrate(const int trackId, const int crateId) {
 
     emit(trackRemoved(crateId, trackId));
     emit(changed(crateId));
+    m_cratesTrackIsIn.remove(crateId, trackId);
     return true;
 }
 
@@ -401,6 +433,7 @@ bool CrateDAO::removeTracksFromCrate(const QList<int>& ids, const int crateId) {
     }
     foreach (int trackId, ids) {
         emit(trackRemoved(crateId, trackId));
+        m_cratesTrackIsIn.remove(crateId, trackId);
     }
     emit(changed(crateId));
     return true;
@@ -421,4 +454,9 @@ void CrateDAO::removeTracksFromCrates(const QList<int>& ids) {
     // TODO(XXX) should we emit this for all crates?
     // emit(trackRemoved(crateId, trackId));
     // emit(changed(crateId));
+    // remove those tracks from memory-map
+}
+
+bool CrateDAO::isTrackInCrate(const int trackId, const int crateId) {
+    return m_cratesTrackIsIn.contains(crateId, trackId);
 }

src/library/dao/cratedao.h

@@ -6,6 +6,7 @@
 
 #include <QObject>
 #include <QMap>
+#include <QMultiHash>
 #include <QSqlDatabase>
 
 #include "library/dao/dao.h"
@@ -61,6 +62,7 @@ class CrateDAO : public QObject, public virtual DAO {
     bool removeTracksFromCrate(const QList<int>& ids, const int crateId);
     // remove tracks from all crates
     void removeTracksFromCrates(const QList<int>& ids);
+    bool isTrackInCrate(const int trackId, const int crateId);
 
   signals:
     void added(int crateId);
@@ -74,6 +76,7 @@ class CrateDAO : public QObject, public virtual DAO {
 
   private:
     QSqlDatabase& m_database;
+    QMultiHash<int,int> m_cratesTrackIsIn;
     DISALLOW_COPY_AND_ASSIGN(CrateDAO);
 };