--- a/Tools__ViewTreeApplication.st	Tue Aug 27 00:48:09 2019 +0200
+++ b/Tools__ViewTreeApplication.st	Wed Aug 28 17:11:53 2019 +0200
@@ -1,5 +1,3 @@
-"{ Encoding: utf8 }"
-
 "
  COPYRIGHT (c) 2007 by eXept Software AG
 	      All Rights Reserved
@@ -632,153 +630,158 @@
 
     <resource: #menu>
 
-    ^
-     #(Menu
-        (
-         (MenuItem
-            label: 'Browse View Class'
-            itemValue: doBrowse:
-            argument: view
-          )
-         (MenuItem
-            label: 'Browse Model Class'
-            itemValue: doBrowse:
-            isVisible: hasModel
-            argument: model
-          )
-         (MenuItem
-            label: 'Browse Application Class'
-            itemValue: doBrowse:
-            isVisible: hasApplication
-            argument: application
-          )
-         (MenuItem
-            label: 'Browse Master Application Class'
-            itemValue: doBrowse:
-            isVisible: hasApplication
-            enabled: hasMasterApplication
-            argument: masterApplication
-          )
-         (MenuItem
-            label: 'Browse Controller Class'
-            itemValue: doBrowse:
-            isVisible: hasController
-            argument: controller
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Inspect View'
-            itemValue: doInspect:
-            argument: view
-          )
-         (MenuItem
-            label: 'Inspect Window Group'
-            itemValue: doInspect:
-            argument: group
-          )
-         (MenuItem
-            label: 'Inspect Model'
-            itemValue: doInspect:
-            isVisible: hasModel
-            argument: model
-          )
-         (MenuItem
-            label: 'Inspect Application'
-            itemValue: doInspect:
-            isVisible: hasApplication
-            argument: application
-          )
-         (MenuItem
-            label: 'Inspect Master Application'
-            itemValue: doInspect:
-            isVisible: hasApplication
-            enabled: hasMasterApplication
-            argument: masterApplication
-          )
-         (MenuItem
-            label: 'Inspect Controller'
-            itemValue: doInspect:
-            isVisible: hasController
-            argument: controller
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Edit Language Resources'
-            itemValue: doEditLanguageResources
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Flash'
-            itemValue: doFlash
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Destroy View'
-            itemValue: doDestroy
-            labelImage: (ResourceRetriever ToolbarIconLibrary erase16x16Icon 'Destroy')
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
-            label: 'Geometry'
-            submenuChannel: submenuGeometry:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            label: 'Interface'
-            submenuChannel: submenuInterface:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            label: 'Visibility'
-            submenuChannel: submenuVisibility:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            label: 'Presentation'
-            submenuChannel: submenuPresentation:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            label: 'Instance Variables'
-            submenuChannel: submenuInspector:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            label: '='
-          )
-         (MenuItem
-            label: ''
-          )
-         (MenuItem
-            enabled: selectedComponentHasChildren
-            label: 'Applications'
-            nameKey: single
-            submenuChannel: submenuApplications:
-            keepLinkedMenu: true
-          )
-         (MenuItem
-            enabled: selectedComponentHasChildren
-            label: 'Components'
-            nameKey: single
-            submenuChannel: submenuComponents:
-            keepLinkedMenu: true
-          )
+    ^ 
+     #(Menu 
+       (MenuItem
+          label: 'Browse'
+          nameKey: BrowseMenu
+          submenu: 
+         (Menu 
+           (MenuItem
+              label: 'View Class (Widget)'
+              itemValue: doBrowse:
+              argument: view
+           ) 
+           (MenuItem
+              label: 'Model Class'
+              itemValue: doBrowse:
+              isVisible: hasModel
+              argument: model
+           ) 
+           (MenuItem
+              label: 'Application Class'
+              itemValue: doBrowse:
+              isVisible: hasApplication
+              argument: application
+           ) 
+           (MenuItem
+              enabled: hasMasterApplication
+              label: 'Master Application Class'
+              itemValue: doBrowse:
+              isVisible: hasApplication
+              argument: masterApplication
+           ) 
+           (MenuItem
+              label: 'Controller Class'
+              itemValue: doBrowse:
+              isVisible: hasController
+              argument: controller
+           )
          )
-        nil
-        nil
-      )
-
-    "Modified: / 18-07-2019 / 12:22:06 / Claus Gittinger"
+       ) 
+       (MenuItem
+          label: 'Inspect'
+          nameKey: InspectMenu
+          submenu: 
+         (Menu 
+           (MenuItem
+              label: 'View (Widget)'
+              itemValue: doInspect:
+              argument: view
+           ) 
+           (MenuItem
+              label: 'Model'
+              itemValue: doInspect:
+              isVisible: hasModel
+              argument: model
+           ) 
+           (MenuItem
+              label: 'Application'
+              itemValue: doInspect:
+              isVisible: hasApplication
+              argument: application
+           ) 
+           (MenuItem
+              enabled: hasMasterApplication
+              label: 'Master Application'
+              itemValue: doInspect:
+              isVisible: hasApplication
+              argument: masterApplication
+           ) 
+           (MenuItem
+              label: 'Window Group'
+              itemValue: doInspect:
+              argument: group
+           ) 
+           (MenuItem
+              label: 'Controller'
+              itemValue: doInspect:
+              isVisible: hasController
+              argument: controller
+           )
+         )
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Edit Language Resources'
+          itemValue: doEditLanguageResources
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Flash'
+          itemValue: doFlash
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Destroy View'
+          itemValue: doDestroy
+          labelImage: (ResourceRetriever ToolbarIconLibrary erase16x16Icon 'Destroy View')
+       ) 
+       (MenuItem
+          label: '-'
+       ) 
+       (MenuItem
+          label: 'Geometry'
+          submenuChannel: submenuGeometry:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          label: 'Interface'
+          submenuChannel: submenuInterface:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          label: 'Visibility'
+          submenuChannel: submenuVisibility:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          label: 'Presentation'
+          submenuChannel: submenuPresentation:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          label: 'Instance Variables'
+          submenuChannel: submenuInspector:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          label: '='
+       ) 
+       (MenuItem
+          label: ''
+       ) 
+       (MenuItem
+          enabled: selectedComponentHasChildren
+          label: 'Applications'
+          nameKey: single
+          submenuChannel: submenuApplications:
+          keepLinkedMenu: true
+       ) 
+       (MenuItem
+          enabled: selectedComponentHasChildren
+          label: 'Components'
+          nameKey: single
+          submenuChannel: submenuComponents:
+          keepLinkedMenu: true
+       )
+     )
 !
 
 middleButtonMenuForMenuItems