X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=ee6282b775eb5803d4dc803235dd72ccbadb6dc5;hb=a2df77cbda43d5a24eeb8ac7db7452baae9f18aa;hp=ed4b5e3811e0e40c85440696beac983e99ddddbb;hpb=bfbcdc683846195fbe720f4b3c38f3b0604c8f22;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index ed4b5e3..ee6282b 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -7,6 +7,7 @@ import iTasks
 import mTask
 import Data.List
 from Data.Func import $
+from StdFunc import flip
 
 derive class iTask MTaskShareType, MTaskShare
 
@@ -14,6 +15,7 @@ manageShares :: [MTaskShare] -> Task ()
 manageShares shares = withShared Nothing $ \cs->forever $
 	(viewSharesGrid cs shares -|| updateShares shares <<@ ArrangeVertical) 
 	@! ()
+
 updateShares :: [MTaskShare] -> Task BCValue
 updateShares shares = anyTask (map updateS shares) <<@ ArrangeWithTabs
 
@@ -22,42 +24,18 @@ updateS sh = flip (<<@) (Title $ toString sh.identifier) $ forever $
 		viewSharedInformation "Current value" [] (getSDSShare sh)
 	||- (
 			updateSharedInformation "New value" [] (getSDSShare sh)
-		>>= \nv->allTasks (map (sendMessages [MTUpd sh.identifier nv]) sh.withDevice)
+		>>= \nv->allTasks (map (withDevice treturn) sh.withDevice)
+		>>= \devs->allTasks (map (sendMessages [MTUpd sh.identifier nv]) devs)
 		>>| treturn nv
 		)
 	<<@ ArrangeHorizontal
 
-//	>&^ \st->whileUnchanged st $ \msh->case msh of
-//		Nothing = viewShares shares
-//		Just sh = forever (
-//				viewSharedInformation "View value" [] (getSDSShare sh) >>| treturn sh
-//			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-//			>>= updateShare sh
-//			)
-//			
-//	) @! ()
-
-
-//viewShares :: [MTaskShare] -> Task BCValue
-//viewShares shares = anyTask (map viewShare shares)
-//
-//viewAndDelete :: [MTaskShare] -> Task ()
-//viewAndDelete shares 
-//	= enterChoice "Choose share to update" [ChooseFromGrid id] shares @! ()
-
-//updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
-//updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
-//	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
-//	>>| treturn sh
-//
-from StdFunc import flip
-
 viewSharesGrid :: (Shared (Maybe MTaskShare)) [MTaskShare] -> Task [BCValue]
 viewSharesGrid _ [] = viewInformation "No shares yet" [] []
 viewSharesGrid cs sh = (allTasks [watch (getSDSShare m)\\m<-sh] <<@ NoUserInterface)
 	>&^ \st->flip (<<@) NoUserInterface $ whileUnchanged st $ \mshs->enterChoice "" [ChooseFromGrid id]
 		[{MTaskShare|ss&value=s}\\s<-fromJust mshs & ss<-sh]
-//		>>* [OnValue (withValue $ \s->Just (set (Just s) cs))]
+		>>* [OnValue (withValue $ \s->Just (set (Just s) cs))]
 		@! fromJust mshs
 
 viewShare :: MTaskShare -> Task BCValue
@@ -67,7 +45,7 @@ viewShare m = viewSharedInformation "" [] (getSDSShare m)
 getSDSShare :: MTaskShare -> Shared BCValue
 getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 
-makeShare :: String MTaskDevice Int BCValue -> Task MTaskShare
+makeShare :: String String Int BCValue -> Task MTaskShare
 makeShare withTask withDevice identifier value = treturn 
 		{MTaskShare
 		|withTask=[withTask]