[UI/MOBILE] Removed the duplicated search bar

approot/templates.xml

@@ -2,6 +2,18 @@
 <messages xmlns:if="Wt.WTemplate.conditions">
 <!--FORMS message blocks-->
 
+<message id="Wt.WNavigationBar.template">
+	<div>
+		${collapse-button}
+		<div class="navbar-header">
+			${expand-button}
+			${title-link}
+			${search}
+		</div>
+		${contents}
+	</div>
+</message>
+
 <message id="firstConnectionForm-template">
 	<legend>${title}</legend>
 	<div class="form-horizontal">

src/logger/Logger.hpp

@@ -17,8 +17,7 @@
  * along with LMS.  If not, see <http://www.gnu.org/licenses/>.
  */
 
-#ifndef LOGGER_HPP__
+#pragma once
-#define LOGGER_HPP__
 
 #include <Wt/WServer>
 #include <Wt/WApplication>
@@ -55,4 +54,3 @@ std::string getSeverityName(Severity sev);
 
 #define LMS_LOG(module, level)	Wt::log(getSeverityName(Severity::level)) << Wt::WLogger::sep << "[" << getModuleName(Module::module) << "]" <<  Wt::WLogger::sep
 
-#endif

src/ui/LmsApplication.cpp

@@ -23,7 +23,6 @@
 #include <Wt/WNavigationBar>
 #include <Wt/WStackedWidget>
 #include <Wt/WMenu>
-#include <Wt/WNavigationBar>
 #include <Wt/WPopupMenu>
 #include <Wt/WVBoxLayout>
 #include <Wt/Auth/Identity>
@@ -204,9 +203,15 @@ LmsApplication::handleAuthEvent(void)
 		contentsStack->setOverflow(Wt::WContainerWidget::OverflowAuto);
 		contentsStack->addStyleClass("contents");
 
-		// Setup a Left-aligned menu.
+		Wt::WMenu *menu = new Wt::WMenu(contentsStack);
-		Wt::WMenu *leftMenu = new Wt::WMenu(contentsStack);
+		navigation->addMenu(menu, Wt::AlignRight);
-		navigation->addMenu(leftMenu);
+
+		Wt::WLineEdit *searchEdit = new Wt::WLineEdit();
+		navigation->bindWidget("search", searchEdit);
+		searchEdit->setEmptyText("Search...");
+		searchEdit->addStyleClass("navbar-form navbar-nav");
+		searchEdit->setWidth(150);
+		// TODO add a span with a search icon
 
 		Audio *audio;
 
@@ -215,23 +220,18 @@ LmsApplication::handleAuthEvent(void)
 		else
 			audio = new Desktop::Audio();
 
-		leftMenu->addItem("Audio", audio);
+		menu->addItem("Audio", audio);
 #if defined HAVE_VIDEO
-		leftMenu->addItem("Video", new VideoWidget());
+		menu->addItem("Video", new VideoWidget());
 #endif
-		leftMenu->addItem("Settings", new Settings::Settings());
+		menu->addItem("Settings", new Settings::Settings());
-
-		// Setup a Right-aligned menu.
-		Wt::WMenu *rightMenu = new Wt::WMenu();
-
-		navigation->addMenu(rightMenu, Wt::AlignRight);
 
 		Wt::WPopupMenu *popup = new Wt::WPopupMenu();
 		popup->addItem("Logout");
 
 		Wt::WMenuItem *item = new Wt::WMenuItem( CurrentAuthUser().identity(Wt::Auth::Identity::LoginName) );
-			item->setMenu(popup);
+		item->setMenu(popup);
-			rightMenu->addItem(item);
+		menu->addItem(item);
 
 		popup->itemSelected().connect(std::bind([=] (Wt::WMenuItem* item)
 		{
@@ -239,17 +239,12 @@ LmsApplication::handleAuthEvent(void)
 				DbHandler().getLogin().logout();
 		}, std::placeholders::_1));
 
