Differential D21525 Diff 62357 src/models/viewsmodel.cpp

Changeset View

Standalone View

View Options

src/models/viewsmodel.cpp

Show All 33 Lines29public:
34 34​
35 QHash<ViewManager::ViewsType, QUrl> mIcons; 35​ QHash<ViewManager::ViewsType, QUrl> mIcons;
36 36​
37 ViewsModelPrivate() 37​ ViewsModelPrivate()
38 { 38​ {
39 mTypes = {ViewManager::Context, ViewManager::RecentlyPlayedTracks, 39​ mTypes = {ViewManager::Context, ViewManager::RecentlyPlayedTracks,
40 ViewManager::FrequentlyPlayedTracks, ViewManager::AllAlbums, 40​ ViewManager::FrequentlyPlayedTracks, ViewManager::AllAlbums,
41 ViewManager::AllArtists, ViewManager::AllTracks, 41​ ViewManager::AllArtists, ViewManager::AllTracks,
42 ViewManager::AllGenres, ViewManager::FilesBrowser}; 42​ ViewManager::AllGenres, ViewManager::FilesBrowser,
43​ ViewManager::RadiosBrowser};
43 44​
44 mNames = {{ViewManager::Context, {i18nc("Title of the view of the playlist", "Now Playing")}}, 45​ mNames = {{ViewManager::Context, {i18nc("Title of the view of the playlist", "Now Playing")}},
45 {ViewManager::RecentlyPlayedTracks, {i18nc("Title of the view of recently played tracks", "Recently Played")}}, 46​ {ViewManager::RecentlyPlayedTracks, {i18nc("Title of the view of recently played tracks", "Recently Played")}},
46 {ViewManager::FrequentlyPlayedTracks, {i18nc("Title of the view of frequently played tracks", "Frequently Played")}}, 47​ {ViewManager::FrequentlyPlayedTracks, {i18nc("Title of the view of frequently played tracks", "Frequently Played")}},
47 {ViewManager::AllAlbums, {i18nc("Title of the view of all albums", "Albums")}}, 48​ {ViewManager::AllAlbums, {i18nc("Title of the view of all albums", "Albums")}},
48 {ViewManager::AllArtists, {i18nc("Title of the view of all artists", "Artists")}}, 49​ {ViewManager::AllArtists, {i18nc("Title of the view of all artists", "Artists")}},
49 {ViewManager::AllTracks, {i18nc("Title of the view of all tracks", "Tracks")}}, 50​ {ViewManager::AllTracks, {i18nc("Title of the view of all tracks", "Tracks")}},
50 {ViewManager::AllGenres, {i18nc("Title of the view of all genres", "Genres")}}, 51​ {ViewManager::AllGenres, {i18nc("Title of the view of all genres", "Genres")}},
51 {ViewManager::FilesBrowser, {i18nc("Title of the file browser view", "Files")}}}; 52​ {ViewManager::FilesBrowser, {i18nc("Title of the file browser view", "Files")}},
53​ {ViewManager::RadiosBrowser, {i18nc("Title of the file radios browser view", "Radios")}}};
54​
astippichUnsubmitted
Done

unnecessary new line

astippich: unnecessary new line
52 55​
53 mIcons = {{ViewManager::Context, QUrl{QStringLiteral("image://icon/view-media-lyrics")}}, 56​ mIcons = {{ViewManager::Context, QUrl{QStringLiteral("image://icon/view-media-lyrics")}},
54 {ViewManager::RecentlyPlayedTracks, QUrl{QStringLiteral("image://icon/media-playlist-play")}}, 57​ {ViewManager::RecentlyPlayedTracks, QUrl{QStringLiteral("image://icon/media-playlist-play")}},
55 {ViewManager::FrequentlyPlayedTracks, QUrl{QStringLiteral("image://icon/amarok_playcount")}}, 58​ {ViewManager::FrequentlyPlayedTracks, QUrl{QStringLiteral("image://icon/amarok_playcount")}},
56 {ViewManager::AllAlbums, QUrl{QStringLiteral("image://icon/view-media-album-cover")}}, 59​ {ViewManager::AllAlbums, QUrl{QStringLiteral("image://icon/view-media-album-cover")}},
57 {ViewManager::AllArtists, QUrl{QStringLiteral("image://icon/view-media-artist")}}, 60​ {ViewManager::AllArtists, QUrl{QStringLiteral("image://icon/view-media-artist")}},
58 {ViewManager::AllTracks, QUrl{QStringLiteral("image://icon/view-media-track")}}, 61​ {ViewManager::AllTracks, QUrl{QStringLiteral("image://icon/view-media-track")}},
59 {ViewManager::AllGenres, QUrl{QStringLiteral("image://icon/view-media-genre")}}, 62​ {ViewManager::AllGenres, QUrl{QStringLiteral("image://icon/view-media-genre")}},
60 {ViewManager::FilesBrowser, QUrl{QStringLiteral("image://icon/document-open-folder")}}}; 63​ {ViewManager::FilesBrowser, QUrl{QStringLiteral("image://icon/document-open-folder")}},
64​ {ViewManager::RadiosBrowser, QUrl{QStringLiteral("image://icon/radio")}}};
65​
astippichUnsubmitted
Done

unnecessary new line

astippich: unnecessary new line
61 } 66​ }
62 67​
63}; 68​};
64 69​
65ViewsModel::ViewsModel(QObject *parent) 70​ViewsModel::ViewsModel(QObject *parent)
66 : QAbstractListModel(parent), d(std::make_unique<ViewsModelPrivate>()) 71​ : QAbstractListModel(parent), d(std::make_unique<ViewsModelPrivate>())
67{ 72​{
68} 73​}
▲ Show 20 Lines • Show All 93 Lines • ▼ Show 20 Line(s)156{
162 case ViewManager::AllArtists: 167​ case ViewManager::AllArtists:
163 return 4; 168​ return 4;
164 case ViewManager::AllTracks: 169​ case ViewManager::AllTracks:
165 return 5; 170​ return 5;
166 case ViewManager::AllGenres: 171​ case ViewManager::AllGenres:
167 return 6; 172​ return 6;
168 case ViewManager::FilesBrowser: 173​ case ViewManager::FilesBrowser:
169 return 7; 174​ return 7;
175​ case ViewManager::RadiosBrowser:
176​ return 8;
170 case ViewManager::OneAlbum: 177​ case ViewManager::OneAlbum:
171 case ViewManager::OneArtist: 178​ case ViewManager::OneArtist:
172 case ViewManager::OneAlbumFromArtist: 179​ case ViewManager::OneAlbumFromArtist:
173 case ViewManager::OneArtistFromGenre: 180​ case ViewManager::OneArtistFromGenre:
174 case ViewManager::OneAlbumFromArtistAndGenre: 181​ case ViewManager::OneAlbumFromArtistAndGenre:
175 case ViewManager::AllArtistsFromGenre: 182​ case ViewManager::AllArtistsFromGenre:
176 break; 183​ break;
177 } 184​ }
Show All 32 Lines