Changeset 101

Timestamp:

03/05/09 12:45:14 (3 years ago)

Author:

alex

Message:

adressed wrong text position on line. bug in my code was revealed through fixedLineSpace bug in D11

Location:

trunk/lingosource

Files:

• castlib1/subversion_version_field.txt (modified) (1 diff)
• castlib2/Alex_HierMenuParent.ls (modified) (1 diff)
• castlib2/ButtonImageCreator.ls (modified) (1 diff)
• castlib2/ButtonManager.ls (modified) (4 diffs)
• castlib2/GetSetPrefs.ls (modified) (1 diff)
• castlib2/ImageUtilityScripts.ls (modified) (2 diffs)
• castlib2/PseudoXMLPS.ls (modified) (2 diffs)
• castlib2/aleXtrasMovieScript.ls (modified) (2 diffs)
• castlib2/commonMovieScript.ls (modified) (1 diff)

trunk/lingosource/castlib1/subversion_version_field.txt

@@ -1 @@
-r101
+r102

trunk/lingosource/castlib2/Alex_HierMenuParent.ls

@@ -3806 +3806 @@
 on mDrawText me
   
-  obenoffset = pHeaderOffset - (pZeilenhoehe - pMenuProps.getaprop(#myFontsize))/2 + 1 -- 1 -- + 1
+  --  obenoffset = pHeaderOffset - (pZeilenhoehe - pMenuProps.getaprop(#myFontsize))/2 + 1 -- 1 -- + 1
+  obenoffset = pHeaderOffset -- dunno what the above line was about, but it fails now, I guess it is a remnant from "older times"
   
   --  obenoffset = obenoffset - integer(pZeilenhoehe * (pZeilenhoehe / 150.0))

trunk/lingosource/castlib2/ButtonImageCreator.ls

@@ -976 +976 @@
   
   
-  
+  ----------- now just add the property names of the table script and the buttonscript
+  retlist.addProp(#myContent, retlist[#normal])
+  retlist.addProp(#myNormalImage, retlist[#normal])
+  retlist.addProp(#myPressImage, retlist[#pressed])
+  retlist.addProp(#myOverImage, retlist[#hilite])
+  retlist.addProp(#myDisabledImage, retlist[#disabled])
+  retlist.addProp(#mySelectedImage, retlist[#selected])
+  ----------------------------------------------------------
   
   return retlist

trunk/lingosource/castlib2/ButtonManager.ls

@@ -618 +618 @@
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
---
---on getPropertyDescriptionList
---  if the currentspritenum = 0 then exit
---  liste = [:]
---  fontliste = call(#InitFonts, [pIncludes.getaprop(#commonmoviescript)])
---  if not listP(fontliste) then fontliste = ["Arial"]
---  
---  liste[#pCallFunction] = [#default:#funktion, #format:#symbol, #comment:"Event to sendAllSprites:"]
---  liste[#pBroadcastSprites] = [#format:#list, #default:[], #comment:"Send event to: ([] = All, [-1] = Moviescript, [0] = this Sprite)"]
---  liste[#pEventsToProcess] = [#format:#list, #default:[#mouseUp], #comment:"Which events to process:"]
---  liste[#pKeyboardshortcut] = [#default:"", #format:#string, #comment:"Keyboardshortcut:"]
---  
---  liste[#pLabel] = [#default:"Label", #format:#string, #comment:"Labeltext:"]
---  
---  liste[#pFarbe] = [#default:rgb(170,170,170),#format:#color,#comment: "Color:"]
---  liste[#pBevel] = [#default:"1 - Small Bevel", #format:#string, #range:["0 - No Bevel","1 - Small Bevel", "2 - Normal Bevel","3 - Large Bevel"], #comment:"Bevel:"]
---  liste[#pUseMember] = [#default:"myAquaButton", #format:#string, #comment:"Use prepared members based on name:"]
---  
---  liste[#pSaveImgs] = [#default:0, #format:#integer, #comment:"Save text images to which castlib (0 = dont save)"]
---  
---  liste[#pUseDefaultLayout] = [#default:0, #format:#boolean, #comment:"Use global layout settings from handler mGetDefaultButtonList()"]
---  liste[#pDefaultLayoutPreset] = [#default:"", #format:#string, #comment:"layout preset (only used when global layout = 1)"]
---  
---  liste[#pMarginH] = [#format:#integer, #default:20, #range:[#min:0, #max:30], #comment:"Margin horiz.:"]
---  liste[#pMarginV] = [#format:#integer, #default:10, #range:[#min:0, #max:20], #comment:"Margin vert.:"]
---  
---  liste[#pRotation] = [#format:#integer, #default:0, #range:[#min:0, #max:360], #comment:"Rotation:"]
---  
---  liste[#pFont] = [#format:#string, #default:fontliste[1], #range:fontliste, #comment:"Font:"]
---  liste[#pFontGroesse] = [#format:#integer, #default:10, #range:[#min:7, #max:36], #comment:"Fontsize:"]
---  liste[#pFontFarbe] = [#default:rgb(0,0,0),#format:#color,#comment: "Fontcolor"]
---  liste[#pFontHLFarbe] = [#default:rgb(0,0,0),#format:#color,#comment: "Font highlight color"]
---  liste[#pFontAA] = [#default:0,#format:#boolean,#comment: "Font Anti-Aliasing"]
---  liste[#pEnabled] = [#default:true, #format:#boolean, #comment:"Initially enabled ?"]
---  liste[#pDisableBlend] = [#format:#integer, #default:100, #range:[#min:0, #max:100], #comment:"When disabled dim to blend:"]
---  liste[#pStayHilited] = [#default:false, #format:#boolean, #comment:"Stay hilited on mouseLeave while mouse pressed ?"]
---  liste[#pRepeatDownEvent] = [#format:#integer, #default:0, #comment:"Repeat the mouseDown event while the mouse is down every <x> ms"]
---  liste[#pToggle] = [#default:false, #format:#boolean, #comment:"Toggle Button ?"]
---  liste[#pGroupName] = [#default:"", #format:#string, #comment:"Radio button group name:"]
---  liste[#pSelected] = [#default:true, #format:#boolean, #comment:"Initially Selected ?"]
---  return liste
---end
+
+
+-- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
+
+on getPropertyDescriptionList
+  if the currentspritenum = 0 then exit
+  liste = [:]
+  
+  cmonm = mGetXScript()
+  if not voidP(cmonm) then fontliste = call(#InitFonts, cmonm)
+  
+  if not listP(fontliste) then fontliste = ["Arial"]
+  
+  liste[#pCallFunction] = [#default:#funktion, #format:#symbol, #comment:"Event to sendAllSprites:"]
+  liste[#pBroadcastSprites] = [#format:#list, #default:[], #comment:"Send event to: ([] = All, [-1] = Moviescript, [0] = this Sprite)"]
+  liste[#pEventsToProcess] = [#format:#list, #default:[#mouseUp], #comment:"Which events to process:"]
+  liste[#pKeyboardshortcut] = [#default:"", #format:#string, #comment:"Keyboardshortcut:"]
+  
+  liste[#pLabel] = [#default:"Label", #format:#string, #comment:"Labeltext:"]
+  
+  liste[#pFarbe] = [#default:rgb(170,170,170),#format:#color,#comment: "Color:"]
+  liste[#pBevel] = [#default:"1 - Small Bevel", #format:#string, #range:["0 - No Bevel","1 - Small Bevel", "2 - Normal Bevel","3 - Large Bevel"], #comment:"Bevel:"]
+  liste[#pUseMember] = [#default:"myAquaButton", #format:#string, #comment:"Use prepared members based on name:"]
+  
+  liste[#pSaveImgs] = [#default:0, #format:#integer, #comment:"Save text images to which castlib (0 = dont save)"]
+  
+  liste[#pUseDefaultLayout] = [#default:0, #format:#boolean, #comment:"Use global layout settings from handler mGetDefaultButtonList()"]
+  liste[#pDefaultLayoutPreset] = [#default:"", #format:#string, #comment:"layout preset (only used when global layout = 1)"]
+  
+  liste[#pMarginH] = [#format:#integer, #default:20, #range:[#min:0, #max:30], #comment:"Margin horiz.:"]
+  liste[#pMarginV] = [#format:#integer, #default:10, #range:[#min:0, #max:20], #comment:"Margin vert.:"]
+  
+  liste[#pRotation] = [#format:#integer, #default:0, #range:[#min:0, #max:360], #comment:"Rotation:"]
+  
+  liste[#pFont] = [#format:#string, #default:fontliste[1], #range:fontliste, #comment:"Font:"]
+  liste[#pFontGroesse] = [#format:#integer, #default:10, #range:[#min:7, #max:36], #comment:"Fontsize:"]
+  liste[#pFontFarbe] = [#default:rgb(0,0,0),#format:#color,#comment: "Fontcolor"]
+  liste[#pFontHLFarbe] = [#default:rgb(0,0,0),#format:#color,#comment: "Font highlight color"]
+  liste[#pFontAA] = [#default:0,#format:#boolean,#comment: "Font Anti-Aliasing"]
+  liste[#pEnabled] = [#default:true, #format:#boolean, #comment:"Initially enabled ?"]
+  liste[#pDisableBlend] = [#format:#integer, #default:100, #range:[#min:0, #max:100], #comment:"When disabled dim to blend:"]
+  liste[#pStayHilited] = [#default:false, #format:#boolean, #comment:"Stay hilited on mouseLeave while mouse pressed ?"]
+  liste[#pRepeatDownEvent] = [#format:#integer, #default:0, #comment:"Repeat the mouseDown event while the mouse is down every <x> ms"]
+  liste[#pToggle] = [#default:false, #format:#boolean, #comment:"Toggle Button ?"]
+  liste[#pNoIcon] = [#default:false, #format:#boolean, #comment:"Don't use checkbox icon for toggle button"]
+  liste[#pGroupName] = [#default:"", #format:#string, #comment:"Radio button group name:"]
+  liste[#pSelected] = [#default:true, #format:#boolean, #comment:"Initially Selected ?"]
+  
+  return liste
+end
 
 -- xxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxxx
@@ -748 +756 @@
   pOptionsListe[#keyboardshortcut] = pKeyboardshortcut
   
+  -- further properties known to this script (3-D only):
+  -- #renderformat ; default rgba8880 for images without alpha and rgba8888 for images with alpha
+  -- #useModel ; use the model with the name specified by #useModel (String) instead of an overlay (-> default)
+  
   sendSprite(me.spritenum, #mButtonManager_OverrideOptions, pOptionsListe)
 end
@@ -772 +784 @@
   -- INPUT: <options> ; property list ; huge number of properties describing the button, most of which comes from mGetDefaultButtonList()
   --                    see script "defaultLayoutDefinitions" for all properties, which are available for the layout of the button
-  --                see the below example for the porperties concerning this script:
+  --                see the below example for the properties concerning this script
+  --                see handler "mInitProps" in this script for properties too
   -- RETURNS: -
   -- CALLER: -
@@ -836 +849 @@
   tabname = options.getaprop(#myName)
   
-  if voidP(tabname) then -- Sonderfall: ohne name loescht ALLE vorherigen tabellen
+  if voidP(tabname) then -- Exception!: buttons without a name replaces ALL buttons
     tabname = "button1"
     

trunk/lingosource/castlib2/GetSetPrefs.ls

@@ -179 +179 @@
 --    delete line 1 of prefsText
     
-    gPrefs = call(#mGetListFromXMLString, mGetXScript(#PseudoXMLPS), prefsText)
+    gPrefs = call(#mGetListFromXMLStringX, mGetXScript(#PseudoXMLPS), prefsText)
     if objectP(gPrefs) then globs[#gPrefs] = gPrefs
     

trunk/lingosource/castlib2/ImageUtilityScripts.ls

@@ -305 +305 @@
   if ft = 32 then
     maske = img.extractalpha()
-    maskImg = image(breite, hoehe, 32) -- 32 bit is twice as fast on the mac ???!!! and can be used as mask also
+    maskImg = image(breite, hoehe, 8, #grayscale) -- 32 bit is twice as fast on the mac ???!!! and can be used as mask also
     usemask = 1
   else
@@ -311 +311 @@
   end if
   
-  tempImg = image(breite, hoehe, origft, img.usealpha, img.paletteref)
+  tempImg = image(breite, hoehe, origft, 0, img.paletteref)
   if usemask then img.useAlpha = 0
   

trunk/lingosource/castlib2/PseudoXMLPS.ls

@@ -757 +757 @@
   
   if val.length = 7 then
-    if (val.char[1] = "#") and (offset(val.char[2], "abcdef0123456789") > 0) then return rgb(val)
+    if (val.char[1] = "#") then
+      isColor = 1
+      repeat with n = 2 to 7
+        if (offset(val.char[n], "abcdef0123456789") < 1) then
+          isColor = 0
+          exit repeat
+        end if
+      end repeat
+      if isColor = 1 then return rgb(val)
+    end if
   end if 
   
@@ -1186 +1195 @@
 
 on mGetListFromPListString me, str
-  return mConvertKeyList(me, mGetListFromXMLString(me, str, 0))
+  return mConvertKeyList(me, mGetListFromXMLStringX(me, str, 0))
 end
 

trunk/lingosource/castlib2/aleXtrasMovieScript.ls

@@ -49 +49 @@
       halt
     end if
+    
+    if voidP(cms.script) then -- strangely enough this happened suddenly, dunno why...
+      -- until now it happened only in authoring with the stopped movie
+      -- therefore I just exit here without alert
+      halt
+    end if
+    
     alextras = rawnew(cms.script)
     if ilk(alextras) <> #instance then
@@ -55 +62 @@
     end if
     (script "aleXtrasMovieScript").pAleXtras = alextras
+    
   end if
   return alextras

trunk/lingosource/castlib2/commonMovieScript.ls

@@ -387 +387 @@
   --         ACTION: Create/Get timeout object
   --                 This handler works the same with the old player <10 and the new player >=10
-  --         INPUT: ||ÊtheName     || string  || name for new timeout object||
-  --                ||ÊtheDuration || integer || timeout perios in milliseconds||
+  --         INPUT: || theName     || string  || name for new timeout object||
+  --                || theDuration || integer || timeout perios in milliseconds||
   --                || theHandler  || symbol  || handler to be called on each timepout event||
   --                || theTarget   || object  || object to be sent the timeout event <theHandler>||