Address code review feedback: remove const_cast and document scaling formula

Co-authored-by: jonaski <10343810+jonaski@users.noreply.github.com>

.github/workflows/build.yml

@@ -739,18 +739,12 @@ jobs:
       with:
         fetch-depth: 0
         submodules: recursive
-    - name: Free disk space
-      run: |
-        df -h
-        sudo rm -rf /usr/share/dotnet /usr/local/lib/android /opt/ghc
-        sudo apt-get clean
-        df -h
     - name: Build FreeBSD
       id: build-freebsd
-      uses: vmactions/freebsd-vm@v1.3.2
+      uses: vmactions/freebsd-vm@v1.3.0
       with:
         usesh: true
-        mem: 8192
+        mem: 4096
         prepare: pkg install -y git cmake pkgconf boost-libs alsa-lib glib qt6-base qt6-tools sqlite gstreamer1 gstreamer1-plugins chromaprint libebur128 taglib libcdio libmtp gdk-pixbuf2 libgpod fftw3 icu kdsingleapplication googletest pulseaudio sparsehash rapidjson
         run: |
           set -e
@@ -772,7 +766,7 @@ jobs:
         submodules: recursive
     - name: Build OpenBSD
       id: build-openbsd
-      uses: vmactions/openbsd-vm@v1.2.9
+      uses: vmactions/openbsd-vm@v1.2.5
       with:
         usesh: true
         mem: 4096

CMakeLists.txt

@@ -834,12 +834,6 @@ set(SOURCES
   src/device/devicestatefiltermodel.cpp
   src/device/deviceviewcontainer.cpp
   src/device/deviceview.cpp
-
-  src/artistbio/artistbioview.cpp
-  src/artistbio/artistbiofetcher.cpp
-  src/artistbio/artistbioprovider.cpp
-  src/artistbio/lastfmartistbio.cpp
-  src/artistbio/wikipediaartistbio.cpp
 )
 
 set(HEADERS
@@ -1128,12 +1122,6 @@ set(HEADERS
   src/device/devicestatefiltermodel.h
   src/device/deviceviewcontainer.h
   src/device/deviceview.h
-
-  src/artistbio/artistbiofetcher.h
-  src/artistbio/artistbioprovider.h
-  src/artistbio/artistbioview.h
-  src/artistbio/lastfmartistbio.h
-  src/artistbio/wikipediaartistbio.h
 )
 
 set(UI

data/data.qrc

@@ -15,7 +15,6 @@
         <file>schema/schema-21.sql</file>
         <file>schema/device-schema.sql</file>
         <file>style/strawberry.css</file>
-        <file>style/artistbio.css</file>
         <file>style/smartplaylistsearchterm.css</file>
         <file>html/oauthsuccess.html</file>
         <file>pictures/strawberry.png</file>

data/icons.qrc

@@ -98,7 +98,6 @@
         <file>icons/128x128/somafm.png</file>
         <file>icons/128x128/radioparadise.png</file>
         <file>icons/128x128/musicbrainz.png</file>
-        <file>icons/128x128/guitar.png</file>
         <file>icons/64x64/albums.png</file>
         <file>icons/64x64/alsa.png</file>
         <file>icons/64x64/application-exit.png</file>
@@ -198,7 +197,6 @@
         <file>icons/64x64/somafm.png</file>
         <file>icons/64x64/radioparadise.png</file>
         <file>icons/64x64/musicbrainz.png</file>
-        <file>icons/64x64/guitar.png</file>
         <file>icons/48x48/albums.png</file>
         <file>icons/48x48/alsa.png</file>
         <file>icons/48x48/application-exit.png</file>
@@ -302,7 +300,6 @@
         <file>icons/48x48/somafm.png</file>
         <file>icons/48x48/radioparadise.png</file>
         <file>icons/48x48/musicbrainz.png</file>
-        <file>icons/48x48/guitar.png</file>
         <file>icons/32x32/albums.png</file>
         <file>icons/32x32/alsa.png</file>
         <file>icons/32x32/application-exit.png</file>
@@ -406,7 +403,6 @@
         <file>icons/32x32/somafm.png</file>
         <file>icons/32x32/radioparadise.png</file>
         <file>icons/32x32/musicbrainz.png</file>
-        <file>icons/32x32/guitar.png</file>
         <file>icons/22x22/albums.png</file>
         <file>icons/22x22/alsa.png</file>
         <file>icons/22x22/application-exit.png</file>
@@ -510,6 +506,5 @@
         <file>icons/22x22/somafm.png</file>
         <file>icons/22x22/radioparadise.png</file>
         <file>icons/22x22/musicbrainz.png</file>
-        <file>icons/22x22/guitar.png</file>
     </qresource>
 </RCC>

data/style/artistbio.css

@@ -1,7 +0,0 @@
-QScrollArea {
-  background: qpalette(base);
-}
-
-QTextEdit {
-  border: 0px;
-}

src/artistbio/artistbiofetcher.cpp

@@ -1,126 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QObject>
-#include <QTimer>
-#include <QUrl>
-
-#include "artistbiofetcher.h"
-#include "artistbioprovider.h"
-#include "core/logging.h"
-
-ArtistBioFetcher::ArtistBioFetcher(QObject *parent)
-    : QObject(parent),
-      timeout_duration_(kDefaultTimeoutDuration),
-      next_id_(1) {}
-
-void ArtistBioFetcher::AddProvider(ArtistBioProvider *provider) {
-
-  providers_ << provider;
-  connect(provider, SIGNAL(ImageReady(int, QUrl)), SLOT(ImageReady(int, QUrl)), Qt::QueuedConnection);
-  connect(provider, SIGNAL(InfoReady(int, CollapsibleInfoPane::Data)), SLOT(InfoReady(int, CollapsibleInfoPane::Data)), Qt::QueuedConnection);
-  connect(provider, SIGNAL(Finished(int)), SLOT(ProviderFinished(int)), Qt::QueuedConnection);
-
-}
-
-ArtistBioFetcher::~ArtistBioFetcher() {
-
-  while (!providers_.isEmpty()) {
-    ArtistBioProvider *provider = providers_.takeFirst();
-    provider->deleteLater();
-  }
-
-}
-
-int ArtistBioFetcher::FetchInfo(const Song &metadata) {
-
-  const int id = next_id_++;
-  results_[id] = Result();
-  timeout_timers_[id] = new QTimer(this);
-  timeout_timers_[id]->setSingleShot(true);
-  timeout_timers_[id]->setInterval(timeout_duration_);
-  timeout_timers_[id]->start();
-
-  connect(timeout_timers_[id], &QTimer::timeout, [this, id]() { Timeout(id); });
-
-  for (ArtistBioProvider *provider : providers_) {
-    if (provider->is_enabled()) {
-      waiting_for_[id].append(provider);
-      provider->Start(id, metadata);
-    }
-  }
-  return id;
-
-}
-
-void ArtistBioFetcher::ImageReady(const int id, const QUrl &url) {
-
-  if (!results_.contains(id)) return;
-  results_[id].images_ << url;
-
-}
-
-void ArtistBioFetcher::InfoReady(const int id, const CollapsibleInfoPane::Data &data) {
-
-  if (!results_.contains(id)) return;
-  results_[id].info_ << data;
-
-  if (!waiting_for_.contains(id)) return;
-  Q_EMIT InfoResultReady(id, data);
-
-}
-
-void ArtistBioFetcher::ProviderFinished(const int id) {
-
-  if (!results_.contains(id)) return;
-  if (!waiting_for_.contains(id)) return;
-
-  ArtistBioProvider *provider = qobject_cast<ArtistBioProvider*>(sender());
-  if (!waiting_for_[id].contains(provider)) return;
-
-  waiting_for_[id].removeAll(provider);
-  if (waiting_for_[id].isEmpty()) {
-    Result result = results_.take(id);
-    Q_EMIT ResultReady(id, result);
-    waiting_for_.remove(id);
-    delete timeout_timers_.take(id);
-  }
-
-}
-
-void ArtistBioFetcher::Timeout(const int id) {
-
-  if (!results_.contains(id)) return;
-  if (!waiting_for_.contains(id)) return;
-
-  // Emit the results that we have already
-  Q_EMIT ResultReady(id, results_.take(id));
-
-  // Cancel any providers that we're still waiting for
-  for (ArtistBioProvider *provider : waiting_for_[id]) {
-    qLog(Info) << "Request timed out from info provider" << provider->name();
-    provider->Cancel(id);
-  }
-  waiting_for_.remove(id);
-
-  // Remove the timer
-  delete timeout_timers_.take(id);
-
-}

src/artistbio/artistbiofetcher.h

@@ -1,75 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ARTISTBIOFETCHER_H
-#define ARTISTBIOFETCHER_H
-
-#include <QObject>
-#include <QList>
-#include <QMap>
-#include <QUrl>
-
-#include "widgets/collapsibleinfopane.h"
-#include "core/song.h"
-
-class QTimer;
-class ArtistBioProvider;
-
-class ArtistBioFetcher : public QObject {
-  Q_OBJECT
-
- public:
-  explicit ArtistBioFetcher(QObject *parent = nullptr);
-  ~ArtistBioFetcher() override;
-
-  struct Result {
-    QList<QUrl> images_;
-    QList<CollapsibleInfoPane::Data> info_;
-  };
-
-  static const int kDefaultTimeoutDuration = 25000;
-
-  void AddProvider(ArtistBioProvider *provider);
-  int FetchInfo(const Song &metadata);
-
-  QList<ArtistBioProvider*> providers() const { return providers_; }
-
- Q_SIGNALS:
-  void InfoResultReady(int, CollapsibleInfoPane::Data);
-  void ResultReady(int, ArtistBioFetcher::Result);
-
- private Q_SLOTS:
-  void ImageReady(const int id, const QUrl &url);
-  void InfoReady(const int id, const CollapsibleInfoPane::Data &data);
-  void ProviderFinished(const int id);
-  void Timeout(const int id);
-
- private:
-  QList<ArtistBioProvider*> providers_;
-
-  QMap<int, Result> results_;
-  QMap<int, QList<ArtistBioProvider*>> waiting_for_;
-  QMap<int, QTimer*> timeout_timers_;
-
-  int timeout_duration_;
-  int next_id_;
-};
-
-#endif  // ARTISTBIOFETCHER_H

src/artistbio/artistbioprovider.cpp

@@ -1,25 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "artistbioprovider.h"
-
-ArtistBioProvider::ArtistBioProvider() : enabled_(true) {}
-
-QString ArtistBioProvider::name() const { return QString::fromLatin1(metaObject()->className()); }

src/artistbio/artistbioprovider.h

@@ -1,53 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ARTISTBIOPROVIDER_H
-#define ARTISTBIOPROVIDER_H
-
-#include <QObject>
-#include <QUrl>
-
-#include "widgets/collapsibleinfopane.h"
-#include "core/song.h"
-
-class ArtistBioProvider : public QObject {
-  Q_OBJECT
-
- public:
-  explicit ArtistBioProvider();
-
-  virtual void Start(const int id, const Song &song) = 0;
-  virtual void Cancel(const int) {}
-
-  virtual QString name() const;
-
-  bool is_enabled() const { return enabled_; }
-  void set_enabled(bool enabled) { enabled_ = enabled; }
-
- Q_SIGNALS:
-  void ImageReady(int, QUrl);
-  void InfoReady(int, CollapsibleInfoPane::Data);
-  void Finished(int);
-
- private:
-  bool enabled_;
-};
-
-#endif  // ARTISTBIOPROVIDER_H

src/artistbio/artistbioview.cpp

@@ -1,287 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QWidget>
-#include <QFile>
-#include <QScrollArea>
-#include <QSettings>
-#include <QSpacerItem>
-#include <QTimer>
-#include <QVBoxLayout>
-#include <QShowEvent>
-
-#include "core/song.h"
-#include "core/networkaccessmanager.h"
-#include "widgets/prettyimageview.h"
-#include "widgets/widgetfadehelper.h"
-#include "artistbiofetcher.h"
-#include "lastfmartistbio.h"
-#include "wikipediaartistbio.h"
-
-#include "artistbioview.h"
-
-const char *ArtistBioView::kSettingsGroup = "ArtistBio";
-
-ArtistBioView::ArtistBioView(QWidget *parent)
-    : QWidget(parent),
-      network_(new NetworkAccessManager(this)),
-      fetcher_(new ArtistBioFetcher(this)),
-      current_request_id_(-1),
-      container_(new QVBoxLayout),
-      section_container_(nullptr),
-      fader_(new WidgetFadeHelper(this, 1000)),
-      dirty_(false) {
-
-  // Add the top-level scroll area
-  QScrollArea *scrollarea = new QScrollArea(this);
-  setLayout(new QVBoxLayout);
-  layout()->setContentsMargins(0, 0, 0, 0);
-  layout()->addWidget(scrollarea);
-
-  // Add a container widget to the scroll area
-  QWidget *container_widget = new QWidget;
-  container_widget->setLayout(container_);
-  container_widget->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-  container_widget->setBackgroundRole(QPalette::Base);
-  container_->setSizeConstraint(QLayout::SetMinAndMaxSize);
-  container_->setContentsMargins(0, 0, 0, 0);
-  container_->setSpacing(6);
-  scrollarea->setWidget(container_widget);
-  scrollarea->setWidgetResizable(true);
-
-  // Add a spacer to the bottom of the container
-  container_->addStretch();
-
-  // Set stylesheet
-  QFile stylesheet(QStringLiteral(":/style/artistbio.css"));
-  if (stylesheet.open(QIODevice::ReadOnly)) {
-    setStyleSheet(QString::fromLatin1(stylesheet.readAll()));
-    stylesheet.close();
-  }
-
-  fetcher_->AddProvider(new LastFMArtistBio);
-  fetcher_->AddProvider(new WikipediaArtistBio);
-
-  connect(fetcher_, SIGNAL(ResultReady(int, ArtistBioFetcher::Result)), SLOT(ResultReady(int, ArtistBioFetcher::Result)));
-  connect(fetcher_, SIGNAL(InfoResultReady(int, CollapsibleInfoPane::Data)), SLOT(InfoResultReady(int, CollapsibleInfoPane::Data)));
-
-}
-
-ArtistBioView::~ArtistBioView() {}
-
-void ArtistBioView::showEvent(QShowEvent *e) {
-
-  if (dirty_) {
-    MaybeUpdate(queued_metadata_);
-    dirty_ = false;
-  }
-
-  QWidget::showEvent(e);
-
-}
-
-void ArtistBioView::ReloadSettings() {
-
-  for (CollapsibleInfoPane *pane : sections_) {
-    QWidget *contents = pane->data().contents_;
-    if (!contents) continue;
-
-    QMetaObject::invokeMethod(contents, "ReloadSettings");
-  }
-
-}
-
-bool ArtistBioView::NeedsUpdate(const Song &old_metadata, const Song &new_metadata) const {
-
-  if (new_metadata.artist().isEmpty()) return false;
-
-  return old_metadata.artist() != new_metadata.artist();
-
-}
-
-void ArtistBioView::InfoResultReady(const int id, const CollapsibleInfoPane::Data &_data) {
-
-  if (id != current_request_id_) return;
-
-  AddSection(new CollapsibleInfoPane(_data, this));
-  CollapseSections();
-
-}
-
-void ArtistBioView::ResultReady(const int id, const ArtistBioFetcher::Result &result) {
-
-  if (id != current_request_id_) return;
-
-  if (!result.images_.isEmpty()) {
-    // Image view goes at the top
-    PrettyImageView *image_view = new PrettyImageView(network_, this);
-    AddWidget(image_view);
-
-    for (const QUrl& url : result.images_) {
-      image_view->AddImage(url);
-    }
-  }
-
-  CollapseSections();
-
-}
-
-void ArtistBioView::Clear() {
-
-  fader_->StartFade();
-
-  qDeleteAll(widgets_);
-  widgets_.clear();
-  if (section_container_) {
-    container_->removeWidget(section_container_);
-    delete section_container_;
-  }
-  sections_.clear();
-
-  // Container for collapsible sections goes below
-  section_container_ = new QWidget;
-  section_container_->setLayout(new QVBoxLayout);
-  section_container_->layout()->setContentsMargins(0, 0, 0, 0);
-  section_container_->layout()->setSpacing(1);
-  section_container_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-  container_->insertWidget(0, section_container_);
-
-}
-
-void ArtistBioView::AddSection(CollapsibleInfoPane *section) {
-
-  int i = 0;
-  for (; i < sections_.count(); ++i) {
-    if (section->data() < sections_[i]->data()) break;
-  }
-
-  ConnectWidget(section->data().contents_);
-
-  sections_.insert(i, section);
-  qobject_cast<QVBoxLayout*>(section_container_->layout())->insertWidget(i, section);
-  section->show();
-
-}
-
-void ArtistBioView::AddWidget(QWidget *widget) {
-
-  ConnectWidget(widget);
-
-  container_->insertWidget(container_->count() - 2, widget);
-  widgets_ << widget;
-
-}
-
-void ArtistBioView::SongChanged(const Song &metadata) {
-
-  if (isVisible()) {
-    MaybeUpdate(metadata);
-    dirty_ = false;
-  }
-  else {
-    queued_metadata_ = metadata;
-    dirty_ = true;
-  }
-
-}
-
-void ArtistBioView::SongFinished() { dirty_ = false; }
-
-void ArtistBioView::MaybeUpdate(const Song &metadata) {
-
-  if (old_metadata_.is_valid()) {
-    if (!NeedsUpdate(old_metadata_, metadata)) {
-      return;
-    }
-  }
-
-  Update(metadata);
-  old_metadata_ = metadata;
-
-}
-
-void ArtistBioView::Update(const Song &metadata) {
-
-  current_request_id_ = fetcher_->FetchInfo(metadata);
-
-  // Do this after the new pane has been shown otherwise it'll just grab a black rectangle.
-  Clear();
-  QTimer::singleShot(0, fader_, SLOT(StartBlur()));
-
-}
-
-void ArtistBioView::CollapseSections() {
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-
-  // Sections are already sorted by type and relevance, so the algorithm we use to determine which ones to show by default is:
-  //   * In the absence of any user preference, show the first (highest relevance section of each type and hide the rest)
-  //   * If one or more sections in a type have been explicitly hidden/shown by the user before then hide all sections in that type and show only the ones that are explicitly shown.
-
-  QMultiMap<CollapsibleInfoPane::Data::Type, CollapsibleInfoPane*> types_;
-  QSet<CollapsibleInfoPane::Data::Type> has_user_preference_;
-  for (CollapsibleInfoPane *pane : sections_) {
-    const CollapsibleInfoPane::Data::Type type = pane->data().type_;
-    types_.insert(type, pane);
-
-    QVariant preference = s.value(pane->data().id_);
-    if (preference.isValid()) {
-      has_user_preference_.insert(type);
-      if (preference.toBool()) {
-        pane->Expand();
-      }
-    }
-  }
-
-  for (CollapsibleInfoPane::Data::Type type : types_.keys()) {
-    if (!has_user_preference_.contains(type)) {
-      // Expand the first one
-      types_.values(type).last()->Expand();
-    }
-  }
-
-  for (CollapsibleInfoPane *pane : sections_) {
-    connect(pane, SIGNAL(Toggled(bool)), SLOT(SectionToggled(bool)));
-  }
-
-}
-
-void ArtistBioView::SectionToggled(const bool value) {
-
-  CollapsibleInfoPane *pane = qobject_cast<CollapsibleInfoPane*>(sender());
-  if (!pane || !sections_.contains(pane)) return;
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-  s.setValue(pane->data().id_, value);
-  s.endGroup();
-
-}
-
-void ArtistBioView::ConnectWidget(QWidget *widget) {
-
-  const QMetaObject *m = widget->metaObject();
-
-  if (m->indexOfSignal("ShowSettingsDialog()") != -1) {
-    connect(widget, SIGNAL(ShowSettingsDialog()), SIGNAL(ShowSettingsDialog()));
-  }
-
-}

src/artistbio/artistbioview.h

@@ -1,104 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef ARTISTBIOVIEW_H
-#define ARTISTBIOVIEW_H
-
-#include <QObject>
-#include <QWidget>
-#include <QList>
-
-#include "core/song.h"
-#include "widgets/collapsibleinfopane.h"
-#include "widgets/widgetfadehelper.h"
-#include "widgets/collapsibleinfopane.h"
-#include "playlist/playlistitem.h"
-#include "smartplaylists/playlistgenerator_fwd.h"
-#include "artistbiofetcher.h"
-
-class QNetworkAccessManager;
-class QTimeLine;
-class QVBoxLayout;
-class QScrollArea;
-class QShowEvent;
-
-class PrettyImageView;
-class CollapsibleInfoPane;
-class WidgetFadeHelper;
-
-class ArtistBioView : public QWidget {
-  Q_OBJECT
-
- public:
-  explicit ArtistBioView(QWidget *parent = nullptr);
-  ~ArtistBioView() override;
-
-  static const char *kSettingsGroup;
-
- public Q_SLOTS:
-  void SongChanged(const Song& metadata);
-  void SongFinished();
-  virtual void ReloadSettings();
-
- Q_SIGNALS:
-  void ShowSettingsDialog();
-
- protected:
-  void showEvent(QShowEvent *e) override;
-
-  void Update(const Song &metadata);
-  void AddWidget(QWidget *widget);
-  void AddSection(CollapsibleInfoPane *section);
-  void Clear();
-  void CollapseSections();
-
-  bool NeedsUpdate(const Song& old_metadata, const Song &new_metadata) const;
-
- protected Q_SLOTS:
-  void ResultReady(const int id, const ArtistBioFetcher::Result &result);
-  void InfoResultReady(const int id, const CollapsibleInfoPane::Data &data);
-
- protected:
-  QNetworkAccessManager *network_;
-  ArtistBioFetcher *fetcher_;
-  int current_request_id_;
-
- private:
-  void MaybeUpdate(const Song &metadata);
-  void ConnectWidget(QWidget *widget);
-
- private Q_SLOTS:
-  void SectionToggled(const bool value);
-
- private:
-  QVBoxLayout *container_;
-  QList<QWidget*> widgets_;
-
-  QWidget *section_container_;
-  QList<CollapsibleInfoPane*> sections_;
-
-  WidgetFadeHelper *fader_;
-
-  Song queued_metadata_;
-  Song old_metadata_;
-  bool dirty_;
-};
-
-#endif  // ARTISTBIOVIEW_H

src/artistbio/lastfmartistbio.cpp

@@ -1,209 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "config.h"
-
-#include <algorithm>
-
-#include <QtGlobal>
-#include <QLocale>
-#include <QVariant>
-#include <QByteArray>
-#include <QString>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QDateTime>
-#include <QNetworkRequest>
-#include <QNetworkReply>
-#include <QJsonDocument>
-#include <QJsonObject>
-#include <QJsonArray>
-#include <QJsonValue>
-
-#include "core/networkaccessmanager.h"
-#include "core/song.h"
-#include "core/logging.h"
-#include "core/iconloader.h"
-
-#include "lastfmartistbio.h"
-#include "widgets/infotextview.h"
-#include "scrobbler/scrobblingapi20.h"
-#include "scrobbler/lastfmscrobbler.h"
-
-LastFMArtistBio::LastFMArtistBio() : ArtistBioProvider(), network_(new NetworkAccessManager(this)) {}
-
-LastFMArtistBio::~LastFMArtistBio() {
-
-  while (!replies_.isEmpty()) {
-    QNetworkReply *reply = replies_.takeFirst();
-    disconnect(reply, nullptr, this, nullptr);
-    reply->abort();
-    reply->deleteLater();
-  }
-
-}
-
-void LastFMArtistBio::Start(const int id, const Song &song) {
-
-  ParamList params = ParamList()
-    << Param(QStringLiteral("api_key"), QString::fromLatin1(ScrobblingAPI20::kApiKey))
-    << Param(QStringLiteral("lang"), QLocale().name().left(2).toLower())
-    << Param(QStringLiteral("format"), QStringLiteral("json"))
-    << Param(QStringLiteral("method"), QStringLiteral("artist.getinfo"))
-    << Param(QStringLiteral("artist"), song.artist());
-
-  std::sort(params.begin(), params.end());
-
-  QUrlQuery url_query;
-  for (const Param &param : params) {
-    url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
-  }
-
-  QUrl url(QString::fromLatin1(LastFMScrobbler::kApiUrl));
-  url.setQuery(url_query);
-  QNetworkRequest req(url);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-  req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
-#else
-  req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
-  req.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/x-www-form-urlencoded"));
-
-  QNetworkReply *reply = network_->get(req);
-  replies_ << reply;
-  connect(reply, &QNetworkReply::finished, [=] { RequestFinished(reply, id); });
-
-  qLog(Debug) << "Sending request" << url_query.toString(QUrl::FullyDecoded);
-
-}
-
-QByteArray LastFMArtistBio::GetReplyData(QNetworkReply *reply) {
-
-  QByteArray data;
-
-  if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
-    data = reply->readAll();
-  }
-  else {
-    if (reply->error() != QNetworkReply::NoError && reply->error() < 200) {
-      // This is a network error, there is nothing more to do.
-      Error(QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error()));
-    }
-    else {
-      QString error;
-      // See if there is Json data containing "error" and "message" - then use that instead.
-      data = reply->readAll();
-      QJsonParseError json_error;
-      QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
-      int error_code = -1;
-      if (json_error.error == QJsonParseError::NoError && !json_doc.isEmpty() && json_doc.isObject()) {
-        QJsonObject json_obj = json_doc.object();
-        if (json_obj.contains(QLatin1String("error")) && json_obj.contains(QLatin1String("message"))) {
-          error_code = json_obj[QLatin1String("error")].toInt();
-          QString error_message = json_obj[QLatin1String("message")].toString();
-          error = QStringLiteral("%1 (%2)").arg(error_message).arg(error_code);
-        }
-      }
-      if (error.isEmpty()) {
-        if (reply->error() != QNetworkReply::NoError) {
-          error = QStringLiteral("%1 (%2)").arg(reply->errorString()).arg(reply->error());
-        }
-        else {
-          error = QStringLiteral("Received HTTP code %1").arg(reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt());
-        }
-      }
-      Error(error);
-    }
-    return QByteArray();
-  }
-
-  return data;
-
-}
-
-QJsonObject LastFMArtistBio::ExtractJsonObj(const QByteArray &data) {
-
-  if (data.isEmpty()) return QJsonObject();
-
-  QJsonParseError error;
-  QJsonDocument json_doc = QJsonDocument::fromJson(data, &error);
-
-  if (error.error != QJsonParseError::NoError) {
-    Error(QStringLiteral("Reply from server missing Json data."), data);
-    return QJsonObject();
-  }
-  if (json_doc.isEmpty()) {
-    Error(QStringLiteral("Received empty Json document."), json_doc);
-    return QJsonObject();
-  }
-  if (!json_doc.isObject()) {
-    Error(QStringLiteral("Json document is not an object."), json_doc);
-    return QJsonObject();
-  }
-  QJsonObject json_obj = json_doc.object();
-  if (json_obj.isEmpty()) {
-    Error(QStringLiteral("Received empty Json object."), json_doc);
-    return QJsonObject();
-  }
-
-  return json_obj;
-
-}
-
-void LastFMArtistBio::RequestFinished(QNetworkReply *reply, const int id) {
-
-  if (!replies_.contains(reply)) return;
-  replies_.removeAll(reply);
-  disconnect(reply, nullptr, this, nullptr);
-  reply->deleteLater();
-
-  QJsonObject json_obj = ExtractJsonObj(GetReplyData(reply));
-
-  QString title;
-  QString text;
-  if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("artist")) && json_obj[QLatin1String("artist")].isObject()) {
-    json_obj = json_obj[QLatin1String("artist")].toObject();
-    if (json_obj.contains(QLatin1String("bio")) && json_obj[QLatin1String("bio")].isObject()) {
-      title = json_obj[QLatin1String("name")].toString();
-      QJsonObject obj_bio = json_obj[QLatin1String("bio")].toObject();
-      if (obj_bio.contains(QLatin1String("content"))) {
-        text = obj_bio[QLatin1String("content")].toString();
-      }
-    }
-  }
-
-  CollapsibleInfoPane::Data info_data;
-  info_data.id_ = title;
-  info_data.title_ = tr("Biography");
-  info_data.type_ = CollapsibleInfoPane::Data::Type_Biography;
-  info_data.icon_ = IconLoader::Load(QStringLiteral("scrobble"));
-  InfoTextView *editor = new InfoTextView;
-  editor->SetHtml(text);
-  info_data.contents_ = editor;
-  Q_EMIT InfoReady(id, info_data);
-  Q_EMIT Finished(id);
-
-}
-
-void LastFMArtistBio::Error(const QString &error, const QVariant &debug) {
-
-  qLog(Error) << error;
-  if (debug.isValid()) qLog(Debug) << debug;
-
-}

