diff --git a/src/globalsearch/digitallyimportedsearchprovider.cpp b/src/globalsearch/digitallyimportedsearchprovider.cpp index 44fd98fd1..f211e8f8e 100644 --- a/src/globalsearch/digitallyimportedsearchprovider.cpp +++ b/src/globalsearch/digitallyimportedsearchprovider.cpp @@ -52,6 +52,4 @@ void DigitallyImportedSearchProvider::RecreateItems() { SetItems(items); } -void DigitallyImportedSearchProvider::ShowConfig() { - service_->ShowSettingsDialog(); -} +void DigitallyImportedSearchProvider::ShowConfig() { service_->ShowConfig(); } diff --git a/src/internet/core/cloudfilesearchprovider.cpp b/src/internet/core/cloudfilesearchprovider.cpp index 389ca4dcd..56ebc3968 100644 --- a/src/internet/core/cloudfilesearchprovider.cpp +++ b/src/internet/core/cloudfilesearchprovider.cpp @@ -34,7 +34,7 @@ bool CloudFileSearchProvider::IsLoggedIn() { return service_->has_credentials(); } -void CloudFileSearchProvider::ShowConfig() { service_->ShowSettingsDialog(); } +void CloudFileSearchProvider::ShowConfig() { service_->ShowConfig(); } InternetService* CloudFileSearchProvider::internet_service() { return service_; diff --git a/src/internet/core/cloudfileservice.cpp b/src/internet/core/cloudfileservice.cpp index 936353fc6..960a35e16 100644 --- a/src/internet/core/cloudfileservice.cpp +++ b/src/internet/core/cloudfileservice.cpp @@ -84,7 +84,7 @@ void CloudFileService::LazyPopulate(QStandardItem* item) { switch (item->data(InternetModel::Role_Type).toInt()) { case InternetModel::Type_Service: if (!has_credentials()) { - ShowSettingsDialog(); + ShowConfig(); } else { Connect(); } @@ -103,8 +103,7 @@ void CloudFileService::PopulateContextMenu() { tr("Cover Manager"), this, SLOT(ShowCoverManager())); context_menu_->addSeparator(); context_menu_->addAction(IconLoader::Load("configure", IconLoader::Base), - tr("Configure..."), this, - SLOT(ShowSettingsDialog())); + tr("Configure..."), this, SLOT(ShowConfig())); } void CloudFileService::ShowCoverManager() { @@ -122,7 +121,7 @@ void CloudFileService::AddToPlaylist(QMimeData* mime) { QModelIndex()); } -void CloudFileService::ShowSettingsDialog() { +void CloudFileService::ShowConfig() { app_->OpenSettingsDialogAtPage(settings_page_); } diff --git a/src/internet/core/cloudfileservice.h b/src/internet/core/cloudfileservice.h index bf2d508e7..7b9db223e 100644 --- a/src/internet/core/cloudfileservice.h +++ b/src/internet/core/cloudfileservice.h @@ -53,7 +53,7 @@ class CloudFileService : public InternetService { void AllIndexingTasksFinished(); public slots: - void ShowSettingsDialog(); + void ShowConfig() override; protected: virtual void Connect() = 0; diff --git a/src/internet/digitally/digitallyimportedservicebase.cpp b/src/internet/digitally/digitallyimportedservicebase.cpp index 9626f2f42..a4f6105c1 100644 --- a/src/internet/digitally/digitallyimportedservicebase.cpp +++ b/src/internet/digitally/digitallyimportedservicebase.cpp @@ -127,7 +127,7 @@ void DigitallyImportedServiceBase::PopulateStreams() { if (root_->hasChildren()) root_->removeRows(0, root_->rowCount()); if (!is_premium_account()) { - ShowSettingsDialog(); + ShowConfig(); return; } @@ -180,8 +180,7 @@ void DigitallyImportedServiceBase::ShowContextMenu(const QPoint& global_pos) { SLOT(ForceRefreshStreams())); context_menu_->addSeparator(); context_menu_->addAction(IconLoader::Load("configure", IconLoader::Base), - tr("Configure..."), this, - SLOT(ShowSettingsDialog())); + tr("Configure..."), this, SLOT(ShowConfig())); } context_menu_->popup(global_pos); @@ -204,7 +203,7 @@ void DigitallyImportedServiceBase::LoadPlaylistFinished(QNetworkReply* reply) { } } -void DigitallyImportedServiceBase::ShowSettingsDialog() { +void DigitallyImportedServiceBase::ShowConfig() { app_->OpenSettingsDialogAtPage(SettingsDialog::Page_DigitallyImported); } diff --git a/src/internet/digitally/digitallyimportedservicebase.h b/src/internet/digitally/digitallyimportedservicebase.h index 88e116c1a..943e11d6b 100644 --- a/src/internet/digitally/digitallyimportedservicebase.h +++ b/src/internet/digitally/digitallyimportedservicebase.h @@ -65,7 +65,7 @@ class DigitallyImportedServiceBase : public InternetService { Song* song) const; public slots: - void ShowSettingsDialog(); + void ShowConfig() override; signals: void StreamsChanged(); diff --git a/src/internet/dropbox/dropboxservice.cpp b/src/internet/dropbox/dropboxservice.cpp index 839746d22..086e824b5 100644 --- a/src/internet/dropbox/dropboxservice.cpp +++ b/src/internet/dropbox/dropboxservice.cpp @@ -76,7 +76,7 @@ void DropboxService::Connect() { if (has_credentials()) { RequestFileList(); } else { - ShowSettingsDialog(); + ShowConfig(); } } diff --git a/src/internet/googledrive/googledriveservice.cpp b/src/internet/googledrive/googledriveservice.cpp index 1fe9c3f5f..6cefa0eb8 100644 --- a/src/internet/googledrive/googledriveservice.cpp +++ b/src/internet/googledrive/googledriveservice.cpp @@ -226,8 +226,7 @@ void GoogleDriveService::PopulateContextMenu() { context_menu_->addAction(IconLoader::Load("download", IconLoader::Base), tr("Cover Manager"), this, SLOT(ShowCoverManager())); context_menu_->addAction(IconLoader::Load("configure", IconLoader::Base), - tr("Configure..."), this, - SLOT(ShowSettingsDialog())); + tr("Configure..."), this, SLOT(ShowConfig())); } void GoogleDriveService::UpdateContextMenu() { diff --git a/src/internet/seafile/seafileservice.cpp b/src/internet/seafile/seafileservice.cpp index fe828b12a..ba2120518 100644 --- a/src/internet/seafile/seafileservice.cpp +++ b/src/internet/seafile/seafileservice.cpp @@ -218,7 +218,7 @@ void SeafileService::Connect() { if (has_credentials()) { UpdateLibraries(); } else { - ShowSettingsDialog(); + ShowConfig(); } } diff --git a/src/internet/skydrive/skydriveservice.cpp b/src/internet/skydrive/skydriveservice.cpp index 40ec39099..7eaafac6b 100644 --- a/src/internet/skydrive/skydriveservice.cpp +++ b/src/internet/skydrive/skydriveservice.cpp @@ -219,8 +219,7 @@ void SkydriveService::PopulateContextMenu() { tr("Cover Manager"), this, SLOT(ShowCoverManager())); context_menu_->addSeparator(); context_menu_->addAction(IconLoader::Load("configure", IconLoader::Base), - tr("Configure..."), this, - SLOT(ShowSettingsDialog())); + tr("Configure..."), this, SLOT(ShowConfig())); } void SkydriveService::UpdateContextMenu() {