Change defaults for Tidal

src/settings/tidalsettingspage.cpp

@@ -88,7 +88,7 @@ void TidalSettingsPage::Load() {
 
   s.beginGroup(kSettingsGroup);
   ui_->enable->setChecked(s.value("enabled", false).toBool());
-  ui_->oauth->setChecked(s.value("oauth", false).toBool());
+  ui_->oauth->setChecked(s.value("oauth", true).toBool());
 
   ui_->client_id->setText(s.value("client_id").toString());
   ui_->api_token->setText(s.value("api_token").toString());
@@ -105,7 +105,7 @@ void TidalSettingsPage::Load() {
   ui_->songssearchlimit->setValue(s.value("songssearchlimit", 10).toInt());
   ui_->checkbox_fetchalbums->setChecked(s.value("fetchalbums", false).toBool());
   ui_->checkbox_download_album_covers->setChecked(s.value("downloadalbumcovers", true).toBool());
-  dialog()->ComboBoxLoadFromSettings(s, ui_->coversize, "coversize", "320x320");
+  dialog()->ComboBoxLoadFromSettings(s, ui_->coversize, "coversize", "640x640");
 
   StreamUrlMethod stream_url = static_cast<StreamUrlMethod>(s.value("streamurl").toInt());
   int i = ui_->streamurl->findData(stream_url);
@@ -158,8 +158,16 @@ void TidalSettingsPage::LoginClicked() {
     emit Authorize(ui_->client_id->text());
   }
   else {
-    if (ui_->api_token->text().isEmpty() || ui_->username->text().isEmpty() || ui_->password->text().isEmpty()) {
-      QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing API token, username or password."));
+    if (ui_->api_token->text().isEmpty()) {
+      QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing API token."));
+      return;
+    }
+    if (ui_->username->text().isEmpty()) {
+      QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing username."));
+      return;
+    }
+    if (ui_->password->text().isEmpty()) {
+      QMessageBox::critical(this, tr("Configuration incomplete"), tr("Missing password."));
       return;
     }
     emit Login(ui_->api_token->text(), ui_->username->text(), ui_->password->text());

src/settings/tidalsettingspage.ui

@@ -7,7 +7,7 @@
     <x>0</x>
     <y>0</y>
     <width>472</width>
-    <height>912</height>
+    <height>853</height>
    </rect>
   </property>
   <property name="windowTitle">

src/tidal/tidalbaserequest.h

@@ -57,7 +57,7 @@ class TidalBaseRequest : public QObject {
     QueryType_StreamURL,
   };
 
-  TidalBaseRequest(TidalService *service, NetworkAccessManager *network, QObject *parent);
+  explicit TidalBaseRequest(TidalService *service, NetworkAccessManager *network, QObject *parent);
 
   typedef QPair<QString, QString> Param;
   typedef QList<Param> ParamList;

src/tidal/tidalfavoriterequest.h

@@ -38,7 +38,7 @@ class TidalFavoriteRequest : public TidalBaseRequest {
   Q_OBJECT
 
  public:
-  TidalFavoriteRequest(TidalService *service, NetworkAccessManager *network, QObject *parent);
+  explicit TidalFavoriteRequest(TidalService *service, NetworkAccessManager *network, QObject *parent);
   ~TidalFavoriteRequest() override;
 
   enum FavoriteType {

src/tidal/tidalrequest.h

@@ -51,7 +51,7 @@ class TidalRequest : public TidalBaseRequest {
 
  public:
 
-  TidalRequest(TidalService *service, TidalUrlHandler *url_handler, Application *app, NetworkAccessManager *network, QueryType type, QObject *parent);
+  explicit TidalRequest(TidalService *service, TidalUrlHandler *url_handler, Application *app, NetworkAccessManager *network, QueryType type, QObject *parent);
   ~TidalRequest() override;
 
   void ReloadSettings();

src/tidal/tidalservice.cpp

@@ -264,7 +264,7 @@ void TidalService::ReloadSettings() {
   s.beginGroup(TidalSettingsPage::kSettingsGroup);
 
   enabled_ = s.value("enabled", false).toBool();
-  oauth_ = s.value("oauth", false).toBool();
+  oauth_ = s.value("oauth", true).toBool();
   client_id_ = s.value("client_id").toString();
   api_token_ = s.value("api_token").toString();
 
@@ -279,7 +279,7 @@ void TidalService::ReloadSettings() {
   albumssearchlimit_ = s.value("albumssearchlimit", 10).toInt();
   songssearchlimit_ = s.value("songssearchlimit", 10).toInt();
   fetchalbums_ = s.value("fetchalbums", false).toBool();
-  coversize_ = s.value("coversize", "320x320").toString();
+  coversize_ = s.value("coversize", "640x640").toString();
   download_album_covers_ = s.value("downloadalbumcovers", true).toBool();
   stream_url_method_ = static_cast<TidalSettingsPage::StreamUrlMethod>(s.value("streamurl").toInt());
 

src/tidal/tidalservice.h

@@ -59,7 +59,7 @@ class TidalService : public InternetService {
   Q_OBJECT
 
  public:
-  TidalService(Application *app, QObject *parent);
+  explicit TidalService(Application *app, QObject *parent);
   ~TidalService() override;
 
   static const Song::Source kSource;
@@ -121,8 +121,6 @@ class TidalService : public InternetService {
     QueryType_SearchSongs,
   };
 
- signals:
-
  public slots:
   void ShowConfig() override;
   void TryLogin();

src/tidal/tidalstreamurlrequest.h

@@ -41,7 +41,7 @@ class TidalStreamURLRequest : public TidalBaseRequest {
   Q_OBJECT
 
  public:
-  TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, QObject *parent);
+  explicit TidalStreamURLRequest(TidalService *service, NetworkAccessManager *network, const QUrl &original_url, QObject *parent);
   ~TidalStreamURLRequest() override;
 
   void GetStreamURL();

src/tidal/tidalurlhandler.h

@@ -37,7 +37,7 @@ class TidalUrlHandler : public UrlHandler {
   Q_OBJECT
 
  public:
-  TidalUrlHandler(Application *app, TidalService *service);
+  explicit TidalUrlHandler(Application *app, TidalService *service);
 
   QString scheme() const override { return service_->url_scheme(); }
   LoadResult StartLoading(const QUrl &url) override;