Skip to content

Commit 11b9cda

Browse files
dmcolesdmcoles
committed
split requester and requester item into separate objects
remove requester list editor and add items into main tree view instead check identifier dupes recursively
1 parent c3a22eb commit 11b9cda

File tree

7 files changed

+103
-727
lines changed

7 files changed

+103
-727
lines changed

‎cSourceGen.e

Lines changed: 11 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ OPT MODULE,LARGE
33
MODULE 'images/drawlist'
44
MODULE '*baseStreamer','*sourceGen','*reactionObject','*windowObject','*menuObject','*stringlist','*screenObject'
55
MODULE '*chooserObject','*clickTabObject','*radioObject','*listBrowserObject','*tabsObject','*reactionListObject',
6-
'*drawListObject','*speedBarObject','*listViewObject','*rexxObject','*requesterObject'
6+
'*drawListObject','*speedBarObject','*listViewObject','*rexxObject','*requesterObject','*requesterItemObject'
77

88
EXPORT OBJECT cSrcGen OF srcGen
99
ENDOBJECT
@@ -81,7 +81,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
8181
DEF layoutObject:PTR TO reactionObject
8282
DEF listObjects:PTR TO stdlist
8383
DEF listObject:PTR TO reactionObject
84-
DEF reqItem:PTR TO requesterItem
84+
DEF reqItem:PTR TO requesterItemObject
8585
DEF bodyText
8686

8787
hasarexx:=(rexxObject.commands.count()>0) AND (StrLen(rexxObject.hostName)>0)
@@ -152,7 +152,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
152152

153153
IF self.libsused[TYPE_VIRTUAL] THEN self.writeLine('#include <proto/virtual.h>')
154154
IF self.libsused[TYPE_SKETCH] THEN self.writeLine('#include <proto/sketchboard.h>')
155-
IF requesterObject.requesterItems.count()>0
155+
IF requesterObject.children.count()>0
156156
self.writeLine('#include <proto/requester.h>')
157157
self.writeLine('#include <classes/requester.h>')
158158
ENDIF
@@ -487,9 +487,11 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
487487
ENDIF
488488
ENDIF
489489

490-
FOR i:=0 TO requesterObject.requesterItems.count()-1
491-
reqItem:=requesterObject.requesterItems.item(i)
492-
StringF(tempStr,'int requester\d(Object *reactionWindow',reqItem.id)
490+
FOR i:=0 TO requesterObject.children.count()-1
491+
reqItem:=requesterObject.children.item(i)
492+
StrCopy(tempStr,reqItem.ident)
493+
LowerStr(tempStr)
494+
StringF(tempStr,'int \s(Object *reactionWindow',tempStr)
493495
IF reqItem.titleParam
494496
StrAdd(tempStr,',STRPTR titleText')
495497
ENDIF
@@ -579,7 +581,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
579581
IF self.libsused[TYPE_VIRTUAL] THEN self.writeLine(' *VirtualBase = NULL,')
580582
IF self.libsused[TYPE_SKETCH] THEN self.writeLine(' *SketchBoardBase = NULL,')
581583
IF self.libsused[TYPE_TABS] THEN self.writeLine(' *TabsBase = NULL,')
582-
IF requesterObject.requesterItems.count()>0 THEN self.writeLine(' *RequesterBase = NULL,')
584+
IF requesterObject.children.count()>0 THEN self.writeLine(' *RequesterBase = NULL,')
583585

584586
self.writeLine(' *GadToolsBase = NULL,')
585587
self.writeLine(' *LayoutBase = NULL,')
@@ -768,7 +770,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
768770
IF self.libsused[TYPE_TABS]
769771
self.writeLine(' if( !(TabsBase = (struct Library*) OpenLibrary("gadgets/tabs.gadget",0L) ) ) return 0;')
770772
ENDIF
771-
IF requesterObject.requesterItems.count()>0
773+
IF requesterObject.children.count()>0
772774
self.writeLine(' if( !(RequesterBase = (struct Library*) OpenLibrary("classes/requester.class",0L) ) ) return 0;')
773775
ENDIF
774776

@@ -849,7 +851,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
849851
IF hasarexx
850852
self.writeLine(' if (ARexxBase) CloseLibrary( (struct Library *)ARexxBase );')
851853
ENDIF
852-
IF requesterObject.requesterItems.count()>0
854+
IF requesterObject.children.count()>0
853855
self.writeLine(' if (RequesterBase) CloseLibrary( (struct Library *)RequesterBase );')
854856
ENDIF
855857

‎eSourceGen.e

