uses jalviewfilechooser

[jalview.git] / src / jalview / gui / Desktop.java

diff --git a/src/jalview/gui/Desktop.java b/src/jalview/gui/Desktop.java
index efa283c..eaa2c5e 100755 (executable)
--- a/src/jalview/gui/Desktop.java
+++ b/src/jalview/gui/Desktop.java
@@ -44,20 +44,41 @@ public class Desktop extends jalview.jbgui.GDesktop
     setDefaultCloseOperation(JFrame.EXIT_ON_CLOSE);\r
     setVisible(true);\r
     desktop = new JDesktopPane();\r
+    desktop.setBackground(Color.white);\r
     setContentPane(desktop);\r
     desktop.setDragMode(JDesktopPane.OUTLINE_DRAG_MODE);\r
 \r
     Dimension screenSize = Toolkit.getDefaultToolkit().getScreenSize();\r
-    int width = 900, height = 650;\r
-    if(screenSize.getWidth()<width)\r
-      width = screenSize.width;\r
-    if(screenSize.getHeight()<height)\r
-      height = screenSize.height;\r
+    String x = jalview.bin.Cache.getProperty("SCREEN_X");\r
+    String y = jalview.bin.Cache.getProperty("SCREEN_Y");\r
+    String width = jalview.bin.Cache.getProperty("SCREEN_WIDTH");\r
+    String height = jalview.bin.Cache.getProperty("SCREEN_HEIGHT");\r
 \r
-    setBounds( (int)(screenSize.width-width)/2,\r
-               (int)(screenSize.height-height)/2,\r
-              width ,\r
-              height);\r
+    if(x!=null && y!=null && width!=null && height!=null)\r
+    {\r
+      setBounds( Integer.parseInt(x), Integer.parseInt(y),\r
+                 Integer.parseInt(width), Integer.parseInt(height));\r
+    }\r
+    else\r
+      setBounds( (int)(screenSize.width-900)/2,\r
+           (int)(screenSize.height-650)/2,\r
+          900 ,\r
+          650);\r
+\r
+this.addWindowListener(new WindowAdapter()\r
+{\r
+public void windowClosing(WindowEvent evt)\r
+{\r
+ jalview.bin.Cache.setProperty("SCREEN_X",\r
+                               getBounds().x + "");\r
+ jalview.bin.Cache.setProperty("SCREEN_Y",\r
+                               getBounds().y + "");\r
+ jalview.bin.Cache.setProperty("SCREEN_WIDTH", getWidth() + "");\r
+ jalview.bin.Cache.setProperty("SCREEN_HEIGHT", getHeight() + "");\r
+}\r
+});\r
+\r
+/////////Add a splashscreen on startup\r
 \r
 \r
    /////////Add a splashscreen on startup\r
@@ -75,8 +96,8 @@ public class Desktop extends jalview.jbgui.GDesktop
     catch (java.beans.PropertyVetoException e)\r
     {}\r
     frame.setResizable(true);\r
-    frame.setSize(845, 200);\r
-    frame.setLocation( (int)((getWidth()-845) /2), (int)((getHeight()-240) /2));\r
+    frame.setSize(750, 160);\r
+    frame.setLocation( (int)((getWidth()-750) /2), (int)((getHeight()-160) /2));\r
     frame.setClosable(false);\r
     frame.setIconifiable(false);\r
     frame.setMaximizable(false);\r
@@ -125,12 +146,12 @@ public class Desktop extends jalview.jbgui.GDesktop
 \r
  public void inputLocalFileMenuItem_actionPerformed(ActionEvent e)\r
  {\r
-   JFileChooser chooser = new JFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"));\r
+   JalviewFileChooser chooser = new JalviewFileChooser();\r
    chooser.setFileView(new JalviewFileView());\r
    chooser.setDialogTitle("Open local file");\r
    chooser.setToolTipText("Open");\r
    int value = chooser.showOpenDialog(this);\r
-   if(value == JFileChooser.APPROVE_OPTION)\r
+   if(value == JalviewFileChooser.APPROVE_OPTION)\r
    {\r
      String choice =  chooser.getSelectedFile().getPath();\r
      jalview.bin.Cache.setProperty("LAST_DIRECTORY", choice);\r