--- a/Tools__ViewTreeApplication.st	Wed Jan 21 13:37:09 2009 +0100
+++ b/Tools__ViewTreeApplication.st	Fri Jan 23 17:58:19 2009 +0100
@@ -194,8 +194,8 @@
      the MenuEditor may not be able to read the specification."
 
     "
-     MenuEditor new openOnClass:ViewTreeApplication andSelector:#menu
-     (Menu new fromLiteralArrayEncoding:(ViewTreeApplication menu)) startUp
+     MenuEditor new openOnClass:Tools::ViewTreeApplication andSelector:#menu
+     (Menu new fromLiteralArrayEncoding:(Tools::ViewTreeApplication menu)) startUp
     "
 
     <resource: #menu>
@@ -234,6 +234,48 @@
             )
           )
          (MenuItem
+            label: 'Settings'
+            translateLabel: true
+            submenu: 
+           (Menu
+              (
+               (MenuItem
+                  label: 'Test Mode'
+                  translateLabel: true
+                  hideMenuOnActivated: false
+                  indication: testModeChannel
+                )
+               (MenuItem
+                  enabled: testModeChannel
+                  label: 'Follow Focus'
+                  translateLabel: true
+                  hideMenuOnActivated: false
+                  indication: followFocusChannel
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Select on Click'
+                  translateLabel: true
+                  hideMenuOnActivated: false
+                  indication: selectOnClickHolder
+                )
+               (MenuItem
+                  label: '-'
+                )
+               (MenuItem
+                  label: 'Show Name of Widgets'
+                  translateLabel: true
+                  hideMenuOnActivated: false
+                  indication: showNamesHolder
+                )
+               )
+              nil
+              nil
+            )
+          )
+         (MenuItem
             label: ''
           )
          (MenuItem
@@ -431,25 +473,39 @@
      #(Menu
         (
          (MenuItem
-            label: 'Test Mode'
-            translateLabel: true
-            indication: testModeChannel
+            enabled: hasSingleSelectionHolder
+            label: 'Application'
+            itemValue: doBrowse:
+            translateLabel: false
+            labelImage: (ResourceRetriever ToolbarIconLibrary systemBrowser24x24Icon2)
+            argument: application
+          )
+         (MenuItem
+            enabled: hasSingleSelectionHolder
+            label: 'Application'
+            itemValue: doInspect:
+            translateLabel: false
+            labelImage: (ResourceRetriever ToolbarIconLibrary inspect22x24Icon 'Application')
+            argument: application
           )
          (MenuItem
-            enabled: testModeChannel
-            label: 'Follow Focus'
-            translateLabel: true
-            indication: followFocusChannel
+            label: '-'
           )
          (MenuItem
-            label: 'Select On Click'
-            translateLabel: true
-            indication: selectOnClickHolder
+            enabled: hasSingleSelectionHolder
+            label: 'Widget'
+            itemValue: doBrowse:
+            translateLabel: false
+            labelImage: (ResourceRetriever ToolbarIconLibrary systemBrowser24x24Icon2)
+            argument: view
           )
          (MenuItem
-            label: 'Show Names'
+            enabled: hasSingleSelectionHolder
+            label: 'Widget'
+            itemValue: doInspect:
             translateLabel: true
-            indication: showNamesHolder
+            labelImage: (ResourceRetriever ToolbarIconLibrary inspect22x24Icon 'Widget')
+            argument: view
           )
          )
         nil
@@ -562,14 +618,21 @@
 !
 
 update:something with:someArgument from:aModel
+    |oldSelection|
+
+    oldSelection := model selectedItem.
 
     aModel == testModeChannel ifTrue:[
+        model selectedItem:nil.
         model testMode:(testModeChannel value).
+        model selectedItem:oldSelection.
         ^ self
     ].
 
     aModel == showNamesHolder ifTrue:[
+        model selectedItem:nil.
         self listOfItems showWidgetNames:(aModel value).
+        model selectedItem:oldSelection.
         ^ self
     ].
     super update:something with:someArgument from:aModel.