Refactoring
This commit is contained in:
@@ -24,11 +24,10 @@
|
||||
#include <QSettings>
|
||||
#include <QShowEvent>
|
||||
|
||||
#include "core/application.h"
|
||||
#include "core/iconloader.h"
|
||||
#include "core/mimedata.h"
|
||||
#include "core/settings.h"
|
||||
#include "settings/appearancesettingspage.h"
|
||||
#include "constants/appearancesettings.h"
|
||||
|
||||
#include "smartplaylistsviewcontainer.h"
|
||||
#include "smartplaylistsmodel.h"
|
||||
@@ -39,10 +38,23 @@
|
||||
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
|
||||
SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidget *parent)
|
||||
SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(const SharedPtr<Player> player,
|
||||
const SharedPtr<PlaylistManager> playlist_manager,
|
||||
const SharedPtr<CollectionBackend> collection_backend,
|
||||
#ifdef HAVE_MOODBAR
|
||||
const SharedPtr<MoodbarLoader> moodbar_loader,
|
||||
#endif
|
||||
const SharedPtr<CurrentAlbumCoverLoader> current_albumcover_loader,
|
||||
QWidget *parent)
|
||||
: QWidget(parent),
|
||||
ui_(new Ui_SmartPlaylistsViewContainer),
|
||||
app_(app),
|
||||
player_(player),
|
||||
playlist_manager_(playlist_manager),
|
||||
collection_backend_(collection_backend),
|
||||
#ifdef HAVE_MOODBAR
|
||||
moodbar_loader_(moodbar_loader),
|
||||
#endif
|
||||
current_albumcover_loader_(current_albumcover_loader),
|
||||
context_menu_(new QMenu(this)),
|
||||
context_menu_selected_(new QMenu(this)),
|
||||
action_new_smart_playlist_(nullptr),
|
||||
@@ -56,7 +68,7 @@ SmartPlaylistsViewContainer::SmartPlaylistsViewContainer(Application *app, QWidg
|
||||
|
||||
ui_->setupUi(this);
|
||||
|
||||
model_ = new SmartPlaylistsModel(app_->collection_backend(), this);
|
||||
model_ = new SmartPlaylistsModel(collection_backend, this);
|
||||
ui_->view->setModel(model_);
|
||||
|
||||
model_->Init();
|
||||
@@ -111,8 +123,8 @@ void SmartPlaylistsViewContainer::showEvent(QShowEvent *e) {
|
||||
void SmartPlaylistsViewContainer::ReloadSettings() {
|
||||
|
||||
Settings s;
|
||||
s.beginGroup(AppearanceSettingsPage::kSettingsGroup);
|
||||
int iconsize = s.value(AppearanceSettingsPage::kIconSizeLeftPanelButtons, 22).toInt();
|
||||
s.beginGroup(AppearanceSettings::kSettingsGroup);
|
||||
int iconsize = s.value(AppearanceSettings::kIconSizeLeftPanelButtons, 22).toInt();
|
||||
s.endGroup();
|
||||
|
||||
ui_->new_->setIconSize(QSize(iconsize, iconsize));
|
||||
@@ -188,7 +200,14 @@ void SmartPlaylistsViewContainer::AddToPlaylistEnqueueNext() {
|
||||
|
||||
void SmartPlaylistsViewContainer::NewSmartPlaylist() {
|
||||
|
||||
SmartPlaylistWizard *wizard = new SmartPlaylistWizard(app_, app_->collection_backend(), this);
|
||||
SmartPlaylistWizard *wizard = new SmartPlaylistWizard(player_,
|
||||
playlist_manager_,
|
||||
collection_backend_,
|
||||
#ifdef HAVE_MOODBAR
|
||||
moodbar_loader_,
|
||||
#endif
|
||||
current_albumcover_loader_,
|
||||
this);
|
||||
wizard->setAttribute(Qt::WA_DeleteOnClose);
|
||||
QObject::connect(wizard, &SmartPlaylistWizard::accepted, this, &SmartPlaylistsViewContainer::NewSmartPlaylistFinished);
|
||||
|
||||
@@ -200,7 +219,14 @@ void SmartPlaylistsViewContainer::EditSmartPlaylist(const QModelIndex &idx) {
|
||||
|
||||
if (!idx.isValid()) return;
|
||||
|
||||
SmartPlaylistWizard *wizard = new SmartPlaylistWizard(app_, app_->collection_backend(), this);
|
||||
SmartPlaylistWizard *wizard = new SmartPlaylistWizard(player_,
|
||||
playlist_manager_,
|
||||
collection_backend_,
|
||||
#ifdef HAVE_MOODBAR
|
||||
moodbar_loader_,
|
||||
#endif
|
||||
current_albumcover_loader_,
|
||||
this);
|
||||
wizard->setAttribute(Qt::WA_DeleteOnClose);
|
||||
QObject::connect(wizard, &SmartPlaylistWizard::accepted, this, &SmartPlaylistsViewContainer::EditSmartPlaylistFinished);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user