ProgressIndicator.st
changeset 1834 ba170c21ed76
parent 1789 99a33f0b2164
child 1835 1c2180fe3976
--- a/ProgressIndicator.st	Wed Sep 06 15:50:31 2000 +0200
+++ b/ProgressIndicator.st	Tue Sep 12 12:58:11 2000 +0200
@@ -421,7 +421,7 @@
         from:200
         to:400
         during:[:val |
-            200 to:400 by:2 do:[:i |
+            200 to:400 by:5 do:[:i |
                 val value:i.
                 Delay waitForSeconds:0.1.
             ]
@@ -556,7 +556,7 @@
 progressOpenOn:progressModel label:aLabel
     "create and open a progressIndicator dialog window,
      bit do not open it modal; instead, it is opened modeless
-     and control returns tó the caller.
+     and control returns to the caller.
      The models value is assumed to be 0..1 
      (which is for compatibility and different from ST/X's percentage use)
      Added for VW compatibility (RB)."
@@ -916,15 +916,18 @@
     |progressValue labelValue p|
 
     progressValue := 0 asValue.
-    labelValue := '' asValue.
 
     connectedLabel notNil ifTrue:[
+        labelValue := (connectedLabel label ? '') asValue.
         connectedLabel 
             model:labelValue;
             aspect:#value;
             labelMessage:#value.
+    ] ifFalse:[
+        labelValue := '' asValue.
     ].
 
+
     self model:progressValue.
 
     "/ the worker process
@@ -985,5 +988,5 @@
 !ProgressIndicator class methodsFor:'documentation'!
 
 version
-    ^ '$Header: /cvs/stx/stx/libwidg2/ProgressIndicator.st,v 1.31 2000-07-25 10:00:28 cg Exp $'
+    ^ '$Header: /cvs/stx/stx/libwidg2/ProgressIndicator.st,v 1.32 2000-09-12 10:58:11 cg Exp $'
 ! !