Merged adbbcc25326f and cfeafdc3f22d (branch default - CVS HEAD) jv
authorJan Vrany <jan.vrany@fit.cvut.cz>
Wed, 17 Apr 2013 10:22:54 +0200
branchjv
changeset 12682 6fb2176bf0fa
parent 12681 adbbcc25326f (current diff)
parent 12673 cfeafdc3f22d (diff)
child 12683 e094e18bfd10
Merged adbbcc25326f and cfeafdc3f22d (branch default - CVS HEAD)
DebugView.st
FileBrowserV2.st
SyntaxHighlighter2.st
--- a/DebugView.st	Tue Apr 16 16:11:00 2013 +0200
+++ b/DebugView.st	Wed Apr 17 10:22:54 2013 +0200
@@ -122,6 +122,7 @@
 "
 ! !
 
+
 !DebugView class methodsFor:'initialization'!
 
 initialize
@@ -140,6 +141,7 @@
     self newDebugger
 ! !
 
+
 !DebugView class methodsFor:'cleanup'!
 
 lowSpaceCleanup
@@ -173,6 +175,7 @@
     "
 ! !
 
+
 !DebugView class methodsFor:'defaults'!
 
 defaultIcon
@@ -216,6 +219,7 @@
     "Modified: / 17.11.2001 / 17:31:42 / cg"
 ! !
 
+
 !DebugView class methodsFor:'ignoring halts'!
 
 haltIgnoreInformationFor:haltingMethod atLineNr:lineNrInHaltingMethod
@@ -386,6 +390,7 @@
     Smalltalk changed:#ignoredHalts.
 ! !
 
+
 !DebugView class methodsFor:'instance creation / entering'!
 
 enter
@@ -649,6 +654,7 @@
     "Modified: 4.4.1997 / 16:22:36 / cg"
 ! !
 
+
 !DebugView class methodsFor:'menu specs'!
 
 breakPointMenuSpec
@@ -1105,6 +1111,10 @@
             itemValue: doChangeProcessPriority
           )
          (MenuItem
+            label: 'Inspect'
+            itemValue: doInspectProcess
+          )
+         (MenuItem
             label: '-'
           )
          (MenuItem
@@ -1234,6 +1244,7 @@
       )
 ! !
 
+
 !DebugView class methodsFor:'misc'!
 
 interestingContextFrom:aContext
@@ -1493,6 +1504,7 @@
     "Modified: / 08-07-2011 / 13:15:49 / cg"
 ! !
 
+
 !DebugView methodsFor:'basic'!
 
 enableDisableActions
@@ -2266,6 +2278,7 @@
     "Created: / 16.11.2001 / 17:36:18 / cg"
 ! !
 
+
 !DebugView methodsFor:'help'!
 
 flyByHelpDependsOnPositionIn:aView
@@ -2463,6 +2476,7 @@
     "Modified: 4.3.1997 / 01:54:03 / cg"
 ! !
 
+
 !DebugView methodsFor:'initialization & release'!
 
 addToCurrentProject
@@ -3146,6 +3160,7 @@
     "Modified: / 06-07-2006 / 12:43:19 / cg"
 ! !
 
+
 !DebugView methodsFor:'interrupt handling'!
 
 contextInterrupt
@@ -3805,6 +3820,7 @@
     "Modified: / 20-07-2012 / 15:26:26 / cg"
 ! !
 
+
 !DebugView methodsFor:'menu & button actions'!
 
 addBrowserBookmark
@@ -4429,6 +4445,10 @@
     "Modified: / 23-03-2012 / 09:49:31 / cg"
 !
 
+doInspectProcess
+    (inspectedProcess ? Processor activeProcess) inspect.
+!
+
 doMicroSend
     "single send; reenter with next message send"
 
@@ -5207,6 +5227,7 @@
     "Modified: / 19-07-2012 / 11:53:30 / cg"
 ! !
 
+
 !DebugView methodsFor:'menu & button actions-breakpoints'!
 
 addBreakpoint
@@ -5441,6 +5462,7 @@
     self class stopIgnoringHalts
 ! !
 
+
 !DebugView methodsFor:'private'!
 
 abortAllIsHandled
@@ -5893,6 +5915,7 @@
     "Modified: / 18-01-2011 / 17:57:34 / cg"
 ! !
 
+
 !DebugView methodsFor:'private queries'!
 
 canBrowseClassHierarchy
@@ -6016,6 +6039,7 @@
     setOfHiddenCallingSelectors := aCollectionOfSymbols
 ! !
 
+
 !DebugView methodsFor:'private-breakpoints'!
 
 addIgnoredHaltForCount:countOrNil orTimeDuration:dTOrNil orUntilShiftKey:untilShiftKey forAll:aBoolean
@@ -6101,6 +6125,7 @@
     "Created: / 17.11.2001 / 18:20:16 / cg"
 ! !
 
+
 !DebugView methodsFor:'private-cache handling'!
 
 cacheMyself