Lines changed: 10 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ OPT MODULE,LARGE
33
MODULE 'images/drawlist','gadgets/tabs'
44
MODULE '*baseStreamer','*sourceGen','*reactionObject','*menuObject','*windowObject','*stringlist','*screenObject'
55
MODULE '*chooserObject','*clickTabObject','*radioObject','*listBrowserObject','*rexxObject','*tabsObject',
6-
'*reactionListObject','*reactionLists','*drawlistObject','*speedBarObject','*listViewObject','*requesterObject'
6+
'*reactionListObject','*reactionLists','*drawlistObject','*speedBarObject','*listViewObject','*requesterObject','*requesterItemObject'
77

88
EXPORT OBJECT eSrcGen OF srcGen
99
ENDOBJECT
@@ -62,7 +62,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
6262
DEF windowObject:PTR TO reactionObject
6363
DEF layoutObject:PTR TO reactionObject
6464
DEF listObjects:PTR TO stdlist
65-
DEF reqItem:PTR TO requesterItem
65+
DEF reqItem:PTR TO requesterItemObject
6666
DEF bodyText
6767

6868
hasarexx:=(rexxObject.commands.count()>0) AND (StrLen(rexxObject.hostName)>0)
@@ -134,7 +134,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
134134
self.writeLine(' \autility/hooks\a,\atools/installhook\a,')
135135
ENDIF
136136
ENDIF
137-
IF requesterObject.requesterItems.count()>0
137+
IF requesterObject.children.count()>0
138138
self.writeLine(' \arequester\a,\aclasses/requester\a,')
139139
ENDIF
140140

@@ -323,7 +323,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
323323
IF self.libsused[TYPE_VIRTUAL] THEN self.writeLine(' IF (virtualbase:=OpenLibrary(\agadgets/virtual.gadget\a,0))=NIL THEN Throw(\qLIB\q,\qvirt\q)')
324324
IF self.libsused[TYPE_SKETCH] THEN self.writeLine(' IF (sketchboardbase:=OpenLibrary(\agadgets/sketchboard.gadget\a,0))=NIL THEN Throw(\qLIB\q,\qskch\q)')
325325
IF self.libsused[TYPE_TABS] THEN self.writeLine(' IF (tabsbase:=OpenLibrary(\agadgets/tabs.gadget\a,0))=NIL THEN Throw(\qLIB\q,\qtabs\q)')
326-
IF requesterObject.requesterItems.count()>0 THEN self.writeLine(' IF (requesterbase:=OpenLibrary(\aclasses/requester.class\a,0))=NIL THEN Throw(\qLIB\q,\qreqs\q)')
326+
IF requesterObject.children.count()>0 THEN self.writeLine(' IF (requesterbase:=OpenLibrary(\aclasses/requester.class\a,0))=NIL THEN Throw(\qLIB\q,\qreqs\q)')
327327

328328
self.genScreenCreate(screenObject)
329329
self.writeLine(' IF (gVisInfo:=GetVisualInfoA(gScreen, [TAG_END]))=NIL THEN Raise(\qvisi\q)')
@@ -396,7 +396,7 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
396396
IF self.libsused[TYPE_VIRTUAL] THEN self.writeLine(' IF virtualbase THEN CloseLibrary(virtualbase)')
397397
IF self.libsused[TYPE_SKETCH] THEN self.writeLine(' IF sketchboardbase THEN CloseLibrary(sketchboardbase)')
398398
IF self.libsused[TYPE_TABS] THEN self.writeLine(' IF tabsbase THEN CloseLibrary(tabsbase)')
399-
IF requesterObject.requesterItems.count()>0 THEN self.writeLine(' IF requesterbase THEN CloseLibrary(requesterbase)')
399+
IF requesterObject.children.count()>0 THEN self.writeLine(' IF requesterbase THEN CloseLibrary(requesterbase)')
400400

