Skip to content

Commit c03a1bf

Browse files
committed
correctin texts for buttons labels and tooltips
1 parent 4c0ffda commit c03a1bf

1 file changed

Lines changed: 10 additions & 10 deletions

File tree

Tutorial-o-Matic/src/main/groovy/ToM.groovy

Lines changed: 10 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -332,8 +332,8 @@ class ToM{
332332
nodos.findAll{n -> n.link.node?true:false}.each{nodo ->
333333
def targetNode = nodo.link.node
334334
def msgHtml = nodo.note?tomui.getHtmlFromNote(nodo, options):null
335-
def bttnText = nodo.text
336-
def bttnToolTip = "Click to go to '${bttnText}' section"
335+
def bttnText = nodo.htmlText
336+
def bttnToolTip = "Click to go to '${nodo.plainText.replace('\n',' ')}' section"
337337
def bttnAction = { e ->
338338
if(targetNode.style.name == styles.tutorial){
339339
def tutorialTabName = targetNode[attributeTabLabel] ?: defaultTabLabel
@@ -362,7 +362,7 @@ class ToM{
362362
def static addReturnPane(myP, ApiNode backNode){
363363
def msgHtml = "Return to '${backNode.text}' page"
364364
def bttnText = 'go back'
365-
def bttnToolTip = "Click to go to '${backNode.text}' section"
365+
def bttnToolTip = "Click to go to '${backNode.plainText.replace('\n',' ')}' section"
366366
def bttnAction = { e -> fillPage(myP, backNode, true, true)}
367367
def buttonPanel = tomui.createButtonPanel(msgHtml,bttnText,bttnToolTip, bttnAction, false)
368368
myP.add(buttonPanel, tomui.GBC)
@@ -372,8 +372,8 @@ class ToM{
372372
def nodos = tNode.children.findAll{ n -> isValidUri(n.link?.uri) || isValidUri(n[attributeNewPageLink].uri)}
373373
nodos.each{nodo ->
374374
def msgHtml = nodo.note?tomui.getHtmlFromNote(nodo, options):null
375-
def bttnText = nodo.text
376-
def bttnToolTip = "Click to go to '${bttnText}' section"
375+
def bttnText = nodo.htmlText
376+
def bttnToolTip = "Click to go to '${nodo.plainText.replace('\n',' ')}' section"
377377
def bttnAction = { e ->
378378
openTutorialPage(nodo)
379379
}
@@ -416,7 +416,7 @@ class ToM{
416416
def static getGroovyHtml( ApiNode nodo, script){
417417
def showScript = nodo.icons.icons.contains('emoji-1F50D') || nodo.icons.icons.contains('emoji-1F453')
418418
uiMsg("showScript ${showScript}")
419-
def html = showScript? tomui.getHtmlFromGroovyNode(nodo, script) : nodo.text
419+
def html = showScript? tomui.getHtmlFromGroovyNode(nodo, script) : nodo.htmlText
420420
uiMsg("html ${html}")
421421
return html
422422
}
@@ -589,9 +589,9 @@ class ToM{
589589
def static addShowNodePane(myP, ApiNode nodo){
590590
def nodos = nodo.children.findAll{ n -> n.link && (n.link.node || (!n.link.node && !n.link.file && n.link.uri.scheme == 'file'))}
591591
nodos.each{ n ->
592-
def msgHtml = "Click to show ${n.text}"
592+
def msgHtml = "Click to show ${n.plainText.replace('\n',' ')}"
593593
def bttnText = "goto Node"
594-
def bttnToolTip = "Click to show ${n.text}"
594+
def bttnToolTip = "Click to show ${n.plainText.replace('\n',' ')}"
595595
def bttnAction
596596
if(n.link.node){
597597
bttnAction = { e ->
@@ -623,7 +623,7 @@ class ToM{
623623
def titleNodes = getNewPageNodes(getTutorialNode(nodo))
624624
def pane = tomui.createEmptyGridBagPanel()
625625
titleNodes.each{ tn ->
626-
def title = tn.text
626+
def title = tn.htmlText
627627
def bttnAction = { e -> fillPage(myP, tn, true, true) }
628628
def button = tomui.createButton(title, bttnAction)
629629
pane.add(button, tomui.GBC)
@@ -638,7 +638,7 @@ class ToM{
638638
def pre = nodosTutoriales.size() == 0 ? "No t" : "T"
639639
addPageTitle(myP, "${pre}utorials present in '${mapa.name}' map".toString())
640640
nodosTutoriales.each{ nT ->
641-
def title = nT.text
641+
def title = nT.htmlText
642642
def bttnAction = { e ->
643643
def tutNodes = getTutNodes(nT)
644644
if(tutNodes) {

0 commit comments

Comments
 (0)