Fileloading progressbar

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index 6ac9b76..0b88bca 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -48,6 +48,7 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
     public static Object [] jalviewClipboard;\r
 \r
+    static int fileLoadingCount= 0;\r
 \r
     /**\r
      * Creates a new Desktop object.\r
@@ -80,7 +81,8 @@ public class Desktop extends jalview.jbgui.GDesktop
         setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
         desktop = new JDesktopPane();\r
         desktop.setBackground(Color.white);\r
-        setContentPane(desktop);\r
+        getContentPane().setLayout(new BorderLayout());\r
+        getContentPane().add(desktop, BorderLayout.CENTER);\r
         desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
 \r
         // This line prevents Windows Look&Feel resizing all new windows to maximum\r
@@ -626,5 +628,42 @@ public class Desktop extends jalview.jbgui.GDesktop
     {\r
       new SequenceFetcher(null);\r
     }\r
+\r
+    JPanel progressPanel;\r
+\r
+    public void startLoading(final String fileName)\r
+    {\r
+      if (fileLoadingCount == 0)\r
+      {\r
+        progressPanel = new JPanel(new BorderLayout());\r
+        JProgressBar progressBar = new JProgressBar();\r
+        progressBar.setIndeterminate(true);\r
+\r
+        progressPanel.add(new JLabel("Loading File: " + fileName + "   "),\r
+                          BorderLayout.WEST);\r
+\r
+        progressPanel.add(progressBar, BorderLayout.CENTER);\r
+\r
+        instance.getContentPane().add(progressPanel, BorderLayout.SOUTH);\r
+      }\r
+      fileLoadingCount++;\r
+      validate();\r
+    }\r
+\r
+    public void stopLoading()\r
+    {\r
+      fileLoadingCount--;\r
+      if (fileLoadingCount < 1)\r
+      {\r
+        if(progressPanel!=null)\r
+        {\r
+          this.getContentPane().remove(progressPanel);\r
+          progressPanel = null;\r
+        }\r
+        fileLoadingCount = 0;\r
+      }\r
+      validate();\r
+    }\r
+\r
 }\r
 \r

diff --git a/src/jalview/io/FileLoader.java b/src/jalview/io/FileLoader.java
index f720804..7db0b90 100755 (executable)
--- a/src/jalview/io/FileLoader.java
+++ b/src/jalview/io/FileLoader.java
@@ -122,8 +122,11 @@ public class FileLoader
     AlignFrame af;\r
 \r
 \r
+\r
     public void run()\r
     {\r
+      Desktop.instance.startLoading(file);\r
+\r
       SequenceI[] sequences = null;\r
 \r
       if (format.equalsIgnoreCase("Jalview"))\r
@@ -194,6 +197,8 @@ public class FileLoader
       {\r
         updateRecentlyOpened();\r
       }\r
+\r
+      Desktop.instance.stopLoading();\r
     }\r
   }\r
 \r