src/artistbio/lastfmartistbio.h

@@ -1,66 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef LASTFMARTISTBIO_H
-#define LASTFMARTISTBIO_H
-
-#include "config.h"
-
-#include <QtGlobal>
-#include <QObject>
-#include <QList>
-#include <QVariant>
-#include <QByteArray>
-#include <QString>
-
-#include "core/song.h"
-
-#include "artistbioprovider.h"
-
-class NetworkAccessManager;
-class QNetworkReply;
-
-class LastFMArtistBio : public ArtistBioProvider {
-  Q_OBJECT
-
- public:
-  explicit LastFMArtistBio();
-  ~LastFMArtistBio();
-
-  void Start(const int id, const Song &song) override;
-
- private:
-  using Param = QPair<QString, QString>;
-  using ParamList = QList<Param>;
-
-  QNetworkReply *CreateRequest(const ParamList &request_params);
-  QByteArray GetReplyData(QNetworkReply *reply);
-  QJsonObject ExtractJsonObj(const QByteArray &data);
-  void Error(const QString &error, const QVariant &debug = QVariant());
-
- private Q_SLOTS:
-  void RequestFinished(QNetworkReply *reply, const int id);
-
- private:
-  NetworkAccessManager *network_;
-  QList<QNetworkReply*> replies_;
-
-};
-
-#endif  // LASTFMARTISTBIO_H

src/artistbio/wikipediaartistbio.cpp

