Merge pull request #4037 from Holzhaus/qml-sidebar

Basic QML Sidebar placeholder

res/skins/QMLDemo/Library.qml

@@ -1,15 +1,48 @@
 import "." as Skin
 import Mixxx 0.1 as Mixxx
 import QtQuick 2.12
+import QtQuick.Controls 1.4
 import "Theme"
 
 Item {
     Rectangle {
         color: Theme.deckBackgroundColor
         anchors.fill: parent
 
+        TreeView {
+            id: sidebar
+
+            anchors.top: parent.top
+            anchors.left: parent.left
+            anchors.bottom: parent.bottom
+            anchors.margins: 10
+            width: 250
+            model: Mixxx.Library.getSidebarModel()
+
+            TableViewColumn {
+                title: "Icon"
+                role: "iconName"
+                width: 50
+
+                delegate: Image {
+                    fillMode: Image.PreserveAspectFit
+                    source: styleData.value ? "qrc:///images/library/ic_library_" + styleData.value + ".svg" : ""
+                }
+
+            }
+
+            TableViewColumn {
+                title: "Title"
+                role: "display"
+            }
+
+        }
+
         ListView {
-            anchors.fill: parent
+            anchors.top: parent.top
+            anchors.left: sidebar.right
+            anchors.right: parent.right
+            anchors.bottom: parent.bottom
             anchors.margins: 10
             clip: true
             model: Mixxx.Library.model

src/library/library.h

@@ -76,6 +76,11 @@ class Library: public QObject {
     /// Needed for exposing models to QML
     LibraryTableModel* trackTableModel() const;
 
+    /// Needed for exposing sidebar to QML
+    SidebarModel* sidebarModel() const {
+        return m_pSidebarModel.get();
+    }
+
     int getTrackTableRowHeight() const {
         return m_iTrackTableRowHeight;
     }

src/library/sidebarmodel.cpp

@@ -18,6 +18,13 @@ namespace {
 // been chosen as a compromise between usability and responsiveness.
 const int kPressedUntilClickedTimeoutMillis = 300;
 
+const QHash<int, QByteArray> kRoleNames = {
+        // Only roles that are useful in QML are added here.
+        {Qt::DisplayRole, "display"},
+        {Qt::ToolTipRole, "tooltip"},
+        {SidebarModel::IconNameRole, "iconName"},
+};
+
 } // anonymous namespace
 
 SidebarModel::SidebarModel(
@@ -270,6 +277,10 @@ QVariant SidebarModel::data(const QModelIndex& index, int role) const {
     }
 }
 
+QHash<int, QByteArray> SidebarModel::roleNames() const {
+    return kRoleNames;
+}
+
 void SidebarModel::startPressedUntilClickedTimer(const QModelIndex& pressedIndex) {
     m_pressedIndex = pressedIndex;
     m_pressedUntilClickedTimer->start(kPressedUntilClickedTimeoutMillis);

src/library/sidebarmodel.h

@@ -38,6 +38,7 @@ class SidebarModel : public QAbstractItemModel {
     int columnCount(const QModelIndex& parent = QModelIndex()) const override;
     QVariant data(const QModelIndex& index,
                   int role = Qt::DisplayRole) const override;
+    QHash<int, QByteArray> roleNames() const override;
     bool dropAccept(const QModelIndex& index, const QList<QUrl>& urls, QObject* pSource);
     bool dragMoveAccept(const QModelIndex& index, const QUrl& url);
     bool hasChildren(const QModelIndex& parent = QModelIndex()) const override;

src/skin/qml/qmllibraryproxy.cpp

@@ -3,6 +3,7 @@
 #include <QAbstractItemModel>
 
 #include "library/library.h"
+#include "library/sidebarmodel.h"
 
 namespace mixxx {
 namespace skin {
@@ -14,6 +15,10 @@ QmlLibraryProxy::QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* par
           m_pModel(make_parented<QmlLibraryTrackListModel>(m_pLibrary->trackTableModel(), this)) {
 }
 
+QAbstractItemModel* QmlLibraryProxy::getSidebarModel() {
+    return m_pLibrary->sidebarModel();
+}
+
 } // namespace qml
 } // namespace skin
 } // namespace mixxx

src/skin/qml/qmllibraryproxy.h

@@ -6,6 +6,9 @@
 #include "util/parented_ptr.h"
 
 class Library;
+class SidebarModel;
+
+QT_FORWARD_DECLARE_CLASS(QAbstractItemModel);
 
 namespace mixxx {
 namespace skin {
@@ -20,6 +23,8 @@ class QmlLibraryProxy : public QObject {
   public:
     explicit QmlLibraryProxy(std::shared_ptr<Library> pLibrary, QObject* parent = nullptr);
 
+    Q_INVOKABLE QAbstractItemModel* getSidebarModel();
+
   private:
     std::shared_ptr<Library> m_pLibrary;
     parented_ptr<QmlLibraryTrackListModel> m_pModel;