all gadget types now have label property

dmcoles · Jul 23, 2024 · ffbe475 · ffbe475
1 parent 5c6cc26
commit ffbe475
Show file tree

Hide file tree

Showing 38 changed files with 496 additions and 902 deletions.
diff --git a/ListViewObject.e b/ListViewObject.e
@@ -23,7 +23,7 @@ OPT MODULE, OSVERSION=37
 
   MODULE '*reactionObject','*reactionForm','*listPicker','*stringlist','*reactionListObject','*reactionLists','*sourceGen','*validator'
 
-EXPORT ENUM LVIEWGAD_IDENT, LVIEWGAD_HINT, LVIEWGAD_LISTSELECT, LVIEWGAD_MULTISELECT,
+EXPORT ENUM LVIEWGAD_IDENT, LVIEWGAD_LABEL, LVIEWGAD_HINT, LVIEWGAD_LISTSELECT, LVIEWGAD_MULTISELECT,
       LVIEWGAD_OK, LVIEWGAD_CHILD, LVIEWGAD_CANCEL
 
 
@@ -88,6 +88,16 @@ PROC create() OF listViewSettingsForm
           LABEL_TEXT, 'Identifier',
         LabelEnd,
 
+        LAYOUT_ADDCHILD, self.gadgetList[ LVIEWGAD_LABEL ]:=StringObject,
+          GA_ID, LVIEWGAD_LABEL,
+          GA_RELVERIFY, TRUE,
+          GA_TABCYCLE, TRUE,
+          STRINGA_MAXCHARS, 80,
+        StringEnd,
+        CHILD_LABEL, LabelObject,
+          LABEL_TEXT, '_Label',
+        LabelEnd,
+
         LAYOUT_ADDCHILD,  self.gadgetList[ LVIEWGAD_HINT ]:=ButtonObject,
           GA_ID, LVIEWGAD_HINT,
           GA_TEXT, 'Hint',
@@ -203,12 +213,14 @@ PROC editSettings(comp:PTR TO listViewObject) OF listViewSettingsForm
 
   self.updateHint(LVIEWGAD_HINT, comp.hintText)
   SetGadgetAttrsA(self.gadgetList[ LVIEWGAD_IDENT ],0,0,[STRINGA_TEXTVAL,comp.ident,0])
+  SetGadgetAttrsA(self.gadgetList[ LVIEWGAD_LABEL ],0,0,[STRINGA_TEXTVAL,comp.label,0])
   SetGadgetAttrsA(self.gadgetList[ LVIEWGAD_MULTISELECT ],0,0,[LVIEWGAD_MULTISELECT,comp.multiSelect,0]) 
 
   res:=self.showModal()
   IF res=MR_OK
     comp.listObjectId:=self.selectedListId
     AstrCopy(comp.ident,Gets(self.gadgetList[ LVIEWGAD_IDENT ],STRINGA_TEXTVAL))
+    AstrCopy(comp.label,Gets(self.gadgetList[ LVIEWGAD_LABEL ],STRINGA_TEXTVAL))
     comp.multiSelect:=Gets(self.gadgetList[ LVIEWGAD_MULTISELECT ],CHECKBOX_CHECKED)   
   ENDIF
 ENDPROC res=MR_OK
@@ -225,22 +237,7 @@ EXPORT PROC createPreviewObject(scr) OF listViewObject
   ENDIF
   IF self.previewObject=0 THEN self.previewObject:=self.createErrorObject(scr)
 
