From tchemit@users.nuiton.org Fri Mar 12 01:24:13 2010
From: tchemit@users.nuiton.org
To: jaxx-commits@list.nuiton.org
Subject:
 [Jaxx-commits] r1774 -	trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing
Date: Fri, 12 Mar 2010 01:24:11 +0100
Message-ID: <20100312002411.C4F3515D83@nuiton.codelutin.com>
MIME-Version: 1.0
Content-Type: multipart/mixed; boundary="===============3938095090119651350=="

--===============3938095090119651350==
Content-Type: text/plain; charset="utf-8"
Content-Transfer-Encoding: quoted-printable

Author: tchemit
Date: 2010-03-12 01:24:04 +0100 (Fri, 12 Mar 2010)
New Revision: 1774

Log:
improve StatusMessagePanel (add a busy scroll bar)

Modified:
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.jaxx
   trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHand=
ler.java

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePa=
nel.jaxx
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.ja=
xx	2010-03-12 00:23:15 UTC (rev 1773)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanel.ja=
xx	2010-03-12 00:24:04 UTC (rev 1774)
@@ -21,16 +21,10 @@
=20
 -->
=20
-<Table border=3D'{BorderFactory.createBevelBorder(javax.swing.border.BevelBo=
rder.LOWERED)}'=20
+<Table border=3D'{BorderFactory.createBevelBorder(javax.swing.border.BevelBo=
rder.LOWERED)}'
        insets=3D'0'
        implements=3D'java.awt.event.ActionListener'>
=20
-    <Boolean id=3D'showMemoryStatus' javaBean=3D'Boolean.TRUE'/>
-    <Boolean id=3D'showClock' javaBean=3D'Boolean.TRUE'/>
-    <Boolean id=3D'showI18n' javaBean=3D'Boolean.FALSE'/>
-
-    <StatusMessagePanelHandler id=3D'handler' />
-
     <script><![CDATA[
=20
 // To ensure status bar constant height, no matter what font are in use...
@@ -39,12 +33,38 @@
 public void clearStatus() {
     handler.stopStatusFader(this);
     getStatusLabel().setText(EMPTY_STATUS);
+    //getStatusLabel().setString(EMPTY_STATUS);
 }
=20
+public void startProgress() {
+    startProgress(null);
+}
+
+public void startProgress(final String status) {
+    setBusy(true);
+    setStatus(status);
+}
+
+public void stopProgress() {
+  stopProgress(null);
+}
+
+public void stopProgress(String finalStatus) {
+    setBusy(false);
+    setStatus(finalStatus);
+}
+
 public void setStatus(String status) {
-    handler.stopStatusFader(this);
-    getStatusLabel().setText(status);
-    handler.startStatusFader(this);
+   =20
+    if (status !=3D null) {
+        handler.stopStatusFader(this);
+        getStatusLabel().setText(status);
+        //getStatusLabel().setString(status);
+    }
+   =20
+    if (!isBusy()) {
+        handler.startStatusFader(this);
+    }
 }
=20
 @Override
@@ -68,16 +88,63 @@
 public void addWidget(Component w, int index) {
     box.add(w, index);
 }
+
+public void init() {
+    if (isShowBusy()) {
+        Dimension dim =3D new Dimension(30, 15);
+        //Dimension dim =3D new Dimension(30, (int) statusLabel.getPreferred=
Size().getHeight());
+        //log.info("dimension of busy =3D "+ dim);
+        //busyWidget.setPreferredSize(dim);
+        busyWidget.setMaximumSize(dim);
+        busyWidget.setMinimumSize(dim);
+    }
+}
+
+void $afterCompleteSetup() {
+  init();
+}
 ]]>
     </script>
+
+    <Boolean id=3D'showMemoryStatus' javaBean=3D'Boolean.TRUE'/>
+    <Boolean id=3D'showClock' javaBean=3D'Boolean.TRUE'/>
+    <Boolean id=3D'showI18n' javaBean=3D'Boolean.FALSE'/>
+    <Boolean id=3D'showBusy' javaBean=3D'Boolean.FALSE'/>
+    <Boolean id=3D'busy' javaBean=3D'Boolean.FALSE'/>
+
+    <StatusMessagePanelHandler id=3D'handler'/>
+
     <row>
