X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=miTask.icl;h=71b891165dbbb029ade74296b4b4750f3e7562ee;hb=a2b8b2a0de173f92092bf6cbbed23551e674ca3c;hp=a2ef345b38690d5db21dacce05e09623ae1a5460;hpb=cf006df4dfd44845b6e5459d81bfe34a187884a9;p=mTask.git diff --git a/miTask.icl b/miTask.icl index a2ef345..71b8911 100644 --- 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 ()