update

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index 45ee7dd..ba28987 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -24,19 +24,22 @@ import iTasks._Framework.Serialization
 
 import TTY, iTasksTTY
 
-Start :: *World -> *World
-Start world = startEngine (mTaskManager
-       >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
+Start world = startEngine [
+               publish "/manage" $ const $ mTaskManager
+                       >>* [OnAction (Action "Shutdown") (always $ shutDown)],
+               publish "/" $ const demo
+       ] world
+
+demo = viewInformation "" [] "Hello world"
 
 mTaskManager :: Task ()
 mTaskManager = startupDevices >>| anyTask 
                [ viewmTasks @! ()
-               , whileUnchanged sdsStore manageShares
+               , whileUnchanged sdsStore manageShares @! ()
                , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout (sequenceLayouts 
-                       [ arrangeWithSideBar 0 LeftSide 260 True
-                       , arrangeSplit Vertical True
-                       ])
+               ] <<@ ApplyLayout (foldl1 sequenceLayouts
+                       [arrangeWithSideBar 0 LeftSide 260 True
+                       ,arrangeSplit Vertical True])
        where
                viewmTasks :: Task String
                viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
@@ -48,7 +51,7 @@ mTaskManager = startupDevices >>| anyTask
                                                ds = fromJust ('DM'.get mTaskTask allmTasks)
                                                        >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
                                                                -&&- enterInformation "Timeout" []
-                                                       ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)]
+                                                       ) >>* [OnAction (Action "Send") (withValue $ Just o sendTaskToDevice mTaskTask bc)]
                                                        @! ()
                                )
 
@@ -63,8 +66,8 @@ mTaskManager = startupDevices >>| anyTask
                                proc [m:ms] = traceValue (toString m) >>| (case m of
 //                                     MTSDSAck i = traceValue (toString m) @! ()
 //                                     MTSDSDelAck i = traceValue (toString m) @! ()
-                                       MTPub i val = updateShare i val
-                                       MTTaskAck i = deviceTaskAcked device i
+                                       MTPub i val = updateShare i val @! ()
+                                       MTTaskAck i mem = deviceTaskAcked device i mem
                                        MTTaskDelAck i = deviceTaskDeleteAcked device i @! ()
                                        MTDevSpec s = deviceAddSpec device s @! ()
                                        _ = treturn ()