X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FProgressPanel.java;h=023080579777c0dd2c15656c66ee14168e66c893;hb=69b246bd6330f05271ca15a440c8442b03b7db6c;hp=1f87838946b815041925594cf291302091dd3136;hpb=0c4b75bb2b3973218c9aa86f9bec19cd3dc5dcd5;p=jalview.git diff --git a/src/jalview/gui/ProgressPanel.java b/src/jalview/gui/ProgressPanel.java index 1f87838..0230805 100644 --- a/src/jalview/gui/ProgressPanel.java +++ b/src/jalview/gui/ProgressPanel.java @@ -24,6 +24,8 @@ 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; @@ -31,7 +33,6 @@ import javax.swing.JLabel; import javax.swing.JPanel; import javax.swing.JProgressBar; import javax.swing.border.EmptyBorder; -import javax.swing.border.EtchedBorder; /** * A class to manage a panel containing a label and progress bar updated by an @@ -72,23 +73,34 @@ 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 labelPanel.setLayout(labelLayout); barPanel.setLayout(barLayout); - + labelPanel.add(progressLabel, VISIBLE); labelPanel.add(new JPanel(), INVISIBLE); barPanel.add(progressBar, VISIBLE); @@ -101,7 +113,8 @@ public class ProgressPanel extends JPanel implements RendererListenerI add(barPanel, BorderLayout.CENTER); add(new JLabel(" "), BorderLayout.EAST); - setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)); + setBorder(BorderFactory.createLineBorder(Color.black)); + // setBorder(BorderFactory.createEtchedBorder(EtchedBorder.LOWERED)); } @Override