X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FProgressPanel.java;h=170e9eb3987f6883c71d8f2097a033f03511e563;hb=95d4b3209ee3ab5f13232da00dc23153da86bc28;hp=5417a1dc99f78f60748d8767dbebb01e4ceb276b;hpb=16010b4222b4cf81b839fb5ff124ed369556a827;p=jalview.git

diff --git a/src/jalview/gui/ProgressPanel.java b/src/jalview/gui/ProgressPanel.java
index 5417a1d..170e9eb 100644
--- a/src/jalview/gui/ProgressPanel.java
+++ b/src/jalview/gui/ProgressPanel.java
@@ -24,8 +24,11 @@ import jalview.api.RendererListenerI;
 
 import java.awt.BorderLayout;
 import java.awt.CardLayout;
+import java.awt.Color;
+import java.awt.Dimension;
 import java.beans.PropertyChangeEvent;
 
+import javax.swing.BorderFactory;
 import javax.swing.JLabel;
 import javax.swing.JPanel;
 import javax.swing.JProgressBar;
@@ -70,17 +73,28 @@ public class ProgressPanel extends JPanel implements RendererListenerI
    * @param label
    *          The label to place next to the progress bar
    */
-  public ProgressPanel(String eventPropertyName, String label)
+  public ProgressPanel(String eventPropertyName, String label, int maxwidth)
   {
     super(new BorderLayout(10, 0));
-    setBorder(new EmptyBorder(0, 3, 0, 20));
+    setBorder(new EmptyBorder(0, 3, 0, 0));
 
     eventName = eventPropertyName;
     String labelText = label;
 
-    progressBar = new JProgressBar();
+    final int w = maxwidth;
+
+    progressBar = new JProgressBar()
+    {
+      @Override
+      public Dimension getMaximumSize()
+      {
+        return new Dimension(w, 1);
+      }
+    };
     progressBar.setMinimum(0);
+    progressBar.setPreferredSize(progressBar.getMaximumSize());
     progressLabel = new JLabel(labelText);
+    progressLabel.setFont(new java.awt.Font("Verdana", 0, 11));
 
     // Use a CardLayout to stop the progress bar panel moving around when
     // changing visibility
@@ -97,6 +111,10 @@ public class ProgressPanel extends JPanel implements RendererListenerI
 
     add(labelPanel, BorderLayout.WEST);
     add(barPanel, BorderLayout.CENTER);
+    add(new JLabel(" "), BorderLayout.EAST);
+
+    setBorder(BorderFactory.createLineBorder(Color.black));
+    // setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED));
   }
 
   @Override
@@ -120,7 +138,7 @@ public class ProgressPanel extends JPanel implements RendererListenerI
         labelLayout.show(labelPanel, VISIBLE);
         barLayout.show(barPanel, VISIBLE);
       }
-      else if (progress >= MAXVALUE)
+      if (progress >= MAXVALUE)
       {
         labelLayout.show(labelPanel, INVISIBLE);
         barLayout.show(barPanel, INVISIBLE);