401401
self.writeLine('ENDPROC')
402402
self.writeLine('')
@@ -617,9 +617,11 @@ PROC genHeader(screenObject:PTR TO screenObject,rexxObject:PTR TO rexxObject, re
617617
self.writeLine(' RA_CloseWindow(windowObject)')
618618
self.writeLine('ENDPROC')
619619
self.writeLine('')
620-
FOR i:=0 TO requesterObject.requesterItems.count()-1
621-
reqItem:=requesterObject.requesterItems.item(i)
622-
StringF(tempStr,'PROC requester\d(reactionWindow',reqItem.id)
620+
FOR i:=0 TO requesterObject.children.count()-1
621+
reqItem:=requesterObject.children.item(i)
622+
StrCopy(tempStr,reqItem.ident)
623+
LowerStr(tempStr)
624+
StringF(tempStr,'PROC \s(reactionWindow',tempStr)
623625
IF reqItem.titleParam
624626
StrAdd(tempStr,',titleText')
625627
ENDIF

‎makefile

Lines changed: 7 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,7 @@ all: rebuild
1515
release: options=$(releaseoptions)
1616
release: rebuild
1717

18-
rebuild: rebuild.e codePreviewForm.m 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 stringStreamer.m baseStreamer.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
18+
rebuild: rebuild.e codePreviewForm.m 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 stringStreamer.m baseStreamer.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 requesterItemObject.m
1919
$(compiler) rebuild $(options)
2020

2121
reactionLists.m: reactionLists.e stringlist.m
@@ -75,10 +75,10 @@ getColorObject.m: getColorObject.e reactionObject.m reactionForm.m sourceGen.m
7575
dateBrowserObject.m: dateBrowserObject.e reactionObject.m reactionForm.m sourceGen.m validator.m
7676
$(compiler) dateBrowserObject $(options)
7777

78-
eSourceGen.m: eSourceGen.e baseStreamer.m sourceGen.m reactionObject.m stringlist.m menuObject.m windowObject.m reactionListObject.m chooserObject.m clickTabObject.m radioObject.m listBrowserObject.m drawListObject.m screenObject.m rexxObject.m speedBarObject.m listViewObject.m tabsObject.m windowObject.m requesterObject.m
78+
eSourceGen.m: eSourceGen.e baseStreamer.m sourceGen.m reactionObject.m stringlist.m menuObject.m windowObject.m reactionListObject.m chooserObject.m clickTabObject.m radioObject.m listBrowserObject.m drawListObject.m screenObject.m rexxObject.m speedBarObject.m listViewObject.m tabsObject.m windowObject.m requesterObject.m requesterItemObject.m
7979
$(compiler) eSourceGen $(options)
8080

81-
cSourceGen.m: cSourceGen.e baseStreamer.m sourceGen.m reactionObject.m stringlist.m menuObject.m windowObject.m reactionListObject.m chooserObject.m clickTabObject.m radioObject.m listBrowserObject.m drawListObject.m speedBarObject.m rexxObject.m screenObject.m listViewObject.m tabsObject.m windowObject.m requesterObject.m
81+
cSourceGen.m: cSourceGen.e baseStreamer.m sourceGen.m reactionObject.m stringlist.m menuObject.m windowObject.m reactionListObject.m chooserObject.m clickTabObject.m radioObject.m listBrowserObject.m drawListObject.m speedBarObject.m rexxObject.m screenObject.m listViewObject.m tabsObject.m windowObject.m requesterObject.m requesterItemObject.m
8282
$(compiler) cSourceGen $(options)
8383

8484
sourceGen.m: sourceGen.e baseStreamer.m stringlist.m
@@ -105,9 +105,12 @@ labelObject.m: labelObject.e reactionObject.m reactionForm.m colourPicker.m so
105105
rexxObject.m: rexxObject.e reactionObject.m reactionForm.m stringlist.m
106106
$(compiler) rexxObject $(options)
107107

108-
requesterObject.m: requesterObject.e reactionObject.m reactionForm.m stringlist.m baseStreamer.m
108+
requesterObject.m: requesterObject.e reactionObject.m reactionForm.m stringlist.m baseStreamer.m validator.m requesterItemObject.m
109109
$(compiler) requesterObject $(options)
110110

111+
requesterItemObject.m: requesterItemObject.e reactionObject.m reactionForm.m stringlist.m baseStreamer.m validator.m
112+
$(compiler) requesterItemObject $(options)
113+
111114
menuObject.m: menuObject.e reactionObject.m reactionForm.m stringlist.m baseStreamer.m dialogs.m
112115
$(compiler) menuObject $(options)
113116

‎reactionObject.e

Lines changed: 44 additions & 43 deletions
Original file line numberDiff line numberDiff line change
@@ -44,6 +44,7 @@ EXPORT ENUM TYPE_REACTIONLIST,TYPE_SCREEN,TYPE_REXX, TYPE_WINDOW, TYPE_MENU,
4444
TYPE_LISTVIEW, TYPE_PAGE, TYPE_PROGRESS, TYPE_SKETCH,TYPE_TAPEDECK,
4545
TYPE_TEXTEDITOR, TYPE_TEXTENTRY, TYPE_VIRTUAL, TYPE_BOINGBALL, TYPE_LED,
4646
TYPE_PENMAP, TYPE_SMARTBITMAP, TYPE_TITLEBAR, TYPE_TABS, TYPE_REQUESTER,
47+
TYPE_REQUESTER_ITEM,
4748

4849
TYPE_MAX
4950

@@ -497,9 +498,8 @@ EXPORT PROC create(parent) OF reactionObject
497498
DEF strlist:PTR TO stringlist
498499
DEF scr
499500
self.parent:=parent
500-
self.id:=objCount
501+
self.id:=getObjId()
501502
self.errObj:=FALSE
502-
objCount:=objCount+1
503503
StringF(name,'\s_\d',self.getTypeName(),self.id)
504504
AstrCopy(self.name,name)
505505
AstrCopy(self.ident,name)
@@ -726,9 +726,9 @@ EXPORT PROC serialise(fser:PTR TO fileStreamer) OF reactionObject
726726
ENDIF
727727
ENDIF
728728
ENDWHILE
729-
fser.writeLine('-')
730-
self.serialiseChildren(fser)
731729
ENDIF
730+
fser.writeLine('-')
731+
self.serialiseChildren(fser)
732732
ENDPROC
733733

734734
PROC deserialise(fser:PTR TO fileStreamer) OF reactionObject
@@ -804,46 +804,44 @@ PROC deserialise(fser:PTR TO fileStreamer) OF reactionObject
804804

805805
list:=self.serialiseData()
806806
count:=ListLen(list)
807-
IF count>0
808-
done:=FALSE
809-
REPEAT
810-
IF fser.readLine(tempStr)
811-
IF StrCmp('-',tempStr)
812-
done:=TRUE
813-
ELSE
814-
i:=0
815-
WHILE i<count
816-
fieldname:=list[i++]
817-
fieldptr:=list[i++]
818-
fieldtype:=list[i++]
819-
StrCopy(tempStr2,fieldname)
820-
StrAdd(tempStr2,': ')
821-
UpperStr(tempStr2)
822-
IF StrCmp(tempStr2,tempStr,EstrLen(tempStr2))
823-
SELECT fieldtype
824-
CASE FIELDTYPE_CHAR
825-
PutChar(fieldptr,Val(tempStr+StrLen(tempStr2)))
826-
CASE FIELDTYPE_INT
827-
PutInt(fieldptr,Val(tempStr+StrLen(tempStr2)))
828-
CASE FIELDTYPE_LONG
829-
PutLong(fieldptr,Val(tempStr+StrLen(tempStr2)))
830-
CASE FIELDTYPE_STR
831-
AstrCopy(fieldptr,tempStr+StrLen(tempStr2))
832-
CASE FIELDTYPE_STRLIST
833-
strlist:=Long(fieldptr)
834-
strlist.add(tempStr+StrLen(tempStr2))
835-
CASE FIELDTYPE_INTLIST
836-
intlist:=Long(fieldptr)
837-
intlist.add(Val(tempStr+StrLen(tempStr2)))
838-
ENDSELECT
839-
ENDIF
840-
ENDWHILE
841-
ENDIF
842-
ELSE
807+
done:=FALSE
808+
REPEAT
809+
IF fser.readLine(tempStr)
810+
IF StrCmp('-',tempStr)
843811
done:=TRUE
812+
ELSE
813+
i:=0
814+
WHILE i<count
815+
fieldname:=list[i++]
816+
fieldptr:=list[i++]
817+
fieldtype:=list[i++]
818+
StrCopy(tempStr2,fieldname)
819+
StrAdd(tempStr2,': ')
820+
UpperStr(tempStr2)
821+
IF StrCmp(tempStr2,tempStr,EstrLen(tempStr2))
822+
SELECT fieldtype
823+
CASE FIELDTYPE_CHAR
824+
PutChar(fieldptr,Val(tempStr+StrLen(tempStr2)))
825+
CASE FIELDTYPE_INT
826+
PutInt(fieldptr,Val(tempStr+StrLen(tempStr2)))
827+
CASE FIELDTYPE_LONG
828+
PutLong(fieldptr,Val(tempStr+StrLen(tempStr2)))
829+
CASE FIELDTYPE_STR
830+
AstrCopy(fieldptr,tempStr+StrLen(tempStr2))
831+
CASE FIELDTYPE_STRLIST
832+
strlist:=Long(fieldptr)
833+
strlist.add(tempStr+StrLen(tempStr2))
834+
CASE FIELDTYPE_INTLIST
835+
intlist:=Long(fieldptr)
836+
intlist.add(Val(tempStr+StrLen(tempStr2)))
837+
ENDSELECT
838+
ENDIF
839+
ENDWHILE
844840
ENDIF
845-
UNTIL done
846-
ENDIF
841+
ELSE
842+
done:=TRUE
843+
ENDIF
844+
UNTIL done
847845
ENDPROC
848846

849847
PROC serialiseChildren(fser:PTR TO fileStreamer) OF reactionObject
@@ -1010,5 +1008,8 @@ ENDPROC NewObjectA(PenMap_GetClass(),NIL,
10101008
PENMAP_PALETTE,[2,-1,-1,-1,0,0,0]:LONG,
10111009
TAG_DONE])
10121010

