diff --git a/src/main.cpp b/src/main.cpp --- a/src/main.cpp +++ b/src/main.cpp @@ -155,7 +155,6 @@ qmlRegisterType("org.kde.elisa", 1, 0, "MusicStatistics"); qmlRegisterType("org.kde.elisa", 1, 0, "ProgressIndicator"); qmlRegisterType("org.kde.elisa", 1, 0, "MusicListenersManager"); - qmlRegisterType("org.kde.elisa", 1, 0, "AlbumModel"); qmlRegisterType("org.kde.elisa", 1, 0, "AllAlbumsProxyModel"); qmlRegisterType("org.kde.elisa", 1, 0, "AllArtistsProxyModel"); qmlRegisterType("org.kde.elisa", 1, 0, "AllTracksProxyModel"); diff --git a/src/models/singlealbumproxymodel.h b/src/models/singlealbumproxymodel.h --- a/src/models/singlealbumproxymodel.h +++ b/src/models/singlealbumproxymodel.h @@ -24,6 +24,7 @@ #include "abstractmediaproxymodel.h" #include "musicaudiotrack.h" #include "elisautils.h" +#include "albummodel.h" class SingleAlbumProxyModel : public AbstractMediaProxyModel { @@ -47,6 +48,8 @@ void replaceAndPlayOfPlayList(); + void loadAlbumData(qulonglong databaseId); + protected: bool filterAcceptsRow(int source_row, const QModelIndex &source_parent) const override; diff --git a/src/models/singlealbumproxymodel.cpp b/src/models/singlealbumproxymodel.cpp --- a/src/models/singlealbumproxymodel.cpp +++ b/src/models/singlealbumproxymodel.cpp @@ -96,4 +96,12 @@ }); } +void SingleAlbumProxyModel::loadAlbumData(qulonglong databaseId) +{ + AlbumModel *albumSourceModel = qobject_cast(this->sourceModel()); + if(albumSourceModel) { + albumSourceModel->loadAlbumData(databaseId); + } +} + #include "moc_singlealbumproxymodel.cpp" diff --git a/src/qml/ElisaMainWindow.qml b/src/qml/ElisaMainWindow.qml --- a/src/qml/ElisaMainWindow.qml +++ b/src/qml/ElisaMainWindow.qml @@ -452,7 +452,7 @@ mainTitle: i18nc("Title of the view of all albums", "Albums") onOpen: { - elisa.singleAlbumProxyModel.sourceModel.loadAlbumData(databaseId) + elisa.singleAlbumProxyModel.loadAlbumData(databaseId) localAlbums.stackView.push(albumView, { stackView: localAlbums.stackView, albumName: innerMainTitle, @@ -866,7 +866,7 @@ isSubPage: true onOpen: { - elisa.singleAlbumProxyModel.sourceModel.loadAlbumData(databaseId) + elisa.singleAlbumProxyModel.loadAlbumData(databaseId) localArtists.stackView.push(albumView, { stackView: localArtists.stackView, albumName: innerMainTitle, diff --git a/src/qml/MediaAlbumView.qml b/src/qml/MediaAlbumView.qml --- a/src/qml/MediaAlbumView.qml +++ b/src/qml/MediaAlbumView.qml @@ -39,11 +39,6 @@ signal goBack(); signal filterViewChanged(string filterState) - function loadAlbumData(id) - { - contentModel.sourceModel.loadAlbumData(id) - } - SystemPalette { id: myPalette colorGroup: SystemPalette.Active