@@ -6171,6 +6196,7 @@
     "Modified: 31.7.1997 / 21:20:11 / cg"
 ! !
 
+
 !DebugView methodsFor:'private-code view'!
 
 codeAspect
@@ -6180,6 +6206,7 @@
     "Modified: / 27-07-2012 / 22:20:27 / cg"
 ! !
 
+
 !DebugView methodsFor:'private-context handling'!
 
 contextListEntryFor:aContext
@@ -6924,6 +6951,7 @@
     "Modified: / 27-07-2012 / 17:26:54 / cg"
 ! !
 
+
 !DebugView methodsFor:'private-control loop'!
 
 controlLoop
@@ -7133,6 +7161,7 @@
     "Modified: / 26-09-2012 / 15:03:39 / cg"
 ! !
 
+
 !DebugView methodsFor:'user interaction'!
 
 checkIfCodeIsReallyModified
@@ -8037,6 +8066,7 @@
     "Modified: / 23-07-2012 / 12:23:49 / cg"
 ! !
 
+
 !DebugView::IgnoredHaltOrBreakpoint methodsFor:'accessing'!
 
 ignoreCount:something
@@ -8053,6 +8083,7 @@
     "Created: / 27-01-2012 / 11:35:23 / cg"
 ! !
 
+
 !DebugView::IgnoredHaltOrBreakpoint methodsFor:'misc'!
 
 decrementIgnoreCount
@@ -8063,6 +8094,7 @@
     ]
 ! !
 
+
 !DebugView::IgnoredHaltOrBreakpoint methodsFor:'printing'!
 
 printConditionOn:aStream
@@ -8092,6 +8124,7 @@
     "Created: / 06-03-2012 / 12:41:10 / cg"
 ! !
 
+
 !DebugView::IgnoredHaltOrBreakpoint methodsFor:'queries'!
 
 haltIgnoredInfoString
@@ -8168,6 +8201,7 @@
     "Modified: / 27-01-2012 / 11:36:01 / cg"
 ! !
 
+
 !DebugView::IgnoredHalt methodsFor:'accessing'!
 
 method
@@ -8203,6 +8237,7 @@
     "Modified: / 08-05-2011 / 10:28:41 / cg"
 ! !
 
+
 !DebugView::IgnoredHalt methodsFor:'printing'!
 
 printOn:aStream
@@ -8224,6 +8259,7 @@
     "Modified: / 27-07-2012 / 23:04:42 / cg"
 ! !
 
+
 !DebugView::IgnoredHalt methodsFor:'queries'!
 
 isActive
@@ -8253,6 +8289,7 @@
     ^ self isHaltIgnored
 ! !
 
+
 !DebugView::IgnoredBreakpoint methodsFor:'accessing'!
 
 parameter
@@ -8263,6 +8300,7 @@
     parameter := something.
 ! !
 
+
 !DebugView::IgnoredBreakpoint methodsFor:'printing'!
 
 printOn:aStream
@@ -8272,6 +8310,7 @@
     "Created: / 06-03-2012 / 12:42:10 / cg"
 ! !
 
+
 !DebugView::IgnoredBreakpoint methodsFor:'queries'!
 
 isForBreakpointWithParameter
@@ -8286,14 +8325,15 @@
     "Created: / 06-03-2012 / 14:36:21 / cg"
 ! !
 
+
 !DebugView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.579 2013-03-28 15:04:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.581 2013-04-16 16:20:09 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.579 2013-03-28 15:04:49 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/DebugView.st,v 1.581 2013-04-16 16:20:09 cg Exp $'
 !
 
 version_HG
--- a/FileBrowserV2.st	Tue Apr 16 16:11:00 2013 +0200
+++ b/FileBrowserV2.st	Wed Apr 17 10:22:54 2013 +0200
@@ -81,6 +81,7 @@
 "
 ! !
 
+
 !FileBrowserV2 class methodsFor:'instance creation'!
 
 on:aDirectoryPath
@@ -197,6 +198,7 @@
     ^ clone
 ! !
 
+
 !FileBrowserV2 class methodsFor:'class initialization'!
 
 initialize
@@ -296,6 +298,7 @@
     ].
 ! !
 
+
 !FileBrowserV2 class methodsFor:'defaults'!
 
 entryFieldEndStringForMultipleSelection
@@ -303,6 +306,7 @@
     ^ ('[*]')
 ! !
 
+
 !FileBrowserV2 class methodsFor:'help specs'!
 
 flyByHelpSpec
@@ -368,6 +372,7 @@
 )
 ! !
 
+
 !FileBrowserV2 class methodsFor:'image specs'!
 
 applicationIcon
@@ -403,6 +408,7 @@
     ^ ToolbarIconLibrary hideToolbarIconH26
 ! !
 
+
 !FileBrowserV2 class methodsFor:'interface specs'!
 
 windowSpec
@@ -420,341 +426,342 @@
 
     <resource: #canvas>
 