1013-
EXPORT PROC getObjId() IS objCount
1011+
EXPORT PROC currObjId() IS objCount
10141012

1013+
EXPORT PROC getObjId()
1014+
objCount:=objCount+1
1015+
ENDPROC objCount-1

‎rebuild.e

Lines changed: 15 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -52,7 +52,7 @@ OPT OSVERSION=37,LARGE
5252
'*penMapObject','*sliderObject','*bitmapObject','*speedBarObject','*colorWheelObject','*dateBrowserObject',
5353
'*getColorObject','*gradSliderObject','*tapeDeckObject','*textEditorObject','*ledObject','*listViewObject',
5454
'*virtualObject','*sketchboardObject','*tabsObject','*requesterObject',
55-
'*codePreviewForm'
55+
'*requesterItemObject','*codePreviewForm'
5656

5757
#define vernum '1.2.0-dev'
5858
#date verstring '$VER:Rebuild 1.2.0-%Y%m%d%h%n%s'
@@ -374,7 +374,7 @@ PROC makeList(selcomp=0)
374374
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")
375375
ENDSELECT
376376
ELSE
377-
IF i==[ROOT_REXX_ITEM,ROOT_REQUESTER_ITEM, ROOT_SCREEN_ITEM]
377+
IF i==[ROOT_REXX_ITEM,ROOT_REQUESTER_ITEM, ROOT_SCREEN_ITEM, ROOT_REQUESTER_ITEM]
378378
depth:=2
379379
ELSE
380380
SELECT Mod(i-ROOT_WINDOW_ITEM,3)
@@ -1929,6 +1929,7 @@ PROC loadStream(fs:PTR TO baseStreamer) HANDLE
19291929
ENDIF
19301930
ENDFOR
19311931

