feat(MenuItem): improvements and changes to the demos

demo/ChileCompanyCustomerPortal/ChileCompanyCustomerPortal.bbj

@@ -1,7 +1,7 @@
 use ::WebKit/framework/LoginDialog/LoginDialog.bbj::LoginDialog
 use ::WebKit/util/ClientUtil.bbj::ClientUtil
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/framework/LoginDialog/SampleAuthProvider.bbj::SampleAuthProvider
 
 use ::WebKit/demo/ChileCompanyCustomerPortal/components/ChileFrame.bbj::ChileFrame
@@ -57,7 +57,14 @@ m! = new Menu()
 
 i! = m!.addMenuItem(m!.getRoot(),101,"Customers","List of Customers","users")
 i!.setProgram("::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanyCustomerDashboardPanel.bbj::ChileCompanyDashboardPanel")
-i!.setStartType(0); rem 0 = class that implements WebWidget and has a constructor that takes the parent window
+i!.setStartType(0)
+
+test! = new MenuItem(i!, 1000, "Details", "Customer Details", "details")
+test!.setProgram("::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanyCustomerDashboardPanel.bbj::ChileCompanyDashboardPanel")
+test!.setStartType(0)
+m!.addItemToIndex(test!)
+
+rem test! = m!.addMenuItem(i!, 1000, "Details", "Customer Details", "details")
 
 i! = m!.addMenuItem(m!.getRoot(),102,"Products","Products - Dashboard","shopping-cart")
 i!.setProgram("::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanyItemDashboard.bbj::ChileCompanyItemDashboard")