-    ^
+    ^ 
      #(FullSpec
-	name: windowSpec
-	window:
+        name: windowSpec
+        window: 
        (WindowSpec
-	  label: FileBrowser
-	  name: FileBrowser
-	  min: (Point 10 10)
-	  bounds: (Rectangle 0 0 800 600)
-	  menu: mainMenu
-	  icon: defaultIcon
-	)
-	component:
+          label: FileBrowser
+          name: FileBrowser
+          min: (Point 10 10)
+          bounds: (Rectangle 0 0 800 768)
+          menu: mainMenu
+          icon: defaultIcon
+        )
+        component: 
        (SpecCollection
-	  collection: (
-	   (ViewSpec
-	      name: 'ToolbarBox'
-	      layout: (LayoutFrame 0 0 0 0 0 1 40 0)
-	      level: 0
-	      visibilityChannel: toolBarVisibleHolder
-	      component:
-	     (SpecCollection
-		collection: (
-		 (ActionButtonSpec
-		    label: 'hideToolBarIcon'
-		    name: 'HideToolBarButton'
-		    layout: (LayoutFrame 0 0 0 0 13 0 40 0)
-		    activeHelpKey: hideToolBar
-		    hasCharacterOrientedLabel: false
-		    translateLabel: true
-		    model: hideToolbar
-		    postBuildCallback: hideToolBarButtonCreated:
-		  )
-		 (MenuPanelSpec
-		    name: 'ToolBar'
-		    layout: (LayoutFrame 13 0 0 0 0 1 40 0)
-		    menu: toolBarMainMenu
-		    textDefault: true
-		  )
-		 )
-
-	      )
-	    )
-	   (ViewSpec
-	      name: 'FilenameEntryFieldBox'
-	      layout: (LayoutFrame 0 0 40 0 0 1 65 0)
-	      level: 0
-	      visibilityChannel: filenameEntryFieldVisibleHolder
-	      component:
-	     (SpecCollection
-		collection: (
-		 (ActionButtonSpec
-		    label: 'hideFilenameEntryFieldIcon'
-		    name: 'HideFilenameEntryFieldButton'
-		    layout: (LayoutFrame 0 0 0 0 13 0 0 1)
-		    activeHelpKey: hideFilenameEntryField
-		    hasCharacterOrientedLabel: false
-		    translateLabel: true
-		    model: hideFilenameEntryField
-		    postBuildCallback: hideFilenameEntryFieldButtonCreated:
-		  )
-		 (HorizontalPanelViewSpec
-		    name: 'HorizontalPanel1'
-		    layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
-		    level: 1
-		    horizontalLayout: leftFit
-		    verticalLayout: fit
-		    horizontalSpace: 3
-		    verticalSpace: 3
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (ComboListSpec
-			  name: 'ComboList1'
-			  visibilityChannel: driveSelectorVisible
-			  model: selectedDeviceDrive
-			  comboList: listOfDeviceDrives
-			  useIndex: false
-			  hidePullDownMenuButton: false
-			  extent: (Point 53 23)
-			)
-		       (VariableHorizontalPanelSpec
-			  name: 'VariableHorizontalPanel1'
-			  level: 0
-			  showHandle: true
-			  component:
-			 (SpecCollection
-			    collection: (
-			     (NonScrollableArbitraryComponentSpec
-				name: 'NonScrollableArbitraryComponent1'
-				component: FilenameEditFieldV2
-				postBuildCallback: postBuildEditField:
-			      )
-			     (ViewSpec
-				name: 'FilterBox'
-				component:
-			       (SpecCollection
-				  collection: (
-				   (LabelSpec
-				      label: 'Filter:'
-				      name: 'Filter'
-				      layout: (LayoutFrame 0 0 0 0 40 0 0 1)
-				      translateLabel: true
-				      adjust: left
-				      postBuildCallback: postBuildPathViewBox:
-				    )
-				   (ComboBoxSpec
-				      name: 'FilterSelectionBox'
-				      layout: (LayoutFrame 40 0 0 0 0 1 0 1)
-				      model: filterModel
-				      immediateAccept: true
-				      acceptOnPointerLeave: false
-				      comboList: filterListModel
-				    )
-				   )
-
-				)
-				postBuildCallback: postBuildPathViewBox:
-			      )
-			     )
-
-			  )
-			  handles: (Any 0.774936 1.0)
-			  postBuildCallback: postBuildPathViewBox:
-			  useDefaultExtent: true
-			)
-		       )
-
-		    )
-		    postBuildCallback: postBuildPathViewBox:
-		  )
-		 )
-
-	      )
-	    )
-	   (#'FileBrowserV2UISpecifications::PanelSpec'
-	      name: 'BrowserBox'
-	      layout: (LayoutFrame 0 0.0 65 0.0 0 1.0 -26 1.0)
-	      level: 0
-	      showHandle: true
-	      snapMode: both
-	      whichView: last
-	      orientation: vertical
-	      visibility: viewNoteBookApplicationHolder
-	      component:
-	     (SpecCollection
-		collection: (
-		 (#'FileBrowserV2UISpecifications::PanelSpec'
-		    name: 'HorizontalPanel'
-		    level: 0
-		    snapMode: both
-		    whichView: first
-		    orientation: horizontal
-		    visibility: showDirectoryTree
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (SubCanvasSpec
-			  name: 'DirectoryTreeBrowser'
-			  hasHorizontalScrollBar: false
-			  hasVerticalScrollBar: false
-			  majorKey: DirectoryTreeBrowser
-			  createNewApplication: true
-			  createNewBuilder: true
-			  postBuildCallback: postBuildDirectoryTree:
-			)
-		       (SubCanvasSpec
-			  name: 'DirectoryContentsBrowser'
-			  hasHorizontalScrollBar: false
-			  hasVerticalScrollBar: false
-			  majorKey: DirectoryContentsBrowser
-			  createNewApplication: true
-			  createNewBuilder: true
-			)
-		       )
-
-		    )
-		    handles: (Any 0.225 1.0)
-		  )
-		 (SubCanvasSpec
-		    name: 'FileApplicationNoteBook'
-		    tabable: false
-		    hasHorizontalScrollBar: false
-		    hasVerticalScrollBar: false
-		    majorKey: FileApplicationNoteBook
-		    createNewApplication: true
-		    createNewBuilder: true
-		  )
-		 )
-
-	      )
-	      handles: (Any 0.5 1.0)
-	    )
-	   (ViewSpec
-	      name: 'InfoBox'
-	      layout: (LayoutFrame 0 0 -26 1 0 1 0 1)
-	      level: 0
-	      visibilityChannel: infoBarVisibleHolder
-	      component:
-	     (SpecCollection
-		collection: (
-		 (LabelSpec
-		    label: 'NotifyLabel'
-		    name: 'NotifyLabel'
-		    layout: (LayoutFrame 0 0 1 0.0 -220 1 1 1.0)
-		    level: -1
-		    translateLabel: true
-		    labelChannel: notifyChannel
-		    adjust: left
-		  )
-		 (LabelSpec
-		    label: 'encoding'
-		    name: 'EncodingLabel'
-		    layout: (LayoutFrame -318 1 2 0.0 -235 1 0 1.0)
-		    activeHelpKey: encodingLabel
-		    level: 0
-		    labelChannel: fileEncodingHolder
-		    adjust: right
-		    menu: encodingMenu
-		  )
-		 (LabelSpec
-		    name: 'FileEncodingLockedLabel'
-		    layout: (LayoutFrame -235 1 2 0.0 -220 1 20 0.0)
-		    activeHelpKey: encodingLockedLabel
-		    level: 0
-		    labelChannel: fileEncodingLockImageHolder
-		    adjust: right
-		    menu: encodingMenu
-		  )
-		 (LabelSpec
-		    label: 'Shown Files'
-		    name: 'ShownFilesLabel'
-		    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
-		    activeHelpKey: numberOfFiles
-		    level: -1
-		    translateLabel: true
-		    labelChannel: shownFiles
-		    adjust: right
-		  )
-		 (ViewSpec
-		    name: 'ProgressIndicatorBox'
-		    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
-		    level: -1
-		    visibilityChannel: activityVisibilityChannel
-		    component:
-		   (SpecCollection
-		      collection: (
-		       (ProgressIndicatorSpec
-			  name: 'ProgressIndicator1'
-			  layout: (LayoutFrame 5 0.0 -7 0.5 -5 1.0 7 0.5)
-			  backgroundColor: (Color 0.0 66.6666666666667 66.6666666666667)
-			  isActivityIndicator: true
-			)
-		       )
-
-		    )
-		  )
-		 (LabelSpec
-		    name: 'BusyLabel'
-		    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
-		    activeHelpKey: modeLabel
-		    level: -1
-		    visibilityChannel: busyLabelVisibleHolder
-		    translateLabel: true
-		    labelChannel: busyLabelHolder
-		    adjust: right
-		  )
-		 (LabelSpec
-		    label: 'M'
-		    name: 'ModeLabel'
-		    layout: (LayoutFrame -65 1 1 0.0 -55 1 1 1.0)
-		    activeHelpKey: modeLabel
-		    level: -1
-		    translateLabel: true
-		    labelChannel: modeLabelHolder
-		    adjust: right
-		    postBuildCallback: postBuildEditModeInfoLabel:
-		  )
-		 (LabelSpec
-		    label: 'L'
-		    name: 'LineLabel'
-		    layout: (LayoutFrame -55 1 1 0.0 -20 1 1 1.0)
-		    activeHelpKey: lineLabel
-		    level: -1
-		    translateLabel: true
-		    labelChannel: cursorLineLabelHolder
-		    adjust: right
-		  )
-		 (LabelSpec
-		    label: 'C'
-		    name: 'ColLabel'
-		    layout: (LayoutFrame -20 1 1 0.0 0 1 1 1.0)
-		    activeHelpKey: columnLabel
-		    level: -1
-		    translateLabel: true
-		    labelChannel: cursorColLabelHolder
-		    adjust: right
-		  )
-		 )
-
-	      )
-	      keepSpaceForOSXResizeHandleH: true
-	    )
-	   (LabelSpec
-	      label: 'Preview'
-	      name: 'PreviewLabel'
-	      layout: (LayoutFrame 0 0.5 39 0 100 0.5 61 0)
-	      level: 0
-	      borderWidth: 1
-	      visibilityChannel: previewVisibleHolder
-	      backgroundColor: (Color 86.9993133440147 86.9993133440147 86.9993133440147)
-	      translateLabel: true
-	    )
-	   (ArbitraryComponentSpec
-	      name: 'Preview'
-	      layout: (LayoutFrame 0 0.5 63 0 -147 1 -319 1)
-	      level: 1
-	      visibilityChannel: previewVisibleHolder
-	      hasBorder: false
-	      component: ImageView
-	    )
-	   (ActionButtonSpec
-	      label: 'closePreviewButtonImage'
-	      name: 'ClosePreviewButton'
-	      layout: (LayoutFrame -169 1 39 0 -147 1 61 0)
-	      visibilityChannel: previewVisibleHolder
-	      hasCharacterOrientedLabel: false
-	      translateLabel: true
-	    )
-	   )
-
-	)
+          collection: (
+           (ViewSpec
+              name: 'ToolbarBox'
+              layout: (LayoutFrame 0 0 0 0 0 1 40 0)
+              level: 0
+              visibilityChannel: toolBarVisibleHolder
+              component: 
+             (SpecCollection
+                collection: (
+                 (ActionButtonSpec
+                    label: 'hideToolBarIcon'
+                    name: 'HideToolBarButton'
+                    layout: (LayoutFrame 0 0 0 0 13 0 40 0)
+                    activeHelpKey: hideToolBar
+                    hasCharacterOrientedLabel: false
+                    translateLabel: true
+                    model: hideToolbar
+                    postBuildCallback: hideToolBarButtonCreated:
+                  )
+                 (MenuPanelSpec
+                    name: 'ToolBar'
+                    layout: (LayoutFrame 13 0 0 0 0 1 40 0)
+                    menu: toolBarMainMenu
+                    textDefault: true
+                  )
+                 )
+               
+              )
+            )
+           (ViewSpec
+              name: 'FilenameEntryFieldBox'
+              layout: (LayoutFrame 0 0 40 0 0 1 65 0)
+              level: 0
+              visibilityChannel: filenameEntryFieldVisibleHolder
+              component: 
+             (SpecCollection
+                collection: (
+                 (ActionButtonSpec
+                    label: 'hideFilenameEntryFieldIcon'
+                    name: 'HideFilenameEntryFieldButton'
+                    layout: (LayoutFrame 0 0 0 0 13 0 0 1)
+                    activeHelpKey: hideFilenameEntryField
+                    hasCharacterOrientedLabel: false
+                    translateLabel: true
+                    model: hideFilenameEntryField
+                    postBuildCallback: hideFilenameEntryFieldButtonCreated:
+                  )
+                 (HorizontalPanelViewSpec
+                    name: 'HorizontalPanel1'
+                    layout: (LayoutFrame 13 0.0 0 0.0 0 1.0 0 1.0)
+                    level: 1
+                    horizontalLayout: leftFit
+                    verticalLayout: fit
+                    horizontalSpace: 3
+                    verticalSpace: 3
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (ComboListSpec
+                          name: 'ComboList1'
+                          visibilityChannel: driveSelectorVisible
+                          model: selectedDeviceDrive
+                          comboList: listOfDeviceDrives
+                          useIndex: false
+                          hidePullDownMenuButton: false
+                          extent: (Point 53 23)
+                        )
+                       (VariableHorizontalPanelSpec
+                          name: 'VariableHorizontalPanel1'
+                          level: 0
+                          showHandle: true
+                          component: 
+                         (SpecCollection
+                            collection: (
+                             (NonScrollableArbitraryComponentSpec
+                                name: 'NonScrollableArbitraryComponent1'
+                                component: FilenameEditFieldV2
+                                postBuildCallback: postBuildEditField:
+                              )
+                             (ViewSpec
+                                name: 'FilterBox'
+                                component: 
+                               (SpecCollection
+                                  collection: (
+                                   (LabelSpec
+                                      label: 'Filter:'
+                                      name: 'Filter'
+                                      layout: (LayoutFrame 0 0 0 0 40 0 0 1)
+                                      translateLabel: true
+                                      adjust: left
+                                      postBuildCallback: postBuildPathViewBox:
+                                    )
+                                   (ComboBoxSpec
+                                      name: 'FilterSelectionBox'
+                                      layout: (LayoutFrame 40 0 0 0 0 1 0 1)
+                                      model: filterModel
+                                      immediateAccept: true
+                                      acceptOnPointerLeave: false
+                                      comboList: filterListModel
+                                    )
+                                   )
+                                 
+                                )
+                                postBuildCallback: postBuildPathViewBox:
+                              )
+                             )
+                           
+                          )
+                          handles: (Any 0.774936 1.0)
+                          postBuildCallback: postBuildPathViewBox:
+                          useDefaultExtent: true
+                        )
+                       )
+                     
+                    )
+                    postBuildCallback: postBuildPathViewBox:
+                  )
+                 )
+               
+              )
+            )
+           (#'FileBrowserV2UISpecifications::PanelSpec'
+              name: 'BrowserBox'
+              layout: (LayoutFrame 0 0.0 65 0.0 0 1.0 -26 1.0)
+              level: 0
+              showHandle: true
+              snapMode: both
+              whichView: last
+              orientation: vertical
+              visibility: viewNoteBookApplicationHolder
+              component: 
+             (SpecCollection
+                collection: (
+                 (#'FileBrowserV2UISpecifications::PanelSpec'
+                    name: 'HorizontalPanel'
+                    level: 0
+                    snapMode: both
+                    whichView: first
+                    orientation: horizontal
+                    visibility: showDirectoryTree
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (SubCanvasSpec
+                          name: 'DirectoryTreeBrowser'
+                          hasHorizontalScrollBar: false
+                          hasVerticalScrollBar: false
+                          majorKey: DirectoryTreeBrowser
+                          createNewApplication: true
+                          createNewBuilder: true
+                          postBuildCallback: postBuildDirectoryTree:
+                        )
+                       (SubCanvasSpec
+                          name: 'DirectoryContentsBrowser'
+                          hasHorizontalScrollBar: false
+                          hasVerticalScrollBar: false
+                          majorKey: DirectoryContentsBrowser
+                          createNewApplication: true
+                          createNewBuilder: true
+                        )
+                       )
+                     
+                    )
+                    handles: (Any 0.225 1.0)
+                  )
+                 (SubCanvasSpec
+                    name: 'FileApplicationNoteBook'
+                    tabable: false
+                    hasHorizontalScrollBar: false
+                    hasVerticalScrollBar: false
+                    majorKey: FileApplicationNoteBook
+                    createNewApplication: true
+                    createNewBuilder: true
+                  )
+                 )
+               
+              )
+              handles: (Any 0.5 1.0)
+            )
+           (ViewSpec
+              name: 'InfoBox'
+              layout: (LayoutFrame 0 0 -26 1 0 1 0 1)
+              level: 0
+              visibilityChannel: infoBarVisibleHolder
+              component: 
+             (SpecCollection
+                collection: (
+                 (LabelSpec
+                    label: 'NotifyLabel'
+                    name: 'NotifyLabel'
+                    layout: (LayoutFrame 0 0 1 0.0 -220 1 1 1.0)
+                    level: -1
+                    translateLabel: true
+                    labelChannel: notifyChannel
+                    adjust: left
+                  )
+                 (LabelSpec
+                    label: 'encoding'
+                    name: 'EncodingLabel'
+                    layout: (LayoutFrame -318 1 2 0.0 -235 1 0 1.0)
+                    activeHelpKey: encodingLabel
+                    level: 0
+                    labelChannel: fileEncodingHolder
+                    adjust: right
+                    menu: encodingMenu
+                  )
+                 (LabelSpec
+                    name: 'FileEncodingLockedLabel'
+                    layout: (LayoutFrame -235 1 2 0.0 -220 1 20 0.0)
+                    activeHelpKey: encodingLockedLabel
+                    level: 0
+                    labelChannel: fileEncodingLockImageHolder
+                    adjust: right
+                    menu: encodingMenu
+                  )
+                 (LabelSpec
+                    label: 'Shown Files'
+                    name: 'ShownFilesLabel'
+                    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+                    activeHelpKey: numberOfFiles
+                    level: -1
+                    translateLabel: true
+                    labelChannel: shownFiles
+                    adjust: right
+                  )
+                 (ViewSpec
+                    name: 'ProgressIndicatorBox'
+                    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+                    level: -1
+                    visibilityChannel: activityVisibilityChannel
+                    component: 
+                   (SpecCollection
+                      collection: (
+                       (ProgressIndicatorSpec
+                          name: 'ProgressIndicator1'
+                          layout: (LayoutFrame 5 0.0 -7 0.5 -5 1.0 7 0.5)
+                          backgroundColor: (Color 0.0 66.6666666666667 66.6666666666667)
+                          isActivityIndicator: true
+                        )
+                       )
+                     
+                    )
+                  )
+                 (LabelSpec
+                    name: 'BusyLabel'
+                    layout: (LayoutFrame -220 1 1 0.0 -65 1 1 1.0)
+                    activeHelpKey: modeLabel
+                    level: -1
+                    visibilityChannel: busyLabelVisibleHolder
+                    translateLabel: true
+                    labelChannel: busyLabelHolder
+                    adjust: right
+                  )
+                 (LabelSpec
+                    label: 'M'
+                    name: 'ModeLabel'
+                    layout: (LayoutFrame -65 1 1 0.0 -55 1 1 1.0)
+                    activeHelpKey: modeLabel
+                    level: -1
+                    translateLabel: true
+                    labelChannel: modeLabelHolder
+                    adjust: right
+                    postBuildCallback: postBuildEditModeInfoLabel:
+                  )
+                 (LabelSpec
+                    label: 'L'
+                    name: 'LineLabel'
+                    layout: (LayoutFrame -55 1 1 0.0 -20 1 1 1.0)
+                    activeHelpKey: lineLabel
+                    level: -1
+                    translateLabel: true
+                    labelChannel: cursorLineLabelHolder
+                    adjust: right
+                  )
+                 (LabelSpec
+                    label: 'C'
+                    name: 'ColLabel'
+                    layout: (LayoutFrame -20 1 1 0.0 0 1 1 1.0)
+                    activeHelpKey: columnLabel
+                    level: -1
+                    translateLabel: true
+                    labelChannel: cursorColLabelHolder
+                    adjust: right
+                  )
+                 )
+               
+              )
+              keepSpaceForOSXResizeHandleH: true
+            )
+           (LabelSpec
+              label: 'Preview'
+              name: 'PreviewLabel'
+              layout: (LayoutFrame 0 0.5 39 0 100 0.5 61 0)
+              level: 0
+              borderWidth: 1
+              visibilityChannel: previewVisibleHolder
+              backgroundColor: (Color 86.9993133440147 86.9993133440147 86.9993133440147)
+              translateLabel: true
+            )
+           (ArbitraryComponentSpec
+              name: 'Preview'
+              layout: (LayoutFrame 0 0.5 63 0 -147 1 -319 1)
+              level: 1
+              visibilityChannel: previewVisibleHolder
+              hasBorder: false
+              component: ImageView
+            )
+           (ActionButtonSpec
+              label: 'closePreviewButtonImage'
+              name: 'ClosePreviewButton'
+              layout: (LayoutFrame -169 1 39 0 -147 1 61 0)
+              visibilityChannel: previewVisibleHolder
+              hasCharacterOrientedLabel: false
+              translateLabel: true
+            )
+           )
+         
+        )
       )
 ! !
 
