Commit f4418e34 authored by Diederik van Arkel's avatar Diederik van Arkel
Browse files

more cleanup types

make typewin fixed width
parent be6a9880
...@@ -272,8 +272,8 @@ typewinPane ps ...@@ -272,8 +272,8 @@ typewinPane ps
# (twi,ps) = accPLoc getTypeWinInfo ps # (twi,ps) = accPLoc getTypeWinInfo ps
# (fontNames, ps) # (fontNames, ps)
= accPIO (accScreenPicture getFontNames) ps = accPIO (accScreenPicture getFontNames) ps
// # fixed = map lisFixedWidth fontNames // allow all fonts for types window # fixed = map lisFixedWidth fontNames // allow all fonts for types window
// # fontNames = lfilter fixed fontNames # fontNames = lfilter fixed fontNames
# fontSizes = [7, 8, 9, 10, 12, 14, 18, 24 ] # fontSizes = [7, 8, 9, 10, 12, 14, 18, 24 ]
# {typewinfont={fName=inifn,fSize=inifs},typewinsync=sync} # {typewinfont={fName=inifn,fSize=inifs},typewinsync=sync}
= TW_GetInf twi = TW_GetInf twi
......
definition module ioutil definition module ioutil
import StdOverloaded, StdBool, StdList import StdOverloaded, StdBool, StdList
import StdPicture, StdPSt, StdId, StdIOCommon, StdFile, StdFileSelect import StdPicture, StdPSt, StdId, StdIOCommon, StdFile//, StdFileSelect
from commondef import unzip3,unzip4 from commondef import unzip3,unzip4
...@@ -20,7 +20,7 @@ noPS :: .(.a -> .b) !(.a,.c) -> (.b,.c) ...@@ -20,7 +20,7 @@ noPS :: .(.a -> .b) !(.a,.c) -> (.b,.c)
drawLeft :: !.Point2 a !*Picture -> *Picture | toString a drawLeft :: !.Point2 a !*Picture -> *Picture | toString a
drawCenter :: !.Point2 a !*Picture -> *Picture | toString a drawCenter :: !.Point2 a !*Picture -> *Picture | toString a
drawRight :: !.Point2 a !*Picture -> *Picture | toString a drawRight :: !.Point2 a !*Picture -> *Picture | toString a
setCheckControlItem :: !Id .Index !.Bool !*(IOSt *l) -> *(IOSt *l) setCheckControlItem :: !Id .Index !.Bool !*(IOSt .l) -> *(IOSt .l)
zip3 :: ![.a] [.b] [.c] -> [(.a,.b,.c)] zip3 :: ![.a] [.b] [.c] -> [(.a,.b,.c)]
getPenAttributeFont :: ![.PenAttribute] -> FontDef; getPenAttributeFont :: ![.PenAttribute] -> FontDef;
getPenAttributeColour :: ![.PenAttribute] -> Colour; getPenAttributeColour :: ![.PenAttribute] -> Colour;
......
implementation module ioutil implementation module ioutil
import StdBool,StdList,StdFile import StdBool,StdList,StdFile
import StdControl,StdPSt,StdFileSelect import StdControl,StdPSt//,StdFileSelect
import iostate import iostate
altScrollFunction :: !Direction !Int -> ScrollFunction altScrollFunction :: !Direction !Int -> ScrollFunction
...@@ -104,7 +104,7 @@ drawRight {x,y} info picture ...@@ -104,7 +104,7 @@ drawRight {x,y} info picture
(width,picture) = getPenFontStringWidth text picture (width,picture) = getPenFontStringWidth text picture
= drawAt {x=x-width,y=y} text picture = drawAt {x=x-width,y=y} text picture
setCheckControlItem :: !Id .Index !.Bool !*(IOSt *l) -> *(IOSt *l) setCheckControlItem :: !Id .Index !.Bool !*(IOSt .l) -> *(IOSt .l)
setCheckControlItem id idx True io = markCheckControlItems id [idx] io setCheckControlItem id idx True io = markCheckControlItems id [idx] io
setCheckControlItem id idx False io = unmarkCheckControlItems id [idx] io setCheckControlItem id idx False io = unmarkCheckControlItems id [idx] io
......
...@@ -4,9 +4,9 @@ import StdPSt, StdString ...@@ -4,9 +4,9 @@ import StdPSt, StdString
PlatformDependant win mac :== win PlatformDependant win mac :== win
initPlatformCommandLine :: !*(PSt *l) -> (![String],!*PSt *l) initPlatformCommandLine :: !*(PSt .l) -> (![String],!*PSt .l)
installPlatformEventHandlers :: !*(PSt *l) -> *(PSt *l) installPlatformEventHandlers :: !*(PSt .l) -> *(PSt .l)
openPlatformWindowMenu :: !*(PSt *l) -> *(PSt *l) openPlatformWindowMenu :: !*(PSt .l) -> *(PSt .l)
TooltempDir :: String TooltempDir :: String
EnvsDir :: String EnvsDir :: String
......
...@@ -42,7 +42,7 @@ where ...@@ -42,7 +42,7 @@ where
ccall GetPrivateProfileStringA@24 "PsssIIs:I:I" ccall GetPrivateProfileStringA@24 "PsssIIs:I:I"
} }
initPlatformCommandLine :: !*(PSt *l) -> (![String],!*PSt *l) initPlatformCommandLine :: !*(PSt .l) -> (![String],!*PSt .l)
initPlatformCommandLine ps initPlatformCommandLine ps
# args = cl_args # args = cl_args
# args = [arg \\ arg <-: args] # args = [arg \\ arg <-: args]
...@@ -53,11 +53,11 @@ initPlatformCommandLine ps ...@@ -53,11 +53,11 @@ initPlatformCommandLine ps
# files = map GetLongPathName files # files = map GetLongPathName files
= (files, ps) = (files, ps)
installPlatformEventHandlers :: !*(PSt *l) -> *(PSt *l) installPlatformEventHandlers :: !*(PSt .l) -> *(PSt .l)
installPlatformEventHandlers ps installPlatformEventHandlers ps
= ps = ps
openPlatformWindowMenu :: !*(PSt *l) -> *(PSt *l) openPlatformWindowMenu :: !*(PSt .l) -> *(PSt .l)
openPlatformWindowMenu ps openPlatformWindowMenu ps
= ps = ps
......
Markdown is supported
0% or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment