dryark/strawberry
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Fix embedded album cover default in edit tag dialog

Browse Source
This commit is contained in:
Jonas Kvinge
2021-02-27 01:32:45 +01:00
parent 901ba9cf13
commit ab4c725217
2 changed files with 8 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
src/covermanager/albumcoverchoicecontroller.h
View File

@@ -70,7 +70,7 @@ class AlbumCoverChoiceController : public QWidget {
void ReloadSettings(); void ReloadSettings();
CollectionSettingsPage::SaveCoverType get_save_album_cover_type() const { return (save_embedded_cover_override_ ? CollectionSettingsPage::SaveCoverType_Embedded : save_cover_type_); } CollectionSettingsPage::SaveCoverType get_save_album_cover_type() const { return (save_embedded_cover_override_ ? CollectionSettingsPage::SaveCoverType_Embedded : save_cover_type_); }
void set_save_embedded_cover_override(const bool value) { save_embedded_cover_override_ = value; } CollectionSettingsPage::SaveCoverType get_collection_save_album_cover_type() const { return save_cover_type_; }
// Getters for all QActions implemented by this controller. // Getters for all QActions implemented by this controller.
@@ -149,15 +149,17 @@ class AlbumCoverChoiceController : public QWidget {
static bool CanAcceptDrag(const QDragEnterEvent *e); static bool CanAcceptDrag(const QDragEnterEvent *e);
signals: public slots:
void AutomaticCoverSearchDone(); void set_save_embedded_cover_override(const bool value) { save_embedded_cover_override_ = value; }
private slots: private slots:
void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics); void AlbumCoverFetched(const quint64 id, const AlbumCoverImageResult &result, const CoverSearchStatistics &statistics);
void SaveEmbeddedCoverAsyncFinished(quint64 id, const bool success); void SaveEmbeddedCoverAsyncFinished(quint64 id, const bool success);
private: signals:
void AutomaticCoverSearchDone();
private:
QString GetInitialPathForFileDialog(const Song &song, const QString &filename); QString GetInitialPathForFileDialog(const Song &song, const QString &filename);
static bool IsKnownImageExtension(const QString &suffix); static bool IsKnownImageExtension(const QString &suffix);

3
src/dialogs/edittagdialog.cpp
View File

@@ -202,6 +202,7 @@ EditTagDialog::EditTagDialog(Application *app, QWidget *parent)
QObject::connect(album_cover_choice_controller_->clear_cover_action(), &QAction::triggered, this, &EditTagDialog::ClearCover); QObject::connect(album_cover_choice_controller_->clear_cover_action(), &QAction::triggered, this, &EditTagDialog::ClearCover);
QObject::connect(album_cover_choice_controller_->delete_cover_action(), &QAction::triggered, this, &EditTagDialog::DeleteCover); QObject::connect(album_cover_choice_controller_->delete_cover_action(), &QAction::triggered, this, &EditTagDialog::DeleteCover);
QObject::connect(album_cover_choice_controller_->show_cover_action(), &QAction::triggered, this, &EditTagDialog::ShowCover); QObject::connect(album_cover_choice_controller_->show_cover_action(), &QAction::triggered, this, &EditTagDialog::ShowCover);
QObject::connect(ui_->checkbox_embedded_cover, &QCheckBox::toggled, album_cover_choice_controller_, &AlbumCoverChoiceController::set_save_embedded_cover_override);
cover_menu_->addActions(actions); cover_menu_->addActions(actions);
@@ -668,7 +669,7 @@ void EditTagDialog::SelectionChanged() {
album_cover_choice_controller_->search_for_cover_action()->setEnabled(app_->cover_providers()->HasAnyProviders()); album_cover_choice_controller_->search_for_cover_action()->setEnabled(app_->cover_providers()->HasAnyProviders());
const bool embedded_cover = (first_song.save_embedded_cover_supported() && (first_song.has_embedded_cover() || album_cover_choice_controller_->get_save_album_cover_type() == CollectionSettingsPage::SaveCoverType_Embedded)); const bool embedded_cover = (first_song.save_embedded_cover_supported() && (first_song.has_embedded_cover() || album_cover_choice_controller_->get_collection_save_album_cover_type() == CollectionSettingsPage::SaveCoverType_Embedded));
ui_->checkbox_embedded_cover->setChecked(embedded_cover); ui_->checkbox_embedded_cover->setChecked(embedded_cover);
album_cover_choice_controller_->set_save_embedded_cover_override(embedded_cover); album_cover_choice_controller_->set_save_embedded_cover_override(embedded_cover);