Tools__InlineMessageDialog.st
changeset 11249 be269c303ff2
parent 11248 6387822f8d7a
child 11509 7fa7922c44a0
--- a/Tools__InlineMessageDialog.st	Sun Feb 12 00:35:59 2012 +0100
+++ b/Tools__InlineMessageDialog.st	Sun Feb 12 01:07:09 2012 +0100
@@ -225,12 +225,6 @@
       )
 ! !
 
-!InlineMessageDialog class methodsFor:'others'!
-
-version_CVS
-    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.4 2012-02-11 23:35:59 vrany Exp $'
-! !
-
 !InlineMessageDialog methodsFor:'accessing'!
 
 message: aString
@@ -242,7 +236,17 @@
 
 progress: aNumberOrNil
 
-    self progressHolder value: aNumberOrNil
+    aNumberOrNil isNumber ifTrue:[
+        progressView notNil ifTrue:[
+            progressView showBusyIndication: false.
+        ].
+        self progressHolder value: aNumberOrNil
+    ] ifFalse:[
+        progressView notNil ifTrue:[
+            progressView showBusyIndication: true.
+        ]
+
+    ]
 
     "Created: / 28-10-2010 / 18:24:21 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
@@ -361,6 +365,14 @@
     "Modified: / 28-10-2010 / 18:29:05 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
+!InlineMessageDialog methodsFor:'hooks'!
+
+postBuildProgressView: aProgressIndicator
+    progressView := aProgressIndicator
+
+    "Created: / 10-02-2012 / 10:42:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
+! !
+
 !InlineMessageDialog methodsFor:'informing'!
 
 information: message 
@@ -392,8 +404,8 @@
         self show: #progressInfoSpec.
         [
             block value.    
-        ] on: ProgressNotification do:[:ex|
-            self progress: ex progressValue.
+        ] on: ProgressNotification , ActivityNotification do:[:ex|
+            self progress: ex parameter.
             ex messageText notNil ifTrue:[
                 self message: ex messageText.    
             ].
@@ -409,18 +421,6 @@
     "Created: / 10-02-2012 / 10:34:17 / Jan Vrany <jan.vrany@fit.cvut.cz>"
 ! !
 
-!InlineMessageDialog methodsFor:'initializing'!
-
-postBuildProgressView: aView
-
-    aView showBusyIndication:
-        (BlockValue
-            with: [:p|p value isNil]
-            argument: self progressHolder)
-
-    "Created: / 10-02-2012 / 10:42:01 / Jan Vrany <jan.vrany@fit.cvut.cz>"
-! !
-
 !InlineMessageDialog methodsFor:'private'!
 
 getMyView
@@ -493,6 +493,14 @@
 
 !InlineMessageDialog class methodsFor:'documentation'!
 
+version
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.5 2012-02-12 00:07:09 vrany Exp $'
+!
+
+version_CVS
+    ^ '$Header: /cvs/stx/stx/libtool/Tools__InlineMessageDialog.st,v 1.5 2012-02-12 00:07:09 vrany Exp $'
+!
+
 version_SVN
     ^ '§Id: Tools__InlineMessageDialog.st 7881 2012-02-11 22:16:34Z vranyj1 §'
 ! !