updates

[mTask.git] / miTask.icl

diff --git a/miTask.icl b/miTask.icl
index a2ef345..71b8911 100644 (file)
--- a/miTask.icl
+++ b/miTask.icl
@@ -31,17 +31,15 @@ Start world = startEngine (mTaskManager
        >>* [OnAction (Action "Shutdown") (always $ shutDown)]) world
 
 mTaskManager :: Task ()
-mTaskManager = anyTask 
+mTaskManager = startupDevices >>| anyTask 
                [ viewmTasks @! ()
-               , whileUnchanged sdsStore viewShares
+               , whileUnchanged sdsStore manageShares
                , whileUnchanged deviceStore $ manageDevices process
-               ] <<@ ApplyLayout layout
-       where
-               layout = sequenceLayouts
+               ] <<@ ApplyLayout (sequenceLayouts 
                        [ arrangeWithSideBar 0 LeftSide 260 True
                        , arrangeSplit Vertical True
-                       ]
-
+                       ])
+       where
                viewmTasks :: Task String
                viewmTasks = enterChoiceWithShared "Available mTasks" [ChooseFromList id] mTaskTaskStore
                        >&^ \sh->whileUnchanged sh $ \mi->forever (case mi of
@@ -51,8 +49,9 @@ mTaskManager = anyTask
                                                [] = viewInformation "No devices yet" [] ()
                                                ds = fromJust ('DM'.get mTaskTask allmTasks)
                                                        >>= \bc->(enterChoice "Choose Device" [ChooseFromDropdown \t->t.deviceName] ds
-                                                               -&&- enterInformation "Timeout, 0 for one-shot" []
+                                                               -&&- enterInformation "Timeout" []
                                                        ) >>* [OnAction (Action "Send") (withValue $ Just o sendToDevice mTaskTask bc)]
+                                                       @! ()
                                )
 
                process :: MTaskDevice (Shared Channels) -> Task ()