X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=5fb6fb6e59a8324126c914df8ae5e023741f74a6;hb=c95df1d1e8746c6fa31b94c2bf8505f25a30c168;hp=27e2a93c387e37bc656f51d3cf6919ab1fdb4b95;hpb=55e2e9b22b133db8b9ff0979b0338a33081fc8fd;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 27e2a93..5fb6fb6 100755
--- a/src/jalview/appletgui/FontChooser.java
+++ b/src/jalview/appletgui/FontChooser.java
@@ -1,6 +1,6 @@
 /*
  * Jalview - A Sequence Alignment Editor and Viewer
- * Copyright (C) 2005 AM Waterhouse, J Procter, G Barton, M Clamp, S Searle
+ * Copyright (C) 2006 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
@@ -21,11 +21,10 @@ package jalview.appletgui;
 
 import java.awt.*;
 
-import java.awt.event.ActionEvent;
-import java.awt.event.ItemEvent;
+import java.awt.event.*;
 
 public class FontChooser
-    extends Panel
+    extends Panel implements ActionListener, ItemListener
 {
   AlignmentPanel ap;
   TreePanel tp;
@@ -51,13 +50,22 @@ public class FontChooser
 
   public FontChooser(AlignmentPanel ap)
   {
+    try
+    {
+      jbInit();
+    }
+    catch (Exception e)
+    {
+      e.printStackTrace();
+    }
+
     this.ap = ap;
     oldFont = ap.av.getFont();
     init();
   }
 
   void init()
-    {
+  {
     String fonts[] = Toolkit.getDefaultToolkit().getFontList();
     for (int i = 0; i < fonts.length; i++)
     {
@@ -80,11 +88,30 @@ public class FontChooser
     Frame frame = new Frame();
     this.frame = frame;
     frame.add(this);
-    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 100);
+    jalview.bin.JalviewLite.addFrame(frame, "Change Font", 440, 115);
 
     init = false;
   }
 
+  public void actionPerformed(ActionEvent evt)
+  {
+    if(evt.getSource()==ok)
+      ok_actionPerformed();
+    else if(evt.getSource()==cancel)
+      cancel_actionPerformed();
+  }
+
+  public void itemStateChanged(ItemEvent evt)
+  {
+    if(evt.getSource()==fontName)
+      fontName_actionPerformed();
+    else if(evt.getSource()==fontSize)
+      fontSize_actionPerformed();
+    else if(evt.getSource()==fontStyle)
+      fontStyle_actionPerformed();
+  }
+
+
   protected void ok_actionPerformed()
   {
     frame.setVisible(false);
@@ -187,17 +214,9 @@ public class FontChooser
       label1.setText("Font: ");
       this.setLayout(borderLayout4);
       fontSize.setFont(new java.awt.Font("Verdana", 0, 11));
-      fontSize.addItemListener(new java.awt.event.ItemListener() {
-              public void itemStateChanged(ItemEvent e) {
-                  fontSize_actionPerformed();
-              }
-          });
+      fontSize.addItemListener(this);
       fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));
-      fontStyle.addItemListener(new java.awt.event.ItemListener() {
-              public void itemStateChanged(ItemEvent e) {
-                  fontStyle_actionPerformed();
-              }
-          });
+      fontStyle.addItemListener(this);
       label2.setAlignment(Label.RIGHT);
       label2.setFont(new java.awt.Font("Verdana", 0, 11));
       label2.setText("Size: ");
@@ -205,25 +224,13 @@ public class FontChooser
       label3.setFont(new java.awt.Font("Verdana", 0, 11));
       label3.setText("Style: ");
       fontName.setFont(new java.awt.Font("Verdana", 0, 11));
-      fontName.addItemListener(new java.awt.event.ItemListener() {
-              public void itemStateChanged(ItemEvent e) {
-                  fontName_actionPerformed();
-              }
-          });
+      fontName.addItemListener(this);
       ok.setFont(new java.awt.Font("Verdana", 0, 11));
       ok.setLabel("OK");
-      ok.addActionListener(new java.awt.event.ActionListener() {
-              public void actionPerformed(ActionEvent e) {
-                  ok_actionPerformed();
-              }
-          });
+      ok.addActionListener(this);
       cancel.setFont(new java.awt.Font("Verdana", 0, 11));
       cancel.setLabel("Cancel");
-      cancel.addActionListener(new java.awt.event.ActionListener() {
-              public void actionPerformed(ActionEvent e) {
-                  cancel_actionPerformed();
-              }
-          });
+      cancel.addActionListener(this);
       this.setBackground(Color.white);
       panel1.setLayout(borderLayout1);
       panel2.setLayout(borderLayout3);