From 4385260e3db5312b9edde4c5c1f22fdff8dbf2b2 Mon Sep 17 00:00:00 2001
From: Michael Krelin <hacker@klever.net>
Date: Thu, 19 Jul 2007 11:53:07 +0000
Subject: opie-taskbar-images: package more resoltions. We're yet to provide
 correct images, though.

---
 packages/opie-taskbar/opie-taskbar-images.inc    | 14 +++++++++-----
 packages/opie-taskbar/opie-taskbar-images_cvs.bb |  2 +-
 2 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc
index 2e84210718..576220d2f0 100644
--- a/packages/opie-taskbar/opie-taskbar-images.inc
+++ b/packages/opie-taskbar/opie-taskbar-images.inc
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 RPROVIDES = "${PN}"
 APPNAME = "qpe"
 
-S = "${WORKDIR}/launcher"
+S = "${WORKDIR}/pics"
 
 # Wallpaper and welcome splash
 PIXMAP_SIZE 		= ""
@@ -18,24 +18,28 @@ PIXMAP_SIZE_asus730     = "-480x640"
 PIXMAP_SIZE_htcuniversal= "-480x640"
 PIXMAP_SIZE_hx4700      = "-480x640"
 
-PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-240x320"
-
-#inherit opie
+PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320"
 
 do_install() {
 	install -d ${D}${palmtopdir}/pics/launcher
 
 	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-240x320.jpg
 	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-240x320.jpg
+	# TODO: those should be correct images for the resolution:
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x240.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x240.jpg
 
         for res in 480x640 640x480 800x600 ; do
          install -m 0644 ${WORKDIR}/pics/launcher/firstuse-${res}.jpg ${D}${palmtopdir}/pics/launcher/firstuse-${res}.jpg
          install -m 0644 ${WORKDIR}/pics/launcher/opie-background-${res}.jpg ${D}${palmtopdir}/pics/launcher/opie-background-${res}.jpg
         done
+	# TODO: those should be correct images for the resoltion:
+        install -m 0644 ${WORKDIR}/pics/launcher/firstuse-800x600.jpg ${D}${palmtopdir}/pics/launcher/firstuse-600x800.jpg
+        install -m 0644 ${WORKDIR}/pics/launcher/opie-background-800x600.jpg ${D}${palmtopdir}/pics/launcher/opie-background-600x800.jpg
 }
 
 python do_package_prepend () {
-        reslist = ['240x320','480x640','640x480', '800x600']
+        reslist = ['240x320','320x240', '480x640','640x480', '800x600','600x800']
         dir = bb.data.expand('${palmtopdir}/pics/launcher/', d)
         ft = bb.data.expand('${palmtopdir}/pics/*/*-%s.*', d)
         pn = bb.data.getVar('PN', d, 1)
diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
index 718160cb4d..33588d9e12 100644
--- a/packages/opie-taskbar/opie-taskbar-images_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb
@@ -1,5 +1,5 @@
 require ${PN}.inc
 PV = "${OPIE_CVS_PV}"
-PR = "r4"
+PR = "r5"
 
 SRC_URI = "${HANDHELDS_CVS};module=opie/pics"
-- 
cgit v1.2.3