-  self.previewChildAttrs:=[
-    LAYOUT_MODIFYCHILD, self.previewObject,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_NODISPOSE, FALSE,
-    CHILD_MINWIDTH, self.minWidth,
-    CHILD_MINHEIGHT, self.minHeight,
-    CHILD_MAXWIDTH, self.maxWidth,
-    CHILD_MAXHEIGHT, self.maxHeight,
-    CHILD_WEIGHTEDWIDTH, self.weightedWidth,
-    CHILD_WEIGHTEDHEIGHT,self.weightedHeight,
-    CHILD_SCALEWIDTH, self.scaleWidth,
-    CHILD_SCALEHEIGHT, self.scaleHeight,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_WEIGHTMINIMUM, self.weightMinimum,
-    IF self.weightBar THEN LAYOUT_WEIGHTBAR ELSE TAG_IGNORE, 1,
-    TAG_END]
+  self.makePreviewChildAttrs(0)
 ENDPROC
 
 EXPORT PROC create(parent) OF listViewObject
@@ -361,6 +358,11 @@ EXPORT PROC genCodeProperties(srcGen:PTR TO srcGen) OF listViewObject
   ENDIF
 ENDPROC
 
+EXPORT PROC genCodeChildProperties(srcGen:PTR TO srcGen) OF listViewObject
+  srcGen.componentAddChildLabel(self.label)
+  SUPER self.genCodeChildProperties(srcGen)
+ENDPROC
+
 EXPORT PROC hasCreateMacro() OF listViewObject IS FALSE
 
 EXPORT PROC getTypeEndName() OF listViewObject

diff --git a/SpeedBarObject.e b/SpeedBarObject.e
@@ -26,7 +26,7 @@ OPT MODULE, OSVERSION=37
 
   MODULE '*reactionObject','*reactionForm','*colourPicker','*sourcegen','*stringlist','*validator'
 
-EXPORT ENUM SBARGAD_IDENT,SBARGAD_NAME, SBARGAD_HINT, SBARGAD_BTNLIST, SBARGAD_BUTTON_TEXT, SBARGAD_BUTTON_TYPE, SBARGAD_BUTTON_ADD, SBARGAD_BUTTON_DEL, SBARGAD_ORIENTATION, SBARGAD_BGPEN,
+EXPORT ENUM SBARGAD_IDENT,SBARGAD_LABEL, SBARGAD_HINT, SBARGAD_BTNLIST, SBARGAD_BUTTON_TEXT, SBARGAD_BUTTON_TYPE, SBARGAD_BUTTON_ADD, SBARGAD_BUTTON_DEL, SBARGAD_ORIENTATION, SBARGAD_BGPEN,
             SBARGAD_STRUMBAR, SBARGAD_BEVELSTYLE,
       SBARGAD_OK, SBARGAD_CHILD, SBARGAD_CANCEL
 
@@ -189,6 +189,16 @@ PROC create() OF speedBarSettingsForm
           LABEL_TEXT, 'Identifier',
         LabelEnd,
 
+        LAYOUT_ADDCHILD, self.gadgetList[ SBARGAD_LABEL ]:=StringObject,
+          GA_ID, SBARGAD_LABEL,
+          GA_RELVERIFY, TRUE,
+          GA_TABCYCLE, TRUE,
+          STRINGA_MAXCHARS, 80,
+        StringEnd,
+        CHILD_LABEL, LabelObject,
+          LABEL_TEXT, '_Label',
+        LabelEnd,
+
         LAYOUT_ADDCHILD,  self.gadgetList[ SBARGAD_HINT ]:=ButtonObject,
           GA_ID, SBARGAD_HINT,
           GA_TEXT, 'Hint',
@@ -422,15 +432,15 @@ PROC editSettings(comp:PTR TO speedBarObject) OF speedBarSettingsForm
   self.selectItem(self,0,0,-1)
 
   SetGadgetAttrsA(self.gadgetList[ SBARGAD_IDENT ],0,0,[STRINGA_TEXTVAL,comp.ident,0])
