summaryrefslogtreecommitdiff
path: root/packages/opie-taskbar
diff options
context:
space:
mode:
Diffstat (limited to 'packages/opie-taskbar')
-rw-r--r--packages/opie-taskbar/opie-taskbar/ramses/opie23
-rw-r--r--packages/opie-taskbar/opie-taskbar/ramses/qpe.conf25
-rw-r--r--packages/opie-taskbar/opie-taskbar_cvs.bb9
3 files changed, 45 insertions, 12 deletions
diff --git a/packages/opie-taskbar/opie-taskbar/ramses/opie b/packages/opie-taskbar/opie-taskbar/ramses/opie
index f5887c4be2..d5e2955b10 100644
--- a/packages/opie-taskbar/opie-taskbar/ramses/opie
+++ b/packages/opie-taskbar/opie-taskbar/ramses/opie
@@ -18,13 +18,8 @@ fi
. /etc/profile
if [ ! -e "$HOME/Settings/qpe.conf" ] ; then
- echo "Copying default qpe.conf into $HOME/Settings/"
- mkdir -p $HOME/Settings/
- cat $OPIEDIR/etc/skel/qpe.conf >$HOME/Settings/qpe.conf
-fi
-
-if [ ! -e "$HOME/Settings/locale.conf" -a -e "$OPIEDIR/etc/skel/locale.conf" ] ; then
- cat $OPIEDIR/etc/skel/locale.conf >$HOME/Settings/locale.conf
+ mkdir -p $HOME/Settings
+ cp $OPIEDIR/etc/skel/* $HOME/Settings
fi
if [ ! -e "$HOME/systeminfo/linkver" ] ; then
@@ -42,7 +37,7 @@ case $1 in
echo Starting Opie-login....
$OPIEDIR/bin/opie-login -terminal 2
else
- $OPIEDIR/bin/opie-reorgfiles
+ $OPIEDIR/bin/opie-reorgfiles >/dev/null
if [ -x /usr/bin/ssh-agent ]; then
SSHAGENT=/usr/bin/ssh-agent
else
@@ -53,16 +48,20 @@ case $1 in
export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh
fi
echo Starting Opie....
- $SSHAGENT $OPIEDIR/bin/qpe -terminal 2
+ $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 2>/dev/null
fi
;;
'stop')
echo "Stopping Opie..."
- killall qpe 2>/dev/null
- killall opie-login 2>/dev/null
- killall quicklauncher 2>/dev/null
+ killall qpe 2>/dev/null
+ killall opie-login 2>/dev/null
+ killall quicklauncher 2>/dev/null
+ sleep 1
+ killall -9 qpe 2>/dev/null
+ killall -9 opie-login 2>/dev/null
+ killall -9 quicklauncher 2>/dev/null
;;
diff --git a/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf b/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf
index e69de29bb2..8efe771ad0 100644
--- a/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf
+++ b/packages/opie-taskbar/opie-taskbar/ramses/qpe.conf
@@ -0,0 +1,25 @@
+[Appearance]
+Decoration = libflat.so
+FontFamily = vera
+FontSize = 10
+FontStyle = Regular
+LeftHand = 0
+Style = libflatstyle.so
+rotatedir = 0
+[Battery]
+[Date]
+ClockApplet = 0
+LongOrder = 273
+Separator = .
+ShortOrder = 273
+[InputMethod]
+current = Multikey
+[Keyboard]
+[Startup]
+FirstUse = 0
+[Time]
+AMPM = 0
+MONDAY = 1
+[Volume]
+[Wireless]
+UpdateFrequency = 2
diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb
index b7783b926f..286abdb459 100644
--- a/packages/opie-taskbar/opie-taskbar_cvs.bb
+++ b/packages/opie-taskbar/opie-taskbar_cvs.bb
@@ -100,6 +100,15 @@ do_install() {
install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}/${palmtopdir}/pics/
}
+updatercd_postinst_ramses() {
+if test "x$D" != "x"; then
+ D="-r $D"
+else
+ D="" # do not autostart at installation time
+fi
+update-rc.d $D ${INITSCRIPT_NAME} ${INITSCRIPT_PARAMS}
+}
+
FILES_opie-taskbar_append = " /etc ${palmtopdir}/apps ${palmtopdir}/pics"
PACKAGE_ARCH = "${MACHINE_ARCH}"