--- a/Tools__TestRunner2.st	Tue Aug 16 15:13:38 2011 +0200
+++ b/Tools__TestRunner2.st	Tue Aug 16 18:19:47 2011 +0200
@@ -117,8 +117,11 @@
     NewLauncher isNil ifTrue:[^ self].
     ToolbarIconLibrary isNil ifTrue:[^ self].
 
+    "/ NewLauncher removeUserTool:#TestRunner2.
+
     "Class may be changed, and we want to start the changed class"
-    action := (MessageSend receiver:(Smalltalk at:self name) selector:#open).
+    "/ action := (MessageSend receiver:(Smalltalk at:self name) selector:#open).
+    action := [ self halt. (Smalltalk at:self name) open ].
 
     "Install in Tools menu"
     menuItem := (MenuItem label:'SUnit Test Runner (enhanced)')
@@ -134,23 +137,24 @@
         space:false.
 
     "Install in Toolbar"
-"/    menuItem := (MenuItem new)
-"/                nameKey:#TestRunner2;
-"/                "label: 'SUnit Test Runner (enhanced)'" 
-"/                icon:self startSUnitIcon;
-"/                value:action;
-"/                isButton:true.
-"/    NewLauncher 
-"/        addMenuItem:menuItem
-"/        from:self
-"/        in:'toolbar'
-"/        position:#( before garbageCollect )
-"/        space:false.
+    menuItem := (MenuItem new)
+                nameKey:#TestRunner2;
+                label: 'SUnit Test Runner (enhanced)'; 
+                activeHelpKey: #openTestRunner;
+                icon:self startSUnitIcon;
+                value:action;
+                isButton:true.
+    NewLauncher 
+        addMenuItem:menuItem
+        from:self
+        in:'toolbar'
+        position:#( before garbageCollect )
+        space:false.
 
     "Created: / 09-06-2008 / 11:11:19 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 26-11-2008 / 09:38:20 / Jan Vrany <vranyj1@fel.cvut.cz>"
     "Modified: / 09-01-2010 / 20:48:39 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-    "Modified: / 09-08-2011 / 22:42:12 / cg"
+    "Modified: / 16-08-2011 / 18:19:16 / cg"
 ! !
 
 !TestRunner2 class methodsFor:'image specs'!
@@ -1698,7 +1702,7 @@
 !TestRunner2::ClassList class methodsFor:'documentation'!
 
 version
-    ^'$Id: Tools__TestRunner2.st,v 1.20 2011-08-10 22:25:08 vrany Exp $'
+    ^'$Id: Tools__TestRunner2.st,v 1.21 2011-08-16 16:19:47 cg Exp $'
 ! !
 
 !TestRunner2::ClassList methodsFor:'private'!
@@ -2197,11 +2201,11 @@
 !TestRunner2 class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.20 2011-08-10 22:25:08 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.21 2011-08-16 16:19:47 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.20 2011-08-10 22:25:08 vrany Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__TestRunner2.st,v 1.21 2011-08-16 16:19:47 cg Exp $'
 !
 
 version_SVN