added getGroovyHtml

EdoFro · EdoFro · commit 189da8cdb3fe · 2021-11-09T20:32:58.000-03:00
diff --git a/Tutorial-o-Matic/src/main/groovy/ToM.groovy b/Tutorial-o-Matic/src/main/groovy/ToM.groovy
@@ -264,9 +264,9 @@ class ToM{
         nodoT.children.findAll{n -> WSE.isGroovyNode(n)}.each{nodo ->
             def script = WSE.scriptFromNode(nodo)
             if (script){
-                def scrText     = script + "\n c.statusInfo = '---- script executed ----'".toString()
-                def msgHtml     = nodo.text //TODO: mejorar texto
-                def bttnText    = 'Execute script'
+                def scrText     = script + "\n c.statusInfo = '---- ready ----'".toString()
+                def msgHtml     = getGroovyHtml(nodo, script)
+                def bttnText    = 'Execute'
                 def bttnToolTip = "Click to execute script on selected nodes"
                 def bttnAction  = { e ->
                         def bttn = e.source
@@ -284,6 +284,14 @@ class ToM{
         }
     }
     
+    def static getGroovyHtml(nodo, script){
+        def showScript = nodo.icons.icons.contains('emoji-1F50D')
+        uiMsg("showScript ${showScript}")
+        def html = showScript? tomui.getHtmlFromGroovyNode(nodo, script) : nodo.text
+        uiMsg("html ${html}")
+        return html
+    }
+    
     def static addActionPane(myP, nodo){
         def infoAcciones = []
         nodo.children.findAll{n -> toma.hasAction(n)}.each{n ->
diff --git a/Tutorial-o-Matic/src/main/groovy/ToM_ui.groovy b/Tutorial-o-Matic/src/main/groovy/ToM_ui.groovy
@@ -40,6 +40,22 @@ class ToM_ui{
     static final String myPaneName        = 'myContentPanel'
     static final String myButtonPanelName = 'aButtonPane'
     static final String myNextPanelName   = 'nextPane'
+    static final String htmlStyle         =
+        """
+            table {border: 0; border-spacing: 0;}
+            th, td {border: 1px solid;}
+            pre {
+                background-color: rgb(230, 230, 230);
+                border: 1px solid rgb(0, 0, 0);
+                display: block;
+                padding: 10px;
+            }
+            code {
+                font-family: Consolas,"courier new";
+                color: rgb(0, 80, 0);
+            }
+        """
+    
 
     static SwingBuilder swing      = new SwingBuilder()
 
@@ -95,20 +111,7 @@ class ToM_ui{
             case 'markdown':
                 //html = "<html> ${Marked.marked(nodo.note.plain)} </html>"
                 html = """<html>
-                            <style>
-                                table {border: 0; border-spacing: 0;}
-                                th, td {border: 1px solid;}
-                                pre {
-                                    background-color: rgb(230, 230, 230);
-                                    border: 1px solid rgb(0, 0, 0);
-                                    display: block;
-                                    padding: 10px;
-                                }
-                                code {
-                                    font-family: Consolas,"courier new";
-                                    color: rgb(0, 80, 0);
-                                }
-                            </style>
+                            <style>${htmlStyle}</style>
                             <body>
                                 ${Marked.marked(nodo.note.plain)} 
                             </body>