-  SetGadgetAttrsA(self.gadgetList[ SBARGAD_NAME ],0,0,[STRINGA_TEXTVAL,comp.name,0])
+  SetGadgetAttrsA(self.gadgetList[ SBARGAD_LABEL ],0,0,[STRINGA_TEXTVAL,comp.label,0])
   SetGadgetAttrsA(self.gadgetList[ SBARGAD_STRUMBAR ],0,0,[CHECKBOX_CHECKED,comp.strumBar,0]) 
   SetGadgetAttrsA(self.gadgetList[ SBARGAD_ORIENTATION ],0,0,[CHOOSER_SELECTED,comp.orientation,0]) 
   SetGadgetAttrsA(self.gadgetList[ SBARGAD_BEVELSTYLE ],0,0,[CHOOSER_SELECTED,comp.bevelStyle,0]) 
 
   res:=self.showModal()
   IF res=MR_OK
     AstrCopy(comp.ident,Gets(self.gadgetList[ SBARGAD_IDENT ],STRINGA_TEXTVAL))
-    AstrCopy(comp.name,Gets(self.gadgetList[ SBARGAD_NAME ],STRINGA_TEXTVAL))
+    AstrCopy(comp.label,Gets(self.gadgetList[ SBARGAD_LABEL ],STRINGA_TEXTVAL))
     comp.bgPen:=self.tempBgPen
     comp.strumBar:=Gets(self.gadgetList[ SBARGAD_STRUMBAR ],CHECKBOX_CHECKED)   
     comp.orientation:=Gets(self.gadgetList[ SBARGAD_ORIENTATION ],CHOOSER_SELECTED)   
@@ -508,7 +518,6 @@ EXPORT PROC createPreviewObject(scr) OF speedBarObject
         GA_ID, self.id,
         GA_RELVERIFY, TRUE,
         GA_TABCYCLE, TRUE,
-        GA_TEXT, self.name,
         SPEEDBAR_ORIENTATION, ListItem([SBORIENT_HORIZ,SBORIENT_VERT],self.orientation),
         SPEEDBAR_BACKGROUND, self.bgPen,
         SPEEDBAR_STRUMBAR, self.strumBar,
@@ -517,23 +526,8 @@ EXPORT PROC createPreviewObject(scr) OF speedBarObject
       SpeedBarEnd
   ENDIF
   IF self.previewObject=0 THEN self.previewObject:=self.createErrorObject(scr)
+  self.makePreviewChildAttrs(self.label)
 
-  self.previewChildAttrs:=[
-    LAYOUT_MODIFYCHILD, self.previewObject,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_NODISPOSE, FALSE,
-    CHILD_MINWIDTH, self.minWidth,
-    CHILD_MINHEIGHT, self.minHeight,
-    CHILD_MAXWIDTH, self.maxWidth,
-    CHILD_MAXHEIGHT, self.maxHeight,
-    CHILD_WEIGHTEDWIDTH, self.weightedWidth,
-    CHILD_WEIGHTEDHEIGHT,self.weightedHeight,
-    CHILD_SCALEWIDTH, self.scaleWidth,
-    CHILD_SCALEHEIGHT, self.scaleHeight,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_WEIGHTMINIMUM, self.weightMinimum,
-    IF self.weightBar THEN LAYOUT_WEIGHTBAR ELSE TAG_IGNORE, 1,
-    TAG_END]
 ENDPROC
 
 EXPORT PROC create(parent) OF speedBarObject
@@ -587,7 +581,6 @@ EXPORT PROC serialiseData() OF speedBarObject IS
 EXPORT PROC genCodeProperties(srcGen:PTR TO srcGen) OF speedBarObject
   DEF tempStr[200]:STRING
 
-  srcGen.componentProperty('GA_Text',self.name,TRUE)
   srcGen.componentProperty('GA_RelVerify','TRUE',FALSE)
   srcGen.componentProperty('GA_TabCycle','TRUE',FALSE)
 
@@ -599,7 +592,11 @@ EXPORT PROC genCodeProperties(srcGen:PTR TO srcGen) OF speedBarObject
 
   StringF(tempStr,'buttons\d',self.id)
   srcGen.componentProperty('SPEEDBAR_Buttons',tempStr,FALSE)
+ENDPROC
 
