X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=d781d724e528040ba3c0a06b8e79aecd0225793d;hb=99c58ee0ae2a848f982552e53feaf6d5cb9925e5;hp=3edbdb6af5f063c4856d1b4b1e83e30cfd7d721b;hpb=b8ad1d6974a31bce823c3d7ac2f49d07f0a0c061;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index 3edbdb6..d781d72 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,3 +1,22 @@
+/*
+* Jalview - A Sequence Alignment Editor and Viewer
+* Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+*
+* This program is free software; you can redistribute it and/or
+* modify it under the terms of the GNU General Public License
+* as published by the Free Software Foundation; either version 2
+* of the License, or (at your option) any later version.
+*
+* This program is distributed in the hope that it will be useful,
+* but WITHOUT ANY WARRANTY; without even the implied warranty of
+* MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+* GNU General Public License for more details.
+*
+* You should have received a copy of the GNU General Public License
+* along with this program; if not, write to the Free Software
+* Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA  02110-1301, USA
+*/
+
 package jalview.gui;
 
 import jalview.jbgui.GFontChooser;
@@ -6,6 +25,7 @@ import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
 import javax.swing.event.*;
+import jalview.bin.Cache;
 
 
 public class FontChooser extends GFontChooser
@@ -15,10 +35,14 @@ public class FontChooser extends GFontChooser
   boolean init = true;
   JInternalFrame frame;
 
-  public FontChooser(AlignmentPanel ap, JInternalFrame f)
+  public FontChooser(AlignmentPanel ap)
   {
+    frame = new JInternalFrame();
+    frame.setContentPane(this);
+    Desktop.addInternalFrame(frame, "Change Font", 480,100, false);
+    frame.setLayer(JLayeredPane.PALETTE_LAYER);
+
     this.ap = ap;
-    frame = f;
     String fonts[] = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment().getAvailableFontFamilyNames();
     for(int i=0; i<fonts.length; i++)
       fontName.addItem(fonts[i]);
@@ -44,18 +68,20 @@ public class FontChooser extends GFontChooser
       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());
+   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()
@@ -65,8 +91,7 @@ public class FontChooser extends GFontChooser
                             Integer.parseInt(fontSize.getSelectedItem().toString())
                             );
     ap.av.setFont(newFont);
-    ap.annotationPanel.adjustPanelHeight();
-    ap.repaint();
+    ap.fontChanged();
   }
 
   protected void fontName_actionPerformed(ActionEvent e)
@@ -87,5 +112,13 @@ public class FontChooser extends GFontChooser
     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());
+  }
+
+
 
 }