From c03f6a2c2122bd033aa4070112a6458a3dec750f Mon Sep 17 00:00:00 2001 From: Britney Fransen Date: Wed, 18 Sep 2013 15:20:41 -0500 Subject: LinHES-system: msg_daemon.py: make top slots slide down from the top and slide up to disappear. --- abs/core/LinHES-system/PKGBUILD | 4 +-- abs/core/LinHES-system/msg_daemon.py | 47 +++++++++++++++++++++++++----------- 2 files changed, 35 insertions(+), 16 deletions(-) diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD index 1a9c554..43a8dbf 100755 --- a/abs/core/LinHES-system/PKGBUILD +++ b/abs/core/LinHES-system/PKGBUILD @@ -1,6 +1,6 @@ pkgname=LinHES-system pkgver=8.0 -pkgrel=18 +pkgrel=19 arch=('i686' 'x86_64') install=system.install pkgdesc="Everything that makes LinHES an automated system" @@ -101,7 +101,7 @@ md5sums=('8fc4b7c1ddf8f3c4d2266ce55086b4d4' '4a3cd8f9b33b2b86fdba47a8f1fa2859' '16f079dab35dde6efd55bf6cf4e2fb2f' '4abc4780fa78ed40c07401b3cd25209b' - 'cf5d14fdb45991d07ab9db7726cf1322' + '1d275246216ba1b22d5f09eb1c775a73' 'ea315f41dcd6c978e546c95fc05546cf' 'ac61cc460d9e97ba1f5ef69e92cdfbe5' 'f3502bb7c665750da0ecdf6918f7c838' diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py index 4c37171..fe47263 100755 --- a/abs/core/LinHES-system/msg_daemon.py +++ b/abs/core/LinHES-system/msg_daemon.py @@ -28,21 +28,40 @@ class msg_aosd(): osd.show() x -= 1 - y += height - 1; - for i in range(1, height + 1, step): - osd.loop_for(5) - y -= step - osd.set_geometry(x, y, width, i) - osd.set_position(pos, width, height) - osd.set_position_offset(-1, -1) - (x, y, _, _) = osd.get_geometry() - #time to display - osd.loop_for(display_time) - for i in range(height, 0, -step): - y += step - osd.set_geometry(x, y, width, i); - osd.loop_for(1); + if pos < 3: #top positions + y -= height + 1; + for i in range(1, height + 1, step): + osd.loop_for(5) + y += step + osd.set_geometry(x, y, width, height) + + osd.set_position(pos, width, height) + osd.set_position_offset(-1, -1) + (x, y, _, _) = osd.get_geometry() + #time to display + osd.loop_for(display_time) + for i in range(height, 0, -step): + y -= step + osd.set_geometry(x, y, width, height); + osd.loop_for(1); + + else: #bottom positions + y += height - 1; + for i in range(1, height + 1, step): + osd.loop_for(5) + y -= step + osd.set_geometry(x, y, width, i) + + osd.set_position(pos, width, height) + osd.set_position_offset(-1, -1) + (x, y, _, _) = osd.get_geometry() + #time to display + osd.loop_for(display_time) + for i in range(height, 0, -step): + y += step + osd.set_geometry(x, y, width, i); + osd.loop_for(1); osd.hide(); -- cgit v0.12