InspectorView.st
branchjv
changeset 12268 cb43ab66c093
parent 12265 f1b3696cf042
child 12287 400a99059170
--- a/InspectorView.st	Thu Jul 26 11:10:37 2012 +0100
+++ b/InspectorView.st	Thu Jul 26 17:09:41 2012 +0100
@@ -76,6 +76,8 @@
 
             InspectorView openOn:Display
             InspectorView openOn:Display monitor:'shiftDown'
+            InspectorView openOn:(Image fromScreen)
+            InspectorView openOn:(Image fromFile:'banner8.xpm')
 
     The InspectorView can also be used as a subComponent within another view.
     In this case, the isStandAlone flag should be cleared, to prevent the
@@ -208,14 +210,14 @@
      see if two objects are identical (and is very useful, indeed).
      WARNING: used by both Inspector and Inspector2 !!!!!!"
 
-    |lbl id|
+    |lbl id extra|
 
     lbl := ''.
     (anObject isImmediate
     or:[anObject isBoolean]) ifFalse:[
         lbl := '<%2> ' 
     ].
-    lbl := lbl , '%1'.
+    lbl := lbl , '%1%3'.
 
     IdDictionary isNil ifTrue:[
         IdDictionary := WeakIdentityDictionary new.
@@ -232,10 +234,19 @@
                     ].
     ] valueUninterruptably.
 
+    extra := ''.
+    "/ the following should be provided by the inspected object (labelInInspector)
+    anObject isImage ifTrue:[
+        anObject fileName notNil ifTrue:[
+            extra := ' (', anObject fileName asFilename baseName,')'
+        ]
+    ].
+
     ^ self classResources 
         string:lbl 
         with:(self labelNameFor:anObject)
         with:id
+        with:extra
 
     "Created: / 15-07-2011 / 16:21:44 / cg"
 !
@@ -3047,31 +3058,15 @@
     "return the iconLabel to use in my topView, when inspecting anObject.
      Simply returns the className or name of anObjects class"
 
-    |s|
-
-    anObject isClass ifTrue:[
-        s := anObject displayString
-    ] ifFalse:[
-        (anObject isImmediate
-         or:[anObject isBoolean]) ifTrue:[
-            s := anObject printString , ', ' , anObject classNameWithArticle
-        ] ifFalse:[
-            s := anObject classNameWithArticle
-        ].
-    ].
-    s isNil ifTrue:[
-        anObject isBehavior ifTrue:[
-            ^ 'someBehavior'
-        ].
-        ^ 'something'
-    ].
-    ^ s
+    ^ self class labelNameFor:anObject
 
     "
      1234 inspect
      true inspect
      $a inspect
     "
+
+    "Modified: / 25-07-2012 / 10:15:06 / cg"
 !
 
 selectedKeyName
@@ -3298,13 +3293,13 @@
 !InspectorView class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.270 2012/07/22 08:02:43 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.272 2012/07/25 11:22:23 cg Exp $'
 !
 
 version_CVS
-    ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.270 2012/07/22 08:02:43 cg Exp §'
+    ^ '§Header: /cvs/stx/stx/libtool/InspectorView.st,v 1.272 2012/07/25 11:22:23 cg Exp §'
 !
 
 version_SVN
-    ^ '$Id: InspectorView.st 8022 2012-07-25 09:51:30Z vranyj1 $'
+    ^ '$Id: InspectorView.st 8026 2012-07-26 16:09:41Z vranyj1 $'
 ! !