X-Git-Url: https://git.martlubbers.net/?a=blobdiff_plain;f=Shares%2FmTaskShare.icl;h=7f9a2f499dbdc3576039cf4a891f8296d701673a;hb=18c1286739897b65578e87b17167c6cef1922a3b;hp=1e9294c4c92ada35639c760caabd421ff149c1e8;hpb=1d6cedaf81bbbe0ae869f20c9003bf018fb027ff;p=mTask.git

diff --git a/Shares/mTaskShare.icl b/Shares/mTaskShare.icl
index 1e9294c..7f9a2f4 100644
--- a/Shares/mTaskShare.icl
+++ b/Shares/mTaskShare.icl
@@ -1,36 +1,58 @@
 implementation module Shares.mTaskShare
 
+import dynamic_string
 import Utils.SDS
 import Utils.Devices
 import iTasks
 import mTask
 from Data.Func import $
 
+derive class iTask MTaskShareType
+
+derive gEditor MTaskShare
+derive gText MTaskShare
+derive JSONEncode MTaskShare
+derive JSONDecode MTaskShare
+derive gDefault MTaskShare
+gEq{|MTaskShare|} m1 m2 = m1.identifier == m2.identifier
+
 manageShares :: [MTaskShare] -> Task ()
-manageShares shares = forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
+manageShares shares =
+	forever (enterChoice "Choose share to update" [ChooseFromGrid id] shares
 	>&^ \st->whileUnchanged st $ \msh->case msh of
-		Nothing = viewShares shares @! zero
+		Nothing = viewShares shares
 		Just sh = forever (
-				viewSharedInformation "View value" [] (getSDSStore sh)
-			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
-			>>= updateShare sh
+				viewSharedInformation "View value" [] (getSDSShare sh) >>| treturn sh
+//			>>* [OnAction (Action "Update") (withValue (Just o updateInformation "New value" []))]
+//			>>= updateShare sh
 			)
 			
 	) @! ()
 
-updateShare :: MTaskShare a -> Task MTaskShare | toByteCode a
-updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
-	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
-	>>| treturn sh
-
-
-viewShares :: [MTaskShare] -> Task ()
-viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal @! ()
-
-viewShare :: MTaskShare -> Task ()
-viewShare m = viewSharedInformation "" [] (getSDSStore m)
-	<<@ Title ("SDS: " +++ toString m.identifier) @! ()
-
-instance zero MTaskShare where
-	zero = {initValue=0,withTask="",identifier=0,realShare=""}
-
+//updateShare :: MTaskShare a -> Task MTaskShare | toByteCode, iTask a
+//updateShare sh=:{withTask,identifier} a = getDeviceByName withTask
+//	>>= sendMessages [MTUpd identifier $ toString $ toByteCode a]
+//	>>| treturn sh
+
+
+viewShares :: [MTaskShare] -> Task MTaskShare
+viewShares sh = anyTask (map viewShare sh) <<@ ArrangeHorizontal
+	>>| return (hd sh)
+
+viewShare :: MTaskShare -> Task String
+viewShare m = viewSharedInformation "" [] (getSDSShare m)
+	<<@ Title ("SDS: " +++ toString m.identifier)
+
+getSDSShare :: MTaskShare -> Shared String
+getSDSShare s=:{realShare=(MTaskWithShare id)}
+	= memoryShare id s.MTaskShare.value
+
+makeShare :: String Int String -> Task MTaskShare
+makeShare withTask identifier value = treturn 
+		{MTaskShare
+		|withTask=withTask
+		,identifier=identifier
+		,value=value
+		,dynvalue=dynamic value
+		,realShare=MTaskWithShare $ "mTaskSDS-" +++ toString identifier
+		} >>= \sh->set value (getSDSShare sh) >>| treturn sh