Merge branch 'master' of git.martlubbers.net:clean-tests

[clean-tests.git] / test.icl

diff --git a/test.icl b/test.icl
index 6459207..2076421 100644 (file)
--- a/test.icl
+++ b/test.icl
@@ -1,4 +1,5 @@
 module test
+<<<<<<< HEAD
 
 import StdEnv
 from Data.Func import $
@@ -16,3 +17,29 @@ runS (S s) = s
 Start world = flip runS world
        $   (S time)
        >>= \_->S (readDirectory "/home/mrl")
+=======
+import qualified Data.Map as DM
+import iTasks
+import Data.Func
+import Data.Tuple
+import StdEnv
+
+Start w = doTasksWithOptions (\a o->Ok $ flip tuple {o & autoLayout=True} $
+       (parallel
+               [(Embedded, tab "tab1")
+               ,(Embedded, tab "tab2")
+               ]
+               [ OnAction (Action "New") (always (Embedded, tab "New tab"))
+               , OnAction (Action " ") (always (Embedded, tab "New tab"))
+               , OnAction (Action "Close") (never (Embedded, \_->treturn ()))
+               , OnAction (Action "Dis no icon") (never (Embedded, \_->treturn ()))
+               , OnAction (Action "+") (always (Embedded, tab "New tab"))
+               ]
+       <<@ ArrangeWithTabs True
+       <<@ ApplyLayout (setActionIcon ('DM'.put " " "new" 'DM'.newMap))
+       )) w
+
+tab title _ = tune (Title title)
+       $   viewInformation [] ()
+       >>* [OnAction (Action "Close") (always (treturn ()))]
+>>>>>>> 49f7dcc4c088dc816398a0c7854d75d7c2628f15