+
 !FileBrowserV2 class methodsFor:'menu specs'!
 
 editModeInfoLabelMenu
@@ -1247,6 +1254,7 @@
       )
 ! !
 
+
 !FileBrowserV2 methodsFor:'actions'!
 
 changeFileBrowserTitleTo:aString
@@ -1286,6 +1294,7 @@
     ].
 ! !
 
+
 !FileBrowserV2 methodsFor:'aspects'!
 
 busyLabelHolder
@@ -1432,6 +1441,7 @@
     ^ selectedDeviceDrive
 ! !
 
+
 !FileBrowserV2 methodsFor:'aspects-visibility'!
 
 busyLabelVisibleHolder
@@ -1468,6 +1478,7 @@
     ^ self aspectFor:#toolBarVisibleHolder ifAbsent:[true asValue]
 ! !
 
+
 !FileBrowserV2 methodsFor:'change & update'!
 
 currentFileNameHolderChanged
@@ -1733,6 +1744,7 @@
     ].
 ! !
 
+
 !FileBrowserV2 methodsFor:'event handling'!
 
 crPressedInPathField
@@ -1808,6 +1820,7 @@
     "Modified: / 17-05-2007 / 09:12:53 / cg"
 ! !
 
+
 !FileBrowserV2 methodsFor:'menu accessing'!
 
 menuFileHistory
