X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FPreferences.java;h=398c5bed6d1ee1201fcfae0b5e65bc2e9792f068;hb=fe5db5e87fc726b1560d21f97f19b0e04963b72c;hp=6c07d23623c6e83307ca91f0619bc3ea6b2839ae;hpb=aee942d972498d3e51334fc890221b1827e0b255;p=jalview.git

diff --git a/src/jalview/gui/Preferences.java b/src/jalview/gui/Preferences.java
index 6c07d23..398c5be 100755
--- a/src/jalview/gui/Preferences.java
+++ b/src/jalview/gui/Preferences.java
@@ -2,40 +2,118 @@ package jalview.gui;
 
 import jalview.jbgui.*;
 import jalview.schemes.*;
+import jalview.io.*;
 
 import jalview.bin.Cache;
 import javax.swing.*;
 import java.awt.event.ActionEvent;
 import java.awt.*;
 
+
 public class Preferences extends GPreferences
 {
-  AlignViewport av;
+  static boolean preferencesLoaded=false;
+
+  public static boolean showFullscreen=false;
+  public static boolean showFullId=true;
+  public static boolean showAnnotation=true;
+  public static boolean showConservation=true;
+  public static boolean showQuality=true;
+  public static boolean showIdentity=true;
+  public static String fontName="SansSerif";
+  public static String fontSize="10";
+  public static String fontStyle=Font.PLAIN+"";
+  public static char gapSymbol='-';
+  public static String defaultColour=null;
+  public static boolean showStartupFile=true;
+  public static String startupFile = "http://www.compbio.dundee.ac.uk/~andrew/jalviewTEST/fasta";
+
   JInternalFrame frame;
-  public Preferences(AlignViewport av)
+
+  public static void initPreferences()
   {
-    this.av = av;
+  String string = Cache.getProperty("SHOW_FULL_ID");
+  if(string!=null)
+    showFullId = Boolean.valueOf(string).booleanValue();
+
+  string = Cache.getProperty("SHOW_FULLSCREEN");
+  if(string!=null)
+    showFullscreen = Boolean.valueOf(string).booleanValue();
+
+  string = Cache.getProperty("SHOW_ANNOTATIONS");
+      if(string!=null)
+    showAnnotation = Boolean.valueOf(string).booleanValue();
+
+  string = Cache.getProperty("SHOW_CONSERVATION");
+      if(string!=null)
+    showConservation = Boolean.valueOf(string).booleanValue();
+  string = Cache.getProperty("SHOW_QUALITY");
+      if(string!=null)
+    showQuality = Boolean.valueOf(string).booleanValue();
+  string = Cache.getProperty("SHOW_IDENTITY");
+      if(string!=null)
+    showIdentity = Boolean.valueOf(string).booleanValue();
+
+  string = Cache.getProperty("GAP_SYMBOL");
+      if(string!=null)
+    gapSymbol = string.charAt(0);
+
+  string = Cache.getProperty("SHOW_FULL_ID");
+    if(string!=null)
+      showFullId = Boolean.valueOf(string).booleanValue();
+
+    string = Cache.getProperty("FONT_NAME");
+    if (string != null)
+      fontName = string;
+
+    string = Cache.getProperty("FONT_STYLE");
+    if (string != null)
+      fontStyle = string;
+
+    string = Cache.getProperty("FONT_SIZE");
+    if (string != null)
+      fontSize = string;
+
+
+  string = Cache.getProperty("DEFAULT_COLOUR");
+  if(string!=null)
+      defaultColour = string;
+
+  string = Cache.getProperty("STARTUP_FILE");
+    if(string!=null)
+      startupFile = string;
+
+  string = Cache.getProperty("SHOW_STARTUP_FILE");
+        if(string!=null)
+      showStartupFile = Boolean.valueOf(string).booleanValue();
+
+      preferencesLoaded = true;
+  }
+
+  public Preferences()
+  {
+    initPreferences();
+
     frame = new JInternalFrame();
     frame.setContentPane(this);
-    Desktop.addInternalFrame(frame, "Preferences", 480,350 );
-
+    Desktop.addInternalFrame(frame, "Preferences", 480,390 );
 
-    fullID.setSelected(av.getShowFullId());
+    fullID.setSelected(showFullId);
     String string = Cache.getProperty("SHOW_FULLSCREEN");
     boolean value = false;
     if(string!=null)
       value =  Boolean.valueOf(string).booleanValue();
 
     fullScreen.setSelected(value);
-    annotations.setSelected(av.getShowAnnotation());
+    annotations.setSelected(showAnnotation);
 
-    conservation.setEnabled(av.getShowAnnotation());
-    quality.setEnabled(av.getShowAnnotation());
-    identity.setEnabled(av.getShowAnnotation());
+    conservation.setEnabled(showAnnotation);
+    quality.setEnabled(showAnnotation);
+    identity.setEnabled(showAnnotation);
 
-    conservation.setSelected(av.showConservation);
-    quality.setSelected(av.showQuality);
-    identity.setSelected(av.showIdentity);
+    conservation.setSelected(showConservation);
+    quality.setSelected(showQuality);
+    identity.setSelected(showIdentity);
 
     for(int i=0; i<12; i++)
       colour.addItem( ColourSchemeProperty.getColourName(i) );
@@ -48,54 +126,88 @@ public class Preferences extends GPreferences
 
     String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
     for(int i=0; i<fonts.length; i++)
-      fontName.addItem(fonts[i]);
+      fontNameCB.addItem(fonts[i]);
 
     for(int i=1; i<31; i++)
-      fontSize.addItem(i+"");
+      fontSizeCB.addItem(i+"");
 
-   fontStyle.addItem("plain");
-   fontStyle.addItem("bold");
-   fontStyle.addItem("italic");
+   fontStyleCB.addItem("plain");
+   fontStyleCB.addItem("bold");
+   fontStyleCB.addItem("italic");
 
-   Font oldFont = av.getFont();
-   fontName.setSelectedItem(oldFont.getName());
-   fontSize.setSelectedItem(oldFont.getSize() + "");
-   fontStyle.setSelectedIndex(oldFont.getStyle());
+   fontNameCB.setSelectedItem(fontName);
+   fontSizeCB.setSelectedItem(fontSize);
+   fontStyleCB.setSelectedItem(fontStyle);
 
-   gapSymbol.addItem("-");
-   gapSymbol.addItem(".");
+   gapSymbolCB.addItem("-");
+   gapSymbolCB.addItem(".");
 
-   gapSymbol.setSelectedItem( av.getGapCharacter()+"" );
+   gapSymbolCB.setSelectedItem( gapSymbol+"" );
+
+   startupCheckbox.setSelected(showStartupFile);
+   startupFileTextfield.setText(startupFile);
 
   }
 
   public void ok_actionPerformed(ActionEvent e)
   {
-    Cache.setProperty("SHOW_FULL_ID", Boolean.toString( fullID.isSelected() ));
-    Cache.setProperty("SHOW_FULLSCREEN", Boolean.toString( fullScreen.isSelected() ));
+    showFullId =  fullID.isSelected() ;
+    showFullscreen = fullScreen.isSelected();
+    showAnnotation = annotations.isSelected();
+    showConservation = conservation.isSelected();
+    showQuality = quality.isSelected();
+    showIdentity = identity.isSelected();
+    defaultColour = colour.getSelectedItem().toString();
+    gapSymbol = gapSymbolCB.getSelectedItem().toString().charAt(0);
+    fontName = fontNameCB.getSelectedItem().toString();
+    fontSize = fontSizeCB.getSelectedItem().toString();
+    fontStyle = fontStyleCB.getSelectedItem().toString();
+    startupFile = startupFileTextfield.getText();
+    showStartupFile = startupCheckbox.isSelected();
+
+    Cache.setProperty("SHOW_FULL_ID", Boolean.toString(showFullId));
+    Cache.setProperty("SHOW_FULLSCREEN", Boolean.toString( showFullscreen ) );
+
+    Cache.setProperty("SHOW_ANNOTATIONS", Boolean.toString( showAnnotation  ));
+    Cache.setProperty("SHOW_CONSERVATION", Boolean.toString( showConservation ));
+    Cache.setProperty("SHOW_QUALITY", Boolean.toString( showQuality ));
+    Cache.setProperty("SHOW_IDENTITY", Boolean.toString( showIdentity ));
 
-    Cache.setProperty("SHOW_ANNOTATIONS", Boolean.toString( annotations.isSelected() ));
-    Cache.setProperty("SHOW_CONSERVATION", Boolean.toString( conservation.isSelected() ));
-    Cache.setProperty("SHOW_QUALITY", Boolean.toString( quality.isSelected() ));
-    Cache.setProperty("SHOW_IDENTITY", Boolean.toString( identity.isSelected() ));
+    Cache.setProperty("DEFAULT_COLOUR", defaultColour);
+    Cache.setProperty("GAP_SYMBOL", gapSymbol+"");
+
+    Cache.setProperty("FONT_NAME", fontName);
+    Cache.setProperty("FONT_STYLE", fontStyle);
+    Cache.setProperty("FONT_SIZE", fontSize);
+
+    Cache.setProperty("STARTUP_FILE", startupFile);
+    Cache.setProperty("SHOW_STARTUP_FILE", Boolean.toString(showStartupFile));
 
-    Cache.setProperty("DEFAULT_COLOUR", colour.getSelectedItem().toString() );
-    Cache.setProperty("GAP_SYMBOL", gapSymbol.getSelectedItem().toString());
 
-    Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());
-    Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex()+"");
-    Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());
 
     try    {
       frame.setClosed(true);
     }    catch (Exception ex)  {}
 
-    av.updateFromPreferences();
-
-    repaint();
+  }
 
+  public void startupFileTextfield_mouseClicked()
+  {
+    JalviewFileChooser chooser = new JalviewFileChooser(jalview.bin.Cache.getProperty("LAST_DIRECTORY"),
+        new String[]{"fa, fasta, fastq", "aln",  "pfam", "msf", "pir","blc","jar"},
+        new String[]{"Fasta", "Clustal", "PFAM", "MSF", "PIR", "BLC", "Jalview"}
+       ,jalview.bin.Cache.getProperty("DEFAULT_FILE_FORMAT"));
+   chooser.setFileView(new JalviewFileView());
+   chooser.setDialogTitle("Select startup file");
+   int value = chooser.showOpenDialog(this);
+   if(value == JalviewFileChooser.APPROVE_OPTION)
+   {
+     jalview.bin.Cache.setProperty("DEFAULT_FILE_FORMAT", chooser.getSelectedFormat());
+     startupFileTextfield.setText( chooser.getSelectedFile().getAbsolutePath() );
+   }
   }
 
+
   public void cancel_actionPerformed(ActionEvent e)
   {
     try{