From 082e63d61d956f470655ff2c41fc16c8e2d109e8 Mon Sep 17 00:00:00 2001 From: "craig.p.drummond" Date: Wed, 22 May 2013 16:30:19 +0000 Subject: [PATCH] Combine lyrics and wiki settings --- CMakeLists.txt | 2 +- context/contextengine.cpp | 6 ------ context/contextengine.h | 10 ---------- context/lyricsettings.ui | 3 --- context/wikipediasettings.cpp | 2 +- context/wikipediasettings.h | 2 +- context/wikipediasettings.ui | 3 --- gui/preferencesdialog.cpp | 11 +++-------- gui/preferencesdialog.h | 2 -- widgets/icons.cpp | 5 ----- widgets/icons.h | 1 - 11 files changed, 6 insertions(+), 41 deletions(-) diff --git a/CMakeLists.txt b/CMakeLists.txt index ce811c29f..00a08c354 100644 --- a/CMakeLists.txt +++ b/CMakeLists.txt @@ -104,7 +104,7 @@ SET( CANTATA_SRCS gui/application.cpp gui/main.cpp gui/initialsettingswizard.cpp devices/deviceoptions.cpp context/lyricsettings.cpp context/ultimatelyricsprovider.cpp context/ultimatelyrics.cpp context/lyricsdialog.cpp context/contextpage.cpp context/view.cpp context/artistview.cpp context/albumview.cpp context/songview.cpp context/contextengine.cpp - context/wikipediaengine.cpp context/wikipediasettings.cpp) + context/wikipediaengine.cpp context/wikipediasettings.cpp context/contextsettings.cpp) SET( CANTATA_MOC_HDRS gui/initialsettingswizard.h gui/mainwindow.h gui/settings.h gui/covers.h gui/folderpage.h gui/librarypage.h gui/albumspage.h gui/playlistspage.h gui/serverplaybacksettings.h gui/serversettings.h gui/preferencesdialog.h gui/filesettings.h diff --git a/context/contextengine.cpp b/context/contextengine.cpp index 1b35ac837..49b862a7c 100644 --- a/context/contextengine.cpp +++ b/context/contextengine.cpp @@ -23,7 +23,6 @@ #include "contextengine.h" #include "wikipediaengine.h" -#include "wikipediasettings.h" #include ContextEngine * ContextEngine::create(QObject *parent) @@ -31,11 +30,6 @@ ContextEngine * ContextEngine::create(QObject *parent) return new WikipediaEngine(parent); } -ContextSettings * ContextEngine::settings(QWidget *parent) -{ - return new WikipediaSettings(parent); -} - ContextEngine::ContextEngine(QObject *p) : QObject(p) , job(0) diff --git a/context/contextengine.h b/context/contextengine.h index fb55c142b..2e0e342fc 100644 --- a/context/contextengine.h +++ b/context/contextengine.h @@ -26,18 +26,9 @@ #include #include -#include class QNetworkReply; -class ContextSettings : public QWidget { -public: - ContextSettings(QWidget *p=0) : QWidget(p) { } - virtual ~ContextSettings() { } - virtual void load()=0; - virtual void save()=0; -}; - class ContextEngine : public QObject { Q_OBJECT @@ -51,7 +42,6 @@ public: static void setPreferedLangs(const QStringList &l); static const QStringList & getPreferedLangs() { return preferredLangs; } static ContextEngine * create(QObject *parent); - static ContextSettings * settings(QWidget *parent); ContextEngine(QObject *p); virtual ~ContextEngine(); diff --git a/context/lyricsettings.ui b/context/lyricsettings.ui index 37ebea171..58856612b 100644 --- a/context/lyricsettings.ui +++ b/context/lyricsettings.ui @@ -11,9 +11,6 @@ - - 0 - diff --git a/context/wikipediasettings.cpp b/context/wikipediasettings.cpp index b0ea0f1cf..4891a5447 100644 --- a/context/wikipediasettings.cpp +++ b/context/wikipediasettings.cpp @@ -42,7 +42,7 @@ static QString localeFile() { } WikipediaSettings::WikipediaSettings(QWidget *p) - : ContextSettings(p) + : QWidget(p) , loaded(false) , job(0) , spinner(0) diff --git a/context/wikipediasettings.h b/context/wikipediasettings.h index 1052726a9..395be0454 100644 --- a/context/wikipediasettings.h +++ b/context/wikipediasettings.h @@ -31,7 +31,7 @@ class QNetworkReply; class QShowEvent; class Spinner; -class WikipediaSettings : public ContextSettings, private Ui::WikipediaSettings +class WikipediaSettings : public QWidget, private Ui::WikipediaSettings { Q_OBJECT diff --git a/context/wikipediasettings.ui b/context/wikipediasettings.ui index 2c2968d46..a71d51f71 100644 --- a/context/wikipediasettings.ui +++ b/context/wikipediasettings.ui @@ -11,9 +11,6 @@ - - 0 - diff --git a/gui/preferencesdialog.cpp b/gui/preferencesdialog.cpp index 0eecf4cd2..5539451e3 100644 --- a/gui/preferencesdialog.cpp +++ b/gui/preferencesdialog.cpp @@ -33,8 +33,7 @@ #ifdef TAGLIB_FOUND #include "httpserversettings.h" #endif -#include "contextengine.h" -#include "lyricsettings.h" +#include "contextsettings.h" #include "cachesettings.h" #include "localize.h" #include "mpdconnection.h" @@ -67,15 +66,14 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) playback = new PlaybackSettings(widget); files = new FileSettings(widget); interface = new InterfaceSettings(widget); - context = ContextEngine::settings(widget); - lyrics = new LyricSettings(widget); + context = new ContextSettings(widget); cache = new CacheSettings(widget); server->load(); serverplayback->load(); playback->load(); files->load(); interface->load(); - lyrics->load(); + context->load(); widget->addPage(server, i18n("Connection"), Icons::libraryIcon, i18n("Connection Settings")); widget->addPage(serverplayback, i18n("Output"), Icons::speakerIcon, i18n("Output Settings")); widget->addPage(playback, i18n("Playback"), Icon("media-playback-start"), i18n("Playback Settings")); @@ -92,8 +90,6 @@ PreferencesDialog::PreferencesDialog(QWidget *parent) } #endif widget->addPage(context, i18n("Context"), Icons::contextIcon, i18n("Context View Settings")); - context->load(); - widget->addPage(lyrics, i18n("Lyrics"), Icons::lyricsIcon, i18n("Lyrics Settings")); #if defined CDDB_FOUND || defined MUSICBRAINZ5_FOUND audiocd = new AudioCdSettings(widget); audiocd->load(); @@ -145,7 +141,6 @@ void PreferencesDialog::writeSettings() audiocd->save(); #endif context->save(); - lyrics->save(); Settings::self()->save(); emit settingsSaved(); } diff --git a/gui/preferencesdialog.h b/gui/preferencesdialog.h index c0d29c412..e6991bb78 100644 --- a/gui/preferencesdialog.h +++ b/gui/preferencesdialog.h @@ -37,7 +37,6 @@ class PlaybackSettings; class FileSettings; class InterfaceSettings; class ContextSettings; -class LyricSettings; #ifdef TAGLIB_FOUND class HttpServerSettings; #endif @@ -75,7 +74,6 @@ private: FileSettings *files; InterfaceSettings *interface; ContextSettings *context; - LyricSettings *lyrics; #ifdef TAGLIB_FOUND HttpServerSettings *http; #endif diff --git a/widgets/icons.cpp b/widgets/icons.cpp index 2a86db83f..2b60ab175 100644 --- a/widgets/icons.cpp +++ b/widgets/icons.cpp @@ -332,7 +332,6 @@ Icon Icons::streamsIcon; Icon Icons::onlineIcon; #endif Icon Icons::contextIcon; -Icon Icons::lyricsIcon; Icon Icons::infoIcon; #ifdef ENABLE_DEVICES_SUPPORT Icon Icons::devicesIcon; @@ -438,10 +437,6 @@ void Icons::init() filesIcon=Icon("document-multiple"); cancelIcon=Icon("dialog-cancel"); importIcon=Icon("document-import"); - lyricsIcon=Icon("view-media-lyrics"); - if (lyricsIcon.isNull()) { - lyricsIcon=Icon("text-x-generic"); - } if (editIcon.isNull()) { editIcon=Icon("text-editor"); } diff --git a/widgets/icons.h b/widgets/icons.h index 45bbb4f00..a477b7d75 100644 --- a/widgets/icons.h +++ b/widgets/icons.h @@ -78,7 +78,6 @@ namespace Icons extern Icon onlineIcon; #endif extern Icon contextIcon; - extern Icon lyricsIcon; extern Icon infoIcon; #ifdef ENABLE_DEVICES_SUPPORT extern Icon devicesIcon;