X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=db844876b785fff9b51b3cb5392fad9d4c5afc6d;hb=ebb52a433edbbdbd31ab82cbb1c59fc116a72b1d;hp=782d2d67de10415e114de7c805b05e8aaf925c57;hpb=6ab8366d05c5e884329e746b5df1fa169661ec4b;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 782d2d6..db84487 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -6,17 +6,24 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import jalview.bin.Cache;
 
 
 public class FontChooser extends GFontChooser
 {
   AlignmentPanel ap;
   Font oldFont;
+  boolean init = true;
+  JInternalFrame frame;
 
   public FontChooser(AlignmentPanel ap)
   {
-    this.ap = ap;
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "Change Font", 480,100, false);
+    frame.setLayer(JLayeredPane.PALETTE_LAYER);
 
+    this.ap = ap;
     String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
     for(int i=0; i<fonts.length; i++)
       fontName.addItem(fonts[i]);
@@ -33,27 +40,66 @@ 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){}
+
+   if(ap.getOverviewPanel()!=null)
+     ap.getOverviewPanel().updateOverviewImage();
   }
 
   protected void cancel_actionPerformed(ActionEvent e)
   {
     ap.av.setFont(oldFont);
-    ap.RefreshPanels();
+    ap.repaint();
     fontName.setSelectedItem(oldFont.getName());
     fontSize.setSelectedItem(oldFont.getSize()+"");
     fontStyle.setSelectedIndex(oldFont.getStyle());
+    try{
+      frame.setClosed(true);
+    }catch(Exception ex){}
+  }
+
+  void changeFont()
+  {
+    Font newFont = new Font(fontName.getSelectedItem().toString(),
+                            fontStyle.getSelectedIndex(),
+                            Integer.parseInt(fontSize.getSelectedItem().toString())
+                            );
+    ap.av.setFont(newFont);
+    ap.fontChanged();
   }
 
+  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();
+  }
+
+  public void defaultButton_actionPerformed(ActionEvent e)
+  {
+    Cache.setProperty("FONT_NAME", fontName.getSelectedItem().toString());
+    Cache.setProperty("FONT_STYLE", fontStyle.getSelectedIndex()+"");
+    Cache.setProperty("FONT_SIZE", fontSize.getSelectedItem().toString());
+  }
+
+
 
 }