dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Formatting

Browse Source
This commit is contained in:
Jonas Kvinge
2021-07-11 02:27:26 +02:00
parent f69e42e520
commit 434b31b932
2 changed files with 9 additions and 8 deletions
Download Patch File Download Diff File Expand all files Collapse all files

11
src/internet/internetsearchmodel.cpp
View File

@@ -44,8 +44,7 @@ InternetSearchModel::InternetSearchModel(InternetService *service, QObject *pare
proxy_(nullptr), proxy_(nullptr),
use_pretty_covers_(true), use_pretty_covers_(true),
artist_icon_(IconLoader::Load("folder-sound")), artist_icon_(IconLoader::Load("folder-sound")),
album_icon_(IconLoader::Load("cdcase")) album_icon_(IconLoader::Load("cdcase")) {
{
group_by_[0] = CollectionModel::GroupBy_AlbumArtist; group_by_[0] = CollectionModel::GroupBy_AlbumArtist;
group_by_[1] = CollectionModel::GroupBy_AlbumDisc; group_by_[1] = CollectionModel::GroupBy_AlbumDisc;
@@ -257,8 +256,11 @@ QStandardItem *InternetSearchModel::BuildContainers(const Song &s, QStandardItem
// Find a container for this level // Find a container for this level
key->group_[level] = display_text + unique_tag; key->group_[level] = display_text + unique_tag;
QStandardItem *container = containers_[*key]; QStandardItem *container = nullptr;
if (!container) { if (containers_.contains(*key)) {
container = containers_[*key];
}
else {
container = new QStandardItem(display_text); container = new QStandardItem(display_text);
container->setData(sort_text, CollectionModel::Role_SortText); container->setData(sort_text, CollectionModel::Role_SortText);
container->setData(group_by_[level], CollectionModel::Role_ContainerType); container->setData(group_by_[level], CollectionModel::Role_ContainerType);
@@ -408,4 +410,3 @@ MimeData *InternetSearchModel::LoadTracks(const InternetSearchView::ResultList &
return mime_data; return mime_data;
} }

6
src/internet/internetsearchview.cpp
View File

@@ -318,9 +318,9 @@ bool InternetSearchView::ResultsContextMenuEvent(QContextMenuEvent *e) {
if (!context_menu_) { if (!context_menu_) {
context_menu_ = new QMenu(this); context_menu_ = new QMenu(this);
context_actions_ << context_menu_->addAction( IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, &InternetSearchView::AddSelectedToPlaylist); context_actions_ << context_menu_->addAction(IconLoader::Load("media-playback-start"), tr("Append to current playlist"), this, &InternetSearchView::AddSelectedToPlaylist);
context_actions_ << context_menu_->addAction( IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, &InternetSearchView::LoadSelected); context_actions_ << context_menu_->addAction(IconLoader::Load("media-playback-start"), tr("Replace current playlist"), this, &InternetSearchView::LoadSelected);
context_actions_ << context_menu_->addAction( IconLoader::Load("document-new"), tr("Open in new playlist"), this, &InternetSearchView::OpenSelectedInNewPlaylist); context_actions_ << context_menu_->addAction(IconLoader::Load("document-new"), tr("Open in new playlist"), this, &InternetSearchView::OpenSelectedInNewPlaylist);
context_menu_->addSeparator(); context_menu_->addSeparator();
context_actions_ << context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, &InternetSearchView::AddSelectedToPlaylistEnqueue); context_actions_ << context_menu_->addAction(IconLoader::Load("go-next"), tr("Queue track"), this, &InternetSearchView::AddSelectedToPlaylistEnqueue);