tab name can now be customized

Author: EdoFro

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

@@ -12,8 +12,19 @@ class TabPane{
 //region: methods
 
     def static removeTab(String tabName, boolean hideTabPane = false){
-        def index   = tabPane.indexOfTab(tabName)
-        //eliminar
+        int index = tabPane.indexOfTab(tabName)
+        //msg("removeTab String - index: $index")
+        removeTab(index, hideTabPane)
+    }
+    
+    def static removeTab(javax.swing.JComponent comp, boolean hideTabPane = false){
+        int index = tabPane.indexOfComponent(comp)
+        //msg("removeTab Component - index: $index")
+        removeTab(index, hideTabPane)
+    }
+    
+    def static removeTab(int index, boolean hideTabPane = false){
+        //msg("removeTab index - index: $index")
         if (index >= 0) {
             tabPane.removeTabAt(index)
             def previousTab = tabPane.hasProperty('previousTab')? tabPane.previousTab : 0
@@ -67,5 +78,9 @@ class TabPane{
     def static repaint(){
         tabPane.repaint()
     }
+    
+    def static msg(texto){
+        ui.informationMessage(texto.toString())
+    }
 //end:
 }

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

@@ -15,10 +15,13 @@ class ToM{
     // region: properties
         // this region has all the properties for the ToM class
 
-    static final String version        = '0.0.4'
-    static final c                     = ScriptUtils.c()
-    static final String tabName        = 'Tutorial'
-    static final String idDictStorage  = 'ToM_idDictionary'
+    static final String version           = '0.0.6'
+    static final c                        = ScriptUtils.c()
+    static final String idDictStorage     = 'ToM_idDictionary'
+    static final String attributeTabLabel = 'ToM_TabLabel'
+    static final String defaultTabLabel   = 'Tutorial'
+    static final String defaultMapTutorialsTabLabel = 'Tutorials'
+
 
     static final Map styles = [
         tutorial  : 'ToM-Tutorial'  ,
@@ -199,7 +202,7 @@ class ToM{
         def tocToolTip   = 'Click to show the Table of Contents of the tutorial'
         def tocBttnAction   = { e -> showTOC(myP,lastNode) }
 
-        def nextButtonPanel = tomui.createNextButtonPanel(tabName, closeLabel, closeToolTip, nextLabel, nextToolTip , bttnAction, tocLabel, tocToolTip, tocBttnAction)
+        def nextButtonPanel = tomui.createNextButtonPanel(closeLabel, closeToolTip, nextLabel, nextToolTip , bttnAction, tocLabel, tocToolTip, tocBttnAction)
         myP.add(nextButtonPanel, tomui.GBC)
     }
 
@@ -513,15 +516,17 @@ class ToM{
                 def bttnAction   = { e ->
                     def tutNodes = getTutNodes(nT)
                     if(tutNodes) {
-                        fillContentPane(myP, tutNodes)
+                        def tutorialTabName = nT[attributeTabLabel] ?: defaultTabLabel
+                        def myP_thisTutorial = tomui.getContentPaneFromMyTab(tutorialTabName.toString(), true)
+                        fillContentPane(myP_thisTutorial, tutNodes)
                     } else {
                         ui.informationMessage( "no tutorial components(nodes) found for tutorial '${nT.text}'".toString() )
                     }
                 }
                 def button = tomui.createButton(title, bttnAction)
                 pane.add(button, tomui.GBC)
             }
-            def stopButton = tomui.createButton('Exit tutorial', {tomui.closeTab(tabName)})
+            def stopButton = tomui.createButton('CLOSE', { e -> tomui.closeTab(e.source)})
             pane.add(stopButton, tomui.GBC)
             myP.add(pane, tomui.GBC)
         } else {
@@ -548,7 +553,8 @@ class ToM{
     }
 
     def static showTutorials(mapa){
-        def myP = tomui.getContentPaneFromMyTab(tabName, true)
+        def tutorialTabName = mapa.root[attributeTabLabel] ?: defaultMapTutorialsTabLabel
+        def myP = tomui.getContentPaneFromMyTab(tutorialTabName.toString(), true)
         myP.removeAll()
         tomui.resizeContentPanel(myP,tomui.maxContentPaneHeigth)
         addTutorialsPane(myP, mapa)

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

@@ -295,7 +295,7 @@ class ToM_ui{
 
 // genera panel close - next page
         //nextButtonAction == null --> no 'Next page' button
-    def static createNextButtonPanel(tabName, closeLabel, closeToolTip, nextLabel, nextToolTip, nextButtonAction, tocLabel = '', tocToolTip = '', tocButtonAction = null ){
+    def static createNextButtonPanel(closeLabel, closeToolTip, nextLabel, nextToolTip, nextButtonAction, tocLabel = '', tocToolTip = '', tocButtonAction = null ){
         def panel = swing.panel(
             //border      : new LineBorder(Color.gray, 1),
             name        : myNextPanelName,
@@ -311,7 +311,7 @@ class ToM_ui{
                             constraints : WEST,
                             margin      : new Insets(10,15,10,15),
                             toolTipText : closeToolTip,
-                            actionPerformed : {closeTab(tabName)},
+                            actionPerformed : { e -> closeTab(e.source) },
                         )
                         if(tocButtonAction /* && nextButtonAction */ ){
                             button(
@@ -415,10 +415,17 @@ class ToM_ui{
 
     //region: other methods
 
-    def static closeTab(tabName, boolean hideTabPane = false) {
+    def static closeTab(String tabName, boolean hideTabPane = false) {
         TabPane.removeTab(tabName, hideTabPane)
     }
 
+    def static closeTab(javax.swing.JComponent comp, boolean hideTabPane = false) {
+        //msg(comp.class)
+        def componente = getScrollPaneViewport(comp).parent
+        //msg(componente.class)
+        TabPane.removeTab(componente, hideTabPane)
+    }
+
     def static setNextPagePanelEnabled(JPanel myP, boolean isEnabled){
         setPanelEnabled(getNextButtonPanel(myP), isEnabled)
     }
@@ -442,6 +449,10 @@ class ToM_ui{
         getScrollPaneViewport(comp).setViewPosition(new Point(0,0))
     }
 
+    def static msg(texto){
+        ui.informationMessage(texto.toString())
+    }
+    
     //end:
 
 

Tutorial-o-Matic/zips/doc/Tutorial-o-Matic/SimpleTutorialSample.mm

@@ -135,6 +135,8 @@
     </p>
   </body>
 </html></richcontent>
+<attribute_layout NAME_WIDTH="86.25 pt" VALUE_WIDTH="87 pt"/>
+<attribute NAME="ToM_TabLabel" VALUE="ToM - Samples"/>
 <node TEXT="SIMPLE DEMO" STYLE_REF="ToM-Tutorial" FOLDED="true" POSITION="right" ID="ID_390003608">
 <node TEXT="greetings" ID="ID_659572764">
 <node TEXT="Welcome to the Tutorial-o-Matic Simple Tutorial Demo!" STYLE_REF="ToM_newPage" ID="ID_577559944"/>
@@ -1794,9 +1796,19 @@ candle indicates that executes only one time (then button gets disabled)
     <p>
       Buttons &quot;inspect&quot; and &quot;reload&quot; appear on page's top.
     </p>
+    <p>
+      
+    </p>
+    <p>
+      the attribute &quot;ToM_TabLabel&quot; indicates which Tab should the tutorial be shown in.
+    </p>
+    <p>
+      If not present -&gt; default is &quot;Tutorial&quot;
+    </p>
   </body>
-</html>
-</richcontent>
+</html></richcontent>
+<attribute_layout NAME_WIDTH="86.25 pt" VALUE_WIDTH="66.75 pt"/>
+<attribute NAME="ToM_TabLabel" VALUE="in new tab"/>
 <node TEXT="Introduction" FOLDED="true" ID="ID_791969447">
 <node TEXT="Introduction" STYLE_REF="ToM_newPage" ID="ID_615110223">
 <node TEXT="nodes with style newPage defines the title for the page and indicates where the page starts" ID="ID_963032450"/>