Changing some image files. Adding check to ensure album cover image is valid. Removi...

diff --git a/Makefile b/Makefile
index 7c819a7..88317e6 100644 (file)
--- a/Makefile
+++ b/Makefile
@@ -3,22 +3,19 @@ INSTALL_FILES = images js MediaPlayer.png index.html
 
 VERSION := 0.0.1
 PACKAGE = $(PROJECT)-$(VERSION)
-ARCHIVE = $(PACKAGE).tar.bz2
 
 INSTALL_DIR = ${DESTDIR}/usr/share/$(PROJECT)
-DESKTOP_DIR = ${DESTDIR}/usr/share/applications
-ICON_DIR    = ${DESTDIR}/usr/share/pixmaps
 
 all:
        @echo "Nothing to build"
 
+wgtPkg:
+       zip -r $(PROJECT).wgt js images css index.html manifest.json config.xml
+
 install:
+       @echo "Installing MediaPlayer, stand by..."
        mkdir -p $(INSTALL_DIR)/
-       cp -a $(INSTALL_FILES) $(INSTALL_DIR)/
-       mkdir -p $(DESKTOP_DIR)/
-       cp $(PROJECT).desktop $(DESKTOP_DIR)/
-       mkdir -p $(ICON_DIR)/
-       cp MediaPlayer.png $(ICON_DIR)/$(PROJECT).png
+       cp $(PROJECT).wgt $(INSTALL_DIR)/
 
 dist:
        tar czf ../$(PACKAGE).tar.bz2 . 

diff --git a/config.xml b/config.xml
index e1a1c7c..c644111 100644 (file)
--- a/config.xml
+++ b/config.xml
@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://yourdomain/MediaPlayer20" version="1.0.0" viewmodes="maximized">
-    <tizen:application id="t8j6HTRpuz" required_version="1.0"/>
+<widget xmlns="http://www.w3.org/ns/widgets" xmlns:tizen="http://tizen.org/ns/widgets" id="http://yourdomain/MediaPlayer" version="1.0.0" viewmodes="maximized">
+    <tizen:application id="t8j6HTRpuz.MediaPlayer" package="t8j6HTRpuz" required_version="2.1"/>
     <content src="index.html"/>
     <icon src="MediaPlayer.png"/>
     <name>MediaPlayer</name>

diff --git a/images/albumButton.png b/images/albumButton.png
new file mode 100644 (file)
index 0000000..b427311
Binary files /dev/null and b/images/albumButton.png differ

diff --git a/images/allButton.png b/images/allButton.png
new file mode 100644 (file)
index 0000000..5764ad5
Binary files /dev/null and b/images/allButton.png differ

diff --git a/images/artistButton.png b/images/artistButton.png
new file mode 100644 (file)
index 0000000..64db620
Binary files /dev/null and b/images/artistButton.png differ

diff --git a/index.html b/index.html
index 60e8f13..1c41edf 100644 (file)
--- a/index.html
+++ b/index.html
@@ -34,9 +34,9 @@
                </div>          
                
                <div id="sortButtons">
-                               <img id="sortAllButton" class="sortButton" src="images/allButton2.png" onClick="sortByAlpha()" style="display: none">
-                               <img id="sortArtistButton" class="sortButton" src="images/artistButton3.png" onClick="sortByArtist()" style="display: none">
-                               <img id="sortAlbumButton" class="sortButton" src="images/albumButton2.png" onClick="sortByAlbum()" style="display: none">
+                               <img id="sortAllButton" class="sortButton" src="images/allButton.png" onClick="sortByAlpha()" style="display: none">
+                               <img id="sortArtistButton" class="sortButton" src="images/artistButton.png" onClick="sortByArtist()" style="display: none">
+                               <img id="sortAlbumButton" class="sortButton" src="images/albumButton.png" onClick="sortByAlbum()" style="display: none">
                        </div>                                  
                
                <canvas id="mediaName" style="position:absolute; z-index : 0"></canvas> 
@@ -60,4 +60,4 @@
                </div>  
                                 
        </body>
-</html>
\ No newline at end of file
+</html>

diff --git a/packaging/MediaPlayer.spec b/packaging/MediaPlayer.spec
index cd69a8e..a7dd8f6 100644 (file)
--- a/packaging/MediaPlayer.spec
+++ b/packaging/MediaPlayer.spec
@@ -18,18 +18,17 @@ A HTML media player for music, video, and images
 
 %build
 
-make %{?jobs:-j%jobs}
+make wgtPkg
+
+#make %{?jobs:-j%jobs}
 
 %install
 rm -rf %{buildroot}
 %make_install
 
-desktop-file-install --delete-original       \
-  --dir %{buildroot}%{_datadir}/applications             \
-   %{buildroot}%{_datadir}/applications/*.desktop
+%post
+wrt-installer -i %{_datadir}/MediaPlayer/MediaPlayer.wgt
 
 %files
 %defattr(-,root,root,-)
 %{_datadir}/MediaPlayer
-%{_datadir}/applications/MediaPlayer.desktop
-%{_datadir}/pixmaps/MediaPlayer.png