Skip to content

Commit

Permalink
7.2.1rc1
Browse files Browse the repository at this point in the history
Fixes:
#27
#26
#24

Updates:
#19
  • Loading branch information
gcanyon committed Jan 27, 2019
1 parent 415fef3 commit 3ad9e9f
Show file tree
Hide file tree
Showing 7 changed files with 64 additions and 33 deletions.
Binary file modified Navigator.rev
Binary file not shown.
9 changes: 6 additions & 3 deletions Navigator_Behaviors/rev_b_propListPopup.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -6,16 +6,19 @@ local idList
local customPropertyB

on menuPick pWhich
-- put valueMenu,propertyName,idList,customPropertyB,customPropertySetName
if valueMenu then
dispatch "setValue" to fld "editProps" with pWhich
else
put line (the menuHistory of me) of idList into tID
if customPropertyB is true then set the custompropertySet of tID to customPropertySetName
dispatch "setValue" to fld "editProps" with the propertyName of tID
if customPropertyB is true
then put value(merge("the [[customPropertySetName]][ [[quote]][[propertyName]][[quote]]] of [[tID]]")) into propValue
else put the propertyName of tID into propValue
dispatch "setValue" to fld "editProps" with propValue
end if
end menuPick



on doSetup pvalueMenu,ppropertyName,pidList,pcustomPropertyB,pcustomPropertySetName
put pvalueMenu into valueMenu
put ppropertyName into propertyName
Expand Down
4 changes: 2 additions & 2 deletions Navigator_Behaviors/rev_c_card_id_1002.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -37,7 +37,7 @@ on getPrefs
set the text of button "colorset" to BT & "Save Current..."

-- Display Options
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes"
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes,FoldDataGrids"
set the highlight of btn P to the P of navID
end repeat
put the fontNames into FN
Expand Down Expand Up @@ -108,7 +108,7 @@ on setPrefs
repeat for each line navID in navIDList

-- Display Options
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes"
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes,FoldDataGrids"
set the P of navID to the highlight of btn P
end repeat
set the hGrid of fld "list" of navID to the highlight of btn "showListLines"
Expand Down
44 changes: 29 additions & 15 deletions Navigator_Behaviors/rev_f_editProps.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -21,13 +21,18 @@ on mouseDown
-- do values popup here
put the cSourceID of me into tSourceID
put the cCustomProperties of me into customPropertyB
put the sProp of tSourceID into tIDVal
put the cCustomPropertySet of me into pCustomPropertySet
if customPropertyB
then put value(merge("the [[pCustomPropertySet]][ [[quote]][[sProp]][[quote]]] of [[tSourceID]]")) into tIDVal
else put the sProp of tSourceID into tIDVal
if not customPropertyB and tIDVal is empty then put the effective sProp of tSourceID into tIDVal
put tSourceID into valToID[tIDVal]
put truncateString(tIDVal,30) into tIDtoVal[tSourceID]
put -1 into tIDAddCount[tSourceID]
repeat for each line tID in the cIDList of me
put the sProp of tID into tIDVal
if customPropertyB
then put value(merge("the [[pCustomPropertySet]][ [[quote]][[sProp]][[quote]]] of [[tID]]")) into tIDVal
else put the sProp of tID into tIDVal
if not customPropertyB and tIDVal is empty then put the effective sProp of tID into tIDVal
if valToID[tIDVal] is empty then
put tID into valToID[tIDVal]
Expand Down Expand Up @@ -100,12 +105,16 @@ on mouseUp
set the uID of group "editContents" to the long id of me
put the cSourceID of me into tID

if the cCustomProperties of me is true then set the customPropertySet of tID to (the cCustomPropertySet of me)

put the sProp of tID into tDefaultVal
if the cCustomProperties of me is true then
--set the customPropertySet of tID to (the cCustomPropertySet of me)
put the cCustomPropertySet of me into pCustomPropertySet
put value(merge("the [[pCustomPropertySet]][ [[quote]][[sProp]][[quote]]] of [[tID]]")) into tDefaultVal
else
put the sProp of tID into tDefaultVal
end if
set the uDialogText of group "editContents" to tDefaultVal
dispatch "showMe" to group "editContents" with true,(sProp is "htmlText"),(the cCustomProperties of me is false and sProp is among the lines of the oneLiners of stack "revNavigator")

--put value(the clickline)
end mouseUp

Expand All @@ -118,17 +127,22 @@ on resultMessage pText
end resultMessage

on setValue pText
repeat for each line tID in the cIDList of me
if the cCustomProperties of me is true
then set the customPropertySet of tID to (the cCustomPropertySet of me)
else put 1 into typeList[word 1 of tID]

set the sProp of tID to pText
end repeat
if the cCustomProperties of me is false then setRecentProp (the keys of typeList),sProp

put the cCustomPropertySet of me into pCustomPropertySet
if the cCustomProperties of me is true then
repeat for each line tID in the cIDList of me
do merge("set the [[pCustomPropertySet]][ [[quote]][[sProp]][[quote]]] of [[tID]] to [[pText]]")
end repeat
else
repeat for each line tID in the cIDList of me
add 1 to typeList[word 1 of tID]

set the sProp of tID to pText
end repeat
setRecentProp (the keys of typeList),sProp
end if
set the itemDelimiter to tab
put line 1 of pText into item 2 of line sWhichLine of me
updateDisplay ,true
end setValue

