Add Jamendo as a global search provider but disabled by default.

This commit is contained in:
John Maguire 2011-10-03 16:03:03 +02:00
parent 55624c4dda
commit 9f1e82965d
4 changed files with 16 additions and 1 deletions

View File

@ -247,7 +247,7 @@ void GlobalSearch::ReloadSettings() {
QSettings s;
s.beginGroup(kSettingsGroup);
disabled_provider_ids_ = s.value("disabled_providers").toStringList();
disabled_provider_ids_ = s.value("disabled_providers", QStringList() << "jamendo").toStringList();
foreach (SearchProvider* provider, providers_.keys()) {
SetProviderEnabled(provider, !disabled_provider_ids_.contains(provider->id()));

View File

@ -1513,6 +1513,9 @@ msgstr ""
msgid "It seems user %1 doesn't have a GrooveShark Anywhere account"
msgstr ""
msgid "Jamendo"
msgstr ""
msgid "Jamendo Most Listened Tracks"
msgstr ""

View File

@ -1503,6 +1503,9 @@ msgstr ""
msgid "It seems user %1 doesn't have a GrooveShark Anywhere account"
msgstr ""
msgid "Jamendo"
msgstr ""
msgid "Jamendo Most Listened Tracks"
msgstr ""

View File

@ -43,6 +43,7 @@
#include "globalsearch/globalsearch.h"
#include "globalsearch/globalsearchpopup.h"
#include "globalsearch/librarysearchprovider.h"
#include "internet/jamendoservice.h"
#include "internet/magnatuneservice.h"
#include "internet/internetmodel.h"
#include "internet/internetview.h"
@ -235,6 +236,7 @@ MainWindow::MainWindow(
// Initialise the global search widget
StyleHelper::setBaseColor(palette().color(QPalette::Highlight).darker());
global_search->ReloadSettings();
// Add global search providers
global_search->AddProvider(new LibrarySearchProvider(
library_->backend(), tr("Library"), "library",
@ -247,6 +249,13 @@ MainWindow::MainWindow(
QIcon(":/providers/magnatune.png"),
global_search));
global_search->AddProvider(new LibrarySearchProvider(
internet_model_->Service<JamendoService>()->library_backend(),
tr("Jamendo"),
"jamendo",
QIcon(":/providers/jamendo.png"),
global_search));
ui_->global_search->Init(global_search);
connect(ui_->global_search, SIGNAL(AddToPlaylist(QMimeData*)), SLOT(AddToPlaylist(QMimeData*)));