From f8c808433f9c1d01212009d9740c60803dd94673 Mon Sep 17 00:00:00 2001 From: emeric Date: Sun, 6 Mar 2016 00:44:24 +0100 Subject: [PATCH] [UI/MOBILE] WIP on internal path support --- Makefile.am | 3 +- approot/templates.xml | 127 ++++------ docroot/images/unknown-artist.jpg | Bin 0 -> 12272 bytes docroot/images/unknown-cover.jpg | Bin 1120 -> 25322 bytes src/Makefile.am | 4 +- src/database/Artist.cpp | 24 ++ src/database/Artist.hpp | 1 + src/database/Release.cpp | 16 ++ src/database/Release.hpp | 1 + src/database/Track.cpp | 16 ++ src/database/Track.hpp | 1 + src/ui/LmsApplication.cpp | 36 ++- src/ui/LmsApplication.hpp | 8 +- src/ui/audio/AudioPlayer.cpp | 4 +- src/ui/audio/desktop/PlayQueue.cpp | 2 +- src/ui/audio/desktop/PlayQueue.hpp | 2 - src/ui/audio/mobile/ArtistSearch.cpp | 44 +--- src/ui/audio/mobile/ArtistView.cpp | 15 +- src/ui/audio/mobile/ArtistView.hpp | 6 + src/ui/audio/mobile/MobileAudio.cpp | 11 +- src/ui/audio/mobile/PreviewSearchView.cpp | 10 +- src/ui/audio/mobile/ReleaseSearch.cpp | 110 ++++----- src/ui/audio/mobile/ReleaseSearch.hpp | 18 +- src/ui/audio/mobile/ReleaseSearchView.cpp | 58 +++++ src/ui/audio/mobile/ReleaseSearchView.hpp | 37 +++ src/ui/audio/mobile/ReleaseView.cpp | 8 +- src/ui/audio/mobile/ReleaseView.hpp | 4 +- src/ui/audio/mobile/TrackSearch.cpp | 56 ++--- src/ui/audio/mobile/TrackSearch.hpp | 14 +- src/ui/audio/mobile/TrackSearchView.cpp | 60 +++++ src/ui/audio/mobile/TrackSearchView.hpp | 37 +++ src/ui/resource/CoverResource.cpp | 177 -------------- src/ui/resource/ImageResource.cpp | 226 ++++++++++++++++++ .../{CoverResource.hpp => ImageResource.hpp} | 14 +- 34 files changed, 696 insertions(+), 454 deletions(-) create mode 100755 docroot/images/unknown-artist.jpg mode change 100644 => 100755 docroot/images/unknown-cover.jpg create mode 100644 src/ui/audio/mobile/ReleaseSearchView.cpp create mode 100644 src/ui/audio/mobile/ReleaseSearchView.hpp create mode 100644 src/ui/audio/mobile/TrackSearchView.cpp create mode 100644 src/ui/audio/mobile/TrackSearchView.hpp delete mode 100644 src/ui/resource/CoverResource.cpp create mode 100644 src/ui/resource/ImageResource.cpp rename src/ui/resource/{CoverResource.hpp => ImageResource.hpp} (78%) diff --git a/Makefile.am b/Makefile.am index 99025d4e..28cd688e 100644 --- a/Makefile.am +++ b/Makefile.am @@ -13,7 +13,8 @@ lms_css_DATA = \ docroot/css/lms.css lms_images_DATA = \ - docroot/images/unknown-cover.jpg + docroot/images/unknown-cover.jpg \ + docroot/images/unknown-artist.jpg lms_approot_DATA = \ approot/templates.xml diff --git a/approot/templates.xml b/approot/templates.xml index 01fea403..ff40519c 100644 --- a/approot/templates.xml +++ b/approot/templates.xml @@ -365,12 +365,6 @@ - -
-
${search}
-
-
-
@@ -386,62 +380,45 @@
- -
-
-
${name}
-
-
-
- - -
-
-
-
-
-
${cover}
-
${name}
-
-
-
-
-
-
- - -
-
-
-
-
-
${cover}
-
${name}
-
${btn}
-
-
-
-
-
-
- - -
-
-
- ${contents} -
-
-
+ + + + ${title} + ${contents} + ${show-more} - + +
+
${gif} +

${name}

+
+
+ + + + ${title} + ${contents} + ${show-more} + + +

${cover}

${name}

${artist}

@@ -449,43 +426,20 @@ - - ${title} - ${release-container} - ${show-more} - - - -
-
-
- ${contents} -
-
-
-
- - -
-
${gif} -

${name}

-
-
- - + wa-track_search + -> wa-track-search-res + -> wa-track-search-res + -> ... +!--> + ${title} ${show-more} - +