Opie-Taskbar:

	-Increment PR on taskbar packages
	-Remove default values from configuration files

BKrev: 419fb100yKvqpK603KlWW3DUfIXY6g

9 files changed, 166 insertions, 13 deletions

diff --git a/opie-taskbar/opie-taskbar/corgi/qpe.conf b/opie-taskbar/opie-taskbar/corgi/qpe.conf
index a0611a2f22..261e245c90 100644
--- a/opie-taskbar/opie-taskbar/corgi/qpe.conf
+++ b/opie-taskbar/opie-taskbar/corgi/qpe.conf
@@ -10,12 +10,9 @@ Base = #ffffff
 Button = #e3e3e3
 ButtonText = #000000
 Decoration = libliquid.so
-ForceStyle = 0
 Highlight = #52719c
 HighlightedText = #ffffff
-NoStyle = 
 Style = libphasestyle.so
 Text = #000000
-rotatedir = 0
 [InputMethod]
 current = Multikey
diff --git a/opie-taskbar/opie-taskbar/husky/qpe.conf b/opie-taskbar/opie-taskbar/husky/qpe.conf
index a0611a2f22..261e245c90 100644
--- a/opie-taskbar/opie-taskbar/husky/qpe.conf
+++ b/opie-taskbar/opie-taskbar/husky/qpe.conf
@@ -10,12 +10,9 @@ Base = #ffffff
 Button = #e3e3e3
 ButtonText = #000000
 Decoration = libliquid.so
-ForceStyle = 0
 Highlight = #52719c
 HighlightedText = #ffffff
-NoStyle = 
 Style = libphasestyle.so
 Text = #000000
-rotatedir = 0
 [InputMethod]
 current = Multikey
diff --git a/opie-taskbar/opie-taskbar/qpe.conf b/opie-taskbar/opie-taskbar/qpe.conf
index ea3e68d124..8ed53ff038 100644
--- a/opie-taskbar/opie-taskbar/qpe.conf
+++ b/opie-taskbar/opie-taskbar/qpe.conf
@@ -4,12 +4,9 @@ Base = #ffffff
 Button = #e3e3e3
 ButtonText = #000000
 Decoration = libliquid.so
-ForceStyle = 0
 Highlight = #52719c
 HighlightedText = #ffffff
-NoStyle = 
 Style = libphasestyle.so
 Text = #000000
-rotatedir = 0
 [InputMethod]
 current = Multikey
diff --git a/opie-taskbar/opie-taskbar/ramses/qpe.conf b/opie-taskbar/opie-taskbar/ramses/qpe.conf
index e69de29bb2..98b9fc3133 100644
--- a/opie-taskbar/opie-taskbar/ramses/qpe.conf
+++ b/opie-taskbar/opie-taskbar/ramses/qpe.conf
@@ -0,0 +1,6 @@
+[Appearance]
+Decoration = libflat.so
+FontFamily = helvetica
+FontSize = 10
+FontStyle = Regular
+Style = QPE
diff --git a/opie-taskbar/opie-taskbar/shepherd/qpe.conf b/opie-taskbar/opie-taskbar/shepherd/qpe.conf
index a0611a2f22..261e245c90 100644
--- a/opie-taskbar/opie-taskbar/shepherd/qpe.conf
+++ b/opie-taskbar/opie-taskbar/shepherd/qpe.conf
@@ -10,12 +10,9 @@ Base = #ffffff
 Button = #e3e3e3
 ButtonText = #000000
 Decoration = libliquid.so
-ForceStyle = 0
 Highlight = #52719c
 HighlightedText = #ffffff
-NoStyle = 
 Style = libphasestyle.so
 Text = #000000
-rotatedir = 0
 [InputMethod]
 current = Multikey
