Merge jv
authorMerge Script
Sun, 06 Mar 2016 07:04:45 +0100
branchjv
changeset 16140 d10ad942a667
parent 16137 d0dd3f718e92 (current diff)
parent 16139 3cd126af8cb9 (diff)
child 16145 d30891e2e694
Merge
InspectorView.st
NewLauncher.st
--- a/InspectorView.st	Fri Mar 04 16:06:17 2016 +0000
+++ b/InspectorView.st	Sun Mar 06 07:04:45 2016 +0100
@@ -1994,7 +1994,7 @@
     |sel|
 
     sel := self selection.
-    (object isFilename or:[sel isFilename]) ifTrue:[
+    (object isFilename or:[sel isFilename or:[sel isString and:[sel asFilename exists]]]) ifTrue:[
         OperatingSystem isMSWINDOWSlike ifTrue:[
             ^ #(
                        ('Show in Explorer'             #showInWindowsExplorer)
--- a/NewLauncher.st	Fri Mar 04 16:06:17 2016 +0000
+++ b/NewLauncher.st	Sun Mar 06 07:04:45 2016 +0100
@@ -2675,30 +2675,6 @@
             label: '-'
           )
          (MenuItem
-            activeHelpKey: systemInterruptLatency
-            label: 'Interrupt Latency'
-            itemValue: startLatencyMonitor
-            isVisible: false
-          )
-         (MenuItem
-            label: '-'
-            isVisible: false
-          )
-         (MenuItem
-            activeHelpKey: systemEventView
-            label: 'Event View'
-            itemValue: openApplication:
-            argument: 'EventMonitor'
-          )
-         (MenuItem
-            activeHelpKey: systemEventTrace
-            label: 'Event Trace'
-            itemValue: startStopEventTrace
-          )
-         (MenuItem
-            label: '-'
-          )
-         (MenuItem
             activeHelpKey: systemGarbageCollect
             label: 'Collect Garbage'
             itemValue: garbageCollect
@@ -2886,6 +2862,30 @@
                   itemValue: timestampTranscriptMessages:
                   indication: timestampTranscriptMessages
                 )
+         (MenuItem
+            label: '-'
+          )
+         (MenuItem
+            activeHelpKey: systemInterruptLatency
+            label: 'Interrupt Latency'
+            itemValue: startLatencyMonitor
+            isVisible: false
+          )
+         (MenuItem
+            label: '-'
+            isVisible: false
+          )
+         (MenuItem
+            activeHelpKey: systemEventView
+            label: 'Event View'
+            itemValue: openApplication:
+            argument: 'EventMonitor'
+          )
+         (MenuItem
+            activeHelpKey: systemEventTrace
+            label: 'Event Trace'
+            itemValue: startStopEventTrace
+          )
                (MenuItem
                   label: '-'
                 )