@@ -1856,12 +1869,24 @@
     "Modified: / 09-09-2012 / 13:08:42 / cg"
 ! !
 
+
 !FileBrowserV2 methodsFor:'queries'!
 
+defaultWindowExtent
+    "use nearly the full screen height, but at least 768px if available.
+     Keep the width as defined in the windowSpec"
+
+    |maxHeight|
+
+    maxHeight := self window device usableHeightAt:self window origin.
+    ^ Point x:nil y:(((maxHeight - 200) max:self window extent y) min:maxHeight).
+!
+
 getAllFilesAsStrings
     ^ self directoryContentsBrowser getAllFilesAsStrings
 ! !
 
+
 !FileBrowserV2 methodsFor:'startup & release'!
 
 closeRequest
@@ -2023,10 +2048,11 @@
     ^ super release
 ! !
 
+
 !FileBrowserV2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.205 2013-01-26 21:04:45 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/FileBrowserV2.st,v 1.206 2013-04-16 13:04:04 stefan Exp $'
 !
 
 version_HG
--- a/SyntaxHighlighter2.st	Tue Apr 16 16:11:00 2013 +0200
+++ b/SyntaxHighlighter2.st	Wed Apr 17 10:22:54 2013 +0200
@@ -63,8 +63,11 @@
 "
 ! !
 
