diff options
Diffstat (limited to 'packages/opie-taskbar')
34 files changed, 157 insertions, 638 deletions
diff --git a/packages/opie-taskbar/opie-taskbar-images.inc b/packages/opie-taskbar/opie-taskbar-images.inc new file mode 100644 index 0000000000..769b5ff2c0 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images.inc @@ -0,0 +1,56 @@ +DESCRIPTION = "Opie Launcher and Taskbar" +SECTION = "opie/base" +PRIORITY = "optional" +LICENSE = "GPL" +RPROVIDES = "${PN}" +APPNAME = "qpe" + +S = "${WORKDIR}/pics" + +# Wallpaper and welcome splash +PIXMAP_SIZE = "" +PIXMAP_SIZE_c7x0 = "-640x480" +PIXMAP_SIZE_spitz = "-640x480" +PIXMAP_SIZE_akita = "-640x480" +PIXMAP_SIZE_tosa = "-480x640" +PIXMAP_SIZE_simpad = "-800x600" +PIXMAP_SIZE_asus730 = "-480x640" +PIXMAP_SIZE_htcuniversal= "-480x640" +PIXMAP_SIZE_hx4700 = "-480x640" + +PACKAGES = "${PN}-480x640 ${PN}-640x480 ${PN}-800x600 ${PN}-600x800 ${PN}-320x240 ${PN}-240x320 ${PN}-320x320" + +do_install() { + install -d ${D}${palmtopdir}/pics/launcher + + install -m 0644 ${FILESDIR}/firstuse-320x320.jpg ${D}${palmtopdir}/pics/launcher/firstuse-320x320.jpg + install -m 0644 ${FILESDIR}/opie-background-320x320.jpg ${D}${palmtopdir}/pics/launcher/opie-background-320x320.jpg + 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','320x240', '320x320', '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) + for res in reslist: + bb.data.setVar('FILES_%s-%s' % (pn,res), ft % res, d ) + postinst = '' + postinst = 'update-alternatives --install %sfirstuse.jpg opie-firstuse-pixmap %sfirstuse-%s.jpg 50\n' % (dir,dir,res) + postinst += 'update-alternatives --install %sopie-background.jpg opie-background-pixmap %sopie-background-%s.jpg 50\n' % (dir,dir,res) + bb.data.setVar('pkg_postinst_%s-%s' % (pn,res),postinst, d) +} + +PACKAGE_ARCH = "all" diff --git a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty index e69de29bb2..e69de29bb2 100644 --- a/packages/opie-taskbar/opie-taskbar/akita/.mtn2git_empty +++ b/packages/opie-taskbar/opie-taskbar-images/.mtn2git_empty diff --git a/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg Binary files differnew file mode 100644 index 0000000000..67523f1291 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images/firstuse-320x320.jpg diff --git a/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg Binary files differnew file mode 100644 index 0000000000..194816f1e1 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images/opie-background-320x320.jpg diff --git a/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb new file mode 100644 index 0000000000..0c5b93780d --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_1.2.3.bb @@ -0,0 +1,6 @@ +require ${PN}.inc +PR = "r1" + +TAG = "${@'v' + bb.data.getVar('PV',d,1).replace('.', '_')}" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/pics" diff --git a/packages/opie-taskbar/opie-taskbar-images_cvs.bb b/packages/opie-taskbar/opie-taskbar-images_cvs.bb new file mode 100644 index 0000000000..ff7ea9e17b --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar-images_cvs.bb @@ -0,0 +1,5 @@ +require ${PN}.inc +PV = "${OPIE_CVS_PV}" +PR = "r6" + +SRC_URI = "${HANDHELDS_CVS};module=opie/pics" diff --git a/packages/opie-taskbar/opie-taskbar.inc b/packages/opie-taskbar/opie-taskbar.inc index 4c357f54b6..4f43e550b9 100644 --- a/packages/opie-taskbar/opie-taskbar.inc +++ b/packages/opie-taskbar/opie-taskbar.inc @@ -3,34 +3,16 @@ SECTION = "opie/base" PRIORITY = "optional" LICENSE = "GPL" DEPENDS = "opie-libqrsync opie-qss" +# Unfortunately, ipkg has buggy handling of Rdepends to multiple packages with the same Provides. +# Instead of seeing if something in package package lists selects needed package among the rest +# or errors out otherwise, it just install random package which has needed Provides. So, comment +# this out. +#RDEPENDS = "opie-taskbar-images" APPNAME = "qpe" 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_c7x0 = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_tosa = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_spitz = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_akita = "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" -EXTRA_QMAKEVARS_POST_append_htcuniversal= "DEFINES+=OPIE_TASKBAR_LOCK_KEY_STATE" - -# Wallpaper and welcome splash -PIXMAP_SIZE = "" -PIXMAP_SIZE_c7x0 = "-640x480" -PIXMAP_SIZE_spitz = "-640x480" -PIXMAP_SIZE_akita = "-640x480" -PIXMAP_SIZE_tosa = "-480x640" -PIXMAP_SIZE_simpad = "-800x600" -PIXMAP_SIZE_asus730 = "-480x640" -PIXMAP_SIZE_htcuniversal= "-480x640" -PIXMAP_SIZE_hx4700 = "-480x640" - -inherit opie update-rc.d - -INITSCRIPT_NAME = "opie" -INITSCRIPT_PARAMS = "start 99 5 . stop 20 0 1 6 ." +inherit opie do_configure_prepend() { ln -s ${WORKDIR}/calibrate ${S}/calibrate @@ -47,7 +29,7 @@ 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 + install -d ${D}${bindir} for i in ${SECTIONS} do install -d ${D}${palmtopdir}/apps/$i/ @@ -56,23 +38,18 @@ do_install() { install -d ${D}${palmtopdir}/pics/launcher install -d ${D}${palmtopdir}/pics/logo install -d ${D}${palmtopdir}/pics/RoH/star/ - install -d ${D}${sysconfdir}/init.d - install -d ${D}${sysconfdir}/profile.d install -d ${D}${palmtopdir}/etc/colors install -d ${D}${palmtopdir}/etc/skel + install -d ${D}${sysconfdir} - install -m 0755 ${S}/qpe ${D}${palmtopdir}/bin/qpe - install -m 0755 ${WORKDIR}/opie-reorgfiles ${D}${palmtopdir}/bin/ + install -m 0755 ${S}/qpe ${D}${bindir}/qpe install -m 0644 ${WORKDIR}/apps/Settings/calibrate.desktop ${D}${palmtopdir}/apps/Settings/ install -m 0644 ${WORKDIR}/apps/Settings/quit.desktop ${D}${palmtopdir}/apps/Settings/ - install -m 0644 ${WORKDIR}/opie_defaults ${D}${sysconfdir}/profile.d/ 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/ @@ -80,35 +57,8 @@ do_install() { install -m 0644 ${WORKDIR}/etc/colors/*.scheme ${D}${palmtopdir}/etc/colors/ install -m 0644 ${WORKDIR}/etc/mime.types ${D}${sysconfdir}/ - install -m 0755 ${WORKDIR}/opie ${D}${sysconfdir}/init.d/opie - install -m 0644 ${WORKDIR}/qpe.conf ${D}${palmtopdir}/etc/skel/ - - if [ -s ${WORKDIR}/locale.conf ]; then - install -m 0644 ${WORKDIR}/locale.conf ${D}${palmtopdir}/etc/skel/ - fi - install -m 0644 ${WORKDIR}/pics/capslock.xpm ${D}${palmtopdir}/pics/ install -m 0644 ${WORKDIR}/pics/numlock.xpm ${D}${palmtopdir}/pics/ - - case ${MACHINE} in - c7x0) - install -d ${D}${sysconfdir}/apm/event.d/ - install -m 0755 ${WORKDIR}/qpe-suspend-resume ${D}${sysconfdir}/apm/event.d/00-qpe-suspend-resume.sh - ;; - *) - ;; - esac -} - -updatercd_postinst_mnci() { -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 = " ${sysconfdir} ${palmtopdir}/apps ${palmtopdir}/pics" - -PACKAGE_ARCH = "${MACHINE_ARCH}" diff --git a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf b/packages/opie-taskbar/opie-taskbar/akita/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/akita/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/opie b/packages/opie-taskbar/opie-taskbar/c7x0/opie deleted file mode 100755 index 84f3b3e673..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/opie +++ /dev/null @@ -1,85 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -# we need to tinker directly with qws_display until the ODevice -# default (which is now W100:Rot0:0) works flawlessly with rotation -# and survives a suspend/resume cycle -export QWS_DISPLAY=Transformed:Rot0:0 -# export QWS_DISPLAY=W100:Rot0:0 -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -for conf in $OPIEDIR/etc/skel/*.conf; do - conf_basename=`basename $conf` - if [ ! -e "$HOME/Settings/$conf_basename" ] ; then - echo "Copying default $conf_basename into $HOME/Settings/" - mkdir -p $HOME/Settings/ - cat $conf >$HOME/Settings/$conf_basename - fi -done - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 2 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume b/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume deleted file mode 100644 index be37519512..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe-suspend-resume +++ /dev/null @@ -1,33 +0,0 @@ -#!/bin/sh - -QTDIR=/opt/QtPalmtop -LD_LIBRARY_PATH=$QTDIR -export LD_LIBRARY_PATH QTDIR -LOGGING=0 -log() { - if [ $LOGGING -eq 1 ]; then - echo "$(date +%y/%m/%d-%H:%m:%S): $@" >> /var/log/qte.log - fi -} - -retcode=1 -tries=3 - -if [ "$1" = suspend ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'aboutToSuspend()'" - $QTDIR/bin/qcop QPE/System 'aboutToSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -elif [ "$1" = resume ]; then - while [ $retcode -ne 0 -a $tries -gt 0 ]; do - log "-> $QTDIR/bin/qcop QPE/System 'returnFromSuspend()'" - $QTDIR/bin/qcop QPE/System 'returnFromSuspend()' - retcode=$? - tries=`expr $tries - 1` - log "<- Result $retcode" - done -fi - diff --git a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf b/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/c7x0/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf b/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/htcuniversal/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch new file mode 100644 index 0000000000..e356682768 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/kbdlocks-runtime.patch @@ -0,0 +1,35 @@ +--- launcher/taskbar.h.org 2004-08-23 00:35:22.000000000 +0300 ++++ launcher/taskbar.h 2007-07-04 19:23:54.000000000 +0300 +@@ -84,6 +84,7 @@ + LockKeyState* lockState; + StartMenu *sm; + bool resizeRunningApp; ++ bool showKbdLockState; + }; + + +--- launcher/taskbar.cpp.org 2005-07-04 01:13:00.000000000 +0300 ++++ launcher/taskbar.cpp 2007-07-04 19:24:48.000000000 +0300 +@@ -213,12 +213,9 @@ + (void)new SafeMode( this ); + #endif + +- // ## make customizable in some way? +-#ifdef OPIE_TASKBAR_LOCK_KEY_STATE +- lockState = new LockKeyState( this ); +-#else + lockState = 0; +-#endif ++ if ( showKbdLockState ) ++ lockState = new LockKeyState( this ); + + #if defined(Q_WS_QWS) + #if !defined(QT_NO_COP) +@@ -388,6 +385,7 @@ + Config cfg( "Launcher" ); + cfg.setGroup( "InputMethods" ); + resizeRunningApp = cfg.readBoolEntry( "Resize", true ); ++ showKbdLockState = cfg.readBoolEntry( "ShowKbdLocks", true ); + } + + #include "taskbar.moc" diff --git a/packages/opie-taskbar/opie-taskbar/locale.conf b/packages/opie-taskbar/opie-taskbar/locale.conf deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/locale.conf +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/mnci/opie b/packages/opie-taskbar/opie-taskbar/mnci/opie deleted file mode 100755 index d5e2955b10..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/opie +++ /dev/null @@ -1,79 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin -# export QWS_KEYBOARD=KernelTTY - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e "$HOME/Settings/qpe.conf" ] ; then - mkdir -p $HOME/Settings - cp $OPIEDIR/etc/skel/* $HOME/Settings -fi - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 2 - else - $OPIEDIR/bin/opie-reorgfiles >/dev/null - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $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 - sleep 1 - killall -9 qpe 2>/dev/null - killall -9 opie-login 2>/dev/null - killall -9 quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf b/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf deleted file mode 100644 index 8efe771ad0..0000000000 --- a/packages/opie-taskbar/opie-taskbar/mnci/qpe.conf +++ /dev/null @@ -1,25 +0,0 @@ -[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/no-builtin-qss-startup.patch b/packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch new file mode 100644 index 0000000000..349b28675b --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/no-builtin-qss-startup.patch @@ -0,0 +1,11 @@ +--- launcher/server.cpp.org 2007-05-01 20:55:01.000000000 +0000 ++++ launcher/server.cpp 2007-05-03 04:48:45.000000000 +0000 +@@ -1009,6 +1009,8 @@ + } + + void Server::startSoundServer() { ++ owarn << "Sound server (qss) now needs to be started standalone" << oendl; ++ return; + if ( !process ) { + process = new Opie::Core::OProcess( this ); + connect(process, SIGNAL(processExited(Opie::Core::OProcess*)), diff --git a/packages/opie-taskbar/opie-taskbar/opie b/packages/opie-taskbar/opie-taskbar/opie deleted file mode 100755 index 3fe4d0cdf8..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie +++ /dev/null @@ -1,90 +0,0 @@ -#!/bin/sh -# -[ -z $LOGNAME ] && export LOGNAME=root && export HOME=/home/root -[ -z $HOME ] && export HOME=/home/$LOGNAME - -export QTDIR=/opt/QtPalmtop -export OPIEDIR=/opt/QtPalmtop -export QPEDIR=/opt/QtPalmtop -export LD_LIBRARY_PATH=$LD_LIBRARY_PATH:$OPIEDIR/lib -export PATH=$PATH:$OPIEDIR/bin - -if [ ! -x "$OPIEDIR/bin/qpe" ] ; then - echo Opie not installed - exit 0 -fi - -. /etc/profile - -if [ ! -e $TSLIB_TSDEVICE ]; then - export QWS_MOUSE_PROTO=MouseMan:/dev/input/mice -fi - -for conf in $OPIEDIR/etc/skel/*.conf; do - conf_basename=`basename $conf` - if [ ! -e "$HOME/Settings/$conf_basename" ] ; then - echo "Copying default $conf_basename into $HOME/Settings/" - mkdir -p $HOME/Settings/ - cat $conf >$HOME/Settings/$conf_basename - fi -done - -if [ ! -e "$HOME/systeminfo/linkver" ] ; then - mkdir -p $HOME/systeminfo/ - echo "1.13" >$HOME/systeminfo/linkver -fi - -if [ ! -e "/opt/Qtopia" ] ; then - ln -sf /opt/QtPalmtop /opt/Qtopia -fi - -case $1 in -'start') - #/sbin/getkey 5 "Starting Opie in 5 seconds... press key to interrupt." && exit 0 - - # Turn off psplash if any - sleep is required for anti-race - if [ -e /mnt/.psplash ]; then - TMPDIR=/mnt/.psplash psplash-write "QUIT" || true - sleep 1 - fi - - if [ -x "$OPIEDIR/bin/opie-login" ]; then - echo Starting Opie-login.... - $OPIEDIR/bin/opie-login -terminal 3 - else - $OPIEDIR/bin/opie-reorgfiles - if [ -x /usr/bin/ssh-agent ]; then - SSHAGENT=/usr/bin/ssh-agent - else - SSHAGENT="" - fi - - if [ -x "$OPIEDIR/bin/opie-sh-ssh-askpass.sh" ]; then - export SSH_ASKPASS=$OPIEDIR/bin/opie-sh-ssh-askpass.sh - fi - echo Starting Opie.... - $SSHAGENT $OPIEDIR/bin/qpe -terminal 3 - fi - - ;; - -'stop') - echo "Stopping Opie..." - killall qpe 2>/dev/null - killall opie-login 2>/dev/null - killall quicklauncher 2>/dev/null - - ;; - -'restart') - $0 stop && $0 start - - ;; - -*) - echo "usage: $0 { start | stop | restart }" - - ;; - -esac - diff --git a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles b/packages/opie-taskbar/opie-taskbar/opie-reorgfiles deleted file mode 100755 index 96b3e29da4..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie-reorgfiles +++ /dev/null @@ -1,93 +0,0 @@ -#!/bin/sh - -APPS=$HOME/Applications -DOCS=$HOME/Documents - -if [ -d $APPS -a "$1" != "-f" ] -then - echo "You seem to already have a $APPS directory." - echo "Assuming it is the Opie Applications directory. Exiting." - exit 0 -fi - -if [ -d $HOME/Apps ] -then - mv $HOME/Apps $APPS -else - mkdir $APPS -fi - -if [ -f $DOCS/addressbook.xml ] -then - if [ -f $APPS/addressbook/addressbook.xml ] - then - echo "$DOCS/addressbook.xml conflicts with $APPS/addressbook/addressbook.xml" - echo "Moving $DOCS/addressbook.xml to $HOME" - mv $DOCS/addressbook.xml $HOME - else - mkdir $APPS/addressbook - mv $DOCS/addressbook.xml $APPS/addressbook - fi -fi - -if [ -f $DOCS/datebooksettings.xml ] -then - echo "$DOCS/datebooksettings.xml is obsolete" - echo "Please re-set your datebook preferences" - rm $DOCS/datebooksettings.xml -fi - -if [ -f $DOCS/datebook.xml ] -then - mkdir $APPS/databook - mv $DOCS/datebook.xml $APPS/databook -fi - -if [ -d $DOCS/qtmail ] -then - mv $DOCS/qtmail $APPS/ -fi - -if [ -f $DOCS/todo.xml ] -then - if [ -f $APPS/todolist/todolist.xml ] - then - mv $DOCS/todo.xml $HOME - echo "$DOCS/todo.xml is superceded by $APPS/todolist/todolist.xml" - echo "$DOCS/todo.xml has been moved to $HOME" - else - echo "NOTE: $DOCS/todo.xml is obsolete. It will move to $APPS/todolist/todolist.xml" - echo "when next you run the latest ToDo application." - fi -fi - -if [ ! -d $APPS/qimpen ] -then - mkdir $APPS/qimpen -fi - -if [ -f $DOCS/asciilower.qpt ] -then - mv $DOCS/asciilower.qpt $APPS/qimpen -fi - -if [ -f $DOCS/asciiupper.qpt ] -then - mv $DOCS/asciiupper.qpt $APPS/qimpen -fi - -if [ -f $DOCS/numeric.qpt ] -then - mv $DOCS/numeric.qpt $APPS/qimpen -fi - -if [ -d "$HOME/.qpe" ] -then - if [ -d "$HOME/Settings" ] - then - mv $HOME/.qpe/* "$HOME/Settings" - rmdir "$HOME/.qpe" - else - mv $HOME/.qpe "$HOME/Settings" - fi -fi diff --git a/packages/opie-taskbar/opie-taskbar/opie_defaults b/packages/opie-taskbar/opie-taskbar/opie_defaults deleted file mode 100644 index f560889927..0000000000 --- a/packages/opie-taskbar/opie-taskbar/opie_defaults +++ /dev/null @@ -1,12 +0,0 @@ -#!/bin/sh - -MACHINE="`cat /proc/cpuinfo | sed -n "/^Hardware/s/.*\:\(.*\)/\1/;s/^\ //p"`" -KVER="`uname -r | sed -n "s/\([0-9]\)\.\([0-9]\)\..*/\1.\2/p"`" - -case "$MACHINE" in -*Poodle) test "$KVER" = "2.6" && export QWS_CURSOR_ROTATION=90;; -esac - -export PATH="$PATH:/opt/QtPalmtop/bin" -export QTDIR="/opt/QtPalmtop" - diff --git a/packages/opie-taskbar/opie-taskbar/qpe.conf b/packages/opie-taskbar/opie-taskbar/qpe.conf deleted file mode 100644 index 59bb20c762..0000000000 --- a/packages/opie-taskbar/opie-taskbar/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 9 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 9 -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/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch b/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch new file mode 100644 index 0000000000..1a73588409 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar/restart-from-bindir.patch @@ -0,0 +1,12 @@ +diff --git a/serverapp.cpp b/serverapp.cpp +index 0e92040..b933340 100644 +--- a/serverapp.cpp ++++ b/serverapp.cpp +@@ -763,6 +763,7 @@ void ServerApplication::restart() + for ( int fd = 3; fd < 100; fd++ ) + close( fd ); + execl( ( qpeDir() + "/bin/qpe" ).local8Bit(), "qpe", NULL ); ++ execl( OPIE_BINDIR "/qpe", "qpe", NULL ); + exit( 1 ); + #endif + } diff --git a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/simpad/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf b/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf deleted file mode 100644 index b10d90b94e..0000000000 --- a/packages/opie-taskbar/opie-taskbar/simpad/qpe.conf +++ /dev/null @@ -1,18 +0,0 @@ -[Appearance] -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 12 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 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/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/spitz/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf b/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/spitz/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty b/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty deleted file mode 100644 index e69de29bb2..0000000000 --- a/packages/opie-taskbar/opie-taskbar/tosa/.mtn2git_empty +++ /dev/null diff --git a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf b/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf deleted file mode 100644 index e9922e4d86..0000000000 --- a/packages/opie-taskbar/opie-taskbar/tosa/qpe.conf +++ /dev/null @@ -1,22 +0,0 @@ -[Appearance] -useBigPixmaps = 1 -SmallIconSize = 32 -BigIconSize = 48 -FontFamily = DejaVu_Sans -FontStyle = Regular -FontSize = 16 -FixedFontFamily = DejaVu_Sans_Mono -FixedFontStyle = Regular -FixedFontSize = 14 -Background = #d5d0de -Base = #ffffff -Button = #e3e3e3 -ButtonText = #000000 -Decoration = libliquid.so -Highlight = #52719c -HighlightedText = #ffffff -Style = Windows -Text = #000000 -TabStyle = 1 -[InputMethod] -current = Multikey diff --git a/packages/opie-taskbar/opie-taskbar_1.2.2.bb b/packages/opie-taskbar/opie-taskbar_1.2.2.bb index a5e154cfef..497bff0953 100644 --- a/packages/opie-taskbar/opie-taskbar_1.2.2.bb +++ b/packages/opie-taskbar/opie-taskbar_1.2.2.bb @@ -1,5 +1,5 @@ require ${PN}.inc -PR = "r5" +PR = "r7" SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ @@ -10,10 +10,4 @@ SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " diff --git a/packages/opie-taskbar/opie-taskbar_1.2.3.bb b/packages/opie-taskbar/opie-taskbar_1.2.3.bb new file mode 100644 index 0000000000..d8a794fc16 --- /dev/null +++ b/packages/opie-taskbar/opie-taskbar_1.2.3.bb @@ -0,0 +1,16 @@ +require ${PN}.inc +PR = "r0" + +SRC_URI = "${HANDHELDS_CVS};tag=${TAG};module=opie/core/apps/calibrate \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/noncore/settings/mediummount \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/core/launcher \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/pics \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/apps \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/root \ + ${HANDHELDS_CVS};tag=${TAG};module=opie/etc \ + file://nomax.patch;patch=1;pnum=3 \ + file://no-builtin-qss-startup.patch;patch=1 \ + file://kbdlocks-runtime.patch;patch=1 \ + file://restart-from-bindir.patch;patch=1 \ + file://server.pro \ + " diff --git a/packages/opie-taskbar/opie-taskbar_cvs.bb b/packages/opie-taskbar/opie-taskbar_cvs.bb index b2992b0c28..3bda5c4f40 100644 --- a/packages/opie-taskbar/opie-taskbar_cvs.bb +++ b/packages/opie-taskbar/opie-taskbar_cvs.bb @@ -1,6 +1,6 @@ require ${PN}.inc PV = "${OPIE_CVS_PV}" -PR = "r5" +PR = "r15" SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/noncore/settings/mediummount \ @@ -10,11 +10,8 @@ SRC_URI = "${HANDHELDS_CVS};module=opie/core/apps/calibrate \ ${HANDHELDS_CVS};module=opie/root \ ${HANDHELDS_CVS};module=opie/etc \ file://nomax.patch;patch=1;pnum=3 \ + file://no-builtin-qss-startup.patch;patch=1 \ + file://kbdlocks-runtime.patch;patch=1 \ + file://restart-from-bindir.patch;patch=1 \ file://server.pro \ - file://opie-reorgfiles \ - file://opie \ - file://qpe.conf \ - file://locale.conf \ - file://opie_defaults" - -SRC_URI_append_c7x0 = " file://qpe-suspend-resume" + " |