diff --git a/opie-taskbar/opie-taskbar/simpad/qpe.conf b/opie-taskbar/opie-taskbar/simpad/qpe.conf
index e69de29bb2..7741468cd9 100644
--- a/opie-taskbar/opie-taskbar/simpad/qpe.conf
+++ b/opie-taskbar/opie-taskbar/simpad/qpe.conf
@@ -0,0 +1,15 @@
+[Appearance]
+FontFamily = Vera
+FontStyle = Regular
+FontSize = 12
+Background = #d5d0de
+Base = #ffffff
+Button = #e3e3e3
+ButtonText = #000000
+Decoration = libliquid.so
+Highlight = #52719c
+HighlightedText = #ffffff
+Style = libphasestyle.so
+Text = #000000
+[InputMethod]
+current = Multikey
diff --git a/opie-taskbar/opie-taskbar/tosa/qpe.conf b/opie-taskbar/opie-taskbar/tosa/qpe.conf
index e69de29bb2..261e245c90 100644
--- a/opie-taskbar/opie-taskbar/tosa/qpe.conf
+++ b/opie-taskbar/opie-taskbar/tosa/qpe.conf
@@ -0,0 +1,18 @@
+[Appearance]
+useBigPixmaps = 1
+SmallIconSize = 24
+BigIconSize = 48
+FontFamily = Vera
+FontStyle = Regular
+FontSize = 12
+Background = #d5d0de
+Base = #ffffff
+Button = #e3e3e3
+ButtonText = #000000
+Decoration = libliquid.so
+Highlight = #52719c
+HighlightedText = #ffffff
+Style = libphasestyle.so
+Text = #000000
+[InputMethod]
+current = Multikey
diff --git a/opie-taskbar/opie-taskbar_1.1.7.oe b/opie-taskbar/opie-taskbar_1.1.7.oe
index e69de29bb2..31c587fd32 100644
--- a/opie-taskbar/opie-taskbar_1.1.7.oe
+++ b/opie-taskbar/opie-taskbar_1.1.7.oe
@@ -0,0 +1,126 @@
+DESCRIPTION = "Opie Launcher and Taskbar"
+SECTION = "opie/base"
+PRIORITY = "optional"
+LICENSE = "GPL"
+MAINTAINER = "Team Opie <opie@handhelds.org>"
+DEPENDS = "opie-libqrsync"
+PR = "r1"
+
+APPNAME = "qpe"
+
+TAG = "${@'v' + oe.data.getVar('PV',d,1).replace('.', '_')}"
+SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/apps/calibrate \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/noncore/settings/mediummount \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/core/launcher \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/pics \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/apps \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/root \
+           cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;tag=${TAG};module=opie/etc \
+           file://server.pro-1.1.7 \
+           file://opie-reorgfiles \
+           file://opie \
+           file://qpe.conf"
+
+S = "${WORKDIR}/launcher"
+
+# Caps/Numlock icons for devices with keyboard
+EXTRA_QMAKEVARS_POST_append_collie 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_poodle 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_shepherd 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_corgi 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_husky 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+EXTRA_QMAKEVARS_POST_append_tosa 	= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE"
+
+# Wallpaper and welcome splash
+PIXMAP_SIZE 		= ""
+PIXMAP_SIZE_shepherd 	= "-640x480"
+PIXMAP_SIZE_corgi 	= "-640x480"
+PIXMAP_SIZE_husky 	= "-640x480"
+PIXMAP_SIZE_tosa 	= "-640x480"
+PIXMAP_SIZE_simpad 	= "-800x600"
+
+inherit opie update-rc.d
+
+INITSCRIPT_NAME = "opie"
+INITSCRIPT_PARAMS = "defaults 99"
+
+do_configure_prepend() {
+	ln -s ${WORKDIR}/calibrate ${S}/calibrate
+	ln -s ${WORKDIR}/mediummount ${S}/mediummount
+	install -m 0644 ${WORKDIR}/server.pro-1.1.7 ${S}/server.pro
+}
+
+do_stage() {
+    install obexinterface.h ${STAGING_INCDIR}/
+
+}
+
+SECTIONS = "1Pim Applications Examples Games Opie-SH Python Settings"
+PICS = "opielogo32x32.png start_button.png new_wait.png opielogo16x16.png sidebar.png"
+
+do_install() {
+	install -d ${D}/${palmtopdir}/bin
+	for i in ${SECTIONS}
+	do
+		install -d ${D}/${palmtopdir}/apps/$i/
+		install -m 0644 ${WORKDIR}/apps/$i/.directory ${D}/${palmtopdir}/apps/$i/
+	done
+	install -d ${D}/${palmtopdir}/pics/launcher
+	install -d ${D}/${palmtopdir}/pics/logo
+	install -d ${D}/${palmtopdir}/pics/RoH/star/
+	install -d ${D}/etc/init.d
+	install -d ${D}/${palmtopdir}/etc/colors
+	install -d ${D}/${palmtopdir}/etc/skel
+
+	install -m 0755 ${S}/qpe ${D}/${palmtopdir}/bin/qpe
+	install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}/${palmtopdir}/bin/
+	install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}/${palmtopdir}/apps/Settings/
+	install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}/${palmtopdir}/apps/Settings/
+
+	for p in ${PICS}
+	do
+		install -m 0644 ${WORKDIR}/pics/launcher/$p ${D}/${palmtopdir}/pics/launcher/$p
+	done
+	install -m 0644 ${WORKDIR}/pics/launcher/firstuse${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/firstuse.jpg
+	install -m 0644 ${WORKDIR}/pics/launcher/opie-background${PIXMAP_SIZE}.jpg ${D}/${palmtopdir}/pics/launcher/opie-background.jpg
+
+	install -m 0644 ${WORKDIR}/pics/logo/*.* ${D}/${palmtopdir}/pics/logo/
+	install -m 0644 ${WORKDIR}/pics/RoH/star/*.png ${D}/${palmtopdir}/pics/RoH/star/
+
+	install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}/${palmtopdir}/etc/colors/
+	install -m 0644 ${WORKDIR}/etc/mime.types ${D}/etc/
+
+	install -m 0755 ${WORKDIR}/opie ${D}/etc/init.d/opie
+	install -m 0644 ${WORKDIR}/qpe.conf ${D}/${palmtopdir}/etc/skel/
+}
+
+# These two should be installed only on devices with keyboard
+do_install_append_collie () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_poodle () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_corgi () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_shepherd () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_husky () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+do_install_append_tosa () {
+	install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}/${palmtopdir}/pics/
+	install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
+}
+
+FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
+
+PACKAGE_ARCH = "${MACHINE_ARCH}"
+
diff --git a/opie-taskbar/opie-taskbar_cvs.oe b/opie-taskbar/opie-taskbar_cvs.oe
index 8cd1c55a52..1629bfbba6 100644
--- a/opie-taskbar/opie-taskbar_cvs.oe
+++ b/opie-taskbar/opie-taskbar_cvs.oe
@@ -5,7 +5,7 @@ LICENSE = "GPL"
 MAINTAINER = "Team Opie <opie@handhelds.org>"
 DEPENDS = "opie-libqrsync"
 PV = "1.1.7+cvs-${CVSDATE}"
-PR = "r1"
+PR = "r2"
 APPNAME = "qpe"
 
 SRC_URI = "cvs://anoncvs:anoncvs@cvs.handhelds.org/cvs;module=opie/core/apps/calibrate \