From f74f1819785fe25aab667794dc746b5e774f53ce Mon Sep 17 00:00:00 2001 From: David Sansome Date: Sun, 26 Sep 2010 17:04:57 +0000 Subject: [PATCH] Query the lyric providers in a sensible default order, and add a new pane in the Settings dialog to configure it. --- src/CMakeLists.txt | 3 + src/lyrics/lyricfetcher.cpp | 69 ++++++++++++++++++++ src/lyrics/lyricfetcher.h | 8 +++ src/lyrics/lyricprovider.cpp | 3 +- src/lyrics/lyricprovider.h | 4 ++ src/lyrics/lyricsettings.cpp | 101 ++++++++++++++++++++++++++++++ src/lyrics/lyricsettings.h | 53 ++++++++++++++++ src/lyrics/lyricsettings.ui | 97 ++++++++++++++++++++++++++++ src/lyrics/lyricview.h | 1 + src/translations/ar.po | 18 ++++++ src/translations/bg.po | 18 ++++++ src/translations/ca.po | 18 ++++++ src/translations/cs.po | 18 ++++++ src/translations/da.po | 18 ++++++ src/translations/de.po | 18 ++++++ src/translations/el.po | 18 ++++++ src/translations/en_CA.po | 18 ++++++ src/translations/en_GB.po | 18 ++++++ src/translations/es.po | 18 ++++++ src/translations/fi.po | 18 ++++++ src/translations/fr.po | 18 ++++++ src/translations/gl.po | 18 ++++++ src/translations/hu.po | 18 ++++++ src/translations/it.po | 18 ++++++ src/translations/kk.po | 18 ++++++ src/translations/lt.po | 18 ++++++ src/translations/nb.po | 18 ++++++ src/translations/nl.po | 18 ++++++ src/translations/oc.po | 18 ++++++ src/translations/pl.po | 18 ++++++ src/translations/pt.po | 18 ++++++ src/translations/pt_BR.po | 18 ++++++ src/translations/ro.po | 18 ++++++ src/translations/ru.po | 18 ++++++ src/translations/sk.po | 18 ++++++ src/translations/sl.po | 18 ++++++ src/translations/sr.po | 18 ++++++ src/translations/sv.po | 18 ++++++ src/translations/tr.po | 18 ++++++ src/translations/translations.pot | 18 ++++++ src/translations/uk.po | 18 ++++++ src/translations/zh_CN.po | 18 ++++++ src/translations/zh_TW.po | 18 ++++++ src/ui/mainwindow.cpp | 3 + src/ui/settingsdialog.cpp | 12 ++++ src/ui/settingsdialog.h | 5 +- src/ui/settingsdialog.ui | 94 +++++++++++++++++++++++---- 47 files changed, 1051 insertions(+), 14 deletions(-) create mode 100644 src/lyrics/lyricsettings.cpp create mode 100644 src/lyrics/lyricsettings.h create mode 100644 src/lyrics/lyricsettings.ui diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt index 0346e01df..fa1ad4e57 100644 --- a/src/CMakeLists.txt +++ b/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 diff --git a/src/lyrics/lyricfetcher.cpp b/src/lyrics/lyricfetcher.cpp index 10158885b..84f305ef4 100644 --- a/src/lyrics/lyricfetcher.cpp +++ b/src/lyrics/lyricfetcher.cpp @@ -18,11 +18,14 @@ #include "ultimatelyricsreader.h" #include +#include #include #include typedef QList 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 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 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* watcher = static_cast*>(sender()); @@ -50,6 +117,8 @@ void LyricFetcher::UltimateLyricsParsed() { watcher->deleteLater(); ultimate_reader_.reset(); + + ReloadSettings(); } int LyricFetcher::SearchAsync(const Song& metadata) { diff --git a/src/lyrics/lyricfetcher.h b/src/lyrics/lyricfetcher.h index e733a8617..1f62203fe 100644 --- a/src/lyrics/lyricfetcher.h +++ b/src/lyrics/lyricfetcher.h @@ -34,8 +34,15 @@ public: LyricFetcher(NetworkAccessManager* network, QObject* parent = 0); ~LyricFetcher(); + static const char* kSettingsGroup; + + QList 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_; diff --git a/src/lyrics/lyricprovider.cpp b/src/lyrics/lyricprovider.cpp index daaea68b7..bcf75af1c 100644 --- a/src/lyrics/lyricprovider.cpp +++ b/src/lyrics/lyricprovider.cpp @@ -18,6 +18,7 @@ LyricProvider::LyricProvider(NetworkAccessManager* network, QObject* parent) : QObject(parent), - network_(network) + network_(network), + enabled_(true) { } diff --git a/src/lyrics/lyricprovider.h b/src/lyrics/lyricprovider.h index ce0273314..58803fa5b 100644 --- a/src/lyrics/lyricprovider.h +++ b/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 diff --git a/src/lyrics/lyricsettings.cpp b/src/lyrics/lyricsettings.cpp new file mode 100644 index 000000000..9c156dd62 --- /dev/null +++ b/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 . +*/ + +#include "lyricfetcher.h" +#include "lyricprovider.h" +#include "lyricsettings.h" +#include "ui_lyricsettings.h" + +#include + +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 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 ; iproviders->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)); +} diff --git a/src/lyrics/lyricsettings.h b/src/lyrics/lyricsettings.h new file mode 100644 index 000000000..b8ea52795 --- /dev/null +++ b/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 . +*/ + +#ifndef LYRICSETTINGS_H +#define LYRICSETTINGS_H + +#include + +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 diff --git a/src/lyrics/lyricsettings.ui b/src/lyrics/lyricsettings.ui new file mode 100644 index 000000000..88dd14de3 --- /dev/null +++ b/src/lyrics/lyricsettings.ui @@ -0,0 +1,97 @@ + + + LyricSettings + + + + 0 + 0 + 414 + 255 + + + + Form + + + + + + Download lyrics from the Internet + + + true + + + + + + + + 0 + + + + + + + + + + false + + + Move up + + + + + + + false + + + Move down + + + + + + + Qt::Vertical + + + + 20 + 40 + + + + + + + + + + + + + + + download + toggled(bool) + internet_container + setEnabled(bool) + + + 67 + 18 + + + 114 + 52 + + + + + diff --git a/src/lyrics/lyricview.h b/src/lyrics/lyricview.h index 5e2d101e0..ad3193f8c 100644 --- a/src/lyrics/lyricview.h +++ b/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); diff --git a/src/translations/ar.po b/src/translations/ar.po index f33c6e824..83edced6a 100644 --- a/src/translations/ar.po +++ b/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 "" diff --git a/src/translations/bg.po b/src/translations/bg.po index c246e381c..d8108c393 100644 --- a/src/translations/bg.po +++ b/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 "" diff --git a/src/translations/ca.po b/src/translations/ca.po index 2a2f6e534..05f2b5aee 100644 --- a/src/translations/ca.po +++ b/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 "" diff --git a/src/translations/cs.po b/src/translations/cs.po index 733f328da..986a52b90 100644 --- a/src/translations/cs.po +++ b/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" diff --git a/src/translations/da.po b/src/translations/da.po index 1273501bb..c2dd294ae 100644 --- a/src/translations/da.po +++ b/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" diff --git a/src/translations/de.po b/src/translations/de.po index 1870978ac..0c63f19bb 100644 --- a/src/translations/de.po +++ b/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" diff --git a/src/translations/el.po b/src/translations/el.po index ebdbab11b..1cd9842ec 100644 --- a/src/translations/el.po +++ b/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" diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po index d8ed89345..4a5d6064a 100644 --- a/src/translations/en_CA.po +++ b/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" diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po index dc2ae57d6..e383cdf63 100644 --- a/src/translations/en_GB.po +++ b/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" diff --git a/src/translations/es.po b/src/translations/es.po index 5272dcde5..7f3195b98 100644 --- a/src/translations/es.po +++ b/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" diff --git a/src/translations/fi.po b/src/translations/fi.po index 9743b07e9..2543aa089 100644 --- a/src/translations/fi.po +++ b/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 "" diff --git a/src/translations/fr.po b/src/translations/fr.po index e6c852645..ada848120 100644 --- a/src/translations/fr.po +++ b/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" diff --git a/src/translations/gl.po b/src/translations/gl.po index 5a4ea3dc6..0711b1011 100644 --- a/src/translations/gl.po +++ b/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 "" diff --git a/src/translations/hu.po b/src/translations/hu.po index db7aa2d9a..934f5bb6e 100644 --- a/src/translations/hu.po +++ b/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" diff --git a/src/translations/it.po b/src/translations/it.po index a879d3900..53e44831c 100644 --- a/src/translations/it.po +++ b/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" diff --git a/src/translations/kk.po b/src/translations/kk.po index 0c636a1c0..20a5b6529 100644 --- a/src/translations/kk.po +++ b/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 "" diff --git a/src/translations/lt.po b/src/translations/lt.po index fbcc27c6e..e6cd0f1b6 100644 --- a/src/translations/lt.po +++ b/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 "" diff --git a/src/translations/nb.po b/src/translations/nb.po index 6d581f3fb..ae77e868f 100644 --- a/src/translations/nb.po +++ b/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" diff --git a/src/translations/nl.po b/src/translations/nl.po index 2708d508e..061ebe3b1 100644 --- a/src/translations/nl.po +++ b/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" diff --git a/src/translations/oc.po b/src/translations/oc.po index 02f9695a1..95fce3494 100644 --- a/src/translations/oc.po +++ b/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" diff --git a/src/translations/pl.po b/src/translations/pl.po index 959d27fda..6e01d5b29 100644 --- a/src/translations/pl.po +++ b/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" diff --git a/src/translations/pt.po b/src/translations/pt.po index 876484dbc..7fcd6ed1d 100644 --- a/src/translations/pt.po +++ b/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" diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po index 5db110ba9..875f6f514 100644 --- a/src/translations/pt_BR.po +++ b/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" diff --git a/src/translations/ro.po b/src/translations/ro.po index 730841b81..a895c8766 100644 --- a/src/translations/ro.po +++ b/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 "" diff --git a/src/translations/ru.po b/src/translations/ru.po index 842b28c1f..67cfa10ff 100644 --- a/src/translations/ru.po +++ b/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 "Сонограмма" diff --git a/src/translations/sk.po b/src/translations/sk.po index 5c347ab7b..5a6112c03 100644 --- a/src/translations/sk.po +++ b/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" diff --git a/src/translations/sl.po b/src/translations/sl.po index 9cb21ad57..4617a8d68 100644 --- a/src/translations/sl.po +++ b/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" diff --git a/src/translations/sr.po b/src/translations/sr.po index e20fd882d..b74fda2c8 100644 --- a/src/translations/sr.po +++ b/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 "" diff --git a/src/translations/sv.po b/src/translations/sv.po index 4fe6c9456..98ec58968 100644 --- a/src/translations/sv.po +++ b/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" diff --git a/src/translations/tr.po b/src/translations/tr.po index 66de1785d..499d552da 100644 --- a/src/translations/tr.po +++ b/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 "" diff --git a/src/translations/translations.pot b/src/translations/translations.pot index 9819c9827..cf1a13d70 100644 --- a/src/translations/translations.pot +++ b/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 "" diff --git a/src/translations/uk.po b/src/translations/uk.po index 1b15d5873..80c2aafa5 100644 --- a/src/translations/uk.po +++ b/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 "Сонограма" diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po index d2df215ad..d99817b64 100644 --- a/src/translations/zh_CN.po +++ b/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 "" diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po index e6bbb13e9..3ab34205e 100644 --- a/src/translations/zh_TW.po +++ b/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 "" diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp index 7555b8736..30c5d884e 100644 --- a/src/ui/mainwindow.cpp +++ b/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))); diff --git a/src/ui/settingsdialog.cpp b/src/ui/settingsdialog.cpp index 59c7d37e8..7188b7117 100644 --- a/src/ui/settingsdialog.cpp +++ b/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(); diff --git a/src/ui/settingsdialog.h b/src/ui/settingsdialog.h index 0ee355adb..3f67c55c2 100644 --- a/src/ui/settingsdialog.h +++ b/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); diff --git a/src/ui/settingsdialog.ui b/src/ui/settingsdialog.ui index bdd4ced4e..612953519 100644 --- a/src/ui/settingsdialog.ui +++ b/src/ui/settingsdialog.ui @@ -14,7 +14,7 @@ Preferences - + :/icon.png:/icon.png @@ -60,10 +60,15 @@ Behavior - + :/icon.png:/icon.png + + + Song Information + + Global Shortcuts @@ -84,7 +89,7 @@ Last.fm - + :/last.fm/as.png:/last.fm/as.png @@ -93,7 +98,7 @@ Magnatune - + :/magnatune.png:/magnatune.png @@ -114,7 +119,7 @@ - 1 + 2 @@ -449,6 +454,67 @@ + + + + + + Show the song information sidebar + + + + + + Always + + + + + + + Only when playing a song + + + true + + + + + + + Never + + + + + + + + + + + 0 + 0 + + + + Lyrics + + + + 0 + + + 0 + + + + + + + + + @@ -729,6 +795,12 @@
ui/globalshortcutsconfig.h
1 + + LyricSettings + QWidget +
lyrics/lyricsettings.h
+ 1 + list @@ -758,9 +830,7 @@ b_always_hide_ b_always_show_ - - - + list @@ -817,12 +887,12 @@ setEnabled(bool) - 274 - 237 + 476 + 277 - 257 - 283 + 459 + 362