+
 !SyntaxHighlighter2 class methodsFor:'highlighting'!
 
+
+
 formatClassDefinition:aString in:aClass elementsInto: elements
     "format (recolor) a class definition expression in a given class.
      Return the text containing font changes and color information."
@@ -209,7 +212,10 @@
 
     "Modified: / 22-08-2006 / 13:32:04 / cg"
     "Created: / 05-07-2011 / 10:39:21 / cg"
-! !
+!
+
+ !
+
 
 !SyntaxHighlighter2 methodsFor:'accessing'!
 
@@ -232,6 +238,7 @@
     "Created: / 16-02-2012 / 09:56:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !SyntaxHighlighter2 methodsFor:'initialization'!
 
 initialize
@@ -245,6 +252,7 @@
     "Modified: / 16-02-2012 / 09:59:58 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !SyntaxHighlighter2 methodsFor:'parsing-expressions'!
 
 _binaryExpressionFor:receiverArg
@@ -542,6 +550,8 @@
     "Created: / 16-02-2012 / 21:56:51 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 expression
     | node savedLastSelectorElement |
 
@@ -561,6 +571,8 @@
     "Modified: / 16-02-2012 / 23:39:15 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 unaryExpressionFor:receiverArg
     "parse a unary-expression; return a node-tree, nil or #Error"
 
