Query the lyric providers in a sensible default order, and add a new pane in the Settings dialog to configure it.

src/CMakeLists.txt

@@ -86,6 +86,7 @@ set(SOURCES
   lyrics/htmlscraper.cpp
   lyrics/lyricfetcher.cpp
   lyrics/lyricprovider.cpp
+  lyrics/lyricsettings.cpp
   lyrics/lyricview.cpp
   lyrics/ultimatelyricsreader.cpp
 
@@ -219,6 +220,7 @@ set(HEADERS
   lyrics/htmlscraper.h
   lyrics/lyricfetcher.h
   lyrics/lyricprovider.h
+  lyrics/lyricsettings.h
   lyrics/lyricview.h
   lyrics/ultimatelyricsreader.h
 
@@ -304,6 +306,7 @@ set(UI
   library/libraryconfig.ui
   library/libraryfilterwidget.ui
 
+  lyrics/lyricsettings.ui
   lyrics/lyricview.ui
 
   playlist/playlistcontainer.ui

src/lyrics/lyricfetcher.cpp

@@ -18,11 +18,14 @@
 #include "ultimatelyricsreader.h"
 
 #include <QFutureWatcher>
+#include <QSettings>
 #include <QtConcurrentRun>
 #include <QtDebug>
 
 typedef QList<LyricProvider*> ProviderList;
 
+const char* LyricFetcher::kSettingsGroup = "Lyrics";
+
 LyricFetcher::LyricFetcher(NetworkAccessManager* network, QObject* parent)
   : QObject(parent),
     network_(network),
@@ -42,6 +45,70 @@ LyricFetcher::~LyricFetcher() {
   qDeleteAll(providers_);
 }
 
+void LyricFetcher::ReloadSettings() {
+  QSettings s;
+  s.beginGroup(kSettingsGroup);
+
+  // Put the providers in the right order
+  QList<LyricProvider*> ordered_providers;
+
+  QVariant saved_order = s.value("search_order");
+  if (saved_order.isNull()) {
+    // Hardcoded default order
+    ordered_providers << ProviderByName("lyrics.wikia.com")
+                      << ProviderByName("lyricsplugin.com")
+                      << ProviderByName("lyricstime.com")
+                      << ProviderByName("lyricsreg.com")
+                      << ProviderByName("lyricsmania.com")
+                      << ProviderByName("metrolyrics.com")
+                      << ProviderByName("seeklyrics.com")
+                      << ProviderByName("azlyrics.com")
+                      << ProviderByName("mp3lyrics.org")
+                      << ProviderByName("songlyrics.com")
+                      << ProviderByName("lyricsmode.com")
+                      << ProviderByName("elyrics.net")
+                      << ProviderByName("lyricsdownload.com")
+                      << ProviderByName("lyrics.com")
+                      << ProviderByName("lyricsbay.com")
+                      << ProviderByName("directlyrics.com")
+                      << ProviderByName("loudson.gs")
+                      << ProviderByName("teksty.org")
+                      << ProviderByName("tekstowo.pl (Polish translations)")
+                      << ProviderByName("vagalume.uol.com.br")
+                      << ProviderByName("vagalume.uol.com.br (Portuguese translations)");
+  } else {
+    foreach (const QVariant& name, saved_order.toList()) {
+      LyricProvider* provider = ProviderByName(name.toString());
+      if (provider)
+        ordered_providers << provider;
+    }
+  }
+
+  foreach (LyricProvider* provider, ordered_providers)
+    provider->set_enabled(true);
+
+  // Any providers we don't have in ordered_providers are considered disabled
+  QList<LyricProvider*> disabled_providers;
+  foreach (LyricProvider* provider, providers_) {
+    if (ordered_providers.contains(provider))
+      continue;
+    provider->set_enabled(false);
+    disabled_providers << provider;
+  }
+
+  providers_ = ordered_providers;
+  providers_.append(disabled_providers);
+}
+
+LyricProvider* LyricFetcher::ProviderByName(const QString& name) const {
+  foreach (LyricProvider* provider, providers_) {
+    if (provider->name() == name)
+      return provider;
+  }
+  qWarning() << __PRETTY_FUNCTION__ << "provider not found" << name;
+  return NULL;
+}
+
 void LyricFetcher::UltimateLyricsParsed() {
   QFutureWatcher<ProviderList>* watcher =
       static_cast<QFutureWatcher<ProviderList>*>(sender());
@@ -50,6 +117,8 @@ void LyricFetcher::UltimateLyricsParsed() {
 
   watcher->deleteLater();
   ultimate_reader_.reset();
+
+  ReloadSettings();
 }
 
 int LyricFetcher::SearchAsync(const Song& metadata) {

src/lyrics/lyricfetcher.h

@@ -34,8 +34,15 @@ public:
   LyricFetcher(NetworkAccessManager* network, QObject* parent = 0);
   ~LyricFetcher();
 
+  static const char* kSettingsGroup;
+
+  QList<LyricProvider*> providers() const { return providers_; }
+
   int SearchAsync(const Song& metadata);
 
+public slots:
+  void ReloadSettings();
+
 signals:
   void SearchProgress(int id, const QString& provider);
   void SearchResult(int id, bool success, const QString& title, const QString& content);
@@ -45,6 +52,7 @@ private slots:
 
 private:
   void DoSearch(const Song& metadata, int id);
+  LyricProvider* ProviderByName(const QString& name) const;
 
 private:
   NetworkAccessManager* network_;

src/lyrics/lyricprovider.cpp

@@ -18,6 +18,7 @@
 
 LyricProvider::LyricProvider(NetworkAccessManager* network, QObject* parent)
   : QObject(parent),
-    network_(network)
+    network_(network),
+    enabled_(true)
 {
 }

src/lyrics/lyricprovider.h

@@ -37,11 +37,15 @@ public:
     QString content;
   };
 
+  bool is_enabled() const { return enabled_; }
+  void set_enabled(bool enabled) { enabled_ = enabled; }
+
   virtual QString name() const = 0;
   virtual Result Search(const Song& metadata) const = 0;
 
 protected:
   NetworkAccessManager* network_;
+  bool enabled_;
 };
 
 #endif // LYRICPROVIDER_H

src/lyrics/lyricsettings.cpp

@@ -0,0 +1,101 @@
+/* This file is part of Clementine.
+
+   Clementine is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Clementine is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#include "lyricfetcher.h"
+#include "lyricprovider.h"
+#include "lyricsettings.h"
+#include "ui_lyricsettings.h"
+
+#include <QSettings>
+
+LyricSettings::LyricSettings(QWidget *parent)
+  : QWidget(parent),
+    ui_(new Ui_LyricSettings),
+    fetcher_(NULL)
+{
+  ui_->setupUi(this);
+
+  connect(ui_->up, SIGNAL(clicked()), SLOT(MoveUp()));
+  connect(ui_->down, SIGNAL(clicked()), SLOT(MoveDown()));
+  connect(ui_->providers, SIGNAL(currentItemChanged(QListWidgetItem*,QListWidgetItem*)),
+          SLOT(CurrentItemChanged(QListWidgetItem*)));
+  connect(ui_->providers, SIGNAL(itemChanged(QListWidgetItem*)),
+          SLOT(ItemChanged(QListWidgetItem*)));
+}
+
+LyricSettings::~LyricSettings() {
+  delete ui_;
+}
+
+void LyricSettings::Load() {
+  QList<LyricProvider*> providers = fetcher_->providers();
+
+  ui_->providers->clear();
+  foreach (const LyricProvider* provider, providers) {
+    QListWidgetItem* item = new QListWidgetItem(ui_->providers);
+    item->setText(provider->name());
+    item->setCheckState(provider->is_enabled() ? Qt::Checked : Qt::Unchecked);
+    item->setForeground(provider->is_enabled() ? palette().color(QPalette::Active, QPalette::Text)
+                                               : palette().color(QPalette::Disabled, QPalette::Text));
+  }
+}
+
+void LyricSettings::Save() {
+  QSettings s;
+  s.beginGroup(LyricFetcher::kSettingsGroup);
+
+  s.setValue("download", ui_->download->isChecked());
+
+  QVariantList search_order;
+  for (int i=0 ; i<ui_->providers->count() ; ++i) {
+    const QListWidgetItem* item = ui_->providers->item(i);
+    if (item->checkState() == Qt::Checked)
+      search_order << item->text();
+  }
+  s.setValue("search_order", search_order);
+}
+
+void LyricSettings::CurrentItemChanged(QListWidgetItem* item) {
+  if (!item) {
+    ui_->up->setEnabled(false);
+    ui_->down->setEnabled(false);
+  } else {
+    const int row = ui_->providers->row(item);
+    ui_->up->setEnabled(row != 0);
+    ui_->down->setEnabled(row != ui_->providers->count() - 1);
+  }
+}
+
+void LyricSettings::MoveUp() {
+  Move(-1);
+}
+
+void LyricSettings::MoveDown() {
+  Move(+1);
+}
+
+void LyricSettings::Move(int d) {
+  const int row = ui_->providers->currentRow();
+  QListWidgetItem* item = ui_->providers->takeItem(row);
+  ui_->providers->insertItem(row + d, item);
+  ui_->providers->setCurrentRow(row + d);
+}
+
+void LyricSettings::ItemChanged(QListWidgetItem* item) {
+  const bool checked = item->checkState() == Qt::Checked;
+  item->setForeground(checked ? palette().color(QPalette::Active, QPalette::Text)
+                              : palette().color(QPalette::Disabled, QPalette::Text));
+}

src/lyrics/lyricsettings.h

@@ -0,0 +1,53 @@
+/* This file is part of Clementine.
+
+   Clementine is free software: you can redistribute it and/or modify
+   it under the terms of the GNU General Public License as published by
+   the Free Software Foundation, either version 3 of the License, or
+   (at your option) any later version.
+
+   Clementine is distributed in the hope that it will be useful,
+   but WITHOUT ANY WARRANTY; without even the implied warranty of
+   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+   GNU General Public License for more details.
+
+   You should have received a copy of the GNU General Public License
+   along with Clementine.  If not, see <http://www.gnu.org/licenses/>.
+*/
+
+#ifndef LYRICSETTINGS_H
+#define LYRICSETTINGS_H
+
+#include <QWidget>
+
+class LyricFetcher;
+class Ui_LyricSettings;
+
+class QListWidgetItem;
+
+
+class LyricSettings : public QWidget {
+  Q_OBJECT
+
+public:
+  LyricSettings(QWidget *parent = 0);
+  ~LyricSettings();
+
+  void set_fetcher(const LyricFetcher* fetcher) { fetcher_ = fetcher; }
+
+  void Load();
+  void Save();
+
+private slots:
+  void MoveUp();
+  void MoveDown();
+  void Move(int d);
+
+  void CurrentItemChanged(QListWidgetItem* item);
+  void ItemChanged(QListWidgetItem* item);
+
+private:
+  Ui_LyricSettings* ui_;
+  const LyricFetcher* fetcher_;
+};
+
+#endif // LYRICSETTINGS_H

src/lyrics/lyricsettings.ui

@@ -0,0 +1,97 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<ui version="4.0">
+ <class>LyricSettings</class>
+ <widget class="QWidget" name="LyricSettings">
+  <property name="geometry">
+   <rect>
+    <x>0</x>
+    <y>0</y>
+    <width>414</width>
+    <height>255</height>
+   </rect>
+  </property>
+  <property name="windowTitle">
+   <string>Form</string>
+  </property>
+  <layout class="QVBoxLayout" name="verticalLayout_2">
+   <item>
+    <widget class="QCheckBox" name="download">
+     <property name="text">
+      <string>Download lyrics from the Internet</string>
+     </property>
+     <property name="checked">
+      <bool>true</bool>
+     </property>
+    </widget>
+   </item>
+   <item>
+    <widget class="QWidget" name="internet_container" native="true">
+     <layout class="QHBoxLayout" name="horizontalLayout">
+      <property name="margin">
+       <number>0</number>
+      </property>
+      <item>
+       <widget class="QListWidget" name="providers"/>
+      </item>
+      <item>
+       <layout class="QVBoxLayout" name="verticalLayout">
+        <item>
+         <widget class="QPushButton" name="up">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Move up</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <widget class="QPushButton" name="down">
+          <property name="enabled">
+           <bool>false</bool>
+          </property>
+          <property name="text">
+           <string>Move down</string>
+          </property>
+         </widget>
+        </item>
+        <item>
+         <spacer name="verticalSpacer">
+          <property name="orientation">
+           <enum>Qt::Vertical</enum>
+          </property>
+          <property name="sizeHint" stdset="0">
+           <size>
+            <width>20</width>
+            <height>40</height>
+           </size>
+          </property>
+         </spacer>
+        </item>
+       </layout>
+      </item>
+     </layout>
+    </widget>
+   </item>
+  </layout>
+ </widget>
+ <resources/>
+ <connections>
+  <connection>
+   <sender>download</sender>
+   <signal>toggled(bool)</signal>
+   <receiver>internet_container</receiver>
+   <slot>setEnabled(bool)</slot>
+   <hints>
+    <hint type="sourcelabel">
+     <x>67</x>
+     <y>18</y>
+    </hint>
+    <hint type="destinationlabel">
+     <x>114</x>
+     <y>52</y>
+    </hint>
+   </hints>
+  </connection>
+ </connections>
+</ui>

src/lyrics/lyricview.h

@@ -33,6 +33,7 @@ public:
   ~LyricView();
 
   void set_network(NetworkAccessManager* network);
+  LyricFetcher* fetcher() const { return fetcher_; }
 
 public slots:
   void SongChanged(const Song& metadata);

src/translations/ar.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1170,6 +1176,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "الجيران"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1234,6 +1243,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr ""
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1614,6 +1626,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1656,6 +1671,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/bg.po

@@ -224,6 +224,9 @@ msgstr "Всички плейлисти (%1)"
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -634,6 +637,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1171,6 +1177,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1235,6 +1244,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr ""
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1615,6 +1627,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1657,6 +1672,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/ca.po

@@ -230,6 +230,9 @@ msgstr "Totes les llistes de reproducció (%1)"
 msgid "Alongside the originals"
 msgstr "Al costat dels originals"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Oculta sempre la finestra principal"
 
@@ -652,6 +655,9 @@ msgstr "Fer doble click sobre una canço netejara la llista de reproducció"
 msgid "Download directory"
 msgstr "Directori de descàrregues"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Membres de descarrega"
 
@@ -1198,6 +1204,9 @@ msgstr "Opcions d'anomenat"
 msgid "Neighbors"
 msgstr "Veïns"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Llista de reproducció nova"
 
@@ -1264,6 +1273,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Obrir dispositiu"
 
@@ -1644,6 +1656,9 @@ msgstr "Mostra a Artiste"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostrar la icona a la safata"
 
@@ -1686,6 +1701,9 @@ msgstr "Suau"
 msgid "Soft Rock"
 msgstr "Rock suau"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/cs.po

@@ -225,6 +225,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Vždy skryj hlavní okno"
 
@@ -635,6 +638,9 @@ msgstr ""
 msgid "Download directory"
 msgstr "Adresář pro download"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1175,6 +1181,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Sousedé"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nový seznam skladeb"
 
@@ -1239,6 +1248,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1619,6 +1631,9 @@ msgstr "Zobrazovat různé umělce"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Ukaž \"oblíbené\" a \"zakaž\" tlačítka"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Zobrazovat ikonu v oznamovací oblasti"
 
@@ -1661,6 +1676,9 @@ msgstr "Měkké"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/da.po

@@ -225,6 +225,9 @@ msgstr "Alle spillelister (%1)"
 msgid "Alongside the originals"
 msgstr "Ved siden af originalerne"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Skjul altid hovedvinduet"
 
@@ -635,6 +638,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1176,6 +1182,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Naboer"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1240,6 +1249,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1622,6 +1634,9 @@ msgstr "Vis under diverse kunstnere"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Vis \"elsker\" og \"bandlys\"-knapperne"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis statusikon"
 
@@ -1664,6 +1679,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/de.po

@@ -229,6 +229,9 @@ msgstr "Alle Wiedergabelisten (%1)"
 msgid "Alongside the originals"
 msgstr "Bei die Originale"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Clementine immer verstecken"
 
@@ -651,6 +654,9 @@ msgstr "Stück doppelklicken um Wiedergabeliste zu ersetzen"
 msgid "Download directory"
 msgstr "Downloadverzeichnis"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Downloadmitgliedschaft"
 
@@ -1199,6 +1205,9 @@ msgstr "Benennungsoptionen"
 msgid "Neighbors"
 msgstr "Nachbarn"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Neue Wiedergabeliste"
 
@@ -1265,6 +1274,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Gerät öffnen"
 
@@ -1645,6 +1657,9 @@ msgstr "Unter \"Verschiedene Interpreten\" anzeigen"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "\"Lieben\" und \"Bannen\" Knöpfe anzeigen"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Benachrichtigungssymbol anzeigen"
 
@@ -1687,6 +1702,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogramm"
 

src/translations/el.po

@@ -231,6 +231,9 @@ msgstr "Όλες οι λίστες αναπαραγωγής (%1)"
 msgid "Alongside the originals"
 msgstr "Παράλληλα με τα πρωτότυπα"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Να κρύβεις πάντα το κύριο παράθυρο"
 
@@ -655,6 +658,9 @@ msgstr "Διπλό κλικ σε ένα τραγούδι θα καθαρίσει
 msgid "Download directory"
 msgstr "Φάκελος λήψης"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "\"Κατέβασμα\" συνδρομής"
 
@@ -1202,6 +1208,9 @@ msgstr "Επιλογές ονομασίας"
 msgid "Neighbors"
 msgstr "Γείτονες"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Νέα λίστα"
 
@@ -1268,6 +1277,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Άνοιγμα συσκευής"
 
@@ -1648,6 +1660,9 @@ msgstr "Εμφάνιση στους διάφορους καλλιτέχνες"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Εμφάνισε τα κουμπιά \"αγάπη\"και \"απαγόρευση\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Εμφάνιση εικονιδίου συστήματος"
 
@@ -1690,6 +1705,9 @@ msgstr "Απαλή"
 msgid "Soft Rock"
 msgstr "Απαλή Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/en_CA.po

@@ -223,6 +223,9 @@ msgstr "All playlists (%1)"
 msgid "Alongside the originals"
 msgstr "Alongside the originals"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Always hide the main window"
 
@@ -635,6 +638,9 @@ msgstr "Double-clicking a song clears the playlist first"
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1174,6 +1180,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Neighbours"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "New playlist"
 
@@ -1239,6 +1248,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1619,6 +1631,9 @@ msgstr "Show in various artists"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Show the \"love\" and \"ban\" buttons"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Show tray icon"
 
@@ -1661,6 +1676,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/en_GB.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Always hide the main window"
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1172,6 +1178,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Neighbours"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1236,6 +1245,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1616,6 +1628,9 @@ msgstr "Show in various artists"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Show the \"love\" and \"ban\" buttons"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Show tray icon"
 
@@ -1658,6 +1673,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/es.po

@@ -231,6 +231,9 @@ msgstr "Todas las listas de reproducción (%1)"
 msgid "Alongside the originals"
 msgstr "Junto a los originales"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Siempre ocultar la ventana principal"
 
@@ -654,6 +657,9 @@ msgstr ""
 msgid "Download directory"
 msgstr "Directorio de descargas"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Membrecía para descarga"
 
@@ -1203,6 +1209,9 @@ msgstr "Opciones de nombrado"
 msgid "Neighbors"
 msgstr "Vecinos"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nueva lista de reproducción"
 
@@ -1269,6 +1278,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Abrir dispositivo"
 
@@ -1649,6 +1661,9 @@ msgstr "Mostrar en Varios artistas"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Mostrar los botones \"Me encanta\" y \"Prohibir\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostrar icono en el área de notificación"
 
@@ -1691,6 +1706,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonograma"
 

src/translations/fi.po

@@ -224,6 +224,9 @@ msgstr "Kaikki soittolistat (%1)"
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -634,6 +637,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1173,6 +1179,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Uusi soittolista"
 
@@ -1237,6 +1246,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1617,6 +1629,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1659,6 +1674,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/fr.po

@@ -230,6 +230,9 @@ msgstr "Toutes les listes de lecture (%1)"
 msgid "Alongside the originals"
 msgstr "A côté des originaux"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Toujours cacher la fenêtre principale"
 
@@ -656,6 +659,9 @@ msgstr "Un double clic sur une chanson efface d'abord la liste de lecture"
 msgid "Download directory"
 msgstr "Dossier de téléchargement"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Adhésion au téléchargement"
 
@@ -1207,6 +1213,9 @@ msgstr "Options de nommage"
 msgid "Neighbors"
 msgstr "Voisins"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nouvelle liste de lecture"
 
@@ -1273,6 +1282,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Ouvrir le périphérique"
 
@@ -1653,6 +1665,9 @@ msgstr "Classer dans la catégorie \"Compilations d'artistes\""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Montrer les boutons « love » et « ban »"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Afficher l'icône dans la zone de notifications"
 
@@ -1695,6 +1710,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogramme"
 

src/translations/gl.po

@@ -224,6 +224,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr "Xunto aos orixináis"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Sempre ocultar a xanela principal"
 
@@ -638,6 +641,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1177,6 +1183,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Viciños"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1241,6 +1250,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1621,6 +1633,9 @@ msgstr "Mostrar en vários artistas"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1663,6 +1678,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/hu.po

@@ -229,6 +229,9 @@ msgstr "Minden lejátszási lista (%1)"
 msgid "Alongside the originals"
 msgstr "Az eredetiek mellett"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Mindig rejtse a főablakot"
 
@@ -650,6 +653,9 @@ msgstr "Dupla kattintás egy számon előbb törli a lejátszási listát"
 msgid "Download directory"
 msgstr "Letöltési mappa"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Tagsági információk betöltése"
 
@@ -1196,6 +1202,9 @@ msgstr "Elnevezési opciók"
 msgid "Neighbors"
 msgstr "Szomszédok"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Új lejátszási lista"
 
@@ -1262,6 +1271,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Eszköz megnyitása"
 
@@ -1643,6 +1655,9 @@ msgstr "Jelenítse meg a különböző előadók között"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Jelenítse meg a \"kedvenc\" és \"tiltás\" gombokat"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Tálcaikon megjelenítése"
 
@@ -1685,6 +1700,9 @@ msgstr "Lágy"
 msgid "Soft Rock"
 msgstr "Lágy Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Szonográfia"
 

src/translations/it.po

@@ -231,6 +231,9 @@ msgstr "Tutte le scalette (%1)"
 msgid "Alongside the originals"
 msgstr "Insieme agli originali"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Nascondi sempre la finestra principale"
 
@@ -656,6 +659,9 @@ msgstr "Il doppio clic su un brano svuota la scaletta"
 msgid "Download directory"
 msgstr "Cartella degli scaricamenti"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Scaricamento"
 
@@ -1206,6 +1212,9 @@ msgstr "Opzioni di assegnazione dei nomi"
 msgid "Neighbors"
 msgstr "Vicini"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nuova scaletta"
 
@@ -1273,6 +1282,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Apri dispositivo"
 
@@ -1653,6 +1665,9 @@ msgstr "Mostra in artisti vari"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Mostra i pulsanti \"Mi piace\" e \"Vieta\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostra icona nel vassoio"
 
@@ -1695,6 +1710,9 @@ msgstr "Leggere"
 msgid "Soft Rock"
 msgstr "Rock leggero"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogramma"
 

src/translations/kk.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1172,6 +1178,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1236,6 +1245,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1616,6 +1628,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1658,6 +1673,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/lt.po

@@ -224,6 +224,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -634,6 +637,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1171,6 +1177,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1235,6 +1244,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr ""
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1615,6 +1627,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1657,6 +1672,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/nb.po

@@ -224,6 +224,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Alltid gjem hovedvinduet"
 
@@ -634,6 +637,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1174,6 +1180,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Ny spilleliste"
 
@@ -1238,6 +1247,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1618,6 +1630,9 @@ msgstr "Vis under Diverse Artister"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Vis \"Elsk\" og \"Bannlys\" knappene"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Vis systemkurvikon"
 
@@ -1660,6 +1675,9 @@ msgstr "Myk"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/nl.po

@@ -228,6 +228,9 @@ msgstr "Alle afspeellijsten (%1)"
 msgid "Alongside the originals"
 msgstr "Samen met originelen"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Hoofdscherm altijd verbergen"
 
@@ -652,6 +655,9 @@ msgstr "Dubbelklikken op een nummer maakt eerst de afspeellijst leeg"
 msgid "Download directory"
 msgstr "Downloadmap"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Download lidmaatschap"
 
@@ -1200,6 +1206,9 @@ msgstr "Benoemingsopties"
 msgid "Neighbors"
 msgstr "Buren"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nieuwe afspeellijst"
 
@@ -1268,6 +1277,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Apparaat openen"
 
@@ -1648,6 +1660,9 @@ msgstr "In diverse artiesten weergeven"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "\"Mooi\" en \"ban\" knoppen weergeven"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Systeemvakpictogram weergeven"
 
@@ -1690,6 +1705,9 @@ msgstr "Zacht"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/oc.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1170,6 +1176,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vesins"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1234,6 +1243,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1614,6 +1626,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Afichar l'icòna dins la bóstia de miniaturas"
 
@@ -1656,6 +1671,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonograma"
 

src/translations/pl.po

@@ -232,6 +232,9 @@ msgstr "Wszystkie listy odtwarzania (%1)"
 msgid "Alongside the originals"
 msgstr "Wraz z orginałem"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Zawsze ukrywaj główne okno"
 
@@ -653,6 +656,9 @@ msgstr "Podwójne kliknięcie na utworze najpierw czyści listę odtwarzania"
 msgid "Download directory"
 msgstr "Pobierz katalog"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Pobierz członkwstwo"
 
@@ -1198,6 +1204,9 @@ msgstr "Nazwy opcji"
 msgid "Neighbors"
 msgstr "Sąsiedzi"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nowa lista odtwarzania"
 
@@ -1264,6 +1273,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Otwórz urządzenie"
 
@@ -1644,6 +1656,9 @@ msgstr "Pokaż w różni wykonawcy"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Pokaż przyciski \"love\" i \"ban\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Pokaż ikonkę w obszarze powiadomień"
 
@@ -1686,6 +1701,9 @@ msgstr "Miękki"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/pt.po

@@ -230,6 +230,9 @@ msgstr "Todas as listas de reprodução (%1)"
 msgid "Alongside the originals"
 msgstr "Juntamente aos originais"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Ocultar sempre a janela principal"
 
@@ -652,6 +655,9 @@ msgstr "Duplo clique na música limpa a lista de reprodução"
 msgid "Download directory"
 msgstr "Diretório de transferências"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Transferência"
 
@@ -1198,6 +1204,9 @@ msgstr "Opções de nomeação"
 msgid "Neighbors"
 msgstr "Vizinhos"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
@@ -1265,6 +1274,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Abrir dispositivo"
 
@@ -1645,6 +1657,9 @@ msgstr "Mostrar em vários artistas"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Mostrar os botões \"adorar\" e \"banir\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Mostrar ícone na área de notificação"
 
@@ -1687,6 +1702,9 @@ msgstr "Suave"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonograma"
 

src/translations/pt_BR.po

@@ -227,6 +227,9 @@ msgstr "Todas as listas de reprodução (%1)"
 msgid "Alongside the originals"
 msgstr "Juntamente com os originais"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Sempre esconder a janela principal"
 
@@ -645,6 +648,9 @@ msgstr "Duplo clique em música limpa a lista de reprodução primeiro"
 msgid "Download directory"
 msgstr "Pasta de Download"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Download de membro"
 
@@ -1187,6 +1193,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vizinhos"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nova lista de reprodução"
 
@@ -1253,6 +1262,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1633,6 +1645,9 @@ msgstr "Exibir em vários artistas"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Exibir os botões \"adoro\" e \"odeio\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Exibir ícone na área de notificação"
 
@@ -1675,6 +1690,9 @@ msgstr "Suave"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonograma"
 

src/translations/ro.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Ascunde întotdeauna fereastra principală"
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1171,6 +1177,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Vecini"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1235,6 +1244,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1615,6 +1627,9 @@ msgstr "Arată în artiști diferiți"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Arată pictogramă în tava de sistem"
 
@@ -1657,6 +1672,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/ru.po

@@ -227,6 +227,9 @@ msgstr "Все списки воспроизведения (%1)"
 msgid "Alongside the originals"
 msgstr "Вместе с оригиналами"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Всегда скрывать главное окно"
 
@@ -647,6 +650,9 @@ msgstr "Двойной щелчок мышью на композиции сти
 msgid "Download directory"
 msgstr "Каталог загрузок"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Загрузить membership"
 
@@ -1191,6 +1197,9 @@ msgstr "Настройки названия"
 msgid "Neighbors"
 msgstr "Соседи"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Новый список воспроизведения"
 
@@ -1257,6 +1266,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Открыть устройство"
 
@@ -1637,6 +1649,9 @@ msgstr "Показать в \"Разных исполнителях\""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Показывать кнопки \"Избранное\" и \"Запретить\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Показать иконку в системном лотке"
 
@@ -1679,6 +1694,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Сонограмма"
 

src/translations/sk.po

@@ -229,6 +229,9 @@ msgstr "Všetky playlisty (%1)"
 msgid "Alongside the originals"
 msgstr "Po boku originálov"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Vždy skryť hlavné okno"
 
@@ -649,6 +652,9 @@ msgstr "Dvojklik na pieseň najprv vymaže playlist"
 msgid "Download directory"
 msgstr "Priečinok na sťahovanie"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Členstvo sťahovania"
 
@@ -1193,6 +1199,9 @@ msgstr "Možnosti pomenovávania"
 msgid "Neighbors"
 msgstr "Susedia"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nový playlist"
 
@@ -1258,6 +1267,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Otvoriť zariadenie"
 
@@ -1638,6 +1650,9 @@ msgstr "Zobrazovať v rôznich interprétoch"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Zobrazovať \"obľúbené\" a \"neobľúbené\" tlačítka"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Zobrazovať tray ikonu"
 
@@ -1680,6 +1695,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/sl.po

@@ -228,6 +228,9 @@ msgstr "Vsi seznami predvajanja (%1)"
 msgid "Alongside the originals"
 msgstr "Ob izvirnikih"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Vedno skrij glavno okno"
 
@@ -648,6 +651,9 @@ msgstr "Dvoklik na skladbo počisti predvajalni seznam"
 msgid "Download directory"
 msgstr "Mapa prejemov"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Članstvo prejemanja"
 
@@ -1192,6 +1198,9 @@ msgstr "Možnosti poimenovanja"
 msgid "Neighbors"
 msgstr "Sosedje"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Nov seznam predvajanja"
 
@@ -1258,6 +1267,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Odpri napravo"
 
@@ -1638,6 +1650,9 @@ msgstr "Pokaži med \"Različni izvajalci\""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Pokaži gumbe \"Priljubljena\" in \"Blokiraj\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Pokaži ikono v sistemski vrstici"
 
@@ -1680,6 +1695,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Sonogram"
 

src/translations/sr.po

@@ -224,6 +224,9 @@ msgstr "Све листе нумера (%1)"
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Увек сакриј главни прозор"
 
@@ -636,6 +639,9 @@ msgstr "Двоструки клик на песму претходно ће оч
 msgid "Download directory"
 msgstr "Фасцикла за преузимање"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1176,6 +1182,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Комшије"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Нова листа нумера"
 
@@ -1240,6 +1249,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr "ОГГ Ворбис"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1620,6 +1632,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Прикажи икону системске касете"
 
@@ -1662,6 +1677,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/sv.po

@@ -224,6 +224,9 @@ msgstr "Alla spellistor (%1)"
 msgid "Alongside the originals"
 msgstr "Tillsammans med originalen"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Dölj alltid huvudfönstret"
 
@@ -638,6 +641,9 @@ msgstr "Dubbelklick på en sång rensar spellistan först"
 msgid "Download directory"
 msgstr "Nedladdningskatalog"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Ladda ned medlemskap"
 
@@ -1180,6 +1186,9 @@ msgstr "Namngivningsalternativ"
 msgid "Neighbors"
 msgstr "Grannar"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Ny spellista"
 
@@ -1244,6 +1253,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1624,6 +1636,9 @@ msgstr "Visa i diverse artister"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Visa knapparna \"gilla\" och \"banlys\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Visa ikon i systemfältet"
 
@@ -1666,6 +1681,9 @@ msgstr "Soft"
 msgid "Soft Rock"
 msgstr "Soft Rock"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Spektrogram"
 

src/translations/tr.po

@@ -224,6 +224,9 @@ msgstr "Tüm çalma listeleri (%1)"
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Ana pencereyi her zaman gizle"
 
@@ -634,6 +637,9 @@ msgstr ""
 msgid "Download directory"
 msgstr "İndirme dizini"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1175,6 +1181,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "Komşular"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Yeni çalma listesi"
 
@@ -1241,6 +1250,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1621,6 +1633,9 @@ msgstr "Çeşitli sanatçılarda göster"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "\"Sev\" ve \"Yasakla\" tuşlarını göster"
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Sistem çekmecesi simgesini göster"
 
@@ -1663,6 +1678,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/translations.pot

@@ -214,6 +214,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -624,6 +627,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1161,6 +1167,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr ""
 
@@ -1225,6 +1234,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr ""
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1605,6 +1617,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1647,6 +1662,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/uk.po

@@ -228,6 +228,9 @@ msgstr "Всі списки відтворення (%1)"
 msgid "Alongside the originals"
 msgstr "Разом з оригіналами"
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "Завжди приховувати головне вікно"
 
@@ -648,6 +651,9 @@ msgstr "Подвійнне клацання на композиції споча
 msgid "Download directory"
 msgstr "Каталог завантаження"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "Завантажити членство"
 
@@ -1192,6 +1198,9 @@ msgstr "Параметри найменування"
 msgid "Neighbors"
 msgstr "Сусіди"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "Новий список відтворення"
 
@@ -1258,6 +1267,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr "Відкрити пристрій"
 
@@ -1638,6 +1650,9 @@ msgstr "Показувати в різних виконавцях"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr "Показувати кнопки \"love\" та \"ban\""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr "Показувати значок в лотку"
 
@@ -1680,6 +1695,9 @@ msgstr "Легка"
 msgid "Soft Rock"
 msgstr "Легкий рок"
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr "Сонограма"
 

src/translations/zh_CN.po

@@ -223,6 +223,9 @@ msgstr ""
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr ""
 
@@ -633,6 +636,9 @@ msgstr ""
 msgid "Download directory"
 msgstr ""
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr ""
 
@@ -1170,6 +1176,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr ""
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "新建播放列表"
 
@@ -1234,6 +1243,9 @@ msgstr ""
 msgid "Ogg Vorbis"
 msgstr ""
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1614,6 +1626,9 @@ msgstr ""
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1656,6 +1671,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/translations/zh_TW.po

@@ -228,6 +228,9 @@ msgstr "所有播放清單 (%1)"
 msgid "Alongside the originals"
 msgstr ""
 
+msgid "Always"
+msgstr ""
+
 msgid "Always hide the main window"
 msgstr "總是隱藏主要視窗"
 
@@ -638,6 +641,9 @@ msgstr ""
 msgid "Download directory"
 msgstr "下載目錄"
 
+msgid "Download lyrics from the Internet"
+msgstr ""
+
 msgid "Download membership"
 msgstr "下載會員"
 
@@ -1176,6 +1182,9 @@ msgstr ""
 msgid "Neighbors"
 msgstr "鄰居"
 
+msgid "Never"
+msgstr ""
+
 msgid "New playlist"
 msgstr "新增播放清單"
 
@@ -1240,6 +1249,9 @@ msgstr "Ogg Speex"
 msgid "Ogg Vorbis"
 msgstr "Ogg Vorbis"
 
+msgid "Only when playing a song"
+msgstr ""
+
 msgid "Open device"
 msgstr ""
 
@@ -1620,6 +1632,9 @@ msgstr "顯示各演唱者"
 msgid "Show the \"love\" and \"ban\" buttons"
 msgstr ""
 
+msgid "Show the song information sidebar"
+msgstr ""
+
 msgid "Show tray icon"
 msgstr ""
 
@@ -1662,6 +1677,9 @@ msgstr ""
 msgid "Soft Rock"
 msgstr ""
 
+msgid "Song Information"
+msgstr ""
+
 msgid "Sonogram"
 msgstr ""
 

src/ui/mainwindow.cpp

@@ -34,6 +34,7 @@
 #include "library/libraryconfig.h"
 #include "library/librarydirectorymodel.h"
 #include "library/library.h"
+#include "lyrics/lyricfetcher.h"
 #include "lyrics/lyricview.h"
 #include "playlist/playlistbackend.h"
 #include "playlist/playlist.h"
@@ -1470,6 +1471,7 @@ void MainWindow::EnsureSettingsDialogCreated() {
 #endif
 
   settings_dialog_->SetGlobalShortcutManager(global_shortcuts_);
+  settings_dialog_->SetLyricFetcher(ui_->lyrics_view->fetcher());
 
   // Settings
   connect(settings_dialog_.get(), SIGNAL(accepted()), SLOT(ReloadSettings()));
@@ -1479,6 +1481,7 @@ void MainWindow::EnsureSettingsDialogCreated() {
   connect(settings_dialog_.get(), SIGNAL(accepted()), ui_->library_view, SLOT(ReloadSettings()));
   connect(settings_dialog_.get(), SIGNAL(accepted()), player_->GetEngine(), SLOT(ReloadSettings()));
   connect(settings_dialog_.get(), SIGNAL(accepted()), ui_->playlist->view(), SLOT(ReloadSettings()));
+  connect(settings_dialog_.get(), SIGNAL(accepted()), ui_->lyrics_view->fetcher(), SLOT(ReloadSettings()));
 #ifdef ENABLE_WIIMOTEDEV
   connect(settings_dialog_.get(), SIGNAL(accepted()), wiimotedev_shortcuts_.get(), SLOT(ReloadSettings()));
   connect(settings_dialog_.get(), SIGNAL(SetWiimotedevInterfaceActived(bool)), wiimotedev_shortcuts_.get(), SLOT(SetWiimotedevInterfaceActived(bool)));

src/ui/settingsdialog.cpp

@@ -53,6 +53,7 @@ SettingsDialog::SettingsDialog(QWidget* parent)
 
   // Icons
   ui_->list->item(Page_Playback)->setIcon(IconLoader::Load("media-playback-start"));
+  ui_->list->item(Page_SongInformation)->setIcon(IconLoader::Load("view-media-lyrics"));
   ui_->list->item(Page_GlobalShortcuts)->setIcon(IconLoader::Load("input-keyboard"));
   ui_->list->item(Page_Notifications)->setIcon(IconLoader::Load("help-hint"));
   ui_->list->item(Page_Library)->setIcon(IconLoader::Load("folder-sound"));
@@ -174,6 +175,10 @@ void SettingsDialog::SetGlobalShortcutManager(GlobalShortcuts *manager) {
   ui_->global_shortcuts->SetManager(manager);
 }
 
+void SettingsDialog::SetLyricFetcher(const LyricFetcher* fetcher) {
+  ui_->lyric_settings->set_fetcher(fetcher);
+}
+
 void SettingsDialog::LastFMValidationComplete(bool success) {
   ui_->buttonBox->setEnabled(true);
 
@@ -231,6 +236,10 @@ void SettingsDialog::accept() {
   s.endGroup();
 #endif
 
+  // Lyrics
+  ui_->lyric_settings->Save();
+
+  // Wii remotes
 #ifdef ENABLE_WIIMOTEDEV
   s.beginGroup(WiimotedevShortcuts::kActionsGroup);
   s.remove("");
@@ -317,6 +326,9 @@ void SettingsDialog::showEvent(QShowEvent*) {
     ui_->language->setCurrentIndex(ui_->language->findText(name));
   s.endGroup();
 
+  // Lyrics
+  ui_->lyric_settings->Load();
+
   // Last.fm
   ui_->lastfm->Load();
 

src/ui/settingsdialog.h

@@ -24,6 +24,7 @@
 
 class GlobalShortcuts;
 class LibraryDirectoryModel;
+class LyricFetcher;
 class OSDPretty;
 class Ui_SettingsDialog;
 
@@ -43,19 +44,21 @@ class SettingsDialog : public QDialog {
   enum Page {
     Page_Playback = 0,
     Page_Behaviour,
+    Page_SongInformation,
     Page_GlobalShortcuts,
     Page_Notifications,
     Page_Library,
     Page_Lastfm,
     Page_Magnatune,
 #ifdef ENABLE_WIIMOTEDEV
-    Page_Wiimotedev
+    Page_Wiimotedev,
 #endif
   };
 
   void SetLibraryDirectoryModel(LibraryDirectoryModel* model);
   void SetGlobalShortcutManager(GlobalShortcuts* manager);
   void SetGstEngine(const GstEngine* engine) { gst_engine_ = engine; }
+  void SetLyricFetcher(const LyricFetcher* fetcher);
 
   void OpenAtPage(Page page);
 

src/ui/settingsdialog.ui

@@ -14,7 +14,7 @@
    <string>Preferences</string>
   </property>
   <property name="windowIcon">
-   <iconset resource="../../data/data.qrc">
+   <iconset>
     <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
   </property>
   <layout class="QHBoxLayout" name="horizontalLayout_2">
@@ -60,10 +60,15 @@
        <string>Behavior</string>
       </property>
       <property name="icon">
-       <iconset resource="../../data/data.qrc">
+       <iconset>
         <normaloff>:/icon.png</normaloff>:/icon.png</iconset>
       </property>
      </item>
+     <item>
+      <property name="text">
+       <string>Song Information</string>
+      </property>
+     </item>
      <item>
       <property name="text">
        <string>Global Shortcuts</string>
@@ -84,7 +89,7 @@
        <string>Last.fm</string>
       </property>
       <property name="icon">
-       <iconset resource="../../data/data.qrc">
+       <iconset>
         <normaloff>:/last.fm/as.png</normaloff>:/last.fm/as.png</iconset>
       </property>
      </item>
@@ -93,7 +98,7 @@
        <string>Magnatune</string>
       </property>
       <property name="icon">
-       <iconset resource="../../data/data.qrc">
+       <iconset>
         <normaloff>:/magnatune.png</normaloff>:/magnatune.png</iconset>
       </property>
      </item>
@@ -114,7 +119,7 @@
      <item>
       <widget class="QStackedWidget" name="stacked_widget">
        <property name="currentIndex">
-        <number>1</number>
+        <number>2</number>
        </property>
        <widget class="QWidget" name="playback_page">
         <layout class="QVBoxLayout" name="verticalLayout_10">
@@ -449,6 +454,67 @@
          </item>
         </layout>
        </widget>
+       <widget class="QWidget" name="song_info_page">
+        <layout class="QVBoxLayout" name="verticalLayout_16">
+         <item>
+          <widget class="QGroupBox" name="groupBox_5">
+           <property name="title">
+            <string>Show the song information sidebar</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_14">
+            <item>
+             <widget class="QRadioButton" name="info_sidebar_always">
+              <property name="text">
+               <string>Always</string>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="info_sidebar_playing">
+              <property name="text">
+               <string>Only when playing a song</string>
+              </property>
+              <property name="checked">
+               <bool>true</bool>
+              </property>
+             </widget>
+            </item>
+            <item>
+             <widget class="QRadioButton" name="info_sidebar_never">
+              <property name="text">
+               <string>Never</string>
+              </property>
+             </widget>
+            </item>
+           </layout>
+          </widget>
+         </item>
+         <item>
+          <widget class="QGroupBox" name="groupBox_6">
+           <property name="sizePolicy">
+            <sizepolicy hsizetype="Preferred" vsizetype="Expanding">
+             <horstretch>0</horstretch>
+             <verstretch>0</verstretch>
+            </sizepolicy>
+           </property>
+           <property name="title">
+            <string>Lyrics</string>
+           </property>
+           <layout class="QVBoxLayout" name="verticalLayout_15">
+            <property name="spacing">
+             <number>0</number>
+            </property>
+            <property name="margin">
+             <number>0</number>
+            </property>
+            <item>
+             <widget class="LyricSettings" name="lyric_settings" native="true"/>
+            </item>
+           </layout>
+          </widget>
+         </item>
+        </layout>
+       </widget>
        <widget class="QWidget" name="page_2">
         <layout class="QVBoxLayout" name="verticalLayout_12">
          <property name="spacing">
@@ -729,6 +795,12 @@
    <header>ui/globalshortcutsconfig.h</header>
    <container>1</container>
   </customwidget>
+  <customwidget>
+   <class>LyricSettings</class>
+   <extends>QWidget</extends>
+   <header>lyrics/lyricsettings.h</header>
+   <container>1</container>
+  </customwidget>
  </customwidgets>
  <tabstops>
   <tabstop>list</tabstop>
@@ -758,9 +830,7 @@
   <tabstop>b_always_hide_</tabstop>
   <tabstop>b_always_show_</tabstop>
  </tabstops>
- <resources>
+ <resources/>
-  <include location="../../data/data.qrc"/>
- </resources>
  <connections>
   <connection>
    <sender>list</sender>
@@ -817,12 +887,12 @@
    <slot>setEnabled(bool)</slot>
    <hints>
     <hint type="sourcelabel">
-     <x>274</x>
+     <x>476</x>
-     <y>237</y>
+     <y>277</y>
     </hint>
     <hint type="destinationlabel">
-     <x>257</x>
+     <x>459</x>
-     <y>283</y>
+     <y>362</y>
     </hint>
    </hints>
   </connection>