addShowMenuItemPane with multiple buttons

Author: EdoFro

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

@@ -118,7 +118,7 @@ class ToM{
                     }
                     break
                 case styles.showMenu:
-                    addShowMenuItemPane(myPanel, tutNode.children)
+                    addShowMenuItemPane(myPanel, tutNode.children, options)
                     break
                 case styles.toc:
                     addTOCPane(myPanel, tutNode)
@@ -253,14 +253,22 @@ class ToM{
         myP.add(nextButtonPanel, tomui.GBC)
     }
 
-    def static addShowMenuItemPane(myP, nodos){
+    def static addShowMenuItemPane(myP, nodos, options){
         nodos.findAll{n -> toma.hasAction(n)}.each{nodo ->
             def infoAccion  = toma.getActionInfoMap(nodo)
             if (infoAccion){
-                def msgHtml     = infoAccion.instructions
-                def bttnText    = 'Show it in the menu'
-                def bttnToolTip = "Click to see where is ${toma.apos(infoAccion.label)} in Freeplane Menu"
-                def bttnAction  = { e ->
+                def msgHtmlA    = nodo.note?tomui.getHtmlFromNote(nodo, options):null
+                def msgHtmlB    = infoAccion.instructions
+                def msgHtml     = tomui.mergeHtml(msgHtmlA,msgHtmlB)
+                def botones = []
+                def bttnText    
+                def bttnToolTip 
+                def bttnAction  
+                def bttnIcon
+                
+                bttnText    = null //'Show me'
+                bttnToolTip = "Click to see where is ${toma.apos(infoAccion.label)} in Freeplane Menu"
+                bttnAction  = { e ->
                         def bttn = e.source
                         def sel = bttn.isSelected()
                         def bttnPanel = tomui.getButtonPanel(bttn)
@@ -271,12 +279,33 @@ class ToM{
                             bttn.label = 'Close menu'
                             tomui.setNextPagePanelEnabled(myP, false)
                         } else {
-                            bttn.label = 'Show me'
+                            bttn.label = null // 'Show me'
                             if(! tomui.anyCompPending(myP) ) tomui.setNextPagePanelEnabled(myP, true)
                         }
                     }
+                bttnIcon = menuUtils.getMenuItemIcon('IconAction.emoji-1F50D')
+                
+                botones << [bttnText, bttnToolTip, bttnAction, bttnIcon, true]
+                
+                if(withExecute(nodo)){
+                    def enabled = !disableBttn(nodo)
+                    def exeHow  = exeActionsHow(nodo)
+                    bttnText    = null // 'Execute'
+                    bttnToolTip =  "Click to execute the command on the selected nodes"
+                    bttnAction  = { e ->
+                            def bttn = e.source
+                            bttn.setEnabled(enabled)
+                            toma.executeActions([] << infoAccion, exeHow)
+                        }
+                    bttnIcon = menuUtils.getMenuItemIcon('IconAction.launch')
+
+                    botones << [bttnText, bttnToolTip, bttnAction, bttnIcon, true]
+                }
 
-                def buttonPanel = tomui.createButtonPanel(msgHtml,bttnText,bttnToolTip, bttnAction, true)
+                
+                def buttonPanel = tomui.createButtonPanel(msgHtml, botones)
+                
+                
                 buttonPanel.metaClass.pending = false
                 myP.add(buttonPanel, tomui.GBC)
             } else {
@@ -285,6 +314,12 @@ class ToM{
             }
         }
     }
+    
+    def static withExecute( ApiNode nodo){
+        return nodo.icons.icons.contains('emoji-1F525')
+    }
+    
+    
 
     def static addGotoPane(myP, ApiNode tNode, ApiNode backNode, options){
         backNode = withGoBack(tNode)?backNode:null

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

@@ -12,6 +12,7 @@ import java.awt.Insets
 import java.awt.GridBagConstraints
 import java.awt.Dimension
 import java.awt.GridBagLayout
+import java.awt.GridLayout
 import java.awt.Point
 import java.awt.event.*
 
@@ -263,7 +264,12 @@ class ToM_ui{
     }
 
 // genera panel con botón
-    def static createButtonPanel(htmlMsg, buttonLabel, buttonToolTip, buttonAction, boolean isToggleButton = false){
+    def static createButtonPanel(String htmlMsg, buttonLabel, buttonToolTip, buttonAction, boolean isToggleButton = false){
+        def botones = [] << [buttonLabel, buttonToolTip, buttonAction, null, isToggleButton]
+        createButtonPanel(htmlMsg, botones)
+    }
+
+    def static createButtonPanel(String htmlMsg, botones){
         def panel = swing.panel(
             border      : new LineBorder(Color.gray, 1),
             name        : myButtonPanelName,
@@ -279,33 +285,45 @@ class ToM_ui{
                     constraints : CENTER,
                     clientProperties: [(JEditorPane.HONOR_DISPLAY_PROPERTIES):true]
               )
-              vbox(constraints:SOUTH) {
+            if(botones.size()>0){
+                panel(
+                    constraints:EAST,
+                    background: Color.white,
+                ) {
+                    borderLayout()
                     panel(
-                           // border      : new LineBorder(Color.black, 1),
-                            border      : new EmptyBorder(2, 10, 2, 10),  // <------- éste
-                            //border: new CompoundBorder(new LineBorder(Color.red, 1),new EmptyBorder(5, 10, 5, 10))  // éste es de prueba poder ver el borde
-                            //insets      : new Insets(30,10,30,10),
-                        ) {
-                            borderLayout()
-                            if (isToggleButton){
+                        constraints:SOUTH,
+                        background: Color.white,
+                       // // border      : new LineBorder(Color.black, 1),
+                        border      : new EmptyBorder(2, 2, 2, 2),  // <------- éste
+                        // //border: new CompoundBorder(new LineBorder(Color.red, 1),new EmptyBorder(5, 10, 5, 10))  // éste es de prueba poder ver el borde
+                        // //insets      : new Insets(30,10,30,10),
+                    ) {
+                        gridLayout(new GridLayout(0,1))
+                        botones.each{ b ->
+                            if ( b[4] == true ){
                                 toggleButton(
-                                    label       : buttonLabel,
-                                    constraints : EAST,
-                                    margin      : new Insets(10,15,10,15),
-                                    toolTipText : buttonToolTip,
-                                    actionPerformed : buttonAction,
+                                    label       :  b[0],
+                                    // constraints : EAST,
+                                    margin      : new Insets(3,6,3,6),
+                                    toolTipText : b[1],
+                                    actionPerformed : b[2],
+                                    icon            : b[3],
                                 )
                             } else {
                                 button(
-                                    label       : buttonLabel,
-                                    constraints : EAST,
-                                    margin      : new Insets(10,15,10,15),
-                                    toolTipText : buttonToolTip,
-                                    actionPerformed : buttonAction,
+                                    label       : b[0],
+                                    // constraints : EAST,
+                                    margin      : new Insets(3,6,3,6),
+                                    toolTipText : b[1],
+                                    actionPerformed : b[2],
+                                    icon            : b[3],
                                 )
                             }
                         }
-              }
+                    }
+                }
+            }
         }
         return panel
     }