From: amwaterhouse <Andrew Waterhouse>
Date: Thu, 10 Mar 2005 10:12:01 +0000 (+0000)
Subject: fonts changed as selection made
X-Git-Tag: Release_2_0~605
X-Git-Url: http://source.jalview.org/gitweb/?a=commitdiff_plain;h=21bf96841dd49d9538dff23e6dd553485ab16896;p=jalview.git

fonts changed as selection made
---

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 782d2d6..d7a88a7 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -12,11 +12,13 @@ public class FontChooser extends GFontChooser
 {
   AlignmentPanel ap;
   Font oldFont;
+  boolean init = true;
+  JInternalFrame frame;
 
-  public FontChooser(AlignmentPanel ap)
+  public FontChooser(AlignmentPanel ap, JInternalFrame f)
   {
     this.ap = ap;
-
+    frame = f;
     String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
     for(int i=0; i<fonts.length; i++)
       fontName.addItem(fonts[i]);
@@ -33,17 +35,18 @@ public class FontChooser extends GFontChooser
    fontSize.setSelectedItem(oldFont.getSize()+"");
    fontStyle.setSelectedIndex(oldFont.getStyle());
 
+   init = false;
   }
 
   protected void ok_actionPerformed(ActionEvent e)
   {
-    Font newFont = new Font(fontName.getSelectedItem().toString(),
-                            fontStyle.getSelectedIndex(),
-                            Integer.parseInt(fontSize.getSelectedItem().toString()+"")
-                            );
-    ap.av.setFont(newFont);
-    ap.RefreshPanels();
-    ap.RefreshPanels();
+    try{
+      frame.setClosed(true);
+    }catch(Exception ex){}
+
+   jalview.bin.Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());
+   jalview.bin.Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex()+"");
+   jalview.bin.Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());
   }
 
   protected void cancel_actionPerformed(ActionEvent e)
@@ -55,5 +58,33 @@ public class FontChooser extends GFontChooser
     fontStyle.setSelectedIndex(oldFont.getStyle());
   }
 
+  void changeFont()
+  {
+    Font newFont = new Font(fontName.getSelectedItem().toString(),
+                            fontStyle.getSelectedIndex(),
+                            Integer.parseInt(fontSize.getSelectedItem().toString())
+                            );
+    ap.av.setFont(newFont);
+    ap.RefreshPanels();
+  }
+
+  protected void fontName_actionPerformed(ActionEvent e)
+  {
+    if(init) return;
+    changeFont();
+  }
+
+  protected void fontSize_actionPerformed(ActionEvent e)
+  {
+    if(init) return;
+    changeFont();
+  }
+
+  protected void fontStyle_actionPerformed(ActionEvent e)
+  {
+    if(init) return;
+    changeFont();
+  }
+
 
 }