X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=8c0ae61355ffb78e257597dbd5b386a01858b0c4;hb=ee38806680e1706a4aea577d1ed699860f1fb0e8;hp=76f676a76a17af4a465170055453b809f39361c3;hpb=7ab8606c3d22a2bc2743eae7a398407c84d502f2;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 76f676a..8c0ae61 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -11,8 +11,8 @@ from Data.Func import $
 derive class iTask MTaskShareType, MTaskShare
 
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever $
-	/*viewSharesGrid shares -|| */viewShares shares @! ()
+manageShares shares = withShared Nothing $ \cs->forever $
+	viewSharesGrid cs shares /*||- (viewSharedInformation "" [] cs*/ @! ()//)//||- editCurrentShare cs
 
 //	>&^ \st->whileUnchanged st $ \msh->case msh of
 //		Nothing = viewShares shares
@@ -25,25 +25,27 @@ manageShares shares = forever $
 //	) @! ()
 
 
-viewShares :: [MTaskShare] -> Task BCValue
-viewShares shares = anyTask (map viewShare shares)
-
-viewAndDelete :: [MTaskShare] -> Task ()
-viewAndDelete shares 
-	= enterChoice "Choose share to update" [ChooseFromGrid id] shares @! ()
+//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 :: [MTaskShare] -> Task [MTaskShare]
-//viewSharesGrid sh = allTasks [whileUnchanged (get $ getSDSShare m) (\s->treturn (m, s))\\m<-sh]
-//	@ map (\(s,v)->{MTaskShare|s&value=v})
-//	>>= enterChoice "Choose share" [ChooseFromGrid id]
-//	>>= \s->treturn [s]
-//{anyTask (map viewShare sh) <<@ ArrangeHorizontal
-//	>>| return (hd sh)
+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))]
+		@! fromJust mshs
 
 viewShare :: MTaskShare -> Task BCValue
 viewShare m = viewSharedInformation "" [] (getSDSShare m)
@@ -55,15 +57,15 @@ getSDSShare s=:{realShare=(MTaskWithShare id),value} = memoryShare id value
 makeShare :: String Int BCValue -> Task MTaskShare
 makeShare withTask identifier value = treturn 
 		{MTaskShare
-		|withTask=withTask
+		|withTask=[withTask]
 		,identifier=identifier
 		,value=value
 		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
 		} >>= \sh->set value (getSDSShare sh) >>| treturn sh
 
-updateShare :: Int String -> Task ()
+updateShare :: Int BCValue -> Task ()
 updateShare ident val = get sdsStore
 	>>= \sh->(case find (\s->s.identifier==ident) sh of
 		Nothing = abort "Help, no share found with this ident"
-		Just mts = set (fromByteCode val) (getSDSShare mts))
+		Just mts = set val (getSDSShare mts))
 	>>| traceValue "Updated" @! ()