Capitalize strawberry in osd and tooltip, change cdcase and remove some

unused code
This commit is contained in:
Jonas Kvinge
2019-02-10 21:25:36 +01:00
parent a831519b54
commit 333a0bc05a
12 changed files with 47 additions and 59 deletions

View File

@@ -66,11 +66,11 @@ QSet<QString> *AlbumCoverChoiceController::sImageExtensions = nullptr;
AlbumCoverChoiceController::AlbumCoverChoiceController(QWidget *parent) :
QWidget(parent),
app_(nullptr),
cover_searcher_(nullptr),
cover_fetcher_(nullptr),
save_file_dialog_(nullptr),
cover_from_url_dialog_(nullptr) {
app_(nullptr),
cover_searcher_(nullptr),
cover_fetcher_(nullptr),
save_file_dialog_(nullptr),
cover_from_url_dialog_(nullptr) {
cover_from_file_ = new QAction(IconLoader::Load("document-open"), tr("Load cover from disk..."), this);
cover_to_file_ = new QAction(IconLoader::Load("document-save"), tr("Save cover to disk..."), this);

View File

@@ -119,17 +119,6 @@ AlbumCoverManager::AlbumCoverManager(Application *app, CollectionBackend *collec
album_cover_choice_controller_->SetApplication(app_);
// Get a square version of cdcase.png
QImage nocover(":/pictures/cdcase.png");
nocover = nocover.scaled(120, 120, Qt::KeepAspectRatio, Qt::SmoothTransformation);
QImage square_nocover(120, 120, QImage::Format_ARGB32);
square_nocover.fill(0);
QPainter p(&square_nocover);
p.setOpacity(0.4);
p.drawImage((120 - nocover.width()) / 2, (120 - nocover.height()) / 2, nocover);
p.end();
// no_cover_item_icon_ = QPixmap::fromImage(square_nocover);
cover_searcher_ = new AlbumCoverSearcher(no_cover_item_icon_, app_, this);
cover_export_ = new AlbumCoverExport(this);

View File

@@ -44,12 +44,9 @@ CurrentArtLoader::CurrentArtLoader(Application *app, QObject *parent)
options_.scale_output_image_ = false;
options_.pad_output_image_ = false;
// QIcon nocover = IconLoader::Load("cdcase");
// options_.default_output_image_ = nocover.pixmap(nocover.availableSizes().last()).toImage();
options_.default_output_image_ = QImage(":/pictures/cdcase.png");
connect(app_->album_cover_loader(), SIGNAL(ImageLoaded(quint64, QImage)), SLOT(TempArtLoaded(quint64, QImage)));
connect(app_->playlist_manager(), SIGNAL(CurrentSongChanged(Song)), SLOT(LoadArt(Song)));
}