+EXPORT PROC genCodeChildProperties(srcGen:PTR TO srcGen) OF speedBarObject
+  srcGen.componentAddChildLabel(self.label)
+  SUPER self.genCodeChildProperties(srcGen)
 ENDPROC
 
 EXPORT PROC createSpeedBarObject(parent)

diff --git a/bevelObject.e b/bevelObject.e
@@ -21,7 +21,7 @@ OPT MODULE, OSVERSION=37
 
   MODULE '*reactionObject','*reactionForm','*colourPicker','*sourceGen','*validator'
 
-EXPORT ENUM BEVELGAD_IDENT, BEVELGAD_NAME, BEVELGAD_LEFT, BEVELGAD_TOP, BEVELGAD_WIDTH, BEVELGAD_HEIGHT,
+EXPORT ENUM BEVELGAD_IDENT, BEVELGAD_LABEL, BEVELGAD_NAME, BEVELGAD_LEFT, BEVELGAD_TOP, BEVELGAD_WIDTH, BEVELGAD_HEIGHT,
       BEVELGAD_FILLPEN, BEVELGAD_TEXTPEN, BEVELGAD_STYLE, BEVELGAD_PLACETEXT,
       BEVELGAD_HIGHLIGHTPEN, BEVELGAD_FOREGROUNDPEN, BEVELGAD_BACKGROUNDPEN, BEVELGAD_SHADOWPEN,
       BEVELGAD_RECESSED, BEVELGAD_EDGESONLY, BEVELGAD_TRANSPARENT,
@@ -113,6 +113,18 @@ PROC create() OF bevelSettingsForm
           LABEL_TEXT, 'Identifier',
         LabelEnd,
 
+        LAYOUT_ADDCHILD, self.gadgetList[ BEVELGAD_LABEL ]:=StringObject,
+          GA_ID, BEVELGAD_LABEL,
+          GA_RELVERIFY, TRUE,
+          GA_TABCYCLE, TRUE,
+          STRINGA_MAXCHARS, 80,
+        StringEnd,
+
+        CHILD_LABEL, LabelObject,
+          LABEL_TEXT, '_Label',
+        LabelEnd,
+
+
         LAYOUT_ADDCHILD, self.gadgetList[ BEVELGAD_NAME ]:=StringObject,
           GA_ID, BEVELGAD_NAME,
           GA_RELVERIFY, TRUE,
@@ -121,7 +133,7 @@ PROC create() OF bevelSettingsForm
         StringEnd,
 
         CHILD_LABEL, LabelObject,
-          LABEL_TEXT, '_Label',
+          LABEL_TEXT, '_Text',
         LabelEnd,
       LayoutEnd,
 
@@ -415,6 +427,7 @@ PROC editSettings(comp:PTR TO bevelObject) OF bevelSettingsForm
   self.tmpTextPen:=comp.textPen
 
   SetGadgetAttrsA(self.gadgetList[ BEVELGAD_IDENT ],0,0,[STRINGA_TEXTVAL,comp.ident,0])
+  SetGadgetAttrsA(self.gadgetList[ BEVELGAD_LABEL ],0,0,[STRINGA_TEXTVAL,comp.label,0])
   SetGadgetAttrsA(self.gadgetList[ BEVELGAD_NAME ],0,0,[STRINGA_TEXTVAL,comp.name,0])
   SetGadgetAttrsA(self.gadgetList[ BEVELGAD_LEFT ],0,0,[INTEGER_NUMBER,comp.left,0]) 
   SetGadgetAttrsA(self.gadgetList[ BEVELGAD_TOP ],0,0,[INTEGER_NUMBER,comp.top,0]) 
@@ -435,6 +448,7 @@ PROC editSettings(comp:PTR TO bevelObject) OF bevelSettingsForm
   res:=self.showModal()
   IF res=MR_OK
     AstrCopy(comp.ident,Gets(self.gadgetList[ BEVELGAD_IDENT ],STRINGA_TEXTVAL))
