Skip to content

Commit

Permalink
add requester designer
Browse files Browse the repository at this point in the history 
change hint text to use string list
  • Loading branch information
@dmcoles
dmcoles committed Jul 12, 2024
1 parent 67da2d6 commit 0c3f6db
Show file tree
Hide file tree
Showing 9 changed files with 722 additions and 68 deletions.
2 changes: 1 addition & 1 deletion cSourceGen.e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -968,7 +968,7 @@ PROC genWindowHeader(count, windowObject:PTR TO windowObject, menuObject:PTR TO
ENDIF
LowerStr(itemName)

hintText:=self.strReplace(reactionObject.hintText,'\n','\\n')
hintText:=reactionObject.hintText.makeTextString('\\n')
StringF(tempStr,' {\s,-1,\q\s\q,0},',itemName,hintText)
Dispose(hintText)
self.writeLine(tempStr)
Expand Down
5 changes: 2 additions & 3 deletions eSourceGen.e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -906,16 +906,15 @@ PROC genWindowHeader(count, windowObject:PTR TO windowObject, menuObject:PTR TO
j:=0
FOR i:=0 TO listObjects.count()-1
reactionObject:=listObjects.item(i)
IF reactionObject.hintText
IF reactionObject.hintText.count()
IF self.useIds
StringF(itemName,'\s_id',reactionObject.ident)
ELSE
StringF(itemName,'\s',reactionObject.ident)
ENDIF
UpperStr(itemName)

hintText:=self.strReplace(reactionObject.hintText,'\n','\\n')

hintText:=reactionObject.hintText.makeTextString('\\n')
IF j=0
StringF(tempStr,' hintInfo:=[\s,-1,\a\s\a,0,',itemName,hintText)
ELSE
Expand Down
9 changes: 6 additions & 3 deletions makefile
View file
Original file line number Diff line number Diff line change
Expand Up @@ -15,7 +15,7 @@ all: rebuild
release: options=$(releaseoptions)
release: rebuild

rebuild: rebuild.e validator.m dialogs.m libraryVersions.m reactionLists.m tabsObject.m sketchboardObject.m virtualObject.m listViewObject.m ledObject.m textEditorObject.m tapeDeckObject.m gradSliderObject.m getColorObject.m dateBrowserObject.m colorWheelObject.m speedBarObject.m sliderObject.m bitmapObject.m penMapObject.m boingBallObject.m getScreenModeObject.m getFontObject.m getFileObject.m textFieldObject.m drawListObject.m fuelGaugeObject.m bevelObject.m listBrowserObject.m clickTabObject.m chooserObject.m radioObject.m menuObject.m rexxObject.m reactionListObject.m listManagerForm.m codeGenForm.m eSourceGen.m cSourceGen.m sourcegen.m fileStreamer.m reactionForm.m objectPicker.m windowObject.m screenObject.m paletteObject.m scrollerObject.m glyphObject.m spaceObject.m integerObject.m labelObject.m checkboxObject.m stringObject.m buttonObject.m layoutObject.m reactionObject.m stringlist.m
rebuild: rebuild.e validator.m dialogs.m libraryVersions.m reactionLists.m tabsObject.m sketchboardObject.m virtualObject.m listViewObject.m ledObject.m textEditorObject.m tapeDeckObject.m gradSliderObject.m getColorObject.m dateBrowserObject.m colorWheelObject.m speedBarObject.m sliderObject.m bitmapObject.m penMapObject.m boingBallObject.m getScreenModeObject.m getFontObject.m getFileObject.m textFieldObject.m drawListObject.m fuelGaugeObject.m bevelObject.m listBrowserObject.m clickTabObject.m chooserObject.m radioObject.m menuObject.m rexxObject.m reactionListObject.m listManagerForm.m codeGenForm.m eSourceGen.m cSourceGen.m sourcegen.m fileStreamer.m reactionForm.m objectPicker.m windowObject.m screenObject.m paletteObject.m scrollerObject.m glyphObject.m spaceObject.m integerObject.m labelObject.m checkboxObject.m stringObject.m buttonObject.m layoutObject.m reactionObject.m stringlist.m requesterObject.m
$(compiler) rebuild $(options)

reactionLists.m: reactionLists.e stringlist.m
Expand Down Expand Up @@ -105,6 +105,9 @@ labelObject.m: labelObject.e reactionObject.m reactionForm.m colourPicker.m so
rexxObject.m: rexxObject.e reactionObject.m reactionForm.m stringlist.m
$(compiler) rexxObject $(options)

requesterObject.m: requesterObject.e reactionObject.m reactionForm.m stringlist.m fileStreamer.m
$(compiler) requesterObject $(options)

menuObject.m: menuObject.e reactionObject.m reactionForm.m stringlist.m fileStreamer.m dialogs.m
$(compiler) menuObject $(options)

Expand Down Expand Up @@ -186,11 +189,11 @@ listPicker.m: listPicker.e stringlist.m reactionListObject.m reactionLists.m
reactionObject.m: reactionObject.e stringlist.m reactionForm.m fileStreamer.m sourceGen.m
$(compiler) reactionObject $(options)

reactionForm.m: reactionForm.e
reactionForm.m: reactionForm.e stringlist.m
$(compiler) reactionForm $(options)

validator.m: validator.e reactionObject.m reactionForm.m stringlist.m dialogs.m
$(compiler) validator $(options)

clean:
delete validator.m bitmapObject.m dialogs.m libraryVersions.m tabsObject.m sketchboardObject.m virtualObject.m listViewObject.m ledObject.m textEditorObject.m tapeDeckObject.m gradSliderObject.m getColorObject.m dateBrowserObject.m colorWheelObject.m speedBarObject.m sliderObject.m penMapObject.m boingBallObject.m getScreenModeObject.m getFontObject.m getFileObject.m textFieldObject.m fuelGaugeObject.m drawListObject.m bevelObject.m listBrowserObject.m clickTabObject.m chooserObject.m radioObject.m menuObject.m rexxObject.m reactionListObject.m listPicker.m reactionForm.m listManagerForm.m codeGenForm.m cSourcegen.m eSourceGen.m sourceGen.m objectPicker.m colourPicker.m fileStreamer.m windowObject.m screenObject.m paletteObject.m scrollerObject.m glyphObject.m spaceObject.m integerObject.m labelObject.m checkboxObject.m stringObject.m buttonObject.m layoutObject.m reactionObject.m reactionLists.m stringlist.m rebuild
delete validator.m bitmapObject.m dialogs.m libraryVersions.m tabsObject.m sketchboardObject.m virtualObject.m listViewObject.m ledObject.m textEditorObject.m tapeDeckObject.m gradSliderObject.m getColorObject.m dateBrowserObject.m colorWheelObject.m speedBarObject.m sliderObject.m penMapObject.m boingBallObject.m getScreenModeObject.m getFontObject.m getFileObject.m textFieldObject.m fuelGaugeObject.m drawListObject.m bevelObject.m listBrowserObject.m clickTabObject.m chooserObject.m radioObject.m menuObject.m rexxObject.m reactionListObject.m listPicker.m reactionForm.m listManagerForm.m codeGenForm.m cSourcegen.m eSourceGen.m sourceGen.m objectPicker.m colourPicker.m fileStreamer.m windowObject.m screenObject.m paletteObject.m scrollerObject.m glyphObject.m spaceObject.m integerObject.m labelObject.m checkboxObject.m stringObject.m buttonObject.m layoutObject.m reactionObject.m reactionLists.m stringlist.m requesterObject.m rebuild
13 changes: 10 additions & 3 deletions reactionForm.e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -7,6 +7,8 @@ OPT MODULE, OSVERSION=37
'gadgets/button',
'amigalib/boopsi',
'intuition/intuition'

MODULE '*stringlist'

EXPORT ENUM MR_NONE, MR_OK, MR_CANCEL

Expand All @@ -15,6 +17,7 @@ EXPORT OBJECT reactionForm
modalResult:LONG
gadgetList:PTR TO LONG
gadgetActions:PTR TO LONG
hintText:PTR TO CHAR
hintInfo:PTR TO hintinfo
ENDOBJECT

Expand Down Expand Up @@ -42,7 +45,7 @@ EXPORT PROC canClose(modalRes) OF reactionForm IS TRUE
EXPORT PROC ticker() OF reactionForm IS 0
EXPORT PROC menuPick(menu,menuitem,subItem) OF reactionForm IS 0

PROC updateHint(gadid,hintText:PTR TO CHAR) OF reactionForm
PROC updateHint(gadid,hintText:PTR TO stringlist) OF reactionForm
DEF win
win:=Gets(self.windowObj,WINDOW_WINDOW)

Expand All @@ -54,8 +57,11 @@ PROC updateHint(gadid,hintText:PTR TO CHAR) OF reactionForm
ENDIF
self.hintInfo.gadgetid:=gadid

SetGadgetAttrsA(self.gadgetList[ gadid ],win,0,[BUTTON_TEXTPEN,IF hintText THEN 2 ELSE 1,0])
self.hintInfo.text:=hintText
SetGadgetAttrsA(self.gadgetList[ gadid ],win,0,[BUTTON_TEXTPEN,IF hintText.count() THEN 2 ELSE 1,0])

IF self.hintText THEN Dispose(self.hintText)
self.hintText:=hintText.makeTextString()
self.hintInfo.text:=self.hintText
Sets(self.windowObj,WINDOW_HINTINFO,self.hintInfo)
Sets(self.windowObj,WINDOW_GADGETHELP,TRUE)
ENDPROC
Expand Down Expand Up @@ -94,6 +100,7 @@ EXPORT PROC showModal() OF reactionForm HANDLE
Raise("WIN")
ENDIF

IF self.hintText THEN Dispose(self.hintText)
IF self.hintInfo THEN Dispose(self.hintInfo)

EXCEPT DO
Expand Down
40 changes: 16 additions & 24 deletions reactionObject.e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,7 @@ OPT MODULE,OSVERSION=37

EXPORT DEF texteditorbase

// These are not yet all implemented but included here to define the ids
EXPORT ENUM TYPE_REACTIONLIST,TYPE_SCREEN,TYPE_REXX, TYPE_WINDOW, TYPE_MENU,
TYPE_BUTTON, TYPE_BITMAP, TYPE_CHECKBOX, TYPE_CHOOSER,
TYPE_CLICKTAB, TYPE_FUELGAUGE, TYPE_GETFILE, TYPE_GETFONT,
Expand All @@ -32,11 +33,10 @@ EXPORT ENUM TYPE_REACTIONLIST,TYPE_SCREEN,TYPE_REXX, TYPE_WINDOW, TYPE_MENU,
TYPE_SPACE, TYPE_TEXTFIELD, TYPE_BEVEL, TYPE_DRAWLIST,
TYPE_GLYPH, TYPE_LABEL,

// These are not yet all implemented but included here to define the ids
TYPE_COLORWHEEL, TYPE_DATEBROWSER, TYPE_GETCOLOR, TYPE_GRADSLIDER,
TYPE_LISTVIEW, TYPE_PAGE, TYPE_PROGRESS, TYPE_SKETCH,TYPE_TAPEDECK,
TYPE_TEXTEDITOR, TYPE_TEXTENTRY, TYPE_VIRTUAL, TYPE_BOINGBALL, TYPE_LED,
TYPE_PENMAP, TYPE_SMARTBITMAP, TYPE_TITLEBAR, TYPE_TABS,
TYPE_PENMAP, TYPE_SMARTBITMAP, TYPE_TITLEBAR, TYPE_TABS, TYPE_REQUESTER,

TYPE_MAX

Expand All @@ -61,7 +61,7 @@ EXPORT DEF imageData:PTR TO CHAR
EXPORT OBJECT reactionObject
ident[80]:ARRAY OF CHAR
name[80]:ARRAY OF CHAR
hintText:PTR TO CHAR
hintText:PTR TO stringlist
parent:PTR TO reactionObject
children:PTR TO stdlist
libsused:PTR TO LONG
Expand Down Expand Up @@ -439,25 +439,22 @@ ENDPROC
PROC editHint(comp:PTR TO reactionObject) OF hintEditForm
DEF res,newval

SetGadgetAttrsA(self.gadgetList[ HINTGAD_TEXT ],0,0,[GA_TEXTEDITOR_CONTENTS,IF comp.hintText THEN comp.hintText ELSE '',0])
newval:=comp.hintText.makeTextString()
SetGadgetAttrsA(self.gadgetList[ HINTGAD_TEXT ],0,0,[GA_TEXTEDITOR_CONTENTS,newval,0])
Dispose(newval)

res:=self.showModal()
IF res=MR_OK
DisposeLink(comp.hintText)

newval:=DoMethod(self.gadgetList[ HINTGAD_TEXT ], GM_TEXTEDITOR_EXPORTTEXT);
IF StrLen(newval)
comp.hintText:=AstrClone(newval)
ELSE
comp.hintText:=0
ENDIF
comp.hintText.setFromTextString(newval)
FreeVec(newval)
ENDIF
ENDPROC res=MR_OK

EXPORT PROC create(parent) OF reactionObject
DEF stdlist:PTR TO stdlist
DEF name[80]:STRING
DEF strlist:PTR TO stringlist
DEF scr
self.parent:=parent
self.id:=objCount
Expand All @@ -467,7 +464,8 @@ EXPORT PROC create(parent) OF reactionObject
AstrCopy(self.name,name)
AstrCopy(self.ident,name)

self.hintText:=0
NEW strlist.stringlist(10)
self.hintText:=strlist

NEW stdlist.stdlist(20)
self.children:=stdlist
Expand Down Expand Up @@ -511,8 +509,8 @@ EXPORT PROC end() OF reactionObject
UnlockPubScreen(NIL,scr)
ENDIF
IF self.visInfo THEN FreeVisualInfo(self.visInfo)
ENDPROC
END self.hintText
ENDPROC

EXPORT PROC createPreviewObject(scr) OF reactionObject IS -1

Expand Down Expand Up @@ -606,11 +604,10 @@ EXPORT PROC serialise(fser:PTR TO fileStreamer) OF reactionObject
fser.writeLine(tempStr)
StringF(tempStr,'IDENT: \s',self.ident)
fser.writeLine(tempStr)
IF self.hintText
StringF(tempStr,'HINT: \r\z\h[8]',StrLen(self.hintText))
FOR i:=0 TO self.hintText.count()-1
StringF(tempStr,'HINT: \s',self.hintText.item(i))
fser.writeLine(tempStr)
fser.writeLine(self.hintText)
ENDIF
ENDFOR
StringF(tempStr,'MINWIDTH: \d',self.minWidth)
fser.writeLine(tempStr)
StringF(tempStr,'MINHEIGHT: \d',self.minHeight)
Expand Down Expand Up @@ -708,12 +705,7 @@ PROC deserialise(fser:PTR TO fileStreamer) OF reactionObject
self.tempParentId:=Val(tempStr+STRLEN)
ENDIF
ELSEIF StrCmp('HINT: ',tempStr,STRLEN)
count:=STRLEN
StringF(tempStr2,'$\s',tempStr+count)
count:=Val(tempStr2)
self.hintText:=String(count+1)
fser.read(self.hintText,count+1)
SetStr(self.hintText,count)
self.hintText.add(tempStr+STRLEN)
ELSEIF StrCmp('NAME: ',tempStr,STRLEN)
AstrCopy(self.name,tempStr+STRLEN,80)
ELSEIF StrCmp('IDENT: ',tempStr,STRLEN)
Expand Down
46 changes: 33 additions & 13 deletions rebuild.e
View file
Original file line number Diff line number Diff line change
Expand Up @@ -51,7 +51,7 @@ OPT OSVERSION=37,LARGE
'*stringObject','*integerObject','*stringlist','*reactionObject','*reactionForm','*boingBallObject',
'*penMapObject','*sliderObject','*bitmapObject','*speedBarObject','*colorWheelObject','*dateBrowserObject',
'*getColorObject','*gradSliderObject','*tapeDeckObject','*textEditorObject','*ledObject','*listViewObject',
'*virtualObject','*sketchboardObject','*tabsObject'
'*virtualObject','*sketchboardObject','*tabsObject','*requesterObject'

#define vernum '1.2.0-dev'
#date verstring '$VER:Rebuild 1.2.0-%Y%m%d%h%n%s'
Expand All @@ -62,10 +62,11 @@ OPT OSVERSION=37,LARGE

CONST ROOT_APPLICATION_ITEM=0
CONST ROOT_REXX_ITEM=1
CONST ROOT_SCREEN_ITEM=2
CONST ROOT_WINDOW_ITEM=3
CONST ROOT_MENU_ITEM=4
CONST ROOT_LAYOUT_ITEM=5
CONST ROOT_REQUESTER_ITEM=2
CONST ROOT_SCREEN_ITEM=3
CONST ROOT_WINDOW_ITEM=4
CONST ROOT_MENU_ITEM=5
CONST ROOT_LAYOUT_ITEM=6

ENUM GAD_COMPONENTLIST,GAD_TEMP_COPYTO, GAD_TEMP_COPYFROM, GAD_TEMP_MOVETO, GAD_TEMP_MOVEFROM, GAD_TEMP_REMOVE, GAD_TEMPLIST, GAD_ADD, GAD_GENMINUS, GAD_GENPLUS, GAD_DELETE, GAD_MOVEUP, GAD_MOVEDOWN,
GAD_LISTS, GAD_CODE, GAD_LOAD, GAD_SAVE, GAD_NEW
Expand Down Expand Up @@ -267,8 +268,13 @@ PROC makeComponentList(comp:PTR TO reactionObject,generation,list, selcomp, newn
DEF typeStr[15]:STRING

StringF(idStr,'\d',comp.id)
StringF(typeStr,'\s',comp.getTypeName())
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, IF (comp.parent=0) OR (comp.allowChildren()) THEN LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN ELSE 0,LBNA_USERDATA, comp, LBNA_GENERATION, generation, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, comp.ident, LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, typeStr,LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, idStr,TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
StrCopy(typeStr,comp.getTypeName())
IF (n:=AllocListBrowserNodeA(3,
[LBNA_FLAGS, IF (comp.parent=0) OR (comp.allowChildren()) THEN LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN ELSE 0,
LBNA_USERDATA, comp, LBNA_GENERATION, generation,
LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, IF StrLen(comp.ident) THEN comp.ident ELSE typeStr,
LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, typeStr,
LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, idStr,TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
comp.node:=n

IF comp=selcomp THEN newnode[]:=n
Expand Down Expand Up @@ -335,6 +341,8 @@ PROC makeList(selcomp=0)
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN, LBNA_USERDATA, 0, LBNA_GENERATION, 1, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'Application Begin', LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'System',LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'N/A',TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
CASE ROOT_REXX_ITEM
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN, LBNA_USERDATA, 0, LBNA_GENERATION, 2, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'Rexx', LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'System',LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'N/A',TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
CASE ROOT_REQUESTER_ITEM
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN, LBNA_USERDATA, 0, LBNA_GENERATION, 2, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'Requesters', LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'System',LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'N/A',TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
CASE ROOT_SCREEN_ITEM
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN, LBNA_USERDATA, 0, LBNA_GENERATION, 2, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'Screen', LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'System',LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'N/A',TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
CASE ROOT_WINDOW_ITEM
Expand All @@ -343,9 +351,7 @@ PROC makeList(selcomp=0)
IF (n:=AllocListBrowserNodeA(3, [LBNA_FLAGS, LBFLG_HASCHILDREN OR LBFLG_SHOWCHILDREN, LBNA_USERDATA, 0, LBNA_GENERATION, 4, LBNA_COLUMN,0, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'Menu', LBNA_COLUMN,1, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'System',LBNA_COLUMN,2, LBNCA_COPYTEXT, TRUE, LBNCA_TEXT, 'N/A',TAG_END])) THEN AddTail(list, n) ELSE Raise("MEM")
ENDSELECT
ELSE
IF i=ROOT_REXX_ITEM
depth:=2
ELSEIF i=ROOT_SCREEN_ITEM
IF i==[ROOT_REXX_ITEM,ROOT_REQUESTER_ITEM, ROOT_SCREEN_ITEM]
depth:=2
ELSE
SELECT Mod(i-ROOT_WINDOW_ITEM,3)
Expand Down Expand Up @@ -1594,6 +1600,7 @@ PROC loadFile(loadfilename:PTR TO CHAR) HANDLE

objectList.add(0) ->Application begin
objectList.add(0) ->Rexx
objectList.add(0) ->Requester
objectList.add(0) ->Screen
objectList.add(0) ->Window
objectList.add(0) ->Menu
Expand All @@ -1610,6 +1617,7 @@ PROC loadFile(loadfilename:PTR TO CHAR) HANDLE
IF type=TYPE_REACTIONLIST THEN reactionLists.add(newObj)
IF type=TYPE_SCREEN THEN objectList.setItem(ROOT_SCREEN_ITEM,newObj)
IF type=TYPE_REXX THEN objectList.setItem(ROOT_REXX_ITEM,newObj)
IF type=TYPE_REQUESTER THEN objectList.setItem(ROOT_REQUESTER_ITEM,newObj)
IF type=TYPE_WINDOW
IF objectList.item(ROOT_WINDOW_ITEM)=0
objectList.setItem(ROOT_WINDOW_ITEM,newObj)
Expand All @@ -1627,6 +1635,13 @@ PROC loadFile(loadfilename:PTR TO CHAR) HANDLE
ENDIF
ENDWHILE

//original v1 files did not include requester
IF objectList.item(ROOT_REQUESTER_ITEM)=0
newObj:=createRequesterObject(0)
newObj.id:=newid++
objectList.setItem(ROOT_REQUESTER_ITEM,newObj)
ENDIF

FOR i:=0 TO loadObjectList.count()-1
newObj:=loadObjectList.item(i)
IF newObj.tempParentId=-1
Expand Down Expand Up @@ -2286,6 +2301,7 @@ PROC newProject()

objectList.add(0) ->Application begin
objectList.add(createRexxObject(0)) ->Rexx
objectList.add(createRequesterObject(0)) ->Requester
objectList.add(createScreenObject(0)) ->Screen
objectList.add(createWindowObject(0)) ->Window
objectList.add(createMenuObject(0)) ->Menu
Expand Down Expand Up @@ -2550,10 +2566,12 @@ PROC remakePreviewMenus()
ENDPROC

PROC makeHintList(comp:PTR TO reactionObject, hintGadIds:PTR TO stdlist, hintTexts:PTR TO stdlist)
DEF i
DEF i,tempText

IF comp.hintText
hintTexts.add(comp.hintText)
IF comp.hintText.count()
tempText:=comp.hintText.makeTextString()
hintTexts.add(tempText)
Dispose(tempText)
hintGadIds.add(comp.id)
ENDIF

Expand Down Expand Up @@ -2776,6 +2794,8 @@ PROC createObjectByType(objType,comp)
newObj:=createSketchboardObject(comp)
CASE TYPE_TABS
newObj:=createTabsObject(comp)
CASE TYPE_REQUESTER
newObj:=createRequesterObject(comp)
DEFAULT
Raise("OBJ")
ENDSELECT
Expand Down
Loading

0 comments on commit 0c3f6db

Please sign in to comment.