startup file added

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 075065e..1553de5 100755 (executable)
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -2,12 +2,14 @@ package jalview.gui;
 \r
 import jalview.jbgui.*;\r
 import jalview.schemes.*;\r
+import jalview.io.*;\r
 \r
 import jalview.bin.Cache;\r
 import javax.swing.*;\r
 import java.awt.event.ActionEvent;\r
 import java.awt.*;\r
 \r
+\r
 public class Preferences extends GPreferences\r
 {\r
   static boolean preferencesLoaded=false;\r
@@ -23,6 +25,8 @@ public class Preferences extends GPreferences
   public static String fontStyle;\r
   public static char gapSymbol='-';\r
   public static String defaultColour=null;\r
+  public static boolean showStartupFile=true;\r
+  public static String startupFile = "http://www.compbio.dundee.ac.uk/~andrew/jalviewTEST/fasta";\r
 \r
   JInternalFrame frame;\r
 \r
@@ -36,7 +40,6 @@ public class Preferences extends GPreferences
   if(string!=null)\r
     showFullscreen = Boolean.valueOf(string).booleanValue();\r
 \r
-\r
   string = Cache.getProperty("SHOW_ANNOTATIONS");\r
       if(string!=null)\r
     showAnnotation = Boolean.valueOf(string).booleanValue();\r
@@ -67,6 +70,13 @@ public class Preferences extends GPreferences
   if(string!=null)\r
       defaultColour = string;\r
 \r
+  string = Cache.getProperty("STARTUP_FILE");\r
+    if(string!=null)\r
+      startupFile = string;\r
+\r
+  string = Cache.getProperty("SHOW_STARTUP_FILE");\r
+        if(string!=null)\r
+      showStartupFile = Boolean.valueOf(string).booleanValue();\r
 \r
       preferencesLoaded = true;\r
   }\r
@@ -78,7 +88,7 @@ public class Preferences extends GPreferences
 \r
     frame = new JInternalFrame();\r
     frame.setContentPane(this);\r
-    Desktop.addInternalFrame(frame, "Preferences", 480,350 );\r
+    Desktop.addInternalFrame(frame, "Preferences", 480,390 );\r
 \r
     fullID.setSelected(showFullId);\r
     String string = Cache.getProperty("SHOW_FULLSCREEN");\r
@@ -126,6 +136,9 @@ public class Preferences extends GPreferences
 \r
    gapSymbolCB.setSelectedItem( gapSymbol+"" );\r
 \r
+   startupCheckbox.setSelected(showStartupFile);\r
+   startupFileTextfield.setText(startupFile);\r
+\r
   }\r
 \r
   public void ok_actionPerformed(ActionEvent e)\r
@@ -141,6 +154,8 @@ public class Preferences extends GPreferences
     fontName = fontNameCB.getSelectedItem().toString();\r
     fontSize = fontSizeCB.getSelectedItem().toString();\r
     fontStyle = fontStyleCB.getSelectedItem().toString();\r
+    startupFile = startupFileTextfield.getText();\r
+    showStartupFile = startupCheckbox.isSelected();\r
 \r
     Cache.setProperty("SHOW_FULL_ID", Boolean.toString(showFullId));\r
     Cache.setProperty("SHOW_FULLSCREEN", Boolean.toString( showFullscreen ) );\r
@@ -157,12 +172,33 @@ public class Preferences extends GPreferences
     Cache.setProperty("FONT_STYLE", fontStyle);\r
     Cache.setProperty("FONT_SIZE", fontSize);\r
 \r
+    Cache.setProperty("STARTUP_FILE", startupFile);\r
+    Cache.setProperty("SHOW_STARTUP_FILE", Boolean.toString(showStartupFile));\r
+\r
+\r
+\r
     try    {\r
       frame.setClosed(true);\r
     }    catch (Exception ex)  {}\r
 \r
   }\r
 \r
