Merge pull request #2 from rryan/sidebar-highlight

Some fixes.

build/depends.py

@@ -743,7 +743,6 @@ 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/analysisfeature.h

@@ -16,7 +16,6 @@
 #include "configobject.h"
 #include "treeitemmodel.h"
 #include "dlganalysis.h"
-#include "trackinfoobject.h"
 
 class AnalyserQueue;
 class TrackCollection;
@@ -43,7 +42,6 @@ class AnalysisFeature : public LibraryFeature {
   signals:
     void analysisActive(bool bActive);
     void trackAnalysisStarted(int size);
-    void trackSelected(TrackPointer);
 
   public slots:
     void activate();

src/library/autodj/autodjfeature.h

@@ -19,7 +19,6 @@
 #include "library/libraryfeature.h"
 #include "configobject.h"
 #include "library/treeitemmodel.h"
-#include "trackinfoobject.h"
 
 #ifdef __AUTODJCRATES__
 #include "library/dao/autodjcratesdao.h"
@@ -51,9 +50,6 @@ class AutoDJFeature : public LibraryFeature {
 
     TreeItemModel* getChildModel();
 
-  signals:
-    void trackSelected(TrackPointer);
-
   public slots:
     void activate();
 

src/library/baseplaylistfeature.cpp

@@ -86,9 +86,9 @@ BasePlaylistFeature::BasePlaylistFeature(QObject* parent,
 
     Library* pLibrary = static_cast<Library*>(parent);
     connect(pLibrary, SIGNAL(trackSelected(TrackPointer)),
-                this, SLOT(slotTrackSelected(TrackPointer)));
+            this, SLOT(slotTrackSelected(TrackPointer)));
     connect(pLibrary, SIGNAL(switchToView(const QString&)),
-                this, SLOT(slotResetSelectedTrack()));
+            this, SLOT(slotResetSelectedTrack()));
 }
 
 BasePlaylistFeature::~BasePlaylistFeature() {
@@ -560,6 +560,9 @@ QModelIndex BasePlaylistFeature::constructChildModel(int selected_id) {
 
         // Create the TreeItem whose parent is the invisible root item
         TreeItem* item = new TreeItem(playlist_name, QString::number(playlist_id), this, root);
+        item->setBold(m_pSelectedTrack && m_playlistDao.isTrackInPlaylist(
+            m_pSelectedTrack->getId(), playlist_id));
+
         decorateChild(item, playlist_id);
         data_list.append(item);
     }
@@ -593,18 +596,21 @@ 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();
+    int trackId = pTrack.isNull() ? -1 : pTrack->getId();
+
+    // Set all playlists the track is in bold (or if there is no track selected,
+    // clear all the bolding).
+    int row = 0;
+    for (QList<QPair<int, QString> >::const_iterator it = m_playlistList.begin();
+         it != m_playlistList.end(); ++it, ++row) {
+        int playlistId = it->first;
+        QModelIndex index = m_childModel.index(row, 0);
+
+        bool shouldBold = m_playlistDao.isTrackInPlaylist(trackId, playlistId);
+        m_childModel.setData(index, shouldBold, TreeItemModel::kBoldRole);
+    }
 }
 
 

src/library/baseplaylistfeature.h

@@ -35,9 +35,6 @@ 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>);
@@ -95,14 +92,14 @@ class BasePlaylistFeature : public LibraryFeature {
     TreeItemModel m_childModel;
     TrackPointer m_pSelectedTrack;
 
+  private slots:
+    void slotTrackSelected(TrackPointer pTrack);
+    void slotResetSelectedTrack();
+
   private:
     virtual QString getRootViewHtml() const = 0;
 
     QString m_rootViewName;
-
-  private slots:
-    void slotTrackSelected(TrackPointer pTrack);
-    void slotResetSelectedTrack();
 };
 
 #endif /* BASEPLAYLISTFEATURE_H */

src/library/browse/browsefeature.h

@@ -14,7 +14,6 @@
 #include <QString>
 
 #include "configobject.h"
-#include "trackinfoobject.h"
 #include "library/browse/browsetablemodel.h"
 #include "library/browse/foldertreemodel.h"
 #include "library/libraryfeature.h"
