Refactoring
This commit is contained in:
@@ -38,29 +38,21 @@
|
||||
#include "settingsdialog.h"
|
||||
#include "coverssettingspage.h"
|
||||
#include "ui_coverssettingspage.h"
|
||||
#include "core/application.h"
|
||||
#include "core/iconloader.h"
|
||||
#include "core/settings.h"
|
||||
#include "utilities/coveroptions.h"
|
||||
#include "covermanager/coverproviders.h"
|
||||
#include "covermanager/coverprovider.h"
|
||||
#include "widgets/loginstatewidget.h"
|
||||
#include "constants/coverssettings.h"
|
||||
|
||||
using namespace Qt::Literals::StringLiterals;
|
||||
using namespace CoversSettings;
|
||||
|
||||
const char *CoversSettingsPage::kSettingsGroup = "Covers";
|
||||
const char *CoversSettingsPage::kProviders = "providers";
|
||||
const char *CoversSettingsPage::kTypes = "types";
|
||||
const char *CoversSettingsPage::kSaveType = "save_type";
|
||||
const char *CoversSettingsPage::kSaveFilename = "save_filename";
|
||||
const char *CoversSettingsPage::kSavePattern = "save_pattern";
|
||||
const char *CoversSettingsPage::kSaveOverwrite = "save_overwrite";
|
||||
const char *CoversSettingsPage::kSaveLowercase = "save_lowercase";
|
||||
const char *CoversSettingsPage::kSaveReplaceSpaces = "save_replace_spaces";
|
||||
|
||||
CoversSettingsPage::CoversSettingsPage(SettingsDialog *dialog, QWidget *parent)
|
||||
CoversSettingsPage::CoversSettingsPage(SettingsDialog *dialog, const SharedPtr<CoverProviders> cover_providers, QWidget *parent)
|
||||
: SettingsPage(dialog, parent),
|
||||
ui_(new Ui::CoversSettingsPage),
|
||||
cover_providers_(cover_providers),
|
||||
provider_selected_(false),
|
||||
types_selected_(false) {
|
||||
|
||||
@@ -101,7 +93,7 @@ void CoversSettingsPage::Load() {
|
||||
|
||||
ui_->providers->clear();
|
||||
|
||||
QList<CoverProvider*> cover_providers_sorted = dialog()->app()->cover_providers()->List();
|
||||
QList<CoverProvider*> cover_providers_sorted = cover_providers_->List();
|
||||
std::stable_sort(cover_providers_sorted.begin(), cover_providers_sorted.end(), ProviderCompareOrder);
|
||||
|
||||
for (CoverProvider *provider : std::as_const(cover_providers_sorted)) {
|
||||
@@ -213,7 +205,7 @@ void CoversSettingsPage::Save() {
|
||||
void CoversSettingsPage::ProvidersCurrentItemChanged(QListWidgetItem *item_current, QListWidgetItem *item_previous) {
|
||||
|
||||
if (item_previous) {
|
||||
CoverProvider *provider = dialog()->app()->cover_providers()->ProviderByName(item_previous->text());
|
||||
CoverProvider *provider = cover_providers_->ProviderByName(item_previous->text());
|
||||
if (provider && provider->AuthenticationRequired()) DisconnectAuthentication(provider);
|
||||
}
|
||||
|
||||
@@ -221,7 +213,7 @@ void CoversSettingsPage::ProvidersCurrentItemChanged(QListWidgetItem *item_curre
|
||||
const int row = ui_->providers->row(item_current);
|
||||
ui_->providers_up->setEnabled(row != 0);
|
||||
ui_->providers_down->setEnabled(row != ui_->providers->count() - 1);
|
||||
CoverProvider *provider = dialog()->app()->cover_providers()->ProviderByName(item_current->text());
|
||||
CoverProvider *provider = cover_providers_->ProviderByName(item_current->text());
|
||||
if (provider) {
|
||||
if (provider->AuthenticationRequired()) {
|
||||
if (provider->name() == "Tidal"_L1 && !provider->IsAuthenticated()) {
|
||||
@@ -324,7 +316,7 @@ void CoversSettingsPage::DisconnectAuthentication(CoverProvider *provider) const
|
||||
void CoversSettingsPage::AuthenticateClicked() {
|
||||
|
||||
if (!ui_->providers->currentItem()) return;
|
||||
CoverProvider *provider = dialog()->app()->cover_providers()->ProviderByName(ui_->providers->currentItem()->text());
|
||||
CoverProvider *provider = cover_providers_->ProviderByName(ui_->providers->currentItem()->text());
|
||||
if (!provider) return;
|
||||
ui_->button_authenticate->setEnabled(false);
|
||||
ui_->login_state->SetLoggedIn(LoginStateWidget::State::LoginInProgress);
|
||||
@@ -337,7 +329,7 @@ void CoversSettingsPage::AuthenticateClicked() {
|
||||
void CoversSettingsPage::LogoutClicked() {
|
||||
|
||||
if (!ui_->providers->currentItem()) return;
|
||||
CoverProvider *provider = dialog()->app()->cover_providers()->ProviderByName(ui_->providers->currentItem()->text());
|
||||
CoverProvider *provider = cover_providers_->ProviderByName(ui_->providers->currentItem()->text());
|
||||
if (!provider) return;
|
||||
provider->Deauthenticate();
|
||||
|
||||
|
||||
Reference in New Issue
Block a user