X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fgui%2FFontChooser.java;h=b911d7d632afec839d3b8928a323749a682e4e95;hb=94f96a9c993be278b360ad15965715063db72520;hp=d7a88a750eb7342992ee7efe7bd30eb625506755;hpb=21bf96841dd49d9538dff23e6dd553485ab16896;p=jalview.git

diff --git a/src/jalview/gui/FontChooser.java b/src/jalview/gui/FontChooser.java
index d7a88a7..b911d7d 100755
--- a/src/jalview/gui/FontChooser.java
+++ b/src/jalview/gui/FontChooser.java
@@ -1,90 +1,149 @@
+/*
+ * 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;
-import jalview.gui.*;
 import java.awt.*;
 import java.awt.event.*;
 import javax.swing.*;
-import javax.swing.event.*;
 
+import jalview.bin.*;
+import jalview.jbgui.*;
 
-public class FontChooser extends GFontChooser
+public class FontChooser
+    extends GFontChooser
 {
   AlignmentPanel ap;
   Font oldFont;
   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++)
+
+    String[] fonts = java.awt.GraphicsEnvironment.getLocalGraphicsEnvironment()
+        .getAvailableFontFamilyNames();
+
+    for (int i = 0; i < fonts.length; i++)
+    {
       fontName.addItem(fonts[i]);
+    }
 
-    for(int i=1; i<31; i++)
-      fontSize.addItem(i+"");
+    for (int i = 1; i < 31; i++)
+    {
+      fontSize.addItem(i + "");
+    }
 
-   fontStyle.addItem("plain");
-   fontStyle.addItem("bold");
-   fontStyle.addItem("italic");
+    fontStyle.addItem("plain");
+    fontStyle.addItem("bold");
+    fontStyle.addItem("italic");
 
-   oldFont = ap.av.getFont();
-   fontName.setSelectedItem(oldFont.getName());
-   fontSize.setSelectedItem(oldFont.getSize()+"");
-   fontStyle.setSelectedIndex(oldFont.getStyle());
+    oldFont = ap.av.getFont();
+    fontName.setSelectedItem(oldFont.getName());
+    fontSize.setSelectedItem(oldFont.getSize() + "");
+    fontStyle.setSelectedIndex(oldFont.getStyle());
 
-   init = false;
+    init = false;
   }
 
   protected void ok_actionPerformed(ActionEvent e)
   {
-    try{
+    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());
+    }
+    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()+"");
+    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())
-                            );
+                            Integer.parseInt(fontSize.getSelectedItem().
+                                             toString()));
     ap.av.setFont(newFont);
-    ap.RefreshPanels();
+    ap.fontChanged();
   }
 
   protected void fontName_actionPerformed(ActionEvent e)
   {
-    if(init) return;
+    if (init)
+    {
+      return;
+    }
+
     changeFont();
   }
 
   protected void fontSize_actionPerformed(ActionEvent e)
   {
-    if(init) return;
+    if (init)
+    {
+      return;
+    }
+
     changeFont();
   }
 
   protected void fontStyle_actionPerformed(ActionEvent e)
   {
-    if(init) return;
+    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());
+  }
 }