summaryrefslogtreecommitdiff
path: root/src/main/java/com/c2kernel/gui/MainFrame.java
diff options
context:
space:
mode:
authorAndrew Branson <andrew.branson@cern.ch>2013-02-08 15:17:48 +0100
committerAndrew Branson <andrew.branson@cern.ch>2013-02-08 15:17:48 +0100
commit8849a5f9cdea4c5cabc2216b38f35274375b4c05 (patch)
tree39f0a2962629f31d03288001d71b987fbb5ef62c /src/main/java/com/c2kernel/gui/MainFrame.java
parent1e7f63219e88b36d788dda8cc4d07c13f840d82d (diff)
Added bouncy bar to the status pane to make people feel better when the
system is busy.
Diffstat (limited to 'src/main/java/com/c2kernel/gui/MainFrame.java')
-rw-r--r--src/main/java/com/c2kernel/gui/MainFrame.java24
1 files changed, 6 insertions, 18 deletions
diff --git a/src/main/java/com/c2kernel/gui/MainFrame.java b/src/main/java/com/c2kernel/gui/MainFrame.java
index 577db7b..1e9123f 100644
--- a/src/main/java/com/c2kernel/gui/MainFrame.java
+++ b/src/main/java/com/c2kernel/gui/MainFrame.java
@@ -1,8 +1,5 @@
package com.c2kernel.gui;
-import java.awt.BorderLayout;
-import java.awt.Color;
import java.awt.Dimension;
-import java.awt.Font;
import java.awt.GridBagConstraints;
import java.awt.GridBagLayout;
import java.awt.Point;
@@ -14,13 +11,10 @@ import java.net.URL;
import java.util.Properties;
import java.util.StringTokenizer;
-import javax.swing.BorderFactory;
import javax.swing.ImageIcon;
import javax.swing.JComboBox;
import javax.swing.JFileChooser;
-import javax.swing.JLabel;
import javax.swing.JOptionPane;
-import javax.swing.JPanel;
import javax.swing.JSplitPane;
import javax.swing.SwingUtilities;
import javax.swing.UIManager;
@@ -48,7 +42,8 @@ public class MainFrame extends javax.swing.JFrame {
protected MenuBuilder menuBuilder;
protected org.omg.CORBA.ORB orb;
public static Properties prefs = new Properties();
- public static JLabel status = new JLabel();
+
+ public static ProgressReporter progress;
public String logoURL;
public static AgentProxy userAgent;
protected JSplitPane splitPane;
@@ -179,21 +174,14 @@ public class MainFrame extends javax.swing.JFrame {
c.fill = GridBagConstraints.BOTH;
gridbag.setConstraints(getSplitPanel(), c);
getContentPane().add(getSplitPanel());
- // setup status bar
- status.setText("Cristal 2");
- status.setFont(
- new Font("SansSerif", Font.PLAIN, status.getFont().getSize()));
- JPanel statusPanel = new JPanel();
- statusPanel.setLayout(new BorderLayout());
- statusPanel.setBorder(BorderFactory.createLoweredBevelBorder());
- status.setForeground(Color.black);
- statusPanel.add(status);
+ progress = new ProgressReporter();
c.gridy++;
c.weighty = 0.0;
- gridbag.setConstraints(statusPanel, c);
- getContentPane().add(statusPanel);
+ gridbag.setConstraints(progress, c);
+ getContentPane().add(progress);
pack();
+
String paneSize = getPref("WindowSize", null);
if (paneSize != null) {
StringTokenizer tok = new StringTokenizer(paneSize, ",");