@@ -1,319 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QObject>
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
-#include <QUrlQuery>
-#include <QJsonDocument>
-#include <QJsonArray>
-#include <QJsonObject>
-#include <QJsonValue>
-#include <QNetworkReply>
-
-#include "core/logging.h"
-#include "core/networkaccessmanager.h"
-#include "core/iconloader.h"
-#include "core/latch.h"
-
-#include "widgets/infotextview.h"
-#include "wikipediaartistbio.h"
-
-namespace {
-constexpr char kApiUrl[] = "https://en.wikipedia.org/w/api.php";
-constexpr int kMinimumImageSize = 400;
-}
-
-WikipediaArtistBio::WikipediaArtistBio() : ArtistBioProvider(), network_(new NetworkAccessManager(this)) {}
-
-WikipediaArtistBio::~WikipediaArtistBio() {
-
-  while (!replies_.isEmpty()) {
-    QNetworkReply *reply = replies_.takeFirst();
-    disconnect(reply, nullptr, this, nullptr);
-    if (reply->isRunning()) reply->abort();
-    reply->deleteLater();
-  }
-
-}
-
-QNetworkReply *WikipediaArtistBio::CreateRequest(QList<Param> &params) {
-
-  params << Param(QLatin1String("format"), QLatin1String("json"));
-  params << Param(QLatin1String("action"), QLatin1String("query"));
-
-  QUrlQuery url_query;
-  for (const Param &param : params) {
-    url_query.addQueryItem(QString::fromLatin1(QUrl::toPercentEncoding(param.first)), QString::fromLatin1(QUrl::toPercentEncoding(param.second)));
-  }
-
-  QUrl url(QString::fromLatin1(kApiUrl));
-  url.setQuery(url_query);
-  QNetworkRequest req(url);
-#if QT_VERSION >= QT_VERSION_CHECK(5, 9, 0)
-  req.setAttribute(QNetworkRequest::RedirectPolicyAttribute, QNetworkRequest::NoLessSafeRedirectPolicy);
-#else
-  req.setAttribute(QNetworkRequest::FollowRedirectsAttribute, true);
-#endif
-  req.setHeader(QNetworkRequest::ContentTypeHeader, QStringLiteral("application/x-www-form-urlencoded"));
-
-  QNetworkReply *reply = network_->get(req);
-  connect(reply, &QNetworkReply::sslErrors, this, &WikipediaArtistBio::HandleSSLErrors);
-  replies_ << reply;
-
-  return reply;
-
-}
-
-QByteArray WikipediaArtistBio::GetReplyData(QNetworkReply *reply) {
-
-  QByteArray data;
-
-  if (reply->error() == QNetworkReply::NoError && reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt() == 200) {
-    data = reply->readAll();
-  }
-  else {
-    if (reply->error() == QNetworkReply::NoError) {
-      qLog(Error) << "Wikipedia artist biography error: Received HTTP code" << reply->attribute(QNetworkRequest::HttpStatusCodeAttribute).toInt();
-    }
-    else {
-      qLog(Error) << "Wikipedia artist biography error:" << reply->error() << reply->errorString();
-    }
-  }
-
-  return data;
-
-}
-
-QJsonObject WikipediaArtistBio::ExtractJsonObj(const QByteArray &data) {
-
-  if (data.isEmpty()) return QJsonObject();
-
-  QJsonParseError json_error;
-  QJsonDocument json_doc = QJsonDocument::fromJson(data, &json_error);
-
-  if (json_error.error != QJsonParseError::NoError) {
-    qLog(Error) << "Wikipedia artist biography error: Failed to parse json data:" << json_error.errorString();
-    return QJsonObject();
-  }
-
-  if (json_doc.isEmpty()) {
-    qLog(Error) << "Wikipedia artist biography error: Received empty Json document.";
-    return QJsonObject();
-  }
-
-  if (!json_doc.isObject()) {
-    qLog(Error) << "Wikipedia artist biography error: Json document is not an object.";
-    return QJsonObject();
-  }
-
-  QJsonObject json_obj = json_doc.object();
-  if (json_obj.isEmpty()) {
-    qLog(Error) << "Wikipedia artist biography error: Received empty Json object.";
-    return QJsonObject();
-  }
-
-  return json_obj;
-
-}
-
-void WikipediaArtistBio::HandleSSLErrors(QList<QSslError>) {}
-
-void WikipediaArtistBio::Start(const int id, const Song &metadata) {
-
-  if (metadata.artist().isEmpty()) {
-    Q_EMIT Finished(id);
-    return;
-  }
-
-  CountdownLatch *latch = new CountdownLatch;
-  connect(latch, &CountdownLatch::Done, [this, id, latch](){
-    latch->deleteLater();
-    Q_EMIT Finished(id);
-  });
-
-  GetImageTitles(id, metadata.artist(), latch);
-  //GetArticle(id, metadata.artist(), latch);
-
-}
-
-void WikipediaArtistBio::GetArticle(const int id, const QString &artist, CountdownLatch *latch) {
-
-  latch->Wait();
-
-  ParamList params = ParamList() << Param(QStringLiteral("titles"), artist)
-                                 << Param(QStringLiteral("prop"), QStringLiteral("extracts"));
-
-  QNetworkReply *reply = CreateRequest(params);
-  connect(reply, &QNetworkReply::finished, [this, reply, id, latch]() { GetArticleReply(reply, id, latch); });
-
-}
-
-void WikipediaArtistBio::GetArticleReply(QNetworkReply *reply, const int id, CountdownLatch *latch) {
-
-  reply->deleteLater();
-  replies_.removeAll(reply);
-
-  QJsonObject json_obj = ExtractJsonObj(GetReplyData(reply));
-
-  QString title;
-  QString text;
-  if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("query")) && json_obj[QLatin1String("query")].isObject()) {
-    json_obj = json_obj[QLatin1String("query")].toObject();
-    if (json_obj.contains(QLatin1String("pages")) && json_obj[QLatin1String("pages")].isObject()) {
-      QJsonObject value_pages = json_obj[QLatin1String("pages")].toObject();
-      for (const QJsonValue value_page : value_pages) {
-        if (!value_page.isObject()) continue;
-        QJsonObject obj_page = value_page.toObject();
-        if (!obj_page.contains(QLatin1String("title")) || !obj_page.contains(QLatin1String("extract"))) continue;
-        title = obj_page[QLatin1String("title")].toString();
-        text = obj_page[QLatin1String("extract")].toString();
-      }
-    }
-  }
-
-  CollapsibleInfoPane::Data info_data;
-  info_data.id_ = title;
-  info_data.title_ = tr("Biography");
-  info_data.type_ = CollapsibleInfoPane::Data::Type_Biography;
-  info_data.icon_ = IconLoader::Load(QStringLiteral("wikipedia"));
-  InfoTextView *editor = new InfoTextView;
-  editor->SetHtml(text);
-  info_data.contents_ = editor;
-  Q_EMIT InfoReady(id, info_data);
-
-  latch->CountDown();
-
-}
-
-void WikipediaArtistBio::GetImageTitles(const int id, const QString &artist, CountdownLatch *latch) {
-
-  latch->Wait();
-
-  ParamList params = ParamList() << Param(QStringLiteral("titles"), artist)
-                                 << Param(QStringLiteral("prop"), QStringLiteral("images"))
-                                 << Param(QStringLiteral("imlimit"), QString::number(25));
-
-  QNetworkReply *reply = CreateRequest(params);
-  connect(reply, &QNetworkReply::finished, [this, reply, id, latch]() { GetImageTitlesFinished(reply, id, latch); });
-
-}
-
-void WikipediaArtistBio::GetImageTitlesFinished(QNetworkReply *reply, const int id, CountdownLatch *latch) {
-
-  reply->deleteLater();
-  replies_.removeAll(reply);
-
-  QJsonObject json_obj = ExtractJsonObj(GetReplyData(reply));
-
-  QString title;
-  QStringList titles;
-  if (!json_obj.isEmpty() && json_obj.contains(QLatin1String("query")) && json_obj[QLatin1String("query")].isObject()) {
-    json_obj = json_obj[QLatin1String("query")].toObject();
-    if (json_obj.contains(QLatin1String("pages")) && json_obj[QLatin1String("pages")].isObject()) {
-      QJsonObject value_pages = json_obj[QLatin1String("pages")].toObject();
-      for (const QJsonValue value_page : value_pages) {
-        if (!value_page.isObject()) continue;
-        QJsonObject obj_page = value_page.toObject();
-        if (!obj_page.contains(QLatin1String("title")) || !obj_page.contains(QLatin1String("images")) || !obj_page[QLatin1String("images")].isArray()) continue;
-        title = obj_page[QLatin1String("title")].toString();
-        QJsonArray array_images = obj_page[QLatin1String("images")].toArray();
-        for (const QJsonValue value_image : array_images) {
-          if (!value_image.isObject()) continue;
-          QJsonObject obj_image = value_image.toObject();
-          if (!obj_image.contains(QLatin1String("title"))) continue;
-          QString filename = obj_image[QLatin1String("title")].toString();
-          if (filename.endsWith(QLatin1String(".jpg"), Qt::CaseInsensitive) || filename.endsWith(QLatin1String(".png"), Qt::CaseInsensitive)) {
-            titles << filename;
-          }
-        }
-      }
-    }
-  }
-
-  for (const QString &image_title : titles) {
-    GetImage(id, image_title, latch);
-  }
-
-  latch->CountDown();
-
-}
-
-void WikipediaArtistBio::GetImage(const int id, const QString &title, CountdownLatch *latch) {
-
-  latch->Wait();
-
-  ParamList params2 = ParamList() << Param(QStringLiteral("titles"), title)
-                                  << Param(QStringLiteral("prop"), QStringLiteral("imageinfo"))
-                                  << Param(QStringLiteral("iiprop"), QStringLiteral("url|size"));
-
-  QNetworkReply *reply = CreateRequest(params2);
-  connect(reply, &QNetworkReply::finished, [this, reply, id, latch]() { GetImageFinished(reply, id, latch); });
-
-}
-
-void WikipediaArtistBio::GetImageFinished(QNetworkReply *reply, const int id, CountdownLatch *latch) {
-
-  reply->deleteLater();
-  replies_.removeAll(reply);
-
-  QJsonObject json_obj = ExtractJsonObj(GetReplyData(reply));
-
-  if (!json_obj.isEmpty()) {
-    QList<QUrl> urls = ExtractImageUrls(json_obj);
-    for (const QUrl &url : urls) {
-      Q_EMIT ImageReady(id, url);
-    }
-  }
-
-  latch->CountDown();
-
-}
-
-QList<QUrl> WikipediaArtistBio::ExtractImageUrls(QJsonObject json_obj) {
-
-  QList<QUrl> urls;
-  if (json_obj.contains(QLatin1String("query")) && json_obj[QLatin1String("query")].isObject()) {
-    json_obj = json_obj[QLatin1String("query")].toObject();
-    if (json_obj.contains(QLatin1String("pages")) && json_obj[QLatin1String("pages")].isObject()) {
-      QJsonObject value_pages = json_obj[QLatin1String("pages")].toObject();
-      for (const QJsonValue value_page : value_pages) {
-        if (!value_page.isObject()) continue;
-        QJsonObject obj_page = value_page.toObject();
-        if (!obj_page.contains(QLatin1String("title")) || !obj_page.contains(QLatin1String("imageinfo")) || !obj_page[QLatin1String("imageinfo")].isArray()) continue;
-        QJsonArray array_images = obj_page[QLatin1String("imageinfo")].toArray();
-        for (const QJsonValue value_image : array_images) {
-          if (!value_image.isObject()) continue;
-          QJsonObject obj_image = value_image.toObject();
-          if (!obj_image.contains(QLatin1String("url")) || !obj_image.contains(QLatin1String("width")) || !obj_image.contains(QLatin1String("height"))) continue;
-          QUrl url(obj_image[QLatin1String("url")].toString());
-          const int width = obj_image[QLatin1String("width")].toInt();
-          const int height = obj_image[QLatin1String("height")].toInt();
-          if (!url.isValid() || width < kMinimumImageSize || height < kMinimumImageSize) continue;
-          urls << url;
-        }
-      }
-    }
-  }
-
-  return urls;
-
-}

src/artistbio/wikipediaartistbio.h

@@ -1,69 +0,0 @@
-/*
- * Strawberry Music Player
- * Copyright 2020, Jonas Kvinge <jonas@jkvinge.net>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef WIKIPEDIAARTISTBIO_H
-#define WIKIPEDIAARTISTBIO_H
-
-#include <QList>
-#include <QString>
-#include <QStringList>
-#include <QUrl>
-#include <QSslError>
-#include <QJsonObject>
-
-#include "artistbioprovider.h"
-
-class QNetworkReply;
-class CountdownLatch;
-class NetworkAccessManager;
-
-class WikipediaArtistBio : public ArtistBioProvider {
-  Q_OBJECT
-
- public:
-  explicit WikipediaArtistBio();
-  ~WikipediaArtistBio();
-
-  void Start(const int id, const Song &song) override;
-
- private:
-  typedef QPair<QString, QString> Param;
-  typedef QList<Param> ParamList;
-
-  QNetworkReply *CreateRequest(QList<Param> &params);
-  QByteArray GetReplyData(QNetworkReply *reply);
-  QJsonObject ExtractJsonObj(const QByteArray &data);
-  void GetArticle(const int id, const QString &artist, CountdownLatch* latch);
-  void GetImageTitles(const int id, const QString &artist, CountdownLatch* latch);
-  void GetImage(const int id, const QString &title, CountdownLatch *latch);
-  QList<QUrl> ExtractImageUrls(QJsonObject json_obj);
-
- private Q_SLOTS:
-  void HandleSSLErrors(QList<QSslError> ssl_errors);
-  void GetArticleReply(QNetworkReply *reply, const int id, CountdownLatch *latch);
-  void GetImageTitlesFinished(QNetworkReply *reply, const int id, CountdownLatch *latch);
-  void GetImageFinished(QNetworkReply *reply, const int id, CountdownLatch *latch);
-
- private:
-  NetworkAccessManager *network_;
-  QList<QNetworkReply*> replies_;
-
-};
-
-#endif  // WIKIPEDIAARTISTBIO_H

src/collection/collectionlibrary.cpp

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -189,26 +189,6 @@ void CollectionLibrary::ReloadSettings() {
 
 }
 
-void CollectionLibrary::CurrentSongChanged(const Song &song) {
-
-  current_song_url_ = song.url();
-
-  if (!pending_song_saves_.isEmpty()) {
-    SavePendingPlaycountsAndRatings();
-  }
-
-}
-
-void CollectionLibrary::Stopped() {
-
-  current_song_url_ = QUrl();
-
-  if (!pending_song_saves_.isEmpty()) {
-    SavePendingPlaycountsAndRatings();
-  }
-
-}
-
 void CollectionLibrary::SyncPlaycountAndRatingToFilesAsync() {
 
   (void)QtConcurrent::run(&CollectionLibrary::SyncPlaycountAndRatingToFiles, this);
@@ -232,85 +212,18 @@ void CollectionLibrary::SyncPlaycountAndRatingToFiles() {
 
 }
 
-void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsPlaycountChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_playcounts_to_files_) {
-    SongList songs_to_save_now;
+    tagreader_client_->SaveSongsPlaycountAsync(songs);
-    for (const Song &song : songs) {
-      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
-          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
-        qLog(Debug) << "Deferring playcount save for currently playing file" << song.url().toLocalFile();
-        if (pending_song_saves_.contains(song.url())) {
-          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
-          pending_song_save->save_playcount = true;
-          pending_song_save->song.set_playcount(song.playcount());
-        }
-        else {
-          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
-          pending_song_save->save_playcount = true;
-          pending_song_save->song = song;
-          pending_song_saves_.insert(song.url(), pending_song_save);
-        }
-      }
-      else {
-        songs_to_save_now << song;
-      }
-    }
-    if (!songs_to_save_now.isEmpty()) {
-      tagreader_client_->SaveSongsPlaycountAsync(songs_to_save_now);
-    }
   }
 
 }
 
-void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) {
+void CollectionLibrary::SongsRatingChanged(const SongList &songs, const bool save_tags) const {
 
   if (save_tags || save_ratings_to_files_) {
-    SongList songs_to_save_now;
+    tagreader_client_->SaveSongsRatingAsync(songs);
-    for (const Song &song : songs) {
-      if (song.url().isLocalFile() && song.url() == current_song_url_ &&
-          (song.filetype() == Song::FileType::OggFlac || song.filetype() == Song::FileType::OggVorbis || song.filetype() == Song::FileType::OggOpus)) {
-        qLog(Debug) << "Deferring rating save for currently playing file" << song.url().toLocalFile();
-        if (pending_song_saves_.contains(song.url())) {
-          SharedPtr<PendingSongSave> pending_song_save = pending_song_saves_[song.url()];
-          pending_song_save->save_rating = true;
-          pending_song_save->song.set_rating(song.rating());
-        }
-        else {
-          SharedPtr<PendingSongSave> pending_song_save = make_shared<PendingSongSave>();
-          pending_song_save->save_rating = true;
-          pending_song_save->song = song;
-          pending_song_saves_.insert(song.url(), pending_song_save);
-        }
-      }
-      else {
-        songs_to_save_now << song;
-      }
-    }
-    if (!songs_to_save_now.isEmpty()) {
-      tagreader_client_->SaveSongsRatingAsync(songs_to_save_now);
-    }
-  }
-
-}
-
-void CollectionLibrary::SavePendingPlaycountsAndRatings() {
-
-  for (auto it = pending_song_saves_.constBegin(); it != pending_song_saves_.constEnd();) {
-    const QUrl url = it.key();
-    SharedPtr<PendingSongSave> pending_song_save = it.value();
-    if (url == current_song_url_) {
-      ++it;
-      continue;
-    }
-    qLog(Debug) << "Saving deferred playcount/rating for" << url.toLocalFile();
-    if (pending_song_save->save_playcount) {
-      tagreader_client_->SaveSongsPlaycountAsync(SongList() << pending_song_save->song);
-    }
-    if (pending_song_save->save_rating) {
-      tagreader_client_->SaveSongsRatingAsync(SongList() << pending_song_save->song);
-    }
-    it = pending_song_saves_.erase(it);
   }
 
 }

src/collection/collectionlibrary.h

@@ -2,7 +2,7 @@
  * Strawberry Music Player
  * This file was part of Clementine.
  * Copyright 2010, David Sansome <me@davidsansome.com>
- * Copyright 2018-2025, Jonas Kvinge <jonas@jkvinge.net>
+ * Copyright 2018-2021, Jonas Kvinge <jonas@jkvinge.net>
  *
  * Strawberry is free software: you can redistribute it and/or modify
  * it under the terms of the GNU General Public License as published by
@@ -27,7 +27,6 @@
 #include <QObject>
 #include <QList>
 #include <QHash>
-#include <QMap>
 #include <QString>
 
 #include "includes/shared_ptr.h"
@@ -72,7 +71,6 @@ class CollectionLibrary : public QObject {
 
  private:
   void SyncPlaycountAndRatingToFiles();
-  void SavePendingPlaycountsAndRatings();
 
  public Q_SLOTS:
   void ReloadSettings();
@@ -86,26 +84,16 @@ class CollectionLibrary : public QObject {
 
   void IncrementalScan();
 
-  void CurrentSongChanged(const Song &song);
-  void Stopped();
-
  private Q_SLOTS:
   void ExitReceived();
-  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false);
+  void SongsPlaycountChanged(const SongList &songs, const bool save_tags = false) const;
-  void SongsRatingChanged(const SongList &songs, const bool save_tags = false);
+  void SongsRatingChanged(const SongList &songs, const bool save_tags = false) const;
 
  Q_SIGNALS:
   void Error(const QString &error);
   void ExitFinished();
 
  private:
-  class PendingSongSave {
-   public:
-    Song song;
-    bool save_playcount = false;
-    bool save_rating = false;
-  };
-
   const SharedPtr<TaskManager> task_manager_;
   const SharedPtr<TagReaderClient> tagreader_client_;
 
@@ -123,10 +111,6 @@ class CollectionLibrary : public QObject {
 
   bool save_playcounts_to_files_;
   bool save_ratings_to_files_;
-
-  QUrl current_song_url_;
-
-  QMap<QUrl, SharedPtr<PendingSongSave>> pending_song_saves_;
 };
 
 #endif

src/collection/collectionmodel.cpp

@@ -1209,41 +1209,49 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
   switch (group_by) {
     case GroupBy::AlbumArtist:
       key = TextOrUnknown(song.effective_albumartist());
+      if (!song.effective_albumartistsort().isEmpty() && song.effective_albumartistsort() != song.effective_albumartist()) key.append(QLatin1Char('-') + TextOrUnknown(song.effective_albumartistsort()));
       has_unique_album_identifier = true;
       break;
     case GroupBy::Artist:
       key = TextOrUnknown(song.artist());
+      if (!song.artistsort().isEmpty() && song.artistsort() != song.artist()) key.append(QLatin1Char('-') + TextOrUnknown(song.artistsort()));
       has_unique_album_identifier = true;
       break;
     case GroupBy::Album:
       key = TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::AlbumDisc:
       key = TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbum:
       key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::YearAlbumDisc:
       key = SortTextForYear(song.year()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbum:
       key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
       break;
     case GroupBy::OriginalYearAlbumDisc:
       key = SortTextForYear(song.effective_originalyear()) + QLatin1Char('-') + TextOrUnknown(song.album());
+      if (!song.albumsort().isEmpty() && song.albumsort() != song.album()) key.append(QLatin1Char('-') + TextOrUnknown(song.albumsort()));
       key.append(QLatin1Char('-') + SortTextForNumber(song.disc()));
       if (!song.album_id().isEmpty()) key.append(QLatin1Char('-') + song.album_id());
       if (options_active_.separate_albums_by_grouping && !song.grouping().isEmpty()) key.append(QLatin1Char('-') + song.grouping());
@@ -1262,10 +1270,12 @@ QString CollectionModel::ContainerKey(const GroupBy group_by, const Song &song,
       break;
     case GroupBy::Composer:
       key = TextOrUnknown(song.composer());
+      if (!song.composersort().isEmpty() && song.composersort() != song.composer()) key.append(QLatin1Char('-') + song.composersort());
       has_unique_album_identifier = true;
       break;
     case GroupBy::Performer:
       key = TextOrUnknown(song.performer());
+      if (!song.performersort().isEmpty() && song.performersort() != song.performer()) key.append(QLatin1Char('-') + song.performersort());
       has_unique_album_identifier = true;
       break;
     case GroupBy::Grouping:

src/core/filesystemmusicstorage.cpp

@@ -110,32 +110,21 @@ bool FilesystemMusicStorage::CopyToStorage(const CopyJob &job, QString &error_te
 
 bool FilesystemMusicStorage::DeleteFromStorage(const DeleteJob &job) {
 
-  const QString path = job.metadata_.url().toLocalFile();
+  QString path = job.metadata_.url().toLocalFile();
-  const QFileInfo fileInfo(path);
+  QFileInfo fileInfo(path);
 
 #if QT_VERSION >= QT_VERSION_CHECK(6, 9, 0)
   if (job.use_trash_ && QFile::supportsMoveToTrash()) {
 #else
   if (job.use_trash_) {
 #endif
-    if (QFile::moveToTrash(path)) {
+    return QFile::moveToTrash(path);
-      return true;
-    }
-    qLog(Warning) << "Moving file to trash failed for" << path << ", falling back to direct deletion";
   }
 
-  bool success = false;
   if (fileInfo.isDir()) {
-    success = Utilities::RemoveRecursive(path);
+    return Utilities::RemoveRecursive(path);
-  }
-  else {
-    success = QFile::remove(path);
   }
 
-  if (!success) {
+  return QFile::remove(path);
-    qLog(Error) << "Failed to delete file" << path;
-  }
-
-  return success;
 
 }

src/core/latch.cpp

@@ -1,39 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2016, John Maguire <john.maguire@gmail.com>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-#include <QMutexLocker>
-
-#include "latch.h"
-
-CountdownLatch::CountdownLatch() : count_(0) {}
-
-void CountdownLatch::Wait() {
-
-  QMutexLocker l(&mutex_);
-  ++count_;
-
-}
-
-void CountdownLatch::CountDown() {
-
-  QMutexLocker l(&mutex_);
-  Q_ASSERT(count_ > 0);
-  --count_;
-  if (count_ == 0) {
-    emit Done();
-  }
-
-}

src/core/latch.h

@@ -1,39 +0,0 @@
-/* This file is part of Clementine.
-   Copyright 2016, John Maguire <john.maguire@gmail.com>
-
-   Licensed under the Apache License, Version 2.0 (the "License");
-   you may not use this file except in compliance with the License.
-   You may obtain a copy of the License at
-
-       http://www.apache.org/licenses/LICENSE-2.0
-
-   Unless required by applicable law or agreed to in writing, software
-   distributed under the License is distributed on an "AS IS" BASIS,
-   WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
-   See the License for the specific language governing permissions and
-   limitations under the License.
-*/
-
-#ifndef LATCH_H
-#define LATCH_H
-
-#include <QObject>
-#include <QMutex>
-
-class CountdownLatch : public QObject {
-  Q_OBJECT
-
- public:
-  explicit CountdownLatch();
-  void Wait();
-  void CountDown();
-
- Q_SIGNALS:
-  void Done();
-
- private:
-  QMutex mutex_;
-  int count_;
-};
-
-#endif  // LATCH_H