@@ -57,7 +56,6 @@ class BrowseFeature : public LibraryFeature {
     void setRootIndex(const QModelIndex&);
     void requestAddDir(QString);
     void scanLibrary();
-    void trackSelected(TrackPointer);
 
   private:
     QString getRootViewHtml() const;

src/library/cratefeature.cpp

@@ -93,9 +93,9 @@ CrateFeature::CrateFeature(Library* pLibrary,
     constructChildModel(-1);
 
     connect(pLibrary, SIGNAL(trackSelected(TrackPointer)),
-                this, SLOT(slotTrackSelected(TrackPointer)));
+            this, SLOT(slotTrackSelected(TrackPointer)));
     connect(pLibrary, SIGNAL(switchToView(const QString&)),
-                this, SLOT(slotResetSelectedTrack()));
+            this, SLOT(slotResetSelectedTrack()));
 }
 
 CrateFeature::~CrateFeature() {
@@ -120,11 +120,6 @@ 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) {
@@ -520,6 +515,8 @@ QModelIndex CrateFeature::constructChildModel(int selected_id) {
         TreeItem* item = new TreeItem(crate_name, QString::number(crate_id), this, root);
         bool locked = m_crateDao.isCrateLocked(crate_id);
         item->setIcon(locked ? QIcon(":/images/library/ic_library_locked.png") : QIcon());
+        item->setBold(m_pSelectedTrack && m_crateDao.isTrackInCrate(
+            m_pSelectedTrack->getId(), crate_id));
         data_list.append(item);
     }
 
@@ -715,16 +712,23 @@ QString CrateFeature::getRootViewHtml() const {
     return html;
 }
 
-TrackPointer CrateFeature::getSelectedTrack() {
-    return m_pSelectedTrack;
-}
-
 void CrateFeature::slotTrackSelected(TrackPointer pTrack) {
     m_pSelectedTrack = pTrack;
-    m_childModel.triggerRepaint();
+    int trackId = pTrack.isNull() ? -1 : pTrack->getId();
+
+    // Set all crates the track is in bold (or if there is no track selected,
+    // clear all the bolding).
+    int row = 0;
+    for (QList<QPair<int, QString> >::const_iterator it = m_crateList.begin();
+         it != m_crateList.end(); ++it, ++row) {
+        int crateId = it->first;
+        QModelIndex index = m_childModel.index(row, 0);
+
+        bool shouldBold = m_crateDao.isTrackInCrate(trackId, crateId);
+        m_childModel.setData(index, shouldBold, TreeItemModel::kBoldRole);
+    }
 }
 
 void CrateFeature::slotResetSelectedTrack() {
     slotTrackSelected(TrackPointer());
 }
-

src/library/cratefeature.h

@@ -40,9 +40,6 @@ class CrateFeature : public LibraryFeature {
 
     TreeItemModel* getChildModel();
 
-    TrackPointer getSelectedTrack();
-    virtual bool isTrackInChildModel(const int trackId, const QVariant dataPath);
-
   signals:
     void analyzeTracks(QList<int>);
 
@@ -65,6 +62,10 @@ class CrateFeature : public LibraryFeature {
     void slotCrateTableRenamed(int playlistId, QString a_strName);
     void htmlLinkClicked(const QUrl& link);
 
+  private slots:
+    void slotTrackSelected(TrackPointer pTrack);
+    void slotResetSelectedTrack();
+
   private:
     QString getRootViewHtml() const;
     QModelIndex constructChildModel(int selected_id);
@@ -91,10 +92,6 @@ class CrateFeature : public LibraryFeature {
     TreeItemModel m_childModel;
     ConfigObject<ConfigValue>* m_pConfig;
     TrackPointer m_pSelectedTrack;
-
-   private slots:
-       void slotTrackSelected(TrackPointer pTrack);
-       void slotResetSelectedTrack();
 };
 
 #endif /* CRATEFEATURE_H */

src/library/libraryfeature.h

@@ -58,14 +58,6 @@ class LibraryFeature : public QObject {
     virtual void bindWidget(WLibrary* /* libraryWidget */,
                             MixxxKeyboard* /* keyboard */) {}
     virtual TreeItemModel* getChildModel() = 0;
-    virtual TrackPointer getSelectedTrack() {
-        return TrackPointer();
-    }
-    virtual bool isTrackInChildModel(const int trackId, const QVariant dataPath) {
-        Q_UNUSED(trackId);
-        Q_UNUSED(dataPath);
-        return false;
-    }
 
   public slots:
     // called when you single click on the root item
@@ -103,6 +95,7 @@ class LibraryFeature : public QObject {
     void featureSelect(LibraryFeature* pFeature, const QModelIndex& index);
     // emit this signal to enable/disable the cover art widget
     void enableCoverArtDisplay(bool);
+    void trackSelected(TrackPointer pTrack);
 };
 
 #endif /* LIBRARYFEATURE_H */

src/library/mixxxlibraryfeature.h

@@ -18,7 +18,6 @@
 #include "library/dao/trackdao.h"
 #include "treeitemmodel.h"
 #include "configobject.h"
-#include "trackinfoobject.h"
 
 class DlgHidden;
 class DlgMissing;
@@ -42,8 +41,6 @@ class MixxxLibraryFeature : public LibraryFeature {
     TreeItemModel* getChildModel();
     void bindWidget(WLibrary* pLibrary,
                     MixxxKeyboard* pKeyboard);
-  signals:
-    void trackSelected(TrackPointer);
 
   public slots:
     void activate();

src/library/sidebarmodel.cpp

@@ -197,9 +197,13 @@ QVariant SidebarModel::data(const QModelIndex& index, int role) const {
                 } else {
                     return tree_item->dataPath();
                 }
-            } else if (role == Qt::UserRole) {
+            } else if (role == TreeItemModel::kDataPathRole) {
                 // We use Qt::UserRole to ask for the datapath.
                 return tree_item->dataPath();
+            } else if (role == Qt::FontRole) {
+                QFont font;
+                font.setBold(tree_item->isBold());
+                return font;
             } else if (role == Qt::DecorationRole) {
                 return tree_item->getIcon();
             }

src/library/treeitem.cpp

@@ -35,13 +35,15 @@ TreeItem::TreeItem(const QString &data, const QString &data_path,
     m_dataPath = data_path;
     m_parentItem = parent;
     m_feature = feature;
+    m_bold = false;
 }
 
 TreeItem::TreeItem() {
     m_data = "$root";
     m_dataPath = "$root";
     m_parentItem = NULL;
     m_feature = NULL;
+    m_bold = false;
 }
 
 TreeItem::~TreeItem() {

src/library/treeitem.h

@@ -49,6 +49,14 @@ class TreeItem {
     /* Returns the Library feature object to which an item belongs to */
     LibraryFeature* getFeature();
 
+    void setBold(bool bold) {
+        m_bold = bold;
+    }
+    bool isBold() const {
+        return m_bold;
+    }
+
+
     void setIcon(const QIcon& icon);
     QIcon getIcon();
 
@@ -57,6 +65,7 @@ class TreeItem {
     QString m_dataPath;
     QString m_data;
     LibraryFeature* m_feature;
+    bool m_bold;
 
     TreeItem *m_parentItem;
     QIcon m_icon;