-		// Add a Search control.
+		searchEdit->changed().connect(std::bind([=] ()
-		LineEdit *searchEdit = new LineEdit(500);
-		searchEdit->setEmptyText("Search...");
-
-		searchEdit->timedChanged().connect(std::bind([=] ()
 		{
 			// TODO: check which view is activated and search into it
 			audio->search(searchEdit->text().toUTF8());
 		}));
 
-		navigation->addSearch(searchEdit, Wt::AlignLeft);
 
 		layout->addWidget(navigation);
 		layout->addWidget(contentsStack, 1);

src/ui/audio/AudioPlayer.cpp

@@ -25,6 +25,7 @@
 #include <Wt/WPushButton>
 
 #include "common/InputRange.hpp"
+#include "logger/Logger.hpp"
 
 #include "LmsApplication.hpp"
 
@@ -40,7 +41,7 @@ AudioPlayer::loadTrack(Database::Track::id_type trackId)
 	Database::Track::pointer track = Database::Track::getById(DboSession(), trackId);
 	if (!track)
 	{
-		std::cerr << "no track for this id!" << std::endl;
+		LMS_LOG(UI, INFO) << "No track found for id " << trackId;
 		return;
 	}
 
@@ -55,7 +56,7 @@ AudioPlayer::loadTrack(Database::Track::id_type trackId)
 
 	if (!mediaFile.open() || !mediaFile.scan())
 	{
-		std::cerr << "cannot open file '" << track->getPath() << std::endl;
+		LMS_LOG(UI, ERROR) << "Cannot open file '" << track->getPath();
 		return;
 	}
 
@@ -90,6 +91,8 @@ AudioPlayer::AudioPlayer(Wt::WContainerWidget *parent)
 	t->setTemplateText(Wt::WString::tr("wa-audio-player"));
 
 	_audio = new Wt::WAudio(this);
+	_audio->setOptions(Wt::WAudio::Autoplay);
+	_audio->setPreloadMode(Wt::WAudio::PreloadAuto);
 
 	_cover = new Wt::WImage();
 	t->bindWidget("cover", _cover);

src/ui/audio/mobile/MobileAudio.cpp

@@ -20,9 +20,7 @@
 
 #include <Wt/WContainerWidget>
 #include <Wt/WTemplate>
-#include <Wt/WLineEdit>
 #include <Wt/WText>
-#include <Wt/WTable>
 
 #include "logger/Logger.hpp"
 #include "utils/Utils.hpp"
@@ -30,11 +28,6 @@
 #include "audio/AudioPlayer.hpp"
 #include "LmsApplication.hpp"
 
-#include "ArtistSearch.hpp"
-#include "ReleaseSearch.hpp"
-#include "TrackSearch.hpp"
-#include "TrackReleaseView.hpp"
-
 #include "MobileAudio.hpp"
 
 #define SEARCH_NB_ITEMS	4
@@ -56,6 +49,26 @@ static void playTrack(AudioPlayer *audioPlayer, Database::Track::id_type trackId
 		audioPlayer->loadTrack(track.id());
 }
 
+void
+Audio::search(std::string text)
+{
+	// When a new search is done, output some results from:
+	// Artist
+	// Release
+	// Song
+	auto keywords = splitString(text, " ");;
+
+	_releaseSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS);
+	_artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS);
+	_trackSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS);
+
+	_artistSearch->show();
+	_releaseSearch->show();
+	_trackSearch->show();
+	_trackReleaseView->hide();
+}
+
+
 Audio::Audio(Wt::WContainerWidget *parent)
 : UserInterface::Audio(parent)
 {
@@ -63,21 +76,12 @@ Audio::Audio(Wt::WContainerWidget *parent)
 	this->setStyleClass("container-fluid");
 	this->setPadding(60, Wt::Bottom);
 
-	Wt::WTemplate* search = new Wt::WTemplate(this);
+	_artistSearch = new ArtistSearch(this);
-	search->setTemplateText(Wt::WString::tr("mobile-search"));
+	_releaseSearch = new ReleaseSearch(this);
+	_trackSearch = new TrackSearch(this);
 
-	Wt::WLineEdit *edit = new Wt::WLineEdit();
+	_trackReleaseView  = new TrackReleaseView(this);
-	edit->setEmptyText("Search...");
+	_trackReleaseView->hide();
-
-	search->bindWidget("search", edit);
-	search->setMargin(10);
-
-	ArtistSearch* artistSearch = new ArtistSearch(this);
-	ReleaseSearch* releaseSearch = new ReleaseSearch(this);
-	TrackSearch* trackSearch = new TrackSearch(this);
-
-	TrackReleaseView* trackReleaseView  = new TrackReleaseView(this);
-	trackReleaseView->hide();
 
 	Wt::WTemplate* footer = new Wt::WTemplate(this);
 	footer->setTemplateText(Wt::WString::tr("mobile-audio-footer"));
@@ -85,83 +89,65 @@ Audio::Audio(Wt::WContainerWidget *parent)
 	AudioPlayer* audioPlayer = new AudioPlayer();
 	footer->bindWidget("player", audioPlayer);
 
-	edit->changed().connect(std::bind([=] ()
+	_artistSearch->moreArtistsSelected().connect(std::bind([=]
 	{
-		// When a new search is done, output some results from:
+		_releaseSearch->hide();
-		// Artist
+		_trackSearch->hide();
-		// Release
+		_artistSearch->show();
-		// Song
+		_trackReleaseView->hide();
-		auto keywords = splitString(edit->text().toUTF8(), " ");;
-
-		releaseSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Release, keywords), SEARCH_NB_ITEMS);
-		artistSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Artist, keywords), SEARCH_NB_ITEMS);
-		trackSearch->search(SearchFilter::ByNameAnd(SearchFilter::Field::Track, keywords), SEARCH_NB_ITEMS);
-
-		artistSearch->show();
-		releaseSearch->show();
-		trackSearch->show();
-		trackReleaseView->hide();
 	}));
 
