Give the last.fm global search provider a config dialog
This commit is contained in:
parent
e0beff096d
commit
37166ca19d
@ -184,5 +184,5 @@ void GlobalSearchSettingsPage::CurrentProviderChanged(QTreeWidgetItem* item) {
|
||||
|
||||
ui_->up->setEnabled(row != 0);
|
||||
ui_->down->setEnabled(row != root->childCount() - 1);
|
||||
ui_->configure->setEnabled(provider->CanShowConfig());
|
||||
ui_->configure->setEnabled(provider->can_show_config());
|
||||
}
|
||||
|
@ -32,7 +32,7 @@ void GroovesharkSearchProvider::Init(GroovesharkService* service) {
|
||||
service_ = service;
|
||||
SearchProvider::Init("Grooveshark", "grooveshark",
|
||||
QIcon(":providers/grooveshark.png"),
|
||||
WantsDelayedQueries | ArtIsProbablyRemote);
|
||||
WantsDelayedQueries | ArtIsProbablyRemote | CanShowConfig);
|
||||
|
||||
connect(service_, SIGNAL(SimpleSearchResults(int, SongList)),
|
||||
SLOT(SearchDone(int, SongList)));
|
||||
|
@ -36,7 +36,6 @@ class GroovesharkSearchProvider : public SearchProvider {
|
||||
void LoadArtAsync(int id, const Result& result);
|
||||
void LoadTracksAsync(int id, const Result& result);
|
||||
bool IsLoggedIn();
|
||||
bool CanShowConfig() const { return true; }
|
||||
void ShowConfig();
|
||||
|
||||
private slots:
|
||||
|
@ -23,7 +23,7 @@
|
||||
LastFMSearchProvider::LastFMSearchProvider(LastFMService* service, QObject* parent)
|
||||
: SimpleSearchProvider(parent),
|
||||
service_(service) {
|
||||
Init("Last.fm", "lastfm", QIcon(":last.fm/as.png"));
|
||||
Init("Last.fm", "lastfm", QIcon(":last.fm/as.png"), CanShowConfig);
|
||||
icon_ = ScaleAndPad(QImage(":last.fm/as.png"));
|
||||
|
||||
set_safe_words(QStringList() << "lastfm" << "last.fm");
|
||||
@ -74,3 +74,11 @@ void LastFMSearchProvider::RecreateItems() {
|
||||
|
||||
SetItems(items);
|
||||
}
|
||||
|
||||
bool LastFMSearchProvider::IsLoggedIn() {
|
||||
return service_->IsAuthenticated();
|
||||
}
|
||||
|
||||
void LastFMSearchProvider::ShowConfig() {
|
||||
service_->ShowConfig();
|
||||
}
|
||||
|
@ -28,6 +28,9 @@ public:
|
||||
|
||||
void LoadArtAsync(int id, const Result& result);
|
||||
|
||||
bool IsLoggedIn();
|
||||
void ShowConfig();
|
||||
|
||||
protected:
|
||||
void RecreateItems();
|
||||
|
||||
|
@ -81,7 +81,12 @@ public:
|
||||
// normal place in the song metadata. LoadArtAsync will never be called and
|
||||
// WantsSerialisedArtQueries and ArtIsProbablyRemote will be ignored if
|
||||
// they are set as well. The GlobalSearch engine will load the art itself.
|
||||
ArtIsInSongMetadata = 0x08
|
||||
ArtIsInSongMetadata = 0x08,
|
||||
|
||||
// Indicates this provider has a config dialog that can be shown by calling
|
||||
// CanShowConfig. If this is not set then the button will be greyed out
|
||||
// in the GUI.
|
||||
CanShowConfig = 0x10
|
||||
};
|
||||
Q_DECLARE_FLAGS(Hints, Hint)
|
||||
|
||||
@ -94,6 +99,7 @@ public:
|
||||
bool wants_serialised_art() const { return hints() & WantsSerialisedArtQueries; }
|
||||
bool art_is_probably_remote() const { return hints() & ArtIsProbablyRemote; }
|
||||
bool art_is_in_song_metadata() const { return hints() & ArtIsInSongMetadata; }
|
||||
bool can_show_config() const { return hints() & CanShowConfig; }
|
||||
|
||||
// Starts a search. Must emit ResultsAvailable zero or more times and then
|
||||
// SearchFinished exactly once, using this ID.
|
||||
@ -110,8 +116,7 @@ public:
|
||||
// If provider needs user login to search and play songs, this method should
|
||||
// be reimplemented
|
||||
virtual bool IsLoggedIn() { return true; }
|
||||
virtual bool CanShowConfig() const { return false; }
|
||||
virtual void ShowConfig() { }
|
||||
virtual void ShowConfig() { } // Remember to set the CanShowConfig hint
|
||||
|
||||
static QImage ScaleAndPad(const QImage& image);
|
||||
|
||||
|
@ -29,7 +29,8 @@ SpotifySearchProvider::SpotifySearchProvider(QObject* parent)
|
||||
service_(NULL)
|
||||
{
|
||||
Init("Spotify", "spotify", QIcon(":icons/32x32/spotify.png"),
|
||||
WantsDelayedQueries | WantsSerialisedArtQueries | ArtIsProbablyRemote);
|
||||
WantsDelayedQueries | WantsSerialisedArtQueries | ArtIsProbablyRemote |
|
||||
CanShowConfig);
|
||||
}
|
||||
|
||||
SpotifyServer* SpotifySearchProvider::server() {
|
||||
|
@ -36,7 +36,6 @@ public:
|
||||
void LoadTracksAsync(int id, const Result& result);
|
||||
|
||||
bool IsLoggedIn();
|
||||
bool CanShowConfig() const { return true; }
|
||||
void ShowConfig();
|
||||
|
||||
private slots:
|
||||
|
@ -58,9 +58,6 @@ public:
|
||||
|
||||
virtual QString Icon() { return QString(); }
|
||||
|
||||
// Services which need user login will need to reimplement this method
|
||||
virtual bool IsLoggedIn() const { return true; }
|
||||
|
||||
public slots:
|
||||
// Show configuration panel for services which have one
|
||||
virtual void ShowConfig() { }
|
||||
|
Loading…
x
Reference in New Issue
Block a user