From b1be64fe1d935ccce8586f27e88972a5bbe3530c Mon Sep 17 00:00:00 2001 From: Martchus Date: Tue, 16 Apr 2019 23:08:54 +0200 Subject: [PATCH] Make LyricWiki URL configurable --- application/settings.cpp | 2 ++ gui/editordbqueryoptionpage.ui | 26 ++++++++++++++++---------- gui/settingsdialog.cpp | 2 ++ 3 files changed, 20 insertions(+), 10 deletions(-) diff --git a/application/settings.cpp b/application/settings.cpp index 00ffd09..a4f8011 100644 --- a/application/settings.cpp +++ b/application/settings.cpp @@ -194,6 +194,7 @@ void restore() v.dbQuery.override = settings.value(QStringLiteral("override"), true).toBool(); v.dbQuery.fields.restore(settings, QStringLiteral("fields")); v.dbQuery.musicBrainzUrl = settings.value(QStringLiteral("musicbrainzurl")).toString(); + v.dbQuery.lyricsWikiaUrl = settings.value(QStringLiteral("lyricwikiurl")).toString(); v.dbQuery.coverArtArchiveUrl = settings.value(QStringLiteral("coverartarchiveurl")).toString(); settings.endGroup(); @@ -281,6 +282,7 @@ void save() settings.setValue(QStringLiteral("override"), v.dbQuery.override); v.dbQuery.fields.save(settings, QStringLiteral("fields")); settings.setValue(QStringLiteral("musicbrainzurl"), v.dbQuery.musicBrainzUrl); + settings.setValue(QStringLiteral("lyricwikiurl"), v.dbQuery.lyricsWikiaUrl); settings.setValue(QStringLiteral("coverartarchiveurl"), v.dbQuery.coverArtArchiveUrl); settings.endGroup(); diff --git a/gui/editordbqueryoptionpage.ui b/gui/editordbqueryoptionpage.ui index 1559757..e7236d6 100644 --- a/gui/editordbqueryoptionpage.ui +++ b/gui/editordbqueryoptionpage.ui @@ -2,14 +2,6 @@ QtGui::EditorDbQueryOptionsPage - - - 0 - 0 - 222 - 74 - - MusicBrainz @@ -31,20 +23,34 @@ - + Cover Art Archive URL - + http://coverartarchive.org + + + + LyricWiki URL + + + + + + + https://lyrics.fandom.com + + + diff --git a/gui/settingsdialog.cpp b/gui/settingsdialog.cpp index dae7af7..cdc4beb 100644 --- a/gui/settingsdialog.cpp +++ b/gui/settingsdialog.cpp @@ -264,6 +264,7 @@ bool EditorDbQueryOptionsPage::apply() if (hasBeenShown()) { auto &settings = values().dbQuery; settings.musicBrainzUrl = ui()->musicBrainzUrlLineEdit->text(); + settings.lyricsWikiaUrl = ui()->lyricWikiUrlLineEdit->text(); settings.coverArtArchiveUrl = ui()->coverArtArchiveUrlLineEdit->text(); } return true; @@ -274,6 +275,7 @@ void EditorDbQueryOptionsPage::reset() if (hasBeenShown()) { const auto &settings = values().dbQuery; ui()->musicBrainzUrlLineEdit->setText(settings.musicBrainzUrl); + ui()->lyricWikiUrlLineEdit->setText(settings.lyricsWikiaUrl); ui()->coverArtArchiveUrlLineEdit->setText(settings.coverArtArchiveUrl); } }