src/core/mainwindow.cpp

@@ -58,6 +58,7 @@
 #include <QShortcut>
 #include <QMessageBox>
 #include <QErrorMessage>
+#include <QSettings>
 #include <QColor>
 #include <QFrame>
 #include <QItemSelectionModel>
@@ -205,7 +206,6 @@
 #include "smartplaylists/smartplaylistsviewcontainer.h"
 
 #include "organize/organizeerrordialog.h"
-#include "artistbio/artistbioview.h"
 
 #ifdef Q_OS_WIN32
 #  include "core/windows7thumbbar.h"
@@ -233,7 +233,6 @@
 
 using std::make_unique;
 using std::make_shared;
-
 using namespace std::chrono_literals;
 using namespace Qt::Literals::StringLiterals;
 
@@ -359,7 +358,6 @@ MainWindow::MainWindow(Application *app,
       qobuz_view_(new StreamingTabsView(app->streaming_services()->ServiceBySource(Song::Source::Qobuz), app->albumcover_loader(), QLatin1String(QobuzSettings::kSettingsGroup), this)),
 #endif
       radio_view_(new RadioViewContainer(this)),
-      artistbio_view_(new ArtistBioView(this)),
       lastfm_import_dialog_(new LastFMImportDialog(app_->lastfm_import(), this)),
       collection_show_all_(nullptr),
       collection_show_duplicates_(nullptr),
@@ -444,7 +442,6 @@ MainWindow::MainWindow(Application *app,
 #ifdef HAVE_QOBUZ
   ui_->tabs->AddTab(qobuz_view_, u"qobuz"_s, IconLoader::Load(u"qobuz"_s, true, 0, 32), tr("Qobuz"));
 #endif
-  ui_->tabs->AddTab(artistbio_view_, QStringLiteral("artistbio"), IconLoader::Load(QStringLiteral("guitar")), tr("Artist biography"));
 
   // Add the playing widget to the fancy tab widget
   ui_->tabs->AddBottomWidget(ui_->widget_playing);
@@ -700,9 +697,6 @@ MainWindow::MainWindow(Application *app,
   QObject::connect(&*app_->task_manager(), &TaskManager::PauseCollectionWatchers, &*app_->collection(), &CollectionLibrary::PauseWatcher);
   QObject::connect(&*app_->task_manager(), &TaskManager::ResumeCollectionWatchers, &*app_->collection(), &CollectionLibrary::ResumeWatcher);
 
-  QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->collection(), &CollectionLibrary::CurrentSongChanged);
-  QObject::connect(&*app_->player(), &Player::Stopped, &*app_->collection(), &CollectionLibrary::Stopped);
-
   QObject::connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, &*app_->current_albumcover_loader(), &CurrentAlbumCoverLoader::LoadAlbumCover);
   QObject::connect(&*app_->current_albumcover_loader(), &CurrentAlbumCoverLoader::AlbumCoverLoaded, this, &MainWindow::AlbumCoverLoaded);
   QObject::connect(album_cover_choice_controller_, &AlbumCoverChoiceController::Error, this, &MainWindow::ShowErrorDialog);
@@ -981,34 +975,29 @@ MainWindow::MainWindow(Application *app,
   ui_->action_open_cd->setVisible(false);
 #endif
 
-  connect(&*app_->playlist_manager(), &PlaylistManager::CurrentSongChanged, artistbio_view_, &ArtistBioView::SongChanged);
-  connect(&*app_->player(), &Player::PlaylistFinished, artistbio_view_, &ArtistBioView::SongFinished);
-  connect(&*app_->player(), &Player::Stopped, artistbio_view_, &ArtistBioView::SongFinished);
-
   // Load settings
   qLog(Debug) << "Loading settings";
-  Settings settings;
+  settings_.beginGroup(MainWindowSettings::kSettingsGroup);
-  settings.beginGroup(MainWindowSettings::kSettingsGroup);
 
   // Set last used geometry to position window on the correct monitor
   // Set window state only if the window was last maximized
-  if (settings.contains("geometry")) {
+  if (settings_.contains("geometry")) {
-    restoreGeometry(settings.value("geometry").toByteArray());
+    restoreGeometry(settings_.value("geometry").toByteArray());
   }
 
-  if (!settings.contains(MainWindowSettings::kSplitterState) || !ui_->splitter->restoreState(settings.value(MainWindowSettings::kSplitterState).toByteArray())) {
+  if (!settings_.contains(MainWindowSettings::kSplitterState) || !ui_->splitter->restoreState(settings_.value(MainWindowSettings::kSplitterState).toByteArray())) {
     ui_->splitter->setSizes(QList<int>() << 20 << (width() - 20));
   }
 
-  ui_->tabs->setCurrentIndex(settings.value("current_tab", 1).toInt());
+  ui_->tabs->setCurrentIndex(settings_.value("current_tab", 1).toInt());
   FancyTabWidget::Mode default_mode = FancyTabWidget::Mode::LargeSidebar;
-  FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(settings.value("tab_mode", static_cast<int>(default_mode)).toInt());
+  FancyTabWidget::Mode tab_mode = static_cast<FancyTabWidget::Mode>(settings_.value("tab_mode", static_cast<int>(default_mode)).toInt());
   if (tab_mode == FancyTabWidget::Mode::None) tab_mode = default_mode;
   ui_->tabs->SetMode(tab_mode);
 
   TabSwitched();
 
-  file_view_->SetPath(settings.value("file_path", QDir::homePath()).toString());
+  file_view_->SetPath(settings_.value("file_path", QDir::homePath()).toString());
 
   // Users often collapse one side of the splitter by mistake and don't know how to restore it. This must be set after the state is restored above.
   ui_->splitter->setChildrenCollapsible(false);
@@ -1051,13 +1040,13 @@ MainWindow::MainWindow(Application *app,
     case BehaviourSettings::StartupBehaviour::Remember:
     default:{
 
-      was_maximized_ = settings.value(MainWindowSettings::kMaximized, true).toBool();
+      was_maximized_ = settings_.value(MainWindowSettings::kMaximized, true).toBool();
       if (was_maximized_) setWindowState(windowState() | Qt::WindowMaximized);
 
-      was_minimized_ = settings.value(MainWindowSettings::kMinimized, false).toBool();
+      was_minimized_ = settings_.value(MainWindowSettings::kMinimized, false).toBool();
       if (was_minimized_) setWindowState(windowState() | Qt::WindowMinimized);
 
-      if (!systemtrayicon_->IsSystemTrayAvailable() || !systemtrayicon_->isVisible() || !settings.value(MainWindowSettings::kHidden, false).toBool()) {
+      if (!systemtrayicon_->IsSystemTrayAvailable() || !systemtrayicon_->isVisible() || !settings_.value(MainWindowSettings::kHidden, false).toBool()) {
         show();
       }
       break;
@@ -1065,7 +1054,7 @@ MainWindow::MainWindow(Application *app,
   }
 #endif
 
-  bool show_sidebar = settings.value(MainWindowSettings::kShowSidebar, true).toBool();
+  bool show_sidebar = settings_.value(MainWindowSettings::kShowSidebar, true).toBool();
   ui_->sidebar_layout->setVisible(show_sidebar);
   ui_->action_toggle_show_sidebar->setChecked(show_sidebar);
 
@@ -1236,19 +1225,7 @@ void MainWindow::ReloadSettings() {
 
   osd_->ReloadSettings();
 
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  album_cover_choice_controller_->search_cover_auto_action()->setChecked(settings_.value(MainWindowSettings::kSearchForCoverAuto, true).toBool());
-  album_cover_choice_controller_->search_cover_auto_action()->setChecked(s.value(MainWindowSettings::kSearchForCoverAuto, true).toBool());
-  s.endGroup();
-
-  s.beginGroup(BehaviourSettings::kSettingsGroup);
-  bool artistbio = s.value("artistbio", false).toBool();
-  s.endGroup();
-  if (artistbio) {
-    ui_->tabs->EnableTab(artistbio_view_);
-  }
-  else {
-    ui_->tabs->DisableTab(artistbio_view_);
-  }
 
 #ifdef HAVE_SUBSONIC
   s.beginGroup(SubsonicSettings::kSettingsGroup);
@@ -1365,11 +1342,8 @@ void MainWindow::SaveSettings() {
   ui_->playlist->view()->SaveSettings();
   app_->scrobbler()->WriteCache();
 
-  Settings s;
+  settings_.setValue(MainWindowSettings::kShowSidebar, ui_->action_toggle_show_sidebar->isChecked());
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  settings_.setValue(MainWindowSettings::kSearchForCoverAuto, album_cover_choice_controller_->search_cover_auto_action()->isChecked());
-  s.setValue(MainWindowSettings::kShowSidebar, ui_->action_toggle_show_sidebar->isChecked());
-  s.setValue(MainWindowSettings::kSearchForCoverAuto, album_cover_choice_controller_->search_cover_auto_action()->isChecked());
-  s.endGroup();
 
 }
 
@@ -1610,35 +1584,23 @@ void MainWindow::ToggleSidebar(const bool checked) {
 
   ui_->sidebar_layout->setVisible(checked);
   TabSwitched();
-
+  settings_.setValue(MainWindowSettings::kShowSidebar, checked);
-  Settings s;
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  s.setValue(MainWindowSettings::kShowSidebar, checked);
-  s.endGroup();
 
 }
 
 void MainWindow::ToggleSearchCoverAuto(const bool checked) {
-
+  settings_.setValue(MainWindowSettings::kSearchForCoverAuto, checked);
-  Settings s;
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  s.setValue(MainWindowSettings::kSearchForCoverAuto, checked);
-  s.endGroup();
-
 }
 
 void MainWindow::SaveGeometry() {
 
   if (!initialized_) return;
 
-  Settings s;
+  settings_.setValue(MainWindowSettings::kMaximized, isMaximized());
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
+  settings_.setValue(MainWindowSettings::kMinimized, isMinimized());
-  s.setValue(MainWindowSettings::kMaximized, isMaximized());
+  settings_.setValue(MainWindowSettings::kHidden, isHidden());
-  s.setValue(MainWindowSettings::kMinimized, isMinimized());
+  settings_.setValue(MainWindowSettings::kGeometry, saveGeometry());
-  s.setValue(MainWindowSettings::kHidden, isHidden());
+  settings_.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
-  s.setValue(MainWindowSettings::kGeometry, saveGeometry());
-  s.setValue(MainWindowSettings::kSplitterState, ui_->splitter->saveState());
-  s.endGroup();
 
 }
 
@@ -1780,12 +1742,7 @@ void MainWindow::SetHiddenInTray(const bool hidden) {
 }
 
 void MainWindow::FilePathChanged(const QString &path) {
-
+  settings_.setValue("file_path", path);
-  Settings s;
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  s.setValue("file_path", path);
-  s.endGroup();
-
 }
 
 void MainWindow::Seeked(const qint64 microseconds) {
@@ -2367,9 +2324,7 @@ void MainWindow::EditValue() {
 void MainWindow::AddFile() {
 
   // Last used directory
-  Settings s;
+  QString directory = settings_.value("add_media_path", QDir::currentPath()).toString();
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  QString directory = s.value("add_media_path", QDir::currentPath()).toString();
 
   PlaylistParser parser(app_->tagreader_client(), app_->collection_backend());
 
@@ -2379,7 +2334,7 @@ void MainWindow::AddFile() {
   if (filenames.isEmpty()) return;
 
   // Save last used directory
-  s.setValue("add_media_path", filenames[0]);
+  settings_.setValue("add_media_path", filenames[0]);
 
   // Convert to URLs
   QList<QUrl> urls;
@@ -2397,16 +2352,14 @@ void MainWindow::AddFile() {
 void MainWindow::AddFolder() {
 
   // Last used directory
-  Settings s;
+  QString directory = settings_.value("add_folder_path", QDir::currentPath()).toString();
-  s.beginGroup(MainWindowSettings::kSettingsGroup);
-  QString directory = s.value("add_folder_path", QDir::currentPath()).toString();
 
   // Show dialog
   directory = QFileDialog::getExistingDirectory(this, tr("Add folder"), directory);
   if (directory.isEmpty()) return;
 
   // Save last used directory
-  s.setValue("add_folder_path", directory);
+  settings_.setValue("add_folder_path", directory);
 
   // Add media
   MimeData *mimedata = new MimeData;

src/core/mainwindow.h

@@ -45,6 +45,7 @@
 #include <QImage>
 #include <QPixmap>
 #include <QTimer>
+#include <QSettings>
 #include <QtEvents>
 
 #include "includes/scoped_ptr.h"
@@ -52,6 +53,7 @@
 #include "includes/lazy.h"
 #include "core/platforminterface.h"
 #include "core/song.h"
+#include "core/settings.h"
 #include "core/commandlineoptions.h"
 #include "tagreader/tagreaderclient.h"
 #include "osd/osdbase.h"
@@ -97,7 +99,6 @@ class Windows7ThumbBar;
 class AddStreamDialog;
 class LastFMImportDialog;
 class RadioViewContainer;
-class ArtistBioView;
 
 #ifdef HAVE_DISCORD_RPC
 namespace discord {
@@ -359,8 +360,6 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   RadioViewContainer *radio_view_;
 
-  ArtistBioView *artistbio_view_;
-
   LastFMImportDialog *lastfm_import_dialog_;
 
   QAction *collection_show_all_;
@@ -391,6 +390,7 @@ class MainWindow : public QMainWindow, public PlatformInterface {
 
   QTimer *track_position_timer_;
   QTimer *track_slider_timer_;
+  Settings settings_;
 
   bool keep_running_;
   bool playing_widget_;

src/core/metatypes.cpp

@@ -68,7 +68,6 @@
 #include "smartplaylists/playlistgenerator_fwd.h"
 
 #include "radios/radiochannel.h"
-#include "widgets/collapsibleinfopane.h"
 
 #ifdef HAVE_MTP
 #  include "device/mtpconnection.h"
@@ -148,8 +147,6 @@ void RegisterMetaTypes() {
   qRegisterMetaType<RadioChannel>("RadioChannel");
   qRegisterMetaType<RadioChannelList>("RadioChannelList");
 
-  qRegisterMetaType<CollapsibleInfoPane::Data>("CollapsibleInfoPane::Data");
-
 #ifdef HAVE_MTP
   qRegisterMetaType<MtpConnection*>("MtpConnection*");
 #endif

src/core/song.cpp

@@ -805,19 +805,19 @@ bool Song::lyrics_supported() const {
 }
 
 bool Song::albumartistsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::albumsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::artistsort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::composersort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::performersort_supported() const {
@@ -826,7 +826,7 @@ bool Song::performersort_supported() const {
 }
 
 bool Song::titlesort_supported() const {
-  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::OggOpus || d->filetype_ == FileType::MPEG;
+  return d->filetype_ == FileType::FLAC || d->filetype_ == FileType::OggFlac || d->filetype_ == FileType::OggVorbis || d->filetype_ == FileType::MPEG;
 }
 
 bool Song::save_embedded_cover_supported(const FileType filetype) {

src/core/songloader.cpp

@@ -98,9 +98,6 @@ SongLoader::SongLoader(const SharedPtr<UrlHandlers> url_handlers,
 
   QObject::connect(timeout_timer_, &QTimer::timeout, this, &SongLoader::Timeout);
 
-  QObject::connect(playlist_parser_, &PlaylistParser::Error, this, &SongLoader::ParserError);
-  QObject::connect(cue_parser_, &CueParser::Error, this, &SongLoader::ParserError);
-
 }
 
 SongLoader::~SongLoader() {
@@ -109,10 +106,6 @@ SongLoader::~SongLoader() {
 
 }
 
-void SongLoader::ParserError(const QString &error) {
-  errors_ << error;
-}
-
 SongLoader::Result SongLoader::Load(const QUrl &url) {
 
   if (url.isEmpty()) return Result::Error;
@@ -294,7 +287,6 @@ SongLoader::Result SongLoader::LoadLocalAsync(const QString &filename) {
   }
 
   if (parser) {  // It's a playlist!
-    QObject::connect(parser, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
     qLog(Debug) << "Parsing using" << parser->name();
     LoadPlaylist(parser, filename);
     return Result::Success;
@@ -714,10 +706,6 @@ void SongLoader::MagicReady() {
     StopTypefindAsync(true);
   }
 
-  if (parser_) {
-    QObject::connect(parser_, &ParserBase::Error, this, &SongLoader::ParserError, static_cast<Qt::ConnectionType>(Qt::QueuedConnection | Qt::UniqueConnection));
-  }
-
   state_ = State::WaitingForData;
 
   if (!IsPipelinePlaying()) {

src/core/songloader.h

@@ -99,7 +99,6 @@ class SongLoader : public QObject {
   void ScheduleTimeout();
   void Timeout();
   void StopTypefind();
-  void ParserError(const QString &error);
 
 #ifdef HAVE_AUDIOCD
   void AudioCDTracksLoadErrorSlot(const QString &error);

src/engine/gstenginepipeline.cpp

@@ -178,6 +178,7 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       audiobin_(nullptr),
       audiosink_(nullptr),
       audioqueue_(nullptr),
+      audioqueueconverter_(nullptr),
       volume_(nullptr),
       volume_sw_(nullptr),
       volume_fading_(nullptr),
@@ -186,7 +187,6 @@ GstEnginePipeline::GstEnginePipeline(QObject *parent)
       equalizer_(nullptr),
       equalizer_preamp_(nullptr),
       eventprobe_(nullptr),
-      bufferprobe_(nullptr),
       logged_unsupported_analyzer_format_(false),
       about_to_finish_(false),
       finish_requested_(false),
@@ -436,7 +436,7 @@ void GstEnginePipeline::Disconnect() {
     }
 
     if (buffer_probe_cb_id_.has_value()) {
-      GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
+      GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
       if (pad) {
         gst_pad_remove_probe(pad, buffer_probe_cb_id_.value());
         gst_object_unref(pad);
@@ -674,13 +674,8 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  GstElement *audioqueueconverter = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
+  audioqueueconverter_ = CreateElement(u"audioconvert"_s, u"audioqueueconverter"_s, audiobin_, error);
-  if (!audioqueueconverter) {
+  if (!audioqueueconverter_) {
-    return false;
-  }
-
-  GstElement *audioqueueresampler = CreateElement(u"audioresample"_s, u"audioqueueresampler"_s, audiobin_, error);
-  if (!audioqueueresampler) {
     return false;
   }
 
@@ -689,11 +684,6 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  GstElement *audiosinkresampler = CreateElement(u"audioresample"_s, u"audiosinkresampler"_s, audiobin_, error);
-  if (!audiosinkresampler) {
-    return false;
-  }
-
   // Create the volume element if it's enabled.
   if (volume_enabled_ && !volume_) {
     volume_sw_ = CreateElement(u"volume"_s, u"volume_sw"_s, audiobin_, error);
@@ -771,8 +761,7 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   }
 
-  eventprobe_ = audioqueueconverter;
+  eventprobe_ = audioqueueconverter_;
-  bufferprobe_ = audioqueueconverter;
 
   // Create the replaygain elements if it's enabled.
   GstElement *rgvolume = nullptr;
@@ -858,17 +847,12 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
 
   // Link all elements
 
-  if (!gst_element_link(audioqueue_, audioqueueconverter)) {
+  if (!gst_element_link(audioqueue_, audioqueueconverter_)) {
     error = u"Failed to link audio queue to audio queue converter."_s;
     return false;
   }
 
-  if (!gst_element_link(audioqueueconverter, audioqueueresampler)) {
+  GstElement *element_link = audioqueueconverter_;  // The next element to link from.
-    error = u"Failed to link audio queue converter to audio queue resampler."_s;
-    return false;
-  }
-
-  GstElement *element_link = audioqueueresampler;  // The next element to link from.
 
   // Link replaygain elements if enabled.
   if (rg_enabled_ && rgvolume && rglimiter && rgconverter) {
@@ -944,11 +928,6 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
     return false;
   }
 
-  if (!gst_element_link(audiosinkconverter, audiosinkresampler)) {
-    error = "Failed to link audio sink converter to audio sink resampler."_L1;
-    return false;
-  }
-
   {
     GstCaps *caps = gst_caps_new_empty_simple("audio/x-raw");
     if (!caps) {
@@ -959,16 +938,16 @@ bool GstEnginePipeline::InitAudioBin(QString &error) {
       qLog(Debug) << "Setting channels to" << channels_;
       gst_caps_set_simple(caps, "channels", G_TYPE_INT, channels_, nullptr);
     }
-    const bool link_filtered_result = gst_element_link_filtered(audiosinkresampler, audiosink_, caps);
+    const bool link_filtered_result = gst_element_link_filtered(audiosinkconverter, audiosink_, caps);
     gst_caps_unref(caps);
     if (!link_filtered_result) {
-      error = "Failed to link audio sink resampler to audio sink with filter for "_L1 + output_;
+      error = "Failed to link audio sink converter to audio sink with filter for "_L1 + output_;
       return false;
     }
   }
 
   {  // Add probes and handlers.
-    GstPad *pad = gst_element_get_static_pad(bufferprobe_, "src");
+    GstPad *pad = gst_element_get_static_pad(audioqueueconverter_, "src");
     if (pad) {
       buffer_probe_cb_id_ = gst_pad_add_probe(pad, GST_PAD_PROBE_TYPE_BUFFER, BufferProbeCallback, this, nullptr);
       gst_object_unref(pad);

src/engine/gstenginepipeline.h

@@ -355,6 +355,7 @@ class GstEnginePipeline : public QObject {
   GstElement *audiobin_;
   GstElement *audiosink_;
   GstElement *audioqueue_;
+  GstElement *audioqueueconverter_;
   GstElement *volume_;
   GstElement *volume_sw_;
   GstElement *volume_fading_;
@@ -363,7 +364,6 @@ class GstEnginePipeline : public QObject {
   GstElement *equalizer_;
   GstElement *equalizer_preamp_;
   GstElement *eventprobe_;
-  GstElement *bufferprobe_;
 
   std::optional<gulong> upstream_events_probe_cb_id_;
   std::optional<gulong> buffer_probe_cb_id_;

src/globalshortcuts/globalshortcutsmanager.cpp

@@ -32,7 +32,6 @@
 #include <QKeySequence>
 
 #include "core/logging.h"
-#include "core/settings.h"
 
 #include "globalshortcutsmanager.h"
 #include "globalshortcutsbackend.h"
@@ -59,32 +58,29 @@ using namespace Qt::Literals::StringLiterals;
 
 GlobalShortcutsManager::GlobalShortcutsManager(QWidget *parent) : QWidget(parent) {
 
-  Settings s;
+  settings_.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
-  s.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
 
   // Create actions
-  AddShortcut(s, u"play"_s, tr("Play"), std::bind(&GlobalShortcutsManager::Play, this));
+  AddShortcut(u"play"_s, tr("Play"), std::bind(&GlobalShortcutsManager::Play, this));
-  AddShortcut(s, u"pause"_s, tr("Pause"), std::bind(&GlobalShortcutsManager::Pause, this));
+  AddShortcut(u"pause"_s, tr("Pause"), std::bind(&GlobalShortcutsManager::Pause, this));
-  AddShortcut(s, u"play_pause"_s, tr("Play/Pause"), std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay));
+  AddShortcut(u"play_pause"_s, tr("Play/Pause"), std::bind(&GlobalShortcutsManager::PlayPause, this), QKeySequence(Qt::Key_MediaPlay));
-  AddShortcut(s, u"stop"_s, tr("Stop"), std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop));
+  AddShortcut(u"stop"_s, tr("Stop"), std::bind(&GlobalShortcutsManager::Stop, this), QKeySequence(Qt::Key_MediaStop));
-  AddShortcut(s, u"stop_after"_s, tr("Stop playing after current track"), std::bind(&GlobalShortcutsManager::StopAfter, this));
+  AddShortcut(u"stop_after"_s, tr("Stop playing after current track"), std::bind(&GlobalShortcutsManager::StopAfter, this));
-  AddShortcut(s, u"next_track"_s, tr("Next track"), std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext));
+  AddShortcut(u"next_track"_s, tr("Next track"), std::bind(&GlobalShortcutsManager::Next, this), QKeySequence(Qt::Key_MediaNext));
-  AddShortcut(s, u"prev_track"_s, tr("Previous track"), std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious));
+  AddShortcut(u"prev_track"_s, tr("Previous track"), std::bind(&GlobalShortcutsManager::Previous, this), QKeySequence(Qt::Key_MediaPrevious));
-  AddShortcut(s, u"restart_or_prev_track"_s, tr("Restart or previous track"), std::bind(&GlobalShortcutsManager::RestartOrPrevious, this));
+  AddShortcut(u"restart_or_prev_track"_s, tr("Restart or previous track"), std::bind(&GlobalShortcutsManager::RestartOrPrevious, this));
-  AddShortcut(s, u"inc_volume"_s, tr("Increase volume"), std::bind(&GlobalShortcutsManager::IncVolume, this));
+  AddShortcut(u"inc_volume"_s, tr("Increase volume"), std::bind(&GlobalShortcutsManager::IncVolume, this));
-  AddShortcut(s, u"dec_volume"_s, tr("Decrease volume"), std::bind(&GlobalShortcutsManager::DecVolume, this));
+  AddShortcut(u"dec_volume"_s, tr("Decrease volume"), std::bind(&GlobalShortcutsManager::DecVolume, this));
-  AddShortcut(s, u"mute"_s, tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this));
+  AddShortcut(u"mute"_s, tr("Mute"), std::bind(&GlobalShortcutsManager::Mute, this));
-  AddShortcut(s, u"seek_forward"_s, tr("Seek forward"), std::bind(&GlobalShortcutsManager::SeekForward, this));
+  AddShortcut(u"seek_forward"_s, tr("Seek forward"), std::bind(&GlobalShortcutsManager::SeekForward, this));
-  AddShortcut(s, u"seek_backward"_s, tr("Seek backward"), std::bind(&GlobalShortcutsManager::SeekBackward, this));
+  AddShortcut(u"seek_backward"_s, tr("Seek backward"), std::bind(&GlobalShortcutsManager::SeekBackward, this));
-  AddShortcut(s, u"show_hide"_s, tr("Show/Hide"), std::bind(&GlobalShortcutsManager::ShowHide, this));
+  AddShortcut(u"show_hide"_s, tr("Show/Hide"), std::bind(&GlobalShortcutsManager::ShowHide, this));
-  AddShortcut(s, u"show_osd"_s, tr("Show OSD"), std::bind(&GlobalShortcutsManager::ShowOSD, this));
+  AddShortcut(u"show_osd"_s, tr("Show OSD"), std::bind(&GlobalShortcutsManager::ShowOSD, this));
-  AddShortcut(s, u"toggle_pretty_osd"_s, tr("Toggle Pretty OSD"), std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this));  // Toggling possible only for pretty OSD
+  AddShortcut(u"toggle_pretty_osd"_s, tr("Toggle Pretty OSD"), std::bind(&GlobalShortcutsManager::TogglePrettyOSD, this));  // Toggling possible only for pretty OSD
-  AddShortcut(s, u"shuffle_mode"_s, tr("Change shuffle mode"), std::bind(&GlobalShortcutsManager::CycleShuffleMode, this));
+  AddShortcut(u"shuffle_mode"_s, tr("Change shuffle mode"), std::bind(&GlobalShortcutsManager::CycleShuffleMode, this));
-  AddShortcut(s, u"repeat_mode"_s, tr("Change repeat mode"), std::bind(&GlobalShortcutsManager::CycleRepeatMode, this));
+  AddShortcut(u"repeat_mode"_s, tr("Change repeat mode"), std::bind(&GlobalShortcutsManager::CycleRepeatMode, this));
-  AddShortcut(s, u"toggle_scrobbling"_s, tr("Enable/disable scrobbling"), std::bind(&GlobalShortcutsManager::ToggleScrobbling, this));
+  AddShortcut(u"toggle_scrobbling"_s, tr("Enable/disable scrobbling"), std::bind(&GlobalShortcutsManager::ToggleScrobbling, this));
-  AddShortcut(s, u"love"_s, tr("Love"), std::bind(&GlobalShortcutsManager::Love, this));
+  AddShortcut(u"love"_s, tr("Love"), std::bind(&GlobalShortcutsManager::Love, this));
-
-  s.endGroup();
 
   // Create backends - these do the actual shortcut registration
 
@@ -120,39 +116,35 @@ void GlobalShortcutsManager::ReloadSettings() {
   backends_enabled_ << GlobalShortcutsBackend::Type::Win;
 #endif
 
-  {
-    Settings s;
-    s.beginGroup(GlobalShortcutsSettings::kSettingsGroup);
 #ifdef HAVE_KGLOBALACCEL_GLOBALSHORTCUTS
-    if (s.value(GlobalShortcutsSettings::kUseKGlobalAccel, true).toBool()) {
+  if (settings_.value(GlobalShortcutsSettings::kUseKGlobalAccel, true).toBool()) {
-      backends_enabled_ << GlobalShortcutsBackend::Type::KGlobalAccel;
+    backends_enabled_ << GlobalShortcutsBackend::Type::KGlobalAccel;
-    }
-#endif
-#ifdef HAVE_X11_GLOBALSHORTCUTS
-    if (s.value(GlobalShortcutsSettings::kUseX11, false).toBool()) {
-      backends_enabled_ << GlobalShortcutsBackend::Type::X11;
-    }
-#endif
-    s.endGroup();
   }
+#endif
+
+#ifdef HAVE_X11_GLOBALSHORTCUTS
+  if (settings_.value(GlobalShortcutsSettings::kUseX11, false).toBool()) {
+    backends_enabled_ << GlobalShortcutsBackend::Type::X11;
+  }
+#endif
 
   Unregister();
   Register();
 
 }
 
-void GlobalShortcutsManager::AddShortcut(Settings &s, const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key) {  // clazy:exclude=function-args-by-ref
+void GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key) {  // clazy:exclude=function-args-by-ref
 
-  Shortcut shortcut = AddShortcut(s, id, name, default_key);
+  Shortcut shortcut = AddShortcut(id, name, default_key);
   QObject::connect(shortcut.action, &QAction::triggered, this, signal);
 
 }
 
-GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(Settings &s, const QString &id, const QString &name, const QKeySequence &default_key) {
+GlobalShortcutsManager::Shortcut GlobalShortcutsManager::AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key) {
 
   Shortcut shortcut;
   shortcut.action = new QAction(name, this);
-  QKeySequence key_sequence = QKeySequence::fromString(s.value(id, default_key.toString()).toString());
+  QKeySequence key_sequence = QKeySequence::fromString(settings_.value(id, default_key.toString()).toString());
   shortcut.action->setShortcut(key_sequence);
   shortcut.id = id;
   shortcut.default_key = default_key;

src/globalshortcuts/globalshortcutsmanager.h

@@ -32,14 +32,15 @@
 #include <QMap>
 #include <QString>
 #include <QKeySequence>
+#include <QSettings>
 
 #include "globalshortcutsbackend.h"
 
+#include "core/settings.h"
+
 class QShortcut;
 class QAction;
 
-class Settings;
-
 class GlobalShortcutsManager : public QWidget {
   Q_OBJECT
 
@@ -98,11 +99,12 @@ class GlobalShortcutsManager : public QWidget {
   void Love();
 
  private:
-  void AddShortcut(Settings &s, const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key = QKeySequence(0));
+  void AddShortcut(const QString &id, const QString &name, std::function<void()> signal, const QKeySequence &default_key = QKeySequence(0));
-  Shortcut AddShortcut(Settings &s, const QString &id, const QString &name, const QKeySequence &default_key);
+  Shortcut AddShortcut(const QString &id, const QString &name, const QKeySequence &default_key);
 
  private:
   QList<GlobalShortcutsBackend*> backends_;
+  Settings settings_;
   QList<GlobalShortcutsBackend::Type> backends_enabled_;
   QMap<QString, Shortcut> shortcuts_;
 };

src/playlist/playlistcontainer.cpp

@@ -106,6 +106,8 @@ PlaylistContainer::PlaylistContainer(QWidget *parent)
   no_matches_font.setBold(true);
   no_matches_label_->setFont(no_matches_font);
 
+  settings_.beginGroup(kSettingsGroup);
+
   // Tab bar
   ui_->tab_bar->setExpanding(false);
   ui_->tab_bar->setMovable(true);
@@ -255,11 +257,7 @@ void PlaylistContainer::ReloadSettings() {
   ui_->redo->setIconSize(QSize(iconsize, iconsize));
   ui_->search_field->setIconSize(iconsize);
 
-  s.beginGroup(kSettingsGroup);
+  bool playlist_clear = settings_.value("playlist_clear", true).toBool();
-  const bool playlist_clear = s.value("playlist_clear", true).toBool();
-  const bool show_toolbar = s.value("show_toolbar", true).toBool();
-  s.endGroup();
-
   if (playlist_clear) {
     ui_->clear->show();
   }
@@ -267,6 +265,7 @@ void PlaylistContainer::ReloadSettings() {
     ui_->clear->hide();
   }
 
+  bool show_toolbar = settings_.value("show_toolbar", true).toBool();
   ui_->toolbar->setVisible(show_toolbar);
 
   if (!show_toolbar) ui_->search_field->clear();
@@ -309,12 +308,7 @@ void PlaylistContainer::PlaylistAdded(const int id, const QString &name, const b
   ui_->tab_bar->InsertTab(id, index, name, favorite);
 
   // Are we start up, should we select this tab?
-  Settings s;
+  if (starting_up_ && settings_.value("current_playlist", 1).toInt() == id) {
-  s.beginGroup(kSettingsGroup);
-  const int current_playlist = s.value("current_playlist", 1).toInt();
-  s.endGroup();
-
-  if (starting_up_ && current_playlist == id) {
     starting_up_ = false;
     ui_->tab_bar->set_current_id(id);
   }
@@ -353,14 +347,12 @@ void PlaylistContainer::NewPlaylist() { manager_->New(tr("Playlist")); }
 
 void PlaylistContainer::LoadPlaylist() {
 
-  Settings s;
+  QString filename = settings_.value("last_load_playlist").toString();
-  s.beginGroup(kSettingsGroup);
-  QString filename = s.value("last_load_playlist").toString();
   filename = QFileDialog::getOpenFileName(this, tr("Load playlist"), filename, manager_->parser()->filters(PlaylistParser::Type::Load));
 
   if (filename.isNull()) return;
 
-  s.setValue("last_load_playlist", filename);
+  settings_.setValue("last_load_playlist", filename);
 
   manager_->Load(filename);
 
@@ -399,10 +391,7 @@ void PlaylistContainer::Save() {
 
   if (starting_up_) return;
 
-  Settings s;
+  settings_.setValue("current_playlist", ui_->tab_bar->current_id());
-  s.beginGroup(kSettingsGroup);
-  s.setValue("current_playlist", ui_->tab_bar->current_id());
-  s.endGroup();
 
 }
 

src/playlist/playlistcontainer.h

@@ -28,6 +28,7 @@
 #include <QWidget>
 #include <QString>
 #include <QIcon>
+#include <QSettings>
 
 class QTimer;
 class QTimeLine;
@@ -44,6 +45,7 @@ class PlaylistView;
 class Ui_PlaylistContainer;
 
 #include "includes/shared_ptr.h"
+#include "core/settings.h"
 
 class PlaylistContainer : public QWidget {
   Q_OBJECT
@@ -116,6 +118,7 @@ class PlaylistContainer : public QWidget {
   QAction *redo_;
   Playlist *playlist_;
 
+  Settings settings_;
   bool starting_up_;
 
   bool tab_bar_visible_;

src/playlist/playlistsequence.cpp

@@ -22,6 +22,7 @@
 #include "config.h"
 
 #include <utility>
+#include <algorithm>
 
 #include <QWidget>
 #include <QVariant>
@@ -33,9 +34,12 @@
 #include <QAction>
 #include <QActionGroup>
 #include <QToolButton>
+#include <QScreen>
+#include <QGuiApplication>
 
 #include "core/iconloader.h"
 #include "core/settingsprovider.h"
+#include "utilities/screenutils.h"
 #include "playlistsequence.h"
 #include "ui_playlistsequence.h"
 
@@ -43,7 +47,14 @@ using namespace Qt::Literals::StringLiterals;
 
 namespace {
 constexpr char kSettingsGroup[] = "PlaylistSequence";
-}
+
+// Base icon size for reference resolution (1920x1080 at 1.0 scale)
+constexpr int kBaseIconSize = 20;
+constexpr int kReferenceWidth = 1920;
+constexpr int kReferenceHeight = 1080;
+constexpr qreal kReferenceDevicePixelRatio = 1.0;
+
+}  // namespace
 
 PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
     : QWidget(parent),
@@ -60,9 +71,11 @@ PlaylistSequence::PlaylistSequence(QWidget *parent, SettingsProvider *settings)
   // Icons
   ui_->repeat->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-repeat"_s)));
   ui_->shuffle->setIcon(AddDesaturatedIcon(IconLoader::Load(u"media-playlist-shuffle"_s)));
-  const int base_icon_size = static_cast<int>(fontMetrics().height() * 1.2);
+  
-  ui_->repeat->setIconSize(QSize(base_icon_size, base_icon_size));
+  // Calculate icon size dynamically based on screen resolution, aspect ratio, and scaling
-  ui_->shuffle->setIconSize(QSize(base_icon_size, base_icon_size));
+  const int icon_size = CalculateIconSize();
+  ui_->repeat->setIconSize(QSize(icon_size, icon_size));
+  ui_->shuffle->setIconSize(QSize(icon_size, icon_size));
 
   // Remove arrow indicators
   ui_->repeat->setStyleSheet(u"QToolButton::menu-indicator { image: none; }"_s);
@@ -99,6 +112,48 @@ PlaylistSequence::~PlaylistSequence() {
   delete ui_;
 }
 
+int PlaylistSequence::CalculateIconSize() {
+
+  // Get screen information for the widget
+  QScreen *screen = Utilities::GetScreen(this);
+  if (!screen) {
+    screen = QGuiApplication::primaryScreen();
+  }
+  
+  if (!screen) {
+    // Fallback to a reasonable default if no screen is available
+    return kBaseIconSize;
+  }
+
+  // Get screen properties
+  const QSize screen_size = screen->size();
+  const qreal device_pixel_ratio = screen->devicePixelRatio();
+  const int screen_width = screen_size.width();
+  const int screen_height = screen_size.height();
+  
+  // Calculate scaling factors based on resolution
+  // Use the smaller dimension to handle both landscape and portrait orientations
+  const int min_dimension = std::min(screen_width, screen_height);
+  const int ref_min_dimension = std::min(kReferenceWidth, kReferenceHeight);
+  const qreal resolution_factor = static_cast<qreal>(min_dimension) / static_cast<qreal>(ref_min_dimension);
+  
+  // Apply device pixel ratio (for high-DPI displays)
+  const qreal dpi_factor = device_pixel_ratio / kReferenceDevicePixelRatio;
+  
+  // Calculate final icon size with combined scaling
+  // Formula: 50% from resolution scaling + 50% from DPI scaling + 50% base multiplier
+  // The 0.5 base ensures icons scale up appropriately across different displays
+  // Without it, icons would be too small on average displays
+  const qreal combined_factor = (resolution_factor * 0.5) + (dpi_factor * 0.5) + 0.5;
+  int calculated_size = static_cast<int>(kBaseIconSize * combined_factor);
+  
+  // Clamp to reasonable bounds (minimum 16px, maximum 48px)
+  calculated_size = std::max(16, std::min(48, calculated_size));
+  
+  return calculated_size;
+
+}
+
 void PlaylistSequence::Load() {
 
   loading_ = true;  // Stops these setter functions calling Save()

src/playlist/playlistsequence.h

@@ -83,6 +83,7 @@ class PlaylistSequence : public QWidget {
  private:
   void Load();
   void Save();
+  int CalculateIconSize();
   static QIcon AddDesaturatedIcon(const QIcon &icon);
   static QPixmap DesaturatedPixmap(const QPixmap &pixmap);
 

src/playlist/playlistview.cpp

@@ -57,6 +57,7 @@
 #include <QLinearGradient>
 #include <QScrollBar>
 #include <QtEvents>
+#include <QSettings>
 #include <QDrag>
 
 #include "includes/qt_blurimage.h"

src/playlist/songloaderinserter.cpp

@@ -80,13 +80,12 @@ void SongLoaderInserter::Load(Playlist *destination, const int row, const bool p
       songs_ << loader->songs();
       playlist_name_ = loader->playlist_name();
     }
-    
+    else {
-    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
+      const QStringList errors = loader->errors();
-    const QStringList errors = loader->errors();
+      for (const QString &error : errors) {
-    for (const QString &error : errors) {
+        Q_EMIT Error(error);
-      Q_EMIT Error(error);
+      }
     }
-    
     delete loader;
   }
 
@@ -193,13 +192,11 @@ void SongLoaderInserter::AsyncLoad() {
     const SongLoader::Result result = loader->LoadFilenamesBlocking();
     task_manager_->SetTaskProgress(async_load_id, static_cast<quint64>(++async_progress));
 
-    // Always check for errors, even on success (e.g., playlist parsed but some songs failed to load)
-    const QStringList errors = loader->errors();
-    for (const QString &error : errors) {
-      Q_EMIT Error(error);
-    }
-
     if (result == SongLoader::Result::Error) {
+      const QStringList errors = loader->errors();
+      for (const QString &error : errors) {
+        Q_EMIT Error(error);
+      }
       continue;
     }
 

src/playlistparsers/parserbase.cpp

@@ -112,18 +112,10 @@ void ParserBase::LoadSong(const QString &filename_or_url, const qint64 beginning
     }
   }
 
-  // Check if the file exists before trying to read it
-  if (!QFile::exists(filename)) {
-    qLog(Error) << "File does not exist:" << filename;
-    Q_EMIT Error(tr("File %1 does not exist").arg(filename));
-    return;
-  }
-
   if (tagreader_client_) {
     const TagReaderResult result = tagreader_client_->ReadFileBlocking(filename, song);
     if (!result.success()) {
       qLog(Error) << "Could not read file" << filename << result.error_string();
-      Q_EMIT Error(tr("Could not read file %1: %2").arg(filename, result.error_string()));
     }
   }
 

src/settings/behavioursettingspage.cpp

@@ -165,7 +165,6 @@ void BehaviourSettingsPage::Load() {
 
   ui_->checkbox_resumeplayback->setChecked(s.value(kResumePlayback, false).toBool());
   ui_->checkbox_playingwidget->setChecked(s.value(kPlayingWidget, true).toBool());
-  ui_->checkbox_artistbio->setChecked(s.value("artistbio", false).toBool());
 
 #ifndef Q_OS_MACOS
   const StartupBehaviour startup_behaviour = static_cast<StartupBehaviour>(s.value(kStartupBehaviour, static_cast<int>(StartupBehaviour::Remember)).toInt());
@@ -233,12 +232,9 @@ void BehaviourSettingsPage::Save() {
 #if defined(HAVE_DBUS) && !defined(Q_OS_MACOS)
   s.setValue(kTaskbarProgress, ui_->checkbox_taskbar_progress->isChecked());
 #endif
-
   s.setValue(kResumePlayback, ui_->checkbox_resumeplayback->isChecked());
   s.setValue(kPlayingWidget, ui_->checkbox_playingwidget->isChecked());
 
-  s.setValue("artistbio", ui_->checkbox_artistbio->isChecked());
-
   StartupBehaviour startup_behaviour = StartupBehaviour::Remember;
   if (ui_->radiobutton_remember->isChecked()) startup_behaviour = StartupBehaviour::Remember;
   if (ui_->radiobutton_show->isChecked()) startup_behaviour = StartupBehaviour::Show;

src/settings/behavioursettingspage.ui

@@ -65,13 +65,6 @@
      </property>
     </widget>
    </item>
-   <item>
-    <widget class="QCheckBox" name="checkbox_artistbio">
-     <property name="text">
-      <string>Artist biography</string>
-     </property>
-    </widget>
-   </item>
    <item>
     <widget class="QGroupBox" name="groupbox_startup">
      <property name="title">

src/translations/strawberry_ru_RU.ts

@@ -5526,7 +5526,7 @@ Are you sure you want to continue?</source>
     <name>RadioParadiseService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение каналов %1</translation>
+      <translation>Получение %1 каналов</translation>
     </message>
   </context>
   <context>
@@ -6191,7 +6191,7 @@ Are you sure you want to continue?</source>
     <name>SomaFMService</name>
     <message>
       <source>Getting %1 channels</source>
-      <translation>Получение каналов %1</translation>
+      <translation>Получение %1 каналов</translation>
     </message>
   </context>
   <context>

src/translations/strawberry_tr_TR.ts

@@ -1187,7 +1187,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Search for this</source>
@@ -3496,7 +3496,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Unskip track</source>
@@ -4431,7 +4431,7 @@ If there are no matches then it will use the largest image in the directory.</tr
     </message>
     <message>
       <source>&amp;Hide %1</source>
-      <translation>&amp;%1 ögesini sakla</translation>
+      <translation>&amp;%1&apos;i sakla</translation>
     </message>
   </context>
   <context>
@@ -6407,7 +6407,7 @@ Devam etmek istediğinizden emin misiniz?</translation>
     </message>
     <message>
       <source>Queue to play next</source>
-      <translation>Sıradaki yap</translation>
+      <translation>Sıradaki Yap</translation>
     </message>
     <message>
       <source>Remove from favorites</source>

src/widgets/collapsibleinfoheader.cpp

@@ -1,174 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QWidget>
-#include <QApplication>
-#include <QString>
-#include <QIcon>
-#include <QPainter>
-#include <QPalette>
-#include <QColor>
-#include <QStyle>
-#include <QFont>
-#include <QPropertyAnimation>
-#include <QStyleOption>
-#include <QEnterEvent>
-#include <QPaintEvent>
-#include <QMouseEvent>
-#include <QEvent>
-
-#include "collapsibleinfoheader.h"
-
-const int CollapsibleInfoHeader::kHeight = 20;
-const int CollapsibleInfoHeader::kIconSize = 16;
-
-CollapsibleInfoHeader::CollapsibleInfoHeader(QWidget* parent)
-    : QWidget(parent),
-      expanded_(false),
-      hovering_(false),
-      animation_(new QPropertyAnimation(this, "opacity", this)),
-      opacity_(0.0) {
-
-  setMinimumHeight(kHeight);
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-  setCursor(QCursor(Qt::PointingHandCursor));
-
-}
-
-void CollapsibleInfoHeader::SetTitle(const QString &title) {
-  title_ = title;
-  update();
-}
-
-void CollapsibleInfoHeader::SetIcon(const QIcon &icon) {
-  icon_ = icon;
-  update();
-}
-
-void CollapsibleInfoHeader::SetExpanded(const bool expanded) {
-
-  expanded_ = expanded;
-
-  emit ExpandedToggled(expanded);
-  if (expanded)
-    emit Expanded();
-  else
-    emit Collapsed();
-}
-
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-void CollapsibleInfoHeader::enterEvent(QEnterEvent*) {
-#else
-void CollapsibleInfoHeader::enterEvent(QEvent*) {
-#endif
-
-  hovering_ = true;
-  if (!expanded_) {
-    animation_->stop();
-    animation_->setEndValue(1.0);
-    animation_->setDuration(80);
-    animation_->start();
-  }
-
-}
-
-void CollapsibleInfoHeader::leaveEvent(QEvent*) {
-
-  hovering_ = false;
-  if (!expanded_) {
-    animation_->stop();
-    animation_->setEndValue(0.0);
-    animation_->setDuration(160);
-    animation_->start();
-  }
-
-}
-
-void CollapsibleInfoHeader::set_opacity(const float opacity) {
-  opacity_ = opacity;
-  update();
-}
-
-void CollapsibleInfoHeader::paintEvent(QPaintEvent*) {
-
-  QPainter p(this);
-
-  QColor active_text_color(palette().color(QPalette::Active, QPalette::HighlightedText));
-  QColor inactive_text_color(palette().color(QPalette::Active, QPalette::Text));
-  QColor text_color;
-  if (expanded_) {
-    text_color = active_text_color;
-  }
-  else {
-    p.setOpacity(0.4 + opacity_ * 0.6);
-    text_color = QColor(active_text_color.red() * opacity_ + inactive_text_color.red() * (1.0 - opacity_), active_text_color.green() * opacity_ + inactive_text_color.green() * (1.0 - opacity_), active_text_color.blue() * opacity_ + inactive_text_color.blue() * (1.0 - opacity_));
-  }
-
-  QRect indicator_rect(0, 0, height(), height());
-  QRect icon_rect(height() + 2, (kHeight - kIconSize) / 2, kIconSize, kIconSize);
-  QRect text_rect(rect());
-  text_rect.setLeft(icon_rect.right() + 4);
-
-  // Draw the background
-  QColor highlight(palette().color(QPalette::Active, QPalette::Highlight));
-  const QColor bg_color_1(highlight.lighter(120));
-  const QColor bg_color_2(highlight.darker(120));
-  const QColor bg_border(palette().color(QPalette::Dark));
-  QLinearGradient bg_brush(rect().topLeft(), rect().bottomLeft());
-  bg_brush.setColorAt(0.0, bg_color_1);
-  bg_brush.setColorAt(0.5, bg_color_1);
-  bg_brush.setColorAt(0.5, bg_color_2);
-  bg_brush.setColorAt(1.0, bg_color_2);
-
-  p.setPen(Qt::NoPen);
-  p.fillRect(rect(), bg_brush);
-
-  p.setPen(bg_border);
-  p.drawLine(rect().topLeft(), rect().topRight());
-  p.drawLine(rect().bottomLeft(), rect().bottomRight());
-
-  // Draw the expand/collapse indicator
-  QStyleOption opt;
-  opt.initFrom(this);
-  opt.rect = indicator_rect;
-  opt.state |= QStyle::State_Children;
-  if (expanded_) opt.state |= QStyle::State_Open;
-  if (hovering_) opt.state |= QStyle::State_Active;
-
-  // Have to use the application's style here because using the widget's style
-  // will trigger QStyleSheetStyle's recursion guard (I don't know why).
-  QApplication::style()->drawPrimitive(QStyle::PE_IndicatorBranch, &opt, &p, this);
-
-  // Draw the icon
-  p.drawPixmap(icon_rect, icon_.pixmap(kIconSize));
-
-  // Draw the title text
-  QFont bold_font(font());
-  bold_font.setBold(true);
-  p.setFont(bold_font);
-
-  p.setPen(text_color);
-  p.drawText(text_rect, Qt::AlignLeft | Qt::AlignVCenter, title_);
-
-}
-
-void CollapsibleInfoHeader::mouseReleaseEvent(QMouseEvent*) {
-  SetExpanded(!expanded_);
-}

src/widgets/collapsibleinfoheader.h

@@ -1,82 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef COLLAPSIBLEINFOHEADER_H
-#define COLLAPSIBLEINFOHEADER_H
-
-#include <QWidget>
-#include <QString>
-#include <QIcon>
-
-class QPropertyAnimation;
-class QEnterEvent;
-class QEvent;
-class QPaintEvent;
-class QMouseEvent;
-
-class CollapsibleInfoHeader : public QWidget {
-  Q_OBJECT
-  Q_PROPERTY(float opacity READ opacity WRITE set_opacity)
-
- public:
-  CollapsibleInfoHeader(QWidget *parent = nullptr);
-
-  static const int kHeight;
-  static const int kIconSize;
-
-  bool expanded() const { return expanded_; }
-  bool hovering() const { return hovering_; }
-  const QString &title() const { return title_; }
-  const QIcon &icon() const { return icon_; }
-
-  float opacity() const { return opacity_; }
-  void set_opacity(const float opacity);
-
- public Q_SLOTS:
-  void SetExpanded(const bool expanded);
-  void SetTitle(const QString &title);
-  void SetIcon(const QIcon &icon);
-
- Q_SIGNALS:
-  void Expanded();
-  void Collapsed();
-  void ExpandedToggled(const bool expanded);
-
- protected:
-#if QT_VERSION >= QT_VERSION_CHECK(6, 0, 0)
-  void enterEvent(QEnterEvent*) override;
-#else
-  void enterEvent(QEvent*) override;
-#endif
-  void leaveEvent(QEvent*) override;
-  void paintEvent(QPaintEvent*) override;
-  void mouseReleaseEvent(QMouseEvent*) override;
-
- private:
-  bool expanded_;
-  bool hovering_;
-  QString title_;
-  QIcon icon_;
-
-  QPropertyAnimation *animation_;
-  float opacity_;
-};
-
-#endif  // COLLAPSIBLEINFOHEADER_H

src/widgets/collapsibleinfopane.cpp

@@ -1,64 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include "collapsibleinfoheader.h"
-#include "collapsibleinfopane.h"
-
-#include <QVBoxLayout>
-
-CollapsibleInfoPane::CollapsibleInfoPane(const Data &data, QWidget *parent)
-    : QWidget(parent), data_(data), header_(new CollapsibleInfoHeader(this)) {
-
-  QVBoxLayout* layout = new QVBoxLayout(this);
-  layout->setContentsMargins(0, 0, 0, 0);
-  layout->setSpacing(3);
-  layout->setSizeConstraint(QLayout::SetMinAndMaxSize);
-  setLayout(layout);
-
-  layout->addWidget(header_);
-  layout->addWidget(data.contents_);
-  data.contents_->hide();
-
-  header_->SetTitle(data.title_);
-  header_->SetIcon(data.icon_);
-
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Maximum);
-
-  connect(header_, SIGNAL(ExpandedToggled(bool)), SLOT(ExpandedToggled(bool)));
-  connect(header_, SIGNAL(ExpandedToggled(bool)), SIGNAL(Toggled(bool)));
-
-}
-
-void CollapsibleInfoPane::Collapse() { header_->SetExpanded(false); }
-
-void CollapsibleInfoPane::Expand() { header_->SetExpanded(true); }
-
-void CollapsibleInfoPane::ExpandedToggled(bool expanded) {
-  data_.contents_->setVisible(expanded);
-}
-
-bool CollapsibleInfoPane::Data::operator<(const CollapsibleInfoPane::Data &other) const {
-
-  const int my_score = (TypeCount - type_) * 1000 + relevance_;
-  const int other_score = (TypeCount - other.type_) * 1000 + other.relevance_;
-
-  return my_score > other_score;
-
-}

src/widgets/collapsibleinfopane.h

@@ -1,72 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef COLLAPSIBLEINFOPANE_H
-#define COLLAPSIBLEINFOPANE_H
-
-#include <QIcon>
-#include <QWidget>
-
-class CollapsibleInfoHeader;
-
-class CollapsibleInfoPane : public QWidget {
-  Q_OBJECT
-
- public:
-  struct Data {
-    explicit Data() : type_(Type_Biography), relevance_(0) {}
-
-    bool operator<(const Data& other) const;
-
-    enum Type {
-      Type_Biography,
-      TypeCount
-    };
-
-    QString id_;
-    QString title_;
-    QIcon icon_;
-    Type type_;
-    int relevance_;
-
-    QWidget *contents_;
-    QObject *content_object_;
-  };
-
-  CollapsibleInfoPane(const Data &data, QWidget* parent = nullptr);
-
-  const Data &data() const { return data_; }
-
- public Q_SLOTS:
-  void Expand();
-  void Collapse();
-
- Q_SIGNALS:
-  void Toggled(const bool expanded);
-
- private Q_SLOTS:
-  void ExpandedToggled(const bool expanded);
-
- private:
-  Data data_;
-  CollapsibleInfoHeader *header_;
-};
-
-#endif  // COLLAPSIBLEINFOPANE_H

src/widgets/infotextview.cpp

@@ -1,89 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QWidget>
-#include <QApplication>
-#include <QMenu>
-#include <QWheelEvent>
-#include <QRegularExpression>
-#include <QtDebug>
-
-#include "core/logging.h"
-#include "infotextview.h"
-
-InfoTextView::InfoTextView(QWidget *parent) : QTextBrowser(parent), last_width_(-1), recursion_filter_(false) {
-    
-  setHorizontalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-  setOpenExternalLinks(true);
-
-}
-
-void InfoTextView::resizeEvent(QResizeEvent *e) {
-
-  const int w = qMax(100, width());
-  if (w == last_width_) return;
-  last_width_ = w;
-
-  document()->setTextWidth(w);
-  setMinimumHeight(document()->size().height());
-
-  QTextBrowser::resizeEvent(e);
-
-}
-
-QSize InfoTextView::sizeHint() const { return minimumSize(); }
-
-void InfoTextView::wheelEvent(QWheelEvent *e) { e->ignore(); }
-
-void InfoTextView::SetHtml(const QString &html) {
-
-  QString copy(html.trimmed());
-
-  // Simplify newlines
-  copy.replace(QRegularExpression(QStringLiteral("\\r\\n?")), QStringLiteral("\n"));
-
-  // Convert two or more newlines to <p>, convert single newlines to <br>
-  copy.replace(QRegularExpression(QStringLiteral("([^>])([\\t ]*\\n){2,}")), QStringLiteral("\\1<p>"));
-  copy.replace(QRegularExpression(QStringLiteral("([^>])[\\t ]*\\n")), QStringLiteral("\\1<br>"));
-
-  // Strip any newlines from the end
-  copy.replace(QRegularExpression(QStringLiteral("((<\\s*br\\s*/?\\s*>)|(<\\s*/?\\s*p\\s*/?\\s*>))+$")), QLatin1String(""));
-
-  setHtml(copy);
-
-}
-
-// Prevents QTextDocument from trying to load remote images before they are ready.
-QVariant InfoTextView::loadResource(int type, const QUrl &name) {
-
-  if (recursion_filter_) {
-    recursion_filter_ = false;
-    return QVariant();
-  }
-  recursion_filter_ = true;
-  if (type == QTextDocument::ImageResource && name.scheme() == QLatin1String("http")) {
-    if (document()->resource(type, name).isNull()) {
-      return QVariant();
-    }
-  }
-  return QTextBrowser::loadResource(type, name);
-
-}

src/widgets/infotextview.h

@@ -1,52 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef INFOTEXTVIEW_H
-#define INFOTEXTVIEW_H
-
-#include <QTextBrowser>
-#include <QString>
-#include <QUrl>
-
-class QResizeEvent;
-class QWheelEvent;
-
-class InfoTextView : public QTextBrowser {
-  Q_OBJECT
-
- public:
-  explicit InfoTextView(QWidget *parent = nullptr);
-
-  QSize sizeHint() const override;
-
- public Q_SLOTS:
-  void SetHtml(const QString &html);
-
- protected:
-  void resizeEvent(QResizeEvent *e) override;
-  void wheelEvent(QWheelEvent *e) override;
-  QVariant loadResource(int type, const QUrl &name) override;
-
- private:
-  int last_width_;
-  bool recursion_filter_;
-};
-
-#endif  // INFOTEXTVIEW_H

src/widgets/prettyimage.cpp

@@ -1,257 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QApplication>
-#include <QWindow>
-#include <QScreen>
-#include <QtConcurrentRun>
-#include <QFuture>
-#include <QString>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
-#include <QFileInfo>
-#include <QDir>
-#include <QFileDialog>
-#include <QNetworkAccessManager>
-#include <QNetworkReply>
-#include <QSettings>
-#include <QLabel>
-#include <QMenu>
-#include <QScrollArea>
-#include <QContextMenuEvent>
-
-#include "core/logging.h"
-#include "core/networkaccessmanager.h"
-#include "core/iconloader.h"
-
-#include "prettyimage.h"
-
-const int PrettyImage::kTotalHeight = 200;
-const int PrettyImage::kReflectionHeight = 40;
-const int PrettyImage::kImageHeight = PrettyImage::kTotalHeight - PrettyImage::kReflectionHeight;
-
-const int PrettyImage::kMaxImageWidth = 300;
-
-const char *PrettyImage::kSettingsGroup = "PrettyImageView";
-
-PrettyImage::PrettyImage(const QUrl &url, QNetworkAccessManager *network, QWidget *parent)
-    : QWidget(parent),
-      network_(network),
-      state_(State_WaitingForLazyLoad),
-      url_(url),
-      menu_(nullptr) {
-
-  setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Fixed);
-
-  LazyLoad();
-
-}
-
-void PrettyImage::LazyLoad() {
-
-  if (state_ != State_WaitingForLazyLoad) return;
-
-  // Start fetching the image
-  QNetworkReply *reply = network_->get(QNetworkRequest(url_));
-  state_ = State_Fetching;
-  QObject::connect(reply, &QNetworkReply::finished, this, [this, reply]() { ImageFetched(reply); });
-
-}
-
-QSize PrettyImage::image_size() const {
-
-  if (state_ != State_Finished) return QSize(kImageHeight * 1.6, kImageHeight);
-
-  QSize ret = image_.size();
-  ret.scale(kMaxImageWidth, kImageHeight, Qt::KeepAspectRatio);
-  return ret;
-
-}
-
-QSize PrettyImage::sizeHint() const {
-  return QSize(image_size().width(), kTotalHeight);
-}
-
-void PrettyImage::ImageFetched(QNetworkReply *reply) {
-
-  reply->deleteLater();
-
-  QImage image = QImage::fromData(reply->readAll());
-  if (image.isNull()) {
-    qLog(Debug) << "Image failed to load" << reply->request().url() << reply->error();
-    deleteLater();
-  }
-  else {
-    state_ = State_CreatingThumbnail;
-    image_ = image;
-    (void)QtConcurrent::run([=]{ ImageScaled(image_.scaled(image_size(), Qt::KeepAspectRatio, Qt::SmoothTransformation)); });
-  }
-
-}
-
-void PrettyImage::ImageScaled(QImage image) {
-
-  thumbnail_ = QPixmap::fromImage(image);
-  state_ = State_Finished;
-
-  updateGeometry();
-  update();
-  emit Loaded();
-
-}
-
-void PrettyImage::paintEvent(QPaintEvent*) {
-
-  // Draw at the bottom of our area
-  QRect image_rect(QPoint(0, 0), image_size());
-  image_rect.moveBottom(kImageHeight);
-
-  QPainter p(this);
-
-  // Draw the main image
-  DrawThumbnail(&p, image_rect);
-
-  // Draw the reflection
-  // Figure out where to draw it
-  QRect reflection_rect(image_rect);
-  reflection_rect.moveTop(image_rect.bottom());
-
-  // Create the reflected pixmap
-  QImage reflection(reflection_rect.size(), QImage::Format_ARGB32_Premultiplied);
-  reflection.fill(palette().color(QPalette::Base).rgba());
-  QPainter reflection_painter(&reflection);
-
-  // Set up the transformation
-  QTransform transform;
-  transform.scale(1.0, -1.0);
-  transform.translate(0.0, -reflection_rect.height());
-  reflection_painter.setTransform(transform);
-
-  QRect fade_rect(reflection.rect().bottomLeft() - QPoint(0, kReflectionHeight), reflection.rect().bottomRight());
-
-  // Draw the reflection into the buffer
-  DrawThumbnail(&reflection_painter, reflection.rect());
-
-  // Make it fade out towards the bottom
-  QLinearGradient fade_gradient(fade_rect.topLeft(), fade_rect.bottomLeft());
-  fade_gradient.setColorAt(0.0, QColor(0, 0, 0, 0));
-  fade_gradient.setColorAt(1.0, QColor(0, 0, 0, 128));
-
-  reflection_painter.setCompositionMode(QPainter::CompositionMode_DestinationIn);
-  reflection_painter.fillRect(fade_rect, fade_gradient);
-
-  reflection_painter.end();
-
-  // Draw the reflection on the image
-  p.drawImage(reflection_rect, reflection);
-
-}
-
-void PrettyImage::DrawThumbnail(QPainter *p, const QRect &rect) {
-
-  switch (state_) {
-    case State_WaitingForLazyLoad:
-    case State_Fetching:
-    case State_CreatingThumbnail:
-      p->setPen(palette().color(QPalette::Disabled, QPalette::Text));
-      p->drawText(rect, Qt::AlignHCenter | Qt::AlignBottom, tr("Loading..."));
-      break;
-
-    case State_Finished:
-      p->drawPixmap(rect, thumbnail_);
-      break;
-  }
-
-}
-
-void PrettyImage::contextMenuEvent(QContextMenuEvent *e) {
-
-  if (e->pos().y() >= kImageHeight) return;
-
-  if (!menu_) {
-    menu_ = new QMenu(this);
-    menu_->addAction(IconLoader::Load(QStringLiteral("zoom-in")), tr("Show fullsize..."), this, &PrettyImage::ShowFullsize);
-    menu_->addAction(IconLoader::Load(QStringLiteral("document-save")), tr("Save image") + QLatin1String("..."), this, &PrettyImage::SaveAs);
-  }
-
-  menu_->popup(e->globalPos());
-
-}
-
-void PrettyImage::ShowFullsize() {
-
-  // Create the window
-  QScrollArea *pwindow = new QScrollArea;
-  pwindow->setAttribute(Qt::WA_DeleteOnClose, true);
-  pwindow->setWindowTitle(tr("%1 image viewer").arg(QLatin1String("Strawberry")));
-
-  // Work out how large to make the window, based on the size of the screen
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 14, 0))
-  QScreen *screen = QWidget::screen();
-#else
-  QScreen *screen = (window() && window()->windowHandle() ? window()->windowHandle()->screen() : QGuiApplication::primaryScreen());
-#endif
-  if (screen) {
-    QRect desktop_rect(screen->availableGeometry());
-    QSize window_size(qMin(desktop_rect.width() - 20, image_.width()), qMin(desktop_rect.height() - 20, image_.height()));
-    pwindow->resize(window_size);
-  }
-
-  // Create the label that displays the image
-  QLabel *label = new QLabel(pwindow);
-  label->setPixmap(QPixmap::fromImage(image_));
-
-  // Show the label in the window
-  pwindow->setWidget(label);
-  pwindow->setFrameShape(QFrame::NoFrame);
-  pwindow->show();
-
-}
-
-void PrettyImage::SaveAs() {
-
-  QString filename = QFileInfo(url_.path()).fileName();
-
-  if (filename.isEmpty()) filename = QLatin1String("artwork.jpg");
-
-  QSettings s;
-  s.beginGroup(kSettingsGroup);
-  QString last_save_dir = s.value("last_save_dir", QDir::homePath()).toString();
-
-  QString path = last_save_dir.isEmpty() ? QDir::homePath() : last_save_dir;
-  QFileInfo path_info(path);
-  if (path_info.isDir()) {
-    path += QLatin1Char('/') + filename;
-  }
-  else {
-    path = path_info.path() + QLatin1Char('/') + filename;
-  }
-
-  filename = QFileDialog::getSaveFileName(this, tr("Save image"), path);
-  if (filename.isEmpty()) return;
-
-  image_.save(filename);
-
-  s.setValue("last_save_dir", last_save_dir);
-  
-  s.endGroup();
-
-}

src/widgets/prettyimage.h

@@ -1,92 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef PRETTYIMAGE_H
-#define PRETTYIMAGE_H
-
-#include <QWidget>
-#include <QString>
-#include <QUrl>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
-
-class QMenu;
-class QNetworkAccessManager;
-class QNetworkReply;
-class QContextMenuEvent;
-class QPaintEvent;
-
-class PrettyImage : public QWidget {
-  Q_OBJECT
-
- public:
-  PrettyImage(const QUrl &url, QNetworkAccessManager *network, QWidget *parent = nullptr);
-
-  static const int kTotalHeight;
-  static const int kReflectionHeight;
-  static const int kImageHeight;
-
-  static const int kMaxImageWidth;
-
-  static const char *kSettingsGroup;
-
-  QSize sizeHint() const override;
-  QSize image_size() const;
-
-signals:
-  void Loaded();
-
- public slots:
-  void LazyLoad();
-  void SaveAs();
-  void ShowFullsize();
-
- protected:
-  void contextMenuEvent(QContextMenuEvent*) override;
-  void paintEvent(QPaintEvent*) override;
-
- private slots:
-  void ImageFetched(QNetworkReply *reply);
-  void ImageScaled(QImage image);
-
- private:
-  enum State {
-    State_WaitingForLazyLoad,
-    State_Fetching,
-    State_CreatingThumbnail,
-    State_Finished,
-  };
-
-  void DrawThumbnail(QPainter *p, const QRect &rect);
-
- private:
-  QNetworkAccessManager *network_;
-  State state_;
-  QUrl url_;
-
-  QImage image_;
-  QPixmap thumbnail_;
-
-  QMenu *menu_;
-  QString last_save_dir_;
-};
-
-#endif  // PRETTYIMAGE_H

src/widgets/prettyimageview.cpp

@@ -1,189 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QObject>
-#include <QUrl>
-#include <QNetworkAccessManager>
-#include <QPropertyAnimation>
-#include <QAbstractSlider>
-#include <QHBoxLayout>
-#include <QScrollArea>
-#include <QScrollBar>
-#include <QTimer>
-#include <QMouseEvent>
-#include <QResizeEvent>
-#include <QWheelEvent>
-
-#include "core/networkaccessmanager.h"
-
-#include "prettyimage.h"
-#include "prettyimageview.h"
-
-PrettyImageView::PrettyImageView(QNetworkAccessManager *network, QWidget* parent)
-    : QScrollArea(parent),
-      network_(network),
-      container_(new QWidget(this)),
-      layout_(new QHBoxLayout(container_)),
-      current_index_(-1),
-      scroll_animation_(new QPropertyAnimation(horizontalScrollBar(), "value", this)),
-      recursion_filter_(false) {
-
-  setWidget(container_);
-  setWidgetResizable(true);
-  setMinimumHeight(PrettyImage::kTotalHeight + 10);
-  setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Fixed);
-  setFrameShape(QFrame::NoFrame);
-  setVerticalScrollBarPolicy(Qt::ScrollBarAlwaysOff);
-
-  scroll_animation_->setDuration(250);
-  scroll_animation_->setEasingCurve(QEasingCurve::InOutCubic);
-  connect(horizontalScrollBar(), SIGNAL(sliderReleased()), SLOT(ScrollBarReleased()));
-  connect(horizontalScrollBar(), SIGNAL(actionTriggered(int)), SLOT(ScrollBarAction(int)));
-
-  layout_->setSizeConstraint(QLayout::SetMinAndMaxSize);
-  layout_->setContentsMargins(6, 6, 6, 6);
-  layout_->setSpacing(6);
-  layout_->addSpacing(200);
-  layout_->addSpacing(200);
-
-  container_->setSizePolicy(QSizePolicy::Expanding, QSizePolicy::Minimum);
-
-}
-
-bool PrettyImageView::eventFilter(QObject *obj, QEvent *event) {
-
-  // Work around infinite recursion in QScrollArea resizes.
-  if (recursion_filter_) {
-    return false;
-  }
-  recursion_filter_ = true;
-  bool ret = QScrollArea::eventFilter(obj, event);
-  recursion_filter_ = false;
-  return ret;
-
-}
-
-void PrettyImageView::AddImage(const QUrl &url) {
-
-  PrettyImage *image = new PrettyImage(url, network_, container_);
-  connect(image, SIGNAL(destroyed()), SLOT(ScrollToCurrent()));
-  connect(image, SIGNAL(Loaded()), SLOT(ScrollToCurrent()));
-
-  layout_->insertWidget(layout_->count() - 1, image);
-  if (current_index_ == -1) ScrollTo(0);
-
-}
-
-void PrettyImageView::mouseReleaseEvent(QMouseEvent *e) {
-
-  // Find the image that was clicked on
-  QWidget *widget = container_->childAt(container_->mapFrom(this, e->pos()));
-  if (!widget) return;
-
-  // Get the index of that image
-  const int index = layout_->indexOf(widget) - 1;
-  if (index == -1) return;
-
-  if (index == current_index_) {
-    // Show the image fullsize
-    PrettyImage* pretty_image = qobject_cast<PrettyImage*>(widget);
-    if (pretty_image) {
-      pretty_image->ShowFullsize();
-    }
-  }
-  else {
-    // Scroll to the image
-    ScrollTo(index);
-  }
-
-}
-
-void PrettyImageView::ScrollTo(const int index, const bool smooth) {
-
-  current_index_ = qBound(0, index, layout_->count() - 3);
-  const int layout_index = current_index_ + 1;
-
-  const QWidget *target_widget = layout_->itemAt(layout_index)->widget();
-  if (!target_widget) return;
-
-  const int current_x = horizontalScrollBar()->value();
-  const int target_x = target_widget->geometry().center().x() - width() / 2;
-
-  if (current_x == target_x) return;
-
-  if (smooth) {
-    scroll_animation_->setStartValue(current_x);
-    scroll_animation_->setEndValue(target_x);
-    scroll_animation_->start();
-  }
-  else {
-    scroll_animation_->stop();
-    horizontalScrollBar()->setValue(target_x);
-  }
-
-}
-
-void PrettyImageView::ScrollToCurrent() { ScrollTo(current_index_); }
-
-void PrettyImageView::ScrollBarReleased() {
-
-  // Find the nearest widget to where the scroll bar was released
-  const int current_x = horizontalScrollBar()->value() + width() / 2;
-  int layout_index = 1;
-  for (; layout_index < layout_->count() - 1; ++layout_index) {
-    const QWidget *widget = layout_->itemAt(layout_index)->widget();
-    if (widget && widget->geometry().right() > current_x) {
-      break;
-    }
-  }
-
-  ScrollTo(layout_index - 1);
-
-}
-
-void PrettyImageView::ScrollBarAction(const int action) {
-
-  switch (action) {
-    case QAbstractSlider::SliderSingleStepAdd:
-    case QAbstractSlider::SliderPageStepAdd:
-      ScrollTo(current_index_ + 1);
-      break;
-
-    case QAbstractSlider::SliderSingleStepSub:
-    case QAbstractSlider::SliderPageStepSub:
-      ScrollTo(current_index_ - 1);
-      break;
-  }
-
-}
-
-void PrettyImageView::resizeEvent(QResizeEvent *e) {
-
-  QScrollArea::resizeEvent(e);
-  ScrollTo(current_index_, false);
-
-}
-
-void PrettyImageView::wheelEvent(QWheelEvent *e) {
-
-  const int d = e->angleDelta().x() > 0 ? -1 : 1;
-  ScrollTo(current_index_ + d, true);
-
-}

src/widgets/prettyimageview.h

@@ -1,74 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef PRETTYIMAGEVIEW_H
-#define PRETTYIMAGEVIEW_H
-
-#include <QScrollArea>
-#include <QMap>
-#include <QUrl>
-
-class QNetworkAccessManager;
-class QNetworkReply;
-class QMenu;
-class QHBoxLayout;
-class QPropertyAnimation;
-class QTimeLine;
-class QMouseEvent;
-class QResizeEvent;
-class QWheelEvent;
-
-class PrettyImageView : public QScrollArea {
-  Q_OBJECT
-
- public:
-  PrettyImageView(QNetworkAccessManager *network, QWidget *parent = nullptr);
-
-  static const char* kSettingsGroup;
-
- public Q_SLOTS:
-  void AddImage(const QUrl& url);
-
- protected:
-  void mouseReleaseEvent(QMouseEvent*) override;
-  void resizeEvent(QResizeEvent *e) override;
-  void wheelEvent(QWheelEvent *e) override;
-
- private Q_SLOTS:
-  void ScrollBarReleased();
-  void ScrollBarAction(const int action);
-  void ScrollTo(const int index, const bool smooth = true);
-  void ScrollToCurrent();
-
- private:
-  bool eventFilter(QObject*, QEvent*) override;
-
-  QNetworkAccessManager *network_;
-
-  QWidget *container_;
-  QHBoxLayout *layout_;
-
-  int current_index_;
-  QPropertyAnimation *scroll_animation_;
-
-  bool recursion_filter_;
-};
-
-#endif  // PRETTYIMAGEVIEW_H

src/widgets/widgetfadehelper.cpp

@@ -1,187 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#include <QObject>
-#include <QWidget>
-#include <QImage>
-#include <QPixmap>
-#include <QPainter>
-#include <QTimeLine>
-#include <QResizeEvent>
-#include <QEvent>
-
-#include "widgetfadehelper.h"
-#include "core/qt_blurimage.h"
-
-const int WidgetFadeHelper::kLoadingPadding = 9;
-const int WidgetFadeHelper::kLoadingBorderRadius = 10;
-
-WidgetFadeHelper::WidgetFadeHelper(QWidget *parent, const int msec)
-    : QWidget(parent),
-      parent_(parent),
-      blur_timeline_(new QTimeLine(msec, this)),
-      fade_timeline_(new QTimeLine(msec, this)) {
-
-  parent->installEventFilter(this);
-
-  connect(blur_timeline_, SIGNAL(valueChanged(qreal)), SLOT(update()));
-  connect(fade_timeline_, SIGNAL(valueChanged(qreal)), SLOT(update()));
-  connect(fade_timeline_, SIGNAL(finished()), SLOT(FadeFinished()));
-
-  hide();
-
-}
-
-bool WidgetFadeHelper::eventFilter(QObject *obj, QEvent *event) {
-
-  // We're only interested in our parent's resize events
-  if (obj != parent_ || event->type() != QEvent::Resize) return false;
-
-  // Don't care if we're hidden
-  if (!isVisible()) return false;
-
-  QResizeEvent *re = static_cast<QResizeEvent*>(event);
-  if (re->oldSize() == re->size()) {
-    // Ignore phoney resize events
-    return false;
-  }
-
-  // Get a new capture of the parent
-  hide();
-  CaptureParent();
-  show();
-  return false;
-
-}
-
-void WidgetFadeHelper::StartBlur() {
-
-  CaptureParent();
-
-  // Cover the parent
-  raise();
-  show();
-
-  // Start the timeline
-  blur_timeline_->stop();
-  blur_timeline_->start();
-
-  setAttribute(Qt::WA_TransparentForMouseEvents, false);
-
-}
-
-void WidgetFadeHelper::CaptureParent() {
-
-  // Take a "screenshot" of the window
-  original_pixmap_ = parent_->grab();
-  QImage original_image = original_pixmap_.toImage();
-
-  // Blur it
-  QImage blurred(original_image.size(), QImage::Format_ARGB32_Premultiplied);
-  blurred.fill(Qt::transparent);
-
-  QPainter blur_painter(&blurred);
-  blur_painter.save();
-  qt_blurImage(&blur_painter, original_image, 10.0, true, false);
-  blur_painter.restore();
-
-  // Draw some loading text over the top
-  QFont loading_font(font());
-  loading_font.setBold(true);
-  QFontMetrics loading_font_metrics(loading_font);
-
-  const QString loading_text = tr("Loading...");
-#if (QT_VERSION >= QT_VERSION_CHECK(5, 11, 0))
-  const QSize loading_size(kLoadingPadding * 2 + loading_font_metrics.horizontalAdvance(loading_text), kLoadingPadding * 2 + loading_font_metrics.height());
-#else
-  const QSize loading_size(kLoadingPadding * 2 + loading_font_metrics.width(loading_text), kLoadingPadding * 2 + loading_font_metrics.height());
-#endif
-  const QRect loading_rect((blurred.width() - loading_size.width()) / 2, 100, loading_size.width(), loading_size.height());
-
-  blur_painter.setRenderHint(QPainter::Antialiasing);
-
-  blur_painter.translate(0.5, 0.5);
-  blur_painter.setPen(QColor(200, 200, 200, 255));
-  blur_painter.setBrush(QColor(200, 200, 200, 192));
-  blur_painter.drawRoundedRect(loading_rect, kLoadingBorderRadius, kLoadingBorderRadius);
-
-  blur_painter.setPen(palette().brush(QPalette::Text).color());
-  blur_painter.setFont(loading_font);
-  blur_painter.drawText(loading_rect.translated(-1, -1), Qt::AlignCenter, loading_text);
-  blur_painter.translate(-0.5, -0.5);
-
-  blur_painter.end();
-
-  blurred_pixmap_ = QPixmap::fromImage(blurred);
-
-  resize(parent_->size());
-
-}
-
-void WidgetFadeHelper::StartFade() {
-
-  if (blur_timeline_->state() == QTimeLine::Running) {
-    // Blur timeline is still running, so we need render the current state
-    // into a new pixmap.
-    QPixmap pixmap(original_pixmap_);
-    QPainter painter(&pixmap);
-    painter.setOpacity(blur_timeline_->currentValue());
-    painter.drawPixmap(0, 0, blurred_pixmap_);
-    painter.end();
-    blurred_pixmap_ = pixmap;
-  }
-  blur_timeline_->stop();
-  original_pixmap_ = QPixmap();
-
-  // Start the timeline
-  fade_timeline_->stop();
-  fade_timeline_->start();
-
-  setAttribute(Qt::WA_TransparentForMouseEvents, true);
-
-}
-
-void WidgetFadeHelper::paintEvent(QPaintEvent *event) {
-
-  Q_UNUSED(event)
-
-  QPainter p(this);
-
-  if (fade_timeline_->state() != QTimeLine::Running) {
-    // We're fading in the blur
-    p.drawPixmap(0, 0, original_pixmap_);
-    p.setOpacity(blur_timeline_->currentValue());
-  }
-  else {
-    // Fading out the blur into the new image
-    p.setOpacity(1.0 - fade_timeline_->currentValue());
-  }
-
-  p.drawPixmap(0, 0, blurred_pixmap_);
-
-}
-
-void WidgetFadeHelper::FadeFinished() {
-
-  hide();
-  original_pixmap_ = QPixmap();
-  blurred_pixmap_ = QPixmap();
-
-}

src/widgets/widgetfadehelper.h

@@ -1,63 +0,0 @@
-/*
- * Strawberry Music Player
- * This file was part of Clementine.
- * Copyright 2010, David Sansome <me@davidsansome.com>
- *
- * Strawberry is free software: you can redistribute it and/or modify
- * it under the terms of the GNU General Public License as published by
- * the Free Software Foundation, either version 3 of the License, or
- * (at your option) any later version.
- *
- * Strawberry is distributed in the hope that it will be useful,
- * but WITHOUT ANY WARRANTY; without even the implied warranty of
- * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
- * GNU General Public License for more details.
- *
- * You should have received a copy of the GNU General Public License
- * along with Strawberry.  If not, see <http://www.gnu.org/licenses/>.
- *
- */
-
-#ifndef WIDGETFADEHELPER_H
-#define WIDGETFADEHELPER_H
-
-#include <QWidget>
-#include <QPixmap>
-
-class QTimeLine;
-class QPaintEvent;
-class QEvent;
-
-class WidgetFadeHelper : public QWidget {
-  Q_OBJECT
-
- public:
-  WidgetFadeHelper(QWidget *parent, const int msec = 500);
-
- public Q_SLOTS:
-  void StartBlur();
-  void StartFade();
-
- protected:
-  void paintEvent(QPaintEvent *event) override;
-  bool eventFilter(QObject *obj, QEvent *event) override;
-
- private Q_SLOTS:
-  void FadeFinished();
-
- private:
-  void CaptureParent();
-
- private:
-  static const int kLoadingPadding;
-  static const int kLoadingBorderRadius;
-
-  QWidget *parent_;
-  QTimeLine *blur_timeline_;
-  QTimeLine *fade_timeline_;
-
-  QPixmap original_pixmap_;
-  QPixmap blurred_pixmap_;
-};
-
-#endif  // WIDGETFADEHELPER_H