Merge jv
authorMerge Script
Wed, 11 May 2016 07:02:25 +0200
branchjv
changeset 3676 5fdc90d84463
parent 3671 52c3c5a35e73 (current diff)
parent 3675 c7ba11759026 (diff)
child 3679 9dfbe91050ff
Merge
PNGReader.st
--- a/FlyByHelp.st	Mon May 09 06:39:17 2016 +0200
+++ b/FlyByHelp.st	Wed May 11 07:02:25 2016 +0200
@@ -88,7 +88,7 @@
     "/ don't start tooltip, if this view is not active
     "/ does not work, because motion events are reported for the current focus-view,
     "/ which is always active. Must check after we have determined the view under the pointer
-    "/ aView topView isActive ifFalse:[^ false].
+    "/      aView topView isActive ifFalse:[^ false].
 
     ^ super buttonMotion:buttonAndModifierState x:x y:y view:aView
 !
@@ -255,6 +255,7 @@
     [
         Error handle:[:ex |
             ('FlyByhelp [warning]: error while asking for helpText: ',ex description) errorPrintCR.
+            Transcript showCR:'-------------------------'.
             ex suspendedContext fullPrintAllOn:Transcript.
             "/ self halt.
         ] do:[
@@ -305,6 +306,9 @@
 !
 
 toolTipFollowsMouse
+    "if true, the tooltip-window moves with the pointer
+     so that it stays away from (does not cover) the mouse pointer"
+
     ^ false
 ! !
 
--- a/Icon.st	Mon May 09 06:39:17 2016 +0200
+++ b/Icon.st	Wed May 11 07:02:25 2016 +0200
@@ -597,6 +597,9 @@
 !
 
 preSnapshot
+    "flush cached icons contents before saving a snapshot
+     (do not save them in the image)"
+    
     self flushCachedIcons
 ! !
 
--- a/PNGReader.st	Mon May 09 06:39:17 2016 +0200
+++ b/PNGReader.st	Wed May 11 07:02:25 2016 +0200
@@ -350,7 +350,7 @@
         filter := zlibReader nextByte.
         "/ filtersSeen add: filter.
         (filter notNil and: [filter between: 0 and: 4]) ifFalse: [
-            'PNGReader: unsupported filter' infoPrintCR.
+            'PNGReader: unsupported filter: ' infoPrint. filter infoPrintCR.
             ^ self
         ].
         zlibReader next: bytesPerRow into: thisScanline startingAt: 1.
--- a/ToolApplicationModel.st	Mon May 09 06:39:17 2016 +0200
+++ b/ToolApplicationModel.st	Wed May 11 07:02:25 2016 +0200
@@ -1645,7 +1645,7 @@
 !ToolApplicationModel::HistoryEntryForMethod methodsFor:'printing'!
 
 printStringInMenu
-    ^ methodClass name , ' >> ' , (methodSelector?'?')
+    ^ methodClass name , ' » ' , (methodSelector?'?')
 
     "Modified: / 11-07-2006 / 13:53:40 / fm"
 ! !