X-Git-Url: http://source.jalview.org/gitweb/?a=blobdiff_plain;f=src%2Fjalview%2Fappletgui%2FFontChooser.java;h=87fa50febf74051eaf3cf6091203df53af2bcfb0;hb=6366cf9dcc083ef36aa9fe822bf49fbc18100dca;hp=5f44b39faaa5e4a8d144dd987d47f5b61dd5159d;hpb=d89c653f63d31887c5a9c41c80711240324849f6;p=jalview.git

diff --git a/src/jalview/appletgui/FontChooser.java b/src/jalview/appletgui/FontChooser.java
index 5f44b39..87fa50f 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) 2007 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
@@ -20,12 +20,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;
@@ -89,11 +87,39 @@ 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);
@@ -109,12 +135,12 @@ public class FontChooser
 
   protected void cancel_actionPerformed()
   {
-    if(ap!=null)
+    if (ap != null)
     {
       ap.av.setFont(oldFont);
-      ap.repaint();
+      ap.paintAlignment(true);
     }
-    else if(tp!=null)
+    else if (tp != null)
     {
       tp.setTreeFont(oldFont);
       tp.treeCanvas.repaint();
@@ -139,10 +165,10 @@ public class FontChooser
       ap.av.setFont(newFont);
       ap.fontChanged();
     }
-    else if(tp != null)
+    else if (tp != null)
     {
       tp.setTreeFont(newFont);
-      }
+    }
   }
 
   protected void fontName_actionPerformed()
@@ -171,6 +197,7 @@ public class FontChooser
     }
     changeFont();
   }
+
   Label label1 = new Label();
   protected Choice fontSize = new Choice();
   protected Choice fontStyle = new Choice();
@@ -189,72 +216,53 @@ public class FontChooser
   Panel panel5 = new Panel();
   BorderLayout borderLayout4 = new BorderLayout();
 
-
-  private void jbInit() throws Exception {
-      label1.setFont(new java.awt.Font("Verdana", 0, 11));
-      label1.setAlignment(Label.RIGHT);
-      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();
-              }
-          });
-      fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));
-      fontStyle.addItemListener(new java.awt.event.ItemListener() {
-              public void itemStateChanged(ItemEvent e) {
-                  fontStyle_actionPerformed();
-              }
-          });
-      label2.setAlignment(Label.RIGHT);
-      label2.setFont(new java.awt.Font("Verdana", 0, 11));
-      label2.setText("Size: ");
-      label3.setAlignment(Label.RIGHT);
-      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();
-              }
-          });
-      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();
-              }
-          });
-      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();
-              }
-          });
-      this.setBackground(Color.white);
-      panel1.setLayout(borderLayout1);
-      panel2.setLayout(borderLayout3);
-      panel3.setLayout(borderLayout2);
-      panel5.setBackground(Color.white);
-      panel4.setBackground(Color.white);
-      panel1.setBackground(Color.white);
-      panel2.setBackground(Color.white);
-      panel3.setBackground(Color.white);
-      panel1.add(label1, BorderLayout.WEST);
-      panel1.add(fontName, BorderLayout.CENTER);
-      panel5.add(panel1, null);
-      panel5.add(panel3, null);
-      panel5.add(panel2, null);
-      panel2.add(label3, BorderLayout.WEST);
-      panel2.add(fontStyle, BorderLayout.CENTER);
-      panel3.add(label2, BorderLayout.WEST);
-      panel3.add(fontSize, BorderLayout.CENTER);
-      this.add(panel4, BorderLayout.SOUTH);
-      panel4.add(ok, null);
-      panel4.add(cancel, null);
-      this.add(panel5, BorderLayout.CENTER);
+  private void jbInit()
+      throws Exception
+  {
+    label1.setFont(new java.awt.Font("Verdana", 0, 11));
+    label1.setAlignment(Label.RIGHT);
+    label1.setText("Font: ");
+    this.setLayout(borderLayout4);
+    fontSize.setFont(new java.awt.Font("Verdana", 0, 11));
+    fontSize.addItemListener(this);
+    fontStyle.setFont(new java.awt.Font("Verdana", 0, 11));
+    fontStyle.addItemListener(this);
+    label2.setAlignment(Label.RIGHT);
+    label2.setFont(new java.awt.Font("Verdana", 0, 11));
+    label2.setText("Size: ");
+    label3.setAlignment(Label.RIGHT);
+    label3.setFont(new java.awt.Font("Verdana", 0, 11));
+    label3.setText("Style: ");
+    fontName.setFont(new java.awt.Font("Verdana", 0, 11));
+    fontName.addItemListener(this);
+    ok.setFont(new java.awt.Font("Verdana", 0, 11));
+    ok.setLabel("OK");
+    ok.addActionListener(this);
+    cancel.setFont(new java.awt.Font("Verdana", 0, 11));
+    cancel.setLabel("Cancel");
+    cancel.addActionListener(this);
+    this.setBackground(Color.white);
+    panel1.setLayout(borderLayout1);
+    panel2.setLayout(borderLayout3);
+    panel3.setLayout(borderLayout2);
+    panel5.setBackground(Color.white);
+    panel4.setBackground(Color.white);
+    panel1.setBackground(Color.white);
+    panel2.setBackground(Color.white);
+    panel3.setBackground(Color.white);
+    panel1.add(label1, BorderLayout.WEST);
+    panel1.add(fontName, BorderLayout.CENTER);
+    panel5.add(panel1, null);
+    panel5.add(panel3, null);
+    panel5.add(panel2, null);
+    panel2.add(label3, BorderLayout.WEST);
+    panel2.add(fontStyle, BorderLayout.CENTER);
+    panel3.add(label2, BorderLayout.WEST);
+    panel3.add(fontSize, BorderLayout.CENTER);
+    this.add(panel4, BorderLayout.SOUTH);
+    panel4.add(ok, null);
+    panel4.add(cancel, null);
+    this.add(panel5, BorderLayout.CENTER);
   }
 
 }