+    AstrCopy(comp.label,Gets(self.gadgetList[ BEVELGAD_LABEL ],STRINGA_TEXTVAL))
     AstrCopy(comp.name,Gets(self.gadgetList[ BEVELGAD_NAME ],STRINGA_TEXTVAL))
     comp.fillPen:=self.tmpFillPen
     comp.textPen:=self.tmpTextPen
@@ -479,22 +493,7 @@ EXPORT PROC createPreviewObject(scr) OF bevelObject
 
     IF self.previewObject=0 THEN self.previewObject:=self.createErrorObject(scr)
 
-    self.previewChildAttrs:=[
-        LAYOUT_MODIFYCHILD, self.previewObject,
-        CHILD_NOMINALSIZE, self.nominalSize,
-        CHILD_NODISPOSE, FALSE,
-        CHILD_MINWIDTH, self.minWidth,
-        CHILD_MINHEIGHT, self.minHeight,
-        CHILD_MAXWIDTH, self.maxWidth,
-        CHILD_MAXHEIGHT, self.maxHeight,
-        CHILD_WEIGHTEDWIDTH, self.weightedWidth,
-        CHILD_WEIGHTEDHEIGHT,self.weightedHeight,
-        CHILD_SCALEWIDTH, self.scaleWidth,
-        CHILD_SCALEHEIGHT, self.scaleHeight,
-        CHILD_NOMINALSIZE, self.nominalSize,
-        CHILD_WEIGHTMINIMUM, self.weightMinimum,
-        IF self.weightBar THEN LAYOUT_WEIGHTBAR ELSE TAG_IGNORE, 1,
-        TAG_END]
+    self.makePreviewChildAttrs(0)
 ENDPROC
 
 EXPORT PROC create(parent) OF bevelObject
@@ -574,6 +573,11 @@ EXPORT PROC genCodeProperties(srcGen:PTR TO srcGen) OF bevelObject
   IF self.transparent THEN srcGen.componentProperty('BEVEL_Transparent','TRUE',TRUE)
 ENDPROC
 
+EXPORT PROC genCodeChildProperties(srcGen:PTR TO srcGen) OF bevelObject
+  srcGen.componentAddChildLabel(self.label)
+  SUPER self.genCodeChildProperties(srcGen)
+ENDPROC
+
 EXPORT PROC getTypeName() OF bevelObject
   RETURN 'Bevel'
 ENDPROC

diff --git a/bitmapObject.e b/bitmapObject.e
@@ -22,7 +22,7 @@ OPT MODULE, OSVERSION=37
 
 EXPORT DEF errorState
 
-EXPORT ENUM BITMAPGAD_IDENT, BITMAPGAD_LEFTEDGE, BITMAPGAD_TOPEDGE,
+EXPORT ENUM BITMAPGAD_IDENT, BITMAPGAD_LABEL, BITMAPGAD_LEFTEDGE, BITMAPGAD_TOPEDGE,
             BITMAPGAD_WIDTH, BITMAPGAD_HEIGHT, BITMAPGAD_SOURCEFILE, BITMAPGAD_MASKING, 
       BITMAPGAD_OK, BITMAPGAD_CHILD, BITMAPGAD_CANCEL
 
@@ -86,6 +86,17 @@ PROC create() OF bitmapSettingsForm
         LABEL_TEXT, 'Identifier',
       LabelEnd,
 
+      LAYOUT_ADDCHILD, self.gadgetList[ BITMAPGAD_LABEL ]:=StringObject,
+        GA_ID, BITMAPGAD_LABEL,
+        GA_RELVERIFY, TRUE,
+        GA_TABCYCLE, TRUE,
+        STRINGA_MAXCHARS, 80,
+      StringEnd,
+
+      CHILD_LABEL, LabelObject,
+        LABEL_TEXT, '_Label',
+      LabelEnd,
+
       LAYOUT_ADDCHILD, LayoutObject,
         LAYOUT_ORIENTATION, LAYOUT_ORIENT_HORIZ,
 