@@ -645,6 +657,7 @@
     "Created: / 16-02-2012 / 22:21:33 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+
 !SyntaxHighlighter2 methodsFor:'syntax detection'!
 
 markArgumentIdentifierFrom:pos1 to:pos2
@@ -671,6 +684,8 @@
     "Created: / 17-03-2012 / 19:02:40 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 markLocalIdentifierFrom:pos1 to:pos2
     | node el prevEl |
 
@@ -689,7 +704,7 @@
 
 markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode
 
-    | element |
+    | element selectorSymbol |
 
     "Special hack for Java class references - I would like to have them
      marked specially (and not as an error when the class is not yet loaded -
@@ -702,8 +717,11 @@
     ] ifFalse:[
         super markSelector:selectorString from:pos1 to:pos2 receiverNode:aReceiverNode.
     ].
+    
+    "don't create symbols for partial typed selectors"
+    selectorSymbol := selectorString asSymbolIfInterned.
 
-    element := elements newElementFor: (SelectorNode value: selectorString from: pos1 to: pos2).
+    element := SyntaxElement from: pos1 to: pos2 type: #selector value: selectorSymbol ? selectorString.
 
     (lastSelectorElement notNil "and:[lastSelectorElement value = selectorString]") ifTrue:[
         lastSelectorElement next: element.
@@ -714,10 +732,13 @@
                                 ifFalse:[element].
 
     "Created: / 14-02-2010 / 17:40:09 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+    "Modified: / 14-02-2010 / 19:24:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
     "Modified (format): / 21-08-2011 / 09:18:21 / cg"
     "Modified: / 19-04-2012 / 09:53:59 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 !
 
+
+
 markUnknownIdentifierFrom:pos1 to:pos2
 
     ignoreBadIdentifier == true ifTrue:[ ^ self ].
@@ -728,6 +749,8 @@
     "Modified: / 31.3.1998 / 19:10:30 / cg"
 !
 
+
+
 rememberVariableElementFor:name type:typeSymbol from:pos1 to:pos2
     |element prev|
 
@@ -744,10 +767,11 @@
     "Created: / 21-08-2011 / 09:26:24 / cg"
 ! !
 
+
 !SyntaxHighlighter2 class methodsFor:'documentation'!
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.10 2012-10-19 14:59:02 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/SyntaxHighlighter2.st,v 1.12 2013-04-16 17:24:24 stefan Exp $'
 !
 
 version_HG
--- a/Tools_MethodList.st	Tue Apr 16 16:11:00 2013 +0200
+++ b/Tools_MethodList.st	Wed Apr 17 10:22:54 2013 +0200
@@ -820,7 +820,9 @@
             (mthd notNil and:[mthd isWrapped or:[mthd isMethodWithBreakpoints]]) ifTrue:[
                 (methodList includes:mthd originalMethod) ifTrue:[
                     methodList replaceAll:mthd originalMethod with:mthd.
-                    lastSelectedMethods replaceAll:mthd originalMethod with:mthd.
+                    lastSelectedMethods notNil ifTrue:[
+                        lastSelectedMethods replaceAll:mthd originalMethod with:mthd.
+                    ].
                 ]
             ].
             mustFlushInheritanceInfo := false.    
@@ -1811,10 +1813,10 @@
 !MethodList class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.84 2013-04-10 08:36:58 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.85 2013-04-16 18:09:58 cg Exp $'
 !
 
 version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.84 2013-04-10 08:36:58 stefan Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/Tools_MethodList.st,v 1.85 2013-04-16 18:09:58 cg Exp $'
 ! !