Commit e736ddd7 authored by Diederik van Arkel's avatar Diederik van Arkel

Remaining 2.0 fixes for CleanIde

parent 4205e6ce
...@@ -105,7 +105,7 @@ where ...@@ -105,7 +105,7 @@ where
enterKeyAction autoTab enterKeyAction autoTab
:== case autoTab of :== case autoTab of
True -> autoinAction True -> autoinAction
False -> performAction (Insert (SCons "" (SCons "" SNil))) // ["",""] _ -> performAction (Insert (SCons "" (SCons "" SNil))) // ["",""]
where where
autoinAction = autoinAction =
getText >>>= \text -> getText >>>= \text ->
......
...@@ -5,7 +5,7 @@ definition module projmen ...@@ -5,7 +5,7 @@ definition module projmen
import StdReceiver import StdReceiver
import PmProject, IdeState import PmProject, IdeState
ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: .RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General) ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
pm_menu_add :: .Pathname !*(PSt *General) -> *PSt *General; pm_menu_add :: .Pathname !*(PSt *General) -> *PSt *General;
......
...@@ -132,7 +132,7 @@ where ...@@ -132,7 +132,7 @@ where
, WindowInitActive okId , WindowInitActive okId
] ]
ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: .RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General) ProjListMenu :: Id Id (R2Id PLMMessage PLMReply) -> NewLS (:+: RadioMenu (Receiver2 PLMMessage PLMReply)) .a *(PSt *General)
ProjListMenu mProjectId mPrListId mPrRecId = ProjListMenu mProjectId mPrListId mPrRecId =
{newDef = {newDef =
( RadioMenu [] 0 [MenuId mPrListId] ( RadioMenu [] 0 [MenuId mPrListId]
......
...@@ -518,7 +518,7 @@ IsOpen modname ps ...@@ -518,7 +518,7 @@ IsOpen modname ps
# (windows,ps) = accPIO getWindowsStack ps # (windows,ps) = accPIO getWindowsStack ps
= doall windows ps = doall windows ps
where where
doall :: ![.Id] !*(PSt *General) -> *(!.Maybe Id,!*PSt *General) doall :: ![Id] !*(PSt *General) -> *(!.Maybe Id,!*PSt *General)
doall [] ps = (Nothing,ps) doall [] ps = (Nothing,ps)
doall [win:res] ps doall [win:res] ps
# (mr,ps) = message win msgGetPathName ps # (mr,ps) = message win msgGetPathName ps
......
...@@ -7,7 +7,7 @@ from PmPrefs import TypPrefs ...@@ -7,7 +7,7 @@ from PmPrefs import TypPrefs
//--- Types window //--- Types window
iniTypeWinInfo :: !Id !Id ![Id] !TypPrefs !*a -> *(.TypeWinInfo,*a) | accScreenPicture, Ids a iniTypeWinInfo :: !Id !Id ![Id] !TypPrefs !*a -> *(.TypeWinInfo,*a) | Ids, accScreenPicture a
// initialise type window info // initialise type window info
updateTypeWindow :: !Bool !String [WindowAttribute *(EditState,*(PSt *b))] ![String] !*(PSt *b) -> *PSt *b | Typer b updateTypeWindow :: !Bool !String [WindowAttribute *(EditState,*(PSt *b))] ![String] !*(PSt *b) -> *PSt *b | Typer b
......
...@@ -17,7 +17,7 @@ import ...@@ -17,7 +17,7 @@ import
// Modulenames should be stored WITHOUT extension; Pathnames should be stored fully and not end with a (back)slash // Modulenames should be stored WITHOUT extension; Pathnames should be stored fully and not end with a (back)slash
:: ProjectStructure = :: ProjectStructure =
{ project_name :: !String { project_name :: !String
, project_paths :: ![!String] , project_paths :: ![String]
, main_module_name :: !String , main_module_name :: !String
, main_module_path :: !String , main_module_path :: !String
, icl_modules :: ![(!String, !String)] // (name, path) , icl_modules :: ![(!String, !String)] // (name, path)
......
...@@ -17,7 +17,7 @@ import ...@@ -17,7 +17,7 @@ import
:: ProjectStructure = :: ProjectStructure =
// ------------------------------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------------------------------
{ project_name :: !String { project_name :: !String
, project_paths :: ![!String] , project_paths :: ![String]
, main_module_name :: !String , main_module_name :: !String
, main_module_path :: !String , main_module_path :: !String
, icl_modules :: ![(!String, !String)] , icl_modules :: ![(!String, !String)]
...@@ -91,7 +91,7 @@ WriteDclModules [(name, path): rest] file ...@@ -91,7 +91,7 @@ WriteDclModules [(name, path): rest] file
= WriteDclModules rest file = WriteDclModules rest file
// ------------------------------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------------------------------
WriteProjectPaths :: ![!String] !*File -> !*File WriteProjectPaths :: ![String] !*File -> !*File
// ------------------------------------------------------------------------------------------------------------------------------------------------- // -------------------------------------------------------------------------------------------------------------------------------------------------
WriteProjectPaths [] file WriteProjectPaths [] file
= file = file
......
...@@ -58,9 +58,10 @@ where ...@@ -58,9 +58,10 @@ where
:+: TextControl "Size:" [ left ] :+: TextControl "Size:" [ left ]
:+: FontSizeControl fontSizes sizeFun (findNameInList fontsize fontSizes) [ControlId sizesId] :+: FontSizeControl fontSizes sizeFun (findNameInList fontsize fontSizes) [ControlId sizesId]
) (atts++[ControlHMargin 0 0,ControlVMargin 0 0]) ) (atts++[ControlHMargin 0 0,ControlVMargin 0 0])
# selectfun = \fontname fontsize ps -> let # selectfun = \fontname fontsize ps ->
namesIdx = findNameInList fontname fontNames let
sizesIdx = findNameInList fontsize fontSizes namesIdx = findNameInList fontname fontNames
sizesIdx = findNameInList fontsize fontSizes
in appPIO (selectPopUpControlItem sizesId sizesIdx o selectPopUpControlItem namesId namesIdx) ps in appPIO (selectPopUpControlItem sizesId sizesIdx o selectPopUpControlItem namesId namesIdx) ps
= controlToHandles control ps = controlToHandles control ps
where where
......
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