@@ -228,6 +239,7 @@ PROC editSettings(comp:PTR TO bitmapObject) OF bitmapSettingsForm
   self.bitmapObject:=comp
 
   SetGadgetAttrsA(self.gadgetList[ BITMAPGAD_IDENT ],0,0,[STRINGA_TEXTVAL,comp.ident,0])
+  SetGadgetAttrsA(self.gadgetList[ BITMAPGAD_LABEL ],0,0,[STRINGA_TEXTVAL,comp.label,0])
   SetGadgetAttrsA(self.gadgetList[ BITMAPGAD_SOURCEFILE ],0,0,[GETFILE_FULLFILE,comp.sourceFile,0])
   SetGadgetAttrsA(self.gadgetList[ BITMAPGAD_LEFTEDGE ],0,0,[INTEGER_NUMBER,comp.leftEdge,0])
   SetGadgetAttrsA(self.gadgetList[ BITMAPGAD_TOPEDGE ],0,0,[INTEGER_NUMBER,comp.topEdge,0])
@@ -238,6 +250,7 @@ PROC editSettings(comp:PTR TO bitmapObject) OF bitmapSettingsForm
   res:=self.showModal()
   IF res=MR_OK
     AstrCopy(comp.ident,Gets(self.gadgetList[ BITMAPGAD_IDENT ],STRINGA_TEXTVAL))
+    AstrCopy(comp.label,Gets(self.gadgetList[ BITMAPGAD_LABEL ],STRINGA_TEXTVAL))
     AstrCopy(comp.sourceFile,Gets(self.gadgetList[ BITMAPGAD_SOURCEFILE ],GETFILE_FULLFILE),255)
     comp.leftEdge:=Gets(self.gadgetList[ BITMAPGAD_LEFTEDGE ],INTEGER_NUMBER)
     comp.topEdge:=Gets(self.gadgetList[ BITMAPGAD_TOPEDGE ],INTEGER_NUMBER)
@@ -262,22 +275,7 @@ EXPORT PROC createPreviewObject(scr) OF bitmapObject
   IF self.previewObject=0 THEN self.previewObject:=self.createErrorObject(scr)
   errorState:=FALSE
 
-  self.previewChildAttrs:=[
-    LAYOUT_MODIFYCHILD, self.previewObject,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_NODISPOSE, FALSE,
-    CHILD_MINWIDTH, self.minWidth,
-    CHILD_MINHEIGHT, self.minHeight,
-    CHILD_MAXWIDTH, self.maxWidth,
-    CHILD_MAXHEIGHT, self.maxHeight,
-    CHILD_WEIGHTEDWIDTH, self.weightedWidth,
-    CHILD_WEIGHTEDHEIGHT,self.weightedHeight,
-    CHILD_SCALEWIDTH, self.scaleWidth,
-    CHILD_SCALEHEIGHT, self.scaleHeight,
-    CHILD_NOMINALSIZE, self.nominalSize,
-    CHILD_WEIGHTMINIMUM, self.weightMinimum,
-    IF self.weightBar THEN LAYOUT_WEIGHTBAR ELSE TAG_IGNORE, 1,
-    TAG_END]
+  self.makePreviewChildAttrs(0)
 ENDPROC
 
 EXPORT PROC create(parent) OF bitmapObject
@@ -325,6 +323,11 @@ EXPORT PROC genCodeProperties(srcGen:PTR TO srcGen) OF bitmapObject
   IF self.masking THEN srcGen.componentProperty('BITMAP_Masking','TRUE',FALSE)
 ENDPROC
 
+EXPORT PROC genCodeChildProperties(srcGen:PTR TO srcGen) OF bitmapObject
+  srcGen.componentAddChildLabel(self.label)
+  SUPER self.genCodeChildProperties(srcGen)
+ENDPROC
+
 EXPORT PROC getTypeName() OF bitmapObject
   RETURN 'BitMap'
 ENDPROC