From 1d47d5494777098c42cacadab9be9328f54da407 Mon Sep 17 00:00:00 2001
From: Britney Fransen <brfransen@gmail.com>
Date: Sat, 28 Sep 2013 15:25:20 -0500
Subject: LinHES-system: msg_daemon.py: make bottom positions scroll the same
 as the top positions

---
 abs/core/LinHES-system/PKGBUILD       |  4 ++--
 abs/core/LinHES-system/msg_daemon.py  | 35 +++++++++++++++++++++++------------
 abs/core/LinHES-system/system.install |  2 +-
 3 files changed, 26 insertions(+), 15 deletions(-)

diff --git a/abs/core/LinHES-system/PKGBUILD b/abs/core/LinHES-system/PKGBUILD
index 3cce3eb..fddb3a7 100755
--- a/abs/core/LinHES-system/PKGBUILD
+++ b/abs/core/LinHES-system/PKGBUILD
@@ -1,6 +1,6 @@
 pkgname=LinHES-system
 pkgver=8.0
-pkgrel=26
+pkgrel=27
 arch=('i686' 'x86_64')
 install=system.install
 pkgdesc="Everything that makes LinHES an automated system"
@@ -101,7 +101,7 @@ md5sums=('5ee78704cab0e88ec58d1aab821fc1aa'
          '4a3cd8f9b33b2b86fdba47a8f1fa2859'
          '16f079dab35dde6efd55bf6cf4e2fb2f'
          '3e60b17892e5b8214d47dcfddf5215a4'
-         '28d2fbad517bcd2ba0cb0ce09f99bf62'
+         '57ec994cc3964a10c00580e89ebcae35'
          'ea315f41dcd6c978e546c95fc05546cf'
          'ac61cc460d9e97ba1f5ef69e92cdfbe5'
          'f3502bb7c665750da0ecdf6918f7c838'
diff --git a/abs/core/LinHES-system/msg_daemon.py b/abs/core/LinHES-system/msg_daemon.py
index 861dbe3..f84d0c8 100755
--- a/abs/core/LinHES-system/msg_daemon.py
+++ b/abs/core/LinHES-system/msg_daemon.py
@@ -31,39 +31,50 @@ class msg_aosd():
         x -= 1
 
         if pos < 3:   #top positions 0 to 2
-            y -= height - ypad;
-            for i in range(1, height + 1, step):
+            y -= height;
+            for i in range(1, height + 1 + ypad, 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
+          #time to display
             osd.loop_for(display_time)
-            for i in range(height, 0, -step):
+            for i in range(height + 1 + ypad, 0, -step):
                 y -= step
                 osd.set_geometry(x, y, width, height);
                 osd.loop_for(1);
 
-        else:    #bottom positions 3 to 8
-            y += height - ypad;
-            for i in range(1, height + 1, step):
+        elif pos < 6:    #middle positions 3 to 5
+            y += height;
+            for i in range(1, height, 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
+          #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);
 
+        else:   #bottom positions 6 to 8
+            y += height;
+            for i in range(1, height + 1 + ypad, step):
+                osd.loop_for(5)
+                y -= step
+                osd.set_geometry(x, y, width, height)
+
+            (x, y, _, _) = osd.get_geometry()
+          #time to display
+            osd.loop_for(display_time)
+            for i in range(height + 1 + ypad, 0, -step):
+                y += step
+                osd.set_geometry(x, y, width, height);
+                osd.loop_for(1);
+
         osd.hide();
 
     def setup(self,font_color,font_type):
diff --git a/abs/core/LinHES-system/system.install b/abs/core/LinHES-system/system.install
index c8dc71d..ddad9e3 100644
--- a/abs/core/LinHES-system/system.install
+++ b/abs/core/LinHES-system/system.install
@@ -19,7 +19,7 @@ post_install() {
     # not needed in R8 because it's in the DB, may be removed
     #/usr/LH/bin/misc_status_config.py
 
-    # install canter font for msg_client.py
+    sv restart msg_daemon
 }
 
 # arg 1:  the new package version
-- 
cgit v0.12

