From a2e7173983dc37804a045ab8b4182b3260df312c Mon Sep 17 00:00:00 2001 From: Jonas Kvinge Date: Mon, 28 Jun 2021 00:07:58 +0200 Subject: [PATCH] Rename filter to filter_widget --- src/collection/collectionviewcontainer.cpp | 14 ++++----- src/collection/collectionviewcontainer.h | 2 +- src/core/mainwindow.cpp | 22 +++++++------- .../internetcollectionviewcontainer.cpp | 12 ++++---- .../internetcollectionviewcontainer.h | 2 +- .../internetcollectionviewcontainer.ui | 2 +- src/internet/internetsongsview.cpp | 10 +++---- src/internet/internettabsview.cpp | 30 +++++++++---------- 8 files changed, 47 insertions(+), 47 deletions(-) diff --git a/src/collection/collectionviewcontainer.cpp b/src/collection/collectionviewcontainer.cpp index b255f8e08..8b8107a9c 100644 --- a/src/collection/collectionviewcontainer.cpp +++ b/src/collection/collectionviewcontainer.cpp @@ -32,12 +32,12 @@ CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(parent), ui_(new Ui_CollectionViewContainer) { ui_->setupUi(this); - view()->SetFilter(filter()); + view()->SetFilter(filter_widget()); - QObject::connect(filter(), &CollectionFilterWidget::UpPressed, view(), &CollectionView::UpAndFocus); - QObject::connect(filter(), &CollectionFilterWidget::DownPressed, view(), &CollectionView::DownAndFocus); - QObject::connect(filter(), &CollectionFilterWidget::ReturnPressed, view(), &CollectionView::FilterReturnPressed); - QObject::connect(view(), &CollectionView::FocusOnFilterSignal, filter(), &CollectionFilterWidget::FocusOnFilter); + QObject::connect(filter_widget(), &CollectionFilterWidget::UpPressed, view(), &CollectionView::UpAndFocus); + QObject::connect(filter_widget(), &CollectionFilterWidget::DownPressed, view(), &CollectionView::DownAndFocus); + QObject::connect(filter_widget(), &CollectionFilterWidget::ReturnPressed, view(), &CollectionView::FilterReturnPressed); + QObject::connect(view(), &CollectionView::FocusOnFilterSignal, filter_widget(), &CollectionFilterWidget::FocusOnFilter); ReloadSettings(); @@ -45,8 +45,8 @@ CollectionViewContainer::CollectionViewContainer(QWidget *parent) : QWidget(pare CollectionViewContainer::~CollectionViewContainer() { delete ui_; } CollectionView *CollectionViewContainer::view() const { return ui_->view; } -CollectionFilterWidget *CollectionViewContainer::filter() const { return ui_->filter; } +CollectionFilterWidget *CollectionViewContainer::filter_widget() const { return ui_->filter; } void CollectionViewContainer::ReloadSettings() const { - filter()->ReloadSettings(); + filter_widget()->ReloadSettings(); view()->ReloadSettings(); } diff --git a/src/collection/collectionviewcontainer.h b/src/collection/collectionviewcontainer.h index 9afda56ff..c92ef9a3f 100644 --- a/src/collection/collectionviewcontainer.h +++ b/src/collection/collectionviewcontainer.h @@ -38,7 +38,7 @@ class CollectionViewContainer : public QWidget { explicit CollectionViewContainer(QWidget *parent = nullptr); ~CollectionViewContainer() override; - CollectionFilterWidget *filter() const; + CollectionFilterWidget *filter_widget() const; CollectionView *view() const; void ReloadSettings() const; diff --git a/src/core/mainwindow.cpp b/src/core/mainwindow.cpp index 97d1a8202..2b4fdd3eb 100644 --- a/src/core/mainwindow.cpp +++ b/src/core/mainwindow.cpp @@ -643,17 +643,17 @@ MainWindow::MainWindow(Application *app, std::shared_ptr tray_ic QAction *collection_config_action = new QAction(IconLoader::Load("configure"), tr("Configure collection..."), this); QObject::connect(collection_config_action, &QAction::triggered, this, &MainWindow::ShowCollectionConfig); - collection_view_->filter()->SetSettingsGroup(CollectionSettingsPage::kSettingsGroup); - collection_view_->filter()->SetCollectionModel(app_->collection()->model()); + collection_view_->filter_widget()->SetSettingsGroup(CollectionSettingsPage::kSettingsGroup); + collection_view_->filter_widget()->Init(app_->collection()->model()); QAction *separator = new QAction(this); separator->setSeparator(true); - collection_view_->filter()->AddMenuAction(collection_show_all_); - collection_view_->filter()->AddMenuAction(collection_show_duplicates_); - collection_view_->filter()->AddMenuAction(collection_show_untagged_); - collection_view_->filter()->AddMenuAction(separator); - collection_view_->filter()->AddMenuAction(collection_config_action); + collection_view_->filter_widget()->AddMenuAction(collection_show_all_); + collection_view_->filter_widget()->AddMenuAction(collection_show_duplicates_); + collection_view_->filter_widget()->AddMenuAction(collection_show_untagged_); + collection_view_->filter_widget()->AddMenuAction(separator); + collection_view_->filter_widget()->AddMenuAction(collection_config_action); #ifdef HAVE_SUBSONIC QObject::connect(subsonic_view_->view(), &InternetCollectionView::AddToPlaylistSignal, this, &MainWindow::AddToPlaylist); @@ -2219,7 +2219,7 @@ void MainWindow::ShowInCollection() { if (!songs.isEmpty()) { search = "artist:" + songs.first().artist() + " album:" + songs.first().album(); } - collection_view_->filter()->ShowInCollection(search); + collection_view_->filter_widget()->ShowInCollection(search); } @@ -2701,13 +2701,13 @@ void MainWindow::PlaylistCopyToDevice() { void MainWindow::ChangeCollectionQueryMode(QAction *action) { if (action == collection_show_duplicates_) { - collection_view_->filter()->SetQueryMode(QueryOptions::QueryMode_Duplicates); + collection_view_->filter_widget()->SetQueryMode(QueryOptions::QueryMode_Duplicates); } else if (action == collection_show_untagged_) { - collection_view_->filter()->SetQueryMode(QueryOptions::QueryMode_Untagged); + collection_view_->filter_widget()->SetQueryMode(QueryOptions::QueryMode_Untagged); } else { - collection_view_->filter()->SetQueryMode(QueryOptions::QueryMode_All); + collection_view_->filter_widget()->SetQueryMode(QueryOptions::QueryMode_All); } } diff --git a/src/internet/internetcollectionviewcontainer.cpp b/src/internet/internetcollectionviewcontainer.cpp index b560e9777..ba10c2893 100644 --- a/src/internet/internetcollectionviewcontainer.cpp +++ b/src/internet/internetcollectionviewcontainer.cpp @@ -37,12 +37,12 @@ InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent service_(nullptr) { ui_->setupUi(this); - view()->SetFilter(filter()); + view()->SetFilter(filter_widget()); - QObject::connect(filter(), &CollectionFilterWidget::UpPressed, view(), &InternetCollectionView::UpAndFocus); - QObject::connect(filter(), &CollectionFilterWidget::DownPressed, view(), &InternetCollectionView::DownAndFocus); - QObject::connect(filter(), &CollectionFilterWidget::ReturnPressed, view(), &InternetCollectionView::FilterReturnPressed); - QObject::connect(view(), &InternetCollectionView::FocusOnFilterSignal, filter(), &CollectionFilterWidget::FocusOnFilter); + QObject::connect(filter_widget(), &CollectionFilterWidget::UpPressed, view(), &InternetCollectionView::UpAndFocus); + QObject::connect(filter_widget(), &CollectionFilterWidget::DownPressed, view(), &InternetCollectionView::DownAndFocus); + QObject::connect(filter_widget(), &CollectionFilterWidget::ReturnPressed, view(), &InternetCollectionView::FilterReturnPressed); + QObject::connect(view(), &InternetCollectionView::FocusOnFilterSignal, filter_widget(), &CollectionFilterWidget::FocusOnFilter); ui_->progressbar->hide(); @@ -53,7 +53,7 @@ InternetCollectionViewContainer::InternetCollectionViewContainer(QWidget *parent InternetCollectionViewContainer::~InternetCollectionViewContainer() { delete ui_; } void InternetCollectionViewContainer::ReloadSettings() const { - filter()->ReloadSettings(); + filter_widget()->ReloadSettings(); view()->ReloadSettings(); } diff --git a/src/internet/internetcollectionviewcontainer.h b/src/internet/internetcollectionviewcontainer.h index 5e1e5c356..d63eaf8e5 100644 --- a/src/internet/internetcollectionviewcontainer.h +++ b/src/internet/internetcollectionviewcontainer.h @@ -51,7 +51,7 @@ class InternetCollectionViewContainer : public QWidget { QWidget *help_page() const { return ui_->help_page; } QWidget *internetcollection_page() const { return ui_->internetcollection_page; } InternetCollectionView *view() const { return ui_->view; } - CollectionFilterWidget *filter() const { return ui_->filter; } + CollectionFilterWidget *filter_widget() const { return ui_->filter_widget; } QPushButton *button_refresh() const { return ui_->refresh; } QPushButton *button_close() const { return ui_->close; } QPushButton *button_abort() const { return ui_->abort; } diff --git a/src/internet/internetcollectionviewcontainer.ui b/src/internet/internetcollectionviewcontainer.ui index 965413cbb..10ea766fc 100644 --- a/src/internet/internetcollectionviewcontainer.ui +++ b/src/internet/internetcollectionviewcontainer.ui @@ -129,7 +129,7 @@ 0 - + diff --git a/src/internet/internetsongsview.cpp b/src/internet/internetsongsview.cpp index a0fa5b8dc..f0f2bd974 100644 --- a/src/internet/internetsongsview.cpp +++ b/src/internet/internetsongsview.cpp @@ -54,13 +54,13 @@ InternetSongsView::InternetSongsView(Application *app, InternetService *service, ui_->stacked->setCurrentWidget(ui_->internetcollection_page); ui_->view->Init(app_, service_->songs_collection_backend(), service_->songs_collection_model(), false); ui_->view->setModel(service_->songs_collection_sort_model()); - ui_->view->SetFilter(ui_->filter); - ui_->filter->SetSettingsGroup(settings_group); - ui_->filter->SetCollectionModel(service_->songs_collection_model()); + ui_->view->SetFilter(ui_->filter_widget); + ui_->filter_widget->SetSettingsGroup(settings_group); + ui_->filter_widget->Init(service_->songs_collection_model()); QAction *action_configure = new QAction(IconLoader::Load("configure"), tr("Configure %1...").arg(Song::TextForSource(service_->source())), this); QObject::connect(action_configure, &QAction::triggered, this, &InternetSongsView::OpenSettingsDialog); - ui_->filter->AddMenuAction(action_configure); + ui_->filter_widget->AddMenuAction(action_configure); QObject::connect(ui_->view, &InternetCollectionView::GetSongs, this, &InternetSongsView::GetSongs); QObject::connect(ui_->view, &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveSongs); @@ -87,7 +87,7 @@ InternetSongsView::~InternetSongsView() { delete ui_; } void InternetSongsView::ReloadSettings() { - ui_->filter->ReloadSettings(); + ui_->filter_widget->ReloadSettings(); ui_->view->ReloadSettings(); } diff --git a/src/internet/internettabsview.cpp b/src/internet/internettabsview.cpp index 3127e0a59..bb57828da 100644 --- a/src/internet/internettabsview.cpp +++ b/src/internet/internettabsview.cpp @@ -67,11 +67,11 @@ InternetTabsView::InternetTabsView(Application *app, InternetService *service, c ui_->artists_collection->stacked()->setCurrentWidget(ui_->artists_collection->internetcollection_page()); ui_->artists_collection->view()->Init(app_, service_->artists_collection_backend(), service_->artists_collection_model(), true); ui_->artists_collection->view()->setModel(service_->artists_collection_sort_model()); - ui_->artists_collection->view()->SetFilter(ui_->artists_collection->filter()); - ui_->artists_collection->filter()->SetSettingsGroup(settings_group); - ui_->artists_collection->filter()->SetSettingsPrefix("artists"); - ui_->artists_collection->filter()->SetCollectionModel(service_->artists_collection_model()); - ui_->artists_collection->filter()->AddMenuAction(action_configure); + ui_->artists_collection->view()->SetFilter(ui_->artists_collection->filter_widget()); + ui_->artists_collection->filter_widget()->SetSettingsGroup(settings_group); + ui_->artists_collection->filter_widget()->SetSettingsPrefix("artists"); + ui_->artists_collection->filter_widget()->Init(service_->artists_collection_model()); + ui_->artists_collection->filter_widget()->AddMenuAction(action_configure); QObject::connect(ui_->artists_collection->view(), &InternetCollectionView::GetSongs, this, &InternetTabsView::GetArtists); QObject::connect(ui_->artists_collection->view(), &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveArtists); @@ -99,11 +99,11 @@ InternetTabsView::InternetTabsView(Application *app, InternetService *service, c ui_->albums_collection->stacked()->setCurrentWidget(ui_->albums_collection->internetcollection_page()); ui_->albums_collection->view()->Init(app_, service_->albums_collection_backend(), service_->albums_collection_model(), true); ui_->albums_collection->view()->setModel(service_->albums_collection_sort_model()); - ui_->albums_collection->view()->SetFilter(ui_->albums_collection->filter()); - ui_->albums_collection->filter()->SetSettingsGroup(settings_group); - ui_->albums_collection->filter()->SetSettingsPrefix("albums"); - ui_->albums_collection->filter()->SetCollectionModel(service_->albums_collection_model()); - ui_->albums_collection->filter()->AddMenuAction(action_configure); + ui_->albums_collection->view()->SetFilter(ui_->albums_collection->filter_widget()); + ui_->albums_collection->filter_widget()->SetSettingsGroup(settings_group); + ui_->albums_collection->filter_widget()->SetSettingsPrefix("albums"); + ui_->albums_collection->filter_widget()->Init(service_->albums_collection_model()); + ui_->albums_collection->filter_widget()->AddMenuAction(action_configure); QObject::connect(ui_->albums_collection->view(), &InternetCollectionView::GetSongs, this, &InternetTabsView::GetAlbums); QObject::connect(ui_->albums_collection->view(), &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveAlbums); @@ -131,11 +131,11 @@ InternetTabsView::InternetTabsView(Application *app, InternetService *service, c ui_->songs_collection->stacked()->setCurrentWidget(ui_->songs_collection->internetcollection_page()); ui_->songs_collection->view()->Init(app_, service_->songs_collection_backend(), service_->songs_collection_model(), true); ui_->songs_collection->view()->setModel(service_->songs_collection_sort_model()); - ui_->songs_collection->view()->SetFilter(ui_->songs_collection->filter()); - ui_->songs_collection->filter()->SetSettingsGroup(settings_group); - ui_->songs_collection->filter()->SetSettingsPrefix("songs"); - ui_->songs_collection->filter()->SetCollectionModel(service_->songs_collection_model()); - ui_->songs_collection->filter()->AddMenuAction(action_configure); + ui_->songs_collection->view()->SetFilter(ui_->songs_collection->filter_widget()); + ui_->songs_collection->filter_widget()->SetSettingsGroup(settings_group); + ui_->songs_collection->filter_widget()->SetSettingsPrefix("songs"); + ui_->songs_collection->filter_widget()->Init(service_->songs_collection_model()); + ui_->songs_collection->filter_widget()->AddMenuAction(action_configure); QObject::connect(ui_->songs_collection->view(), &InternetCollectionView::GetSongs, this, &InternetTabsView::GetSongs); QObject::connect(ui_->songs_collection->view(), &InternetCollectionView::RemoveSongs, service_, &InternetService::RemoveSongs);