Changeset 4771

Timestamp:

06/06/08 08:40:32 (6 months ago)

Author:

marc.englund@…

Message:

Fixed multiple bugs in ProgressIndicator?: polled even if disabled or invisible (#1581), had no isIndeterminate(), did not call requestRepaint() when changing polling interval or indeterminate mode.

Location:

trunk

Files:

• WebContent/ITMILL/themes/default/progressindicator/img/disabled.gif (added)
• WebContent/ITMILL/themes/default/progressindicator/progressindicator.css (modified) (2 diffs)
• src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java (modified) (2 diffs)
• src/com/itmill/toolkit/ui/ProgressIndicator.java (modified) (3 diffs)

trunk/WebContent/ITMILL/themes/default/progressindicator/progressindicator.css

@@ -1 +1 @@
 .i-progressindicator {
         background: #dfe2e4 url(img/base.gif);
+        height: 9px;
+        border: 1px solid #b6bbbc;
+        overflow: hidden; /* for IE6 */
+}
+
+.i-progressindicator-disabled {
+        background: #dfe2e4 url(img/disabled.gif);
         height: 9px;
         border: 1px solid #b6bbbc;
@@ -18 +25 @@
         overflow: hidden; /* for IE6 */
 }
+.i-progressindicator-disabled-indeterminate {
+        background: #dfe2e4 url(../common/img/blank.gif);
+        height: 16px;
+        width: 16px;
+        overflow: hidden; /* for IE6 */
+}

trunk/src/com/itmill/toolkit/terminal/gwt/client/ui/IProgressIndicator.java

@@ -42 +42 @@
         indeterminate = uidl.getBooleanAttribute("indeterminate");
 
+        String style = CLASSNAME;
+        if (uidl.getBooleanAttribute("disabled")) {
+            style += "-disabled";
+        }
+
         if (indeterminate) {
-            this.setStyleName(CLASSNAME + "-indeterminate");
+            this.setStyleName(style + "-indeterminate");
         } else {
+            setStyleName(style);
             try {
                 final float f = Float.parseFloat(uidl
@@ -53 +59 @@
             }
         }
-        poller.scheduleRepeating(uidl.getIntAttribute("pollinginterval"));
+
+        if (!uidl.getBooleanAttribute("disabled")) {
+            poller.scheduleRepeating(uidl.getIntAttribute("pollinginterval"));
+        }
+    }
+
+    public void setVisible(boolean visible) {
+        super.setVisible(visible);
+        if (!visible) {
+            poller.cancel();
+        }
     }
 

trunk/src/com/itmill/toolkit/ui/ProgressIndicator.java

@@ -215 +215 @@
 
     /**
-     * Sets the ProgressIndicator to indeterminate mode.
+     * Sets wheter or not the ProgressIndicator is indeterminate.
      * 
      * @param newValue
@@ -222 +222 @@
     public void setIndeterminate(boolean newValue) {
         indeterminate = newValue;
+        requestRepaint();
+    }
+
+    /**
+     * Gets whether or not the ProgressIndicator is indeterminate.
+     * 
+     * @return true to set to indeterminate mode.
+     */
+    public boolean isIndeterminate() {
+        return indeterminate;
     }
 
@@ -232 +242 @@
     public void setPollingInterval(int newValue) {
         pollingInterval = newValue;
+        requestRepaint();
     }