1932+
processObjects(objectList.item(ROOT_REQUESTER_ITEM),loadObjectList)
19321933
i:=ROOT_LAYOUT_ITEM
19331934
WHILE i<objectList.count()
19341935
processObjects(objectList.item(i),loadObjectList)
@@ -2024,7 +2025,7 @@ PROC saveStream(fs:PTR TO baseStreamer)
20242025
fs.writeLine('-REBUILD-')
20252026
StringF(tempStr,'VER=\d',FILE_FORMAT_VER)
20262027
fs.writeLine(tempStr)
2027-
StringF(tempStr,'NEXTID=\d',getObjId())
2028+
StringF(tempStr,'NEXTID=\d',currObjId())
20282029
fs.writeLine(tempStr)
20292030
IF selectedComp
20302031
StringF(tempStr,'SELECTEDID=\d',selectedComp.id)
@@ -2382,6 +2383,11 @@ PROC doAdd()
23822383
RETURN
23832384
ENDIF
23842385

2386+
IF (comp.type=TYPE_REQUESTER) OR (comp.type=TYPE_REQUESTER_ITEM)
2387+
doAddComp(comp,TYPE_REQUESTER_ITEM)
2388+
RETURN
2389+
ENDIF
2390+
23852391
NEW frmObjectPicker.create()
23862392
setBusy()
23872393
IF (objType:=frmObjectPicker.selectItem())<>-1
@@ -3235,6 +3241,8 @@ PROC createObjectByType(objType,comp)
32353241
newObj:=createTabsObject(comp)
32363242
CASE TYPE_REQUESTER
32373243
newObj:=createRequesterObject(comp)
3244+
CASE TYPE_REQUESTER_ITEM
3245+
newObj:=createRequesterItemObject(comp)
32383246
DEFAULT
32393247
Raise("OBJ")
32403248
ENDSELECT
@@ -3773,7 +3781,10 @@ EXCEPT DO
37733781
clearUndo()
37743782
END undoData
37753783
ENDIF
3776-
IF codePreviewForm THEN END codePreviewForm
3784+
IF codePreviewForm
3785+
codePreviewForm.close()
3786+
END codePreviewForm
3787+
ENDIF
37773788
IF objectList THEN END objectList
37783789
IF bufferList
37793790
disposeBufferObjects()

0 commit comments

Comments
 (0)