@@ -67,6 +74,7 @@ i! = m!.addMenuItem(m!.getRoot(),103,"Salesperson","Salesperson - Dashboard","us
 i!.setProgram("::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanySalespersonDashboard.bbj::ChileCompanySalespersonDashboard")
 i!.setStartType(0); rem 0 = class that implements WebWidget and has a constructor that takes the parent window
 
+
 treeMenuShowCase! = m!.addMenuItem(m!.getRoot(),104,"Sales - Options","Sales - Options","list")
 treeMenuShowCase!.setStartType(2)
 

demo/ChileCompanyCustomerPortal/ChileCompanyMyDashboard.bbj

@@ -37,6 +37,8 @@ class public ChileCompanyMyDashboard extends BBjWidget
             canvas!.addStaticText(canvas!.getAvailableControlID(), 0, 0, 0, 0, Icons.get("check","color:red"))
             rem PortalFrame.getInstance().reloadAllPanels()
             canvas!.addButton(canvas!.getAvailableControlID(),0,0,0,0,"Overlay").setCallback(BBjAPI.ON_BUTTON_PUSH,#this!,"onBtnPush")
+            canvas!.addButton(canvas!.getAvailableControlID(),0,0,0,0,"Go to SubRoute of Customer").setCallback(BBjAPI.ON_BUTTON_PUSH,#this!,"onNavBtnPush")
+
             methodret
         FI
     methodend    
@@ -54,6 +56,10 @@ class public ChileCompanyMyDashboard extends BBjWidget
         #overlay!.setBackgroundColor("rgba(0,0,0,0.35)")
     methodend
 
+    method public void onNavBtnPush(BBjButtonPushEvent event!)
+        PortalFrame.getInstance().navigateTo("customers/details")
+    methodend
+
     method public void onOverlayDissmissed(BBjCustomEvent event!)
         PortalFrame.getInstance().destroyDialogWindow()
     methodend

demo/Showcase/Showcase.bbj

@@ -4,7 +4,7 @@ use ::WebKit/framework/LoginDialog/LoginDialog.bbj::LoginDialog
 use ::WebKit/framework/PortalFrame/PortalFrame.bbj::PortalFrame
 use ::WebKit/util/ClientUtil.bbj::ClientUtil
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/demo/Showcase/components/ShowCaseFrame.bbj::ShowCaseFrame
 use ::WebKit/framework/LoginDialog/SampleAuthProvider.bbj::SampleAuthProvider
 use ::WebKit/framework/Favorites/SampleFavoritesProvider.bbj::SampleFavoritesProvider
@@ -51,20 +51,20 @@ menuItem!.setStartType(0)
 
 declare PortalFrame portal!
 
-showCase! = menu!.addMenuItem(menu!.getRoot(),104,"Sales - Options","Sales - Options","list")
-showCase!.setStartType(2)
+showCase! = menu!.addMenuItem(menu!.getRoot(),104,"salesOptions","Sales - Options","Sales - Options","list")
 
 showCaseItem! = menu!.addMenuItem(showCase!,212,"Sales Statistics","Sales Statistics","table")
 showCaseItem!.setStartType(2)
 
 showCaseItem! = menu!.addMenuItem(showCase!,211,"Diagrams","Diagrams","table")
 showCaseItem!.setStartType(2)
 
-showCaseItem! = menu!.addMenuItem(showCase!,201,"Direct - Sales - Options","Direct - Sales - Options","table")
-showCaseItem!.setStartType(2)
+showCaseItem! = menu!.addMenuItem(showCase!,201,"directSales","Direct - Sales - Options","Direct - Sales - Options","table")
 
 showCaseSubItem! = menu!.addMenuItem(showCaseItem!,202,"Personal - Sale","Personal - Sale","table")
-showCaseSubItem!.setStartType(2)
+showCaseSubItem!.setProgram("::WebKit/demo/Showcase/ShowcasePanels/ToastShowcase.bbj::ToastShowcase")
+showCaseSubItem!.setMenuItemPathCaption("personal")
+showCaseSubItem!.setStartType(0)
 
 showCaseSubItem! = menu!.addMenuItem(showCaseItem!,203,"Electronic - Sale","Electronic - Sale","table")
 showCaseSubItem!.setStartType(2)

demo/Showcase/ShowcasePanels/ToastShowcase.bbj

@@ -2,6 +2,7 @@ use ::WebKit/demo/Showcase/ShowcaseWidget/ShowcaseWidget.bbj::ShowcaseWidget
 use ::WebKit/widgets/InputField/InputField.bbj::InputField
 use ::WebKit/widgets/Toast/Toast.bbj::Toast
 
+use ::WebKit/framework/PortalFrame/PortalFrame.bbj::PortalFrame
 
 class public ToastShowcase extends ShowcaseWidget
 
@@ -48,10 +49,10 @@ class public ToastShowcase extends ShowcaseWidget
     methodend
 
     method public void onShowToast(BBjButtonPushEvent ev!)
-
-        message$=#TitleField!.getInput()
-        duration=max(1000,num(#DurationField!.getInput(),err=*next))
-        Toast.show(message$,duration)
+        PortalFrame.getInstance().navigateTo("/salesoptions/directsales/personal")
+        rem message$=#TitleField!.getInput()
+        rem duration=max(1000,num(#DurationField!.getInput(),err=*next))
+        rem Toast.show(message$,duration)
 
 
     methodend

demo/Showcase/components/ShowCaseFrame.bbj

@@ -3,29 +3,29 @@ use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
 use ::WebKit/demo/Showcase/components/ShowCaseMenuPanel.bbj::ShowCaseMenuPanel
 use ::WebKit/widgets/DashboardHeader/DashboardHeaderEntry.bbj::DashboardHeaderEntry
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 
 class public ShowCaseFrame extends PortalFrame
 
     rem @Override 
-    method protected TreeListPanel createMenuPanelObject(BBjChildWindow panelWindow!)
-        menuPanel! = new ShowCaseMenuPanel(panelWindow!)
-        rem Test Colors
-        colors! = new BBjVector()
-        colors!.add("#408458")
-        colors!.add("#9B0058")
-        colors!.add("#6883BA")
-        menuPanel!.setColors(colors!)
-        data! = new BBjVector()
-        data!.add(new DashboardHeaderEntry(0,2,"Deals Scored"))
-        data!.add(new DashboardHeaderEntry(1,3,"Upcoming Tasks"))
-        data!.add(new DashboardHeaderEntry(2,45,"Planned Meetings"))
-        menuPanel!.setHeadLineEntrys(data!)
+    rem method protected TreeListPanel createMenuPanelObject(BBjChildWindow panelWindow!)
+    rem     menuPanel! = new ShowCaseMenuPanel(panelWindow!)
+    rem     rem Test Colors
+    rem     colors! = new BBjVector()
+    rem     colors!.add("#408458")
+    rem     colors!.add("#9B0058")
+    rem     colors!.add("#6883BA")
+    rem     menuPanel!.setColors(colors!)
+    rem     data! = new BBjVector()
+    rem     data!.add(new DashboardHeaderEntry(0,2,"Deals Scored"))
+    rem     data!.add(new DashboardHeaderEntry(1,3,"Upcoming Tasks"))
+    rem     data!.add(new DashboardHeaderEntry(2,45,"Planned Meetings"))
+    rem     menuPanel!.setHeadLineEntrys(data!)
 
 
-        methodret menuPanel!
+    rem     methodret menuPanel!
 
-    methodend
+    rem methodend
 
 
 

demo/Showcase/components/ShowCaseMenuPanel.bbj

@@ -7,7 +7,7 @@ use ::WebKit/demo/ChileCompanyCustomerPortal/ChileCompanyCustomerDashboardPanel.
 use ::WebKit/util/ClientUtil.bbj::ClientUtil
 use ::WebKit/widgets/InputField/InputField.bbj::InputField
 use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 class public ShowCaseMenuPanel extends TreeListPanel
     field public DashboardHeader dashHeader!
     field public DashboardTasks dashTasks!

framework/EmbedPanel/EmbedPanel.bbj

@@ -1,5 +1,5 @@
 use ::BBjWidget/BBjWidget.bbj::BBjWidget
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 
 class public EmbedPanel extends BBjWidget

framework/Favorites/IFavoritesProvider.bbj

@@ -1,4 +1,4 @@
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 
 interface public IFavoritesProvider
 

framework/Favorites/SampleFavoritesProvider.bbj

@@ -1,5 +1,5 @@
 use ::WebKit/framework/Favorites/IFavoritesProvider.bbj::IFavoritesProvider
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/model/Menu.bbj::Menu
 use ::WebKit/util/WriteFavorites.bbj::WriteFavorites
 use java.util.ArrayList

framework/MenuCardPanel/MenuCardPanel.bbj

@@ -1,7 +1,7 @@
 use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
 use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 
 

framework/MenuCardPanel/MenuCardPanelSorted.bbj

@@ -1,7 +1,7 @@
 use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
 use ::WebKit/widgets/MenuCard/MenuCard.bbj::MenuCard
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 use ::WebKit/framework/Favorites/SampleFavoritesProvider.bbj::SampleFavoritesProvider
 

framework/MenuPanel/MenuPanel.bbj

@@ -2,7 +2,7 @@ use ::BBjWidget/BBjWidget.bbj::BBjWidget
 use ::WebKit/widgets/IconTile/IconTile.bbj::IconTile
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use java.util.HashMap
 
 

framework/PortalFrame/PortalFrame.bbj

@@ -3,7 +3,7 @@ use ::BBjWidget/BBjWidget.bbj::BBjWidget
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 use ::WebKit/widgets/IconTile/IconTile.bbj::IconTile
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use ::WebKit/framework/TreeListPanel/TreeListPanel.bbj::TreeListPanel
 use ::WebKit/framework/MenuCardPanel/MenuCardPanel.bbj::MenuCardPanel
 use ::WebKit/framework/MenuCardPanel/MenuCardPanelSorted.bbj::MenuCardPanelSorted
@@ -280,7 +280,7 @@ REM         footerMenuItem!.setCallback("onChangeTheme")
         if param! = null() then
             #navigateTo(menu!)
         else
-            #navigateTo(menu!.getBasePath(), str(param!))
+            #navigateTo(menu!.getPath(), str(param!))
         fi
     methodend
 
@@ -324,7 +324,7 @@ REM         footerMenuItem!.setCallback("onChangeTheme")
     methodend
 
     method public void navigateTo(MenuItem menu!)
-        #navigateTo(menu!.getBasePath())
+        #navigateTo(menu!.getPath())
     methodend
 
     method public MenuItem getMenuItem(BBjString path$)

framework/Router/Router.bbj

@@ -5,7 +5,7 @@ use ::WebKit/util/ClientUtil.bbj::ClientUtil
 use ::WebKit/framework/Router/RouterProtocol.bbj::RouterProtocol
 
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 
 class public Router
 

framework/TreeListPanel/TreeListPanel.bbj

@@ -4,7 +4,7 @@ use ::WebKit/widgets/IconTile/IconTile.bbj::IconTile
 use ::WebKit/widgets/ListTile/ListTile.bbj::ListTile
 use ::WebKit/util/DynamicLoader.bbj::DynamicLoader
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use java.util.HashMap
 use ::WebKit/util/Icons.bbj::Icons
 use ::WebKit/framework/Favorites/IFavoritesProvider.bbj::IFavoritesProvider

model/ListView/ListViewDataModel.bbj

@@ -1,7 +1,7 @@
 
 use ::WebKit/model/ListView/ListHeaderDataModel.bbj::ListHeaderDataModel
 use ::WebKit/model/Menu.bbj::Menu
-use ::WebKit/model/Menu.bbj::MenuItem
+use ::WebKit/model/MenuItem.bbj::MenuItem
 use java.util.HashSet
 
 class public ListViewDataModel
@@ -25,9 +25,9 @@ class public ListViewDataModel
         #actionMenus! = new Menu()
 
         i! = #actionMenus!.addMenuItem(#actionMenus!.getRoot(), 1, "Edit", "Edit", "edit-2")
-        i!.setCustomEventName("ON_ACTION_ITEM_EDIT_PRESSED")
+        rem i!.setCustomEventName("ON_ACTION_ITEM_EDIT_PRESSED")
         i! = #actionMenus!.addMenuItem(#actionMenus!.getRoot(), 2, "Delete", "Delete", "trash-2")
-        i!.setCustomEventName("ON_ACTION_ITEM_DELETE_PRESSED")
+        rem i!.setCustomEventName("ON_ACTION_ITEM_DELETE_PRESSED")
     methodend
 
     method public ListViewDataModel(BBjString listPanelTitle$)