+  public void startupFileTextfield_mouseClicked()\r
+  {\r
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),\r
+        new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},\r
+        new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"}\r
+       ,null);\r
+   chooser.setFileView(new JalviewFileView());\r
+   chooser.setDialogTitle("Select startup file");\r
+   int value = chooser.showOpenDialog(this);\r
+   if(value == JalviewFileChooser.APPROVE_OPTION)\r
+   {\r
+     startupFileTextfield.setText( chooser.getSelectedFile().getAbsolutePath() );\r
+   }\r
+  }\r
+\r
+\r
   public void cancel_actionPerformed(ActionEvent e)\r
   {\r
     try{\r

diff --git a/src/jalview/jbgui/GPreferences.java b/src/jalview/jbgui/GPreferences.java
index a3091e4..d4929b4 100755 (executable)
--- a/src/jalview/jbgui/GPreferences.java
+++ b/src/jalview/jbgui/GPreferences.java
@@ -5,6 +5,8 @@ import java.awt.*;
 import java.awt.event.ActionListener;\r
 import java.awt.event.ActionEvent;\r
 import javax.swing.border.TitledBorder;\r
+import java.awt.event.MouseAdapter;\r
+import java.awt.event.MouseEvent;\r
 \r
 public class GPreferences\r
     extends JPanel\r
@@ -50,7 +52,7 @@ public class GPreferences
     quality.setText("Quality");\r
     quality.setBounds(new Rectangle(248, 53, 81, 23));\r
     jPanel2.setBorder(titledBorder1);\r
-    jPanel2.setBounds(new Rectangle(9, 20, 442, 206));\r
+    jPanel2.setBounds(new Rectangle(9, 20, 442, 241));\r
     jPanel2.setLayout(null);\r
     fullID.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
     fullID.setHorizontalAlignment(SwingConstants.RIGHT);\r
@@ -111,6 +113,29 @@ public class GPreferences
     fontNameCB.setBounds(new Rectangle(121, 109, 183, 21));\r
     gapSymbolCB.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
     gapSymbolCB.setBounds(new Rectangle(121, 140, 67, 21));\r
+    startupCheckbox.setText("Open file");\r
+    startupCheckbox.setBounds(new Rectangle(4, 200, 115, 23));\r
+    startupCheckbox.addActionListener(new ActionListener()\r
+    {\r
+      public void actionPerformed(ActionEvent e)\r
+      {\r
+        jCheckBox1_actionPerformed(e);\r
+      }\r
+    });\r
+    startupCheckbox.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    startupCheckbox.setHorizontalAlignment(SwingConstants.RIGHT);\r
+    startupCheckbox.setHorizontalTextPosition(SwingConstants.LEFT);\r
+    startupCheckbox.setSelected(true);\r
+    startupFileTextfield.setFont(new java.awt.Font("Verdana", Font.PLAIN, 11));\r
+    startupFileTextfield.setBounds(new Rectangle(122, 202, 309, 20));\r
+    startupFileTextfield.addMouseListener(new MouseAdapter()\r
+    {\r
+      public void mouseClicked(MouseEvent e)\r
+      {\r
+        startupFileTextfield_mouseClicked();\r
+      }\r
+    });\r
+\r
     jPanel2.add(annotations);\r
     jPanel2.add(conservation);\r
     jPanel2.add(quality);\r
@@ -125,13 +150,14 @@ public class GPreferences
     jPanel2.add(fontStyleCB);\r
     jPanel2.add(identity);\r
     jPanel2.add(fullScreen);\r
+    jPanel2.add(startupCheckbox);\r
+    jPanel2.add(startupFileTextfield);\r
     jPanel1.add(ok);\r
     jPanel1.add(cancel);\r
     this.add(visaulTab, java.awt.BorderLayout.CENTER);\r
     visaulTab.add(visual, "visual");\r
     visual.add(jPanel2);\r
     this.add(jPanel1, java.awt.BorderLayout.SOUTH);\r
-\r
     DefaultListCellRenderer dlcr = new DefaultListCellRenderer();\r
     dlcr.setHorizontalAlignment(DefaultListCellRenderer.CENTER);\r
     gapSymbolCB.setRenderer(dlcr);\r
@@ -160,6 +186,8 @@ public class GPreferences
   protected JComboBox fontStyleCB = new JComboBox();\r
   protected JComboBox fontNameCB = new JComboBox();\r
   protected JComboBox gapSymbolCB = new JComboBox();\r
+  protected JCheckBox startupCheckbox = new JCheckBox();\r
+  protected JTextField startupFileTextfield = new JTextField();\r
   public void ok_actionPerformed(ActionEvent e)\r
   {\r
 \r
@@ -175,4 +203,15 @@ public class GPreferences
 \r
   }\r
 \r
+  public void jCheckBox1_actionPerformed(ActionEvent e)\r
+  {\r
+\r
+  }\r
+\r
+\r
+  public void startupFileTextfield_mouseClicked()\r
+  {\r
+\r
+  }\r
+\r
 }\r