-	artistSearch->moreArtistsSelected().connect(std::bind([=]
+	_artistSearch->artistSelected().connect(std::bind([=] (Artist::id_type artistId)
 	{
-		releaseSearch->hide();
+		_artistSearch->hide();
-		trackSearch->hide();
+		_trackSearch->hide();
-		artistSearch->show();
+		_releaseSearch->show();
-		trackReleaseView->hide();
+		_trackReleaseView->hide();
-	}));
 
-	artistSearch->artistSelected().connect(std::bind([=] (Artist::id_type artistId)
+		_releaseSearch->search(SearchFilter::ById(SearchFilter::Field::Artist, artistId), 20);
-	{
-		artistSearch->hide();
-		trackSearch->hide();
-		releaseSearch->show();
-		trackReleaseView->hide();
-
-		releaseSearch->search(SearchFilter::ById(SearchFilter::Field::Artist, artistId), 20);
 	}, std::placeholders::_1));
 
-	releaseSearch->moreReleasesSelected().connect(std::bind([=]
+	_releaseSearch->moreReleasesSelected().connect(std::bind([=]
 	{
-		artistSearch->hide();
+		_artistSearch->hide();
-		trackSearch->hide();
+		_trackSearch->hide();
-		releaseSearch->show();
+		_releaseSearch->show();
-		trackReleaseView->hide();
+		_trackReleaseView->hide();
 	}));
 
-	releaseSearch->releaseSelected().connect(std::bind([=] (Release::id_type releaseId)
+	_releaseSearch->releaseSelected().connect(std::bind([=] (Release::id_type releaseId)
 	{
-		artistSearch->hide();
+		_artistSearch->hide();
-		releaseSearch->hide();
+		_releaseSearch->hide();
-		trackSearch->hide();
+		_trackSearch->hide();
-		trackReleaseView->show();
+		_trackReleaseView->show();
 
-		trackReleaseView->search(SearchFilter::ById(SearchFilter::Field::Release, releaseId), 40);
+		_trackReleaseView->search(SearchFilter::ById(SearchFilter::Field::Release, releaseId), 40);
 	}, std::placeholders::_1));
 
-	trackSearch->moreSelected().connect(std::bind([=]
+	_trackSearch->moreSelected().connect(std::bind([=]
 	{
-		artistSearch->hide();
+		_artistSearch->hide();
-		releaseSearch->hide();
+		_releaseSearch->hide();
-		trackSearch->show();
+		_trackSearch->show();
-		trackReleaseView->hide();
+		_trackReleaseView->hide();
 	}));
 
-	trackSearch->trackPlay().connect(std::bind([=] (Track::id_type id)
+	_trackSearch->trackPlay().connect(std::bind([=] (Track::id_type id)
 	{
 		playTrack(audioPlayer, id);
 	}, std::placeholders::_1));
 
-	trackReleaseView->trackPlay().connect(std::bind([=] (Track::id_type id)
+	_trackReleaseView->trackPlay().connect(std::bind([=] (Track::id_type id)
 	{
 		playTrack(audioPlayer, id);
 	}, std::placeholders::_1));
 
 	// Initially, populate the widgets using an empty search
 	{
-		artistSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
+		_artistSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
-		releaseSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
+		_releaseSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
-		trackSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
+		_trackSearch->search(SearchFilter(), SEARCH_NB_ITEMS);
 	}
 
 }

src/ui/audio/mobile/MobileAudio.hpp

@@ -24,6 +24,11 @@
 
 #include "audio/Audio.hpp"
 
+#include "ArtistSearch.hpp"
+#include "ReleaseSearch.hpp"
+#include "TrackSearch.hpp"
+#include "TrackReleaseView.hpp"
+
 namespace UserInterface {
 namespace Mobile {
 
@@ -32,10 +37,14 @@ class Audio : public UserInterface::Audio
 	public:
 		Audio(Wt::WContainerWidget *parent = 0);
 
-		void search(std::string text) {}
+		void search(std::string text);
 
 	private:
 
+		ArtistSearch*	_artistSearch;
+		ReleaseSearch*	_releaseSearch;
+		TrackSearch*	_trackSearch;
+		TrackReleaseView*	_trackReleaseView;
 };
 
 } // namespace Mobile