-        <cell anchor=3D'west' weightx=3D'1' insets=3D'2'>
-            <JLabel id=3D'statusLabel'/>
+        <cell anchor=3D'west' fill=3D'both' weightx=3D'1'>
+            <Box constructorParams=3D'0'>
+                <JProgressBar id=3D'busyWidget'
+                              visible=3D'{isShowBusy()}'
+                              enabled=3D'{isBusy()}'
+                              indeterminate=3D'{isBusy()}'
+                              stringPainted=3D'false'
+                              borderPainted=3D'true'/>
+                <!--visible=3D'{isBusy() &amp;&amp; isShowBusy()}'-->
+
+                <JLabel id=3D'statusLabel'/>
+
+            </Box>
+
         </cell>
         <cell anchor=3D'east'>
             <Box id=3D'box' constructorParams=3D'0'>
+
+                <!--JProgressBar id=3D'busyWidget'
+                              visible=3D'{isBusy() &amp;&amp; isShowBusy()}'
+                              indeterminate=3D'{isBusy()}'
+                              stringPainted=3D'false'
+                              borderPainted=3D'true'/-->
+                <!--
+                minimumSize=3D'{new Dimension(30,1)}'
+                              maximumSize=3D'{new Dimension(30,30)}'
+                              preferredSize=3D'{new Dimension(30,30)}'
+                              -->
                 <MemoryStatusWidget/>
-                <ClockWidget/>               =20
+                <ClockWidget/>
             </Box>
         </cell>
     </row>

Modified: trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePa=
nelHandler.java
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=
=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D=3D
--- trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHan=
dler.java	2010-03-12 00:23:15 UTC (rev 1773)
+++ trunk/jaxx-widgets/src/main/java/jaxx/runtime/swing/StatusMessagePanelHan=
dler.java	2010-03-12 00:24:04 UTC (rev 1774)
@@ -20,31 +20,33 @@
  */
 package jaxx.runtime.swing;
=20
-import java.awt.Color;
-import java.awt.event.ActionListener;
-import javax.swing.Timer;
+import javax.swing.*;
+import java.awt.*;
=20
 /**
- *
  * @author chemit
  * @since 1.6.0
  */
 public class StatusMessagePanelHandler {
=20
-    protected Color statusForeground =3D null;
-    protected String statusReferenceContent =3D null;
-    protected javax.swing.Timer timer =3D null;
+    protected Color statusForeground;
=20
+    protected String statusReferenceContent;
+
+    protected Timer timer;
+
     protected void fadeStatus(StatusMessagePanel ui) {
         for (int i =3D 0; i < 8; i++) {
             // synchronized (this) {
             if (!statusReferenceContent.equals(ui.getStatusLabel().getText()=
)) {
+//            if (!statusReferenceContent.equals(ui.getStatusLabel().getStri=
ng())) {
                 return;
             }
             Color currentForeground =3D ui.getStatusLabel().getForeground();
             Color newColor =3D new Color(currentForeground.getRed(),
-                    currentForeground.getGreen(), currentForeground.getBlue(=
),
-                    currentForeground.getAlpha() - 25);
+                                       currentForeground.getGreen(),
+                                       currentForeground.getBlue(),
+                                       currentForeground.getAlpha() - 25);
             ui.getStatusLabel().setForeground(newColor);
             ui.getStatusLabel().repaint();
             // }
@@ -60,11 +62,14 @@
=20
     protected void startStatusFader(StatusMessagePanel ui) {
         statusReferenceContent =3D ui.getStatusLabel().getText();
+//        statusReferenceContent =3D ui.getStatusLabel().getString();
=20
         int millisecondsPerMinute =3D 5000;
-        timer =3D new Timer(millisecondsPerMinute, (ActionListener) ui);
+        timer =3D new Timer(millisecondsPerMinute, ui);
         timer.setRepeats(false);
-        timer.setInitialDelay((int) ((long) millisecondsPerMinute - System.c=
urrentTimeMillis() % (long) millisecondsPerMinute) + 500);
+        timer.setInitialDelay((int) ((long) millisecondsPerMinute -
+                                     System.currentTimeMillis() %
+                                     (long) millisecondsPerMinute) + 500);
         timer.start();
     }
=20


--===============3938095090119651350==--