on scrollbardrag
Expand Down
11 changes: 9 additions & 2 deletions Navigator_Behaviors/rev_g_editProps.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -84,19 +84,26 @@ on showProps pID,pIDList,pPropList,pCustomProperties,pCustomPropertySet
put false into allSame
exit repeat
end repeat
else
else if (not pCustomProperties) or pCustomPropertySet is empty then
put the P of pID into pIDP
repeat for each line tID in pIDList
if the P of tID is pIDP then next repeat
put false into allSame
exit repeat
end repeat
else
put value(merge("the [[pCustomPropertySet]][ [[quote]][[P]][[quote]]] of [[pID]]")) into pIDP
repeat for each line tID in pIDList
if value(merge("the [[pCustomPropertySet]][ [[quote]][[P]][[quote]]] of [[tID]]")) is pIDP then next repeat
put false into allSame
exit repeat
end repeat
end if
put pIDP is empty and pCustomProperties is not true into effectiveB
if effectiveB
then put line 1 of the effective P of pID into tProp
else put line 1 of pIDP into tProp
if P is "htmlText" then put char 4 to -4 of tProp into tProp
if (pCustomProperties is not true) and P is "htmlText" then put char 4 to -4 of tProp into tProp
put tag[1] & P & tag[2][effectiveB][allSame] & tProp & tag[3][effectiveB][allSame] after tHTML
end repeat
-- if tHTML is empty then put empty into fld "editProps" of me else
Expand Down
27 changes: 17 additions & 10 deletions Navigator_Behaviors/rev_s_revNavigator.livecodescript
Original file line number Diff line number Diff line change
Expand Up @@ -252,7 +252,7 @@ function prefsText
end repeat

-- Display Options
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes,pDefaultFold,pObjectLimit,pMenuLimit"
repeat for each item P in "ColorScriptedObjects,AutoUpdateList,AutoUpdateSelection,namedObjectsOnly,scriptedObjectsOnly,showListLines,EditorsAsPalettes,pDefaultFold,pObjectLimit,pMenuLimit,FoldDataGrids"
put prefsLine(P,navID) after R
end repeat
put prefsLine("textFont",the long id of fld "list" of navID) after R
Expand Down Expand Up @@ -463,12 +463,11 @@ on setFoldDepth tContainer,tDepth
put the long id of tContainer into tContainerID
if not (word 1 of tContainerID is among the items of "group,card") then exit setFoldDepth
if word 1 of tContainerID is "group" then setFolded tContainerID,(tDepth = 0)
repeat with i = 1 to the number of controls of tContainerID
put the long id of control i of tContainerID into tID
put the number of words of tContainerID into tContainerWordCount
repeat for each line shortID in the controlIDs of tContainerID
put the long id of control id shortID of tContainerID into tID
if word 1 of tID is not "group" then next repeat
put tID into tDepthCount
replace tContainerID with empty in tDepthCount
put (the number of words of tDepthCount) div 4 into tDepthCount
put ((the number of words of tID) - tContainerWordCount) div 4 into tDepthCount
if tDepthCount < tDepth then setFolded tID,false
else if tDepthCount = tDepth then setFolded tID,true
end repeat
Expand Down Expand Up @@ -660,6 +659,7 @@ on doUpdateDisplay pForceUpdate,pRetainHilites,pAllStacks,pSoStacks

put the NamedObjectsOnly of this stack into tNamedObjectsOnly
put the ScriptedObjectsOnly of this stack into tScriptedObjectsOnly
put the FoldDataGrids of this stack into tFoldDataGrids
put the uDisplay of this stack into tDisplay
put tDisplay contains "tIS" into isTis
put the ColorScriptedObjects of this stack into tCheckScripts
Expand Down Expand Up @@ -719,9 +719,16 @@ on doUpdateDisplay pForceUpdate,pRetainHilites,pAllStacks,pSoStacks
add 1 to tCurrentLine
put tNavTarget into newLineArray[tCurrentLine]
put tCurrentLine into newIDArray[tNavTarget]
if tNavTarget is not among the lines of lastNavTarget and the pDefaultFold of stack tThisStack is not "Show All"
then setFoldDepth tNavTarget,(the pDefaultFold of stack tThisStack)

if tNavTarget is not among the lines of lastNavTarget then
if the pDefaultFold of stack tThisStack is not "Show All" then setFoldDepth tNavTarget,(the pDefaultFold of stack tThisStack)
if tFoldDataGrids then
repeat for each line shortID in the controlIDs of tNavTarget
put the long id of control id shortID of tNavTarget into tID
if word 1 of tID is "group" and the dgProps["allow editing"] of tID is not empty
then setFolded tID,true
end repeat
end if
end if
if navTitle is empty then put "Nav:" && simpleName(tNavTarget) into navTitle else put "Nav: Multiple Sources" into navTitle
put the number of controls of tNavTarget into tControlCount
else
Expand Down Expand Up @@ -796,7 +803,7 @@ on doUpdateDisplay pForceUpdate,pRetainHilites,pAllStacks,pSoStacks
put tCurrentLine into newIDArray[tID]
put tID into newLineArray[tCurrentLine]
if foldedIDArray[tID] and childControlCount > 0 then
put tColor[1] & tIndentString & tIndent[tCurrentIndentLine] & childControlCount && "folded controls" after tControlList
put tColor[1] & tIndentString & tIndentString & tIndent[tCurrentIndentLine] & "*** " & childControlCount && "folded controls" after tControlList
add 1 to tCurrentLine
put empty into newLineArray[tCurrentLine]
repeat with j = 1 to childControlCount
Expand Down
Loading

0 comments on commit 3ad9e9f

Please sign in to comment.