diff --git a/src/CMakeLists.txt b/src/CMakeLists.txt
index 99b6dbef4..145d52f8c 100644
--- a/src/CMakeLists.txt
+++ b/src/CMakeLists.txt
@@ -50,7 +50,6 @@ set(SOURCES
library/library.cpp
library/librarybackend.cpp
library/libraryconfig.cpp
- library/libraryconfigdialog.cpp
library/librarydirectorymodel.cpp
library/libraryfilterwidget.cpp
library/librarymodel.cpp
@@ -161,7 +160,6 @@ set(HEADERS
library/library.h
library/librarybackend.h
library/libraryconfig.h
- library/libraryconfigdialog.h
library/librarydirectorymodel.h
library/libraryfilterwidget.h
library/librarymodel.h
@@ -239,7 +237,6 @@ set(HEADERS
set(UI
library/groupbydialog.ui
library/libraryconfig.ui
- library/libraryconfigdialog.ui
library/libraryfilterwidget.ui
playlist/playlistcontainer.ui
diff --git a/src/library/libraryconfigdialog.cpp b/src/library/libraryconfigdialog.cpp
deleted file mode 100644
index c784ce426..000000000
--- a/src/library/libraryconfigdialog.cpp
+++ /dev/null
@@ -1,41 +0,0 @@
-/* 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 "libraryconfigdialog.h"
-#include "ui_libraryconfigdialog.h"
-#include "ui/iconloader.h"
-
-LibraryConfigDialog::LibraryConfigDialog(QWidget *parent)
- : QDialog(parent),
- ui_(new Ui_LibraryConfigDialog)
-{
- ui_->setupUi(this);
-
- setWindowIcon(IconLoader::Load("folder-sound"));
-}
-
-LibraryConfigDialog::~LibraryConfigDialog() {
- delete ui_;
-}
-
-void LibraryConfigDialog::SetModel(LibraryDirectoryModel* model) {
- ui_->config->SetModel(model);
-}
-
-void LibraryConfigDialog::accept() {
- ui_->config->Save();
- QDialog::accept();
-}
diff --git a/src/library/libraryconfigdialog.h b/src/library/libraryconfigdialog.h
deleted file mode 100644
index fe4c27df0..000000000
--- a/src/library/libraryconfigdialog.h
+++ /dev/null
@@ -1,40 +0,0 @@
-/* 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 LIBRARYCONFIGDIALOG_H
-#define LIBRARYCONFIGDIALOG_H
-
-#include
-
-class Ui_LibraryConfigDialog;
-class LibraryDirectoryModel;
-
-class LibraryConfigDialog : public QDialog {
- Q_OBJECT
- public:
- LibraryConfigDialog(QWidget* parent = 0);
- ~LibraryConfigDialog();
-
- void SetModel(LibraryDirectoryModel* model);
-
- public slots:
- void accept();
-
- private:
- Ui_LibraryConfigDialog* ui_;
-};
-
-#endif // LIBRARYCONFIGDIALOG_H
diff --git a/src/library/libraryconfigdialog.ui b/src/library/libraryconfigdialog.ui
deleted file mode 100644
index 06e164787..000000000
--- a/src/library/libraryconfigdialog.ui
+++ /dev/null
@@ -1,82 +0,0 @@
-
-
- LibraryConfigDialog
-
-
-
- 0
- 0
- 400
- 300
-
-
-
- Music Library
-
-
- -
-
-
- -
-
-
- Qt::Horizontal
-
-
-
- -
-
-
- Qt::Horizontal
-
-
- QDialogButtonBox::Cancel|QDialogButtonBox::Ok
-
-
-
-
-
-
-
- LibraryConfig
- QWidget
-
- 1
-
-
-
-
-
- buttonBox
- accepted()
- LibraryConfigDialog
- accept()
-
-
- 248
- 254
-
-
- 157
- 274
-
-
-
-
- buttonBox
- rejected()
- LibraryConfigDialog
- reject()
-
-
- 316
- 260
-
-
- 286
- 274
-
-
-
-
-
diff --git a/src/library/libraryfilterwidget.cpp b/src/library/libraryfilterwidget.cpp
index ec98ae001..f0463c0d6 100644
--- a/src/library/libraryfilterwidget.cpp
+++ b/src/library/libraryfilterwidget.cpp
@@ -17,9 +17,9 @@
#include "libraryfilterwidget.h"
#include "librarymodel.h"
#include "groupbydialog.h"
-#include "libraryconfigdialog.h"
#include "ui_libraryfilterwidget.h"
#include "ui/iconloader.h"
+#include "ui/settingsdialog.h"
#include
#include
@@ -30,8 +30,7 @@ LibraryFilterWidget::LibraryFilterWidget(QWidget *parent)
: QWidget(parent),
ui_(new Ui_LibraryFilterWidget),
model_(NULL),
- group_by_dialog_(new GroupByDialog),
- library_config_dialog_(new LibraryConfigDialog)
+ group_by_dialog_(new GroupByDialog)
{
ui_->setupUi(this);
@@ -101,9 +100,8 @@ LibraryFilterWidget::LibraryFilterWidget(QWidget *parent)
library_menu->addMenu(group_by_menu_);
library_menu->addSeparator();
config_action_ = library_menu->addAction(
- tr("Configure library..."), library_config_dialog_.get(), SLOT(show()));
+ tr("Configure library..."), this, SLOT(ShowConfigDialog()));
ui_->options->setMenu(library_menu);
- connect(library_config_dialog_.get(), SIGNAL(accepted()), SIGNAL(LibraryConfigChanged()));
}
LibraryFilterWidget::~LibraryFilterWidget() {
@@ -131,9 +129,6 @@ void LibraryFilterWidget::SetLibraryModel(LibraryModel *model) {
connect(ui_->filter, SIGNAL(textChanged(QString)), model_, SLOT(SetFilterText(QString)));
connect(filter_age_mapper_, SIGNAL(mapped(int)), model_, SLOT(SetFilterAge(int)));
- // Set up the dialogs
- library_config_dialog_->SetModel(model_->directory_model());
-
// Load settings
if (!settings_group_.isEmpty()) {
QSettings s;
@@ -184,7 +179,7 @@ void LibraryFilterWidget::ClearFilter() {
}
void LibraryFilterWidget::ShowConfigDialog() {
- library_config_dialog_->show();
+ settings_dialog_->OpenAtPage(SettingsDialog::Page_Library);
}
void LibraryFilterWidget::SetFilterHint(const QString& hint) {
diff --git a/src/library/libraryfilterwidget.h b/src/library/libraryfilterwidget.h
index c8ee67d63..12003db84 100644
--- a/src/library/libraryfilterwidget.h
+++ b/src/library/libraryfilterwidget.h
@@ -24,7 +24,7 @@
#include "librarymodel.h"
class GroupByDialog;
-class LibraryConfigDialog;
+class SettingsDialog;
class Ui_LibraryFilterWidget;
class QMenu;
@@ -45,6 +45,7 @@ class LibraryFilterWidget : public QWidget {
void SetSettingsGroup(const QString& group) { settings_group_ = group; }
void SetLibraryModel(LibraryModel* model);
+ void SetSettingsDialog(SettingsDialog* dialog) { settings_dialog_ = dialog; }
signals:
void LibraryConfigChanged();
@@ -62,7 +63,7 @@ class LibraryFilterWidget : public QWidget {
LibraryModel* model_;
boost::scoped_ptr group_by_dialog_;
- boost::scoped_ptr library_config_dialog_;
+ SettingsDialog* settings_dialog_;
QMenu* filter_age_menu_;
QMenu* group_by_menu_;
diff --git a/src/translations/ar.po b/src/translations/ar.po
index f9160d1e1..d59bbb22a 100644
--- a/src/translations/ar.po
+++ b/src/translations/ar.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "مكتبة الصوتيات"
-
msgid "Form"
msgstr "النموذج"
@@ -1208,6 +1205,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr "مكتبة الصوتيات"
+
msgid "Last.fm"
msgstr ""
diff --git a/src/translations/cs.po b/src/translations/cs.po
index 7bd7419b8..aa6b1bec9 100644
--- a/src/translations/cs.po
+++ b/src/translations/cs.po
@@ -842,9 +842,6 @@ msgstr "Automaticky otevře jednostlivé kategorie ve stromu knihovny"
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Knihovna hudby"
-
msgid "Form"
msgstr "Formulář"
@@ -1212,6 +1209,9 @@ msgstr "Chování"
msgid "Notifications"
msgstr "Upozornění"
+msgid "Music Library"
+msgstr "Knihovna hudby"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/da.po b/src/translations/da.po
index 05f08b0be..0b15c2bae 100644
--- a/src/translations/da.po
+++ b/src/translations/da.po
@@ -845,9 +845,6 @@ msgstr "Åbn automatisk enkelte kategorier i bibliotekstræet"
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Musikbibliotek"
-
msgid "Form"
msgstr "Formular"
@@ -1215,6 +1212,9 @@ msgstr "Opførsel"
msgid "Notifications"
msgstr "Bekendtgørelser"
+msgid "Music Library"
+msgstr "Musikbibliotek"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/de.po b/src/translations/de.po
index 097203c73..a98f847ec 100644
--- a/src/translations/de.po
+++ b/src/translations/de.po
@@ -844,9 +844,6 @@ msgstr "Kategorien in der Musiksammlung automatisch öffnen"
msgid "Double-clicking a song clears the playlist first"
msgstr "Stück doppelklicken um Wiedergabeliste zu ersetzen"
-msgid "Music Library"
-msgstr "Musiksammlung"
-
msgid "Form"
msgstr "Formular"
@@ -1214,6 +1211,9 @@ msgstr "Verhalten"
msgid "Notifications"
msgstr "Benachrichtigungen"
+msgid "Music Library"
+msgstr "Musiksammlung"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/el.po b/src/translations/el.po
index 074c6d284..ba7c994fe 100644
--- a/src/translations/el.po
+++ b/src/translations/el.po
@@ -848,9 +848,6 @@ msgstr "Άνοιξε αυτόμα τις μόνες κατηγορίες του
msgid "Double-clicking a song clears the playlist first"
msgstr "Διπλό κλικ σε ένα τραγούδι θα καθαρίσει πρώτα την λίστα αναπαραγωγής"
-msgid "Music Library"
-msgstr "Μουσική βιβλιοθήκη"
-
msgid "Form"
msgstr "Μορφή"
@@ -1218,6 +1215,9 @@ msgstr "Συμπεριφορά"
msgid "Notifications"
msgstr "Ειδοποιήσεις"
+msgid "Music Library"
+msgstr "Μουσική βιβλιοθήκη"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/en_CA.po b/src/translations/en_CA.po
index 932c96fcf..baa1ba458 100644
--- a/src/translations/en_CA.po
+++ b/src/translations/en_CA.po
@@ -844,9 +844,6 @@ msgstr "Automatically open single categories in the library tree"
msgid "Double-clicking a song clears the playlist first"
msgstr "Double-clicking a song clears the playlist first"
-msgid "Music Library"
-msgstr "Music Library"
-
msgid "Form"
msgstr "Form"
@@ -1213,6 +1210,9 @@ msgstr "Behaviour"
msgid "Notifications"
msgstr "Notifications"
+msgid "Music Library"
+msgstr "Music Library"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/en_GB.po b/src/translations/en_GB.po
index 43c137ce6..85c7d0631 100644
--- a/src/translations/en_GB.po
+++ b/src/translations/en_GB.po
@@ -841,9 +841,6 @@ msgstr "Automatically open single categories in the library tree"
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Music Library"
-
msgid "Form"
msgstr "Form"
@@ -1210,6 +1207,9 @@ msgstr "Behaviour"
msgid "Notifications"
msgstr "Notifications"
+msgid "Music Library"
+msgstr "Music Library"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/es.po b/src/translations/es.po
index a8847a9c3..595a91060 100644
--- a/src/translations/es.po
+++ b/src/translations/es.po
@@ -852,9 +852,6 @@ msgid "Double-clicking a song clears the playlist first"
msgstr ""
"Hacer doble clic sobre una canción limpia la lista de reproducción primero"
-msgid "Music Library"
-msgstr "Colección de Música"
-
msgid "Form"
msgstr "Formulario"
@@ -1222,6 +1219,9 @@ msgstr "Comportamiento"
msgid "Notifications"
msgstr "Notificaciones"
+msgid "Music Library"
+msgstr "Colección de Música"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/fi.po b/src/translations/fi.po
index 715f492db..8925d63c0 100644
--- a/src/translations/fi.po
+++ b/src/translations/fi.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr ""
-
msgid "Form"
msgstr ""
@@ -1208,6 +1205,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr ""
+
msgid "Last.fm"
msgstr ""
diff --git a/src/translations/fr.po b/src/translations/fr.po
index 6e82746a8..f51067454 100644
--- a/src/translations/fr.po
+++ b/src/translations/fr.po
@@ -848,9 +848,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Bibliothèque musicale"
-
msgid "Form"
msgstr "Form"
@@ -1218,6 +1215,9 @@ msgstr ""
msgid "Notifications"
msgstr "Notifications"
+msgid "Music Library"
+msgstr "Bibliothèque musicale"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/gl.po b/src/translations/gl.po
index 8739b3ee0..113de2c81 100644
--- a/src/translations/gl.po
+++ b/src/translations/gl.po
@@ -842,9 +842,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr ""
-
msgid "Form"
msgstr ""
@@ -1210,6 +1207,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr ""
+
msgid "Last.fm"
msgstr ""
diff --git a/src/translations/it.po b/src/translations/it.po
index 636906910..b29eafba5 100644
--- a/src/translations/it.po
+++ b/src/translations/it.po
@@ -849,9 +849,6 @@ msgstr "Apri automaticamente categorie singole nell'albero della raccolta"
msgid "Double-clicking a song clears the playlist first"
msgstr "Il doppio clic su un brano svuota la scaletta"
-msgid "Music Library"
-msgstr "Raccolta musicale"
-
msgid "Form"
msgstr "Modulo"
@@ -1219,6 +1216,9 @@ msgstr "Comportamento"
msgid "Notifications"
msgstr "Notifiche"
+msgid "Music Library"
+msgstr "Raccolta musicale"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/kk.po b/src/translations/kk.po
index b8ee9a63f..135c163f9 100644
--- a/src/translations/kk.po
+++ b/src/translations/kk.po
@@ -842,9 +842,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr ""
-
msgid "Form"
msgstr ""
@@ -1210,6 +1207,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr ""
+
msgid "Last.fm"
msgstr ""
diff --git a/src/translations/nb.po b/src/translations/nb.po
index 78714906b..c5d620ca4 100644
--- a/src/translations/nb.po
+++ b/src/translations/nb.po
@@ -843,9 +843,6 @@ msgstr "Automatisk åpne enkeltkategorier i bibliotektreet"
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Musikkbibliotek"
-
msgid "Form"
msgstr "Skjema"
@@ -1212,6 +1209,9 @@ msgstr ""
msgid "Notifications"
msgstr "Meldinger"
+msgid "Music Library"
+msgstr "Musikkbibliotek"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/oc.po b/src/translations/oc.po
index 5cd20e5bc..d660b0da3 100644
--- a/src/translations/oc.po
+++ b/src/translations/oc.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Discotèca"
-
msgid "Form"
msgstr "Formulari"
@@ -1208,6 +1205,9 @@ msgstr "Compòrtament"
msgid "Notifications"
msgstr "Notificacions"
+msgid "Music Library"
+msgstr "Discotèca"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/pl.po b/src/translations/pl.po
index bd795b96c..7344669b7 100644
--- a/src/translations/pl.po
+++ b/src/translations/pl.po
@@ -842,9 +842,6 @@ msgstr "Automatycznie otwieraj pojedyńcze kategorie w drzewie Biblioteki"
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Biblioteka muzyki"
-
msgid "Form"
msgstr "Forma"
@@ -1210,6 +1207,9 @@ msgstr ""
msgid "Notifications"
msgstr "Powiadomienia"
+msgid "Music Library"
+msgstr "Biblioteka muzyki"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/pt.po b/src/translations/pt.po
index c450082c8..8398bd7eb 100644
--- a/src/translations/pt.po
+++ b/src/translations/pt.po
@@ -845,9 +845,6 @@ msgstr "Abrir categorias individuais automaticamente na biblioteca em árvore"
msgid "Double-clicking a song clears the playlist first"
msgstr "Duplo clique na canção apaga a lista de reprodução"
-msgid "Music Library"
-msgstr "Biblioteca de Música"
-
msgid "Form"
msgstr "Formulário"
@@ -1214,6 +1211,9 @@ msgstr "Comportamento"
msgid "Notifications"
msgstr "Notificações"
+msgid "Music Library"
+msgstr "Biblioteca de Música"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/pt_BR.po b/src/translations/pt_BR.po
index 1faa79933..d3254005e 100644
--- a/src/translations/pt_BR.po
+++ b/src/translations/pt_BR.po
@@ -848,9 +848,6 @@ msgstr "Abrir categorias únicas na árvore da biblioteca automaticamente"
msgid "Double-clicking a song clears the playlist first"
msgstr "Duplo clique em música limpa a lista de reprodução primeiro"
-msgid "Music Library"
-msgstr "Biblioteca de Músicas"
-
msgid "Form"
msgstr "Formulário"
@@ -1218,6 +1215,9 @@ msgstr "Comportamento"
msgid "Notifications"
msgstr "Notificações"
+msgid "Music Library"
+msgstr "Biblioteca de Músicas"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/ro.po b/src/translations/ro.po
index 594f1d583..8c9c9bc5d 100644
--- a/src/translations/ro.po
+++ b/src/translations/ro.po
@@ -841,9 +841,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Biblioteca audio"
-
msgid "Form"
msgstr ""
@@ -1209,6 +1206,9 @@ msgstr "Comportament"
msgid "Notifications"
msgstr "Notificări"
+msgid "Music Library"
+msgstr "Biblioteca audio"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/ru.po b/src/translations/ru.po
index 9baa113af..3227ca2aa 100644
--- a/src/translations/ru.po
+++ b/src/translations/ru.po
@@ -846,9 +846,6 @@ msgstr "Автоматически открывать одиночные кат
msgid "Double-clicking a song clears the playlist first"
msgstr "Двойной щелчок мышью на композиции стирает список воспроизведения"
-msgid "Music Library"
-msgstr "Музыкальная коллекция"
-
msgid "Form"
msgstr "Форма"
@@ -1214,6 +1211,9 @@ msgstr "Поведение"
msgid "Notifications"
msgstr "Уведомления"
+msgid "Music Library"
+msgstr "Музыкальная коллекция"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/sk.po b/src/translations/sk.po
index 3ed08d9c1..b98c049c8 100644
--- a/src/translations/sk.po
+++ b/src/translations/sk.po
@@ -845,9 +845,6 @@ msgstr "Automaticky otvoriť jednotlivé kategórie v strome zbierky"
msgid "Double-clicking a song clears the playlist first"
msgstr "Dvojklik na pieseň najprv vymaže playlist"
-msgid "Music Library"
-msgstr "Hudobná zbierka"
-
msgid "Form"
msgstr "Forma"
@@ -1215,6 +1212,9 @@ msgstr "Správanie"
msgid "Notifications"
msgstr "Notifikácie"
+msgid "Music Library"
+msgstr "Hudobná zbierka"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/sv.po b/src/translations/sv.po
index d3e52ceeb..98815987e 100644
--- a/src/translations/sv.po
+++ b/src/translations/sv.po
@@ -845,9 +845,6 @@ msgstr "Öppna enkla kategorier i biblioteksträdet automatiskt"
msgid "Double-clicking a song clears the playlist first"
msgstr "Dubbelklick på en sång rensar spellistan först"
-msgid "Music Library"
-msgstr "Musikbibliotek"
-
msgid "Form"
msgstr "Formulär"
@@ -1215,6 +1212,9 @@ msgstr "Beteende"
msgid "Notifications"
msgstr "Underrättelser"
+msgid "Music Library"
+msgstr "Musikbibliotek"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/tr.po b/src/translations/tr.po
index af34f6044..234276f6d 100644
--- a/src/translations/tr.po
+++ b/src/translations/tr.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "Müzik Kütüphanesi"
-
msgid "Form"
msgstr "Form"
@@ -1208,6 +1205,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr "Müzik Kütüphanesi"
+
msgid "Last.fm"
msgstr "Last.fm"
diff --git a/src/translations/zh_CN.po b/src/translations/zh_CN.po
index 66ba2f35c..19388d221 100644
--- a/src/translations/zh_CN.po
+++ b/src/translations/zh_CN.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr "音乐库"
-
msgid "Form"
msgstr ""
@@ -1208,6 +1205,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr "音乐库"
+
msgid "Last.fm"
msgstr ""
diff --git a/src/translations/zh_TW.po b/src/translations/zh_TW.po
index ffde64cff..51066d4f5 100644
--- a/src/translations/zh_TW.po
+++ b/src/translations/zh_TW.po
@@ -840,9 +840,6 @@ msgstr ""
msgid "Double-clicking a song clears the playlist first"
msgstr ""
-msgid "Music Library"
-msgstr ""
-
msgid "Form"
msgstr ""
@@ -1208,6 +1205,9 @@ msgstr ""
msgid "Notifications"
msgstr ""
+msgid "Music Library"
+msgstr ""
+
msgid "Last.fm"
msgstr ""
diff --git a/src/ui/mainwindow.cpp b/src/ui/mainwindow.cpp
index 33755fa51..f38d79a39 100644
--- a/src/ui/mainwindow.cpp
+++ b/src/ui/mainwindow.cpp
@@ -26,7 +26,6 @@
#include "core/stylesheetloader.h"
#include "engines/enginebase.h"
#include "library/groupbydialog.h"
-#include "library/libraryconfigdialog.h"
#include "library/libraryconfig.h"
#include "library/library.h"
#include "playlist/playlistbackend.h"
@@ -318,6 +317,7 @@ MainWindow::MainWindow(NetworkAccessManager* network, Engine::Type engine, QWidg
// Library filter widget
ui_->library_filter->SetSettingsGroup(kSettingsGroup);
ui_->library_filter->SetLibraryModel(library_->model());
+ ui_->library_filter->SetSettingsDialog(settings_dialog_.get());
connect(ui_->library_filter, SIGNAL(LibraryConfigChanged()), ui_->library_view,
SLOT(ReloadSettings()));
connect(ui_->library_filter, SIGNAL(LibraryConfigChanged()), SLOT(ReloadSettings()));