Commit 71ca6921 authored by Diederik van Arkel's avatar Diederik van Arkel

More mods from uniqueness experiment

parent 2d67a49a
...@@ -831,23 +831,23 @@ recfun (MSet ss) (ls,ps) = (ss,(ss,ps)) ...@@ -831,23 +831,23 @@ recfun (MSet ss) (ls,ps) = (ss,(ss,ps))
editMenu altgr_workaround mEditId editRecId mFileSaveId mFileRevertId {mn_und, mn_cut, mn_cpy, mn_pst, mn_clr, mg_edt, searchIds} iniClip = Menu "&Edit" editMenu altgr_workaround mEditId editRecId mFileSaveId mFileRevertId {mn_und, mn_cut, mn_cpy, mn_pst, mn_clr, mg_edt, searchIds} iniClip = Menu "&Edit"
( MenuItem "&Undo" ( MenuItem "&Undo"
[ MenuShortKey 'Z' [ MenuShortKey 'Z'
, MenuFunction (\(ls,ps)->(ls,ls.zfun ps)) , MenuFunction (\(ls=:{zfun},ps)->(ls,zfun ps))
, MenuSelectState Unable , MenuSelectState Unable
, MenuId mn_und , MenuId mn_und
] ]
:+: MenuItem "Cu&t" :+: MenuItem "Cu&t"
[ MenuShortKey 'X' [ MenuShortKey 'X'
, MenuFunction (\(ls,ps)->(ls,ls.xfun ps)) , MenuFunction (\(ls=:{xfun},ps)->(ls,xfun ps))
, MenuId mn_cut , MenuId mn_cut
] ]
:+: MenuItem "&Copy" :+: MenuItem "&Copy"
[ MenuShortKey 'C' [ MenuShortKey 'C'
, MenuFunction (\(ls,ps)->(ls,ls.cfun ps)) , MenuFunction (\(ls=:{cfun},ps)->(ls,cfun ps))
, MenuId mn_cpy , MenuId mn_cpy
] ]
:+: MenuItem "&Paste" :+: MenuItem "&Paste"
[ MenuShortKey 'V' [ MenuShortKey 'V'
, MenuFunction (\(ls,ps)->(ls,ls.vfun ps)) , MenuFunction (\(ls=:{vfun},ps)->(ls,vfun ps))
, MenuId mn_pst , MenuId mn_pst
] ]
:+: Receiver2 editRecId recfun [] :+: Receiver2 editRecId recfun []
......
...@@ -363,11 +363,11 @@ where ...@@ -363,11 +363,11 @@ where
ps = closeExtListBoxItems lbobjId indexsel ps ps = closeExtListBoxItems lbobjId indexsel ps
ps = setExtListBoxSelection lbobjId [] ps ps = setExtListBoxSelection lbobjId [] ps
= ((full,tg),ps) = ((full,tg),ps)
showFullPaths ((full,tg),ps) showFullPaths ((full,tg=:{lo}),ps)
# full = not full # full = not full
ps = appPIO (setCheckControlMark full c2id) ps ps = appPIO (setCheckControlMark full c2id) ps
ps = closeAllExtListBoxItems lbobjId ps ps = closeAllExtListBoxItems lbobjId ps
ps = appendExtListBoxItems lbobjId (zip3 (FullPaths full ap pp (StrictListToList tg.lo.extraObjectModules))(repeat id)(repeat id)) ps ps = appendExtListBoxItems lbobjId (zip3 (FullPaths full ap pp (StrictListToList lo.extraObjectModules))(repeat id)(repeat id)) ps
= ((full,tg),ps) = ((full,tg),ps)
slibsPane = Pane "Static Libraries" slibsPane = Pane "Static Libraries"
{addLS = inifull {addLS = inifull
...@@ -416,11 +416,11 @@ where ...@@ -416,11 +416,11 @@ where
ps = closeExtListBoxItems lbslibId indexsel ps ps = closeExtListBoxItems lbslibId indexsel ps
ps = setExtListBoxSelection lbslibId [] ps ps = setExtListBoxSelection lbslibId [] ps
= ((full,tg),ps) = ((full,tg),ps)
showFullPaths ((full,tg),ps) showFullPaths ((full,tg=:{sl}),ps)
# full = not full # full = not full
ps = appPIO (setCheckControlMark full c3id) ps ps = appPIO (setCheckControlMark full c3id) ps
ps = closeAllExtListBoxItems lbslibId ps ps = closeAllExtListBoxItems lbslibId ps
ps = appendExtListBoxItems lbslibId (zip3 (FullPaths full ap pp (StrictListToList (SL_Libs tg.sl)))(repeat id)(repeat id)) ps ps = appendExtListBoxItems lbslibId (zip3 (FullPaths full ap pp (StrictListToList (SL_Libs sl)))(repeat id)(repeat id)) ps
= ((full,tg),ps) = ((full,tg),ps)
dlibsPane = Pane "Dynamic Libraries" dlibsPane = Pane "Dynamic Libraries"
{addLS = inifull {addLS = inifull
...@@ -469,11 +469,11 @@ where ...@@ -469,11 +469,11 @@ where
ps = closeExtListBoxItems lbdlibId indexsel ps ps = closeExtListBoxItems lbdlibId indexsel ps
ps = setExtListBoxSelection lbdlibId [] ps ps = setExtListBoxSelection lbdlibId [] ps
= ((full,tg),ps) = ((full,tg),ps)
showFullPaths ((full,tg),ps) showFullPaths ((full,tg=:{lo}),ps)
# full = not full # full = not full
ps = appPIO (setCheckControlMark full c4id) ps ps = appPIO (setCheckControlMark full c4id) ps
ps = closeAllExtListBoxItems lbdlibId ps ps = closeAllExtListBoxItems lbdlibId ps
ps = appendExtListBoxItems lbdlibId (zip3 (FullPaths full ap pp (StrictListToList tg.lo.libraries))(repeat id)(repeat id)) ps ps = appendExtListBoxItems lbdlibId (zip3 (FullPaths full ap pp (StrictListToList lo.libraries))(repeat id)(repeat id)) ps
= ((full,tg),ps) = ((full,tg),ps)
pathsPane ap pp paths lbpadId c1id root_path pathsPane ap pp paths lbpadId c1id root_path
...@@ -530,11 +530,11 @@ where ...@@ -530,11 +530,11 @@ where
ps = closeExtListBoxItems lbpadId indexsel ps ps = closeExtListBoxItems lbpadId indexsel ps
ps = setExtListBoxSelection lbpadId [] ps ps = setExtListBoxSelection lbpadId [] ps
= ((full,tg),ps) = ((full,tg),ps)
showFullPaths ((full,tg),ps) showFullPaths ((full,tg=:{paths}),ps)
# full = not full # full = not full
ps = appPIO (setCheckControlMark full c1id) ps ps = appPIO (setCheckControlMark full c1id) ps
ps = closeAllExtListBoxItems lbpadId ps ps = closeAllExtListBoxItems lbpadId ps
ps = appendExtListBoxItems lbpadId (zip3 (FullPaths full ap pp (StrictListToList tg.paths))(repeat id)(repeat id)) ps ps = appendExtListBoxItems lbpadId (zip3 (FullPaths full ap pp (StrictListToList paths))(repeat id)(repeat id)) ps
= ((full,tg),ps) = ((full,tg),ps)
setCheckControlMark full id io setCheckControlMark full id io
......
...@@ -154,7 +154,7 @@ beforeParse level line bln bcn text ...@@ -154,7 +154,7 @@ beforeParse level line bln bcn text
afterParse level line eln ecn text afterParse level line eln ecn text
*/ */
/*
sl_balance cl string sel_begin sel_end sl_balance cl string sel_begin sel_end
= inComment = inComment
...@@ -215,3 +215,4 @@ where ...@@ -215,3 +215,4 @@ where
| i >= m = i | i >= m = i
| funnyChar s.[i] = scanFunny (inc i) | funnyChar s.[i] = scanFunny (inc i)
= i = i
*/
\ No newline at end of file
...@@ -473,33 +473,33 @@ where ...@@ -473,33 +473,33 @@ where
= updateCW win (ls,closeWindow dialogId ps) = updateCW win (ls,closeWindow dialogId ps)
cancelFun win wini dialogId (ls,ps) cancelFun win wini dialogId (ls,ps)
= updateCW win (wini,closeWindow dialogId ps) = updateCW win (wini,closeWindow dialogId ps)
setBoxCol cb1id cb2id cb3id cb4id (ls=:{cur},ps) setBoxCol cb1id cb2id cb3id cb4id (ls=:{cur,txt,cmt,mod,bck},ps)
# (cId,col) = case cur of # (cId,col) = case cur of
TXT -> (cb1id,ls.CWC_LS.txt) TXT -> (cb1id,txt)
CMT -> (cb2id,ls.CWC_LS.cmt) CMT -> (cb2id,cmt)
MOD -> (cb3id,ls.CWC_LS.mod) MOD -> (cb3id,mod)
BCK -> (cb4id,ls.CWC_LS.bck) BCK -> (cb4id,bck)
# ps = appPIO (SetColourBox` cId (toRGBColour col)) ps # ps = appPIO (SetColourBox` cId (toRGBColour col)) ps
= (ls,ps) = (ls,ps)
updateCW win (ls,ps) updateCW win (ls=:{txt,cmt,mod,bck,fn,fs},ps)
# (twi,ps) = accPLoc getConsWinInfo ps # (twi,ps) = accPLoc getConsWinInfo ps
# sync = getConSync twi # sync = getConSync twi
# sync = sc_update ls sync # sync = sc_update sync
# (font,ps) = safeOpen {fName = ls.CWC_LS.fn, fSize = ls.CWC_LS.fs, fStyles = []} ps # (font,ps) = safeOpen {fName = fn, fSize = fs, fStyles = []} ps
# twi = setConSync sync twi # twi = setConSync sync twi
# twi = setConFont font twi # twi = setConFont font twi
# ps = appPLoc (setConsWinInfo twi) ps # ps = appPLoc (setConsWinInfo twi) ps
# (_,ps) = maybe_cons_win_message2 (appFontInfo (fi_update ls)) ps # (_,ps) = maybe_cons_win_message2 (appFontInfo fi_update) ps
# (_,ps) = maybe_cons_win_message2 (setFont font) ps # (_,ps) = maybe_cons_win_message2 (setFont font) ps
# ps = appPIO (updateWindow win Nothing) ps # ps = appPIO (updateWindow win Nothing) ps
= (ls,ps) = (ls,ps)
where where
fi_update ls fi = fi_update fi =
{ fi { fi
& syntaxColours = sc_update ls fi.syntaxColours & syntaxColours = sc_update fi.syntaxColours
} }
sc_update {txt,cmt,mod,bck} sc = sc_update sc =
{ sc { sc
& textColour = txt & textColour = txt
, commentColour = cmt , commentColour = cmt
......
...@@ -98,9 +98,10 @@ editColours ps ...@@ -98,9 +98,10 @@ editColours ps
(Just (0,0)) (Just (0,0))
(Just (0,0)) (Just (0,0))
(Just (0,0)) ps (Just (0,0)) ps
# buttonWidth = ContentWidth "Cancel" # buttonWidth = ContentWidth "Cancel"
# (ilook,wloc) = idslook wloc
# wdef = Dialog "Editor Colours" # wdef = Dialog "Editor Colours"
( RGBColourPickControl` rgbid (prefs.syncols.textColour) (idslook wloc) Nothing ( RGBColourPickControl` rgbid (prefs.syncols.textColour) ilook Nothing
:+: ButtonControl "&Copy" :+: ButtonControl "&Copy"
[ ControlFunction (copyFun wId) [ ControlFunction (copyFun wId)
, ControlWidth buttonWidth , ControlWidth buttonWidth
...@@ -176,13 +177,13 @@ editColours ps ...@@ -176,13 +177,13 @@ editColours ps
# (_,ps) = openModalDialog wloc wdef ps # (_,ps) = openModalDialog wloc wdef ps
= ps = ps
where where
copyFun wId (ls,ps) copyFun wId (ls=:{cls,act},ps)
// get active colour control // get active colour control
// and put in clipboard // and put in clipboard
# cur = ls.cls!!ls.act # cur = cls!!act
# ps = setClipboard [toClipboard (toString cur)] ps # ps = setClipboard [toClipboard (toString cur)] ps
= (ls,ps) = (ls,ps)
pasteFun wId rId (ls,ps) pasteFun wId rId (ls=:{cls,act},ps)
// get clipboard // get clipboard
// and put in active colour control // and put in active colour control
# (its,ps) = getClipboard ps # (its,ps) = getClipboard ps
...@@ -195,9 +196,10 @@ where ...@@ -195,9 +196,10 @@ where
# it = fromJust (hd its) # it = fromJust (hd its)
| it <> toStringC (fromString it) | it <> toStringC (fromString it)
= (ls,ps) = (ls,ps)
# ls = {ls & cls = updateAt ls.act (fromString it) ls.cls} # ls = {ls & cls = updateAt act (fromString it) cls}
# (ls,ps) = setBoxCol (ls,ps) # (ls,ps) = setBoxCol (ls,ps)
# ps = setColourBoxColour` rId (clslook ls) ps # (clook,ls)= clslook ls
# ps = setColourBoxColour` rId clook ps
= (ls,ps) = (ls,ps)
ColourBoxControl`` rgbid lsid cls ids x p ColourBoxControl`` rgbid lsid cls ids x p
= ColourBoxControl` (toRGBColour (cls!!x)) (ids!!x) (mstuff rgbid lsid x) p = ColourBoxControl` (toRGBColour (cls!!x)) (ids!!x) (mstuff rgbid lsid x) p
...@@ -209,18 +211,24 @@ where ...@@ -209,18 +211,24 @@ where
= updateActiveInLS rgbid lsid cont (ls,ps) = updateActiveInLS rgbid lsid cont (ls,ps)
where where
cont (ls,ps) cont (ls,ps)
# ps = appPIO (SetColourBox (idslook ls) (toRGBColour(clslook ls))) ps # (ilook,ls) = idslook ls
# (clook,ls) = clslook ls
# ps = appPIO (SetColourBox ilook (toRGBColour clook)) ps
# ls = {ls & act = x} # ls = {ls & act = x}
# ps = appPIO (SetColourBox` (idslook ls) (toRGBColour(clslook ls))) ps # (ilook,ls) = idslook ls
# ps = setColourBoxId rgbid (idslook ls) ps # (clook,ls) = clslook ls
# ps = setColourBoxColour` rgbid (clslook ls) ps # ps = appPIO (SetColourBox` ilook (toRGBColour clook)) ps
# ps = setColourBoxId rgbid ilook ps
# ps = setColourBoxColour` rgbid clook ps
= (ls,ps) = (ls,ps)
setBoxCol (ls,ps) setBoxCol (ls,ps)
# ps = appPIO (SetColourBox` (idslook ls) (toRGBColour(clslook ls))) ps # (ilook,ls) = idslook ls
# (clook,ls) = clslook ls
# ps = appPIO (SetColourBox` ilook (toRGBColour clook)) ps
= (ls,ps) = (ls,ps)
idslook {ids,act} = ids!!act idslook ls=:{ids,act} = (ids!!act, ls)
clslook {cls,act} = cls!!act clslook ls=:{cls,act} = (cls!!act, ls)
toStringC :: !Colour -> String toStringC :: !Colour -> String
toStringC c = toString c toStringC c = toString c
lsfun f (ls,ps) = f (ls,ps) lsfun f (ls,ps) = f (ls,ps)
...@@ -234,8 +242,8 @@ where ...@@ -234,8 +242,8 @@ where
# col = fromJust col # col = fromJust col
# (_,ps) = asyncSend lsid (cont2 col) ps # (_,ps) = asyncSend lsid (cont2 col) ps
= ps = ps
cont2 col (ls,ps) cont2 col (ls=:{act,cls},ps)
# ls = {ls & cls = updateAt ls.act col ls.cls} # ls = {ls & cls = updateAt act col cls}
= cont3 (ls,ps) = cont3 (ls,ps)
okFun rgbid lsid wId (ls,ps) okFun rgbid lsid wId (ls,ps)
...@@ -252,37 +260,37 @@ where ...@@ -252,37 +260,37 @@ where
applyFun rgbid lsid (ls,ps) applyFun rgbid lsid (ls,ps)
= updateActiveInLS rgbid lsid apply (ls,ps) = updateActiveInLS rgbid lsid apply (ls,ps)
apply (ls,ps) apply (ls=:{cls},ps)
# (prefs,ps) = getPrefs ps # (prefs,ps) = getPrefs ps
# syncols` = # syncols` =
{ prefs.syncols { prefs.syncols
& textColour = ls.cls!!0 & textColour = cls!!0
, tabColour = ls.cls!!3 , tabColour = cls!!3
, commentColour = ls.cls!!6 , commentColour = cls!!6
, stringColour = ls.cls!!9 , stringColour = cls!!9
, charColour = ls.cls!!12 , charColour = cls!!12
, backgroundColour = ls.cls!!15 , backgroundColour = cls!!15
, keywordColour = ls.cls!!18 , keywordColour = cls!!18
} }
# defcols` = # defcols` =
{ prefs.defcols { prefs.defcols
& textColour = ls.cls!!1 & textColour = cls!!1
, tabColour = ls.cls!!4 , tabColour = cls!!4
, commentColour = ls.cls!!7 , commentColour = cls!!7
, stringColour = ls.cls!!10 , stringColour = cls!!10
, charColour = ls.cls!!13 , charColour = cls!!13
, backgroundColour = ls.cls!!16 , backgroundColour = cls!!16
, keywordColour = ls.cls!!19 , keywordColour = cls!!19
} }
# impcols` = # impcols` =
{ prefs.impcols { prefs.impcols
& textColour = ls.cls!!2 & textColour = cls!!2
, tabColour = ls.cls!!5 , tabColour = cls!!5
, commentColour = ls.cls!!8 , commentColour = cls!!8
, stringColour = ls.cls!!11 , stringColour = cls!!11
, charColour = ls.cls!!14 , charColour = cls!!14
, backgroundColour = ls.cls!!17 , backgroundColour = cls!!17
, keywordColour = ls.cls!!20 , keywordColour = cls!!20
} }
# prefs = {prefs & syncols = syncols`, defcols = defcols`, impcols = impcols`} # prefs = {prefs & syncols = syncols`, defcols = defcols`, impcols = impcols`}
# ps = setPrefs prefs ps # ps = setPrefs prefs ps
......
...@@ -439,10 +439,10 @@ where ...@@ -439,10 +439,10 @@ where
# (ls,ps) = setBoxCol fcid bcid (ls,ps) # (ls,ps) = setBoxCol fcid bcid (ls,ps)
# ps = setColourBoxColour` rgbId col ps # ps = setColourBoxColour` rgbId col ps
= (ls,ps) = (ls,ps)
setBoxCol fcid bcid (ls=:{cur},ps) setBoxCol fcid bcid (ls=:{cur,fc,bc},ps)
# (cId,col) = case cur of # (cId,col) = case cur of
TXT -> (fcid,ls.fc) TXT -> (fcid,fc)
BCK -> (bcid,ls.bc) BCK -> (bcid,bc)
# ps = appPIO (SetColourBox` cId (toRGBColour col)) ps # ps = appPIO (SetColourBox` cId (toRGBColour col)) ps
= (ls,ps) = (ls,ps)
mfilter (MouseDown _ _ _) = True mfilter (MouseDown _ _ _) = True
...@@ -490,10 +490,10 @@ where ...@@ -490,10 +490,10 @@ where
TXT -> {ls & fc = col, cur = act} TXT -> {ls & fc = col, cur = act}
BCK -> {ls & bc = col, cur = act} BCK -> {ls & bc = col, cur = act}
= (ls,ps) = (ls,ps)
apply (ls=:{fc,bc},ps) apply (ls=:{fc,bc,fn,fs},ps)
# (errinf,ps) = getErrInfo ps # (errinf,ps) = getErrInfo ps
# lbId = errinf.infoId # lbId = errinf.infoId
# (fnt,ps) = accScreenPicture (safeOpenFixedFont {fName = ls.EWO.fn, fSize = ls.EWO.fs, fStyles = []}) ps # (fnt,ps) = accScreenPicture (safeOpenFixedFont {fName = fn, fSize = fs, fStyles = []}) ps
# pen = [PenFont fnt, PenColour fc, PenBack bc] # pen = [PenFont fnt, PenColour fc, PenBack bc]
# ps = setFilteredListBoxPen lbId pen ps # ps = setFilteredListBoxPen lbId pen ps
# errinf = {errinf & err_font = fnt, err_forg = fc, err_back = bc} # errinf = {errinf & err_font = fnt, err_forg = fc, err_back = bc}
......
...@@ -211,11 +211,11 @@ where ...@@ -211,11 +211,11 @@ where
FC -> {ls & fc = col, cr = ac} FC -> {ls & fc = col, cr = ac}
BC -> {ls & bc = col, cr = ac} BC -> {ls & bc = col, cr = ac}
= (ls,ps) = (ls,ps)
setBoxCol hcId fcId bcId (ls=:{cr},ps) setBoxCol hcId fcId bcId (ls=:{cr,hc,fc,bc},ps)
# (cId,col) = case cr of # (cId,col) = case cr of
HC -> (hcId,ls.hc) HC -> (hcId,hc)
FC -> (fcId,ls.fc) FC -> (fcId,fc)
BC -> (bcId,ls.bc) BC -> (bcId,bc)
# ps = appPIO (SetColourBox` cId (toRGBColour col)) ps # ps = appPIO (SetColourBox` cId (toRGBColour col)) ps
= (ls,ps) = (ls,ps)
applyFun rgbid lsid (ls,ps) applyFun rgbid lsid (ls,ps)
...@@ -244,24 +244,24 @@ where ...@@ -244,24 +244,24 @@ where
BC -> {ls & bc = col} BC -> {ls & bc = col}
# (ls,ps) = apply (ls,ps) # (ls,ps) = apply (ls,ps)
= finish (ls,ps) = finish (ls,ps)
apply (ls,ps) apply (ls=:{fn,fs,fc,bc,hc,shift},ps)
# (lbId,ps) = getPWI ps # (lbId,ps) = getPWI ps
# ((fnt_ok,fnt),ps) = accScreenPicture (openFont {fName = ls.PWO.fn, fSize = ls.PWO.fs, fStyles = []}) ps # ((fnt_ok,fnt),ps) = accScreenPicture (openFont {fName = fn, fSize = fs, fStyles = []}) ps
# pen2 = if fnt_ok [PenFont fnt] [] # pen2 = if fnt_ok [PenFont fnt] []
# pen = [PenColour (ls.fc), PenBack (ls.bc):pen2] # pen = [PenColour fc, PenBack bc:pen2]
# ps = closeAllExtListBoxItems lbId ps # ps = closeAllExtListBoxItems lbId ps
# ps = setExtListBoxPen lbId pen ps # ps = setExtListBoxPen lbId pen ps
# (wId,ps) = getPWW ps # (wId,ps) = getPWW ps
# ps = appPIO (setWindowLook wId True (True,(\_ {newFrame} -> fill newFrame o setPenColour (ls.hc)))) ps # ps = appPIO (setWindowLook wId True (True,(\_ {newFrame} -> fill newFrame o setPenColour hc))) ps
# (prefs,ps) = getPrefs ps # (prefs,ps) = getPrefs ps
# prefs = { prefs # prefs = { prefs
& prj_prefs.proj_forc = ls.fc & prj_prefs.proj_forc = fc
, prj_prefs.proj_bacc = ls.bc , prj_prefs.proj_bacc = bc
, prj_prefs.proj_topc = ls.hc , prj_prefs.proj_topc = hc
, prj_prefs.proj_font = {prefs.prj_prefs.proj_font & fName = ls.PWO.fn, fSize = ls.PWO.fs} , prj_prefs.proj_font = {prefs.prj_prefs.proj_font & fName = fn, fSize = fs}
, prj_prefs.proj_shft = ls.shift , prj_prefs.proj_shft = shift
} }
# ps = setPrefs prefs ps # ps = setPrefs prefs ps
| not fnt_ok | not fnt_ok
...@@ -392,7 +392,7 @@ where ...@@ -392,7 +392,7 @@ where
, ControlPen pen , ControlPen pen
, ControlHMargin 10 10 , ControlHMargin 10 10
, ControlVMargin 3 3 , ControlVMargin 3 3
, ControlMouse mouseFilter Able mouseFunction // , ControlMouse mouseFilter Able mouseFunction
] ]
top_controls lbId localId local2Id local3Id xxId mmId pw_main pw_exec butw fnt = top_controls lbId localId local2Id local3Id xxId mmId pw_main pw_exec butw fnt =
...@@ -653,7 +653,7 @@ pm_copt ps ...@@ -653,7 +653,7 @@ pm_copt ps
= okNotice ["This module is not part of the current project."] ps = okNotice ["This module is not part of the current project."] ps
# minf = fromJust minf # minf = fromJust minf
# projco = minf.compilerOptions # projco = minf.compilerOptions
# setco = \ao -> appProject (\l->PR_UpdateModule mod (\mi->{mi & compilerOptions = ao}) l) # setco = \co -> appProject (\l->PR_UpdateModule mod (\mi->{mi & compilerOptions = co}) l)
= doCompilerOptionsDialog "Module Options" projco setco ps = doCompilerOptionsDialog "Module Options" projco setco ps
// should check if project window is active... // should check if project window is active...
// otherwise this behaviour is unintuitive // otherwise this behaviour is unintuitive
...@@ -671,7 +671,7 @@ pm_copt ps ...@@ -671,7 +671,7 @@ pm_copt ps
= ps = ps
# minf = fromJust minf # minf = fromJust minf
# projco = minf.compilerOptions # projco = minf.compilerOptions
# setco = \ao -> appProject (\l->PR_UpdateModules sel (\mi->{mi & compilerOptions = ao}) l) # setco = \co -> appProject (\l->PR_UpdateModules sel (\mi->{mi & compilerOptions = co}) l)
= doCompilerOptionsDialog "Module Options" projco setco ps = doCompilerOptionsDialog "Module Options" projco setco ps
// work op nothing... ?! // work op nothing... ?!
= ps = ps
......
...@@ -75,7 +75,7 @@ sr_find_idi always_dialog pstate // Find Definition & Implementation & Identifi ...@@ -75,7 +75,7 @@ sr_find_idi always_dialog pstate // Find Definition & Implementation & Identifi
# (selection,_) = fromJust maybesel # (selection,_) = fromJust maybesel
# fbi = {fbi & cleanid = removeDup [selection:fbi.cleanid], pathname = pathname} # fbi = {fbi & cleanid = removeDup [selection:fbi.cleanid], pathname = pathname}
# pstate = setFBI fbi pstate # pstate = setFBI fbi pstate
= fi_messagebox fbi (sr_find_worker fbi) pstate = fi_messagebox fbi pstate
sr_find_def :: !Bool !*(PSt General) -> *PSt General sr_find_def :: !Bool !*(PSt General) -> *PSt General
sr_find_def always_dialog pstate sr_find_def always_dialog pstate
...@@ -112,11 +112,11 @@ sr_find_def_imp_sel always_dialog selection pathname info=:{cleanid} pstate ...@@ -112,11 +112,11 @@ sr_find_def_imp_sel always_dialog selection pathname info=:{cleanid} pstate
# pstate = setFBI info pstate # pstate = setFBI info pstate
| size selection == 0 || not (CleanModId selection) || always_dialog | size selection == 0 || not (CleanModId selection) || always_dialog
= fi_dialog info pstate = fi_dialog info pstate
= fi_messagebox info (sr_find_worker info) pstate = fi_messagebox info pstate
//-- //--
fi_messagebox info=:{cleanid,dlogId} work pstate fi_messagebox info=:{cleanid,dlogId,stringId,msgId,kind,closeId} pstate
| isEmpty cleanid | isEmpty cleanid
= pstate = pstate
# pstate = closeWindow dlogId pstate # pstate = closeWindow dlogId pstate
...@@ -125,41 +125,41 @@ fi_messagebox info=:{cleanid,dlogId} work pstate ...@@ -125,41 +125,41 @@ fi_messagebox info=:{cleanid,dlogId} work pstate
= pstate = pstate
where where
dialog = Dialog dialog = Dialog
( case info.kind of ( case kind of
Definition -> "Find Definition" Definition -> "Find Definition"
Implementation -> "Find Implementation" Implementation -> "Find Implementation"
Identifier -> "Find Identifier" Identifier -> "Find Identifier"
) )
( TextControl "" ( TextControl ""
[ ControlId info.msgId [ ControlId msgId
, ControlWidth (PixelWidth 300) , ControlWidth (PixelWidth 300)
] // area to show messages ] // area to show messages
:+: TextControl "Find:" :+: TextControl "Find:"
[ ControlPos (Left,zero) [ ControlPos (Left,zero)
] ]
:+: EditControl (hd info.cleanid) (PixelWidth 300) 1 :+: EditControl (hd cleanid) (PixelWidth 300) 1
[ ControlPos (Left,zero) [ ControlPos (Left,zero)
, ControlId info.stringId , ControlId stringId
]