diff options
| author | Uwe Klotz <uklotz@mixxx.org> | 2018-11-22 13:13:45 +0100 |
|---|---|---|
| committer | Uwe Klotz <uklotz@mixxx.org> | 2018-11-22 13:13:45 +0100 |
| commit | 3b0c4d0436f34904588cf0ace9124c3f0a36ff97 (patch) | |
| tree | 2320618425d952a3eb6cf0f015deb7fb320e4337 /src/library/library.cpp | |
| parent | c236956884e3c7b9a47536f98eb7eb5a126a26e4 (diff) | |
| parent | df228c678f2a09132c24d15a65010f0837b35bc4 (diff) | |
Merge branch 'master' of git@github.com:mixxxdj/mixxx.git into lp1737537_analysis_revamp
Diffstat (limited to 'src/library/library.cpp')
| -rw-r--r-- | src/library/library.cpp | 14 |
1 files changed, 8 insertions, 6 deletions
diff --git a/src/library/library.cpp b/src/library/library.cpp index 0892d5aed1..52e19cc716 100644 --- a/src/library/library.cpp +++ b/src/library/library.cpp @@ -36,6 +36,7 @@ #include "widget/wtracktableview.h" #include "widget/wlibrary.h" #include "widget/wlibrarysidebar.h" +#include "widget/wsearchlineedit.h" #include "controllers/keyboard/keyboardeventfilter.h" @@ -259,11 +260,6 @@ void Library::bindWidget(WLibrary* pLibraryWidget, connect(this, SIGNAL(setSelectedClick(bool)), pTrackTableView, SLOT(setSelectedClick(bool))); - connect(this, SIGNAL(searchStarting()), - pTrackTableView, SLOT(onSearchStarting())); - connect(this, SIGNAL(searchCleared()), - pTrackTableView, SLOT(onSearchCleared())); - m_pLibraryControl->bindWidget(pLibraryWidget, pKeyboard); QListIterator<LibraryFeature*> feature_it(m_features); @@ -295,6 +291,8 @@ void Library::addFeature(LibraryFeature* feature) { this, SLOT(slotLoadTrackToPlayer(TrackPointer, QString, bool))); connect(feature, SIGNAL(restoreSearch(const QString&)), this, SLOT(slotRestoreSearch(const QString&))); + connect(feature, SIGNAL(disableSearch()), + this, SLOT(slotDisableSearch())); connect(feature, SIGNAL(enableCoverArtDisplay(bool)), this, SIGNAL(enableCoverArtDisplay(bool))); connect(feature, SIGNAL(trackSelected(TrackPointer)), @@ -334,7 +332,11 @@ void Library::slotLoadTrackToPlayer(TrackPointer pTrack, QString group, bool pla } void Library::slotRestoreSearch(const QString& text) { - emit(restoreSearch(text)); + emit restoreSearch(text); +} + +void Library::slotDisableSearch() { + emit disableSearch(); } void Library::slotRefreshLibraryModels() { |